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} {
261 global gitdir current_branch
262 upvar $ctvar ct $hdvar hd $mhvar mh
266 if {[catch {set current_branch [exec git symbolic-ref HEAD]}]} {
267 set current_branch {}
269 regsub ^refs/((heads|tags|remotes)/)? \
275 if {[catch {set hd [exec git rev-parse --verify HEAD]}]} {
281 set merge_head [file join $gitdir MERGE_HEAD]
282 if {[file exists $merge_head]} {
284 set fd_mh [open $merge_head r]
285 while {[gets $fd_mh line] >= 0} {
296 global PARENT empty_tree
298 set p [lindex $PARENT 0]
302 if {$empty_tree eq {}} {
303 set empty_tree [exec git mktree << {}]
308 proc rescan {after} {
309 global HEAD PARENT MERGE_HEAD commit_type
310 global ui_index ui_other ui_status_value ui_comm
311 global rescan_active file_states
314 if {$rescan_active > 0 || ![lock_index read]} return
316 repository_state newType newHEAD newMERGE_HEAD
317 if {[string match amend* $commit_type]
318 && $newType eq {normal}
319 && $newHEAD eq $HEAD} {
323 set MERGE_HEAD $newMERGE_HEAD
324 set commit_type $newType
327 array unset file_states
329 if {![$ui_comm edit modified]
330 || [string trim [$ui_comm get 0.0 end]] eq {}} {
331 if {[load_message GITGUI_MSG]} {
332 } elseif {[load_message MERGE_MSG]} {
333 } elseif {[load_message SQUASH_MSG]} {
336 $ui_comm edit modified false
339 if {$repo_config(gui.trustmtime) eq {true}} {
340 rescan_stage2 {} $after
343 set ui_status_value {Refreshing file status...}
344 set cmd [list git update-index]
346 lappend cmd --unmerged
347 lappend cmd --ignore-missing
348 lappend cmd --refresh
349 set fd_rf [open "| $cmd" r]
350 fconfigure $fd_rf -blocking 0 -translation binary
351 fileevent $fd_rf readable \
352 [list rescan_stage2 $fd_rf $after]
356 proc rescan_stage2 {fd after} {
357 global gitdir ui_status_value
358 global rescan_active buf_rdi buf_rdf buf_rlo
362 if {![eof $fd]} return
366 set ls_others [list | git ls-files --others -z \
367 --exclude-per-directory=.gitignore]
368 set info_exclude [file join $gitdir info exclude]
369 if {[file readable $info_exclude]} {
370 lappend ls_others "--exclude-from=$info_exclude"
378 set ui_status_value {Scanning for modified files ...}
379 set fd_di [open "| git diff-index --cached -z [PARENT]" r]
380 set fd_df [open "| git diff-files -z" r]
381 set fd_lo [open $ls_others r]
383 fconfigure $fd_di -blocking 0 -translation binary
384 fconfigure $fd_df -blocking 0 -translation binary
385 fconfigure $fd_lo -blocking 0 -translation binary
386 fileevent $fd_di readable [list read_diff_index $fd_di $after]
387 fileevent $fd_df readable [list read_diff_files $fd_df $after]
388 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
391 proc load_message {file} {
392 global gitdir ui_comm
394 set f [file join $gitdir $file]
395 if {[file isfile $f]} {
396 if {[catch {set fd [open $f r]}]} {
399 set content [string trim [read $fd]]
401 $ui_comm delete 0.0 end
402 $ui_comm insert end $content
408 proc read_diff_index {fd after} {
411 append buf_rdi [read $fd]
413 set n [string length $buf_rdi]
415 set z1 [string first "\0" $buf_rdi $c]
418 set z2 [string first "\0" $buf_rdi $z1]
422 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
424 [string range $buf_rdi $z1 [expr {$z2 - 1}]] \
426 [list [lindex $i 0] [lindex $i 2]] \
432 set buf_rdi [string range $buf_rdi $c end]
437 rescan_done $fd buf_rdi $after
440 proc read_diff_files {fd after} {
443 append buf_rdf [read $fd]
445 set n [string length $buf_rdf]
447 set z1 [string first "\0" $buf_rdf $c]
450 set z2 [string first "\0" $buf_rdf $z1]
454 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
456 [string range $buf_rdf $z1 [expr {$z2 - 1}]] \
459 [list [lindex $i 0] [lindex $i 2]]
464 set buf_rdf [string range $buf_rdf $c end]
469 rescan_done $fd buf_rdf $after
472 proc read_ls_others {fd after} {
475 append buf_rlo [read $fd]
476 set pck [split $buf_rlo "\0"]
477 set buf_rlo [lindex $pck end]
478 foreach p [lrange $pck 0 end-1] {
481 rescan_done $fd buf_rlo $after
484 proc rescan_done {fd buf after} {
486 global file_states repo_config
489 if {![eof $fd]} return
492 if {[incr rescan_active -1] > 0} return
498 if {$repo_config(gui.partialinclude) ne {true}} {
500 foreach path [array names file_states] {
501 switch -- [lindex $file_states($path) 0] {
503 MM {lappend pathList $path}
506 if {$pathList ne {}} {
508 "Updating included files" \
510 [concat {reshow_diff;} $after]
519 proc prune_selection {} {
520 global file_states selected_paths
522 foreach path [array names selected_paths] {
523 if {[catch {set still_here $file_states($path)}]} {
524 unset selected_paths($path)
529 ######################################################################
534 global ui_diff current_diff ui_index ui_other
536 $ui_diff conf -state normal
537 $ui_diff delete 0.0 end
538 $ui_diff conf -state disabled
542 $ui_index tag remove in_diff 0.0 end
543 $ui_other tag remove in_diff 0.0 end
546 proc reshow_diff {} {
547 global current_diff ui_status_value file_states
549 if {$current_diff eq {}
550 || [catch {set s $file_states($current_diff)}]} {
553 show_diff $current_diff
557 proc handle_empty_diff {} {
558 global current_diff file_states file_lists
560 set path $current_diff
561 set s $file_states($path)
562 if {[lindex $s 0] ne {_M}} return
564 info_popup "No differences detected.
566 [short_path $path] has no changes.
568 The modification date of this file was updated
569 by another application and you currently have
570 the Trust File Modification Timestamps option
571 enabled, so Git did not automatically detect
572 that there are no content differences in this
575 This file will now be removed from the modified
576 files list, to prevent possible confusion.
578 if {[catch {exec git update-index -- $path} err]} {
579 error_popup "Failed to refresh index:\n\n$err"
583 set old_w [mapcol [lindex $file_states($path) 0] $path]
584 set lno [lsearch -sorted $file_lists($old_w) $path]
586 set file_lists($old_w) \
587 [lreplace $file_lists($old_w) $lno $lno]
589 $old_w conf -state normal
590 $old_w delete $lno.0 [expr {$lno + 1}].0
591 $old_w conf -state disabled
595 proc show_diff {path {w {}} {lno {}}} {
596 global file_states file_lists
597 global is_3way_diff diff_active repo_config
598 global ui_diff current_diff ui_status_value
600 if {$diff_active || ![lock_index read]} return
603 if {$w eq {} || $lno == {}} {
604 foreach w [array names file_lists] {
605 set lno [lsearch -sorted $file_lists($w) $path]
612 if {$w ne {} && $lno >= 1} {
613 $w tag add in_diff $lno.0 [expr {$lno + 1}].0
616 set s $file_states($path)
620 set current_diff $path
621 set ui_status_value "Loading diff of [escape_path $path]..."
623 set cmd [list | git diff-index]
624 lappend cmd --no-color
625 if {$repo_config(gui.diffcontext) > 0} {
626 lappend cmd "-U$repo_config(gui.diffcontext)"
636 set fd [open $path r]
637 set content [read $fd]
642 set ui_status_value "Unable to display [escape_path $path]"
643 error_popup "Error loading file:\n\n$err"
646 $ui_diff conf -state normal
647 $ui_diff insert end $content
648 $ui_diff conf -state disabled
651 set ui_status_value {Ready.}
660 if {[catch {set fd [open $cmd r]} err]} {
663 set ui_status_value "Unable to display [escape_path $path]"
664 error_popup "Error loading diff:\n\n$err"
668 fconfigure $fd -blocking 0 -translation auto
669 fileevent $fd readable [list read_diff $fd]
672 proc read_diff {fd} {
673 global ui_diff ui_status_value is_3way_diff diff_active
676 $ui_diff conf -state normal
677 while {[gets $fd line] >= 0} {
678 # -- Cleanup uninteresting diff header lines.
680 if {[string match {diff --git *} $line]} continue
681 if {[string match {diff --combined *} $line]} continue
682 if {[string match {--- *} $line]} continue
683 if {[string match {+++ *} $line]} continue
684 if {$line eq {deleted file mode 120000}} {
685 set line "deleted symlink"
688 # -- Automatically detect if this is a 3 way diff.
690 if {[string match {@@@ *} $line]} {set is_3way_diff 1}
692 # -- Reformat a 3 way diff, 'cause its too weird.
695 set op [string range $line 0 1]
698 {++} {set tags d_+ ; set op { +}}
699 {--} {set tags d_- ; set op { -}}
700 { +} {set tags d_++; set op {++}}
701 { -} {set tags d_--; set op {--}}
702 {+ } {set tags d_-+; set op {-+}}
703 {- } {set tags d_+-; set op {+-}}
704 default {set tags {}}
706 set line [string replace $line 0 1 $op]
708 switch -- [string index $line 0] {
712 default {set tags {}}
715 $ui_diff insert end $line $tags
716 $ui_diff insert end "\n" $tags
718 $ui_diff conf -state disabled
724 set ui_status_value {Ready.}
726 if {$repo_config(gui.trustmtime) eq {true}
727 && [$ui_diff index end] eq {2.0}} {
733 ######################################################################
737 proc load_last_commit {} {
738 global HEAD PARENT MERGE_HEAD commit_type ui_comm
740 if {[llength $PARENT] == 0} {
741 error_popup {There is nothing to amend.
743 You are about to create the initial commit.
744 There is no commit before this to amend.
749 repository_state curType curHEAD curMERGE_HEAD
750 if {$curType eq {merge}} {
751 error_popup {Cannot amend while merging.
753 You are currently in the middle of a merge that
754 has not been fully completed. You cannot amend
755 the prior commit unless you first abort the
756 current merge activity.
764 set fd [open "| git cat-file commit $curHEAD" r]
765 while {[gets $fd line] > 0} {
766 if {[string match {parent *} $line]} {
767 lappend parents [string range $line 7 end]
770 set msg [string trim [read $fd]]
773 error_popup "Error loading commit data for amend:\n\n$err"
779 set MERGE_HEAD [list]
780 switch -- [llength $parents] {
781 0 {set commit_type amend-initial}
782 1 {set commit_type amend}
783 default {set commit_type amend-merge}
786 $ui_comm delete 0.0 end
787 $ui_comm insert end $msg
789 $ui_comm edit modified false
790 rescan {set ui_status_value {Ready.}}
793 proc create_new_commit {} {
794 global commit_type ui_comm
796 set commit_type normal
797 $ui_comm delete 0.0 end
799 $ui_comm edit modified false
800 rescan {set ui_status_value {Ready.}}
803 set GIT_COMMITTER_IDENT {}
805 proc committer_ident {} {
806 global GIT_COMMITTER_IDENT
808 if {$GIT_COMMITTER_IDENT eq {}} {
809 if {[catch {set me [exec git var GIT_COMMITTER_IDENT]} err]} {
810 error_popup "Unable to obtain your identity:\n\n$err"
813 if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \
814 $me me GIT_COMMITTER_IDENT]} {
815 error_popup "Invalid GIT_COMMITTER_IDENT:\n\n$me"
820 return $GIT_COMMITTER_IDENT
823 proc commit_tree {} {
824 global HEAD commit_type file_states ui_comm repo_config
826 if {![lock_index update]} return
827 if {[committer_ident] eq {}} return
829 # -- Our in memory state should match the repository.
831 repository_state curType curHEAD curMERGE_HEAD
832 if {[string match amend* $commit_type]
833 && $curType eq {normal}
834 && $curHEAD eq $HEAD} {
835 } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
836 info_popup {Last scanned state does not match repository state.
838 Another Git program has modified this repository
839 since the last scan. A rescan must be performed
840 before another commit can be created.
842 The rescan will be automatically started now.
845 rescan {set ui_status_value {Ready.}}
849 # -- At least one file should differ in the index.
852 foreach path [array names file_states] {
853 switch -glob -- [lindex $file_states($path) 0] {
857 M? {set files_ready 1; break}
859 error_popup "Unmerged files cannot be committed.
861 File [short_path $path] has merge conflicts.
862 You must resolve them and include the file before committing.
868 error_popup "Unknown file state [lindex $s 0] detected.
870 File [short_path $path] cannot be committed by this program.
876 error_popup {No included files to commit.
878 You must include at least 1 file before you can commit.
884 # -- A message is required.
886 set msg [string trim [$ui_comm get 1.0 end]]
888 error_popup {Please supply a commit message.
890 A good commit message has the following format:
892 - First line: Describe in one sentance what you did.
894 - Remaining lines: Describe why this change is good.
900 # -- Update included files if partialincludes are off.
902 if {$repo_config(gui.partialinclude) ne {true}} {
904 foreach path [array names file_states] {
905 switch -glob -- [lindex $file_states($path) 0] {
907 M? {lappend pathList $path}
910 if {$pathList ne {}} {
913 "Updating included files" \
915 [concat {lock_index update;} \
916 [list commit_prehook $curHEAD $msg]]
921 commit_prehook $curHEAD $msg
924 proc commit_prehook {curHEAD msg} {
925 global gitdir ui_status_value pch_error
927 set pchook [file join $gitdir hooks pre-commit]
929 # On Cygwin [file executable] might lie so we need to ask
930 # the shell if the hook is executable. Yes that's annoying.
932 if {[is_Windows] && [file isfile $pchook]} {
933 set pchook [list sh -c [concat \
934 "if test -x \"$pchook\";" \
935 "then exec \"$pchook\" 2>&1;" \
937 } elseif {[file executable $pchook]} {
938 set pchook [list $pchook |& cat]
940 commit_writetree $curHEAD $msg
944 set ui_status_value {Calling pre-commit hook...}
946 set fd_ph [open "| $pchook" r]
947 fconfigure $fd_ph -blocking 0 -translation binary
948 fileevent $fd_ph readable \
949 [list commit_prehook_wait $fd_ph $curHEAD $msg]
952 proc commit_prehook_wait {fd_ph curHEAD msg} {
953 global pch_error ui_status_value
955 append pch_error [read $fd_ph]
956 fconfigure $fd_ph -blocking 1
958 if {[catch {close $fd_ph}]} {
959 set ui_status_value {Commit declined by pre-commit hook.}
960 hook_failed_popup pre-commit $pch_error
963 commit_writetree $curHEAD $msg
968 fconfigure $fd_ph -blocking 0
971 proc commit_writetree {curHEAD msg} {
972 global ui_status_value
974 set ui_status_value {Committing changes...}
975 set fd_wt [open "| git write-tree" r]
976 fileevent $fd_wt readable \
977 [list commit_committree $fd_wt $curHEAD $msg]
980 proc commit_committree {fd_wt curHEAD msg} {
981 global HEAD PARENT MERGE_HEAD commit_type
982 global single_commit gitdir
983 global ui_status_value ui_comm selected_commit_type
984 global file_states selected_paths rescan_active
987 if {$tree_id eq {} || [catch {close $fd_wt} err]} {
988 error_popup "write-tree failed:\n\n$err"
989 set ui_status_value {Commit failed.}
994 # -- Create the commit.
996 set cmd [list git commit-tree $tree_id]
997 set parents [concat $PARENT $MERGE_HEAD]
998 if {[llength $parents] > 0} {
1003 # git commit-tree writes to stderr during initial commit.
1004 lappend cmd 2>/dev/null
1007 if {[catch {set cmt_id [eval exec $cmd]} err]} {
1008 error_popup "commit-tree failed:\n\n$err"
1009 set ui_status_value {Commit failed.}
1014 # -- Update the HEAD ref.
1017 if {$commit_type ne {normal}} {
1018 append reflogm " ($commit_type)"
1020 set i [string first "\n" $msg]
1022 append reflogm {: } [string range $msg 0 [expr {$i - 1}]]
1024 append reflogm {: } $msg
1026 set cmd [list git update-ref -m $reflogm HEAD $cmt_id $curHEAD]
1027 if {[catch {eval exec $cmd} err]} {
1028 error_popup "update-ref failed:\n\n$err"
1029 set ui_status_value {Commit failed.}
1034 # -- Cleanup after ourselves.
1036 catch {file delete [file join $gitdir MERGE_HEAD]}
1037 catch {file delete [file join $gitdir MERGE_MSG]}
1038 catch {file delete [file join $gitdir SQUASH_MSG]}
1039 catch {file delete [file join $gitdir GITGUI_MSG]}
1041 # -- Let rerere do its thing.
1043 if {[file isdirectory [file join $gitdir rr-cache]]} {
1044 catch {exec git rerere}
1047 # -- Run the post-commit hook.
1049 set pchook [file join $gitdir hooks post-commit]
1050 if {[is_Windows] && [file isfile $pchook]} {
1051 set pchook [list sh -c [concat \
1052 "if test -x \"$pchook\";" \
1053 "then exec \"$pchook\";" \
1055 } elseif {![file executable $pchook]} {
1058 if {$pchook ne {}} {
1059 catch {exec $pchook &}
1062 $ui_comm delete 0.0 end
1064 $ui_comm edit modified false
1066 if {$single_commit} do_quit
1068 # -- Update in memory status
1070 set selected_commit_type new
1071 set commit_type normal
1074 set MERGE_HEAD [list]
1076 foreach path [array names file_states] {
1077 set s $file_states($path)
1079 switch -glob -- $m {
1087 unset file_states($path)
1088 catch {unset selected_paths($path)}
1091 set file_states($path) [list _O [lindex $s 1] {} {}]
1098 set file_states($path) [list \
1099 _[string index $m 1] \
1110 set ui_status_value \
1111 "Changes committed as [string range $cmt_id 0 7]."
1114 ######################################################################
1118 proc fetch_from {remote} {
1119 set w [new_console "fetch $remote" \
1120 "Fetching new changes from $remote"]
1121 set cmd [list git fetch]
1123 console_exec $w $cmd
1126 proc pull_remote {remote branch} {
1127 global HEAD commit_type file_states repo_config
1129 if {![lock_index update]} return
1131 # -- Our in memory state should match the repository.
1133 repository_state curType curHEAD curMERGE_HEAD
1134 if {$commit_type ne $curType || $HEAD ne $curHEAD} {
1135 info_popup {Last scanned state does not match repository state.
1137 Another Git program has modified this repository
1138 since the last scan. A rescan must be performed
1139 before a pull operation can be started.
1141 The rescan will be automatically started now.
1144 rescan {set ui_status_value {Ready.}}
1148 # -- No differences should exist before a pull.
1150 if {[array size file_states] != 0} {
1151 error_popup {Uncommitted but modified files are present.
1153 You should not perform a pull with unmodified
1154 files in your working directory as Git will be
1155 unable to recover from an incorrect merge.
1157 You should commit or revert all changes before
1158 starting a pull operation.
1164 set w [new_console "pull $remote $branch" \
1165 "Pulling new changes from branch $branch in $remote"]
1166 set cmd [list git pull]
1167 if {$repo_config(gui.pullsummary) eq {false}} {
1168 lappend cmd --no-summary
1172 console_exec $w $cmd [list post_pull_remote $remote $branch]
1175 proc post_pull_remote {remote branch success} {
1176 global HEAD PARENT MERGE_HEAD commit_type selected_commit_type
1177 global ui_status_value
1181 repository_state commit_type HEAD MERGE_HEAD
1183 set selected_commit_type new
1184 set ui_status_value "Pulling $branch from $remote complete."
1186 rescan [list set ui_status_value \
1187 "Conflicts detected while pulling $branch from $remote."]
1191 proc push_to {remote} {
1192 set w [new_console "push $remote" \
1193 "Pushing changes to $remote"]
1194 set cmd [list git push]
1196 console_exec $w $cmd
1199 ######################################################################
1203 proc mapcol {state path} {
1204 global all_cols ui_other
1206 if {[catch {set r $all_cols($state)}]} {
1207 puts "error: no column for state={$state} $path"
1213 proc mapicon {state path} {
1216 if {[catch {set r $all_icons($state)}]} {
1217 puts "error: no icon for state={$state} $path"
1223 proc mapdesc {state path} {
1226 if {[catch {set r $all_descs($state)}]} {
1227 puts "error: no desc for state={$state} $path"
1233 proc escape_path {path} {
1234 regsub -all "\n" $path "\\n" path
1238 proc short_path {path} {
1239 return [escape_path [lindex [file split $path] end]]
1243 set null_sha1 [string repeat 0 40]
1245 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1246 global file_states next_icon_id null_sha1
1248 set s0 [string index $new_state 0]
1249 set s1 [string index $new_state 1]
1251 if {[catch {set info $file_states($path)}]} {
1253 set icon n[incr next_icon_id]
1255 set state [lindex $info 0]
1256 set icon [lindex $info 1]
1257 if {$head_info eq {}} {set head_info [lindex $info 2]}
1258 if {$index_info eq {}} {set index_info [lindex $info 3]}
1261 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1262 elseif {$s0 eq {_}} {set s0 _}
1264 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1265 elseif {$s1 eq {_}} {set s1 _}
1267 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1268 set head_info [list 0 $null_sha1]
1269 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1270 && $head_info eq {}} {
1271 set head_info $index_info
1274 set file_states($path) [list $s0$s1 $icon \
1275 $head_info $index_info \
1280 proc display_file {path state} {
1281 global file_states file_lists selected_paths
1283 set old_m [merge_state $path $state]
1284 set s $file_states($path)
1285 set new_m [lindex $s 0]
1286 set new_w [mapcol $new_m $path]
1287 set old_w [mapcol $old_m $path]
1288 set new_icon [mapicon $new_m $path]
1290 if {$new_m eq {__}} {
1291 set lno [lsearch -sorted $file_lists($old_w) $path]
1293 set file_lists($old_w) \
1294 [lreplace $file_lists($old_w) $lno $lno]
1296 $old_w conf -state normal
1297 $old_w delete $lno.0 [expr {$lno + 1}].0
1298 $old_w conf -state disabled
1300 unset file_states($path)
1301 catch {unset selected_paths($path)}
1305 if {$new_w ne $old_w} {
1306 set lno [lsearch -sorted $file_lists($old_w) $path]
1308 set file_lists($old_w) \
1309 [lreplace $file_lists($old_w) $lno $lno]
1311 $old_w conf -state normal
1312 $old_w delete $lno.0 [expr {$lno + 1}].0
1313 $old_w conf -state disabled
1316 lappend file_lists($new_w) $path
1317 set file_lists($new_w) [lsort $file_lists($new_w)]
1318 set lno [lsearch -sorted $file_lists($new_w) $path]
1320 $new_w conf -state normal
1321 $new_w image create $lno.0 \
1322 -align center -padx 5 -pady 1 \
1323 -name [lindex $s 1] \
1325 $new_w insert $lno.1 "[escape_path $path]\n"
1326 if {[catch {set in_sel $selected_paths($path)}]} {
1330 $new_w tag add in_sel $lno.0 [expr {$lno + 1}].0
1332 $new_w conf -state disabled
1333 } elseif {$new_icon ne [mapicon $old_m $path]} {
1334 $new_w conf -state normal
1335 $new_w image conf [lindex $s 1] -image $new_icon
1336 $new_w conf -state disabled
1340 proc display_all_files {} {
1341 global ui_index ui_other
1342 global file_states file_lists
1343 global last_clicked selected_paths
1345 $ui_index conf -state normal
1346 $ui_other conf -state normal
1348 $ui_index delete 0.0 end
1349 $ui_other delete 0.0 end
1352 set file_lists($ui_index) [list]
1353 set file_lists($ui_other) [list]
1355 foreach path [lsort [array names file_states]] {
1356 set s $file_states($path)
1358 set w [mapcol $m $path]
1359 lappend file_lists($w) $path
1360 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1361 $w image create end \
1362 -align center -padx 5 -pady 1 \
1363 -name [lindex $s 1] \
1364 -image [mapicon $m $path]
1365 $w insert end "[escape_path $path]\n"
1366 if {[catch {set in_sel $selected_paths($path)}]} {
1370 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
1374 $ui_index conf -state disabled
1375 $ui_other conf -state disabled
1378 proc update_indexinfo {msg pathList after} {
1379 global update_index_cp ui_status_value
1381 if {![lock_index update]} return
1383 set update_index_cp 0
1384 set pathList [lsort $pathList]
1385 set totalCnt [llength $pathList]
1386 set batch [expr {int($totalCnt * .01) + 1}]
1387 if {$batch > 25} {set batch 25}
1389 set ui_status_value [format \
1390 "$msg... %i/%i files (%.2f%%)" \
1394 set fd [open "| git update-index -z --index-info" w]
1400 fileevent $fd writable [list \
1401 write_update_indexinfo \
1411 proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
1412 global update_index_cp ui_status_value
1413 global file_states current_diff
1415 if {$update_index_cp >= $totalCnt} {
1422 for {set i $batch} \
1423 {$update_index_cp < $totalCnt && $i > 0} \
1425 set path [lindex $pathList $update_index_cp]
1426 incr update_index_cp
1428 set s $file_states($path)
1429 switch -glob -- [lindex $s 0] {
1435 set info [lindex $s 2]
1436 if {$info eq {}} continue
1438 puts -nonewline $fd $info
1439 puts -nonewline $fd "\t"
1440 puts -nonewline $fd $path
1441 puts -nonewline $fd "\0"
1442 display_file $path $new
1445 set ui_status_value [format \
1446 "$msg... %i/%i files (%.2f%%)" \
1449 [expr {100.0 * $update_index_cp / $totalCnt}]]
1452 proc update_index {msg pathList after} {
1453 global update_index_cp ui_status_value
1455 if {![lock_index update]} return
1457 set update_index_cp 0
1458 set pathList [lsort $pathList]
1459 set totalCnt [llength $pathList]
1460 set batch [expr {int($totalCnt * .01) + 1}]
1461 if {$batch > 25} {set batch 25}
1463 set ui_status_value [format \
1464 "$msg... %i/%i files (%.2f%%)" \
1468 set fd [open "| git update-index --add --remove -z --stdin" w]
1474 fileevent $fd writable [list \
1475 write_update_index \
1485 proc write_update_index {fd pathList totalCnt batch msg after} {
1486 global update_index_cp ui_status_value
1487 global file_states current_diff
1489 if {$update_index_cp >= $totalCnt} {
1496 for {set i $batch} \
1497 {$update_index_cp < $totalCnt && $i > 0} \
1499 set path [lindex $pathList $update_index_cp]
1500 incr update_index_cp
1502 switch -glob -- [lindex $file_states($path) 0] {
1518 puts -nonewline $fd $path
1519 puts -nonewline $fd "\0"
1520 display_file $path $new
1523 set ui_status_value [format \
1524 "$msg... %i/%i files (%.2f%%)" \
1527 [expr {100.0 * $update_index_cp / $totalCnt}]]
1530 proc checkout_index {msg pathList after} {
1531 global update_index_cp ui_status_value
1533 if {![lock_index update]} return
1535 set update_index_cp 0
1536 set pathList [lsort $pathList]
1537 set totalCnt [llength $pathList]
1538 set batch [expr {int($totalCnt * .01) + 1}]
1539 if {$batch > 25} {set batch 25}
1541 set ui_status_value [format \
1542 "$msg... %i/%i files (%.2f%%)" \
1546 set cmd [list git checkout-index]
1552 set fd [open "| $cmd " w]
1558 fileevent $fd writable [list \
1559 write_checkout_index \
1569 proc write_checkout_index {fd pathList totalCnt batch msg after} {
1570 global update_index_cp ui_status_value
1571 global file_states current_diff
1573 if {$update_index_cp >= $totalCnt} {
1580 for {set i $batch} \
1581 {$update_index_cp < $totalCnt && $i > 0} \
1583 set path [lindex $pathList $update_index_cp]
1584 incr update_index_cp
1586 switch -glob -- [lindex $file_states($path) 0] {
1596 puts -nonewline $fd $path
1597 puts -nonewline $fd "\0"
1598 display_file $path $new
1601 set ui_status_value [format \
1602 "$msg... %i/%i files (%.2f%%)" \
1605 [expr {100.0 * $update_index_cp / $totalCnt}]]
1608 ######################################################################
1610 ## branch management
1612 proc load_all_branches {} {
1615 set all_branches [list]
1616 set cmd [list git for-each-ref]
1617 lappend cmd --format=%(refname)
1618 lappend cmd refs/heads
1619 set fd [open "| $cmd" r]
1620 while {[gets $fd line] > 0} {
1621 if {[regsub ^refs/heads/ $line {} line]} {
1622 lappend all_branches $line
1627 set all_branches [lsort $all_branches]
1630 proc populate_branch_menu {m} {
1631 global all_branches disable_on_lock
1634 foreach b $all_branches {
1635 $m add radiobutton \
1637 -command [list switch_branch $b] \
1638 -variable current_branch \
1641 lappend disable_on_lock \
1642 [list $m entryconf [$m index last] -state]
1646 proc switch_branch {b} {
1647 error "NOT IMPLEMENTED"
1650 ######################################################################
1652 ## remote management
1654 proc load_all_remotes {} {
1655 global gitdir all_remotes repo_config
1657 set all_remotes [list]
1658 set rm_dir [file join $gitdir remotes]
1659 if {[file isdirectory $rm_dir]} {
1660 set all_remotes [concat $all_remotes [glob \
1664 -directory $rm_dir *]]
1667 foreach line [array names repo_config remote.*.url] {
1668 if {[regexp ^remote\.(.*)\.url\$ $line line name]} {
1669 lappend all_remotes $name
1673 set all_remotes [lsort -unique $all_remotes]
1676 proc populate_fetch_menu {m} {
1677 global gitdir all_remotes repo_config
1679 foreach r $all_remotes {
1681 if {![catch {set a $repo_config(remote.$r.url)}]} {
1682 if {![catch {set a $repo_config(remote.$r.fetch)}]} {
1687 set fd [open [file join $gitdir remotes $r] r]
1688 while {[gets $fd n] >= 0} {
1689 if {[regexp {^Pull:[ \t]*([^:]+):} $n]} {
1700 -label "Fetch from $r..." \
1701 -command [list fetch_from $r] \
1707 proc populate_push_menu {m} {
1708 global gitdir all_remotes repo_config
1710 foreach r $all_remotes {
1712 if {![catch {set a $repo_config(remote.$r.url)}]} {
1713 if {![catch {set a $repo_config(remote.$r.push)}]} {
1718 set fd [open [file join $gitdir remotes $r] r]
1719 while {[gets $fd n] >= 0} {
1720 if {[regexp {^Push:[ \t]*([^:]+):} $n]} {
1731 -label "Push to $r..." \
1732 -command [list push_to $r] \
1738 proc populate_pull_menu {m} {
1739 global gitdir repo_config all_remotes disable_on_lock
1741 foreach remote $all_remotes {
1743 if {[array get repo_config remote.$remote.url] ne {}} {
1744 if {[array get repo_config remote.$remote.fetch] ne {}} {
1745 regexp {^([^:]+):} \
1746 [lindex $repo_config(remote.$remote.fetch) 0] \
1751 set fd [open [file join $gitdir remotes $remote] r]
1752 while {[gets $fd line] >= 0} {
1753 if {[regexp {^Pull:[ \t]*([^:]+):} $line line rb]} {
1762 regsub ^refs/heads/ $rb {} rb_short
1763 if {$rb_short ne {}} {
1765 -label "Branch $rb_short from $remote..." \
1766 -command [list pull_remote $remote $rb] \
1768 lappend disable_on_lock \
1769 [list $m entryconf [$m index last] -state]
1774 ######################################################################
1779 #define mask_width 14
1780 #define mask_height 15
1781 static unsigned char mask_bits[] = {
1782 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1783 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1784 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1787 image create bitmap file_plain -background white -foreground black -data {
1788 #define plain_width 14
1789 #define plain_height 15
1790 static unsigned char plain_bits[] = {
1791 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1792 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1793 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1794 } -maskdata $filemask
1796 image create bitmap file_mod -background white -foreground blue -data {
1797 #define mod_width 14
1798 #define mod_height 15
1799 static unsigned char mod_bits[] = {
1800 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1801 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1802 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1803 } -maskdata $filemask
1805 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1806 #define file_fulltick_width 14
1807 #define file_fulltick_height 15
1808 static unsigned char file_fulltick_bits[] = {
1809 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1810 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1811 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1812 } -maskdata $filemask
1814 image create bitmap file_parttick -background white -foreground "#005050" -data {
1815 #define parttick_width 14
1816 #define parttick_height 15
1817 static unsigned char parttick_bits[] = {
1818 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1819 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1820 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1821 } -maskdata $filemask
1823 image create bitmap file_question -background white -foreground black -data {
1824 #define file_question_width 14
1825 #define file_question_height 15
1826 static unsigned char file_question_bits[] = {
1827 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1828 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1829 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1830 } -maskdata $filemask
1832 image create bitmap file_removed -background white -foreground red -data {
1833 #define file_removed_width 14
1834 #define file_removed_height 15
1835 static unsigned char file_removed_bits[] = {
1836 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1837 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1838 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1839 } -maskdata $filemask
1841 image create bitmap file_merge -background white -foreground blue -data {
1842 #define file_merge_width 14
1843 #define file_merge_height 15
1844 static unsigned char file_merge_bits[] = {
1845 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1846 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1847 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1848 } -maskdata $filemask
1850 set ui_index .vpane.files.index.list
1851 set ui_other .vpane.files.other.list
1852 set max_status_desc 0
1854 {__ i plain "Unmodified"}
1855 {_M i mod "Modified"}
1856 {M_ i fulltick "Included in commit"}
1857 {MM i parttick "Partially included"}
1858 {MD i question "Included (but gone)"}
1860 {_O o plain "Untracked"}
1861 {A_ o fulltick "Added by commit"}
1862 {AM o parttick "Partially added"}
1863 {AD o question "Added (but gone)"}
1865 {_D i question "Missing"}
1866 {DD i removed "Removed by commit"}
1867 {DO i removed "Removed (still exists)"}
1868 {DM i removed "Removed (but modified)"}
1870 {UD i merge "Merge conflicts"}
1871 {UM i merge "Merge conflicts"}
1872 {U_ i merge "Merge conflicts"}
1874 if {$max_status_desc < [string length [lindex $i 3]]} {
1875 set max_status_desc [string length [lindex $i 3]]
1877 if {[lindex $i 1] eq {i}} {
1878 set all_cols([lindex $i 0]) $ui_index
1880 set all_cols([lindex $i 0]) $ui_other
1882 set all_icons([lindex $i 0]) file_[lindex $i 2]
1883 set all_descs([lindex $i 0]) [lindex $i 3]
1887 ######################################################################
1892 global tcl_platform tk_library
1893 if {[tk windowingsystem] eq {aqua}} {
1899 proc is_Windows {} {
1901 if {$tcl_platform(platform) eq {windows}} {
1907 proc bind_button3 {w cmd} {
1908 bind $w <Any-Button-3> $cmd
1910 bind $w <Control-Button-1> $cmd
1914 proc incr_font_size {font {amt 1}} {
1915 set sz [font configure $font -size]
1917 font configure $font -size $sz
1918 font configure ${font}bold -size $sz
1921 proc hook_failed_popup {hook msg} {
1922 global gitdir appname
1928 label $w.m.l1 -text "$hook hook failed:" \
1933 -background white -borderwidth 1 \
1935 -width 80 -height 10 \
1937 -yscrollcommand [list $w.m.sby set]
1939 -text {You must correct the above errors before committing.} \
1943 scrollbar $w.m.sby -command [list $w.m.t yview]
1944 pack $w.m.l1 -side top -fill x
1945 pack $w.m.l2 -side bottom -fill x
1946 pack $w.m.sby -side right -fill y
1947 pack $w.m.t -side left -fill both -expand 1
1948 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
1950 $w.m.t insert 1.0 $msg
1951 $w.m.t conf -state disabled
1953 button $w.ok -text OK \
1956 -command "destroy $w"
1957 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
1959 bind $w <Visibility> "grab $w; focus $w"
1960 bind $w <Key-Return> "destroy $w"
1961 wm title $w "$appname ([lindex [file split \
1962 [file normalize [file dirname $gitdir]]] \
1967 set next_console_id 0
1969 proc new_console {short_title long_title} {
1970 global next_console_id console_data
1971 set w .console[incr next_console_id]
1972 set console_data($w) [list $short_title $long_title]
1973 return [console_init $w]
1976 proc console_init {w} {
1977 global console_cr console_data
1978 global gitdir appname M1B
1980 set console_cr($w) 1.0
1983 label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
1988 -background white -borderwidth 1 \
1990 -width 80 -height 10 \
1993 -yscrollcommand [list $w.m.sby set]
1994 label $w.m.s -text {Working... please wait...} \
1998 scrollbar $w.m.sby -command [list $w.m.t yview]
1999 pack $w.m.l1 -side top -fill x
2000 pack $w.m.s -side bottom -fill x
2001 pack $w.m.sby -side right -fill y
2002 pack $w.m.t -side left -fill both -expand 1
2003 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
2005 menu $w.ctxm -tearoff 0
2006 $w.ctxm add command -label "Copy" \
2008 -command "tk_textCopy $w.m.t"
2009 $w.ctxm add command -label "Select All" \
2011 -command "$w.m.t tag add sel 0.0 end"
2012 $w.ctxm add command -label "Copy All" \
2015 $w.m.t tag add sel 0.0 end
2017 $w.m.t tag remove sel 0.0 end
2020 button $w.ok -text {Close} \
2023 -command "destroy $w"
2024 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
2026 bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
2027 bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
2028 bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
2029 bind $w <Visibility> "focus $w"
2030 wm title $w "$appname ([lindex [file split \
2031 [file normalize [file dirname $gitdir]]] \
2032 end]): [lindex $console_data($w) 0]"
2036 proc console_exec {w cmd {after {}}} {
2037 # -- Windows tosses the enviroment when we exec our child.
2038 # But most users need that so we have to relogin. :-(
2041 set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
2044 # -- Tcl won't let us redirect both stdout and stderr to
2045 # the same pipe. So pass it through cat...
2047 set cmd [concat | $cmd |& cat]
2049 set fd_f [open $cmd r]
2050 fconfigure $fd_f -blocking 0 -translation binary
2051 fileevent $fd_f readable [list console_read $w $fd_f $after]
2054 proc console_read {w fd after} {
2055 global console_cr console_data
2059 if {![winfo exists $w]} {console_init $w}
2060 $w.m.t conf -state normal
2062 set n [string length $buf]
2064 set cr [string first "\r" $buf $c]
2065 set lf [string first "\n" $buf $c]
2066 if {$cr < 0} {set cr [expr {$n + 1}]}
2067 if {$lf < 0} {set lf [expr {$n + 1}]}
2070 $w.m.t insert end [string range $buf $c $lf]
2071 set console_cr($w) [$w.m.t index {end -1c}]
2075 $w.m.t delete $console_cr($w) end
2076 $w.m.t insert end "\n"
2077 $w.m.t insert end [string range $buf $c $cr]
2082 $w.m.t conf -state disabled
2086 fconfigure $fd -blocking 1
2088 if {[catch {close $fd}]} {
2089 if {![winfo exists $w]} {console_init $w}
2090 $w.m.s conf -background red -text {Error: Command Failed}
2091 $w.ok conf -state normal
2093 } elseif {[winfo exists $w]} {
2094 $w.m.s conf -background green -text {Success}
2095 $w.ok conf -state normal
2098 array unset console_cr $w
2099 array unset console_data $w
2101 uplevel #0 $after $ok
2105 fconfigure $fd -blocking 0
2108 ######################################################################
2112 set starting_gitk_msg {Please wait... Starting gitk...}
2114 proc do_gitk {revs} {
2115 global ui_status_value starting_gitk_msg
2123 set cmd "sh -c \"exec $cmd\""
2127 if {[catch {eval exec $cmd} err]} {
2128 error_popup "Failed to start gitk:\n\n$err"
2130 set ui_status_value $starting_gitk_msg
2132 if {$ui_status_value eq $starting_gitk_msg} {
2133 set ui_status_value {Ready.}
2140 set w [new_console {repack} \
2141 {Repacking the object database}]
2142 set cmd [list git repack]
2145 console_exec $w $cmd
2148 proc do_fsck_objects {} {
2149 set w [new_console {fsck-objects} \
2150 {Verifying the object database with fsck-objects}]
2151 set cmd [list git fsck-objects]
2154 lappend cmd --strict
2155 console_exec $w $cmd
2161 global gitdir ui_comm is_quitting repo_config commit_type
2163 if {$is_quitting} return
2166 # -- Stash our current commit buffer.
2168 set save [file join $gitdir GITGUI_MSG]
2169 set msg [string trim [$ui_comm get 0.0 end]]
2170 if {![string match amend* $commit_type]
2171 && [$ui_comm edit modified]
2174 set fd [open $save w]
2175 puts $fd [string trim [$ui_comm get 0.0 end]]
2179 catch {file delete $save}
2182 # -- Stash our current window geometry into this repository.
2184 set cfg_geometry [list]
2185 lappend cfg_geometry [wm geometry .]
2186 lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
2187 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
2188 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2191 if {$cfg_geometry ne $rc_geometry} {
2192 catch {exec git repo-config gui.geometry $cfg_geometry}
2199 rescan {set ui_status_value {Ready.}}
2202 proc remove_helper {txt paths} {
2203 global file_states current_diff
2205 if {![lock_index begin-update]} return
2209 foreach path $paths {
2210 switch -glob -- [lindex $file_states($path) 0] {
2214 lappend pathList $path
2215 if {$path eq $current_diff} {
2216 set after {reshow_diff;}
2221 if {$pathList eq {}} {
2227 [concat $after {set ui_status_value {Ready.}}]
2231 proc do_remove_selection {} {
2232 global current_diff selected_paths
2234 if {[array size selected_paths] > 0} {
2236 {Removing selected files from commit} \
2237 [array names selected_paths]
2238 } elseif {$current_diff ne {}} {
2240 "Removing [short_path $current_diff] from commit" \
2241 [list $current_diff]
2245 proc include_helper {txt paths} {
2246 global file_states current_diff
2248 if {![lock_index begin-update]} return
2252 foreach path $paths {
2253 switch -glob -- [lindex $file_states($path) 0] {
2262 lappend pathList $path
2263 if {$path eq $current_diff} {
2264 set after {reshow_diff;}
2269 if {$pathList eq {}} {
2275 [concat $after {set ui_status_value {Ready to commit.}}]
2279 proc do_include_selection {} {
2280 global current_diff selected_paths
2282 if {[array size selected_paths] > 0} {
2284 {Including selected files} \
2285 [array names selected_paths]
2286 } elseif {$current_diff ne {}} {
2288 "Including [short_path $current_diff]" \
2289 [list $current_diff]
2293 proc do_include_all {} {
2297 foreach path [array names file_states] {
2298 switch -- [lindex $file_states($path) 0] {
2304 _D {lappend paths $path}
2308 {Including all modified files} \
2312 proc revert_helper {txt paths} {
2313 global file_states current_diff
2315 if {![lock_index begin-update]} return
2319 foreach path $paths {
2320 switch -glob -- [lindex $file_states($path) 0] {
2327 lappend pathList $path
2328 if {$path eq $current_diff} {
2329 set after {reshow_diff;}
2335 set n [llength $pathList]
2339 } elseif {$n == 1} {
2340 set s "[short_path [lindex $pathList]]"
2342 set s "these $n files"
2345 set reply [tk_dialog \
2348 "Revert unincluded changes in $s?
2350 Any unincluded changes will be permanently lost by the revert." \
2360 [concat $after {set ui_status_value {Ready.}}]
2366 proc do_revert_selection {} {
2367 global current_diff selected_paths
2369 if {[array size selected_paths] > 0} {
2371 {Reverting selected files} \
2372 [array names selected_paths]
2373 } elseif {$current_diff ne {}} {
2375 "Reverting [short_path $current_diff]" \
2376 [list $current_diff]
2380 proc do_signoff {} {
2383 set me [committer_ident]
2384 if {$me eq {}} return
2386 set sob "Signed-off-by: $me"
2387 set last [$ui_comm get {end -1c linestart} {end -1c}]
2388 if {$last ne $sob} {
2389 $ui_comm edit separator
2391 && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
2392 $ui_comm insert end "\n"
2394 $ui_comm insert end "\n$sob"
2395 $ui_comm edit separator
2400 proc do_select_commit_type {} {
2401 global commit_type selected_commit_type
2403 if {$selected_commit_type eq {new}
2404 && [string match amend* $commit_type]} {
2406 } elseif {$selected_commit_type eq {amend}
2407 && ![string match amend* $commit_type]} {
2410 # The amend request was rejected...
2412 if {![string match amend* $commit_type]} {
2413 set selected_commit_type new
2423 global appname copyright
2424 global tcl_patchLevel tk_patchLevel
2428 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2430 label $w.header -text "About $appname" \
2432 pack $w.header -side top -fill x
2435 button $w.buttons.close -text {Close} \
2437 -command [list destroy $w]
2438 pack $w.buttons.close -side right
2439 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2442 -text "$appname - a commit creation tool for Git.
2450 pack $w.desc -side top -fill x -padx 5 -pady 5
2452 set v [exec git --version]
2454 if {$tcl_patchLevel eq $tk_patchLevel} {
2455 append v "Tcl/Tk version $tcl_patchLevel"
2457 append v "Tcl version $tcl_patchLevel"
2458 append v ", Tk version $tk_patchLevel"
2469 pack $w.vers -side top -fill x -padx 5 -pady 5
2471 bind $w <Visibility> "grab $w; focus $w"
2472 bind $w <Key-Escape> "destroy $w"
2473 wm title $w "About $appname"
2477 proc do_options {} {
2478 global appname gitdir font_descs
2479 global repo_config global_config
2480 global repo_config_new global_config_new
2482 array unset repo_config_new
2483 array unset global_config_new
2484 foreach name [array names repo_config] {
2485 set repo_config_new($name) $repo_config($name)
2488 foreach name [array names repo_config] {
2490 gui.diffcontext {continue}
2492 set repo_config_new($name) $repo_config($name)
2494 foreach name [array names global_config] {
2495 set global_config_new($name) $global_config($name)
2497 set reponame [lindex [file split \
2498 [file normalize [file dirname $gitdir]]] \
2501 set w .options_editor
2503 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2505 label $w.header -text "$appname Options" \
2507 pack $w.header -side top -fill x
2510 button $w.buttons.restore -text {Restore Defaults} \
2512 -command do_restore_defaults
2513 pack $w.buttons.restore -side left
2514 button $w.buttons.save -text Save \
2516 -command [list do_save_config $w]
2517 pack $w.buttons.save -side right
2518 button $w.buttons.cancel -text {Cancel} \
2520 -command [list destroy $w]
2521 pack $w.buttons.cancel -side right
2522 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2524 labelframe $w.repo -text "$reponame Repository" \
2526 -relief raised -borderwidth 2
2527 labelframe $w.global -text {Global (All Repositories)} \
2529 -relief raised -borderwidth 2
2530 pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
2531 pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
2534 {b partialinclude {Allow Partially Included Files}}
2535 {b pullsummary {Show Pull Summary}}
2536 {b trustmtime {Trust File Modification Timestamps}}
2537 {i diffcontext {Number of Diff Context Lines}}
2539 set type [lindex $option 0]
2540 set name [lindex $option 1]
2541 set text [lindex $option 2]
2542 foreach f {repo global} {
2545 checkbutton $w.$f.$name -text $text \
2546 -variable ${f}_config_new(gui.$name) \
2550 pack $w.$f.$name -side top -anchor w
2554 label $w.$f.$name.l -text "$text:" -font font_ui
2555 pack $w.$f.$name.l -side left -anchor w -fill x
2556 spinbox $w.$f.$name.v \
2557 -textvariable ${f}_config_new(gui.$name) \
2558 -from 1 -to 99 -increment 1 \
2561 pack $w.$f.$name.v -side right -anchor e
2562 pack $w.$f.$name -side top -anchor w -fill x
2568 set all_fonts [lsort [font families]]
2569 foreach option $font_descs {
2570 set name [lindex $option 0]
2571 set font [lindex $option 1]
2572 set text [lindex $option 2]
2574 set global_config_new(gui.$font^^family) \
2575 [font configure $font -family]
2576 set global_config_new(gui.$font^^size) \
2577 [font configure $font -size]
2579 frame $w.global.$name
2580 label $w.global.$name.l -text "$text:" -font font_ui
2581 pack $w.global.$name.l -side left -anchor w -fill x
2582 eval tk_optionMenu $w.global.$name.family \
2583 global_config_new(gui.$font^^family) \
2585 spinbox $w.global.$name.size \
2586 -textvariable global_config_new(gui.$font^^size) \
2587 -from 2 -to 80 -increment 1 \
2590 pack $w.global.$name.size -side right -anchor e
2591 pack $w.global.$name.family -side right -anchor e
2592 pack $w.global.$name -side top -anchor w -fill x
2595 bind $w <Visibility> "grab $w; focus $w"
2596 bind $w <Key-Escape> "destroy $w"
2597 wm title $w "$appname ($reponame): Options"
2601 proc do_restore_defaults {} {
2602 global font_descs default_config repo_config
2603 global repo_config_new global_config_new
2605 foreach name [array names default_config] {
2606 set repo_config_new($name) $default_config($name)
2607 set global_config_new($name) $default_config($name)
2610 foreach option $font_descs {
2611 set name [lindex $option 0]
2612 set repo_config(gui.$name) $default_config(gui.$name)
2616 foreach option $font_descs {
2617 set name [lindex $option 0]
2618 set font [lindex $option 1]
2619 set global_config_new(gui.$font^^family) \
2620 [font configure $font -family]
2621 set global_config_new(gui.$font^^size) \
2622 [font configure $font -size]
2626 proc do_save_config {w} {
2627 if {[catch {save_config} err]} {
2628 error_popup "Failed to completely save options:\n\n$err"
2634 proc do_windows_shortcut {} {
2635 global gitdir appname argv0
2637 set reponame [lindex [file split \
2638 [file normalize [file dirname $gitdir]]] \
2642 set desktop [exec cygpath \
2650 set fn [tk_getSaveFile \
2652 -title "$appname ($reponame): Create Desktop Icon" \
2653 -initialdir $desktop \
2654 -initialfile "Git $reponame.bat"]
2658 set sh [exec cygpath \
2663 set me [exec cygpath \
2667 set gd [exec cygpath \
2671 regsub -all ' $me "'\\''" me
2672 regsub -all ' $gd "'\\''" gd
2673 puts -nonewline $fd "\"$sh\" --login -c \""
2674 puts -nonewline $fd "GIT_DIR='$gd'"
2675 puts -nonewline $fd " '$me'"
2679 error_popup "Cannot write script:\n\n$err"
2684 proc do_macosx_app {} {
2685 global gitdir appname argv0 env
2687 set reponame [lindex [file split \
2688 [file normalize [file dirname $gitdir]]] \
2691 set fn [tk_getSaveFile \
2693 -title "$appname ($reponame): Create Desktop Icon" \
2694 -initialdir [file join $env(HOME) Desktop] \
2695 -initialfile "Git $reponame.app"]
2698 set Contents [file join $fn Contents]
2699 set MacOS [file join $Contents MacOS]
2700 set exe [file join $MacOS git-gui]
2704 set fd [open [file join $Contents Info.plist] w]
2705 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
2706 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
2707 <plist version="1.0">
2709 <key>CFBundleDevelopmentRegion</key>
2710 <string>English</string>
2711 <key>CFBundleExecutable</key>
2712 <string>git-gui</string>
2713 <key>CFBundleIdentifier</key>
2714 <string>org.spearce.git-gui</string>
2715 <key>CFBundleInfoDictionaryVersion</key>
2716 <string>6.0</string>
2717 <key>CFBundlePackageType</key>
2718 <string>APPL</string>
2719 <key>CFBundleSignature</key>
2720 <string>????</string>
2721 <key>CFBundleVersion</key>
2722 <string>1.0</string>
2723 <key>NSPrincipalClass</key>
2724 <string>NSApplication</string>
2729 set fd [open $exe w]
2730 set gd [file normalize $gitdir]
2731 set ep [file normalize [exec git --exec-path]]
2732 regsub -all ' $gd "'\\''" gd
2733 regsub -all ' $ep "'\\''" ep
2734 puts $fd "#!/bin/sh"
2735 foreach name [array names env] {
2736 if {[string match GIT_* $name]} {
2737 regsub -all ' $env($name) "'\\''" v
2738 puts $fd "export $name='$v'"
2741 puts $fd "export PATH='$ep':\$PATH"
2742 puts $fd "export GIT_DIR='$gd'"
2743 puts $fd "exec [file normalize $argv0]"
2746 file attributes $exe -permissions u+x,g+x,o+x
2748 error_popup "Cannot write icon:\n\n$err"
2753 proc toggle_or_diff {w x y} {
2754 global file_states file_lists current_diff ui_index ui_other
2755 global last_clicked selected_paths
2757 set pos [split [$w index @$x,$y] .]
2758 set lno [lindex $pos 0]
2759 set col [lindex $pos 1]
2760 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2766 set last_clicked [list $w $lno]
2767 array unset selected_paths
2768 $ui_index tag remove in_sel 0.0 end
2769 $ui_other tag remove in_sel 0.0 end
2772 if {$current_diff eq $path} {
2773 set after {reshow_diff;}
2777 switch -glob -- [lindex $file_states($path) 0] {
2784 "Removing [short_path $path] from commit" \
2786 [concat $after {set ui_status_value {Ready.}}]
2790 "Including [short_path $path]" \
2792 [concat $after {set ui_status_value {Ready.}}]
2796 show_diff $path $w $lno
2800 proc add_one_to_selection {w x y} {
2802 global last_clicked selected_paths
2804 set pos [split [$w index @$x,$y] .]
2805 set lno [lindex $pos 0]
2806 set col [lindex $pos 1]
2807 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2813 set last_clicked [list $w $lno]
2814 if {[catch {set in_sel $selected_paths($path)}]} {
2818 unset selected_paths($path)
2819 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2821 set selected_paths($path) 1
2822 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2826 proc add_range_to_selection {w x y} {
2828 global last_clicked selected_paths
2830 if {[lindex $last_clicked 0] ne $w} {
2831 toggle_or_diff $w $x $y
2835 set pos [split [$w index @$x,$y] .]
2836 set lno [lindex $pos 0]
2837 set lc [lindex $last_clicked 1]
2846 foreach path [lrange $file_lists($w) \
2847 [expr {$begin - 1}] \
2848 [expr {$end - 1}]] {
2849 set selected_paths($path) 1
2851 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2854 ######################################################################
2858 set cursor_ptr arrow
2859 font create font_diff -family Courier -size 10
2863 eval font configure font_ui [font actual [.dummy cget -font]]
2867 font create font_uibold
2868 font create font_diffbold
2873 } elseif {[is_MacOSX]} {
2881 proc apply_config {} {
2882 global repo_config font_descs
2884 foreach option $font_descs {
2885 set name [lindex $option 0]
2886 set font [lindex $option 1]
2888 foreach {cn cv} $repo_config(gui.$name) {
2889 font configure $font $cn $cv
2892 error_popup "Invalid font specified in gui.$name:\n\n$err"
2894 foreach {cn cv} [font configure $font] {
2895 font configure ${font}bold $cn $cv
2897 font configure ${font}bold -weight bold
2901 set default_config(gui.trustmtime) false
2902 set default_config(gui.pullsummary) true
2903 set default_config(gui.partialinclude) false
2904 set default_config(gui.diffcontext) 5
2905 set default_config(gui.fontui) [font configure font_ui]
2906 set default_config(gui.fontdiff) [font configure font_diff]
2908 {fontui font_ui {Main Font}}
2909 {fontdiff font_diff {Diff/Console Font}}
2914 ######################################################################
2920 menu .mbar -tearoff 0
2921 .mbar add cascade -label Repository -menu .mbar.repository
2922 .mbar add cascade -label Edit -menu .mbar.edit
2923 if {!$single_commit} {
2924 .mbar add cascade -label Branch -menu .mbar.branch
2926 .mbar add cascade -label Commit -menu .mbar.commit
2927 if {!$single_commit} {
2928 .mbar add cascade -label Fetch -menu .mbar.fetch
2929 .mbar add cascade -label Pull -menu .mbar.pull
2930 .mbar add cascade -label Push -menu .mbar.push
2932 . configure -menu .mbar
2934 # -- Repository Menu
2936 menu .mbar.repository
2937 .mbar.repository add command \
2938 -label {Visualize Current Branch} \
2939 -command {do_gitk {}} \
2942 .mbar.repository add command \
2943 -label {Visualize All Branches} \
2944 -command {do_gitk {--all}} \
2947 .mbar.repository add separator
2949 if {!$single_commit} {
2950 .mbar.repository add command -label {Repack Database} \
2951 -command do_repack \
2954 .mbar.repository add command -label {Verify Database} \
2955 -command do_fsck_objects \
2958 .mbar.repository add separator
2961 .mbar.repository add command \
2962 -label {Create Desktop Icon} \
2963 -command do_windows_shortcut \
2965 } elseif {[is_MacOSX]} {
2966 .mbar.repository add command \
2967 -label {Create Desktop Icon} \
2968 -command do_macosx_app \
2972 .mbar.repository add command -label Quit \
2974 -accelerator $M1T-Q \
2980 .mbar.edit add command -label Undo \
2981 -command {catch {[focus] edit undo}} \
2982 -accelerator $M1T-Z \
2984 .mbar.edit add command -label Redo \
2985 -command {catch {[focus] edit redo}} \
2986 -accelerator $M1T-Y \
2988 .mbar.edit add separator
2989 .mbar.edit add command -label Cut \
2990 -command {catch {tk_textCut [focus]}} \
2991 -accelerator $M1T-X \
2993 .mbar.edit add command -label Copy \
2994 -command {catch {tk_textCopy [focus]}} \
2995 -accelerator $M1T-C \
2997 .mbar.edit add command -label Paste \
2998 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
2999 -accelerator $M1T-V \
3001 .mbar.edit add command -label Delete \
3002 -command {catch {[focus] delete sel.first sel.last}} \
3005 .mbar.edit add separator
3006 .mbar.edit add command -label {Select All} \
3007 -command {catch {[focus] tag add sel 0.0 end}} \
3008 -accelerator $M1T-A \
3011 if {!$single_commit} {
3016 .mbar.branch add command -label {Create...} \
3017 -command do_create_branch \
3019 lappend disable_on_lock [list .mbar.branch entryconf \
3020 [.mbar.branch index last] -state]
3022 .mbar.branch add command -label {Delete...} \
3023 -command do_delete_branch \
3025 lappend disable_on_lock [list .mbar.branch entryconf \
3026 [.mbar.branch index last] -state]
3033 .mbar.commit add radiobutton \
3034 -label {New Commit} \
3035 -command do_select_commit_type \
3036 -variable selected_commit_type \
3039 lappend disable_on_lock \
3040 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3042 .mbar.commit add radiobutton \
3043 -label {Amend Last Commit} \
3044 -command do_select_commit_type \
3045 -variable selected_commit_type \
3048 lappend disable_on_lock \
3049 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3051 .mbar.commit add separator
3053 .mbar.commit add command -label Rescan \
3054 -command do_rescan \
3057 lappend disable_on_lock \
3058 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3060 .mbar.commit add command -label {Include In Commit} \
3061 -command do_include_selection \
3063 lappend disable_on_lock \
3064 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3066 .mbar.commit add command -label {Include All In Commit} \
3067 -command do_include_all \
3068 -accelerator $M1T-I \
3070 lappend disable_on_lock \
3071 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3073 .mbar.commit add command -label {Remove From Commit} \
3074 -command do_remove_selection \
3076 lappend disable_on_lock \
3077 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3079 .mbar.commit add command -label {Revert Changes} \
3080 -command do_revert_selection \
3082 lappend disable_on_lock \
3083 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3085 .mbar.commit add separator
3087 .mbar.commit add command -label {Sign Off} \
3088 -command do_signoff \
3089 -accelerator $M1T-S \
3092 .mbar.commit add command -label Commit \
3093 -command do_commit \
3094 -accelerator $M1T-Return \
3096 lappend disable_on_lock \
3097 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3099 # -- Transport menus
3101 if {!$single_commit} {
3108 # -- Apple Menu (Mac OS X only)
3110 .mbar add cascade -label Apple -menu .mbar.apple
3113 .mbar.apple add command -label "About $appname" \
3116 .mbar.apple add command -label "$appname Options..." \
3117 -command do_options \
3122 .mbar.edit add separator
3123 .mbar.edit add command -label {Options...} \
3124 -command do_options \
3129 .mbar add cascade -label Help -menu .mbar.help
3132 .mbar.help add command -label "About $appname" \
3144 -text {Current Branch:} \
3149 -textvariable current_branch \
3153 pack .branch.l1 -side left
3154 pack .branch.cb -side left -fill x
3155 pack .branch -side top -fill x
3157 # -- Main Window Layout
3159 panedwindow .vpane -orient vertical
3160 panedwindow .vpane.files -orient horizontal
3161 .vpane add .vpane.files -sticky nsew -height 100 -width 400
3162 pack .vpane -anchor n -side top -fill both -expand 1
3164 # -- Index File List
3166 frame .vpane.files.index -height 100 -width 400
3167 label .vpane.files.index.title -text {Modified Files} \
3170 text $ui_index -background white -borderwidth 0 \
3171 -width 40 -height 10 \
3173 -cursor $cursor_ptr \
3174 -yscrollcommand {.vpane.files.index.sb set} \
3176 scrollbar .vpane.files.index.sb -command [list $ui_index yview]
3177 pack .vpane.files.index.title -side top -fill x
3178 pack .vpane.files.index.sb -side right -fill y
3179 pack $ui_index -side left -fill both -expand 1
3180 .vpane.files add .vpane.files.index -sticky nsew
3182 # -- Other (Add) File List
3184 frame .vpane.files.other -height 100 -width 100
3185 label .vpane.files.other.title -text {Untracked Files} \
3188 text $ui_other -background white -borderwidth 0 \
3189 -width 40 -height 10 \
3191 -cursor $cursor_ptr \
3192 -yscrollcommand {.vpane.files.other.sb set} \
3194 scrollbar .vpane.files.other.sb -command [list $ui_other yview]
3195 pack .vpane.files.other.title -side top -fill x
3196 pack .vpane.files.other.sb -side right -fill y
3197 pack $ui_other -side left -fill both -expand 1
3198 .vpane.files add .vpane.files.other -sticky nsew
3200 foreach i [list $ui_index $ui_other] {
3201 $i tag conf in_diff -font font_uibold
3202 $i tag conf in_sel \
3203 -background [$i cget -foreground] \
3204 -foreground [$i cget -background]
3208 # -- Diff and Commit Area
3210 frame .vpane.lower -height 300 -width 400
3211 frame .vpane.lower.commarea
3212 frame .vpane.lower.diff -relief sunken -borderwidth 1
3213 pack .vpane.lower.commarea -side top -fill x
3214 pack .vpane.lower.diff -side bottom -fill both -expand 1
3215 .vpane add .vpane.lower -stick nsew
3217 # -- Commit Area Buttons
3219 frame .vpane.lower.commarea.buttons
3220 label .vpane.lower.commarea.buttons.l -text {} \
3224 pack .vpane.lower.commarea.buttons.l -side top -fill x
3225 pack .vpane.lower.commarea.buttons -side left -fill y
3227 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
3228 -command do_rescan \
3230 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3231 lappend disable_on_lock \
3232 {.vpane.lower.commarea.buttons.rescan conf -state}
3234 button .vpane.lower.commarea.buttons.incall -text {Include All} \
3235 -command do_include_all \
3237 pack .vpane.lower.commarea.buttons.incall -side top -fill x
3238 lappend disable_on_lock \
3239 {.vpane.lower.commarea.buttons.incall conf -state}
3241 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
3242 -command do_signoff \
3244 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3246 button .vpane.lower.commarea.buttons.commit -text {Commit} \
3247 -command do_commit \
3249 pack .vpane.lower.commarea.buttons.commit -side top -fill x
3250 lappend disable_on_lock \
3251 {.vpane.lower.commarea.buttons.commit conf -state}
3253 # -- Commit Message Buffer
3255 frame .vpane.lower.commarea.buffer
3256 frame .vpane.lower.commarea.buffer.header
3257 set ui_comm .vpane.lower.commarea.buffer.t
3258 set ui_coml .vpane.lower.commarea.buffer.header.l
3259 radiobutton .vpane.lower.commarea.buffer.header.new \
3260 -text {New Commit} \
3261 -command do_select_commit_type \
3262 -variable selected_commit_type \
3265 lappend disable_on_lock \
3266 [list .vpane.lower.commarea.buffer.header.new conf -state]
3267 radiobutton .vpane.lower.commarea.buffer.header.amend \
3268 -text {Amend Last Commit} \
3269 -command do_select_commit_type \
3270 -variable selected_commit_type \
3273 lappend disable_on_lock \
3274 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3279 proc trace_commit_type {varname args} {
3280 global ui_coml commit_type
3281 switch -glob -- $commit_type {
3282 initial {set txt {Initial Commit Message:}}
3283 amend {set txt {Amended Commit Message:}}
3284 amend-initial {set txt {Amended Initial Commit Message:}}
3285 amend-merge {set txt {Amended Merge Commit Message:}}
3286 merge {set txt {Merge Commit Message:}}
3287 * {set txt {Commit Message:}}
3289 $ui_coml conf -text $txt
3291 trace add variable commit_type write trace_commit_type
3292 pack $ui_coml -side left -fill x
3293 pack .vpane.lower.commarea.buffer.header.amend -side right
3294 pack .vpane.lower.commarea.buffer.header.new -side right
3296 text $ui_comm -background white -borderwidth 1 \
3299 -autoseparators true \
3301 -width 75 -height 9 -wrap none \
3303 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3304 scrollbar .vpane.lower.commarea.buffer.sby \
3305 -command [list $ui_comm yview]
3306 pack .vpane.lower.commarea.buffer.header -side top -fill x
3307 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3308 pack $ui_comm -side left -fill y
3309 pack .vpane.lower.commarea.buffer -side left -fill y
3311 # -- Commit Message Buffer Context Menu
3313 set ctxm .vpane.lower.commarea.buffer.ctxm
3314 menu $ctxm -tearoff 0
3318 -command {tk_textCut $ui_comm}
3322 -command {tk_textCopy $ui_comm}
3326 -command {tk_textPaste $ui_comm}
3330 -command {$ui_comm delete sel.first sel.last}
3333 -label {Select All} \
3335 -command {$ui_comm tag add sel 0.0 end}
3340 $ui_comm tag add sel 0.0 end
3341 tk_textCopy $ui_comm
3342 $ui_comm tag remove sel 0.0 end
3349 bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
3354 set diff_actions [list]
3355 proc trace_current_diff {varname args} {
3356 global current_diff diff_actions file_states
3357 if {$current_diff eq {}} {
3364 set s [mapdesc [lindex $file_states($p) 0] $p]
3366 set p [escape_path $p]
3370 .vpane.lower.diff.header.status configure -text $s
3371 .vpane.lower.diff.header.file configure -text $f
3372 .vpane.lower.diff.header.path configure -text $p
3373 foreach w $diff_actions {
3377 trace add variable current_diff write trace_current_diff
3379 frame .vpane.lower.diff.header -background orange
3380 label .vpane.lower.diff.header.status \
3381 -background orange \
3382 -width $max_status_desc \
3386 label .vpane.lower.diff.header.file \
3387 -background orange \
3391 label .vpane.lower.diff.header.path \
3392 -background orange \
3396 pack .vpane.lower.diff.header.status -side left
3397 pack .vpane.lower.diff.header.file -side left
3398 pack .vpane.lower.diff.header.path -fill x
3399 set ctxm .vpane.lower.diff.header.ctxm
3400 menu $ctxm -tearoff 0
3411 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3412 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3416 frame .vpane.lower.diff.body
3417 set ui_diff .vpane.lower.diff.body.t
3418 text $ui_diff -background white -borderwidth 0 \
3419 -width 80 -height 15 -wrap none \
3421 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3422 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3424 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3425 -command [list $ui_diff xview]
3426 scrollbar .vpane.lower.diff.body.sby -orient vertical \
3427 -command [list $ui_diff yview]
3428 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3429 pack .vpane.lower.diff.body.sby -side right -fill y
3430 pack $ui_diff -side left -fill both -expand 1
3431 pack .vpane.lower.diff.header -side top -fill x
3432 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3434 $ui_diff tag conf d_@ -font font_diffbold
3435 $ui_diff tag conf d_+ -foreground blue
3436 $ui_diff tag conf d_- -foreground red
3437 $ui_diff tag conf d_++ -foreground {#00a000}
3438 $ui_diff tag conf d_-- -foreground {#a000a0}
3439 $ui_diff tag conf d_+- \
3441 -background {light goldenrod yellow}
3442 $ui_diff tag conf d_-+ \
3446 # -- Diff Body Context Menu
3448 set ctxm .vpane.lower.diff.body.ctxm
3449 menu $ctxm -tearoff 0
3453 -command {tk_textCopy $ui_diff}
3454 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3456 -label {Select All} \
3458 -command {$ui_diff tag add sel 0.0 end}
3459 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3464 $ui_diff tag add sel 0.0 end
3465 tk_textCopy $ui_diff
3466 $ui_diff tag remove sel 0.0 end
3468 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3471 -label {Decrease Font Size} \
3473 -command {incr_font_size font_diff -1}
3474 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3476 -label {Increase Font Size} \
3478 -command {incr_font_size font_diff 1}
3479 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3482 -label {Show Less Context} \
3484 -command {if {$repo_config(gui.diffcontext) >= 2} {
3485 incr repo_config(gui.diffcontext) -1
3488 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3490 -label {Show More Context} \
3493 incr repo_config(gui.diffcontext)
3496 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3498 $ctxm add command -label {Options...} \
3501 bind_button3 $ui_diff "tk_popup $ctxm %X %Y"
3505 set ui_status_value {Initializing...}
3506 label .status -textvariable ui_status_value \
3512 pack .status -anchor w -side bottom -fill x
3517 set gm $repo_config(gui.geometry)
3518 wm geometry . [lindex $gm 0]
3519 .vpane sash place 0 \
3520 [lindex [.vpane sash coord 0] 0] \
3522 .vpane.files sash place 0 \
3524 [lindex [.vpane.files sash coord 0] 1]
3530 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3531 bind $ui_comm <$M1B-Key-i> {do_include_all;break}
3532 bind $ui_comm <$M1B-Key-I> {do_include_all;break}
3533 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3534 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3535 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3536 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3537 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3538 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3539 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3540 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3542 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3543 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3544 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3545 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3546 bind $ui_diff <$M1B-Key-v> {break}
3547 bind $ui_diff <$M1B-Key-V> {break}
3548 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3549 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3550 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3551 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3552 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3553 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3555 bind . <Destroy> do_quit
3556 bind all <Key-F5> do_rescan
3557 bind all <$M1B-Key-r> do_rescan
3558 bind all <$M1B-Key-R> do_rescan
3559 bind . <$M1B-Key-s> do_signoff
3560 bind . <$M1B-Key-S> do_signoff
3561 bind . <$M1B-Key-i> do_include_all
3562 bind . <$M1B-Key-I> do_include_all
3563 bind . <$M1B-Key-Return> do_commit
3564 bind all <$M1B-Key-q> do_quit
3565 bind all <$M1B-Key-Q> do_quit
3566 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
3567 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
3568 foreach i [list $ui_index $ui_other] {
3569 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
3570 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3571 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
3575 set file_lists($ui_index) [list]
3576 set file_lists($ui_other) [list]
3580 set MERGE_HEAD [list]
3583 set current_branch {}
3585 set selected_commit_type new
3587 wm title . "$appname ([file normalize [file dirname $gitdir]])"
3588 focus -force $ui_comm
3590 # -- Warn the user about environmental problems.
3591 # Cygwin's Tcl does *not* pass its env array
3592 # onto any processes it spawns. This means
3593 # that the git processes get none of our
3594 # environment. That may not work...
3599 set msg "Possible environment issues exist.
3601 The following environment variables are probably
3602 going to be ignored by any Git subprocess run
3606 foreach name [array names env] {
3607 switch -regexp -- $name {
3608 {^GIT_INDEX_FILE$} -
3609 {^GIT_OBJECT_DIRECTORY$} -
3610 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3612 {^GIT_EXTERNAL_DIFF$} -
3616 {^GIT_CONFIG_LOCAL$} -
3617 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3618 append msg " - $name\n"
3621 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3622 append msg " - $name\n"
3624 set suggest_user $name
3628 if {$ignored_env > 0} {
3630 This is due to a known issue with the
3631 Tcl binary distributed by Cygwin."
3633 if {$suggest_user ne {}} {
3636 A good replacement for $suggest_user
3637 is placing values for the user.name and
3638 user.email settings into your personal
3644 unset ignored_env msg suggest_user name
3647 if {!$single_commit} {
3650 populate_branch_menu .mbar.branch
3651 populate_fetch_menu .mbar.fetch
3652 populate_pull_menu .mbar.pull
3653 populate_push_menu .mbar.push
3655 lock_index begin-read