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
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\t$path\0"
1451 display_file $path $new
1454 set ui_status_value [format \
1455 "$msg... %i/%i files (%.2f%%)" \
1458 [expr {100.0 * $update_index_cp / $totalCnt}]]
1461 proc update_index {msg pathList after} {
1462 global update_index_cp ui_status_value
1464 if {![lock_index update]} return
1466 set update_index_cp 0
1467 set pathList [lsort $pathList]
1468 set totalCnt [llength $pathList]
1469 set batch [expr {int($totalCnt * .01) + 1}]
1470 if {$batch > 25} {set batch 25}
1472 set ui_status_value [format \
1473 "$msg... %i/%i files (%.2f%%)" \
1477 set fd [open "| git update-index --add --remove -z --stdin" w]
1483 fileevent $fd writable [list \
1484 write_update_index \
1494 proc write_update_index {fd pathList totalCnt batch msg after} {
1495 global update_index_cp ui_status_value
1496 global file_states current_diff
1498 if {$update_index_cp >= $totalCnt} {
1505 for {set i $batch} \
1506 {$update_index_cp < $totalCnt && $i > 0} \
1508 set path [lindex $pathList $update_index_cp]
1509 incr update_index_cp
1511 switch -glob -- [lindex $file_states($path) 0] {
1520 puts -nonewline $fd "$path\0"
1521 display_file $path $new
1524 set ui_status_value [format \
1525 "$msg... %i/%i files (%.2f%%)" \
1528 [expr {100.0 * $update_index_cp / $totalCnt}]]
1531 proc checkout_index {msg pathList after} {
1532 global update_index_cp ui_status_value
1534 if {![lock_index update]} return
1536 set update_index_cp 0
1537 set pathList [lsort $pathList]
1538 set totalCnt [llength $pathList]
1539 set batch [expr {int($totalCnt * .01) + 1}]
1540 if {$batch > 25} {set batch 25}
1542 set ui_status_value [format \
1543 "$msg... %i/%i files (%.2f%%)" \
1547 set cmd [list git checkout-index]
1553 set fd [open "| $cmd " w]
1559 fileevent $fd writable [list \
1560 write_checkout_index \
1570 proc write_checkout_index {fd pathList totalCnt batch msg after} {
1571 global update_index_cp ui_status_value
1572 global file_states current_diff
1574 if {$update_index_cp >= $totalCnt} {
1581 for {set i $batch} \
1582 {$update_index_cp < $totalCnt && $i > 0} \
1584 set path [lindex $pathList $update_index_cp]
1585 incr update_index_cp
1586 switch -glob -- [lindex $file_states($path) 0] {
1590 puts -nonewline $fd "$path\0"
1591 display_file $path ?_
1596 set ui_status_value [format \
1597 "$msg... %i/%i files (%.2f%%)" \
1600 [expr {100.0 * $update_index_cp / $totalCnt}]]
1603 ######################################################################
1605 ## branch management
1607 proc load_all_heads {} {
1608 global all_heads tracking_branches
1610 set all_heads [list]
1611 set cmd [list git for-each-ref]
1612 lappend cmd --format=%(refname)
1613 lappend cmd refs/heads
1614 set fd [open "| $cmd" r]
1615 while {[gets $fd line] > 0} {
1616 if {![catch {set info $tracking_branches($line)}]} continue
1617 if {![regsub ^refs/heads/ $line {} name]} continue
1618 lappend all_heads $name
1622 set all_heads [lsort $all_heads]
1625 proc populate_branch_menu {} {
1626 global all_heads disable_on_lock
1629 set last [$m index last]
1630 for {set i 0} {$i <= $last} {incr i} {
1631 if {[$m type $i] eq {separator}} {
1634 foreach a $disable_on_lock {
1635 if {[lindex $a 0] ne $m || [lindex $a 2] < $i} {
1639 set disable_on_lock $new_dol
1645 foreach b $all_heads {
1646 $m add radiobutton \
1648 -command [list switch_branch $b] \
1649 -variable current_branch \
1652 lappend disable_on_lock \
1653 [list $m entryconf [$m index last] -state]
1657 proc do_create_branch_action {w} {
1658 global all_heads null_sha1
1659 global create_branch_checkout create_branch_revtype create_branch_head
1661 set newbranch [string trim [$w.name.t get 0.0 end]]
1662 if {![catch {exec git show-ref --verify -- "refs/heads/$newbranch"}]} {
1666 -title [wm title $w] \
1668 -message "Branch '$newbranch' already exists."
1672 if {[catch {exec git check-ref-format "heads/$newbranch"}]} {
1676 -title [wm title $w] \
1678 -message "We do not like '$newbranch' as a branch name."
1684 switch -- $create_branch_revtype {
1685 head {set rev $create_branch_head}
1686 expression {set rev [string trim [$w.from.exp.t get 0.0 end]]}
1688 if {[catch {set cmt [exec git rev-parse --verify "${rev}^0"]}]} {
1692 -title [wm title $w] \
1694 -message "Invalid starting revision: $rev"
1697 set cmd [list git update-ref]
1699 lappend cmd "branch: Created from $rev"
1700 lappend cmd "refs/heads/$newbranch"
1702 lappend cmd $null_sha1
1703 if {[catch {eval exec $cmd} err]} {
1707 -title [wm title $w] \
1709 -message "Failed to create '$newbranch'.\n\n$err"
1713 lappend all_heads $newbranch
1714 set all_heads [lsort $all_heads]
1715 populate_branch_menu
1719 proc do_create_branch {} {
1720 global all_heads current_branch
1721 global create_branch_checkout create_branch_revtype create_branch_head
1723 set create_branch_checkout true
1724 set create_branch_revtype head
1725 set create_branch_head $current_branch
1727 set w .branch_editor
1729 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
1731 label $w.header -text {Create New Branch} \
1733 pack $w.header -side top -fill x
1736 button $w.buttons.create -text Create \
1739 -command [list do_create_branch_action $w]
1740 pack $w.buttons.create -side right
1741 button $w.buttons.cancel -text {Cancel} \
1743 -command [list destroy $w]
1744 pack $w.buttons.cancel -side right -padx 5
1745 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
1747 labelframe $w.name \
1748 -text {Branch Description} \
1750 label $w.name.l -text {Name:} -font font_ui
1755 bind $w.name.t <Shift-Key-Tab> "focus $w.postActions.checkout;break"
1756 bind $w.name.t <Key-Tab> "focus $w.from.exp.t;break"
1757 bind $w.name.t <Key-Return> "do_create_branch_action $w;break"
1758 bind $w.name.t <Key> {
1759 if {{%K} ne {BackSpace}
1762 && {%K} ne {Return}} {
1764 if {[string first %A {~^:?*[}] >= 0} break
1767 pack $w.name.l -side left -padx 5
1768 pack $w.name.t -side left -fill x -expand 1
1769 pack $w.name -anchor nw -fill x -pady 5 -padx 5
1771 labelframe $w.from \
1772 -text {Starting Revision} \
1775 radiobutton $w.from.head.r \
1776 -text {Local Branch:} \
1778 -variable create_branch_revtype \
1780 eval tk_optionMenu $w.from.head.m create_branch_head $all_heads
1781 pack $w.from.head.r -side left
1782 pack $w.from.head.m -side left
1784 radiobutton $w.from.exp.r \
1785 -text {Revision Expression:} \
1787 -variable create_branch_revtype \
1789 text $w.from.exp.t \
1793 bind $w.from.exp.t <Shift-Key-Tab> "focus $w.name.t;break"
1794 bind $w.from.exp.t <Key-Tab> "focus $w.postActions.checkout;break"
1795 bind $w.from.exp.t <Key-Return> "do_create_branch_action $w;break"
1796 pack $w.from.exp.r -side left
1797 pack $w.from.exp.t -side left -fill x -expand 1
1798 pack $w.from.head -padx 5 -fill x -expand 1
1799 pack $w.from.exp -padx 5 -fill x -expand 1
1800 pack $w.from -anchor nw -fill x -pady 5 -padx 5
1802 labelframe $w.postActions \
1803 -text {Post Creation Actions} \
1805 checkbutton $w.postActions.checkout \
1806 -text {Checkout after creation} \
1809 -variable create_branch_checkout \
1811 pack $w.postActions.checkout -anchor nw
1812 pack $w.postActions -anchor nw -fill x -pady 5 -padx 5
1814 bind $w <Visibility> "grab $w; focus $w.name.t"
1815 bind $w <Key-Escape> "destroy $w"
1816 bind $w <Key-Return> "do_create_branch_action $w;break"
1817 wm title $w "[appname] ([reponame]): Create Branch"
1821 proc do_delete_branch_action {w} {
1823 global delete_branch_checkhead delete_branch_head
1825 set to_delete [list]
1826 set msg {Are you sure you want to delete the following branches?
1829 foreach i [$w.list.l curselection] {
1830 set b [$w.list.l get $i]
1831 if {[catch {set o [exec git rev-parse --verify $b]}]} continue
1832 if {$delete_branch_checkhead} {
1833 if {[catch {set m [exec git merge-base $o $delete_branch_head]}]} continue
1834 if {$o ne $m} continue
1836 lappend to_delete [list $b $o]
1837 append msg " - $b\n"
1839 if {$to_delete eq {}} {
1843 -title [wm title $w] \
1845 -message {No branches are able to be deleted.
1847 This is likely because you did not select any branches,
1848 or all selected branches are not completely merged.
1853 It can be difficult to recover deleted branches.
1855 Delete the above branches?}
1856 if {[tk_messageBox \
1859 -title [wm title $w] \
1861 -message $msg] ne yes} {
1866 foreach i $to_delete {
1869 if {[catch {exec git update-ref -d "refs/heads/$b" $o} err]} {
1870 append failed " - $b: $err\n"
1872 set x [lsearch -sorted $all_heads $b]
1874 set all_heads [lreplace $all_heads $x $x]
1879 if {$failed ne {}} {
1883 -title [wm title $w] \
1885 -message "Failed to delete branches:\n$failed"
1888 set all_heads [lsort $all_heads]
1889 populate_branch_menu
1893 proc do_delete_branch {} {
1894 global all_heads current_branch
1895 global delete_branch_checkhead delete_branch_head
1897 set delete_branch_checkhead 1
1898 set delete_branch_head $current_branch
1900 set w .branch_editor
1902 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
1904 label $w.header -text {Delete Local Branch} \
1906 pack $w.header -side top -fill x
1909 button $w.buttons.create -text Delete \
1911 -command [list do_delete_branch_action $w]
1912 pack $w.buttons.create -side right
1913 button $w.buttons.cancel -text {Cancel} \
1915 -command [list destroy $w]
1916 pack $w.buttons.cancel -side right -padx 5
1917 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
1919 labelframe $w.list \
1920 -text {Local Branches} \
1925 -selectmode extended \
1927 foreach h $all_heads {
1928 if {$h ne $current_branch} {
1929 $w.list.l insert end $h
1932 pack $w.list.l -fill both -pady 5 -padx 5
1933 pack $w.list -fill both -pady 5 -padx 5
1935 labelframe $w.validate \
1936 -text {Only Delete If} \
1938 frame $w.validate.head
1939 checkbutton $w.validate.head.r \
1940 -text {Already Merged Into Local Branch:} \
1941 -variable delete_branch_checkhead \
1943 eval tk_optionMenu $w.validate.head.m delete_branch_head $all_heads
1944 pack $w.validate.head.r -side left
1945 pack $w.validate.head.m -side left
1946 pack $w.validate.head -padx 5 -fill x -expand 1
1947 pack $w.validate -anchor nw -fill x -pady 5 -padx 5
1949 bind $w <Visibility> "grab $w; focus $w"
1950 bind $w <Key-Escape> "destroy $w"
1951 wm title $w "[appname] ([reponame]): Delete Branch"
1955 proc switch_branch {b} {
1956 global HEAD commit_type file_states current_branch
1957 global selected_commit_type ui_comm
1959 if {![lock_index switch]} return
1961 # -- Backup the selected branch (repository_state resets it)
1963 set new_branch $current_branch
1965 # -- Our in memory state should match the repository.
1967 repository_state curType curHEAD curMERGE_HEAD
1968 if {[string match amend* $commit_type]
1969 && $curType eq {normal}
1970 && $curHEAD eq $HEAD} {
1971 } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
1972 info_popup {Last scanned state does not match repository state.
1974 Another Git program has modified this repository
1975 since the last scan. A rescan must be performed
1976 before the current branch can be changed.
1978 The rescan will be automatically started now.
1981 rescan {set ui_status_value {Ready.}}
1985 # -- Toss the message buffer if we are in amend mode.
1987 if {[string match amend* $curType]} {
1988 $ui_comm delete 0.0 end
1990 $ui_comm edit modified false
1993 set selected_commit_type new
1994 set current_branch $new_branch
1997 error "NOT FINISHED"
2000 ######################################################################
2002 ## remote management
2004 proc load_all_remotes {} {
2006 global all_remotes tracking_branches
2008 set all_remotes [list]
2009 array unset tracking_branches
2011 set rm_dir [gitdir remotes]
2012 if {[file isdirectory $rm_dir]} {
2013 set all_remotes [glob \
2017 -directory $rm_dir *]
2019 foreach name $all_remotes {
2021 set fd [open [file join $rm_dir $name] r]
2022 while {[gets $fd line] >= 0} {
2023 if {![regexp {^Pull:[ ]*([^:]+):(.+)$} \
2024 $line line src dst]} continue
2025 if {![regexp ^refs/ $dst]} {
2026 set dst "refs/heads/$dst"
2028 set tracking_branches($dst) [list $name $src]
2035 foreach line [array names repo_config remote.*.url] {
2036 if {![regexp ^remote\.(.*)\.url\$ $line line name]} continue
2037 lappend all_remotes $name
2039 if {[catch {set fl $repo_config(remote.$name.fetch)}]} {
2043 if {![regexp {^([^:]+):(.+)$} $line line src dst]} continue
2044 if {![regexp ^refs/ $dst]} {
2045 set dst "refs/heads/$dst"
2047 set tracking_branches($dst) [list $name $src]
2051 set all_remotes [lsort -unique $all_remotes]
2054 proc populate_fetch_menu {m} {
2055 global all_remotes repo_config
2057 foreach r $all_remotes {
2059 if {![catch {set a $repo_config(remote.$r.url)}]} {
2060 if {![catch {set a $repo_config(remote.$r.fetch)}]} {
2065 set fd [open [gitdir remotes $r] r]
2066 while {[gets $fd n] >= 0} {
2067 if {[regexp {^Pull:[ \t]*([^:]+):} $n]} {
2078 -label "Fetch from $r..." \
2079 -command [list fetch_from $r] \
2085 proc populate_push_menu {m} {
2086 global all_remotes repo_config
2088 foreach r $all_remotes {
2090 if {![catch {set a $repo_config(remote.$r.url)}]} {
2091 if {![catch {set a $repo_config(remote.$r.push)}]} {
2096 set fd [open [gitdir remotes $r] r]
2097 while {[gets $fd n] >= 0} {
2098 if {[regexp {^Push:[ \t]*([^:]+):} $n]} {
2109 -label "Push to $r..." \
2110 -command [list push_to $r] \
2116 proc populate_pull_menu {m} {
2117 global repo_config all_remotes disable_on_lock
2119 foreach remote $all_remotes {
2121 if {[array get repo_config remote.$remote.url] ne {}} {
2122 if {[array get repo_config remote.$remote.fetch] ne {}} {
2123 foreach line $repo_config(remote.$remote.fetch) {
2124 if {[regexp {^([^:]+):} $line line rb]} {
2131 set fd [open [gitdir remotes $remote] r]
2132 while {[gets $fd line] >= 0} {
2133 if {[regexp {^Pull:[ \t]*([^:]+):} $line line rb]} {
2141 foreach rb $rb_list {
2142 regsub ^refs/heads/ $rb {} rb_short
2144 -label "Branch $rb_short from $remote..." \
2145 -command [list pull_remote $remote $rb] \
2147 lappend disable_on_lock \
2148 [list $m entryconf [$m index last] -state]
2153 ######################################################################
2158 #define mask_width 14
2159 #define mask_height 15
2160 static unsigned char mask_bits[] = {
2161 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2162 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2163 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2166 image create bitmap file_plain -background white -foreground black -data {
2167 #define plain_width 14
2168 #define plain_height 15
2169 static unsigned char plain_bits[] = {
2170 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2171 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2172 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2173 } -maskdata $filemask
2175 image create bitmap file_mod -background white -foreground blue -data {
2176 #define mod_width 14
2177 #define mod_height 15
2178 static unsigned char mod_bits[] = {
2179 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2180 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2181 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2182 } -maskdata $filemask
2184 image create bitmap file_fulltick -background white -foreground "#007000" -data {
2185 #define file_fulltick_width 14
2186 #define file_fulltick_height 15
2187 static unsigned char file_fulltick_bits[] = {
2188 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2189 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2190 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2191 } -maskdata $filemask
2193 image create bitmap file_parttick -background white -foreground "#005050" -data {
2194 #define parttick_width 14
2195 #define parttick_height 15
2196 static unsigned char parttick_bits[] = {
2197 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2198 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
2199 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2200 } -maskdata $filemask
2202 image create bitmap file_question -background white -foreground black -data {
2203 #define file_question_width 14
2204 #define file_question_height 15
2205 static unsigned char file_question_bits[] = {
2206 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2207 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2208 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2209 } -maskdata $filemask
2211 image create bitmap file_removed -background white -foreground red -data {
2212 #define file_removed_width 14
2213 #define file_removed_height 15
2214 static unsigned char file_removed_bits[] = {
2215 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2216 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2217 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2218 } -maskdata $filemask
2220 image create bitmap file_merge -background white -foreground blue -data {
2221 #define file_merge_width 14
2222 #define file_merge_height 15
2223 static unsigned char file_merge_bits[] = {
2224 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2225 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2226 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2227 } -maskdata $filemask
2229 set ui_index .vpane.files.index.list
2230 set ui_workdir .vpane.files.workdir.list
2232 set all_icons(_$ui_index) file_plain
2233 set all_icons(A$ui_index) file_fulltick
2234 set all_icons(M$ui_index) file_fulltick
2235 set all_icons(D$ui_index) file_removed
2236 set all_icons(U$ui_index) file_merge
2238 set all_icons(_$ui_workdir) file_plain
2239 set all_icons(M$ui_workdir) file_mod
2240 set all_icons(D$ui_workdir) file_question
2241 set all_icons(O$ui_workdir) file_plain
2243 set max_status_desc 0
2247 {_M "Modified, not staged"}
2248 {M_ "Staged for commit"}
2249 {MM "Portions staged for commit"}
2250 {MD "Staged for commit, missing"}
2252 {_O "Untracked, not staged"}
2253 {A_ "Staged for commit"}
2254 {AM "Portions staged for commit"}
2255 {AD "Staged for commit, missing"}
2258 {D_ "Staged for removal"}
2259 {DO "Staged for removal, still present"}
2261 {U_ "Requires merge resolution"}
2262 {UM "Requires merge resolution"}
2263 {UD "Requires merge resolution"}
2265 if {$max_status_desc < [string length [lindex $i 1]]} {
2266 set max_status_desc [string length [lindex $i 1]]
2268 set all_descs([lindex $i 0]) [lindex $i 1]
2272 ######################################################################
2277 global tcl_platform tk_library
2278 if {[tk windowingsystem] eq {aqua}} {
2284 proc is_Windows {} {
2286 if {$tcl_platform(platform) eq {windows}} {
2292 proc bind_button3 {w cmd} {
2293 bind $w <Any-Button-3> $cmd
2295 bind $w <Control-Button-1> $cmd
2299 proc incr_font_size {font {amt 1}} {
2300 set sz [font configure $font -size]
2302 font configure $font -size $sz
2303 font configure ${font}bold -size $sz
2306 proc hook_failed_popup {hook msg} {
2311 label $w.m.l1 -text "$hook hook failed:" \
2316 -background white -borderwidth 1 \
2318 -width 80 -height 10 \
2320 -yscrollcommand [list $w.m.sby set]
2322 -text {You must correct the above errors before committing.} \
2326 scrollbar $w.m.sby -command [list $w.m.t yview]
2327 pack $w.m.l1 -side top -fill x
2328 pack $w.m.l2 -side bottom -fill x
2329 pack $w.m.sby -side right -fill y
2330 pack $w.m.t -side left -fill both -expand 1
2331 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
2333 $w.m.t insert 1.0 $msg
2334 $w.m.t conf -state disabled
2336 button $w.ok -text OK \
2339 -command "destroy $w"
2340 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
2342 bind $w <Visibility> "grab $w; focus $w"
2343 bind $w <Key-Return> "destroy $w"
2344 wm title $w "[appname] ([reponame]): error"
2348 set next_console_id 0
2350 proc new_console {short_title long_title} {
2351 global next_console_id console_data
2352 set w .console[incr next_console_id]
2353 set console_data($w) [list $short_title $long_title]
2354 return [console_init $w]
2357 proc console_init {w} {
2358 global console_cr console_data M1B
2360 set console_cr($w) 1.0
2363 label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
2368 -background white -borderwidth 1 \
2370 -width 80 -height 10 \
2373 -yscrollcommand [list $w.m.sby set]
2374 label $w.m.s -text {Working... please wait...} \
2378 scrollbar $w.m.sby -command [list $w.m.t yview]
2379 pack $w.m.l1 -side top -fill x
2380 pack $w.m.s -side bottom -fill x
2381 pack $w.m.sby -side right -fill y
2382 pack $w.m.t -side left -fill both -expand 1
2383 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
2385 menu $w.ctxm -tearoff 0
2386 $w.ctxm add command -label "Copy" \
2388 -command "tk_textCopy $w.m.t"
2389 $w.ctxm add command -label "Select All" \
2391 -command "$w.m.t tag add sel 0.0 end"
2392 $w.ctxm add command -label "Copy All" \
2395 $w.m.t tag add sel 0.0 end
2397 $w.m.t tag remove sel 0.0 end
2400 button $w.ok -text {Close} \
2403 -command "destroy $w"
2404 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
2406 bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
2407 bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
2408 bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
2409 bind $w <Visibility> "focus $w"
2410 wm title $w "[appname] ([reponame]): [lindex $console_data($w) 0]"
2414 proc console_exec {w cmd {after {}}} {
2415 # -- Windows tosses the enviroment when we exec our child.
2416 # But most users need that so we have to relogin. :-(
2419 set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
2422 # -- Tcl won't let us redirect both stdout and stderr to
2423 # the same pipe. So pass it through cat...
2425 set cmd [concat | $cmd |& cat]
2427 set fd_f [open $cmd r]
2428 fconfigure $fd_f -blocking 0 -translation binary
2429 fileevent $fd_f readable [list console_read $w $fd_f $after]
2432 proc console_read {w fd after} {
2433 global console_cr console_data
2437 if {![winfo exists $w]} {console_init $w}
2438 $w.m.t conf -state normal
2440 set n [string length $buf]
2442 set cr [string first "\r" $buf $c]
2443 set lf [string first "\n" $buf $c]
2444 if {$cr < 0} {set cr [expr {$n + 1}]}
2445 if {$lf < 0} {set lf [expr {$n + 1}]}
2448 $w.m.t insert end [string range $buf $c $lf]
2449 set console_cr($w) [$w.m.t index {end -1c}]
2453 $w.m.t delete $console_cr($w) end
2454 $w.m.t insert end "\n"
2455 $w.m.t insert end [string range $buf $c $cr]
2460 $w.m.t conf -state disabled
2464 fconfigure $fd -blocking 1
2466 if {[catch {close $fd}]} {
2467 if {![winfo exists $w]} {console_init $w}
2468 $w.m.s conf -background red -text {Error: Command Failed}
2469 $w.ok conf -state normal
2471 } elseif {[winfo exists $w]} {
2472 $w.m.s conf -background green -text {Success}
2473 $w.ok conf -state normal
2476 array unset console_cr $w
2477 array unset console_data $w
2479 uplevel #0 $after $ok
2483 fconfigure $fd -blocking 0
2486 ######################################################################
2490 set starting_gitk_msg {Starting gitk... please wait...}
2492 proc do_gitk {revs} {
2493 global ui_status_value starting_gitk_msg
2501 set cmd "sh -c \"exec $cmd\""
2505 if {[catch {eval exec $cmd} err]} {
2506 error_popup "Failed to start gitk:\n\n$err"
2508 set ui_status_value $starting_gitk_msg
2510 if {$ui_status_value eq $starting_gitk_msg} {
2511 set ui_status_value {Ready.}
2518 set w [new_console {gc} {Compressing the object database}]
2519 console_exec $w {git gc}
2522 proc do_fsck_objects {} {
2523 set w [new_console {fsck-objects} \
2524 {Verifying the object database with fsck-objects}]
2525 set cmd [list git fsck-objects]
2528 lappend cmd --strict
2529 console_exec $w $cmd
2535 global ui_comm is_quitting repo_config commit_type
2537 if {$is_quitting} return
2540 # -- Stash our current commit buffer.
2542 set save [gitdir GITGUI_MSG]
2543 set msg [string trim [$ui_comm get 0.0 end]]
2544 if {![string match amend* $commit_type]
2545 && [$ui_comm edit modified]
2548 set fd [open $save w]
2549 puts $fd [string trim [$ui_comm get 0.0 end]]
2553 catch {file delete $save}
2556 # -- Stash our current window geometry into this repository.
2558 set cfg_geometry [list]
2559 lappend cfg_geometry [wm geometry .]
2560 lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
2561 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
2562 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2565 if {$cfg_geometry ne $rc_geometry} {
2566 catch {exec git repo-config gui.geometry $cfg_geometry}
2573 rescan {set ui_status_value {Ready.}}
2576 proc unstage_helper {txt paths} {
2577 global file_states current_diff
2579 if {![lock_index begin-update]} return
2583 foreach path $paths {
2584 switch -glob -- [lindex $file_states($path) 0] {
2588 lappend pathList $path
2589 if {$path eq $current_diff} {
2590 set after {reshow_diff;}
2595 if {$pathList eq {}} {
2601 [concat $after {set ui_status_value {Ready.}}]
2605 proc do_unstage_selection {} {
2606 global current_diff selected_paths
2608 if {[array size selected_paths] > 0} {
2610 {Unstaging selected files from commit} \
2611 [array names selected_paths]
2612 } elseif {$current_diff ne {}} {
2614 "Unstaging [short_path $current_diff] from commit" \
2615 [list $current_diff]
2619 proc add_helper {txt paths} {
2620 global file_states current_diff
2622 if {![lock_index begin-update]} return
2626 foreach path $paths {
2627 switch -glob -- [lindex $file_states($path) 0] {
2632 lappend pathList $path
2633 if {$path eq $current_diff} {
2634 set after {reshow_diff;}
2639 if {$pathList eq {}} {
2645 [concat $after {set ui_status_value {Ready to commit.}}]
2649 proc do_add_selection {} {
2650 global current_diff selected_paths
2652 if {[array size selected_paths] > 0} {
2654 {Adding selected files} \
2655 [array names selected_paths]
2656 } elseif {$current_diff ne {}} {
2658 "Adding [short_path $current_diff]" \
2659 [list $current_diff]
2663 proc do_add_all {} {
2667 foreach path [array names file_states] {
2668 switch -glob -- [lindex $file_states($path) 0] {
2671 ?D {lappend paths $path}
2674 add_helper {Adding all changed files} $paths
2677 proc revert_helper {txt paths} {
2678 global file_states current_diff
2680 if {![lock_index begin-update]} return
2684 foreach path $paths {
2685 switch -glob -- [lindex $file_states($path) 0] {
2689 lappend pathList $path
2690 if {$path eq $current_diff} {
2691 set after {reshow_diff;}
2697 set n [llength $pathList]
2701 } elseif {$n == 1} {
2702 set s "[short_path [lindex $pathList]]"
2704 set s "these $n files"
2707 set reply [tk_dialog \
2709 "[appname] ([reponame])" \
2710 "Revert changes in $s?
2712 Any unadded changes will be permanently lost by the revert." \
2722 [concat $after {set ui_status_value {Ready.}}]
2728 proc do_revert_selection {} {
2729 global current_diff selected_paths
2731 if {[array size selected_paths] > 0} {
2733 {Reverting selected files} \
2734 [array names selected_paths]
2735 } elseif {$current_diff ne {}} {
2737 "Reverting [short_path $current_diff]" \
2738 [list $current_diff]
2742 proc do_signoff {} {
2745 set me [committer_ident]
2746 if {$me eq {}} return
2748 set sob "Signed-off-by: $me"
2749 set last [$ui_comm get {end -1c linestart} {end -1c}]
2750 if {$last ne $sob} {
2751 $ui_comm edit separator
2753 && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
2754 $ui_comm insert end "\n"
2756 $ui_comm insert end "\n$sob"
2757 $ui_comm edit separator
2762 proc do_select_commit_type {} {
2763 global commit_type selected_commit_type
2765 if {$selected_commit_type eq {new}
2766 && [string match amend* $commit_type]} {
2768 } elseif {$selected_commit_type eq {amend}
2769 && ![string match amend* $commit_type]} {
2772 # The amend request was rejected...
2774 if {![string match amend* $commit_type]} {
2775 set selected_commit_type new
2785 global appvers copyright
2786 global tcl_patchLevel tk_patchLevel
2790 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2792 label $w.header -text "About [appname]" \
2794 pack $w.header -side top -fill x
2797 button $w.buttons.close -text {Close} \
2799 -command [list destroy $w]
2800 pack $w.buttons.close -side right
2801 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2804 -text "[appname] - a commit creation tool for Git.
2812 pack $w.desc -side top -fill x -padx 5 -pady 5
2815 append v "[appname] version $appvers\n"
2816 append v "[exec git version]\n"
2818 if {$tcl_patchLevel eq $tk_patchLevel} {
2819 append v "Tcl/Tk version $tcl_patchLevel"
2821 append v "Tcl version $tcl_patchLevel"
2822 append v ", Tk version $tk_patchLevel"
2833 pack $w.vers -side top -fill x -padx 5 -pady 5
2835 menu $w.ctxm -tearoff 0
2836 $w.ctxm add command \
2841 clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
2844 bind $w <Visibility> "grab $w; focus $w"
2845 bind $w <Key-Escape> "destroy $w"
2846 bind_button3 $w.vers "tk_popup $w.ctxm %X %Y; grab $w; focus $w"
2847 wm title $w "About [appname]"
2851 proc do_options {} {
2852 global repo_config global_config font_descs
2853 global repo_config_new global_config_new
2855 array unset repo_config_new
2856 array unset global_config_new
2857 foreach name [array names repo_config] {
2858 set repo_config_new($name) $repo_config($name)
2861 foreach name [array names repo_config] {
2863 gui.diffcontext {continue}
2865 set repo_config_new($name) $repo_config($name)
2867 foreach name [array names global_config] {
2868 set global_config_new($name) $global_config($name)
2871 set w .options_editor
2873 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2875 label $w.header -text "[appname] Options" \
2877 pack $w.header -side top -fill x
2880 button $w.buttons.restore -text {Restore Defaults} \
2882 -command do_restore_defaults
2883 pack $w.buttons.restore -side left
2884 button $w.buttons.save -text Save \
2886 -command [list do_save_config $w]
2887 pack $w.buttons.save -side right
2888 button $w.buttons.cancel -text {Cancel} \
2890 -command [list destroy $w]
2891 pack $w.buttons.cancel -side right -padx 5
2892 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2894 labelframe $w.repo -text "[reponame] Repository" \
2896 -relief raised -borderwidth 2
2897 labelframe $w.global -text {Global (All Repositories)} \
2899 -relief raised -borderwidth 2
2900 pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
2901 pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
2904 {b partialinclude {Allow Partially Added Files}}
2905 {b pullsummary {Show Pull Summary}}
2906 {b trustmtime {Trust File Modification Timestamps}}
2907 {i diffcontext {Number of Diff Context Lines}}
2909 set type [lindex $option 0]
2910 set name [lindex $option 1]
2911 set text [lindex $option 2]
2912 foreach f {repo global} {
2915 checkbutton $w.$f.$name -text $text \
2916 -variable ${f}_config_new(gui.$name) \
2920 pack $w.$f.$name -side top -anchor w
2924 label $w.$f.$name.l -text "$text:" -font font_ui
2925 pack $w.$f.$name.l -side left -anchor w -fill x
2926 spinbox $w.$f.$name.v \
2927 -textvariable ${f}_config_new(gui.$name) \
2928 -from 1 -to 99 -increment 1 \
2931 pack $w.$f.$name.v -side right -anchor e
2932 pack $w.$f.$name -side top -anchor w -fill x
2938 set all_fonts [lsort [font families]]
2939 foreach option $font_descs {
2940 set name [lindex $option 0]
2941 set font [lindex $option 1]
2942 set text [lindex $option 2]
2944 set global_config_new(gui.$font^^family) \
2945 [font configure $font -family]
2946 set global_config_new(gui.$font^^size) \
2947 [font configure $font -size]
2949 frame $w.global.$name
2950 label $w.global.$name.l -text "$text:" -font font_ui
2951 pack $w.global.$name.l -side left -anchor w -fill x
2952 eval tk_optionMenu $w.global.$name.family \
2953 global_config_new(gui.$font^^family) \
2955 spinbox $w.global.$name.size \
2956 -textvariable global_config_new(gui.$font^^size) \
2957 -from 2 -to 80 -increment 1 \
2960 pack $w.global.$name.size -side right -anchor e
2961 pack $w.global.$name.family -side right -anchor e
2962 pack $w.global.$name -side top -anchor w -fill x
2965 bind $w <Visibility> "grab $w; focus $w"
2966 bind $w <Key-Escape> "destroy $w"
2967 wm title $w "[appname] ([reponame]): Options"
2971 proc do_restore_defaults {} {
2972 global font_descs default_config repo_config
2973 global repo_config_new global_config_new
2975 foreach name [array names default_config] {
2976 set repo_config_new($name) $default_config($name)
2977 set global_config_new($name) $default_config($name)
2980 foreach option $font_descs {
2981 set name [lindex $option 0]
2982 set repo_config(gui.$name) $default_config(gui.$name)
2986 foreach option $font_descs {
2987 set name [lindex $option 0]
2988 set font [lindex $option 1]
2989 set global_config_new(gui.$font^^family) \
2990 [font configure $font -family]
2991 set global_config_new(gui.$font^^size) \
2992 [font configure $font -size]
2996 proc do_save_config {w} {
2997 if {[catch {save_config} err]} {
2998 error_popup "Failed to completely save options:\n\n$err"
3004 proc do_windows_shortcut {} {
3008 set desktop [exec cygpath \
3016 set fn [tk_getSaveFile \
3018 -title "[appname] ([reponame]): Create Desktop Icon" \
3019 -initialdir $desktop \
3020 -initialfile "Git [reponame].bat"]
3024 set sh [exec cygpath \
3028 set me [exec cygpath \
3032 set gd [exec cygpath \
3036 set gw [exec cygpath \
3039 [file dirname [gitdir]]]
3040 regsub -all ' $me "'\\''" me
3041 regsub -all ' $gd "'\\''" gd
3042 puts $fd "@ECHO Entering $gw"
3043 puts $fd "@ECHO Starting git-gui... please wait..."
3044 puts -nonewline $fd "@\"$sh\" --login -c \""
3045 puts -nonewline $fd "GIT_DIR='$gd'"
3046 puts -nonewline $fd " '$me'"
3050 error_popup "Cannot write script:\n\n$err"
3055 proc do_macosx_app {} {
3058 set fn [tk_getSaveFile \
3060 -title "[appname] ([reponame]): Create Desktop Icon" \
3061 -initialdir [file join $env(HOME) Desktop] \
3062 -initialfile "Git [reponame].app"]
3065 set Contents [file join $fn Contents]
3066 set MacOS [file join $Contents MacOS]
3067 set exe [file join $MacOS git-gui]
3071 set fd [open [file join $Contents Info.plist] w]
3072 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
3073 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3074 <plist version="1.0">
3076 <key>CFBundleDevelopmentRegion</key>
3077 <string>English</string>
3078 <key>CFBundleExecutable</key>
3079 <string>git-gui</string>
3080 <key>CFBundleIdentifier</key>
3081 <string>org.spearce.git-gui</string>
3082 <key>CFBundleInfoDictionaryVersion</key>
3083 <string>6.0</string>
3084 <key>CFBundlePackageType</key>
3085 <string>APPL</string>
3086 <key>CFBundleSignature</key>
3087 <string>????</string>
3088 <key>CFBundleVersion</key>
3089 <string>1.0</string>
3090 <key>NSPrincipalClass</key>
3091 <string>NSApplication</string>
3096 set fd [open $exe w]
3097 set gd [file normalize [gitdir]]
3098 set ep [file normalize [exec git --exec-path]]
3099 regsub -all ' $gd "'\\''" gd
3100 regsub -all ' $ep "'\\''" ep
3101 puts $fd "#!/bin/sh"
3102 foreach name [array names env] {
3103 if {[string match GIT_* $name]} {
3104 regsub -all ' $env($name) "'\\''" v
3105 puts $fd "export $name='$v'"
3108 puts $fd "export PATH='$ep':\$PATH"
3109 puts $fd "export GIT_DIR='$gd'"
3110 puts $fd "exec [file normalize $argv0]"
3113 file attributes $exe -permissions u+x,g+x,o+x
3115 error_popup "Cannot write icon:\n\n$err"
3120 proc toggle_or_diff {w x y} {
3121 global file_states file_lists current_diff ui_index ui_workdir
3122 global last_clicked selected_paths
3124 set pos [split [$w index @$x,$y] .]
3125 set lno [lindex $pos 0]
3126 set col [lindex $pos 1]
3127 set path [lindex $file_lists($w) [expr {$lno - 1}]]
3133 set last_clicked [list $w $lno]
3134 array unset selected_paths
3135 $ui_index tag remove in_sel 0.0 end
3136 $ui_workdir tag remove in_sel 0.0 end
3139 if {$current_diff eq $path} {
3140 set after {reshow_diff;}
3144 if {$w eq $ui_index} {
3146 "Unstaging [short_path $path] from commit" \
3148 [concat $after {set ui_status_value {Ready.}}]
3149 } elseif {$w eq $ui_workdir} {
3151 "Adding [short_path $path]" \
3153 [concat $after {set ui_status_value {Ready.}}]
3156 show_diff $path $w $lno
3160 proc add_one_to_selection {w x y} {
3161 global file_lists last_clicked selected_paths
3163 set lno [lindex [split [$w index @$x,$y] .] 0]
3164 set path [lindex $file_lists($w) [expr {$lno - 1}]]
3170 if {$last_clicked ne {}
3171 && [lindex $last_clicked 0] ne $w} {
3172 array unset selected_paths
3173 [lindex $last_clicked 0] tag remove in_sel 0.0 end
3176 set last_clicked [list $w $lno]
3177 if {[catch {set in_sel $selected_paths($path)}]} {
3181 unset selected_paths($path)
3182 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
3184 set selected_paths($path) 1
3185 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
3189 proc add_range_to_selection {w x y} {
3190 global file_lists last_clicked selected_paths
3192 if {[lindex $last_clicked 0] ne $w} {
3193 toggle_or_diff $w $x $y
3197 set lno [lindex [split [$w index @$x,$y] .] 0]
3198 set lc [lindex $last_clicked 1]
3207 foreach path [lrange $file_lists($w) \
3208 [expr {$begin - 1}] \
3209 [expr {$end - 1}]] {
3210 set selected_paths($path) 1
3212 $w tag add in_sel $begin.0 [expr {$end + 1}].0
3215 ######################################################################
3219 set cursor_ptr arrow
3220 font create font_diff -family Courier -size 10
3224 eval font configure font_ui [font actual [.dummy cget -font]]
3228 font create font_uibold
3229 font create font_diffbold
3234 } elseif {[is_MacOSX]} {
3242 proc apply_config {} {
3243 global repo_config font_descs
3245 foreach option $font_descs {
3246 set name [lindex $option 0]
3247 set font [lindex $option 1]
3249 foreach {cn cv} $repo_config(gui.$name) {
3250 font configure $font $cn $cv
3253 error_popup "Invalid font specified in gui.$name:\n\n$err"
3255 foreach {cn cv} [font configure $font] {
3256 font configure ${font}bold $cn $cv
3258 font configure ${font}bold -weight bold
3262 set default_config(gui.trustmtime) false
3263 set default_config(gui.pullsummary) true
3264 set default_config(gui.partialinclude) false
3265 set default_config(gui.diffcontext) 5
3266 set default_config(gui.fontui) [font configure font_ui]
3267 set default_config(gui.fontdiff) [font configure font_diff]
3269 {fontui font_ui {Main Font}}
3270 {fontdiff font_diff {Diff/Console Font}}
3275 ######################################################################
3281 menu .mbar -tearoff 0
3282 .mbar add cascade -label Repository -menu .mbar.repository
3283 .mbar add cascade -label Edit -menu .mbar.edit
3284 if {!$single_commit} {
3285 .mbar add cascade -label Branch -menu .mbar.branch
3287 .mbar add cascade -label Commit -menu .mbar.commit
3288 if {!$single_commit} {
3289 .mbar add cascade -label Fetch -menu .mbar.fetch
3290 .mbar add cascade -label Pull -menu .mbar.pull
3291 .mbar add cascade -label Push -menu .mbar.push
3293 . configure -menu .mbar
3295 # -- Repository Menu
3297 menu .mbar.repository
3298 .mbar.repository add command \
3299 -label {Visualize Current Branch} \
3300 -command {do_gitk {}} \
3303 .mbar.repository add command \
3304 -label {Visualize All Branches} \
3305 -command {do_gitk {--all}} \
3308 .mbar.repository add separator
3310 if {!$single_commit} {
3311 .mbar.repository add command -label {Compress Database} \
3315 .mbar.repository add command -label {Verify Database} \
3316 -command do_fsck_objects \
3319 .mbar.repository add separator
3322 .mbar.repository add command \
3323 -label {Create Desktop Icon} \
3324 -command do_windows_shortcut \
3326 } elseif {[is_MacOSX]} {
3327 .mbar.repository add command \
3328 -label {Create Desktop Icon} \
3329 -command do_macosx_app \
3334 .mbar.repository add command -label Quit \
3336 -accelerator $M1T-Q \
3342 .mbar.edit add command -label Undo \
3343 -command {catch {[focus] edit undo}} \
3344 -accelerator $M1T-Z \
3346 .mbar.edit add command -label Redo \
3347 -command {catch {[focus] edit redo}} \
3348 -accelerator $M1T-Y \
3350 .mbar.edit add separator
3351 .mbar.edit add command -label Cut \
3352 -command {catch {tk_textCut [focus]}} \
3353 -accelerator $M1T-X \
3355 .mbar.edit add command -label Copy \
3356 -command {catch {tk_textCopy [focus]}} \
3357 -accelerator $M1T-C \
3359 .mbar.edit add command -label Paste \
3360 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
3361 -accelerator $M1T-V \
3363 .mbar.edit add command -label Delete \
3364 -command {catch {[focus] delete sel.first sel.last}} \
3367 .mbar.edit add separator
3368 .mbar.edit add command -label {Select All} \
3369 -command {catch {[focus] tag add sel 0.0 end}} \
3370 -accelerator $M1T-A \
3375 if {!$single_commit} {
3378 .mbar.branch add command -label {Create...} \
3379 -command do_create_branch \
3380 -accelerator $M1T-N \
3382 lappend disable_on_lock [list .mbar.branch entryconf \
3383 [.mbar.branch index last] -state]
3385 .mbar.branch add command -label {Delete...} \
3386 -command do_delete_branch \
3388 lappend disable_on_lock [list .mbar.branch entryconf \
3389 [.mbar.branch index last] -state]
3396 .mbar.commit add radiobutton \
3397 -label {New Commit} \
3398 -command do_select_commit_type \
3399 -variable selected_commit_type \
3402 lappend disable_on_lock \
3403 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3405 .mbar.commit add radiobutton \
3406 -label {Amend Last Commit} \
3407 -command do_select_commit_type \
3408 -variable selected_commit_type \
3411 lappend disable_on_lock \
3412 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3414 .mbar.commit add separator
3416 .mbar.commit add command -label Rescan \
3417 -command do_rescan \
3420 lappend disable_on_lock \
3421 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3423 .mbar.commit add command -label {Add To Commit} \
3424 -command do_add_selection \
3426 lappend disable_on_lock \
3427 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3429 .mbar.commit add command -label {Add All To Commit} \
3430 -command do_add_all \
3431 -accelerator $M1T-I \
3433 lappend disable_on_lock \
3434 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3436 .mbar.commit add command -label {Unstage From Commit} \
3437 -command do_unstage_selection \
3439 lappend disable_on_lock \
3440 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3442 .mbar.commit add command -label {Revert Changes} \
3443 -command do_revert_selection \
3445 lappend disable_on_lock \
3446 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3448 .mbar.commit add separator
3450 .mbar.commit add command -label {Sign Off} \
3451 -command do_signoff \
3452 -accelerator $M1T-S \
3455 .mbar.commit add command -label Commit \
3456 -command do_commit \
3457 -accelerator $M1T-Return \
3459 lappend disable_on_lock \
3460 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3462 # -- Transport menus
3464 if {!$single_commit} {
3471 # -- Apple Menu (Mac OS X only)
3473 .mbar add cascade -label Apple -menu .mbar.apple
3476 .mbar.apple add command -label "About [appname]" \
3479 .mbar.apple add command -label "[appname] Options..." \
3480 -command do_options \
3485 .mbar.edit add separator
3486 .mbar.edit add command -label {Options...} \
3487 -command do_options \
3492 if {[file exists /usr/local/miga/lib/gui-miga]
3493 && [file exists .pvcsrc]} {
3495 global ui_status_value
3496 if {![lock_index update]} return
3497 set cmd [list sh --login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
3498 set miga_fd [open "|$cmd" r]
3499 fconfigure $miga_fd -blocking 0
3500 fileevent $miga_fd readable [list miga_done $miga_fd]
3501 set ui_status_value {Running miga...}
3503 proc miga_done {fd} {
3508 rescan [list set ui_status_value {Ready.}]
3511 .mbar add cascade -label Tools -menu .mbar.tools
3513 .mbar.tools add command -label "Migrate" \
3516 lappend disable_on_lock \
3517 [list .mbar.tools entryconf [.mbar.tools index last] -state]
3522 .mbar add cascade -label Help -menu .mbar.help
3525 .mbar.help add command -label "About [appname]" \
3537 -text {Current Branch:} \
3542 -textvariable current_branch \
3546 pack .branch.l1 -side left
3547 pack .branch.cb -side left -fill x
3548 pack .branch -side top -fill x
3550 # -- Main Window Layout
3552 panedwindow .vpane -orient vertical
3553 panedwindow .vpane.files -orient horizontal
3554 .vpane add .vpane.files -sticky nsew -height 100 -width 400
3555 pack .vpane -anchor n -side top -fill both -expand 1
3557 # -- Index File List
3559 frame .vpane.files.index -height 100 -width 400
3560 label .vpane.files.index.title -text {Changes To Be Committed} \
3563 text $ui_index -background white -borderwidth 0 \
3564 -width 40 -height 10 \
3566 -cursor $cursor_ptr \
3567 -yscrollcommand {.vpane.files.index.sb set} \
3569 scrollbar .vpane.files.index.sb -command [list $ui_index yview]
3570 pack .vpane.files.index.title -side top -fill x
3571 pack .vpane.files.index.sb -side right -fill y
3572 pack $ui_index -side left -fill both -expand 1
3573 .vpane.files add .vpane.files.index -sticky nsew
3575 # -- Working Directory File List
3577 frame .vpane.files.workdir -height 100 -width 100
3578 label .vpane.files.workdir.title -text {Changed But Not Updated} \
3581 text $ui_workdir -background white -borderwidth 0 \
3582 -width 40 -height 10 \
3584 -cursor $cursor_ptr \
3585 -yscrollcommand {.vpane.files.workdir.sb set} \
3587 scrollbar .vpane.files.workdir.sb -command [list $ui_workdir yview]
3588 pack .vpane.files.workdir.title -side top -fill x
3589 pack .vpane.files.workdir.sb -side right -fill y
3590 pack $ui_workdir -side left -fill both -expand 1
3591 .vpane.files add .vpane.files.workdir -sticky nsew
3593 foreach i [list $ui_index $ui_workdir] {
3594 $i tag conf in_diff -font font_uibold
3595 $i tag conf in_sel \
3596 -background [$i cget -foreground] \
3597 -foreground [$i cget -background]
3601 # -- Diff and Commit Area
3603 frame .vpane.lower -height 300 -width 400
3604 frame .vpane.lower.commarea
3605 frame .vpane.lower.diff -relief sunken -borderwidth 1
3606 pack .vpane.lower.commarea -side top -fill x
3607 pack .vpane.lower.diff -side bottom -fill both -expand 1
3608 .vpane add .vpane.lower -stick nsew
3610 # -- Commit Area Buttons
3612 frame .vpane.lower.commarea.buttons
3613 label .vpane.lower.commarea.buttons.l -text {} \
3617 pack .vpane.lower.commarea.buttons.l -side top -fill x
3618 pack .vpane.lower.commarea.buttons -side left -fill y
3620 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
3621 -command do_rescan \
3623 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3624 lappend disable_on_lock \
3625 {.vpane.lower.commarea.buttons.rescan conf -state}
3627 button .vpane.lower.commarea.buttons.incall -text {Add All} \
3628 -command do_add_all \
3630 pack .vpane.lower.commarea.buttons.incall -side top -fill x
3631 lappend disable_on_lock \
3632 {.vpane.lower.commarea.buttons.incall conf -state}
3634 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
3635 -command do_signoff \
3637 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3639 button .vpane.lower.commarea.buttons.commit -text {Commit} \
3640 -command do_commit \
3642 pack .vpane.lower.commarea.buttons.commit -side top -fill x
3643 lappend disable_on_lock \
3644 {.vpane.lower.commarea.buttons.commit conf -state}
3646 # -- Commit Message Buffer
3648 frame .vpane.lower.commarea.buffer
3649 frame .vpane.lower.commarea.buffer.header
3650 set ui_comm .vpane.lower.commarea.buffer.t
3651 set ui_coml .vpane.lower.commarea.buffer.header.l
3652 radiobutton .vpane.lower.commarea.buffer.header.new \
3653 -text {New Commit} \
3654 -command do_select_commit_type \
3655 -variable selected_commit_type \
3658 lappend disable_on_lock \
3659 [list .vpane.lower.commarea.buffer.header.new conf -state]
3660 radiobutton .vpane.lower.commarea.buffer.header.amend \
3661 -text {Amend Last Commit} \
3662 -command do_select_commit_type \
3663 -variable selected_commit_type \
3666 lappend disable_on_lock \
3667 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3672 proc trace_commit_type {varname args} {
3673 global ui_coml commit_type
3674 switch -glob -- $commit_type {
3675 initial {set txt {Initial Commit Message:}}
3676 amend {set txt {Amended Commit Message:}}
3677 amend-initial {set txt {Amended Initial Commit Message:}}
3678 amend-merge {set txt {Amended Merge Commit Message:}}
3679 merge {set txt {Merge Commit Message:}}
3680 * {set txt {Commit Message:}}
3682 $ui_coml conf -text $txt
3684 trace add variable commit_type write trace_commit_type
3685 pack $ui_coml -side left -fill x
3686 pack .vpane.lower.commarea.buffer.header.amend -side right
3687 pack .vpane.lower.commarea.buffer.header.new -side right
3689 text $ui_comm -background white -borderwidth 1 \
3692 -autoseparators true \
3694 -width 75 -height 9 -wrap none \
3696 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3697 scrollbar .vpane.lower.commarea.buffer.sby \
3698 -command [list $ui_comm yview]
3699 pack .vpane.lower.commarea.buffer.header -side top -fill x
3700 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3701 pack $ui_comm -side left -fill y
3702 pack .vpane.lower.commarea.buffer -side left -fill y
3704 # -- Commit Message Buffer Context Menu
3706 set ctxm .vpane.lower.commarea.buffer.ctxm
3707 menu $ctxm -tearoff 0
3711 -command {tk_textCut $ui_comm}
3715 -command {tk_textCopy $ui_comm}
3719 -command {tk_textPaste $ui_comm}
3723 -command {$ui_comm delete sel.first sel.last}
3726 -label {Select All} \
3728 -command {$ui_comm tag add sel 0.0 end}
3733 $ui_comm tag add sel 0.0 end
3734 tk_textCopy $ui_comm
3735 $ui_comm tag remove sel 0.0 end
3742 bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
3747 set diff_actions [list]
3748 proc trace_current_diff {varname args} {
3749 global current_diff diff_actions file_states
3750 if {$current_diff eq {}} {
3757 set s [mapdesc [lindex $file_states($p) 0] $p]
3759 set p [escape_path $p]
3763 .vpane.lower.diff.header.status configure -text $s
3764 .vpane.lower.diff.header.file configure -text $f
3765 .vpane.lower.diff.header.path configure -text $p
3766 foreach w $diff_actions {
3770 trace add variable current_diff write trace_current_diff
3772 frame .vpane.lower.diff.header -background orange
3773 label .vpane.lower.diff.header.status \
3774 -background orange \
3775 -width $max_status_desc \
3779 label .vpane.lower.diff.header.file \
3780 -background orange \
3784 label .vpane.lower.diff.header.path \
3785 -background orange \
3789 pack .vpane.lower.diff.header.status -side left
3790 pack .vpane.lower.diff.header.file -side left
3791 pack .vpane.lower.diff.header.path -fill x
3792 set ctxm .vpane.lower.diff.header.ctxm
3793 menu $ctxm -tearoff 0
3804 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3805 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3809 frame .vpane.lower.diff.body
3810 set ui_diff .vpane.lower.diff.body.t
3811 text $ui_diff -background white -borderwidth 0 \
3812 -width 80 -height 15 -wrap none \
3814 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3815 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3817 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3818 -command [list $ui_diff xview]
3819 scrollbar .vpane.lower.diff.body.sby -orient vertical \
3820 -command [list $ui_diff yview]
3821 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3822 pack .vpane.lower.diff.body.sby -side right -fill y
3823 pack $ui_diff -side left -fill both -expand 1
3824 pack .vpane.lower.diff.header -side top -fill x
3825 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3827 $ui_diff tag conf d_@ -font font_diffbold
3828 $ui_diff tag conf d_+ -foreground blue
3829 $ui_diff tag conf d_- -foreground red
3830 $ui_diff tag conf d_++ -foreground {#00a000}
3831 $ui_diff tag conf d_-- -foreground {#a000a0}
3832 $ui_diff tag conf d_+- \
3834 -background {light goldenrod yellow}
3835 $ui_diff tag conf d_-+ \
3839 # -- Diff Body Context Menu
3841 set ctxm .vpane.lower.diff.body.ctxm
3842 menu $ctxm -tearoff 0
3846 -command {tk_textCopy $ui_diff}
3847 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3849 -label {Select All} \
3851 -command {$ui_diff tag add sel 0.0 end}
3852 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3857 $ui_diff tag add sel 0.0 end
3858 tk_textCopy $ui_diff
3859 $ui_diff tag remove sel 0.0 end
3861 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3864 -label {Decrease Font Size} \
3866 -command {incr_font_size font_diff -1}
3867 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3869 -label {Increase Font Size} \
3871 -command {incr_font_size font_diff 1}
3872 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3875 -label {Show Less Context} \
3877 -command {if {$repo_config(gui.diffcontext) >= 2} {
3878 incr repo_config(gui.diffcontext) -1
3881 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3883 -label {Show More Context} \
3886 incr repo_config(gui.diffcontext)
3889 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3891 $ctxm add command -label {Options...} \
3894 bind_button3 $ui_diff "tk_popup $ctxm %X %Y"
3898 set ui_status_value {Initializing...}
3899 label .status -textvariable ui_status_value \
3905 pack .status -anchor w -side bottom -fill x
3910 set gm $repo_config(gui.geometry)
3911 wm geometry . [lindex $gm 0]
3912 .vpane sash place 0 \
3913 [lindex [.vpane sash coord 0] 0] \
3915 .vpane.files sash place 0 \
3917 [lindex [.vpane.files sash coord 0] 1]
3923 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3924 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
3925 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
3926 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3927 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3928 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3929 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3930 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3931 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3932 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3933 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3935 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3936 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3937 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3938 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3939 bind $ui_diff <$M1B-Key-v> {break}
3940 bind $ui_diff <$M1B-Key-V> {break}
3941 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3942 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3943 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3944 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3945 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3946 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3948 if {!$single_commit} {
3949 bind . <$M1B-Key-n> do_create_branch
3950 bind . <$M1B-Key-N> do_create_branch
3953 bind . <Destroy> do_quit
3954 bind all <Key-F5> do_rescan
3955 bind all <$M1B-Key-r> do_rescan
3956 bind all <$M1B-Key-R> do_rescan
3957 bind . <$M1B-Key-s> do_signoff
3958 bind . <$M1B-Key-S> do_signoff
3959 bind . <$M1B-Key-i> do_add_all
3960 bind . <$M1B-Key-I> do_add_all
3961 bind . <$M1B-Key-Return> do_commit
3962 bind all <$M1B-Key-q> do_quit
3963 bind all <$M1B-Key-Q> do_quit
3964 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
3965 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
3966 foreach i [list $ui_index $ui_workdir] {
3967 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
3968 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3969 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
3973 set file_lists($ui_index) [list]
3974 set file_lists($ui_workdir) [list]
3978 set MERGE_HEAD [list]
3981 set current_branch {}
3983 set selected_commit_type new
3985 wm title . "[appname] ([file normalize [file dirname [gitdir]]])"
3986 focus -force $ui_comm
3988 # -- Warn the user about environmental problems. Cygwin's Tcl
3989 # does *not* pass its env array onto any processes it spawns.
3990 # This means that git processes get none of our environment.
3995 set msg "Possible environment issues exist.
3997 The following environment variables are probably
3998 going to be ignored by any Git subprocess run
4002 foreach name [array names env] {
4003 switch -regexp -- $name {
4004 {^GIT_INDEX_FILE$} -
4005 {^GIT_OBJECT_DIRECTORY$} -
4006 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
4008 {^GIT_EXTERNAL_DIFF$} -
4012 {^GIT_CONFIG_LOCAL$} -
4013 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
4014 append msg " - $name\n"
4017 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
4018 append msg " - $name\n"
4020 set suggest_user $name
4024 if {$ignored_env > 0} {
4026 This is due to a known issue with the
4027 Tcl binary distributed by Cygwin."
4029 if {$suggest_user ne {}} {
4032 A good replacement for $suggest_user
4033 is placing values for the user.name and
4034 user.email settings into your personal
4040 unset ignored_env msg suggest_user name
4043 # -- Only initialize complex UI if we are going to stay running.
4045 if {!$single_commit} {
4049 populate_branch_menu
4050 populate_fetch_menu .mbar.fetch
4051 populate_pull_menu .mbar.pull
4052 populate_push_menu .mbar.push
4055 # -- Only suggest a gc run if we are going to stay running.
4057 if {!$single_commit} {
4058 set object_limit 2000
4059 if {[is_Windows]} {set object_limit 200}
4060 regexp {^([0-9]+) objects,} [exec git count-objects] _junk objects_current
4061 if {$objects_current >= $object_limit} {
4063 "This repository currently has $objects_current loose objects.
4065 To maintain optimal performance it is strongly
4066 recommended that you compress the database
4067 when more than $object_limit loose objects exist.
4069 Compress the database now?"] eq yes} {
4073 unset object_limit _junk objects_current
4076 lock_index begin-read