2 # Tcl ignores the next line -*- tcl -*- \
5 set appvers {@@GIT_VERSION@@}
7 Copyright © 2006, 2007 Shawn Pearce, Paul Mackerras.
9 This program is free software; you can redistribute it and/or modify
10 it under the terms of the GNU General Public License as published by
11 the Free Software Foundation; either version 2 of the License, or
12 (at your option) any later version.
14 This program is distributed in the hope that it will be useful,
15 but WITHOUT ANY WARRANTY; without even the implied warranty of
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 GNU General Public License for more details.
19 You should have received a copy of the GNU General Public License
20 along with this program; if not, write to the Free Software
21 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA}
23 ######################################################################
27 set _appname [lindex [file split $argv0] end]
41 return [eval [concat [list file join $_gitdir] $args]]
49 ######################################################################
53 proc is_many_config {name} {
54 switch -glob -- $name {
63 proc load_config {include_global} {
64 global repo_config global_config default_config
66 array unset global_config
67 if {$include_global} {
69 set fd_rc [open "| git repo-config --global --list" r]
70 while {[gets $fd_rc line] >= 0} {
71 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
72 if {[is_many_config $name]} {
73 lappend global_config($name) $value
75 set global_config($name) $value
83 array unset repo_config
85 set fd_rc [open "| git repo-config --list" r]
86 while {[gets $fd_rc line] >= 0} {
87 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
88 if {[is_many_config $name]} {
89 lappend repo_config($name) $value
91 set repo_config($name) $value
98 foreach name [array names default_config] {
99 if {[catch {set v $global_config($name)}]} {
100 set global_config($name) $default_config($name)
102 if {[catch {set v $repo_config($name)}]} {
103 set repo_config($name) $default_config($name)
108 proc save_config {} {
109 global default_config font_descs
110 global repo_config global_config
111 global repo_config_new global_config_new
113 foreach option $font_descs {
114 set name [lindex $option 0]
115 set font [lindex $option 1]
116 font configure $font \
117 -family $global_config_new(gui.$font^^family) \
118 -size $global_config_new(gui.$font^^size)
119 font configure ${font}bold \
120 -family $global_config_new(gui.$font^^family) \
121 -size $global_config_new(gui.$font^^size)
122 set global_config_new(gui.$name) [font configure $font]
123 unset global_config_new(gui.$font^^family)
124 unset global_config_new(gui.$font^^size)
127 foreach name [array names default_config] {
128 set value $global_config_new($name)
129 if {$value ne $global_config($name)} {
130 if {$value eq $default_config($name)} {
131 catch {exec git repo-config --global --unset $name}
133 regsub -all "\[{}\]" $value {"} value
134 exec git repo-config --global $name $value
136 set global_config($name) $value
137 if {$value eq $repo_config($name)} {
138 catch {exec git repo-config --unset $name}
139 set repo_config($name) $value
144 foreach name [array names default_config] {
145 set value $repo_config_new($name)
146 if {$value ne $repo_config($name)} {
147 if {$value eq $global_config($name)} {
148 catch {exec git repo-config --unset $name}
150 regsub -all "\[{}\]" $value {"} value
151 exec git repo-config $name $value
153 set repo_config($name) $value
158 proc error_popup {msg} {
160 if {[reponame] ne {}} {
161 append title " ([reponame])"
163 set cmd [list tk_messageBox \
166 -title "$title: error" \
168 if {[winfo ismapped .]} {
169 lappend cmd -parent .
174 proc warn_popup {msg} {
176 if {[reponame] ne {}} {
177 append title " ([reponame])"
179 set cmd [list tk_messageBox \
182 -title "$title: warning" \
184 if {[winfo ismapped .]} {
185 lappend cmd -parent .
190 proc info_popup {msg} {
192 if {[reponame] ne {}} {
193 append title " ([reponame])"
203 proc ask_popup {msg} {
205 if {[reponame] ne {}} {
206 append title " ([reponame])"
208 return [tk_messageBox \
216 ######################################################################
220 if { [catch {set _gitdir $env(GIT_DIR)}]
221 && [catch {set _gitdir [exec git rev-parse --git-dir]} err]} {
222 catch {wm withdraw .}
223 error_popup "Cannot find the git directory:\n\n$err"
226 if {![file isdirectory $_gitdir]} {
227 catch {wm withdraw .}
228 error_popup "Git directory not found:\n\n$_gitdir"
231 if {[lindex [file split $_gitdir] end] ne {.git}} {
232 catch {wm withdraw .}
233 error_popup "Cannot use funny .git directory:\n\n$gitdir"
236 if {[catch {cd [file dirname $_gitdir]} err]} {
237 catch {wm withdraw .}
238 error_popup "No working directory [file dirname $_gitdir]:\n\n$err"
241 set _reponame [lindex [file split \
242 [file normalize [file dirname $_gitdir]]] \
246 if {[appname] eq {git-citool}} {
250 ######################################################################
258 set disable_on_lock [list]
259 set index_lock_type none
261 proc lock_index {type} {
262 global index_lock_type disable_on_lock
264 if {$index_lock_type eq {none}} {
265 set index_lock_type $type
266 foreach w $disable_on_lock {
267 uplevel #0 $w disabled
270 } elseif {$index_lock_type eq "begin-$type"} {
271 set index_lock_type $type
277 proc unlock_index {} {
278 global index_lock_type disable_on_lock
280 set index_lock_type none
281 foreach w $disable_on_lock {
286 ######################################################################
290 proc repository_state {ctvar hdvar mhvar} {
291 global current_branch
292 upvar $ctvar ct $hdvar hd $mhvar mh
296 if {[catch {set current_branch [exec git symbolic-ref HEAD]}]} {
297 set current_branch {}
299 regsub ^refs/((heads|tags|remotes)/)? \
305 if {[catch {set hd [exec git rev-parse --verify HEAD]}]} {
311 set merge_head [gitdir MERGE_HEAD]
312 if {[file exists $merge_head]} {
314 set fd_mh [open $merge_head r]
315 while {[gets $fd_mh line] >= 0} {
326 global PARENT empty_tree
328 set p [lindex $PARENT 0]
332 if {$empty_tree eq {}} {
333 set empty_tree [exec git mktree << {}]
338 proc rescan {after} {
339 global HEAD PARENT MERGE_HEAD commit_type
340 global ui_index ui_workdir ui_status_value ui_comm
341 global rescan_active file_states
344 if {$rescan_active > 0 || ![lock_index read]} return
346 repository_state newType newHEAD newMERGE_HEAD
347 if {[string match amend* $commit_type]
348 && $newType eq {normal}
349 && $newHEAD eq $HEAD} {
353 set MERGE_HEAD $newMERGE_HEAD
354 set commit_type $newType
357 array unset file_states
359 if {![$ui_comm edit modified]
360 || [string trim [$ui_comm get 0.0 end]] eq {}} {
361 if {[load_message GITGUI_MSG]} {
362 } elseif {[load_message MERGE_MSG]} {
363 } elseif {[load_message SQUASH_MSG]} {
366 $ui_comm edit modified false
369 if {$repo_config(gui.trustmtime) eq {true}} {
370 rescan_stage2 {} $after
373 set ui_status_value {Refreshing file status...}
374 set cmd [list git update-index]
376 lappend cmd --unmerged
377 lappend cmd --ignore-missing
378 lappend cmd --refresh
379 set fd_rf [open "| $cmd" r]
380 fconfigure $fd_rf -blocking 0 -translation binary
381 fileevent $fd_rf readable \
382 [list rescan_stage2 $fd_rf $after]
386 proc rescan_stage2 {fd after} {
387 global ui_status_value
388 global rescan_active buf_rdi buf_rdf buf_rlo
392 if {![eof $fd]} return
396 set ls_others [list | git ls-files --others -z \
397 --exclude-per-directory=.gitignore]
398 set info_exclude [gitdir info exclude]
399 if {[file readable $info_exclude]} {
400 lappend ls_others "--exclude-from=$info_exclude"
408 set ui_status_value {Scanning for modified files ...}
409 set fd_di [open "| git diff-index --cached -z [PARENT]" r]
410 set fd_df [open "| git diff-files -z" r]
411 set fd_lo [open $ls_others r]
413 fconfigure $fd_di -blocking 0 -translation binary
414 fconfigure $fd_df -blocking 0 -translation binary
415 fconfigure $fd_lo -blocking 0 -translation binary
416 fileevent $fd_di readable [list read_diff_index $fd_di $after]
417 fileevent $fd_df readable [list read_diff_files $fd_df $after]
418 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
421 proc load_message {file} {
425 if {[file isfile $f]} {
426 if {[catch {set fd [open $f r]}]} {
429 set content [string trim [read $fd]]
431 $ui_comm delete 0.0 end
432 $ui_comm insert end $content
438 proc read_diff_index {fd after} {
441 append buf_rdi [read $fd]
443 set n [string length $buf_rdi]
445 set z1 [string first "\0" $buf_rdi $c]
448 set z2 [string first "\0" $buf_rdi $z1]
452 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
454 [string range $buf_rdi $z1 [expr {$z2 - 1}]] \
456 [list [lindex $i 0] [lindex $i 2]] \
462 set buf_rdi [string range $buf_rdi $c end]
467 rescan_done $fd buf_rdi $after
470 proc read_diff_files {fd after} {
473 append buf_rdf [read $fd]
475 set n [string length $buf_rdf]
477 set z1 [string first "\0" $buf_rdf $c]
480 set z2 [string first "\0" $buf_rdf $z1]
484 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
486 [string range $buf_rdf $z1 [expr {$z2 - 1}]] \
489 [list [lindex $i 0] [lindex $i 2]]
494 set buf_rdf [string range $buf_rdf $c end]
499 rescan_done $fd buf_rdf $after
502 proc read_ls_others {fd after} {
505 append buf_rlo [read $fd]
506 set pck [split $buf_rlo "\0"]
507 set buf_rlo [lindex $pck end]
508 foreach p [lrange $pck 0 end-1] {
511 rescan_done $fd buf_rlo $after
514 proc rescan_done {fd buf after} {
516 global file_states repo_config
519 if {![eof $fd]} return
522 if {[incr rescan_active -1] > 0} return
528 if {$repo_config(gui.partialinclude) ne {true}} {
530 foreach path [array names file_states] {
531 switch -- [lindex $file_states($path) 0] {
533 M? {lappend pathList $path}
536 if {$pathList ne {}} {
538 "Updating included files" \
540 [concat {reshow_diff;} $after]
549 proc prune_selection {} {
550 global file_states selected_paths
552 foreach path [array names selected_paths] {
553 if {[catch {set still_here $file_states($path)}]} {
554 unset selected_paths($path)
559 ######################################################################
564 global ui_diff current_diff ui_index ui_workdir
566 $ui_diff conf -state normal
567 $ui_diff delete 0.0 end
568 $ui_diff conf -state disabled
572 $ui_index tag remove in_diff 0.0 end
573 $ui_workdir tag remove in_diff 0.0 end
576 proc reshow_diff {} {
577 global current_diff ui_status_value file_states
579 if {$current_diff eq {}
580 || [catch {set s $file_states($current_diff)}]} {
583 show_diff $current_diff
587 proc handle_empty_diff {} {
588 global current_diff file_states file_lists
590 set path $current_diff
591 set s $file_states($path)
592 if {[lindex $s 0] ne {_M}} return
594 info_popup "No differences detected.
596 [short_path $path] has no changes.
598 The modification date of this file was updated
599 by another application and you currently have
600 the Trust File Modification Timestamps option
601 enabled, so Git did not automatically detect
602 that there are no content differences in this
605 This file will now be removed from the modified
606 files list, to prevent possible confusion.
608 if {[catch {exec git update-index -- $path} err]} {
609 error_popup "Failed to refresh index:\n\n$err"
613 display_file $path __
616 proc show_diff {path {w {}} {lno {}}} {
617 global file_states file_lists
618 global is_3way_diff diff_active repo_config
619 global ui_diff current_diff ui_status_value
621 if {$diff_active || ![lock_index read]} return
624 if {$w eq {} || $lno == {}} {
625 foreach w [array names file_lists] {
626 set lno [lsearch -sorted $file_lists($w) $path]
633 if {$w ne {} && $lno >= 1} {
634 $w tag add in_diff $lno.0 [expr {$lno + 1}].0
637 set s $file_states($path)
641 set current_diff $path
642 set ui_status_value "Loading diff of [escape_path $path]..."
644 set cmd [list | git diff-index]
645 lappend cmd --no-color
646 if {$repo_config(gui.diffcontext) > 0} {
647 lappend cmd "-U$repo_config(gui.diffcontext)"
657 set fd [open $path r]
658 set content [read $fd]
663 set ui_status_value "Unable to display [escape_path $path]"
664 error_popup "Error loading file:\n\n$err"
667 $ui_diff conf -state normal
668 $ui_diff insert end $content
669 $ui_diff conf -state disabled
672 set ui_status_value {Ready.}
681 if {[catch {set fd [open $cmd r]} err]} {
684 set ui_status_value "Unable to display [escape_path $path]"
685 error_popup "Error loading diff:\n\n$err"
689 fconfigure $fd -blocking 0 -translation auto
690 fileevent $fd readable [list read_diff $fd]
693 proc read_diff {fd} {
694 global ui_diff ui_status_value is_3way_diff diff_active
697 $ui_diff conf -state normal
698 while {[gets $fd line] >= 0} {
699 # -- Cleanup uninteresting diff header lines.
701 if {[string match {diff --git *} $line]} continue
702 if {[string match {diff --combined *} $line]} continue
703 if {[string match {--- *} $line]} continue
704 if {[string match {+++ *} $line]} continue
705 if {$line eq {deleted file mode 120000}} {
706 set line "deleted symlink"
709 # -- Automatically detect if this is a 3 way diff.
711 if {[string match {@@@ *} $line]} {set is_3way_diff 1}
713 # -- Reformat a 3 way diff, 'cause its too weird.
716 set op [string range $line 0 1]
719 {++} {set tags d_+ ; set op { +}}
720 {--} {set tags d_- ; set op { -}}
721 { +} {set tags d_++; set op {++}}
722 { -} {set tags d_--; set op {--}}
723 {+ } {set tags d_-+; set op {-+}}
724 {- } {set tags d_+-; set op {+-}}
725 default {set tags {}}
727 set line [string replace $line 0 1 $op]
729 switch -- [string index $line 0] {
733 default {set tags {}}
736 $ui_diff insert end $line $tags
737 $ui_diff insert end "\n" $tags
739 $ui_diff conf -state disabled
745 set ui_status_value {Ready.}
747 if {$repo_config(gui.trustmtime) eq {true}
748 && [$ui_diff index end] eq {2.0}} {
754 ######################################################################
758 proc load_last_commit {} {
759 global HEAD PARENT MERGE_HEAD commit_type ui_comm
761 if {[llength $PARENT] == 0} {
762 error_popup {There is nothing to amend.
764 You are about to create the initial commit.
765 There is no commit before this to amend.
770 repository_state curType curHEAD curMERGE_HEAD
771 if {$curType eq {merge}} {
772 error_popup {Cannot amend while merging.
774 You are currently in the middle of a merge that
775 has not been fully completed. You cannot amend
776 the prior commit unless you first abort the
777 current merge activity.
785 set fd [open "| git cat-file commit $curHEAD" r]
786 while {[gets $fd line] > 0} {
787 if {[string match {parent *} $line]} {
788 lappend parents [string range $line 7 end]
791 set msg [string trim [read $fd]]
794 error_popup "Error loading commit data for amend:\n\n$err"
800 set MERGE_HEAD [list]
801 switch -- [llength $parents] {
802 0 {set commit_type amend-initial}
803 1 {set commit_type amend}
804 default {set commit_type amend-merge}
807 $ui_comm delete 0.0 end
808 $ui_comm insert end $msg
810 $ui_comm edit modified false
811 rescan {set ui_status_value {Ready.}}
814 proc create_new_commit {} {
815 global commit_type ui_comm
817 set commit_type normal
818 $ui_comm delete 0.0 end
820 $ui_comm edit modified false
821 rescan {set ui_status_value {Ready.}}
824 set GIT_COMMITTER_IDENT {}
826 proc committer_ident {} {
827 global GIT_COMMITTER_IDENT
829 if {$GIT_COMMITTER_IDENT eq {}} {
830 if {[catch {set me [exec git var GIT_COMMITTER_IDENT]} err]} {
831 error_popup "Unable to obtain your identity:\n\n$err"
834 if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \
835 $me me GIT_COMMITTER_IDENT]} {
836 error_popup "Invalid GIT_COMMITTER_IDENT:\n\n$me"
841 return $GIT_COMMITTER_IDENT
844 proc commit_tree {} {
845 global HEAD commit_type file_states ui_comm repo_config
847 if {![lock_index update]} return
848 if {[committer_ident] eq {}} return
850 # -- Our in memory state should match the repository.
852 repository_state curType curHEAD curMERGE_HEAD
853 if {[string match amend* $commit_type]
854 && $curType eq {normal}
855 && $curHEAD eq $HEAD} {
856 } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
857 info_popup {Last scanned state does not match repository state.
859 Another Git program has modified this repository
860 since the last scan. A rescan must be performed
861 before another commit can be created.
863 The rescan will be automatically started now.
866 rescan {set ui_status_value {Ready.}}
870 # -- At least one file should differ in the index.
873 foreach path [array names file_states] {
874 switch -glob -- [lindex $file_states($path) 0] {
878 M? {set files_ready 1; break}
880 error_popup "Unmerged files cannot be committed.
882 File [short_path $path] has merge conflicts.
883 You must resolve them and include the file before committing.
889 error_popup "Unknown file state [lindex $s 0] detected.
891 File [short_path $path] cannot be committed by this program.
897 error_popup {No included files to commit.
899 You must include at least 1 file before you can commit.
905 # -- A message is required.
907 set msg [string trim [$ui_comm get 1.0 end]]
909 error_popup {Please supply a commit message.
911 A good commit message has the following format:
913 - First line: Describe in one sentance what you did.
915 - Remaining lines: Describe why this change is good.
921 # -- Update included files if partialincludes are off.
923 if {$repo_config(gui.partialinclude) ne {true}} {
925 foreach path [array names file_states] {
926 switch -glob -- [lindex $file_states($path) 0] {
928 M? {lappend pathList $path}
931 if {$pathList ne {}} {
934 "Updating included files" \
936 [concat {lock_index update;} \
937 [list commit_prehook $curHEAD $msg]]
942 commit_prehook $curHEAD $msg
945 proc commit_prehook {curHEAD msg} {
946 global ui_status_value pch_error
948 set pchook [gitdir hooks pre-commit]
950 # On Cygwin [file executable] might lie so we need to ask
951 # the shell if the hook is executable. Yes that's annoying.
953 if {[is_Windows] && [file isfile $pchook]} {
954 set pchook [list sh -c [concat \
955 "if test -x \"$pchook\";" \
956 "then exec \"$pchook\" 2>&1;" \
958 } elseif {[file executable $pchook]} {
959 set pchook [list $pchook |& cat]
961 commit_writetree $curHEAD $msg
965 set ui_status_value {Calling pre-commit hook...}
967 set fd_ph [open "| $pchook" r]
968 fconfigure $fd_ph -blocking 0 -translation binary
969 fileevent $fd_ph readable \
970 [list commit_prehook_wait $fd_ph $curHEAD $msg]
973 proc commit_prehook_wait {fd_ph curHEAD msg} {
974 global pch_error ui_status_value
976 append pch_error [read $fd_ph]
977 fconfigure $fd_ph -blocking 1
979 if {[catch {close $fd_ph}]} {
980 set ui_status_value {Commit declined by pre-commit hook.}
981 hook_failed_popup pre-commit $pch_error
984 commit_writetree $curHEAD $msg
989 fconfigure $fd_ph -blocking 0
992 proc commit_writetree {curHEAD msg} {
993 global ui_status_value
995 set ui_status_value {Committing changes...}
996 set fd_wt [open "| git write-tree" r]
997 fileevent $fd_wt readable \
998 [list commit_committree $fd_wt $curHEAD $msg]
1001 proc commit_committree {fd_wt curHEAD msg} {
1002 global HEAD PARENT MERGE_HEAD commit_type
1003 global single_commit
1004 global ui_status_value ui_comm selected_commit_type
1005 global file_states selected_paths rescan_active
1008 if {$tree_id eq {} || [catch {close $fd_wt} err]} {
1009 error_popup "write-tree failed:\n\n$err"
1010 set ui_status_value {Commit failed.}
1015 # -- Create the commit.
1017 set cmd [list git commit-tree $tree_id]
1018 set parents [concat $PARENT $MERGE_HEAD]
1019 if {[llength $parents] > 0} {
1020 foreach p $parents {
1024 # git commit-tree writes to stderr during initial commit.
1025 lappend cmd 2>/dev/null
1028 if {[catch {set cmt_id [eval exec $cmd]} err]} {
1029 error_popup "commit-tree failed:\n\n$err"
1030 set ui_status_value {Commit failed.}
1035 # -- Update the HEAD ref.
1038 if {$commit_type ne {normal}} {
1039 append reflogm " ($commit_type)"
1041 set i [string first "\n" $msg]
1043 append reflogm {: } [string range $msg 0 [expr {$i - 1}]]
1045 append reflogm {: } $msg
1047 set cmd [list git update-ref -m $reflogm HEAD $cmt_id $curHEAD]
1048 if {[catch {eval exec $cmd} err]} {
1049 error_popup "update-ref failed:\n\n$err"
1050 set ui_status_value {Commit failed.}
1055 # -- Cleanup after ourselves.
1057 catch {file delete [gitdir MERGE_HEAD]}
1058 catch {file delete [gitdir MERGE_MSG]}
1059 catch {file delete [gitdir SQUASH_MSG]}
1060 catch {file delete [gitdir GITGUI_MSG]}
1062 # -- Let rerere do its thing.
1064 if {[file isdirectory [gitdir rr-cache]]} {
1065 catch {exec git rerere}
1068 # -- Run the post-commit hook.
1070 set pchook [gitdir hooks post-commit]
1071 if {[is_Windows] && [file isfile $pchook]} {
1072 set pchook [list sh -c [concat \
1073 "if test -x \"$pchook\";" \
1074 "then exec \"$pchook\";" \
1076 } elseif {![file executable $pchook]} {
1079 if {$pchook ne {}} {
1080 catch {exec $pchook &}
1083 $ui_comm delete 0.0 end
1085 $ui_comm edit modified false
1087 if {$single_commit} do_quit
1089 # -- Update in memory status
1091 set selected_commit_type new
1092 set commit_type normal
1095 set MERGE_HEAD [list]
1097 foreach path [array names file_states] {
1098 set s $file_states($path)
1100 switch -glob -- $m {
1108 unset file_states($path)
1109 catch {unset selected_paths($path)}
1112 set file_states($path) [list _O [lindex $s 1] {} {}]
1118 set file_states($path) [list \
1119 _[string index $m 1] \
1130 set ui_status_value \
1131 "Changes committed as [string range $cmt_id 0 7]."
1134 ######################################################################
1138 proc fetch_from {remote} {
1139 set w [new_console "fetch $remote" \
1140 "Fetching new changes from $remote"]
1141 set cmd [list git fetch]
1143 console_exec $w $cmd
1146 proc pull_remote {remote branch} {
1147 global HEAD commit_type file_states repo_config
1149 if {![lock_index update]} return
1151 # -- Our in memory state should match the repository.
1153 repository_state curType curHEAD curMERGE_HEAD
1154 if {$commit_type ne $curType || $HEAD ne $curHEAD} {
1155 info_popup {Last scanned state does not match repository state.
1157 Another Git program has modified this repository
1158 since the last scan. A rescan must be performed
1159 before a pull operation can be started.
1161 The rescan will be automatically started now.
1164 rescan {set ui_status_value {Ready.}}
1168 # -- No differences should exist before a pull.
1170 if {[array size file_states] != 0} {
1171 error_popup {Uncommitted but modified files are present.
1173 You should not perform a pull with unmodified
1174 files in your working directory as Git will be
1175 unable to recover from an incorrect merge.
1177 You should commit or revert all changes before
1178 starting a pull operation.
1184 set w [new_console "pull $remote $branch" \
1185 "Pulling new changes from branch $branch in $remote"]
1186 set cmd [list git pull]
1187 if {$repo_config(gui.pullsummary) eq {false}} {
1188 lappend cmd --no-summary
1192 console_exec $w $cmd [list post_pull_remote $remote $branch]
1195 proc post_pull_remote {remote branch success} {
1196 global HEAD PARENT MERGE_HEAD commit_type selected_commit_type
1197 global ui_status_value
1201 repository_state commit_type HEAD MERGE_HEAD
1203 set selected_commit_type new
1204 set ui_status_value "Pulling $branch from $remote complete."
1206 rescan [list set ui_status_value \
1207 "Conflicts detected while pulling $branch from $remote."]
1211 proc push_to {remote} {
1212 set w [new_console "push $remote" \
1213 "Pushing changes to $remote"]
1214 set cmd [list git push]
1216 console_exec $w $cmd
1219 ######################################################################
1223 proc mapicon {w state path} {
1226 if {[catch {set r $all_icons($state$w)}]} {
1227 puts "error: no icon for $w state={$state} $path"
1233 proc mapdesc {state path} {
1236 if {[catch {set r $all_descs($state)}]} {
1237 puts "error: no desc for state={$state} $path"
1243 proc escape_path {path} {
1244 regsub -all "\n" $path "\\n" path
1248 proc short_path {path} {
1249 return [escape_path [lindex [file split $path] end]]
1253 set null_sha1 [string repeat 0 40]
1255 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1256 global file_states next_icon_id null_sha1
1258 set s0 [string index $new_state 0]
1259 set s1 [string index $new_state 1]
1261 if {[catch {set info $file_states($path)}]} {
1263 set icon n[incr next_icon_id]
1265 set state [lindex $info 0]
1266 set icon [lindex $info 1]
1267 if {$head_info eq {}} {set head_info [lindex $info 2]}
1268 if {$index_info eq {}} {set index_info [lindex $info 3]}
1271 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1272 elseif {$s0 eq {_}} {set s0 _}
1274 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1275 elseif {$s1 eq {_}} {set s1 _}
1277 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1278 set head_info [list 0 $null_sha1]
1279 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1280 && $head_info eq {}} {
1281 set head_info $index_info
1284 set file_states($path) [list $s0$s1 $icon \
1285 $head_info $index_info \
1290 proc display_file_helper {w path icon_name old_m new_m} {
1293 if {$new_m eq {_}} {
1294 set lno [lsearch -sorted $file_lists($w) $path]
1296 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1298 $w conf -state normal
1299 $w delete $lno.0 [expr {$lno + 1}].0
1300 $w conf -state disabled
1302 } elseif {$old_m eq {_} && $new_m ne {_}} {
1303 lappend file_lists($w) $path
1304 set file_lists($w) [lsort -unique $file_lists($w)]
1305 set lno [lsearch -sorted $file_lists($w) $path]
1307 $w conf -state normal
1308 $w image create $lno.0 \
1309 -align center -padx 5 -pady 1 \
1311 -image [mapicon $w $new_m $path]
1312 $w insert $lno.1 "[escape_path $path]\n"
1313 $w conf -state disabled
1314 } elseif {$old_m ne $new_m} {
1315 $w conf -state normal
1316 $w image conf $icon_name -image [mapicon $w $new_m $path]
1317 $w conf -state disabled
1321 proc display_file {path state} {
1322 global file_states selected_paths
1323 global ui_index ui_workdir
1325 set old_m [merge_state $path $state]
1326 set s $file_states($path)
1327 set new_m [lindex $s 0]
1328 set icon_name [lindex $s 1]
1330 display_file_helper $ui_index $path $icon_name \
1331 [string index $old_m 0] \
1332 [string index $new_m 0]
1333 display_file_helper $ui_workdir $path $icon_name \
1334 [string index $old_m 1] \
1335 [string index $new_m 1]
1337 if {$new_m eq {__}} {
1338 unset file_states($path)
1339 catch {unset selected_paths($path)}
1343 proc display_all_files_helper {w path icon_name m} {
1346 lappend file_lists($w) $path
1347 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1348 $w image create end \
1349 -align center -padx 5 -pady 1 \
1351 -image [mapicon $w $m $path]
1352 $w insert end "[escape_path $path]\n"
1355 proc display_all_files {} {
1356 global ui_index ui_workdir
1357 global file_states file_lists
1358 global last_clicked selected_paths
1360 $ui_index conf -state normal
1361 $ui_workdir conf -state normal
1363 $ui_index delete 0.0 end
1364 $ui_workdir delete 0.0 end
1367 set file_lists($ui_index) [list]
1368 set file_lists($ui_workdir) [list]
1370 foreach path [lsort [array names file_states]] {
1371 set s $file_states($path)
1373 set icon_name [lindex $s 1]
1375 if {[string index $m 0] ne {_}} {
1376 display_all_files_helper $ui_index $path \
1377 $icon_name [string index $m 0]
1379 if {[string index $m 1] ne {_}} {
1380 display_all_files_helper $ui_workdir $path \
1381 $icon_name [string index $m 1]
1385 $ui_index conf -state disabled
1386 $ui_workdir conf -state disabled
1389 proc update_indexinfo {msg pathList after} {
1390 global update_index_cp ui_status_value
1392 if {![lock_index update]} return
1394 set update_index_cp 0
1395 set pathList [lsort $pathList]
1396 set totalCnt [llength $pathList]
1397 set batch [expr {int($totalCnt * .01) + 1}]
1398 if {$batch > 25} {set batch 25}
1400 set ui_status_value [format \
1401 "$msg... %i/%i files (%.2f%%)" \
1405 set fd [open "| git update-index -z --index-info" w]
1411 fileevent $fd writable [list \
1412 write_update_indexinfo \
1422 proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
1423 global update_index_cp ui_status_value
1424 global file_states current_diff
1426 if {$update_index_cp >= $totalCnt} {
1433 for {set i $batch} \
1434 {$update_index_cp < $totalCnt && $i > 0} \
1436 set path [lindex $pathList $update_index_cp]
1437 incr update_index_cp
1439 set s $file_states($path)
1440 switch -glob -- [lindex $s 0] {
1447 set info [lindex $s 2]
1448 if {$info eq {}} continue
1450 puts -nonewline $fd $info
1451 puts -nonewline $fd "\t"
1452 puts -nonewline $fd $path
1453 puts -nonewline $fd "\0"
1454 display_file $path $new
1457 set ui_status_value [format \
1458 "$msg... %i/%i files (%.2f%%)" \
1461 [expr {100.0 * $update_index_cp / $totalCnt}]]
1464 proc update_index {msg pathList after} {
1465 global update_index_cp ui_status_value
1467 if {![lock_index update]} return
1469 set update_index_cp 0
1470 set pathList [lsort $pathList]
1471 set totalCnt [llength $pathList]
1472 set batch [expr {int($totalCnt * .01) + 1}]
1473 if {$batch > 25} {set batch 25}
1475 set ui_status_value [format \
1476 "$msg... %i/%i files (%.2f%%)" \
1480 set fd [open "| git update-index --add --remove -z --stdin" w]
1486 fileevent $fd writable [list \
1487 write_update_index \
1497 proc write_update_index {fd pathList totalCnt batch msg after} {
1498 global update_index_cp ui_status_value
1499 global file_states current_diff
1501 if {$update_index_cp >= $totalCnt} {
1508 for {set i $batch} \
1509 {$update_index_cp < $totalCnt && $i > 0} \
1511 set path [lindex $pathList $update_index_cp]
1512 incr update_index_cp
1514 switch -glob -- [lindex $file_states($path) 0] {
1533 puts -nonewline $fd $path
1534 puts -nonewline $fd "\0"
1535 display_file $path $new
1538 set ui_status_value [format \
1539 "$msg... %i/%i files (%.2f%%)" \
1542 [expr {100.0 * $update_index_cp / $totalCnt}]]
1545 proc checkout_index {msg pathList after} {
1546 global update_index_cp ui_status_value
1548 if {![lock_index update]} return
1550 set update_index_cp 0
1551 set pathList [lsort $pathList]
1552 set totalCnt [llength $pathList]
1553 set batch [expr {int($totalCnt * .01) + 1}]
1554 if {$batch > 25} {set batch 25}
1556 set ui_status_value [format \
1557 "$msg... %i/%i files (%.2f%%)" \
1561 set cmd [list git checkout-index]
1567 set fd [open "| $cmd " w]
1573 fileevent $fd writable [list \
1574 write_checkout_index \
1584 proc write_checkout_index {fd pathList totalCnt batch msg after} {
1585 global update_index_cp ui_status_value
1586 global file_states current_diff
1588 if {$update_index_cp >= $totalCnt} {
1595 for {set i $batch} \
1596 {$update_index_cp < $totalCnt && $i > 0} \
1598 set path [lindex $pathList $update_index_cp]
1599 incr update_index_cp
1601 switch -glob -- [lindex $file_states($path) 0] {
1611 puts -nonewline $fd $path
1612 puts -nonewline $fd "\0"
1613 display_file $path $new
1616 set ui_status_value [format \
1617 "$msg... %i/%i files (%.2f%%)" \
1620 [expr {100.0 * $update_index_cp / $totalCnt}]]
1623 ######################################################################
1625 ## branch management
1627 proc load_all_heads {} {
1628 global all_heads tracking_branches
1630 set all_heads [list]
1631 set cmd [list git for-each-ref]
1632 lappend cmd --format=%(refname)
1633 lappend cmd refs/heads
1634 set fd [open "| $cmd" r]
1635 while {[gets $fd line] > 0} {
1636 if {![catch {set info $tracking_branches($line)}]} continue
1637 if {![regsub ^refs/heads/ $line {} name]} continue
1638 lappend all_heads $name
1642 set all_heads [lsort $all_heads]
1645 proc populate_branch_menu {m} {
1646 global all_heads disable_on_lock
1649 foreach b $all_heads {
1650 $m add radiobutton \
1652 -command [list switch_branch $b] \
1653 -variable current_branch \
1656 lappend disable_on_lock \
1657 [list $m entryconf [$m index last] -state]
1661 proc do_create_branch {} {
1662 error "NOT IMPLEMENTED"
1665 proc do_delete_branch {} {
1666 error "NOT IMPLEMENTED"
1669 proc switch_branch {b} {
1670 global HEAD commit_type file_states current_branch
1671 global selected_commit_type ui_comm
1673 if {![lock_index switch]} return
1675 # -- Backup the selected branch (repository_state resets it)
1677 set new_branch $current_branch
1679 # -- Our in memory state should match the repository.
1681 repository_state curType curHEAD curMERGE_HEAD
1682 if {[string match amend* $commit_type]
1683 && $curType eq {normal}
1684 && $curHEAD eq $HEAD} {
1685 } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
1686 info_popup {Last scanned state does not match repository state.
1688 Another Git program has modified this repository
1689 since the last scan. A rescan must be performed
1690 before the current branch can be changed.
1692 The rescan will be automatically started now.
1695 rescan {set ui_status_value {Ready.}}
1699 # -- Toss the message buffer if we are in amend mode.
1701 if {[string match amend* $curType]} {
1702 $ui_comm delete 0.0 end
1704 $ui_comm edit modified false
1707 set selected_commit_type new
1708 set current_branch $new_branch
1711 error "NOT FINISHED"
1714 ######################################################################
1716 ## remote management
1718 proc load_all_remotes {} {
1720 global all_remotes tracking_branches
1722 set all_remotes [list]
1723 array unset tracking_branches
1725 set rm_dir [gitdir remotes]
1726 if {[file isdirectory $rm_dir]} {
1727 set all_remotes [glob \
1731 -directory $rm_dir *]
1733 foreach name $all_remotes {
1735 set fd [open [file join $rm_dir $name] r]
1736 while {[gets $fd line] >= 0} {
1737 if {![regexp {^Pull:[ ]*([^:]+):(.+)$} \
1738 $line line src dst]} continue
1739 if {![regexp ^refs/ $dst]} {
1740 set dst "refs/heads/$dst"
1742 set tracking_branches($dst) [list $name $src]
1749 foreach line [array names repo_config remote.*.url] {
1750 if {![regexp ^remote\.(.*)\.url\$ $line line name]} continue
1751 lappend all_remotes $name
1753 if {[catch {set fl $repo_config(remote.$name.fetch)}]} {
1757 if {![regexp {^([^:]+):(.+)$} $line line src dst]} continue
1758 if {![regexp ^refs/ $dst]} {
1759 set dst "refs/heads/$dst"
1761 set tracking_branches($dst) [list $name $src]
1765 set all_remotes [lsort -unique $all_remotes]
1768 proc populate_fetch_menu {m} {
1769 global all_remotes repo_config
1771 foreach r $all_remotes {
1773 if {![catch {set a $repo_config(remote.$r.url)}]} {
1774 if {![catch {set a $repo_config(remote.$r.fetch)}]} {
1779 set fd [open [gitdir remotes $r] r]
1780 while {[gets $fd n] >= 0} {
1781 if {[regexp {^Pull:[ \t]*([^:]+):} $n]} {
1792 -label "Fetch from $r..." \
1793 -command [list fetch_from $r] \
1799 proc populate_push_menu {m} {
1800 global all_remotes repo_config
1802 foreach r $all_remotes {
1804 if {![catch {set a $repo_config(remote.$r.url)}]} {
1805 if {![catch {set a $repo_config(remote.$r.push)}]} {
1810 set fd [open [gitdir remotes $r] r]
1811 while {[gets $fd n] >= 0} {
1812 if {[regexp {^Push:[ \t]*([^:]+):} $n]} {
1823 -label "Push to $r..." \
1824 -command [list push_to $r] \
1830 proc populate_pull_menu {m} {
1831 global repo_config all_remotes disable_on_lock
1833 foreach remote $all_remotes {
1835 if {[array get repo_config remote.$remote.url] ne {}} {
1836 if {[array get repo_config remote.$remote.fetch] ne {}} {
1837 foreach line $repo_config(remote.$remote.fetch) {
1838 if {[regexp {^([^:]+):} $line line rb]} {
1845 set fd [open [gitdir remotes $remote] r]
1846 while {[gets $fd line] >= 0} {
1847 if {[regexp {^Pull:[ \t]*([^:]+):} $line line rb]} {
1855 foreach rb $rb_list {
1856 regsub ^refs/heads/ $rb {} rb_short
1858 -label "Branch $rb_short from $remote..." \
1859 -command [list pull_remote $remote $rb] \
1861 lappend disable_on_lock \
1862 [list $m entryconf [$m index last] -state]
1867 ######################################################################
1872 #define mask_width 14
1873 #define mask_height 15
1874 static unsigned char mask_bits[] = {
1875 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1876 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1877 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1880 image create bitmap file_plain -background white -foreground black -data {
1881 #define plain_width 14
1882 #define plain_height 15
1883 static unsigned char plain_bits[] = {
1884 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1885 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1886 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1887 } -maskdata $filemask
1889 image create bitmap file_mod -background white -foreground blue -data {
1890 #define mod_width 14
1891 #define mod_height 15
1892 static unsigned char mod_bits[] = {
1893 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1894 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1895 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1896 } -maskdata $filemask
1898 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1899 #define file_fulltick_width 14
1900 #define file_fulltick_height 15
1901 static unsigned char file_fulltick_bits[] = {
1902 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1903 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1904 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1905 } -maskdata $filemask
1907 image create bitmap file_parttick -background white -foreground "#005050" -data {
1908 #define parttick_width 14
1909 #define parttick_height 15
1910 static unsigned char parttick_bits[] = {
1911 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1912 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1913 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1914 } -maskdata $filemask
1916 image create bitmap file_question -background white -foreground black -data {
1917 #define file_question_width 14
1918 #define file_question_height 15
1919 static unsigned char file_question_bits[] = {
1920 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1921 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1922 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1923 } -maskdata $filemask
1925 image create bitmap file_removed -background white -foreground red -data {
1926 #define file_removed_width 14
1927 #define file_removed_height 15
1928 static unsigned char file_removed_bits[] = {
1929 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1930 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1931 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1932 } -maskdata $filemask
1934 image create bitmap file_merge -background white -foreground blue -data {
1935 #define file_merge_width 14
1936 #define file_merge_height 15
1937 static unsigned char file_merge_bits[] = {
1938 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1939 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1940 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1941 } -maskdata $filemask
1943 set ui_index .vpane.files.index.list
1944 set ui_workdir .vpane.files.workdir.list
1946 set all_icons(_$ui_index) file_plain
1947 set all_icons(A$ui_index) file_fulltick
1948 set all_icons(M$ui_index) file_fulltick
1949 set all_icons(D$ui_index) file_removed
1950 set all_icons(U$ui_index) file_merge
1952 set all_icons(_$ui_workdir) file_plain
1953 set all_icons(M$ui_workdir) file_mod
1954 set all_icons(D$ui_workdir) file_question
1955 set all_icons(O$ui_workdir) file_plain
1957 set max_status_desc 0
1961 {_M "Modified, not staged"}
1962 {M_ "Staged for commit"}
1963 {MM "Portions staged for commit"}
1964 {MD "Staged for commit, missing"}
1966 {_O "Untracked, not staged"}
1967 {A_ "Staged for commit"}
1968 {AM "Portions staged for commit"}
1969 {AD "Staged for commit, missing"}
1972 {D_ "Staged for removal"}
1973 {DO "Staged for removal, still present"}
1975 {U_ "Requires merge resolution"}
1976 {UM "Requires merge resolution"}
1977 {UD "Requires merge resolution"}
1979 if {$max_status_desc < [string length [lindex $i 1]]} {
1980 set max_status_desc [string length [lindex $i 1]]
1982 set all_descs([lindex $i 0]) [lindex $i 1]
1986 ######################################################################
1991 global tcl_platform tk_library
1992 if {[tk windowingsystem] eq {aqua}} {
1998 proc is_Windows {} {
2000 if {$tcl_platform(platform) eq {windows}} {
2006 proc bind_button3 {w cmd} {
2007 bind $w <Any-Button-3> $cmd
2009 bind $w <Control-Button-1> $cmd
2013 proc incr_font_size {font {amt 1}} {
2014 set sz [font configure $font -size]
2016 font configure $font -size $sz
2017 font configure ${font}bold -size $sz
2020 proc hook_failed_popup {hook msg} {
2025 label $w.m.l1 -text "$hook hook failed:" \
2030 -background white -borderwidth 1 \
2032 -width 80 -height 10 \
2034 -yscrollcommand [list $w.m.sby set]
2036 -text {You must correct the above errors before committing.} \
2040 scrollbar $w.m.sby -command [list $w.m.t yview]
2041 pack $w.m.l1 -side top -fill x
2042 pack $w.m.l2 -side bottom -fill x
2043 pack $w.m.sby -side right -fill y
2044 pack $w.m.t -side left -fill both -expand 1
2045 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
2047 $w.m.t insert 1.0 $msg
2048 $w.m.t conf -state disabled
2050 button $w.ok -text OK \
2053 -command "destroy $w"
2054 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
2056 bind $w <Visibility> "grab $w; focus $w"
2057 bind $w <Key-Return> "destroy $w"
2058 wm title $w "[appname] ([reponame]): error"
2062 set next_console_id 0
2064 proc new_console {short_title long_title} {
2065 global next_console_id console_data
2066 set w .console[incr next_console_id]
2067 set console_data($w) [list $short_title $long_title]
2068 return [console_init $w]
2071 proc console_init {w} {
2072 global console_cr console_data M1B
2074 set console_cr($w) 1.0
2077 label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
2082 -background white -borderwidth 1 \
2084 -width 80 -height 10 \
2087 -yscrollcommand [list $w.m.sby set]
2088 label $w.m.s -text {Working... please wait...} \
2092 scrollbar $w.m.sby -command [list $w.m.t yview]
2093 pack $w.m.l1 -side top -fill x
2094 pack $w.m.s -side bottom -fill x
2095 pack $w.m.sby -side right -fill y
2096 pack $w.m.t -side left -fill both -expand 1
2097 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
2099 menu $w.ctxm -tearoff 0
2100 $w.ctxm add command -label "Copy" \
2102 -command "tk_textCopy $w.m.t"
2103 $w.ctxm add command -label "Select All" \
2105 -command "$w.m.t tag add sel 0.0 end"
2106 $w.ctxm add command -label "Copy All" \
2109 $w.m.t tag add sel 0.0 end
2111 $w.m.t tag remove sel 0.0 end
2114 button $w.ok -text {Close} \
2117 -command "destroy $w"
2118 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
2120 bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
2121 bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
2122 bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
2123 bind $w <Visibility> "focus $w"
2124 wm title $w "[appname] ([reponame]): [lindex $console_data($w) 0]"
2128 proc console_exec {w cmd {after {}}} {
2129 # -- Windows tosses the enviroment when we exec our child.
2130 # But most users need that so we have to relogin. :-(
2133 set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
2136 # -- Tcl won't let us redirect both stdout and stderr to
2137 # the same pipe. So pass it through cat...
2139 set cmd [concat | $cmd |& cat]
2141 set fd_f [open $cmd r]
2142 fconfigure $fd_f -blocking 0 -translation binary
2143 fileevent $fd_f readable [list console_read $w $fd_f $after]
2146 proc console_read {w fd after} {
2147 global console_cr console_data
2151 if {![winfo exists $w]} {console_init $w}
2152 $w.m.t conf -state normal
2154 set n [string length $buf]
2156 set cr [string first "\r" $buf $c]
2157 set lf [string first "\n" $buf $c]
2158 if {$cr < 0} {set cr [expr {$n + 1}]}
2159 if {$lf < 0} {set lf [expr {$n + 1}]}
2162 $w.m.t insert end [string range $buf $c $lf]
2163 set console_cr($w) [$w.m.t index {end -1c}]
2167 $w.m.t delete $console_cr($w) end
2168 $w.m.t insert end "\n"
2169 $w.m.t insert end [string range $buf $c $cr]
2174 $w.m.t conf -state disabled
2178 fconfigure $fd -blocking 1
2180 if {[catch {close $fd}]} {
2181 if {![winfo exists $w]} {console_init $w}
2182 $w.m.s conf -background red -text {Error: Command Failed}
2183 $w.ok conf -state normal
2185 } elseif {[winfo exists $w]} {
2186 $w.m.s conf -background green -text {Success}
2187 $w.ok conf -state normal
2190 array unset console_cr $w
2191 array unset console_data $w
2193 uplevel #0 $after $ok
2197 fconfigure $fd -blocking 0
2200 ######################################################################
2204 set starting_gitk_msg {Starting gitk... please wait...}
2206 proc do_gitk {revs} {
2207 global ui_status_value starting_gitk_msg
2215 set cmd "sh -c \"exec $cmd\""
2219 if {[catch {eval exec $cmd} err]} {
2220 error_popup "Failed to start gitk:\n\n$err"
2222 set ui_status_value $starting_gitk_msg
2224 if {$ui_status_value eq $starting_gitk_msg} {
2225 set ui_status_value {Ready.}
2232 set w [new_console {gc} {Compressing the object database}]
2233 console_exec $w {git gc}
2236 proc do_fsck_objects {} {
2237 set w [new_console {fsck-objects} \
2238 {Verifying the object database with fsck-objects}]
2239 set cmd [list git fsck-objects]
2242 lappend cmd --strict
2243 console_exec $w $cmd
2249 global ui_comm is_quitting repo_config commit_type
2251 if {$is_quitting} return
2254 # -- Stash our current commit buffer.
2256 set save [gitdir GITGUI_MSG]
2257 set msg [string trim [$ui_comm get 0.0 end]]
2258 if {![string match amend* $commit_type]
2259 && [$ui_comm edit modified]
2262 set fd [open $save w]
2263 puts $fd [string trim [$ui_comm get 0.0 end]]
2267 catch {file delete $save}
2270 # -- Stash our current window geometry into this repository.
2272 set cfg_geometry [list]
2273 lappend cfg_geometry [wm geometry .]
2274 lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
2275 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
2276 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2279 if {$cfg_geometry ne $rc_geometry} {
2280 catch {exec git repo-config gui.geometry $cfg_geometry}
2287 rescan {set ui_status_value {Ready.}}
2290 proc unstage_helper {txt paths} {
2291 global file_states current_diff
2293 if {![lock_index begin-update]} return
2297 foreach path $paths {
2298 switch -glob -- [lindex $file_states($path) 0] {
2302 lappend pathList $path
2303 if {$path eq $current_diff} {
2304 set after {reshow_diff;}
2309 if {$pathList eq {}} {
2315 [concat $after {set ui_status_value {Ready.}}]
2319 proc do_unstage_selection {} {
2320 global current_diff selected_paths
2322 if {[array size selected_paths] > 0} {
2324 {Unstaging selected files from commit} \
2325 [array names selected_paths]
2326 } elseif {$current_diff ne {}} {
2328 "Unstaging [short_path $current_diff] from commit" \
2329 [list $current_diff]
2333 proc add_helper {txt paths} {
2334 global file_states current_diff
2336 if {![lock_index begin-update]} return
2340 foreach path $paths {
2341 switch -glob -- [lindex $file_states($path) 0] {
2350 lappend pathList $path
2351 if {$path eq $current_diff} {
2352 set after {reshow_diff;}
2357 if {$pathList eq {}} {
2363 [concat $after {set ui_status_value {Ready to commit.}}]
2367 proc do_add_selection {} {
2368 global current_diff selected_paths
2370 if {[array size selected_paths] > 0} {
2372 {Adding selected files} \
2373 [array names selected_paths]
2374 } elseif {$current_diff ne {}} {
2376 "Adding [short_path $current_diff]" \
2377 [list $current_diff]
2381 proc do_add_all {} {
2385 foreach path [array names file_states] {
2386 switch -- [lindex $file_states($path) 0] {
2392 _D {lappend paths $path}
2396 {Adding all modified files} \
2400 proc revert_helper {txt paths} {
2401 global file_states current_diff
2403 if {![lock_index begin-update]} return
2407 foreach path $paths {
2408 switch -glob -- [lindex $file_states($path) 0] {
2415 lappend pathList $path
2416 if {$path eq $current_diff} {
2417 set after {reshow_diff;}
2423 set n [llength $pathList]
2427 } elseif {$n == 1} {
2428 set s "[short_path [lindex $pathList]]"
2430 set s "these $n files"
2433 set reply [tk_dialog \
2435 "[appname] ([reponame])" \
2436 "Revert changes in $s?
2438 Any unadded changes will be permanently lost by the revert." \
2448 [concat $after {set ui_status_value {Ready.}}]
2454 proc do_revert_selection {} {
2455 global current_diff selected_paths
2457 if {[array size selected_paths] > 0} {
2459 {Reverting selected files} \
2460 [array names selected_paths]
2461 } elseif {$current_diff ne {}} {
2463 "Reverting [short_path $current_diff]" \
2464 [list $current_diff]
2468 proc do_signoff {} {
2471 set me [committer_ident]
2472 if {$me eq {}} return
2474 set sob "Signed-off-by: $me"
2475 set last [$ui_comm get {end -1c linestart} {end -1c}]
2476 if {$last ne $sob} {
2477 $ui_comm edit separator
2479 && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
2480 $ui_comm insert end "\n"
2482 $ui_comm insert end "\n$sob"
2483 $ui_comm edit separator
2488 proc do_select_commit_type {} {
2489 global commit_type selected_commit_type
2491 if {$selected_commit_type eq {new}
2492 && [string match amend* $commit_type]} {
2494 } elseif {$selected_commit_type eq {amend}
2495 && ![string match amend* $commit_type]} {
2498 # The amend request was rejected...
2500 if {![string match amend* $commit_type]} {
2501 set selected_commit_type new
2511 global appvers copyright
2512 global tcl_patchLevel tk_patchLevel
2516 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2518 label $w.header -text "About [appname]" \
2520 pack $w.header -side top -fill x
2523 button $w.buttons.close -text {Close} \
2525 -command [list destroy $w]
2526 pack $w.buttons.close -side right
2527 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2530 -text "[appname] - a commit creation tool for Git.
2538 pack $w.desc -side top -fill x -padx 5 -pady 5
2541 append v "[appname] version $appvers\n"
2542 append v "[exec git version]\n"
2544 if {$tcl_patchLevel eq $tk_patchLevel} {
2545 append v "Tcl/Tk version $tcl_patchLevel"
2547 append v "Tcl version $tcl_patchLevel"
2548 append v ", Tk version $tk_patchLevel"
2559 pack $w.vers -side top -fill x -padx 5 -pady 5
2561 menu $w.ctxm -tearoff 0
2562 $w.ctxm add command \
2567 clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
2570 bind $w <Visibility> "grab $w; focus $w"
2571 bind $w <Key-Escape> "destroy $w"
2572 bind_button3 $w.vers "tk_popup $w.ctxm %X %Y; grab $w; focus $w"
2573 wm title $w "About [appname]"
2577 proc do_options {} {
2578 global repo_config global_config font_descs
2579 global repo_config_new global_config_new
2581 array unset repo_config_new
2582 array unset global_config_new
2583 foreach name [array names repo_config] {
2584 set repo_config_new($name) $repo_config($name)
2587 foreach name [array names repo_config] {
2589 gui.diffcontext {continue}
2591 set repo_config_new($name) $repo_config($name)
2593 foreach name [array names global_config] {
2594 set global_config_new($name) $global_config($name)
2597 set w .options_editor
2599 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2601 label $w.header -text "[appname] Options" \
2603 pack $w.header -side top -fill x
2606 button $w.buttons.restore -text {Restore Defaults} \
2608 -command do_restore_defaults
2609 pack $w.buttons.restore -side left
2610 button $w.buttons.save -text Save \
2612 -command [list do_save_config $w]
2613 pack $w.buttons.save -side right
2614 button $w.buttons.cancel -text {Cancel} \
2616 -command [list destroy $w]
2617 pack $w.buttons.cancel -side right
2618 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2620 labelframe $w.repo -text "[reponame] Repository" \
2622 -relief raised -borderwidth 2
2623 labelframe $w.global -text {Global (All Repositories)} \
2625 -relief raised -borderwidth 2
2626 pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
2627 pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
2630 {b partialinclude {Allow Partially Added Files}}
2631 {b pullsummary {Show Pull Summary}}
2632 {b trustmtime {Trust File Modification Timestamps}}
2633 {i diffcontext {Number of Diff Context Lines}}
2635 set type [lindex $option 0]
2636 set name [lindex $option 1]
2637 set text [lindex $option 2]
2638 foreach f {repo global} {
2641 checkbutton $w.$f.$name -text $text \
2642 -variable ${f}_config_new(gui.$name) \
2646 pack $w.$f.$name -side top -anchor w
2650 label $w.$f.$name.l -text "$text:" -font font_ui
2651 pack $w.$f.$name.l -side left -anchor w -fill x
2652 spinbox $w.$f.$name.v \
2653 -textvariable ${f}_config_new(gui.$name) \
2654 -from 1 -to 99 -increment 1 \
2657 pack $w.$f.$name.v -side right -anchor e
2658 pack $w.$f.$name -side top -anchor w -fill x
2664 set all_fonts [lsort [font families]]
2665 foreach option $font_descs {
2666 set name [lindex $option 0]
2667 set font [lindex $option 1]
2668 set text [lindex $option 2]
2670 set global_config_new(gui.$font^^family) \
2671 [font configure $font -family]
2672 set global_config_new(gui.$font^^size) \
2673 [font configure $font -size]
2675 frame $w.global.$name
2676 label $w.global.$name.l -text "$text:" -font font_ui
2677 pack $w.global.$name.l -side left -anchor w -fill x
2678 eval tk_optionMenu $w.global.$name.family \
2679 global_config_new(gui.$font^^family) \
2681 spinbox $w.global.$name.size \
2682 -textvariable global_config_new(gui.$font^^size) \
2683 -from 2 -to 80 -increment 1 \
2686 pack $w.global.$name.size -side right -anchor e
2687 pack $w.global.$name.family -side right -anchor e
2688 pack $w.global.$name -side top -anchor w -fill x
2691 bind $w <Visibility> "grab $w; focus $w"
2692 bind $w <Key-Escape> "destroy $w"
2693 wm title $w "[appname] ([reponame]): Options"
2697 proc do_restore_defaults {} {
2698 global font_descs default_config repo_config
2699 global repo_config_new global_config_new
2701 foreach name [array names default_config] {
2702 set repo_config_new($name) $default_config($name)
2703 set global_config_new($name) $default_config($name)
2706 foreach option $font_descs {
2707 set name [lindex $option 0]
2708 set repo_config(gui.$name) $default_config(gui.$name)
2712 foreach option $font_descs {
2713 set name [lindex $option 0]
2714 set font [lindex $option 1]
2715 set global_config_new(gui.$font^^family) \
2716 [font configure $font -family]
2717 set global_config_new(gui.$font^^size) \
2718 [font configure $font -size]
2722 proc do_save_config {w} {
2723 if {[catch {save_config} err]} {
2724 error_popup "Failed to completely save options:\n\n$err"
2730 proc do_windows_shortcut {} {
2734 set desktop [exec cygpath \
2742 set fn [tk_getSaveFile \
2744 -title "[appname] ([reponame]): Create Desktop Icon" \
2745 -initialdir $desktop \
2746 -initialfile "Git [reponame].bat"]
2750 set sh [exec cygpath \
2754 set me [exec cygpath \
2758 set gd [exec cygpath \
2762 set gw [exec cygpath \
2765 [file dirname [gitdir]]]
2766 regsub -all ' $me "'\\''" me
2767 regsub -all ' $gd "'\\''" gd
2768 puts $fd "@ECHO Entering $gw"
2769 puts $fd "@ECHO Starting git-gui... please wait..."
2770 puts -nonewline $fd "@\"$sh\" --login -c \""
2771 puts -nonewline $fd "GIT_DIR='$gd'"
2772 puts -nonewline $fd " '$me'"
2776 error_popup "Cannot write script:\n\n$err"
2781 proc do_macosx_app {} {
2784 set fn [tk_getSaveFile \
2786 -title "[appname] ([reponame]): Create Desktop Icon" \
2787 -initialdir [file join $env(HOME) Desktop] \
2788 -initialfile "Git [reponame].app"]
2791 set Contents [file join $fn Contents]
2792 set MacOS [file join $Contents MacOS]
2793 set exe [file join $MacOS git-gui]
2797 set fd [open [file join $Contents Info.plist] w]
2798 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
2799 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
2800 <plist version="1.0">
2802 <key>CFBundleDevelopmentRegion</key>
2803 <string>English</string>
2804 <key>CFBundleExecutable</key>
2805 <string>git-gui</string>
2806 <key>CFBundleIdentifier</key>
2807 <string>org.spearce.git-gui</string>
2808 <key>CFBundleInfoDictionaryVersion</key>
2809 <string>6.0</string>
2810 <key>CFBundlePackageType</key>
2811 <string>APPL</string>
2812 <key>CFBundleSignature</key>
2813 <string>????</string>
2814 <key>CFBundleVersion</key>
2815 <string>1.0</string>
2816 <key>NSPrincipalClass</key>
2817 <string>NSApplication</string>
2822 set fd [open $exe w]
2823 set gd [file normalize [gitdir]]
2824 set ep [file normalize [exec git --exec-path]]
2825 regsub -all ' $gd "'\\''" gd
2826 regsub -all ' $ep "'\\''" ep
2827 puts $fd "#!/bin/sh"
2828 foreach name [array names env] {
2829 if {[string match GIT_* $name]} {
2830 regsub -all ' $env($name) "'\\''" v
2831 puts $fd "export $name='$v'"
2834 puts $fd "export PATH='$ep':\$PATH"
2835 puts $fd "export GIT_DIR='$gd'"
2836 puts $fd "exec [file normalize $argv0]"
2839 file attributes $exe -permissions u+x,g+x,o+x
2841 error_popup "Cannot write icon:\n\n$err"
2846 proc toggle_or_diff {w x y} {
2847 global file_states file_lists current_diff ui_index ui_workdir
2848 global last_clicked selected_paths
2850 set pos [split [$w index @$x,$y] .]
2851 set lno [lindex $pos 0]
2852 set col [lindex $pos 1]
2853 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2859 set last_clicked [list $w $lno]
2860 array unset selected_paths
2861 $ui_index tag remove in_sel 0.0 end
2862 $ui_workdir tag remove in_sel 0.0 end
2865 if {$current_diff eq $path} {
2866 set after {reshow_diff;}
2870 if {$w eq $ui_index} {
2872 "Unstaging [short_path $path] from commit" \
2874 [concat $after {set ui_status_value {Ready.}}]
2875 } elseif {$w eq $ui_workdir} {
2877 "Adding [short_path $path]" \
2879 [concat $after {set ui_status_value {Ready.}}]
2882 show_diff $path $w $lno
2886 proc add_one_to_selection {w x y} {
2888 global last_clicked selected_paths
2890 set pos [split [$w index @$x,$y] .]
2891 set lno [lindex $pos 0]
2892 set col [lindex $pos 1]
2893 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2899 set last_clicked [list $w $lno]
2900 if {[catch {set in_sel $selected_paths($path)}]} {
2904 unset selected_paths($path)
2905 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2907 set selected_paths($path) 1
2908 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2912 proc add_range_to_selection {w x y} {
2914 global last_clicked selected_paths
2916 if {[lindex $last_clicked 0] ne $w} {
2917 toggle_or_diff $w $x $y
2921 set pos [split [$w index @$x,$y] .]
2922 set lno [lindex $pos 0]
2923 set lc [lindex $last_clicked 1]
2932 foreach path [lrange $file_lists($w) \
2933 [expr {$begin - 1}] \
2934 [expr {$end - 1}]] {
2935 set selected_paths($path) 1
2937 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2940 ######################################################################
2944 set cursor_ptr arrow
2945 font create font_diff -family Courier -size 10
2949 eval font configure font_ui [font actual [.dummy cget -font]]
2953 font create font_uibold
2954 font create font_diffbold
2959 } elseif {[is_MacOSX]} {
2967 proc apply_config {} {
2968 global repo_config font_descs
2970 foreach option $font_descs {
2971 set name [lindex $option 0]
2972 set font [lindex $option 1]
2974 foreach {cn cv} $repo_config(gui.$name) {
2975 font configure $font $cn $cv
2978 error_popup "Invalid font specified in gui.$name:\n\n$err"
2980 foreach {cn cv} [font configure $font] {
2981 font configure ${font}bold $cn $cv
2983 font configure ${font}bold -weight bold
2987 set default_config(gui.trustmtime) false
2988 set default_config(gui.pullsummary) true
2989 set default_config(gui.partialinclude) false
2990 set default_config(gui.diffcontext) 5
2991 set default_config(gui.fontui) [font configure font_ui]
2992 set default_config(gui.fontdiff) [font configure font_diff]
2994 {fontui font_ui {Main Font}}
2995 {fontdiff font_diff {Diff/Console Font}}
3000 ######################################################################
3006 menu .mbar -tearoff 0
3007 .mbar add cascade -label Repository -menu .mbar.repository
3008 .mbar add cascade -label Edit -menu .mbar.edit
3009 if {!$single_commit} {
3010 .mbar add cascade -label Branch -menu .mbar.branch
3012 .mbar add cascade -label Commit -menu .mbar.commit
3013 if {!$single_commit} {
3014 .mbar add cascade -label Fetch -menu .mbar.fetch
3015 .mbar add cascade -label Pull -menu .mbar.pull
3016 .mbar add cascade -label Push -menu .mbar.push
3018 . configure -menu .mbar
3020 # -- Repository Menu
3022 menu .mbar.repository
3023 .mbar.repository add command \
3024 -label {Visualize Current Branch} \
3025 -command {do_gitk {}} \
3028 .mbar.repository add command \
3029 -label {Visualize All Branches} \
3030 -command {do_gitk {--all}} \
3033 .mbar.repository add separator
3035 if {!$single_commit} {
3036 .mbar.repository add command -label {Compress Database} \
3040 .mbar.repository add command -label {Verify Database} \
3041 -command do_fsck_objects \
3044 .mbar.repository add separator
3047 .mbar.repository add command \
3048 -label {Create Desktop Icon} \
3049 -command do_windows_shortcut \
3051 } elseif {[is_MacOSX]} {
3052 .mbar.repository add command \
3053 -label {Create Desktop Icon} \
3054 -command do_macosx_app \
3059 .mbar.repository add command -label Quit \
3061 -accelerator $M1T-Q \
3067 .mbar.edit add command -label Undo \
3068 -command {catch {[focus] edit undo}} \
3069 -accelerator $M1T-Z \
3071 .mbar.edit add command -label Redo \
3072 -command {catch {[focus] edit redo}} \
3073 -accelerator $M1T-Y \
3075 .mbar.edit add separator
3076 .mbar.edit add command -label Cut \
3077 -command {catch {tk_textCut [focus]}} \
3078 -accelerator $M1T-X \
3080 .mbar.edit add command -label Copy \
3081 -command {catch {tk_textCopy [focus]}} \
3082 -accelerator $M1T-C \
3084 .mbar.edit add command -label Paste \
3085 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
3086 -accelerator $M1T-V \
3088 .mbar.edit add command -label Delete \
3089 -command {catch {[focus] delete sel.first sel.last}} \
3092 .mbar.edit add separator
3093 .mbar.edit add command -label {Select All} \
3094 -command {catch {[focus] tag add sel 0.0 end}} \
3095 -accelerator $M1T-A \
3100 if {!$single_commit} {
3103 .mbar.branch add command -label {Create...} \
3104 -command do_create_branch \
3106 lappend disable_on_lock [list .mbar.branch entryconf \
3107 [.mbar.branch index last] -state]
3109 .mbar.branch add command -label {Delete...} \
3110 -command do_delete_branch \
3112 lappend disable_on_lock [list .mbar.branch entryconf \
3113 [.mbar.branch index last] -state]
3120 .mbar.commit add radiobutton \
3121 -label {New Commit} \
3122 -command do_select_commit_type \
3123 -variable selected_commit_type \
3126 lappend disable_on_lock \
3127 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3129 .mbar.commit add radiobutton \
3130 -label {Amend Last Commit} \
3131 -command do_select_commit_type \
3132 -variable selected_commit_type \
3135 lappend disable_on_lock \
3136 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3138 .mbar.commit add separator
3140 .mbar.commit add command -label Rescan \
3141 -command do_rescan \
3144 lappend disable_on_lock \
3145 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3147 .mbar.commit add command -label {Add To Commit} \
3148 -command do_add_selection \
3150 lappend disable_on_lock \
3151 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3153 .mbar.commit add command -label {Add All To Commit} \
3154 -command do_add_all \
3155 -accelerator $M1T-I \
3157 lappend disable_on_lock \
3158 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3160 .mbar.commit add command -label {Unstage From Commit} \
3161 -command do_unstage_selection \
3163 lappend disable_on_lock \
3164 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3166 .mbar.commit add command -label {Revert Changes} \
3167 -command do_revert_selection \
3169 lappend disable_on_lock \
3170 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3172 .mbar.commit add separator
3174 .mbar.commit add command -label {Sign Off} \
3175 -command do_signoff \
3176 -accelerator $M1T-S \
3179 .mbar.commit add command -label Commit \
3180 -command do_commit \
3181 -accelerator $M1T-Return \
3183 lappend disable_on_lock \
3184 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3186 # -- Transport menus
3188 if {!$single_commit} {
3195 # -- Apple Menu (Mac OS X only)
3197 .mbar add cascade -label Apple -menu .mbar.apple
3200 .mbar.apple add command -label "About [appname]" \
3203 .mbar.apple add command -label "[appname] Options..." \
3204 -command do_options \
3209 .mbar.edit add separator
3210 .mbar.edit add command -label {Options...} \
3211 -command do_options \
3216 if {[file exists /usr/local/miga/lib/gui-miga]
3217 && [file exists .pvcsrc]} {
3219 global ui_status_value
3220 if {![lock_index update]} return
3221 set cmd [list sh --login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
3222 set miga_fd [open "|$cmd" r]
3223 fconfigure $miga_fd -blocking 0
3224 fileevent $miga_fd readable [list miga_done $miga_fd]
3225 set ui_status_value {Running miga...}
3227 proc miga_done {fd} {
3232 rescan [list set ui_status_value {Ready.}]
3235 .mbar add cascade -label Tools -menu .mbar.tools
3237 .mbar.tools add command -label "Migrate" \
3240 lappend disable_on_lock \
3241 [list .mbar.tools entryconf [.mbar.tools index last] -state]
3246 .mbar add cascade -label Help -menu .mbar.help
3249 .mbar.help add command -label "About [appname]" \
3261 -text {Current Branch:} \
3266 -textvariable current_branch \
3270 pack .branch.l1 -side left
3271 pack .branch.cb -side left -fill x
3272 pack .branch -side top -fill x
3274 # -- Main Window Layout
3276 panedwindow .vpane -orient vertical
3277 panedwindow .vpane.files -orient horizontal
3278 .vpane add .vpane.files -sticky nsew -height 100 -width 400
3279 pack .vpane -anchor n -side top -fill both -expand 1
3281 # -- Index File List
3283 frame .vpane.files.index -height 100 -width 400
3284 label .vpane.files.index.title -text {Changes To Be Committed} \
3287 text $ui_index -background white -borderwidth 0 \
3288 -width 40 -height 10 \
3290 -cursor $cursor_ptr \
3291 -yscrollcommand {.vpane.files.index.sb set} \
3293 scrollbar .vpane.files.index.sb -command [list $ui_index yview]
3294 pack .vpane.files.index.title -side top -fill x
3295 pack .vpane.files.index.sb -side right -fill y
3296 pack $ui_index -side left -fill both -expand 1
3297 .vpane.files add .vpane.files.index -sticky nsew
3299 # -- Working Directory File List
3301 frame .vpane.files.workdir -height 100 -width 100
3302 label .vpane.files.workdir.title -text {Changed But Not Updated} \
3305 text $ui_workdir -background white -borderwidth 0 \
3306 -width 40 -height 10 \
3308 -cursor $cursor_ptr \
3309 -yscrollcommand {.vpane.files.workdir.sb set} \
3311 scrollbar .vpane.files.workdir.sb -command [list $ui_workdir yview]
3312 pack .vpane.files.workdir.title -side top -fill x
3313 pack .vpane.files.workdir.sb -side right -fill y
3314 pack $ui_workdir -side left -fill both -expand 1
3315 .vpane.files add .vpane.files.workdir -sticky nsew
3317 foreach i [list $ui_index $ui_workdir] {
3318 $i tag conf in_diff -font font_uibold
3319 $i tag conf in_sel \
3320 -background [$i cget -foreground] \
3321 -foreground [$i cget -background]
3325 # -- Diff and Commit Area
3327 frame .vpane.lower -height 300 -width 400
3328 frame .vpane.lower.commarea
3329 frame .vpane.lower.diff -relief sunken -borderwidth 1
3330 pack .vpane.lower.commarea -side top -fill x
3331 pack .vpane.lower.diff -side bottom -fill both -expand 1
3332 .vpane add .vpane.lower -stick nsew
3334 # -- Commit Area Buttons
3336 frame .vpane.lower.commarea.buttons
3337 label .vpane.lower.commarea.buttons.l -text {} \
3341 pack .vpane.lower.commarea.buttons.l -side top -fill x
3342 pack .vpane.lower.commarea.buttons -side left -fill y
3344 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
3345 -command do_rescan \
3347 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3348 lappend disable_on_lock \
3349 {.vpane.lower.commarea.buttons.rescan conf -state}
3351 button .vpane.lower.commarea.buttons.incall -text {Add All} \
3352 -command do_add_all \
3354 pack .vpane.lower.commarea.buttons.incall -side top -fill x
3355 lappend disable_on_lock \
3356 {.vpane.lower.commarea.buttons.incall conf -state}
3358 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
3359 -command do_signoff \
3361 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3363 button .vpane.lower.commarea.buttons.commit -text {Commit} \
3364 -command do_commit \
3366 pack .vpane.lower.commarea.buttons.commit -side top -fill x
3367 lappend disable_on_lock \
3368 {.vpane.lower.commarea.buttons.commit conf -state}
3370 # -- Commit Message Buffer
3372 frame .vpane.lower.commarea.buffer
3373 frame .vpane.lower.commarea.buffer.header
3374 set ui_comm .vpane.lower.commarea.buffer.t
3375 set ui_coml .vpane.lower.commarea.buffer.header.l
3376 radiobutton .vpane.lower.commarea.buffer.header.new \
3377 -text {New Commit} \
3378 -command do_select_commit_type \
3379 -variable selected_commit_type \
3382 lappend disable_on_lock \
3383 [list .vpane.lower.commarea.buffer.header.new conf -state]
3384 radiobutton .vpane.lower.commarea.buffer.header.amend \
3385 -text {Amend Last Commit} \
3386 -command do_select_commit_type \
3387 -variable selected_commit_type \
3390 lappend disable_on_lock \
3391 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3396 proc trace_commit_type {varname args} {
3397 global ui_coml commit_type
3398 switch -glob -- $commit_type {
3399 initial {set txt {Initial Commit Message:}}
3400 amend {set txt {Amended Commit Message:}}
3401 amend-initial {set txt {Amended Initial Commit Message:}}
3402 amend-merge {set txt {Amended Merge Commit Message:}}
3403 merge {set txt {Merge Commit Message:}}
3404 * {set txt {Commit Message:}}
3406 $ui_coml conf -text $txt
3408 trace add variable commit_type write trace_commit_type
3409 pack $ui_coml -side left -fill x
3410 pack .vpane.lower.commarea.buffer.header.amend -side right
3411 pack .vpane.lower.commarea.buffer.header.new -side right
3413 text $ui_comm -background white -borderwidth 1 \
3416 -autoseparators true \
3418 -width 75 -height 9 -wrap none \
3420 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3421 scrollbar .vpane.lower.commarea.buffer.sby \
3422 -command [list $ui_comm yview]
3423 pack .vpane.lower.commarea.buffer.header -side top -fill x
3424 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3425 pack $ui_comm -side left -fill y
3426 pack .vpane.lower.commarea.buffer -side left -fill y
3428 # -- Commit Message Buffer Context Menu
3430 set ctxm .vpane.lower.commarea.buffer.ctxm
3431 menu $ctxm -tearoff 0
3435 -command {tk_textCut $ui_comm}
3439 -command {tk_textCopy $ui_comm}
3443 -command {tk_textPaste $ui_comm}
3447 -command {$ui_comm delete sel.first sel.last}
3450 -label {Select All} \
3452 -command {$ui_comm tag add sel 0.0 end}
3457 $ui_comm tag add sel 0.0 end
3458 tk_textCopy $ui_comm
3459 $ui_comm tag remove sel 0.0 end
3466 bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
3471 set diff_actions [list]
3472 proc trace_current_diff {varname args} {
3473 global current_diff diff_actions file_states
3474 if {$current_diff eq {}} {
3481 set s [mapdesc [lindex $file_states($p) 0] $p]
3483 set p [escape_path $p]
3487 .vpane.lower.diff.header.status configure -text $s
3488 .vpane.lower.diff.header.file configure -text $f
3489 .vpane.lower.diff.header.path configure -text $p
3490 foreach w $diff_actions {
3494 trace add variable current_diff write trace_current_diff
3496 frame .vpane.lower.diff.header -background orange
3497 label .vpane.lower.diff.header.status \
3498 -background orange \
3499 -width $max_status_desc \
3503 label .vpane.lower.diff.header.file \
3504 -background orange \
3508 label .vpane.lower.diff.header.path \
3509 -background orange \
3513 pack .vpane.lower.diff.header.status -side left
3514 pack .vpane.lower.diff.header.file -side left
3515 pack .vpane.lower.diff.header.path -fill x
3516 set ctxm .vpane.lower.diff.header.ctxm
3517 menu $ctxm -tearoff 0
3528 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3529 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3533 frame .vpane.lower.diff.body
3534 set ui_diff .vpane.lower.diff.body.t
3535 text $ui_diff -background white -borderwidth 0 \
3536 -width 80 -height 15 -wrap none \
3538 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3539 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3541 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3542 -command [list $ui_diff xview]
3543 scrollbar .vpane.lower.diff.body.sby -orient vertical \
3544 -command [list $ui_diff yview]
3545 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3546 pack .vpane.lower.diff.body.sby -side right -fill y
3547 pack $ui_diff -side left -fill both -expand 1
3548 pack .vpane.lower.diff.header -side top -fill x
3549 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3551 $ui_diff tag conf d_@ -font font_diffbold
3552 $ui_diff tag conf d_+ -foreground blue
3553 $ui_diff tag conf d_- -foreground red
3554 $ui_diff tag conf d_++ -foreground {#00a000}
3555 $ui_diff tag conf d_-- -foreground {#a000a0}
3556 $ui_diff tag conf d_+- \
3558 -background {light goldenrod yellow}
3559 $ui_diff tag conf d_-+ \
3563 # -- Diff Body Context Menu
3565 set ctxm .vpane.lower.diff.body.ctxm
3566 menu $ctxm -tearoff 0
3570 -command {tk_textCopy $ui_diff}
3571 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3573 -label {Select All} \
3575 -command {$ui_diff tag add sel 0.0 end}
3576 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3581 $ui_diff tag add sel 0.0 end
3582 tk_textCopy $ui_diff
3583 $ui_diff tag remove sel 0.0 end
3585 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3588 -label {Decrease Font Size} \
3590 -command {incr_font_size font_diff -1}
3591 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3593 -label {Increase Font Size} \
3595 -command {incr_font_size font_diff 1}
3596 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3599 -label {Show Less Context} \
3601 -command {if {$repo_config(gui.diffcontext) >= 2} {
3602 incr repo_config(gui.diffcontext) -1
3605 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3607 -label {Show More Context} \
3610 incr repo_config(gui.diffcontext)
3613 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3615 $ctxm add command -label {Options...} \
3618 bind_button3 $ui_diff "tk_popup $ctxm %X %Y"
3622 set ui_status_value {Initializing...}
3623 label .status -textvariable ui_status_value \
3629 pack .status -anchor w -side bottom -fill x
3634 set gm $repo_config(gui.geometry)
3635 wm geometry . [lindex $gm 0]
3636 .vpane sash place 0 \
3637 [lindex [.vpane sash coord 0] 0] \
3639 .vpane.files sash place 0 \
3641 [lindex [.vpane.files sash coord 0] 1]
3647 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3648 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
3649 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
3650 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3651 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3652 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3653 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3654 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3655 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3656 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3657 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3659 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3660 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3661 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3662 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3663 bind $ui_diff <$M1B-Key-v> {break}
3664 bind $ui_diff <$M1B-Key-V> {break}
3665 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3666 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3667 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3668 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3669 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3670 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3672 bind . <Destroy> do_quit
3673 bind all <Key-F5> do_rescan
3674 bind all <$M1B-Key-r> do_rescan
3675 bind all <$M1B-Key-R> do_rescan
3676 bind . <$M1B-Key-s> do_signoff
3677 bind . <$M1B-Key-S> do_signoff
3678 bind . <$M1B-Key-i> do_add_all
3679 bind . <$M1B-Key-I> do_add_all
3680 bind . <$M1B-Key-Return> do_commit
3681 bind all <$M1B-Key-q> do_quit
3682 bind all <$M1B-Key-Q> do_quit
3683 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
3684 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
3685 foreach i [list $ui_index $ui_workdir] {
3686 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
3687 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3688 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
3692 set file_lists($ui_index) [list]
3693 set file_lists($ui_workdir) [list]
3697 set MERGE_HEAD [list]
3700 set current_branch {}
3702 set selected_commit_type new
3704 wm title . "[appname] ([file normalize [file dirname [gitdir]]])"
3705 focus -force $ui_comm
3707 # -- Warn the user about environmental problems. Cygwin's Tcl
3708 # does *not* pass its env array onto any processes it spawns.
3709 # This means that git processes get none of our environment.
3714 set msg "Possible environment issues exist.
3716 The following environment variables are probably
3717 going to be ignored by any Git subprocess run
3721 foreach name [array names env] {
3722 switch -regexp -- $name {
3723 {^GIT_INDEX_FILE$} -
3724 {^GIT_OBJECT_DIRECTORY$} -
3725 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3727 {^GIT_EXTERNAL_DIFF$} -
3731 {^GIT_CONFIG_LOCAL$} -
3732 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3733 append msg " - $name\n"
3736 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3737 append msg " - $name\n"
3739 set suggest_user $name
3743 if {$ignored_env > 0} {
3745 This is due to a known issue with the
3746 Tcl binary distributed by Cygwin."
3748 if {$suggest_user ne {}} {
3751 A good replacement for $suggest_user
3752 is placing values for the user.name and
3753 user.email settings into your personal
3759 unset ignored_env msg suggest_user name
3762 # -- Only initialize complex UI if we are going to stay running.
3764 if {!$single_commit} {
3768 populate_branch_menu .mbar.branch
3769 populate_fetch_menu .mbar.fetch
3770 populate_pull_menu .mbar.pull
3771 populate_push_menu .mbar.push
3774 # -- Only suggest a gc run if we are going to stay running.
3776 if {!$single_commit} {
3777 set object_limit 2000
3778 if {[is_Windows]} {set object_limit 200}
3779 regexp {^([0-9]+) objects,} [exec git count-objects] _junk objects_current
3780 if {$objects_current >= $object_limit} {
3782 "This repository currently has $objects_current loose objects.
3784 To maintain optimal performance it is strongly
3785 recommended that you compress the database
3786 when more than $object_limit loose objects exist.
3788 Compress the database now?"] eq yes} {
3792 unset object_limit _junk objects_current
3795 lock_index begin-read