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
1224 if {[is_Windows] || [is_MacOSX]} {
1225 option add *Menu.tearOff 0
1236 proc apply_config {} {
1237 global repo_config font_descs
1239 foreach option $font_descs {
1240 set name [lindex $option 0]
1241 set font [lindex $option 1]
1243 foreach {cn cv} $repo_config(gui.$name) {
1244 font configure $font $cn $cv
1247 error_popup "Invalid font specified in gui.$name:\n\n$err"
1249 foreach {cn cv} [font configure $font] {
1250 font configure ${font}bold $cn $cv
1252 font configure ${font}bold -weight bold
1256 set default_config(merge.summary) false
1257 set default_config(merge.verbosity) 2
1258 set default_config(user.name) {}
1259 set default_config(user.email) {}
1261 set default_config(gui.pruneduringfetch) false
1262 set default_config(gui.trustmtime) false
1263 set default_config(gui.diffcontext) 5
1264 set default_config(gui.newbranchtemplate) {}
1265 set default_config(gui.fontui) [font configure font_ui]
1266 set default_config(gui.fontdiff) [font configure font_diff]
1268 {fontui font_ui {Main Font}}
1269 {fontdiff font_diff {Diff/Console Font}}
1274 ######################################################################
1276 ## feature option selection
1278 if {[regexp {^git-(.+)$} [appname] _junk subcommand]} {
1283 if {$subcommand eq {gui.sh}} {
1286 if {$subcommand eq {gui} && [llength $argv] > 0} {
1287 set subcommand [lindex $argv 0]
1288 set argv [lrange $argv 1 end]
1291 enable_option multicommit
1292 enable_option branch
1293 enable_option transport
1295 switch -- $subcommand {
1298 disable_option multicommit
1299 disable_option branch
1300 disable_option transport
1303 enable_option singlecommit
1305 disable_option multicommit
1306 disable_option branch
1307 disable_option transport
1311 ######################################################################
1319 menu .mbar -tearoff 0
1320 .mbar add cascade -label Repository -menu .mbar.repository
1321 .mbar add cascade -label Edit -menu .mbar.edit
1322 if {[is_enabled branch]} {
1323 .mbar add cascade -label Branch -menu .mbar.branch
1325 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
1326 .mbar add cascade -label Commit -menu .mbar.commit
1328 if {[is_enabled transport]} {
1329 .mbar add cascade -label Merge -menu .mbar.merge
1330 .mbar add cascade -label Fetch -menu .mbar.fetch
1331 .mbar add cascade -label Push -menu .mbar.push
1333 . configure -menu .mbar
1335 # -- Repository Menu
1337 menu .mbar.repository
1339 .mbar.repository add command \
1340 -label {Browse Current Branch} \
1341 -command {browser::new $current_branch}
1342 trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Browse \$current_branch\" ;#"
1343 .mbar.repository add separator
1345 .mbar.repository add command \
1346 -label {Visualize Current Branch} \
1347 -command {do_gitk $current_branch}
1348 trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Visualize \$current_branch\" ;#"
1349 .mbar.repository add command \
1350 -label {Visualize All Branches} \
1351 -command {do_gitk --all}
1352 .mbar.repository add separator
1354 if {[is_enabled multicommit]} {
1355 .mbar.repository add command -label {Database Statistics} \
1358 .mbar.repository add command -label {Compress Database} \
1361 .mbar.repository add command -label {Verify Database} \
1362 -command do_fsck_objects
1364 .mbar.repository add separator
1367 .mbar.repository add command \
1368 -label {Create Desktop Icon} \
1369 -command do_cygwin_shortcut
1370 } elseif {[is_Windows]} {
1371 .mbar.repository add command \
1372 -label {Create Desktop Icon} \
1373 -command do_windows_shortcut
1374 } elseif {[is_MacOSX]} {
1375 .mbar.repository add command \
1376 -label {Create Desktop Icon} \
1377 -command do_macosx_app
1381 .mbar.repository add command -label Quit \
1388 .mbar.edit add command -label Undo \
1389 -command {catch {[focus] edit undo}} \
1391 .mbar.edit add command -label Redo \
1392 -command {catch {[focus] edit redo}} \
1394 .mbar.edit add separator
1395 .mbar.edit add command -label Cut \
1396 -command {catch {tk_textCut [focus]}} \
1398 .mbar.edit add command -label Copy \
1399 -command {catch {tk_textCopy [focus]}} \
1401 .mbar.edit add command -label Paste \
1402 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
1404 .mbar.edit add command -label Delete \
1405 -command {catch {[focus] delete sel.first sel.last}} \
1407 .mbar.edit add separator
1408 .mbar.edit add command -label {Select All} \
1409 -command {catch {[focus] tag add sel 0.0 end}} \
1414 if {[is_enabled branch]} {
1417 .mbar.branch add command -label {Create...} \
1418 -command do_create_branch \
1420 lappend disable_on_lock [list .mbar.branch entryconf \
1421 [.mbar.branch index last] -state]
1423 .mbar.branch add command -label {Delete...} \
1424 -command do_delete_branch
1425 lappend disable_on_lock [list .mbar.branch entryconf \
1426 [.mbar.branch index last] -state]
1428 .mbar.branch add command -label {Reset...} \
1429 -command merge::reset_hard
1430 lappend disable_on_lock [list .mbar.branch entryconf \
1431 [.mbar.branch index last] -state]
1436 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
1439 .mbar.commit add radiobutton \
1440 -label {New Commit} \
1441 -command do_select_commit_type \
1442 -variable selected_commit_type \
1444 lappend disable_on_lock \
1445 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1447 .mbar.commit add radiobutton \
1448 -label {Amend Last Commit} \
1449 -command do_select_commit_type \
1450 -variable selected_commit_type \
1452 lappend disable_on_lock \
1453 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1455 .mbar.commit add separator
1457 .mbar.commit add command -label Rescan \
1458 -command do_rescan \
1460 lappend disable_on_lock \
1461 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1463 .mbar.commit add command -label {Add To Commit} \
1464 -command do_add_selection
1465 lappend disable_on_lock \
1466 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1468 .mbar.commit add command -label {Add Existing To Commit} \
1469 -command do_add_all \
1471 lappend disable_on_lock \
1472 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1474 .mbar.commit add command -label {Unstage From Commit} \
1475 -command do_unstage_selection
1476 lappend disable_on_lock \
1477 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1479 .mbar.commit add command -label {Revert Changes} \
1480 -command do_revert_selection
1481 lappend disable_on_lock \
1482 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1484 .mbar.commit add separator
1486 .mbar.commit add command -label {Sign Off} \
1487 -command do_signoff \
1490 .mbar.commit add command -label Commit \
1491 -command do_commit \
1492 -accelerator $M1T-Return
1493 lappend disable_on_lock \
1494 [list .mbar.commit entryconf [.mbar.commit index last] -state]
1499 if {[is_enabled branch]} {
1501 .mbar.merge add command -label {Local Merge...} \
1502 -command merge::dialog
1503 lappend disable_on_lock \
1504 [list .mbar.merge entryconf [.mbar.merge index last] -state]
1505 .mbar.merge add command -label {Abort Merge...} \
1506 -command merge::reset_hard
1507 lappend disable_on_lock \
1508 [list .mbar.merge entryconf [.mbar.merge index last] -state]
1514 if {[is_enabled transport]} {
1518 .mbar.push add command -label {Push...} \
1519 -command do_push_anywhere
1523 # -- Apple Menu (Mac OS X only)
1525 .mbar add cascade -label Apple -menu .mbar.apple
1528 .mbar.apple add command -label "About [appname]" \
1530 .mbar.apple add command -label "Options..." \
1535 .mbar.edit add separator
1536 .mbar.edit add command -label {Options...} \
1541 if {[file exists /usr/local/miga/lib/gui-miga]
1542 && [file exists .pvcsrc]} {
1544 global ui_status_value
1545 if {![lock_index update]} return
1546 set cmd [list sh --login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
1547 set miga_fd [open "|$cmd" r]
1548 fconfigure $miga_fd -blocking 0
1549 fileevent $miga_fd readable [list miga_done $miga_fd]
1550 set ui_status_value {Running miga...}
1552 proc miga_done {fd} {
1557 rescan [list set ui_status_value {Ready.}]
1560 .mbar add cascade -label Tools -menu .mbar.tools
1562 .mbar.tools add command -label "Migrate" \
1564 lappend disable_on_lock \
1565 [list .mbar.tools entryconf [.mbar.tools index last] -state]
1571 .mbar add cascade -label Help -menu .mbar.help
1575 .mbar.help add command -label "About [appname]" \
1580 catch {set browser $repo_config(instaweb.browser)}
1581 set doc_path [file dirname [gitexec]]
1582 set doc_path [file join $doc_path Documentation index.html]
1585 set doc_path [exec cygpath --mixed $doc_path]
1588 if {$browser eq {}} {
1591 } elseif {[is_Cygwin]} {
1592 set program_files [file dirname [exec cygpath --windir]]
1593 set program_files [file join $program_files {Program Files}]
1594 set firefox [file join $program_files {Mozilla Firefox} firefox.exe]
1595 set ie [file join $program_files {Internet Explorer} IEXPLORE.EXE]
1596 if {[file exists $firefox]} {
1597 set browser $firefox
1598 } elseif {[file exists $ie]} {
1601 unset program_files firefox ie
1605 if {[file isfile $doc_path]} {
1606 set doc_url "file:$doc_path"
1608 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
1611 if {$browser ne {}} {
1612 .mbar.help add command -label {Online Documentation} \
1613 -command [list exec $browser $doc_url &]
1615 unset browser doc_path doc_url
1617 # -- Standard bindings
1619 bind . <Destroy> do_quit
1620 bind all <$M1B-Key-q> do_quit
1621 bind all <$M1B-Key-Q> do_quit
1622 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
1623 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
1625 set subcommand_args {}
1627 puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
1631 # -- Not a normal commit type invocation? Do that instead!
1633 switch -- $subcommand {
1635 set subcommand_args {rev?}
1636 switch [llength $argv] {
1638 set current_branch [git symbolic-ref HEAD]
1639 regsub ^refs/((heads|tags|remotes)/)? \
1640 $current_branch {} current_branch
1643 set current_branch [lindex $argv 0]
1647 browser::new $current_branch
1651 set subcommand_args {rev? path?}
1656 if {$is_path || [file exists $_prefix$a]} {
1657 if {$path ne {}} usage
1660 } elseif {$a eq {--}} {
1662 if {$head ne {}} usage
1667 } elseif {$head eq {}} {
1668 if {$head ne {}} usage
1677 set current_branch [git symbolic-ref HEAD]
1678 regsub ^refs/((heads|tags|remotes)/)? \
1679 $current_branch {} current_branch
1681 set current_branch $head
1684 if {$path eq {}} usage
1685 blame::new $head $path
1690 if {[llength $argv] != 0} {
1691 puts -nonewline stderr "usage: $argv0"
1692 if {$subcommand ne {gui} && [appname] ne "git-$subcommand"} {
1693 puts -nonewline stderr " $subcommand"
1698 # fall through to setup UI for commits
1701 puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
1712 -text {Current Branch:} \
1716 -textvariable current_branch \
1719 pack .branch.l1 -side left
1720 pack .branch.cb -side left -fill x
1721 pack .branch -side top -fill x
1723 # -- Main Window Layout
1725 panedwindow .vpane -orient vertical
1726 panedwindow .vpane.files -orient horizontal
1727 .vpane add .vpane.files -sticky nsew -height 100 -width 200
1728 pack .vpane -anchor n -side top -fill both -expand 1
1730 # -- Index File List
1732 frame .vpane.files.index -height 100 -width 200
1733 label .vpane.files.index.title -text {Staged Changes (Will Be Committed)} \
1735 text $ui_index -background white -borderwidth 0 \
1736 -width 20 -height 10 \
1738 -cursor $cursor_ptr \
1739 -xscrollcommand {.vpane.files.index.sx set} \
1740 -yscrollcommand {.vpane.files.index.sy set} \
1742 scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
1743 scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
1744 pack .vpane.files.index.title -side top -fill x
1745 pack .vpane.files.index.sx -side bottom -fill x
1746 pack .vpane.files.index.sy -side right -fill y
1747 pack $ui_index -side left -fill both -expand 1
1748 .vpane.files add .vpane.files.index -sticky nsew
1750 # -- Working Directory File List
1752 frame .vpane.files.workdir -height 100 -width 200
1753 label .vpane.files.workdir.title -text {Unstaged Changes (Will Not Be Committed)} \
1755 text $ui_workdir -background white -borderwidth 0 \
1756 -width 20 -height 10 \
1758 -cursor $cursor_ptr \
1759 -xscrollcommand {.vpane.files.workdir.sx set} \
1760 -yscrollcommand {.vpane.files.workdir.sy set} \
1762 scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
1763 scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
1764 pack .vpane.files.workdir.title -side top -fill x
1765 pack .vpane.files.workdir.sx -side bottom -fill x
1766 pack .vpane.files.workdir.sy -side right -fill y
1767 pack $ui_workdir -side left -fill both -expand 1
1768 .vpane.files add .vpane.files.workdir -sticky nsew
1770 foreach i [list $ui_index $ui_workdir] {
1771 $i tag conf in_diff -font font_uibold
1772 $i tag conf in_sel \
1773 -background [$i cget -foreground] \
1774 -foreground [$i cget -background]
1778 # -- Diff and Commit Area
1780 frame .vpane.lower -height 300 -width 400
1781 frame .vpane.lower.commarea
1782 frame .vpane.lower.diff -relief sunken -borderwidth 1
1783 pack .vpane.lower.commarea -side top -fill x
1784 pack .vpane.lower.diff -side bottom -fill both -expand 1
1785 .vpane add .vpane.lower -sticky nsew
1787 # -- Commit Area Buttons
1789 frame .vpane.lower.commarea.buttons
1790 label .vpane.lower.commarea.buttons.l -text {} \
1793 pack .vpane.lower.commarea.buttons.l -side top -fill x
1794 pack .vpane.lower.commarea.buttons -side left -fill y
1796 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
1798 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
1799 lappend disable_on_lock \
1800 {.vpane.lower.commarea.buttons.rescan conf -state}
1802 button .vpane.lower.commarea.buttons.incall -text {Add Existing} \
1804 pack .vpane.lower.commarea.buttons.incall -side top -fill x
1805 lappend disable_on_lock \
1806 {.vpane.lower.commarea.buttons.incall conf -state}
1808 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
1810 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
1812 button .vpane.lower.commarea.buttons.commit -text {Commit} \
1814 pack .vpane.lower.commarea.buttons.commit -side top -fill x
1815 lappend disable_on_lock \
1816 {.vpane.lower.commarea.buttons.commit conf -state}
1818 # -- Commit Message Buffer
1820 frame .vpane.lower.commarea.buffer
1821 frame .vpane.lower.commarea.buffer.header
1822 set ui_comm .vpane.lower.commarea.buffer.t
1823 set ui_coml .vpane.lower.commarea.buffer.header.l
1824 radiobutton .vpane.lower.commarea.buffer.header.new \
1825 -text {New Commit} \
1826 -command do_select_commit_type \
1827 -variable selected_commit_type \
1829 lappend disable_on_lock \
1830 [list .vpane.lower.commarea.buffer.header.new conf -state]
1831 radiobutton .vpane.lower.commarea.buffer.header.amend \
1832 -text {Amend Last Commit} \
1833 -command do_select_commit_type \
1834 -variable selected_commit_type \
1836 lappend disable_on_lock \
1837 [list .vpane.lower.commarea.buffer.header.amend conf -state]
1841 proc trace_commit_type {varname args} {
1842 global ui_coml commit_type
1843 switch -glob -- $commit_type {
1844 initial {set txt {Initial Commit Message:}}
1845 amend {set txt {Amended Commit Message:}}
1846 amend-initial {set txt {Amended Initial Commit Message:}}
1847 amend-merge {set txt {Amended Merge Commit Message:}}
1848 merge {set txt {Merge Commit Message:}}
1849 * {set txt {Commit Message:}}
1851 $ui_coml conf -text $txt
1853 trace add variable commit_type write trace_commit_type
1854 pack $ui_coml -side left -fill x
1855 pack .vpane.lower.commarea.buffer.header.amend -side right
1856 pack .vpane.lower.commarea.buffer.header.new -side right
1858 text $ui_comm -background white -borderwidth 1 \
1861 -autoseparators true \
1863 -width 75 -height 9 -wrap none \
1865 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
1866 scrollbar .vpane.lower.commarea.buffer.sby \
1867 -command [list $ui_comm yview]
1868 pack .vpane.lower.commarea.buffer.header -side top -fill x
1869 pack .vpane.lower.commarea.buffer.sby -side right -fill y
1870 pack $ui_comm -side left -fill y
1871 pack .vpane.lower.commarea.buffer -side left -fill y
1873 # -- Commit Message Buffer Context Menu
1875 set ctxm .vpane.lower.commarea.buffer.ctxm
1876 menu $ctxm -tearoff 0
1879 -command {tk_textCut $ui_comm}
1882 -command {tk_textCopy $ui_comm}
1885 -command {tk_textPaste $ui_comm}
1888 -command {$ui_comm delete sel.first sel.last}
1891 -label {Select All} \
1892 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
1896 $ui_comm tag add sel 0.0 end
1897 tk_textCopy $ui_comm
1898 $ui_comm tag remove sel 0.0 end
1904 bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
1908 proc trace_current_diff_path {varname args} {
1909 global current_diff_path diff_actions file_states
1910 if {$current_diff_path eq {}} {
1916 set p $current_diff_path
1917 set s [mapdesc [lindex $file_states($p) 0] $p]
1919 set p [escape_path $p]
1923 .vpane.lower.diff.header.status configure -text $s
1924 .vpane.lower.diff.header.file configure -text $f
1925 .vpane.lower.diff.header.path configure -text $p
1926 foreach w $diff_actions {
1930 trace add variable current_diff_path write trace_current_diff_path
1932 frame .vpane.lower.diff.header -background orange
1933 label .vpane.lower.diff.header.status \
1934 -background orange \
1935 -width $max_status_desc \
1938 label .vpane.lower.diff.header.file \
1939 -background orange \
1942 label .vpane.lower.diff.header.path \
1943 -background orange \
1946 pack .vpane.lower.diff.header.status -side left
1947 pack .vpane.lower.diff.header.file -side left
1948 pack .vpane.lower.diff.header.path -fill x
1949 set ctxm .vpane.lower.diff.header.ctxm
1950 menu $ctxm -tearoff 0
1958 -- $current_diff_path
1960 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
1961 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
1965 frame .vpane.lower.diff.body
1966 set ui_diff .vpane.lower.diff.body.t
1967 text $ui_diff -background white -borderwidth 0 \
1968 -width 80 -height 15 -wrap none \
1970 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
1971 -yscrollcommand {.vpane.lower.diff.body.sby set} \
1973 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
1974 -command [list $ui_diff xview]
1975 scrollbar .vpane.lower.diff.body.sby -orient vertical \
1976 -command [list $ui_diff yview]
1977 pack .vpane.lower.diff.body.sbx -side bottom -fill x
1978 pack .vpane.lower.diff.body.sby -side right -fill y
1979 pack $ui_diff -side left -fill both -expand 1
1980 pack .vpane.lower.diff.header -side top -fill x
1981 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
1983 $ui_diff tag conf d_cr -elide true
1984 $ui_diff tag conf d_@ -foreground blue -font font_diffbold
1985 $ui_diff tag conf d_+ -foreground {#00a000}
1986 $ui_diff tag conf d_- -foreground red
1988 $ui_diff tag conf d_++ -foreground {#00a000}
1989 $ui_diff tag conf d_-- -foreground red
1990 $ui_diff tag conf d_+s \
1991 -foreground {#00a000} \
1992 -background {#e2effa}
1993 $ui_diff tag conf d_-s \
1995 -background {#e2effa}
1996 $ui_diff tag conf d_s+ \
1997 -foreground {#00a000} \
1999 $ui_diff tag conf d_s- \
2003 $ui_diff tag conf d<<<<<<< \
2004 -foreground orange \
2006 $ui_diff tag conf d======= \
2007 -foreground orange \
2009 $ui_diff tag conf d>>>>>>> \
2010 -foreground orange \
2013 $ui_diff tag raise sel
2015 # -- Diff Body Context Menu
2017 set ctxm .vpane.lower.diff.body.ctxm
2018 menu $ctxm -tearoff 0
2021 -command reshow_diff
2022 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2025 -command {tk_textCopy $ui_diff}
2026 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2028 -label {Select All} \
2029 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
2030 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2034 $ui_diff tag add sel 0.0 end
2035 tk_textCopy $ui_diff
2036 $ui_diff tag remove sel 0.0 end
2038 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2041 -label {Apply/Reverse Hunk} \
2042 -command {apply_hunk $cursorX $cursorY}
2043 set ui_diff_applyhunk [$ctxm index last]
2044 lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
2047 -label {Decrease Font Size} \
2048 -command {incr_font_size font_diff -1}
2049 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2051 -label {Increase Font Size} \
2052 -command {incr_font_size font_diff 1}
2053 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2056 -label {Show Less Context} \
2057 -command {if {$repo_config(gui.diffcontext) >= 2} {
2058 incr repo_config(gui.diffcontext) -1
2061 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2063 -label {Show More Context} \
2065 incr repo_config(gui.diffcontext)
2068 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2070 $ctxm add command -label {Options...} \
2072 bind_button3 $ui_diff "
2075 if {\$ui_index eq \$current_diff_side} {
2076 $ctxm entryconf $ui_diff_applyhunk -label {Unstage Hunk From Commit}
2078 $ctxm entryconf $ui_diff_applyhunk -label {Stage Hunk For Commit}
2080 tk_popup $ctxm %X %Y
2082 unset ui_diff_applyhunk
2086 label .status -textvariable ui_status_value \
2091 pack .status -anchor w -side bottom -fill x
2096 set gm $repo_config(gui.geometry)
2097 wm geometry . [lindex $gm 0]
2098 .vpane sash place 0 \
2099 [lindex [.vpane sash coord 0] 0] \
2101 .vpane.files sash place 0 \
2103 [lindex [.vpane.files sash coord 0] 1]
2109 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
2110 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
2111 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
2112 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
2113 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
2114 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
2115 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
2116 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
2117 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
2118 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2119 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
2121 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
2122 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
2123 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
2124 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
2125 bind $ui_diff <$M1B-Key-v> {break}
2126 bind $ui_diff <$M1B-Key-V> {break}
2127 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2128 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
2129 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
2130 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
2131 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
2132 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
2133 bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
2134 bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
2135 bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
2136 bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
2137 bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
2138 bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
2139 bind $ui_diff <Button-1> {focus %W}
2141 if {[is_enabled branch]} {
2142 bind . <$M1B-Key-n> do_create_branch
2143 bind . <$M1B-Key-N> do_create_branch
2146 bind all <Key-F5> do_rescan
2147 bind all <$M1B-Key-r> do_rescan
2148 bind all <$M1B-Key-R> do_rescan
2149 bind . <$M1B-Key-s> do_signoff
2150 bind . <$M1B-Key-S> do_signoff
2151 bind . <$M1B-Key-i> do_add_all
2152 bind . <$M1B-Key-I> do_add_all
2153 bind . <$M1B-Key-Return> do_commit
2154 foreach i [list $ui_index $ui_workdir] {
2155 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
2156 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
2157 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
2161 set file_lists($ui_index) [list]
2162 set file_lists($ui_workdir) [list]
2164 wm title . "[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
2165 focus -force $ui_comm
2167 # -- Warn the user about environmental problems. Cygwin's Tcl
2168 # does *not* pass its env array onto any processes it spawns.
2169 # This means that git processes get none of our environment.
2174 set msg "Possible environment issues exist.
2176 The following environment variables are probably
2177 going to be ignored by any Git subprocess run
2181 foreach name [array names env] {
2182 switch -regexp -- $name {
2183 {^GIT_INDEX_FILE$} -
2184 {^GIT_OBJECT_DIRECTORY$} -
2185 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
2187 {^GIT_EXTERNAL_DIFF$} -
2191 {^GIT_CONFIG_LOCAL$} -
2192 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
2193 append msg " - $name\n"
2196 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
2197 append msg " - $name\n"
2199 set suggest_user $name
2203 if {$ignored_env > 0} {
2205 This is due to a known issue with the
2206 Tcl binary distributed by Cygwin."
2208 if {$suggest_user ne {}} {
2211 A good replacement for $suggest_user
2212 is placing values for the user.name and
2213 user.email settings into your personal
2219 unset ignored_env msg suggest_user name
2222 # -- Only initialize complex UI if we are going to stay running.
2224 if {[is_enabled transport]} {
2228 populate_branch_menu
2233 # -- Only suggest a gc run if we are going to stay running.
2235 if {[is_enabled multicommit]} {
2236 set object_limit 2000
2237 if {[is_Windows]} {set object_limit 200}
2238 regexp {^([0-9]+) objects,} [git count-objects] _junk objects_current
2239 if {$objects_current >= $object_limit} {
2241 "This repository currently has $objects_current loose objects.
2243 To maintain optimal performance it is strongly recommended that you compress the database when more than $object_limit loose objects exist.
2245 Compress the database now?"] eq yes} {
2249 unset object_limit _junk objects_current
2252 lock_index begin-read