2 # Tcl ignores the next line -*- tcl -*- \
6 Copyright © 2006 Shawn Pearce, Paul Mackerras.
10 This program is free software; it may be used, copied, modified
11 and distributed under the terms of the GNU General Public Licence,
12 either version 2, or (at your option) any later version.}
14 set appname [lindex [file split $argv0] end]
17 ######################################################################
21 proc is_many_config {name} {
22 switch -glob -- $name {
31 proc load_config {include_global} {
32 global repo_config global_config default_config
34 array unset global_config
35 if {$include_global} {
37 set fd_rc [open "| git repo-config --global --list" r]
38 while {[gets $fd_rc line] >= 0} {
39 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
40 if {[is_many_config $name]} {
41 lappend global_config($name) $value
43 set global_config($name) $value
51 array unset repo_config
53 set fd_rc [open "| git repo-config --list" r]
54 while {[gets $fd_rc line] >= 0} {
55 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
56 if {[is_many_config $name]} {
57 lappend repo_config($name) $value
59 set repo_config($name) $value
66 foreach name [array names default_config] {
67 if {[catch {set v $global_config($name)}]} {
68 set global_config($name) $default_config($name)
70 if {[catch {set v $repo_config($name)}]} {
71 set repo_config($name) $default_config($name)
77 global default_config font_descs
78 global repo_config global_config
79 global repo_config_new global_config_new
81 foreach option $font_descs {
82 set name [lindex $option 0]
83 set font [lindex $option 1]
84 font configure $font \
85 -family $global_config_new(gui.$font^^family) \
86 -size $global_config_new(gui.$font^^size)
87 font configure ${font}bold \
88 -family $global_config_new(gui.$font^^family) \
89 -size $global_config_new(gui.$font^^size)
90 set global_config_new(gui.$name) [font configure $font]
91 unset global_config_new(gui.$font^^family)
92 unset global_config_new(gui.$font^^size)
95 foreach name [array names default_config] {
96 set value $global_config_new($name)
97 if {$value ne $global_config($name)} {
98 if {$value eq $default_config($name)} {
99 catch {exec git repo-config --global --unset $name}
101 regsub -all "\[{}\]" $value {"} value
102 exec git repo-config --global $name $value
104 set global_config($name) $value
105 if {$value eq $repo_config($name)} {
106 catch {exec git repo-config --unset $name}
107 set repo_config($name) $value
112 foreach name [array names default_config] {
113 set value $repo_config_new($name)
114 if {$value ne $repo_config($name)} {
115 if {$value eq $global_config($name)} {
116 catch {exec git repo-config --unset $name}
118 regsub -all "\[{}\]" $value {"} value
119 exec git repo-config $name $value
121 set repo_config($name) $value
126 proc error_popup {msg} {
127 global gitdir appname
132 append title [lindex \
133 [file split [file normalize [file dirname $gitdir]]] \
137 set cmd [list tk_messageBox \
140 -title "$title: error" \
142 if {[winfo ismapped .]} {
143 lappend cmd -parent .
148 proc warn_popup {msg} {
149 global gitdir appname
154 append title [lindex \
155 [file split [file normalize [file dirname $gitdir]]] \
159 set cmd [list tk_messageBox \
162 -title "$title: warning" \
164 if {[winfo ismapped .]} {
165 lappend cmd -parent .
170 proc info_popup {msg} {
171 global gitdir appname
176 append title [lindex \
177 [file split [file normalize [file dirname $gitdir]]] \
189 ######################################################################
193 if { [catch {set gitdir $env(GIT_DIR)}]
194 && [catch {set gitdir [exec git rev-parse --git-dir]} err]} {
195 catch {wm withdraw .}
196 error_popup "Cannot find the git directory:\n\n$err"
199 if {![file isdirectory $gitdir]} {
200 catch {wm withdraw .}
201 error_popup "Git directory not found:\n\n$gitdir"
204 if {[lindex [file split $gitdir] end] ne {.git}} {
205 catch {wm withdraw .}
206 error_popup "Cannot use funny .git directory:\n\n$gitdir"
209 if {[catch {cd [file dirname $gitdir]} err]} {
210 catch {wm withdraw .}
211 error_popup "No working directory [file dirname $gitdir]:\n\n$err"
216 if {$appname eq {git-citool}} {
220 ######################################################################
228 set disable_on_lock [list]
229 set index_lock_type none
231 proc lock_index {type} {
232 global index_lock_type disable_on_lock
234 if {$index_lock_type eq {none}} {
235 set index_lock_type $type
236 foreach w $disable_on_lock {
237 uplevel #0 $w disabled
240 } elseif {$index_lock_type eq "begin-$type"} {
241 set index_lock_type $type
247 proc unlock_index {} {
248 global index_lock_type disable_on_lock
250 set index_lock_type none
251 foreach w $disable_on_lock {
256 ######################################################################
260 proc repository_state {ctvar hdvar mhvar} {
262 upvar $ctvar ct $hdvar hd $mhvar mh
266 if {[catch {set hd [exec git rev-parse --verify HEAD]}]} {
272 set merge_head [file join $gitdir MERGE_HEAD]
273 if {[file exists $merge_head]} {
275 set fd_mh [open $merge_head r]
276 while {[gets $fd_mh line] >= 0} {
287 global PARENT empty_tree
289 set p [lindex $PARENT 0]
293 if {$empty_tree eq {}} {
294 set empty_tree [exec git mktree << {}]
299 proc rescan {after} {
300 global HEAD PARENT MERGE_HEAD commit_type
301 global ui_index ui_other ui_status_value ui_comm
302 global rescan_active file_states
305 if {$rescan_active > 0 || ![lock_index read]} return
307 repository_state newType newHEAD newMERGE_HEAD
308 if {[string match amend* $commit_type]
309 && $newType eq {normal}
310 && $newHEAD eq $HEAD} {
314 set MERGE_HEAD $newMERGE_HEAD
315 set commit_type $newType
318 array unset file_states
320 if {![$ui_comm edit modified]
321 || [string trim [$ui_comm get 0.0 end]] eq {}} {
322 if {[load_message GITGUI_MSG]} {
323 } elseif {[load_message MERGE_MSG]} {
324 } elseif {[load_message SQUASH_MSG]} {
327 $ui_comm edit modified false
330 if {$repo_config(gui.trustmtime) eq {true}} {
331 rescan_stage2 {} $after
334 set ui_status_value {Refreshing file status...}
335 set cmd [list git update-index]
337 lappend cmd --unmerged
338 lappend cmd --ignore-missing
339 lappend cmd --refresh
340 set fd_rf [open "| $cmd" r]
341 fconfigure $fd_rf -blocking 0 -translation binary
342 fileevent $fd_rf readable \
343 [list rescan_stage2 $fd_rf $after]
347 proc rescan_stage2 {fd after} {
348 global gitdir ui_status_value
349 global rescan_active buf_rdi buf_rdf buf_rlo
353 if {![eof $fd]} return
357 set ls_others [list | git ls-files --others -z \
358 --exclude-per-directory=.gitignore]
359 set info_exclude [file join $gitdir info exclude]
360 if {[file readable $info_exclude]} {
361 lappend ls_others "--exclude-from=$info_exclude"
369 set ui_status_value {Scanning for modified files ...}
370 set fd_di [open "| git diff-index --cached -z [PARENT]" r]
371 set fd_df [open "| git diff-files -z" r]
372 set fd_lo [open $ls_others r]
374 fconfigure $fd_di -blocking 0 -translation binary
375 fconfigure $fd_df -blocking 0 -translation binary
376 fconfigure $fd_lo -blocking 0 -translation binary
377 fileevent $fd_di readable [list read_diff_index $fd_di $after]
378 fileevent $fd_df readable [list read_diff_files $fd_df $after]
379 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
382 proc load_message {file} {
383 global gitdir ui_comm
385 set f [file join $gitdir $file]
386 if {[file isfile $f]} {
387 if {[catch {set fd [open $f r]}]} {
390 set content [string trim [read $fd]]
392 $ui_comm delete 0.0 end
393 $ui_comm insert end $content
399 proc read_diff_index {fd after} {
402 append buf_rdi [read $fd]
404 set n [string length $buf_rdi]
406 set z1 [string first "\0" $buf_rdi $c]
409 set z2 [string first "\0" $buf_rdi $z1]
413 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
415 [string range $buf_rdi $z1 [expr {$z2 - 1}]] \
417 [list [lindex $i 0] [lindex $i 2]] \
423 set buf_rdi [string range $buf_rdi $c end]
428 rescan_done $fd buf_rdi $after
431 proc read_diff_files {fd after} {
434 append buf_rdf [read $fd]
436 set n [string length $buf_rdf]
438 set z1 [string first "\0" $buf_rdf $c]
441 set z2 [string first "\0" $buf_rdf $z1]
445 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
447 [string range $buf_rdf $z1 [expr {$z2 - 1}]] \
450 [list [lindex $i 0] [lindex $i 2]]
455 set buf_rdf [string range $buf_rdf $c end]
460 rescan_done $fd buf_rdf $after
463 proc read_ls_others {fd after} {
466 append buf_rlo [read $fd]
467 set pck [split $buf_rlo "\0"]
468 set buf_rlo [lindex $pck end]
469 foreach p [lrange $pck 0 end-1] {
472 rescan_done $fd buf_rlo $after
475 proc rescan_done {fd buf after} {
477 global file_states repo_config
480 if {![eof $fd]} return
483 if {[incr rescan_active -1] > 0} return
489 if {$repo_config(gui.partialinclude) ne {true}} {
491 foreach path [array names file_states] {
492 switch -- [lindex $file_states($path) 0] {
494 MM {lappend pathList $path}
497 if {$pathList ne {}} {
499 "Updating included files" \
501 [concat {reshow_diff;} $after]
510 proc prune_selection {} {
511 global file_states selected_paths
513 foreach path [array names selected_paths] {
514 if {[catch {set still_here $file_states($path)}]} {
515 unset selected_paths($path)
520 ######################################################################
525 global ui_diff current_diff ui_index ui_other
527 $ui_diff conf -state normal
528 $ui_diff delete 0.0 end
529 $ui_diff conf -state disabled
533 $ui_index tag remove in_diff 0.0 end
534 $ui_other tag remove in_diff 0.0 end
537 proc reshow_diff {} {
538 global current_diff ui_status_value file_states
540 if {$current_diff eq {}
541 || [catch {set s $file_states($current_diff)}]} {
544 show_diff $current_diff
548 proc handle_empty_diff {} {
549 global current_diff file_states file_lists
551 set path $current_diff
552 set s $file_states($path)
553 if {[lindex $s 0] ne {_M}} return
555 info_popup "No differences detected.
557 [short_path $path] has no changes.
559 The modification date of this file was updated
560 by another application and you currently have
561 the Trust File Modification Timestamps option
562 enabled, so Git did not automatically detect
563 that there are no content differences in this
566 This file will now be removed from the modified
567 files list, to prevent possible confusion.
569 if {[catch {exec git update-index -- $path} err]} {
570 error_popup "Failed to refresh index:\n\n$err"
574 set old_w [mapcol [lindex $file_states($path) 0] $path]
575 set lno [lsearch -sorted $file_lists($old_w) $path]
577 set file_lists($old_w) \
578 [lreplace $file_lists($old_w) $lno $lno]
580 $old_w conf -state normal
581 $old_w delete $lno.0 [expr {$lno + 1}].0
582 $old_w conf -state disabled
586 proc show_diff {path {w {}} {lno {}}} {
587 global file_states file_lists
588 global is_3way_diff diff_active repo_config
589 global ui_diff current_diff ui_status_value
591 if {$diff_active || ![lock_index read]} return
594 if {$w eq {} || $lno == {}} {
595 foreach w [array names file_lists] {
596 set lno [lsearch -sorted $file_lists($w) $path]
603 if {$w ne {} && $lno >= 1} {
604 $w tag add in_diff $lno.0 [expr {$lno + 1}].0
607 set s $file_states($path)
611 set current_diff $path
612 set ui_status_value "Loading diff of [escape_path $path]..."
614 set cmd [list | git diff-index]
615 lappend cmd --no-color
616 if {$repo_config(gui.diffcontext) > 0} {
617 lappend cmd "-U$repo_config(gui.diffcontext)"
627 set fd [open $path r]
628 set content [read $fd]
633 set ui_status_value "Unable to display [escape_path $path]"
634 error_popup "Error loading file:\n\n$err"
637 $ui_diff conf -state normal
638 $ui_diff insert end $content
639 $ui_diff conf -state disabled
642 set ui_status_value {Ready.}
651 if {[catch {set fd [open $cmd r]} err]} {
654 set ui_status_value "Unable to display [escape_path $path]"
655 error_popup "Error loading diff:\n\n$err"
659 fconfigure $fd -blocking 0 -translation auto
660 fileevent $fd readable [list read_diff $fd]
663 proc read_diff {fd} {
664 global ui_diff ui_status_value is_3way_diff diff_active
667 $ui_diff conf -state normal
668 while {[gets $fd line] >= 0} {
669 # -- Cleanup uninteresting diff header lines.
671 if {[string match {diff --git *} $line]} continue
672 if {[string match {diff --combined *} $line]} continue
673 if {[string match {--- *} $line]} continue
674 if {[string match {+++ *} $line]} continue
675 if {$line eq {deleted file mode 120000}} {
676 set line "deleted symlink"
679 # -- Automatically detect if this is a 3 way diff.
681 if {[string match {@@@ *} $line]} {set is_3way_diff 1}
683 # -- Reformat a 3 way diff, 'cause its too weird.
686 set op [string range $line 0 1]
689 {++} {set tags d_+ ; set op { +}}
690 {--} {set tags d_- ; set op { -}}
691 { +} {set tags d_++; set op {++}}
692 { -} {set tags d_--; set op {--}}
693 {+ } {set tags d_-+; set op {-+}}
694 {- } {set tags d_+-; set op {+-}}
695 default {set tags {}}
697 set line [string replace $line 0 1 $op]
699 switch -- [string index $line 0] {
703 default {set tags {}}
706 $ui_diff insert end $line $tags
707 $ui_diff insert end "\n" $tags
709 $ui_diff conf -state disabled
715 set ui_status_value {Ready.}
717 if {$repo_config(gui.trustmtime) eq {true}
718 && [$ui_diff index end] eq {2.0}} {
724 ######################################################################
728 proc load_last_commit {} {
729 global HEAD PARENT MERGE_HEAD commit_type ui_comm
731 if {[llength $PARENT] == 0} {
732 error_popup {There is nothing to amend.
734 You are about to create the initial commit.
735 There is no commit before this to amend.
740 repository_state curType curHEAD curMERGE_HEAD
741 if {$curType eq {merge}} {
742 error_popup {Cannot amend while merging.
744 You are currently in the middle of a merge that
745 has not been fully completed. You cannot amend
746 the prior commit unless you first abort the
747 current merge activity.
755 set fd [open "| git cat-file commit $curHEAD" r]
756 while {[gets $fd line] > 0} {
757 if {[string match {parent *} $line]} {
758 lappend parents [string range $line 7 end]
761 set msg [string trim [read $fd]]
764 error_popup "Error loading commit data for amend:\n\n$err"
770 set MERGE_HEAD [list]
771 switch -- [llength $parents] {
772 0 {set commit_type amend-initial}
773 1 {set commit_type amend}
774 default {set commit_type amend-merge}
777 $ui_comm delete 0.0 end
778 $ui_comm insert end $msg
780 $ui_comm edit modified false
781 rescan {set ui_status_value {Ready.}}
784 proc create_new_commit {} {
785 global commit_type ui_comm
787 set commit_type normal
788 $ui_comm delete 0.0 end
790 $ui_comm edit modified false
791 rescan {set ui_status_value {Ready.}}
794 set GIT_COMMITTER_IDENT {}
796 proc committer_ident {} {
797 global GIT_COMMITTER_IDENT
799 if {$GIT_COMMITTER_IDENT eq {}} {
800 if {[catch {set me [exec git var GIT_COMMITTER_IDENT]} err]} {
801 error_popup "Unable to obtain your identity:\n\n$err"
804 if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \
805 $me me GIT_COMMITTER_IDENT]} {
806 error_popup "Invalid GIT_COMMITTER_IDENT:\n\n$me"
811 return $GIT_COMMITTER_IDENT
814 proc commit_tree {} {
815 global HEAD commit_type file_states ui_comm repo_config
817 if {![lock_index update]} return
818 if {[committer_ident] eq {}} return
820 # -- Our in memory state should match the repository.
822 repository_state curType curHEAD curMERGE_HEAD
823 if {[string match amend* $commit_type]
824 && $curType eq {normal}
825 && $curHEAD eq $HEAD} {
826 } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
827 info_popup {Last scanned state does not match repository state.
829 Another Git program has modified this repository
830 since the last scan. A rescan must be performed
831 before another commit can be created.
833 The rescan will be automatically started now.
836 rescan {set ui_status_value {Ready.}}
840 # -- At least one file should differ in the index.
843 foreach path [array names file_states] {
844 switch -glob -- [lindex $file_states($path) 0] {
848 M? {set files_ready 1; break}
850 error_popup "Unmerged files cannot be committed.
852 File [short_path $path] has merge conflicts.
853 You must resolve them and include the file before committing.
859 error_popup "Unknown file state [lindex $s 0] detected.
861 File [short_path $path] cannot be committed by this program.
867 error_popup {No included files to commit.
869 You must include at least 1 file before you can commit.
875 # -- A message is required.
877 set msg [string trim [$ui_comm get 1.0 end]]
879 error_popup {Please supply a commit message.
881 A good commit message has the following format:
883 - First line: Describe in one sentance what you did.
885 - Remaining lines: Describe why this change is good.
891 # -- Update included files if partialincludes are off.
893 if {$repo_config(gui.partialinclude) ne {true}} {
895 foreach path [array names file_states] {
896 switch -glob -- [lindex $file_states($path) 0] {
898 M? {lappend pathList $path}
901 if {$pathList ne {}} {
904 "Updating included files" \
906 [concat {lock_index update;} \
907 [list commit_prehook $curHEAD $msg]]
912 commit_prehook $curHEAD $msg
915 proc commit_prehook {curHEAD msg} {
916 global gitdir ui_status_value pch_error
918 set pchook [file join $gitdir hooks pre-commit]
920 # On Cygwin [file executable] might lie so we need to ask
921 # the shell if the hook is executable. Yes that's annoying.
923 if {[is_Windows] && [file isfile $pchook]} {
924 set pchook [list sh -c [concat \
925 "if test -x \"$pchook\";" \
926 "then exec \"$pchook\" 2>&1;" \
928 } elseif {[file executable $pchook]} {
929 set pchook [list $pchook |& cat]
931 commit_writetree $curHEAD $msg
935 set ui_status_value {Calling pre-commit hook...}
937 set fd_ph [open "| $pchook" r]
938 fconfigure $fd_ph -blocking 0 -translation binary
939 fileevent $fd_ph readable \
940 [list commit_prehook_wait $fd_ph $curHEAD $msg]
943 proc commit_prehook_wait {fd_ph curHEAD msg} {
944 global pch_error ui_status_value
946 append pch_error [read $fd_ph]
947 fconfigure $fd_ph -blocking 1
949 if {[catch {close $fd_ph}]} {
950 set ui_status_value {Commit declined by pre-commit hook.}
951 hook_failed_popup pre-commit $pch_error
954 commit_writetree $curHEAD $msg
959 fconfigure $fd_ph -blocking 0
962 proc commit_writetree {curHEAD msg} {
963 global ui_status_value
965 set ui_status_value {Committing changes...}
966 set fd_wt [open "| git write-tree" r]
967 fileevent $fd_wt readable \
968 [list commit_committree $fd_wt $curHEAD $msg]
971 proc commit_committree {fd_wt curHEAD msg} {
972 global HEAD PARENT MERGE_HEAD commit_type
973 global single_commit gitdir
974 global ui_status_value ui_comm selected_commit_type
975 global file_states selected_paths rescan_active
978 if {$tree_id eq {} || [catch {close $fd_wt} err]} {
979 error_popup "write-tree failed:\n\n$err"
980 set ui_status_value {Commit failed.}
985 # -- Create the commit.
987 set cmd [list git commit-tree $tree_id]
988 set parents [concat $PARENT $MERGE_HEAD]
989 if {[llength $parents] > 0} {
994 # git commit-tree writes to stderr during initial commit.
995 lappend cmd 2>/dev/null
998 if {[catch {set cmt_id [eval exec $cmd]} err]} {
999 error_popup "commit-tree failed:\n\n$err"
1000 set ui_status_value {Commit failed.}
1005 # -- Update the HEAD ref.
1008 if {$commit_type ne {normal}} {
1009 append reflogm " ($commit_type)"
1011 set i [string first "\n" $msg]
1013 append reflogm {: } [string range $msg 0 [expr {$i - 1}]]
1015 append reflogm {: } $msg
1017 set cmd [list git update-ref -m $reflogm HEAD $cmt_id $curHEAD]
1018 if {[catch {eval exec $cmd} err]} {
1019 error_popup "update-ref failed:\n\n$err"
1020 set ui_status_value {Commit failed.}
1025 # -- Cleanup after ourselves.
1027 catch {file delete [file join $gitdir MERGE_HEAD]}
1028 catch {file delete [file join $gitdir MERGE_MSG]}
1029 catch {file delete [file join $gitdir SQUASH_MSG]}
1030 catch {file delete [file join $gitdir GITGUI_MSG]}
1032 # -- Let rerere do its thing.
1034 if {[file isdirectory [file join $gitdir rr-cache]]} {
1035 catch {exec git rerere}
1038 # -- Run the post-commit hook.
1040 set pchook [file join $gitdir hooks post-commit]
1041 if {[is_Windows] && [file isfile $pchook]} {
1042 set pchook [list sh -c [concat \
1043 "if test -x \"$pchook\";" \
1044 "then exec \"$pchook\";" \
1046 } elseif {![file executable $pchook]} {
1049 if {$pchook ne {}} {
1050 catch {exec $pchook &}
1053 $ui_comm delete 0.0 end
1055 $ui_comm edit modified false
1057 if {$single_commit} do_quit
1059 # -- Update in memory status
1061 set selected_commit_type new
1062 set commit_type normal
1065 set MERGE_HEAD [list]
1067 foreach path [array names file_states] {
1068 set s $file_states($path)
1070 switch -glob -- $m {
1078 unset file_states($path)
1079 catch {unset selected_paths($path)}
1082 set file_states($path) [list _O [lindex $s 1] {} {}]
1088 set file_states($path) [list \
1089 _[string index $m 1] \
1100 set ui_status_value \
1101 "Changes committed as [string range $cmt_id 0 7]."
1104 ######################################################################
1108 proc fetch_from {remote} {
1109 set w [new_console "fetch $remote" \
1110 "Fetching new changes from $remote"]
1111 set cmd [list git fetch]
1113 console_exec $w $cmd
1116 proc pull_remote {remote branch} {
1117 global HEAD commit_type file_states repo_config
1119 if {![lock_index update]} return
1121 # -- Our in memory state should match the repository.
1123 repository_state curType curHEAD curMERGE_HEAD
1124 if {$commit_type ne $curType || $HEAD ne $curHEAD} {
1125 info_popup {Last scanned state does not match repository state.
1127 Another Git program has modified this repository
1128 since the last scan. A rescan must be performed
1129 before a pull operation can be started.
1131 The rescan will be automatically started now.
1134 rescan {set ui_status_value {Ready.}}
1138 # -- No differences should exist before a pull.
1140 if {[array size file_states] != 0} {
1141 error_popup {Uncommitted but modified files are present.
1143 You should not perform a pull with unmodified
1144 files in your working directory as Git will be
1145 unable to recover from an incorrect merge.
1147 You should commit or revert all changes before
1148 starting a pull operation.
1154 set w [new_console "pull $remote $branch" \
1155 "Pulling new changes from branch $branch in $remote"]
1156 set cmd [list git pull]
1157 if {$repo_config(gui.pullsummary) eq {false}} {
1158 lappend cmd --no-summary
1162 console_exec $w $cmd [list post_pull_remote $remote $branch]
1165 proc post_pull_remote {remote branch success} {
1166 global HEAD PARENT MERGE_HEAD commit_type selected_commit_type
1167 global ui_status_value
1171 repository_state commit_type HEAD MERGE_HEAD
1173 set selected_commit_type new
1174 set ui_status_value "Pulling $branch from $remote complete."
1176 rescan [list set ui_status_value \
1177 "Conflicts detected while pulling $branch from $remote."]
1181 proc push_to {remote} {
1182 set w [new_console "push $remote" \
1183 "Pushing changes to $remote"]
1184 set cmd [list git push]
1186 console_exec $w $cmd
1189 ######################################################################
1193 proc mapcol {state path} {
1194 global all_cols ui_other
1196 if {[catch {set r $all_cols($state)}]} {
1197 puts "error: no column for state={$state} $path"
1203 proc mapicon {state path} {
1206 if {[catch {set r $all_icons($state)}]} {
1207 puts "error: no icon for state={$state} $path"
1213 proc mapdesc {state path} {
1216 if {[catch {set r $all_descs($state)}]} {
1217 puts "error: no desc for state={$state} $path"
1223 proc escape_path {path} {
1224 regsub -all "\n" $path "\\n" path
1228 proc short_path {path} {
1229 return [escape_path [lindex [file split $path] end]]
1233 set null_sha1 [string repeat 0 40]
1235 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1236 global file_states next_icon_id null_sha1
1238 set s0 [string index $new_state 0]
1239 set s1 [string index $new_state 1]
1241 if {[catch {set info $file_states($path)}]} {
1243 set icon n[incr next_icon_id]
1245 set state [lindex $info 0]
1246 set icon [lindex $info 1]
1247 if {$head_info eq {}} {set head_info [lindex $info 2]}
1248 if {$index_info eq {}} {set index_info [lindex $info 3]}
1251 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1252 elseif {$s0 eq {_}} {set s0 _}
1254 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1255 elseif {$s1 eq {_}} {set s1 _}
1257 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1258 set head_info [list 0 $null_sha1]
1259 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1260 && $head_info eq {}} {
1261 set head_info $index_info
1264 set file_states($path) [list $s0$s1 $icon \
1265 $head_info $index_info \
1270 proc display_file {path state} {
1271 global file_states file_lists selected_paths
1273 set old_m [merge_state $path $state]
1274 set s $file_states($path)
1275 set new_m [lindex $s 0]
1276 set new_w [mapcol $new_m $path]
1277 set old_w [mapcol $old_m $path]
1278 set new_icon [mapicon $new_m $path]
1280 if {$new_w ne $old_w} {
1281 set lno [lsearch -sorted $file_lists($old_w) $path]
1284 $old_w conf -state normal
1285 $old_w delete $lno.0 [expr {$lno + 1}].0
1286 $old_w conf -state disabled
1289 lappend file_lists($new_w) $path
1290 set file_lists($new_w) [lsort $file_lists($new_w)]
1291 set lno [lsearch -sorted $file_lists($new_w) $path]
1293 $new_w conf -state normal
1294 $new_w image create $lno.0 \
1295 -align center -padx 5 -pady 1 \
1296 -name [lindex $s 1] \
1298 $new_w insert $lno.1 "[escape_path $path]\n"
1299 if {[catch {set in_sel $selected_paths($path)}]} {
1303 $new_w tag add in_sel $lno.0 [expr {$lno + 1}].0
1305 $new_w conf -state disabled
1306 } elseif {$new_icon ne [mapicon $old_m $path]} {
1307 $new_w conf -state normal
1308 $new_w image conf [lindex $s 1] -image $new_icon
1309 $new_w conf -state disabled
1313 proc display_all_files {} {
1314 global ui_index ui_other
1315 global file_states file_lists
1316 global last_clicked selected_paths
1318 $ui_index conf -state normal
1319 $ui_other conf -state normal
1321 $ui_index delete 0.0 end
1322 $ui_other delete 0.0 end
1325 set file_lists($ui_index) [list]
1326 set file_lists($ui_other) [list]
1328 foreach path [lsort [array names file_states]] {
1329 set s $file_states($path)
1331 set w [mapcol $m $path]
1332 lappend file_lists($w) $path
1333 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1334 $w image create end \
1335 -align center -padx 5 -pady 1 \
1336 -name [lindex $s 1] \
1337 -image [mapicon $m $path]
1338 $w insert end "[escape_path $path]\n"
1339 if {[catch {set in_sel $selected_paths($path)}]} {
1343 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
1347 $ui_index conf -state disabled
1348 $ui_other conf -state disabled
1351 proc update_indexinfo {msg pathList after} {
1352 global update_index_cp ui_status_value
1354 if {![lock_index update]} return
1356 set update_index_cp 0
1357 set pathList [lsort $pathList]
1358 set totalCnt [llength $pathList]
1359 set batch [expr {int($totalCnt * .01) + 1}]
1360 if {$batch > 25} {set batch 25}
1362 set ui_status_value [format \
1363 "$msg... %i/%i files (%.2f%%)" \
1367 set fd [open "| git update-index -z --index-info" w]
1373 fileevent $fd writable [list \
1374 write_update_indexinfo \
1384 proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
1385 global update_index_cp ui_status_value
1386 global file_states current_diff
1388 if {$update_index_cp >= $totalCnt} {
1395 for {set i $batch} \
1396 {$update_index_cp < $totalCnt && $i > 0} \
1398 set path [lindex $pathList $update_index_cp]
1399 incr update_index_cp
1401 set s $file_states($path)
1402 switch -glob -- [lindex $s 0] {
1408 set info [lindex $s 2]
1409 if {$info eq {}} continue
1411 puts -nonewline $fd $info
1412 puts -nonewline $fd "\t"
1413 puts -nonewline $fd $path
1414 puts -nonewline $fd "\0"
1415 display_file $path $new
1418 set ui_status_value [format \
1419 "$msg... %i/%i files (%.2f%%)" \
1422 [expr {100.0 * $update_index_cp / $totalCnt}]]
1425 proc update_index {msg pathList after} {
1426 global update_index_cp ui_status_value
1428 if {![lock_index update]} return
1430 set update_index_cp 0
1431 set pathList [lsort $pathList]
1432 set totalCnt [llength $pathList]
1433 set batch [expr {int($totalCnt * .01) + 1}]
1434 if {$batch > 25} {set batch 25}
1436 set ui_status_value [format \
1437 "$msg... %i/%i files (%.2f%%)" \
1441 set fd [open "| git update-index --add --remove -z --stdin" w]
1447 fileevent $fd writable [list \
1448 write_update_index \
1458 proc write_update_index {fd pathList totalCnt batch msg after} {
1459 global update_index_cp ui_status_value
1460 global file_states current_diff
1462 if {$update_index_cp >= $totalCnt} {
1469 for {set i $batch} \
1470 {$update_index_cp < $totalCnt && $i > 0} \
1472 set path [lindex $pathList $update_index_cp]
1473 incr update_index_cp
1475 switch -glob -- [lindex $file_states($path) 0] {
1491 puts -nonewline $fd $path
1492 puts -nonewline $fd "\0"
1493 display_file $path $new
1496 set ui_status_value [format \
1497 "$msg... %i/%i files (%.2f%%)" \
1500 [expr {100.0 * $update_index_cp / $totalCnt}]]
1503 ######################################################################
1505 ## remote management
1507 proc load_all_remotes {} {
1508 global gitdir all_remotes repo_config
1510 set all_remotes [list]
1511 set rm_dir [file join $gitdir remotes]
1512 if {[file isdirectory $rm_dir]} {
1513 set all_remotes [concat $all_remotes [glob \
1517 -directory $rm_dir *]]
1520 foreach line [array names repo_config remote.*.url] {
1521 if {[regexp ^remote\.(.*)\.url\$ $line line name]} {
1522 lappend all_remotes $name
1526 set all_remotes [lsort -unique $all_remotes]
1529 proc populate_fetch_menu {m} {
1530 global gitdir all_remotes repo_config
1532 foreach r $all_remotes {
1534 if {![catch {set a $repo_config(remote.$r.url)}]} {
1535 if {![catch {set a $repo_config(remote.$r.fetch)}]} {
1540 set fd [open [file join $gitdir remotes $r] r]
1541 while {[gets $fd n] >= 0} {
1542 if {[regexp {^Pull:[ \t]*([^:]+):} $n]} {
1553 -label "Fetch from $r..." \
1554 -command [list fetch_from $r] \
1560 proc populate_push_menu {m} {
1561 global gitdir all_remotes repo_config
1563 foreach r $all_remotes {
1565 if {![catch {set a $repo_config(remote.$r.url)}]} {
1566 if {![catch {set a $repo_config(remote.$r.push)}]} {
1571 set fd [open [file join $gitdir remotes $r] r]
1572 while {[gets $fd n] >= 0} {
1573 if {[regexp {^Push:[ \t]*([^:]+):} $n]} {
1584 -label "Push to $r..." \
1585 -command [list push_to $r] \
1591 proc populate_pull_menu {m} {
1592 global gitdir repo_config all_remotes disable_on_lock
1594 foreach remote $all_remotes {
1596 if {[array get repo_config remote.$remote.url] ne {}} {
1597 if {[array get repo_config remote.$remote.fetch] ne {}} {
1598 regexp {^([^:]+):} \
1599 [lindex $repo_config(remote.$remote.fetch) 0] \
1604 set fd [open [file join $gitdir remotes $remote] r]
1605 while {[gets $fd line] >= 0} {
1606 if {[regexp {^Pull:[ \t]*([^:]+):} $line line rb]} {
1615 regsub ^refs/heads/ $rb {} rb_short
1616 if {$rb_short ne {}} {
1618 -label "Branch $rb_short from $remote..." \
1619 -command [list pull_remote $remote $rb] \
1621 lappend disable_on_lock \
1622 [list $m entryconf [$m index last] -state]
1627 ######################################################################
1632 #define mask_width 14
1633 #define mask_height 15
1634 static unsigned char mask_bits[] = {
1635 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1636 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1637 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1640 image create bitmap file_plain -background white -foreground black -data {
1641 #define plain_width 14
1642 #define plain_height 15
1643 static unsigned char plain_bits[] = {
1644 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1645 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1646 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1647 } -maskdata $filemask
1649 image create bitmap file_mod -background white -foreground blue -data {
1650 #define mod_width 14
1651 #define mod_height 15
1652 static unsigned char mod_bits[] = {
1653 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1654 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1655 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1656 } -maskdata $filemask
1658 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1659 #define file_fulltick_width 14
1660 #define file_fulltick_height 15
1661 static unsigned char file_fulltick_bits[] = {
1662 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1663 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1664 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1665 } -maskdata $filemask
1667 image create bitmap file_parttick -background white -foreground "#005050" -data {
1668 #define parttick_width 14
1669 #define parttick_height 15
1670 static unsigned char parttick_bits[] = {
1671 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1672 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1673 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1674 } -maskdata $filemask
1676 image create bitmap file_question -background white -foreground black -data {
1677 #define file_question_width 14
1678 #define file_question_height 15
1679 static unsigned char file_question_bits[] = {
1680 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1681 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1682 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1683 } -maskdata $filemask
1685 image create bitmap file_removed -background white -foreground red -data {
1686 #define file_removed_width 14
1687 #define file_removed_height 15
1688 static unsigned char file_removed_bits[] = {
1689 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1690 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1691 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1692 } -maskdata $filemask
1694 image create bitmap file_merge -background white -foreground blue -data {
1695 #define file_merge_width 14
1696 #define file_merge_height 15
1697 static unsigned char file_merge_bits[] = {
1698 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1699 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1700 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1701 } -maskdata $filemask
1703 set ui_index .vpane.files.index.list
1704 set ui_other .vpane.files.other.list
1705 set max_status_desc 0
1707 {__ i plain "Unmodified"}
1708 {_M i mod "Modified"}
1709 {M_ i fulltick "Included in commit"}
1710 {MM i parttick "Partially included"}
1712 {_O o plain "Untracked"}
1713 {A_ o fulltick "Added by commit"}
1714 {AM o parttick "Partially added"}
1715 {AD o question "Added (but now gone)"}
1717 {_D i question "Missing"}
1718 {DD i removed "Removed by commit"}
1719 {DO i removed "Removed (still exists)"}
1720 {DM i removed "Removed (but modified)"}
1722 {UD i merge "Merge conflicts"}
1723 {UM i merge "Merge conflicts"}
1724 {U_ i merge "Merge conflicts"}
1726 if {$max_status_desc < [string length [lindex $i 3]]} {
1727 set max_status_desc [string length [lindex $i 3]]
1729 if {[lindex $i 1] eq {i}} {
1730 set all_cols([lindex $i 0]) $ui_index
1732 set all_cols([lindex $i 0]) $ui_other
1734 set all_icons([lindex $i 0]) file_[lindex $i 2]
1735 set all_descs([lindex $i 0]) [lindex $i 3]
1739 ######################################################################
1744 global tcl_platform tk_library
1745 if {[tk windowingsystem] eq {aqua}} {
1751 proc is_Windows {} {
1753 if {$tcl_platform(platform) eq {windows}} {
1759 proc bind_button3 {w cmd} {
1760 bind $w <Any-Button-3> $cmd
1762 bind $w <Control-Button-1> $cmd
1766 proc incr_font_size {font {amt 1}} {
1767 set sz [font configure $font -size]
1769 font configure $font -size $sz
1770 font configure ${font}bold -size $sz
1773 proc hook_failed_popup {hook msg} {
1774 global gitdir appname
1780 label $w.m.l1 -text "$hook hook failed:" \
1785 -background white -borderwidth 1 \
1787 -width 80 -height 10 \
1789 -yscrollcommand [list $w.m.sby set]
1791 -text {You must correct the above errors before committing.} \
1795 scrollbar $w.m.sby -command [list $w.m.t yview]
1796 pack $w.m.l1 -side top -fill x
1797 pack $w.m.l2 -side bottom -fill x
1798 pack $w.m.sby -side right -fill y
1799 pack $w.m.t -side left -fill both -expand 1
1800 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
1802 $w.m.t insert 1.0 $msg
1803 $w.m.t conf -state disabled
1805 button $w.ok -text OK \
1808 -command "destroy $w"
1809 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
1811 bind $w <Visibility> "grab $w; focus $w"
1812 bind $w <Key-Return> "destroy $w"
1813 wm title $w "$appname ([lindex [file split \
1814 [file normalize [file dirname $gitdir]]] \
1819 set next_console_id 0
1821 proc new_console {short_title long_title} {
1822 global next_console_id console_data
1823 set w .console[incr next_console_id]
1824 set console_data($w) [list $short_title $long_title]
1825 return [console_init $w]
1828 proc console_init {w} {
1829 global console_cr console_data
1830 global gitdir appname M1B
1832 set console_cr($w) 1.0
1835 label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
1840 -background white -borderwidth 1 \
1842 -width 80 -height 10 \
1845 -yscrollcommand [list $w.m.sby set]
1846 label $w.m.s -text {Working... please wait...} \
1850 scrollbar $w.m.sby -command [list $w.m.t yview]
1851 pack $w.m.l1 -side top -fill x
1852 pack $w.m.s -side bottom -fill x
1853 pack $w.m.sby -side right -fill y
1854 pack $w.m.t -side left -fill both -expand 1
1855 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
1857 menu $w.ctxm -tearoff 0
1858 $w.ctxm add command -label "Copy" \
1860 -command "tk_textCopy $w.m.t"
1861 $w.ctxm add command -label "Select All" \
1863 -command "$w.m.t tag add sel 0.0 end"
1864 $w.ctxm add command -label "Copy All" \
1867 $w.m.t tag add sel 0.0 end
1869 $w.m.t tag remove sel 0.0 end
1872 button $w.ok -text {Close} \
1875 -command "destroy $w"
1876 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
1878 bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
1879 bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
1880 bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
1881 bind $w <Visibility> "focus $w"
1882 wm title $w "$appname ([lindex [file split \
1883 [file normalize [file dirname $gitdir]]] \
1884 end]): [lindex $console_data($w) 0]"
1888 proc console_exec {w cmd {after {}}} {
1889 # -- Windows tosses the enviroment when we exec our child.
1890 # But most users need that so we have to relogin. :-(
1893 set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
1896 # -- Tcl won't let us redirect both stdout and stderr to
1897 # the same pipe. So pass it through cat...
1899 set cmd [concat | $cmd |& cat]
1901 set fd_f [open $cmd r]
1902 fconfigure $fd_f -blocking 0 -translation binary
1903 fileevent $fd_f readable [list console_read $w $fd_f $after]
1906 proc console_read {w fd after} {
1907 global console_cr console_data
1911 if {![winfo exists $w]} {console_init $w}
1912 $w.m.t conf -state normal
1914 set n [string length $buf]
1916 set cr [string first "\r" $buf $c]
1917 set lf [string first "\n" $buf $c]
1918 if {$cr < 0} {set cr [expr {$n + 1}]}
1919 if {$lf < 0} {set lf [expr {$n + 1}]}
1922 $w.m.t insert end [string range $buf $c $lf]
1923 set console_cr($w) [$w.m.t index {end -1c}]
1927 $w.m.t delete $console_cr($w) end
1928 $w.m.t insert end "\n"
1929 $w.m.t insert end [string range $buf $c $cr]
1934 $w.m.t conf -state disabled
1938 fconfigure $fd -blocking 1
1940 if {[catch {close $fd}]} {
1941 if {![winfo exists $w]} {console_init $w}
1942 $w.m.s conf -background red -text {Error: Command Failed}
1943 $w.ok conf -state normal
1945 } elseif {[winfo exists $w]} {
1946 $w.m.s conf -background green -text {Success}
1947 $w.ok conf -state normal
1950 array unset console_cr $w
1951 array unset console_data $w
1953 uplevel #0 $after $ok
1957 fconfigure $fd -blocking 0
1960 ######################################################################
1964 set starting_gitk_msg {Please wait... Starting gitk...}
1966 proc do_gitk {revs} {
1967 global ui_status_value starting_gitk_msg
1975 set cmd "sh -c \"exec $cmd\""
1979 if {[catch {eval exec $cmd} err]} {
1980 error_popup "Failed to start gitk:\n\n$err"
1982 set ui_status_value $starting_gitk_msg
1984 if {$ui_status_value eq $starting_gitk_msg} {
1985 set ui_status_value {Ready.}
1992 set w [new_console {repack} \
1993 {Repacking the object database}]
1994 set cmd [list git repack]
1997 console_exec $w $cmd
2000 proc do_fsck_objects {} {
2001 set w [new_console {fsck-objects} \
2002 {Verifying the object database with fsck-objects}]
2003 set cmd [list git fsck-objects]
2006 lappend cmd --strict
2007 console_exec $w $cmd
2013 global gitdir ui_comm is_quitting repo_config commit_type
2015 if {$is_quitting} return
2018 # -- Stash our current commit buffer.
2020 set save [file join $gitdir GITGUI_MSG]
2021 set msg [string trim [$ui_comm get 0.0 end]]
2022 if {![string match amend* $commit_type]
2023 && [$ui_comm edit modified]
2026 set fd [open $save w]
2027 puts $fd [string trim [$ui_comm get 0.0 end]]
2031 catch {file delete $save}
2034 # -- Stash our current window geometry into this repository.
2036 set cfg_geometry [list]
2037 lappend cfg_geometry [wm geometry .]
2038 lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
2039 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
2040 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2043 if {$cfg_geometry ne $rc_geometry} {
2044 catch {exec git repo-config gui.geometry $cfg_geometry}
2051 rescan {set ui_status_value {Ready.}}
2054 proc remove_helper {txt paths} {
2055 global file_states current_diff
2057 if {![lock_index begin-update]} return
2061 foreach path $paths {
2062 switch -glob -- [lindex $file_states($path) 0] {
2066 lappend pathList $path
2067 if {$path eq $current_diff} {
2068 set after {reshow_diff;}
2073 if {$pathList eq {}} {
2079 [concat $after {set ui_status_value {Ready.}}]
2083 proc do_remove_selection {} {
2084 global current_diff selected_paths
2086 if {[array size selected_paths] > 0} {
2088 {Removing selected files from commit} \
2089 [array names selected_paths]
2090 } elseif {$current_diff ne {}} {
2092 "Removing [short_path $current_diff] from commit" \
2093 [list $current_diff]
2097 proc include_helper {txt paths} {
2098 global file_states current_diff
2100 if {![lock_index begin-update]} return
2104 foreach path $paths {
2105 switch -glob -- [lindex $file_states($path) 0] {
2113 lappend pathList $path
2114 if {$path eq $current_diff} {
2115 set after {reshow_diff;}
2120 if {$pathList eq {}} {
2126 [concat $after {set ui_status_value {Ready to commit.}}]
2130 proc do_include_selection {} {
2131 global current_diff selected_paths
2133 if {[array size selected_paths] > 0} {
2135 {Including selected files} \
2136 [array names selected_paths]
2137 } elseif {$current_diff ne {}} {
2139 "Including [short_path $current_diff]" \
2140 [list $current_diff]
2144 proc do_include_all {} {
2148 foreach path [array names file_states] {
2149 switch -- [lindex $file_states($path) 0] {
2154 _D {lappend paths $path}
2158 {Including all modified files} \
2162 proc do_signoff {} {
2165 set me [committer_ident]
2166 if {$me eq {}} return
2168 set sob "Signed-off-by: $me"
2169 set last [$ui_comm get {end -1c linestart} {end -1c}]
2170 if {$last ne $sob} {
2171 $ui_comm edit separator
2173 && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
2174 $ui_comm insert end "\n"
2176 $ui_comm insert end "\n$sob"
2177 $ui_comm edit separator
2182 proc do_select_commit_type {} {
2183 global commit_type selected_commit_type
2185 if {$selected_commit_type eq {new}
2186 && [string match amend* $commit_type]} {
2188 } elseif {$selected_commit_type eq {amend}
2189 && ![string match amend* $commit_type]} {
2192 # The amend request was rejected...
2194 if {![string match amend* $commit_type]} {
2195 set selected_commit_type new
2205 global appname copyright
2206 global tcl_patchLevel tk_patchLevel
2210 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2212 label $w.header -text "About $appname" \
2214 pack $w.header -side top -fill x
2217 button $w.buttons.close -text {Close} \
2219 -command [list destroy $w]
2220 pack $w.buttons.close -side right
2221 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2224 -text "$appname - a commit creation tool for Git.
2232 pack $w.desc -side top -fill x -padx 5 -pady 5
2234 set v [exec git --version]
2236 if {$tcl_patchLevel eq $tk_patchLevel} {
2237 append v "Tcl/Tk version $tcl_patchLevel"
2239 append v "Tcl version $tcl_patchLevel"
2240 append v ", Tk version $tk_patchLevel"
2251 pack $w.vers -side top -fill x -padx 5 -pady 5
2253 bind $w <Visibility> "grab $w; focus $w"
2254 bind $w <Key-Escape> "destroy $w"
2255 wm title $w "About $appname"
2259 proc do_options {} {
2260 global appname gitdir font_descs
2261 global repo_config global_config
2262 global repo_config_new global_config_new
2264 array unset repo_config_new
2265 array unset global_config_new
2266 foreach name [array names repo_config] {
2267 set repo_config_new($name) $repo_config($name)
2270 foreach name [array names repo_config] {
2272 gui.diffcontext {continue}
2274 set repo_config_new($name) $repo_config($name)
2276 foreach name [array names global_config] {
2277 set global_config_new($name) $global_config($name)
2279 set reponame [lindex [file split \
2280 [file normalize [file dirname $gitdir]]] \
2283 set w .options_editor
2285 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2287 label $w.header -text "$appname Options" \
2289 pack $w.header -side top -fill x
2292 button $w.buttons.restore -text {Restore Defaults} \
2294 -command do_restore_defaults
2295 pack $w.buttons.restore -side left
2296 button $w.buttons.save -text Save \
2298 -command [list do_save_config $w]
2299 pack $w.buttons.save -side right
2300 button $w.buttons.cancel -text {Cancel} \
2302 -command [list destroy $w]
2303 pack $w.buttons.cancel -side right
2304 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2306 labelframe $w.repo -text "$reponame Repository" \
2308 -relief raised -borderwidth 2
2309 labelframe $w.global -text {Global (All Repositories)} \
2311 -relief raised -borderwidth 2
2312 pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
2313 pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
2316 {b partialinclude {Allow Partially Included Files}}
2317 {b pullsummary {Show Pull Summary}}
2318 {b trustmtime {Trust File Modification Timestamps}}
2319 {i diffcontext {Number of Diff Context Lines}}
2321 set type [lindex $option 0]
2322 set name [lindex $option 1]
2323 set text [lindex $option 2]
2324 foreach f {repo global} {
2327 checkbutton $w.$f.$name -text $text \
2328 -variable ${f}_config_new(gui.$name) \
2332 pack $w.$f.$name -side top -anchor w
2336 label $w.$f.$name.l -text "$text:" -font font_ui
2337 pack $w.$f.$name.l -side left -anchor w -fill x
2338 spinbox $w.$f.$name.v \
2339 -textvariable ${f}_config_new(gui.$name) \
2340 -from 1 -to 99 -increment 1 \
2343 pack $w.$f.$name.v -side right -anchor e
2344 pack $w.$f.$name -side top -anchor w -fill x
2350 set all_fonts [lsort [font families]]
2351 foreach option $font_descs {
2352 set name [lindex $option 0]
2353 set font [lindex $option 1]
2354 set text [lindex $option 2]
2356 set global_config_new(gui.$font^^family) \
2357 [font configure $font -family]
2358 set global_config_new(gui.$font^^size) \
2359 [font configure $font -size]
2361 frame $w.global.$name
2362 label $w.global.$name.l -text "$text:" -font font_ui
2363 pack $w.global.$name.l -side left -anchor w -fill x
2364 eval tk_optionMenu $w.global.$name.family \
2365 global_config_new(gui.$font^^family) \
2367 spinbox $w.global.$name.size \
2368 -textvariable global_config_new(gui.$font^^size) \
2369 -from 2 -to 80 -increment 1 \
2372 pack $w.global.$name.size -side right -anchor e
2373 pack $w.global.$name.family -side right -anchor e
2374 pack $w.global.$name -side top -anchor w -fill x
2377 bind $w <Visibility> "grab $w; focus $w"
2378 bind $w <Key-Escape> "destroy $w"
2379 wm title $w "$appname ($reponame): Options"
2383 proc do_restore_defaults {} {
2384 global font_descs default_config repo_config
2385 global repo_config_new global_config_new
2387 foreach name [array names default_config] {
2388 set repo_config_new($name) $default_config($name)
2389 set global_config_new($name) $default_config($name)
2392 foreach option $font_descs {
2393 set name [lindex $option 0]
2394 set repo_config(gui.$name) $default_config(gui.$name)
2398 foreach option $font_descs {
2399 set name [lindex $option 0]
2400 set font [lindex $option 1]
2401 set global_config_new(gui.$font^^family) \
2402 [font configure $font -family]
2403 set global_config_new(gui.$font^^size) \
2404 [font configure $font -size]
2408 proc do_save_config {w} {
2409 if {[catch {save_config} err]} {
2410 error_popup "Failed to completely save options:\n\n$err"
2416 proc do_windows_shortcut {} {
2417 global gitdir appname argv0
2419 set reponame [lindex [file split \
2420 [file normalize [file dirname $gitdir]]] \
2424 set desktop [exec cygpath \
2432 set fn [tk_getSaveFile \
2434 -title "$appname ($reponame): Create Desktop Icon" \
2435 -initialdir $desktop \
2436 -initialfile "Git $reponame.bat"]
2440 set sh [exec cygpath \
2445 set me [exec cygpath \
2449 set gd [exec cygpath \
2453 regsub -all ' $me "'\\''" me
2454 regsub -all ' $gd "'\\''" gd
2455 puts -nonewline $fd "\"$sh\" --login -c \""
2456 puts -nonewline $fd "GIT_DIR='$gd'"
2457 puts -nonewline $fd " '$me'"
2461 error_popup "Cannot write script:\n\n$err"
2466 proc do_macosx_app {} {
2467 global gitdir appname argv0 env
2469 set reponame [lindex [file split \
2470 [file normalize [file dirname $gitdir]]] \
2473 set fn [tk_getSaveFile \
2475 -title "$appname ($reponame): Create Desktop Icon" \
2476 -initialdir [file join $env(HOME) Desktop] \
2477 -initialfile "Git $reponame.app"]
2480 set Contents [file join $fn Contents]
2481 set MacOS [file join $Contents MacOS]
2482 set exe [file join $MacOS git-gui]
2486 set fd [open [file join $Contents Info.plist] w]
2487 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
2488 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
2489 <plist version="1.0">
2491 <key>CFBundleDevelopmentRegion</key>
2492 <string>English</string>
2493 <key>CFBundleExecutable</key>
2494 <string>git-gui</string>
2495 <key>CFBundleIdentifier</key>
2496 <string>org.spearce.git-gui</string>
2497 <key>CFBundleInfoDictionaryVersion</key>
2498 <string>6.0</string>
2499 <key>CFBundlePackageType</key>
2500 <string>APPL</string>
2501 <key>CFBundleSignature</key>
2502 <string>????</string>
2503 <key>CFBundleVersion</key>
2504 <string>1.0</string>
2505 <key>NSPrincipalClass</key>
2506 <string>NSApplication</string>
2511 set fd [open $exe w]
2512 set gd [file normalize $gitdir]
2513 set ep [file normalize [exec git --exec-path]]
2514 regsub -all ' $gd "'\\''" gd
2515 regsub -all ' $ep "'\\''" ep
2516 puts $fd "#!/bin/sh"
2517 foreach name [array names env] {
2518 if {[string match GIT_* $name]} {
2519 regsub -all ' $env($name) "'\\''" v
2520 puts $fd "export $name='$v'"
2523 puts $fd "export PATH='$ep':\$PATH"
2524 puts $fd "export GIT_DIR='$gd'"
2525 puts $fd "exec [file normalize $argv0]"
2528 file attributes $exe -permissions u+x,g+x,o+x
2530 error_popup "Cannot write icon:\n\n$err"
2535 proc toggle_or_diff {w x y} {
2536 global file_states file_lists current_diff ui_index ui_other
2537 global last_clicked selected_paths
2539 set pos [split [$w index @$x,$y] .]
2540 set lno [lindex $pos 0]
2541 set col [lindex $pos 1]
2542 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2548 set last_clicked [list $w $lno]
2549 array unset selected_paths
2550 $ui_index tag remove in_sel 0.0 end
2551 $ui_other tag remove in_sel 0.0 end
2554 if {$current_diff eq $path} {
2555 set after {reshow_diff;}
2559 switch -glob -- [lindex $file_states($path) 0] {
2566 "Removing [short_path $path] from commit" \
2568 [concat $after {set ui_status_value {Ready.}}]
2572 "Including [short_path $path]" \
2574 [concat $after {set ui_status_value {Ready.}}]
2578 show_diff $path $w $lno
2582 proc add_one_to_selection {w x y} {
2584 global last_clicked selected_paths
2586 set pos [split [$w index @$x,$y] .]
2587 set lno [lindex $pos 0]
2588 set col [lindex $pos 1]
2589 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2595 set last_clicked [list $w $lno]
2596 if {[catch {set in_sel $selected_paths($path)}]} {
2600 unset selected_paths($path)
2601 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2603 set selected_paths($path) 1
2604 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2608 proc add_range_to_selection {w x y} {
2610 global last_clicked selected_paths
2612 if {[lindex $last_clicked 0] ne $w} {
2613 toggle_or_diff $w $x $y
2617 set pos [split [$w index @$x,$y] .]
2618 set lno [lindex $pos 0]
2619 set lc [lindex $last_clicked 1]
2628 foreach path [lrange $file_lists($w) \
2629 [expr {$begin - 1}] \
2630 [expr {$end - 1}]] {
2631 set selected_paths($path) 1
2633 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2636 ######################################################################
2640 set cursor_ptr arrow
2641 font create font_diff -family Courier -size 10
2645 eval font configure font_ui [font actual [.dummy cget -font]]
2649 font create font_uibold
2650 font create font_diffbold
2655 } elseif {[is_MacOSX]} {
2663 proc apply_config {} {
2664 global repo_config font_descs
2666 foreach option $font_descs {
2667 set name [lindex $option 0]
2668 set font [lindex $option 1]
2670 foreach {cn cv} $repo_config(gui.$name) {
2671 font configure $font $cn $cv
2674 error_popup "Invalid font specified in gui.$name:\n\n$err"
2676 foreach {cn cv} [font configure $font] {
2677 font configure ${font}bold $cn $cv
2679 font configure ${font}bold -weight bold
2683 set default_config(gui.trustmtime) false
2684 set default_config(gui.pullsummary) true
2685 set default_config(gui.partialinclude) false
2686 set default_config(gui.diffcontext) 5
2687 set default_config(gui.fontui) [font configure font_ui]
2688 set default_config(gui.fontdiff) [font configure font_diff]
2690 {fontui font_ui {Main Font}}
2691 {fontdiff font_diff {Diff/Console Font}}
2696 ######################################################################
2702 menu .mbar -tearoff 0
2703 .mbar add cascade -label Repository -menu .mbar.repository
2704 .mbar add cascade -label Edit -menu .mbar.edit
2705 .mbar add cascade -label Commit -menu .mbar.commit
2706 if {!$single_commit} {
2707 .mbar add cascade -label Fetch -menu .mbar.fetch
2708 .mbar add cascade -label Pull -menu .mbar.pull
2709 .mbar add cascade -label Push -menu .mbar.push
2711 . configure -menu .mbar
2713 # -- Repository Menu
2715 menu .mbar.repository
2716 .mbar.repository add command \
2717 -label {Visualize Current Branch} \
2718 -command {do_gitk {}} \
2721 .mbar.repository add command \
2722 -label {Visualize All Branches} \
2723 -command {do_gitk {--all}} \
2726 .mbar.repository add separator
2728 if {!$single_commit} {
2729 .mbar.repository add command -label {Repack Database} \
2730 -command do_repack \
2733 .mbar.repository add command -label {Verify Database} \
2734 -command do_fsck_objects \
2737 .mbar.repository add separator
2740 .mbar.repository add command \
2741 -label {Create Desktop Icon} \
2742 -command do_windows_shortcut \
2744 } elseif {[is_MacOSX]} {
2745 .mbar.repository add command \
2746 -label {Create Desktop Icon} \
2747 -command do_macosx_app \
2751 .mbar.repository add command -label Quit \
2753 -accelerator $M1T-Q \
2759 .mbar.edit add command -label Undo \
2760 -command {catch {[focus] edit undo}} \
2761 -accelerator $M1T-Z \
2763 .mbar.edit add command -label Redo \
2764 -command {catch {[focus] edit redo}} \
2765 -accelerator $M1T-Y \
2767 .mbar.edit add separator
2768 .mbar.edit add command -label Cut \
2769 -command {catch {tk_textCut [focus]}} \
2770 -accelerator $M1T-X \
2772 .mbar.edit add command -label Copy \
2773 -command {catch {tk_textCopy [focus]}} \
2774 -accelerator $M1T-C \
2776 .mbar.edit add command -label Paste \
2777 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
2778 -accelerator $M1T-V \
2780 .mbar.edit add command -label Delete \
2781 -command {catch {[focus] delete sel.first sel.last}} \
2784 .mbar.edit add separator
2785 .mbar.edit add command -label {Select All} \
2786 -command {catch {[focus] tag add sel 0.0 end}} \
2787 -accelerator $M1T-A \
2794 .mbar.commit add radiobutton \
2795 -label {New Commit} \
2796 -command do_select_commit_type \
2797 -variable selected_commit_type \
2800 lappend disable_on_lock \
2801 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2803 .mbar.commit add radiobutton \
2804 -label {Amend Last Commit} \
2805 -command do_select_commit_type \
2806 -variable selected_commit_type \
2809 lappend disable_on_lock \
2810 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2812 .mbar.commit add separator
2814 .mbar.commit add command -label Rescan \
2815 -command do_rescan \
2818 lappend disable_on_lock \
2819 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2821 .mbar.commit add command -label {Remove From Commit} \
2822 -command do_remove_selection \
2824 lappend disable_on_lock \
2825 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2827 .mbar.commit add command -label {Include In Commit} \
2828 -command do_include_selection \
2830 lappend disable_on_lock \
2831 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2833 .mbar.commit add command -label {Include All In Commit} \
2834 -command do_include_all \
2835 -accelerator $M1T-I \
2837 lappend disable_on_lock \
2838 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2840 .mbar.commit add separator
2842 .mbar.commit add command -label {Sign Off} \
2843 -command do_signoff \
2844 -accelerator $M1T-S \
2847 .mbar.commit add command -label Commit \
2848 -command do_commit \
2849 -accelerator $M1T-Return \
2851 lappend disable_on_lock \
2852 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2854 # -- Transport menus
2856 if {!$single_commit} {
2863 # -- Apple Menu (Mac OS X only)
2865 .mbar add cascade -label Apple -menu .mbar.apple
2868 .mbar.apple add command -label "About $appname" \
2871 .mbar.apple add command -label "$appname Options..." \
2872 -command do_options \
2877 .mbar.edit add separator
2878 .mbar.edit add command -label {Options...} \
2879 -command do_options \
2884 .mbar add cascade -label Help -menu .mbar.help
2887 .mbar.help add command -label "About $appname" \
2893 # -- Main Window Layout
2895 panedwindow .vpane -orient vertical
2896 panedwindow .vpane.files -orient horizontal
2897 .vpane add .vpane.files -sticky nsew -height 100 -width 400
2898 pack .vpane -anchor n -side top -fill both -expand 1
2900 # -- Index File List
2902 frame .vpane.files.index -height 100 -width 400
2903 label .vpane.files.index.title -text {Modified Files} \
2906 text $ui_index -background white -borderwidth 0 \
2907 -width 40 -height 10 \
2909 -cursor $cursor_ptr \
2910 -yscrollcommand {.vpane.files.index.sb set} \
2912 scrollbar .vpane.files.index.sb -command [list $ui_index yview]
2913 pack .vpane.files.index.title -side top -fill x
2914 pack .vpane.files.index.sb -side right -fill y
2915 pack $ui_index -side left -fill both -expand 1
2916 .vpane.files add .vpane.files.index -sticky nsew
2918 # -- Other (Add) File List
2920 frame .vpane.files.other -height 100 -width 100
2921 label .vpane.files.other.title -text {Untracked Files} \
2924 text $ui_other -background white -borderwidth 0 \
2925 -width 40 -height 10 \
2927 -cursor $cursor_ptr \
2928 -yscrollcommand {.vpane.files.other.sb set} \
2930 scrollbar .vpane.files.other.sb -command [list $ui_other yview]
2931 pack .vpane.files.other.title -side top -fill x
2932 pack .vpane.files.other.sb -side right -fill y
2933 pack $ui_other -side left -fill both -expand 1
2934 .vpane.files add .vpane.files.other -sticky nsew
2936 foreach i [list $ui_index $ui_other] {
2937 $i tag conf in_diff -font font_uibold
2938 $i tag conf in_sel \
2939 -background [$i cget -foreground] \
2940 -foreground [$i cget -background]
2944 # -- Diff and Commit Area
2946 frame .vpane.lower -height 300 -width 400
2947 frame .vpane.lower.commarea
2948 frame .vpane.lower.diff -relief sunken -borderwidth 1
2949 pack .vpane.lower.commarea -side top -fill x
2950 pack .vpane.lower.diff -side bottom -fill both -expand 1
2951 .vpane add .vpane.lower -stick nsew
2953 # -- Commit Area Buttons
2955 frame .vpane.lower.commarea.buttons
2956 label .vpane.lower.commarea.buttons.l -text {} \
2960 pack .vpane.lower.commarea.buttons.l -side top -fill x
2961 pack .vpane.lower.commarea.buttons -side left -fill y
2963 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
2964 -command do_rescan \
2966 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
2967 lappend disable_on_lock \
2968 {.vpane.lower.commarea.buttons.rescan conf -state}
2970 button .vpane.lower.commarea.buttons.incall -text {Include All} \
2971 -command do_include_all \
2973 pack .vpane.lower.commarea.buttons.incall -side top -fill x
2974 lappend disable_on_lock \
2975 {.vpane.lower.commarea.buttons.incall conf -state}
2977 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
2978 -command do_signoff \
2980 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
2982 button .vpane.lower.commarea.buttons.commit -text {Commit} \
2983 -command do_commit \
2985 pack .vpane.lower.commarea.buttons.commit -side top -fill x
2986 lappend disable_on_lock \
2987 {.vpane.lower.commarea.buttons.commit conf -state}
2989 # -- Commit Message Buffer
2991 frame .vpane.lower.commarea.buffer
2992 frame .vpane.lower.commarea.buffer.header
2993 set ui_comm .vpane.lower.commarea.buffer.t
2994 set ui_coml .vpane.lower.commarea.buffer.header.l
2995 radiobutton .vpane.lower.commarea.buffer.header.new \
2996 -text {New Commit} \
2997 -command do_select_commit_type \
2998 -variable selected_commit_type \
3001 lappend disable_on_lock \
3002 [list .vpane.lower.commarea.buffer.header.new conf -state]
3003 radiobutton .vpane.lower.commarea.buffer.header.amend \
3004 -text {Amend Last Commit} \
3005 -command do_select_commit_type \
3006 -variable selected_commit_type \
3009 lappend disable_on_lock \
3010 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3015 proc trace_commit_type {varname args} {
3016 global ui_coml commit_type
3017 switch -glob -- $commit_type {
3018 initial {set txt {Initial Commit Message:}}
3019 amend {set txt {Amended Commit Message:}}
3020 amend-initial {set txt {Amended Initial Commit Message:}}
3021 amend-merge {set txt {Amended Merge Commit Message:}}
3022 merge {set txt {Merge Commit Message:}}
3023 * {set txt {Commit Message:}}
3025 $ui_coml conf -text $txt
3027 trace add variable commit_type write trace_commit_type
3028 pack $ui_coml -side left -fill x
3029 pack .vpane.lower.commarea.buffer.header.amend -side right
3030 pack .vpane.lower.commarea.buffer.header.new -side right
3032 text $ui_comm -background white -borderwidth 1 \
3035 -autoseparators true \
3037 -width 75 -height 9 -wrap none \
3039 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3040 scrollbar .vpane.lower.commarea.buffer.sby \
3041 -command [list $ui_comm yview]
3042 pack .vpane.lower.commarea.buffer.header -side top -fill x
3043 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3044 pack $ui_comm -side left -fill y
3045 pack .vpane.lower.commarea.buffer -side left -fill y
3047 # -- Commit Message Buffer Context Menu
3049 set ctxm .vpane.lower.commarea.buffer.ctxm
3050 menu $ctxm -tearoff 0
3054 -command {tk_textCut $ui_comm}
3058 -command {tk_textCopy $ui_comm}
3062 -command {tk_textPaste $ui_comm}
3066 -command {$ui_comm delete sel.first sel.last}
3069 -label {Select All} \
3071 -command {$ui_comm tag add sel 0.0 end}
3076 $ui_comm tag add sel 0.0 end
3077 tk_textCopy $ui_comm
3078 $ui_comm tag remove sel 0.0 end
3085 bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
3090 set diff_actions [list]
3091 proc trace_current_diff {varname args} {
3092 global current_diff diff_actions file_states
3093 if {$current_diff eq {}} {
3100 set s [mapdesc [lindex $file_states($p) 0] $p]
3102 set p [escape_path $p]
3106 .vpane.lower.diff.header.status configure -text $s
3107 .vpane.lower.diff.header.file configure -text $f
3108 .vpane.lower.diff.header.path configure -text $p
3109 foreach w $diff_actions {
3113 trace add variable current_diff write trace_current_diff
3115 frame .vpane.lower.diff.header -background orange
3116 label .vpane.lower.diff.header.status \
3117 -background orange \
3118 -width $max_status_desc \
3122 label .vpane.lower.diff.header.file \
3123 -background orange \
3127 label .vpane.lower.diff.header.path \
3128 -background orange \
3132 pack .vpane.lower.diff.header.status -side left
3133 pack .vpane.lower.diff.header.file -side left
3134 pack .vpane.lower.diff.header.path -fill x
3135 set ctxm .vpane.lower.diff.header.ctxm
3136 menu $ctxm -tearoff 0
3147 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3148 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3152 frame .vpane.lower.diff.body
3153 set ui_diff .vpane.lower.diff.body.t
3154 text $ui_diff -background white -borderwidth 0 \
3155 -width 80 -height 15 -wrap none \
3157 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3158 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3160 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3161 -command [list $ui_diff xview]
3162 scrollbar .vpane.lower.diff.body.sby -orient vertical \
3163 -command [list $ui_diff yview]
3164 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3165 pack .vpane.lower.diff.body.sby -side right -fill y
3166 pack $ui_diff -side left -fill both -expand 1
3167 pack .vpane.lower.diff.header -side top -fill x
3168 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3170 $ui_diff tag conf d_@ -font font_diffbold
3171 $ui_diff tag conf d_+ -foreground blue
3172 $ui_diff tag conf d_- -foreground red
3173 $ui_diff tag conf d_++ -foreground {#00a000}
3174 $ui_diff tag conf d_-- -foreground {#a000a0}
3175 $ui_diff tag conf d_+- \
3177 -background {light goldenrod yellow}
3178 $ui_diff tag conf d_-+ \
3182 # -- Diff Body Context Menu
3184 set ctxm .vpane.lower.diff.body.ctxm
3185 menu $ctxm -tearoff 0
3189 -command {tk_textCopy $ui_diff}
3190 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3192 -label {Select All} \
3194 -command {$ui_diff tag add sel 0.0 end}
3195 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3200 $ui_diff tag add sel 0.0 end
3201 tk_textCopy $ui_diff
3202 $ui_diff tag remove sel 0.0 end
3204 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3207 -label {Decrease Font Size} \
3209 -command {incr_font_size font_diff -1}
3210 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3212 -label {Increase Font Size} \
3214 -command {incr_font_size font_diff 1}
3215 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3218 -label {Show Less Context} \
3220 -command {if {$repo_config(gui.diffcontext) >= 2} {
3221 incr repo_config(gui.diffcontext) -1
3224 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3226 -label {Show More Context} \
3229 incr repo_config(gui.diffcontext)
3232 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3234 $ctxm add command -label {Options...} \
3237 bind_button3 $ui_diff "tk_popup $ctxm %X %Y"
3241 set ui_status_value {Initializing...}
3242 label .status -textvariable ui_status_value \
3248 pack .status -anchor w -side bottom -fill x
3253 set gm $repo_config(gui.geometry)
3254 wm geometry . [lindex $gm 0]
3255 .vpane sash place 0 \
3256 [lindex [.vpane sash coord 0] 0] \
3258 .vpane.files sash place 0 \
3260 [lindex [.vpane.files sash coord 0] 1]
3266 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3267 bind $ui_comm <$M1B-Key-i> {do_include_all;break}
3268 bind $ui_comm <$M1B-Key-I> {do_include_all;break}
3269 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3270 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3271 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3272 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3273 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3274 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3275 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3276 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3278 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3279 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3280 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3281 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3282 bind $ui_diff <$M1B-Key-v> {break}
3283 bind $ui_diff <$M1B-Key-V> {break}
3284 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3285 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3286 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3287 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3288 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3289 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3291 bind . <Destroy> do_quit
3292 bind all <Key-F5> do_rescan
3293 bind all <$M1B-Key-r> do_rescan
3294 bind all <$M1B-Key-R> do_rescan
3295 bind . <$M1B-Key-s> do_signoff
3296 bind . <$M1B-Key-S> do_signoff
3297 bind . <$M1B-Key-i> do_include_all
3298 bind . <$M1B-Key-I> do_include_all
3299 bind . <$M1B-Key-Return> do_commit
3300 bind all <$M1B-Key-q> do_quit
3301 bind all <$M1B-Key-Q> do_quit
3302 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
3303 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
3304 foreach i [list $ui_index $ui_other] {
3305 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
3306 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3307 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
3311 set file_lists($ui_index) [list]
3312 set file_lists($ui_other) [list]
3316 set MERGE_HEAD [list]
3320 set selected_commit_type new
3322 wm title . "$appname ([file normalize [file dirname $gitdir]])"
3323 focus -force $ui_comm
3325 # -- Warn the user about environmental problems.
3326 # Cygwin's Tcl does *not* pass its env array
3327 # onto any processes it spawns. This means
3328 # that the git processes get none of our
3329 # environment. That may not work...
3334 set msg "Possible environment issues exist.
3336 The following environment variables are probably
3337 going to be ignored by any Git subprocess run
3341 foreach name [array names env] {
3342 switch -regexp -- $name {
3343 {^GIT_INDEX_FILE$} -
3344 {^GIT_OBJECT_DIRECTORY$} -
3345 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3347 {^GIT_EXTERNAL_DIFF$} -
3351 {^GIT_CONFIG_LOCAL$} -
3352 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3353 append msg " - $name\n"
3356 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3357 append msg " - $name\n"
3359 set suggest_user $name
3363 if {$ignored_env > 0} {
3365 This is due to a known issue with the
3366 Tcl binary distributed by Cygwin."
3368 if {$suggest_user ne {}} {
3371 A good replacement for $suggest_user
3372 is placing values for the user.name and
3373 user.email settings into your personal
3379 unset ignored_env msg suggest_user name
3382 if {!$single_commit} {
3384 populate_fetch_menu .mbar.fetch
3385 populate_pull_menu .mbar.pull
3386 populate_push_menu .mbar.push
3388 lock_index begin-read