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
531 proc prune_selection {} {
532 global file_states selected_paths
534 foreach path [array names selected_paths] {
535 if {[catch {set still_here $file_states($path)}]} {
536 unset selected_paths($path)
541 ######################################################################
546 global ui_diff current_diff_path ui_index ui_workdir
548 $ui_diff conf -state normal
549 $ui_diff delete 0.0 end
550 $ui_diff conf -state disabled
552 set current_diff_path {}
554 $ui_index tag remove in_diff 0.0 end
555 $ui_workdir tag remove in_diff 0.0 end
558 proc reshow_diff {} {
559 global ui_status_value file_states file_lists
560 global current_diff_path current_diff_side
562 set p $current_diff_path
564 || $current_diff_side eq {}
565 || [catch {set s $file_states($p)}]
566 || [lsearch -sorted $file_lists($current_diff_side) $p] == -1} {
569 show_diff $p $current_diff_side
573 proc handle_empty_diff {} {
574 global current_diff_path file_states file_lists
576 set path $current_diff_path
577 set s $file_states($path)
578 if {[lindex $s 0] ne {_M}} return
580 info_popup "No differences detected.
582 [short_path $path] has no changes.
584 The modification date of this file was updated
585 by another application and you currently have
586 the Trust File Modification Timestamps option
587 enabled, so Git did not automatically detect
588 that there are no content differences in this
591 This file will now be removed from the modified
592 files list, to prevent possible confusion.
594 if {[catch {exec git update-index -- $path} err]} {
595 error_popup "Failed to refresh index:\n\n$err"
599 display_file $path __
602 proc show_diff {path w {lno {}}} {
603 global file_states file_lists
604 global is_3way_diff diff_active repo_config
605 global ui_diff ui_status_value ui_index ui_workdir
606 global current_diff_path current_diff_side
608 if {$diff_active || ![lock_index read]} return
611 if {$w eq {} || $lno == {}} {
612 foreach w [array names file_lists] {
613 set lno [lsearch -sorted $file_lists($w) $path]
620 if {$w ne {} && $lno >= 1} {
621 $w tag add in_diff $lno.0 [expr {$lno + 1}].0
624 set s $file_states($path)
628 set current_diff_path $path
629 set current_diff_side $w
630 set ui_status_value "Loading diff of [escape_path $path]..."
632 # - Git won't give us the diff, there's nothing to compare to!
636 set fd [open $path r]
637 set content [read $fd]
642 set ui_status_value "Unable to display [escape_path $path]"
643 error_popup "Error loading file:\n\n$err"
646 $ui_diff conf -state normal
647 $ui_diff insert end $content
648 $ui_diff conf -state disabled
651 set ui_status_value {Ready.}
656 if {$w eq $ui_index} {
657 lappend cmd diff-index
659 } elseif {$w eq $ui_workdir} {
660 if {[string index $m 0] eq {U}} {
663 lappend cmd diff-files
668 lappend cmd --no-color
669 if {$repo_config(gui.diffcontext) > 0} {
670 lappend cmd "-U$repo_config(gui.diffcontext)"
672 if {$w eq $ui_index} {
678 if {[catch {set fd [open $cmd r]} err]} {
681 set ui_status_value "Unable to display [escape_path $path]"
682 error_popup "Error loading diff:\n\n$err"
686 fconfigure $fd -blocking 0 -translation auto
687 fileevent $fd readable [list read_diff $fd]
690 proc read_diff {fd} {
691 global ui_diff ui_status_value is_3way_diff diff_active
694 $ui_diff conf -state normal
695 while {[gets $fd line] >= 0} {
696 # -- Cleanup uninteresting diff header lines.
698 if {[string match {diff --git *} $line]} continue
699 if {[string match {diff --cc *} $line]} continue
700 if {[string match {diff --combined *} $line]} continue
701 if {[string match {--- *} $line]} continue
702 if {[string match {+++ *} $line]} continue
703 if {$line eq {deleted file mode 120000}} {
704 set line "deleted symlink"
707 # -- Automatically detect if this is a 3 way diff.
709 if {[string match {@@@ *} $line]} {set is_3way_diff 1}
711 if {[string match {index *} $line]
712 || [string match {mode *} $line]
713 || [regexp {^\* Unmerged path } $line]} {
715 } elseif {$is_3way_diff} {
716 set op [string range $line 0 1]
726 if {[regexp {^\+\+([<>]{7} |={7})} $line _g op]} {
727 set line [string replace $line 0 1 { }]
734 puts "error: Unhandled 3 way diff marker: {$op}"
739 set op [string index $line 0]
745 if {[regexp {^\+([<>]{7} |={7})} $line _g op]} {
746 set line [string replace $line 0 0 { }]
753 puts "error: Unhandled 2 way diff marker: {$op}"
758 $ui_diff insert end $line $tags
759 $ui_diff insert end "\n" $tags
761 $ui_diff conf -state disabled
767 set ui_status_value {Ready.}
769 if {$repo_config(gui.trustmtime) eq {true}
770 && [$ui_diff index end] eq {2.0}} {
776 ######################################################################
780 proc load_last_commit {} {
781 global HEAD PARENT MERGE_HEAD commit_type ui_comm
783 if {[llength $PARENT] == 0} {
784 error_popup {There is nothing to amend.
786 You are about to create the initial commit.
787 There is no commit before this to amend.
792 repository_state curType curHEAD curMERGE_HEAD
793 if {$curType eq {merge}} {
794 error_popup {Cannot amend while merging.
796 You are currently in the middle of a merge that
797 has not been fully completed. You cannot amend
798 the prior commit unless you first abort the
799 current merge activity.
807 set fd [open "| git cat-file commit $curHEAD" r]
808 while {[gets $fd line] > 0} {
809 if {[string match {parent *} $line]} {
810 lappend parents [string range $line 7 end]
813 set msg [string trim [read $fd]]
816 error_popup "Error loading commit data for amend:\n\n$err"
822 set MERGE_HEAD [list]
823 switch -- [llength $parents] {
824 0 {set commit_type amend-initial}
825 1 {set commit_type amend}
826 default {set commit_type amend-merge}
829 $ui_comm delete 0.0 end
830 $ui_comm insert end $msg
832 $ui_comm edit modified false
833 rescan {set ui_status_value {Ready.}}
836 proc create_new_commit {} {
837 global commit_type ui_comm
839 set commit_type normal
840 $ui_comm delete 0.0 end
842 $ui_comm edit modified false
843 rescan {set ui_status_value {Ready.}}
846 set GIT_COMMITTER_IDENT {}
848 proc committer_ident {} {
849 global GIT_COMMITTER_IDENT
851 if {$GIT_COMMITTER_IDENT eq {}} {
852 if {[catch {set me [exec git var GIT_COMMITTER_IDENT]} err]} {
853 error_popup "Unable to obtain your identity:\n\n$err"
856 if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \
857 $me me GIT_COMMITTER_IDENT]} {
858 error_popup "Invalid GIT_COMMITTER_IDENT:\n\n$me"
863 return $GIT_COMMITTER_IDENT
866 proc commit_tree {} {
867 global HEAD commit_type file_states ui_comm repo_config
868 global ui_status_value pch_error
870 if {![lock_index update]} return
871 if {[committer_ident] eq {}} return
873 # -- Our in memory state should match the repository.
875 repository_state curType curHEAD curMERGE_HEAD
876 if {[string match amend* $commit_type]
877 && $curType eq {normal}
878 && $curHEAD eq $HEAD} {
879 } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
880 info_popup {Last scanned state does not match repository state.
882 Another Git program has modified this repository
883 since the last scan. A rescan must be performed
884 before another commit can be created.
886 The rescan will be automatically started now.
889 rescan {set ui_status_value {Ready.}}
893 # -- At least one file should differ in the index.
896 foreach path [array names file_states] {
897 switch -glob -- [lindex $file_states($path) 0] {
901 M? {set files_ready 1}
903 error_popup "Unmerged files cannot be committed.
905 File [short_path $path] has merge conflicts.
906 You must resolve them and add the file before committing.
912 error_popup "Unknown file state [lindex $s 0] detected.
914 File [short_path $path] cannot be committed by this program.
920 info_popup {No changes to commit.
922 You must add at least 1 file before you can commit.
928 # -- A message is required.
930 set msg [string trim [$ui_comm get 1.0 end]]
932 error_popup {Please supply a commit message.
934 A good commit message has the following format:
936 - First line: Describe in one sentance what you did.
938 - Remaining lines: Describe why this change is good.
944 # -- Run the pre-commit hook.
946 set pchook [gitdir hooks pre-commit]
948 # On Cygwin [file executable] might lie so we need to ask
949 # the shell if the hook is executable. Yes that's annoying.
951 if {[is_Windows] && [file isfile $pchook]} {
952 set pchook [list sh -c [concat \
953 "if test -x \"$pchook\";" \
954 "then exec \"$pchook\" 2>&1;" \
956 } elseif {[file executable $pchook]} {
957 set pchook [list $pchook |& cat]
959 commit_writetree $curHEAD $msg
963 set ui_status_value {Calling pre-commit hook...}
965 set fd_ph [open "| $pchook" r]
966 fconfigure $fd_ph -blocking 0 -translation binary
967 fileevent $fd_ph readable \
968 [list commit_prehook_wait $fd_ph $curHEAD $msg]
971 proc commit_prehook_wait {fd_ph curHEAD msg} {
972 global pch_error ui_status_value
974 append pch_error [read $fd_ph]
975 fconfigure $fd_ph -blocking 1
977 if {[catch {close $fd_ph}]} {
978 set ui_status_value {Commit declined by pre-commit hook.}
979 hook_failed_popup pre-commit $pch_error
982 commit_writetree $curHEAD $msg
987 fconfigure $fd_ph -blocking 0
990 proc commit_writetree {curHEAD msg} {
991 global ui_status_value
993 set ui_status_value {Committing changes...}
994 set fd_wt [open "| git write-tree" r]
995 fileevent $fd_wt readable \
996 [list commit_committree $fd_wt $curHEAD $msg]
999 proc commit_committree {fd_wt curHEAD msg} {
1000 global HEAD PARENT MERGE_HEAD commit_type
1001 global single_commit all_heads current_branch
1002 global ui_status_value ui_comm selected_commit_type
1003 global file_states selected_paths rescan_active
1006 if {$tree_id eq {} || [catch {close $fd_wt} err]} {
1007 error_popup "write-tree failed:\n\n$err"
1008 set ui_status_value {Commit failed.}
1013 # -- Create the commit.
1015 set cmd [list git commit-tree $tree_id]
1016 set parents [concat $PARENT $MERGE_HEAD]
1017 if {[llength $parents] > 0} {
1018 foreach p $parents {
1022 # git commit-tree writes to stderr during initial commit.
1023 lappend cmd 2>/dev/null
1026 if {[catch {set cmt_id [eval exec $cmd]} err]} {
1027 error_popup "commit-tree failed:\n\n$err"
1028 set ui_status_value {Commit failed.}
1033 # -- Update the HEAD ref.
1036 if {$commit_type ne {normal}} {
1037 append reflogm " ($commit_type)"
1039 set i [string first "\n" $msg]
1041 append reflogm {: } [string range $msg 0 [expr {$i - 1}]]
1043 append reflogm {: } $msg
1045 set cmd [list git update-ref -m $reflogm HEAD $cmt_id $curHEAD]
1046 if {[catch {eval exec $cmd} err]} {
1047 error_popup "update-ref failed:\n\n$err"
1048 set ui_status_value {Commit failed.}
1053 # -- Make sure our current branch exists.
1055 if {$commit_type eq {initial}} {
1056 lappend all_heads $current_branch
1057 set all_heads [lsort -unique $all_heads]
1058 populate_branch_menu
1061 # -- Cleanup after ourselves.
1063 catch {file delete [gitdir MERGE_HEAD]}
1064 catch {file delete [gitdir MERGE_MSG]}
1065 catch {file delete [gitdir SQUASH_MSG]}
1066 catch {file delete [gitdir GITGUI_MSG]}
1068 # -- Let rerere do its thing.
1070 if {[file isdirectory [gitdir rr-cache]]} {
1071 catch {exec git rerere}
1074 # -- Run the post-commit hook.
1076 set pchook [gitdir hooks post-commit]
1077 if {[is_Windows] && [file isfile $pchook]} {
1078 set pchook [list sh -c [concat \
1079 "if test -x \"$pchook\";" \
1080 "then exec \"$pchook\";" \
1082 } elseif {![file executable $pchook]} {
1085 if {$pchook ne {}} {
1086 catch {exec $pchook &}
1089 $ui_comm delete 0.0 end
1091 $ui_comm edit modified false
1093 if {$single_commit} do_quit
1095 # -- Update in memory status
1097 set selected_commit_type new
1098 set commit_type normal
1101 set MERGE_HEAD [list]
1103 foreach path [array names file_states] {
1104 set s $file_states($path)
1106 switch -glob -- $m {
1114 unset file_states($path)
1115 catch {unset selected_paths($path)}
1118 set file_states($path) [list _O [lindex $s 1] {} {}]
1124 set file_states($path) [list \
1125 _[string index $m 1] \
1136 set ui_status_value \
1137 "Changes committed as [string range $cmt_id 0 7]."
1140 ######################################################################
1144 proc fetch_from {remote} {
1145 set w [new_console "fetch $remote" \
1146 "Fetching new changes from $remote"]
1147 set cmd [list git fetch]
1149 console_exec $w $cmd
1152 proc pull_remote {remote branch} {
1153 global HEAD commit_type file_states repo_config
1155 if {![lock_index update]} return
1157 # -- Our in memory state should match the repository.
1159 repository_state curType curHEAD curMERGE_HEAD
1160 if {$commit_type ne $curType || $HEAD ne $curHEAD} {
1161 info_popup {Last scanned state does not match repository state.
1163 Another Git program has modified this repository
1164 since the last scan. A rescan must be performed
1165 before a pull operation can be started.
1167 The rescan will be automatically started now.
1170 rescan {set ui_status_value {Ready.}}
1174 # -- No differences should exist before a pull.
1176 if {[array size file_states] != 0} {
1177 error_popup {Uncommitted but modified files are present.
1179 You should not perform a pull with unmodified
1180 files in your working directory as Git will be
1181 unable to recover from an incorrect merge.
1183 You should commit or revert all changes before
1184 starting a pull operation.
1190 set w [new_console "pull $remote $branch" \
1191 "Pulling new changes from branch $branch in $remote"]
1192 set cmd [list git pull]
1193 if {$repo_config(gui.pullsummary) eq {false}} {
1194 lappend cmd --no-summary
1198 console_exec $w $cmd [list post_pull_remote $remote $branch]
1201 proc post_pull_remote {remote branch success} {
1202 global HEAD PARENT MERGE_HEAD commit_type selected_commit_type
1203 global ui_status_value
1207 repository_state commit_type HEAD MERGE_HEAD
1209 set selected_commit_type new
1210 set ui_status_value "Pulling $branch from $remote complete."
1212 rescan [list set ui_status_value \
1213 "Conflicts detected while pulling $branch from $remote."]
1217 proc push_to {remote} {
1218 set w [new_console "push $remote" \
1219 "Pushing changes to $remote"]
1220 set cmd [list git push]
1222 console_exec $w $cmd
1225 ######################################################################
1229 proc mapicon {w state path} {
1232 if {[catch {set r $all_icons($state$w)}]} {
1233 puts "error: no icon for $w state={$state} $path"
1239 proc mapdesc {state path} {
1242 if {[catch {set r $all_descs($state)}]} {
1243 puts "error: no desc for state={$state} $path"
1249 proc escape_path {path} {
1250 regsub -all "\n" $path "\\n" path
1254 proc short_path {path} {
1255 return [escape_path [lindex [file split $path] end]]
1259 set null_sha1 [string repeat 0 40]
1261 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1262 global file_states next_icon_id null_sha1
1264 set s0 [string index $new_state 0]
1265 set s1 [string index $new_state 1]
1267 if {[catch {set info $file_states($path)}]} {
1269 set icon n[incr next_icon_id]
1271 set state [lindex $info 0]
1272 set icon [lindex $info 1]
1273 if {$head_info eq {}} {set head_info [lindex $info 2]}
1274 if {$index_info eq {}} {set index_info [lindex $info 3]}
1277 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1278 elseif {$s0 eq {_}} {set s0 _}
1280 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1281 elseif {$s1 eq {_}} {set s1 _}
1283 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1284 set head_info [list 0 $null_sha1]
1285 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1286 && $head_info eq {}} {
1287 set head_info $index_info
1290 set file_states($path) [list $s0$s1 $icon \
1291 $head_info $index_info \
1296 proc display_file_helper {w path icon_name old_m new_m} {
1299 if {$new_m eq {_}} {
1300 set lno [lsearch -sorted $file_lists($w) $path]
1302 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1304 $w conf -state normal
1305 $w delete $lno.0 [expr {$lno + 1}].0
1306 $w conf -state disabled
1308 } elseif {$old_m eq {_} && $new_m ne {_}} {
1309 lappend file_lists($w) $path
1310 set file_lists($w) [lsort -unique $file_lists($w)]
1311 set lno [lsearch -sorted $file_lists($w) $path]
1313 $w conf -state normal
1314 $w image create $lno.0 \
1315 -align center -padx 5 -pady 1 \
1317 -image [mapicon $w $new_m $path]
1318 $w insert $lno.1 "[escape_path $path]\n"
1319 $w conf -state disabled
1320 } elseif {$old_m ne $new_m} {
1321 $w conf -state normal
1322 $w image conf $icon_name -image [mapicon $w $new_m $path]
1323 $w conf -state disabled
1327 proc display_file {path state} {
1328 global file_states selected_paths
1329 global ui_index ui_workdir
1331 set old_m [merge_state $path $state]
1332 set s $file_states($path)
1333 set new_m [lindex $s 0]
1334 set icon_name [lindex $s 1]
1336 set o [string index $old_m 0]
1337 set n [string index $new_m 0]
1344 display_file_helper $ui_index $path $icon_name $o $n
1346 if {[string index $old_m 0] eq {U}} {
1349 set o [string index $old_m 1]
1351 if {[string index $new_m 0] eq {U}} {
1354 set n [string index $new_m 1]
1356 display_file_helper $ui_workdir $path $icon_name $o $n
1358 if {$new_m eq {__}} {
1359 unset file_states($path)
1360 catch {unset selected_paths($path)}
1364 proc display_all_files_helper {w path icon_name m} {
1367 lappend file_lists($w) $path
1368 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1369 $w image create end \
1370 -align center -padx 5 -pady 1 \
1372 -image [mapicon $w $m $path]
1373 $w insert end "[escape_path $path]\n"
1376 proc display_all_files {} {
1377 global ui_index ui_workdir
1378 global file_states file_lists
1381 $ui_index conf -state normal
1382 $ui_workdir conf -state normal
1384 $ui_index delete 0.0 end
1385 $ui_workdir delete 0.0 end
1388 set file_lists($ui_index) [list]
1389 set file_lists($ui_workdir) [list]
1391 foreach path [lsort [array names file_states]] {
1392 set s $file_states($path)
1394 set icon_name [lindex $s 1]
1396 set s [string index $m 0]
1397 if {$s ne {U} && $s ne {_}} {
1398 display_all_files_helper $ui_index $path \
1402 if {[string index $m 0] eq {U}} {
1405 set s [string index $m 1]
1408 display_all_files_helper $ui_workdir $path \
1413 $ui_index conf -state disabled
1414 $ui_workdir conf -state disabled
1417 proc update_indexinfo {msg pathList after} {
1418 global update_index_cp ui_status_value
1420 if {![lock_index update]} return
1422 set update_index_cp 0
1423 set pathList [lsort $pathList]
1424 set totalCnt [llength $pathList]
1425 set batch [expr {int($totalCnt * .01) + 1}]
1426 if {$batch > 25} {set batch 25}
1428 set ui_status_value [format \
1429 "$msg... %i/%i files (%.2f%%)" \
1433 set fd [open "| git update-index -z --index-info" w]
1439 fileevent $fd writable [list \
1440 write_update_indexinfo \
1450 proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
1451 global update_index_cp ui_status_value
1452 global file_states current_diff_path
1454 if {$update_index_cp >= $totalCnt} {
1461 for {set i $batch} \
1462 {$update_index_cp < $totalCnt && $i > 0} \
1464 set path [lindex $pathList $update_index_cp]
1465 incr update_index_cp
1467 set s $file_states($path)
1468 switch -glob -- [lindex $s 0] {
1475 set info [lindex $s 2]
1476 if {$info eq {}} continue
1478 puts -nonewline $fd "$info\t$path\0"
1479 display_file $path $new
1482 set ui_status_value [format \
1483 "$msg... %i/%i files (%.2f%%)" \
1486 [expr {100.0 * $update_index_cp / $totalCnt}]]
1489 proc update_index {msg pathList after} {
1490 global update_index_cp ui_status_value
1492 if {![lock_index update]} return
1494 set update_index_cp 0
1495 set pathList [lsort $pathList]
1496 set totalCnt [llength $pathList]
1497 set batch [expr {int($totalCnt * .01) + 1}]
1498 if {$batch > 25} {set batch 25}
1500 set ui_status_value [format \
1501 "$msg... %i/%i files (%.2f%%)" \
1505 set fd [open "| git update-index --add --remove -z --stdin" w]
1511 fileevent $fd writable [list \
1512 write_update_index \
1522 proc write_update_index {fd pathList totalCnt batch msg after} {
1523 global update_index_cp ui_status_value
1524 global file_states current_diff_path
1526 if {$update_index_cp >= $totalCnt} {
1533 for {set i $batch} \
1534 {$update_index_cp < $totalCnt && $i > 0} \
1536 set path [lindex $pathList $update_index_cp]
1537 incr update_index_cp
1539 switch -glob -- [lindex $file_states($path) 0] {
1545 if {[file exists $path]} {
1554 puts -nonewline $fd "$path\0"
1555 display_file $path $new
1558 set ui_status_value [format \
1559 "$msg... %i/%i files (%.2f%%)" \
1562 [expr {100.0 * $update_index_cp / $totalCnt}]]
1565 proc checkout_index {msg pathList after} {
1566 global update_index_cp ui_status_value
1568 if {![lock_index update]} return
1570 set update_index_cp 0
1571 set pathList [lsort $pathList]
1572 set totalCnt [llength $pathList]
1573 set batch [expr {int($totalCnt * .01) + 1}]
1574 if {$batch > 25} {set batch 25}
1576 set ui_status_value [format \
1577 "$msg... %i/%i files (%.2f%%)" \
1581 set cmd [list git checkout-index]
1587 set fd [open "| $cmd " w]
1593 fileevent $fd writable [list \
1594 write_checkout_index \
1604 proc write_checkout_index {fd pathList totalCnt batch msg after} {
1605 global update_index_cp ui_status_value
1606 global file_states current_diff_path
1608 if {$update_index_cp >= $totalCnt} {
1615 for {set i $batch} \
1616 {$update_index_cp < $totalCnt && $i > 0} \
1618 set path [lindex $pathList $update_index_cp]
1619 incr update_index_cp
1620 switch -glob -- [lindex $file_states($path) 0] {
1624 puts -nonewline $fd "$path\0"
1625 display_file $path ?_
1630 set ui_status_value [format \
1631 "$msg... %i/%i files (%.2f%%)" \
1634 [expr {100.0 * $update_index_cp / $totalCnt}]]
1637 ######################################################################
1639 ## branch management
1641 proc is_tracking_branch {name} {
1642 global tracking_branches
1644 if {![catch {set info $tracking_branches($name)}]} {
1647 foreach t [array names tracking_branches] {
1648 if {[string match {*/\*} $t] && [string match $t $name]} {
1655 proc load_all_heads {} {
1658 set all_heads [list]
1659 set fd [open "| git for-each-ref --format=%(refname) refs/heads" r]
1660 while {[gets $fd line] > 0} {
1661 if {[is_tracking_branch $line]} continue
1662 if {![regsub ^refs/heads/ $line {} name]} continue
1663 lappend all_heads $name
1667 set all_heads [lsort $all_heads]
1670 proc populate_branch_menu {} {
1671 global all_heads disable_on_lock
1674 set last [$m index last]
1675 for {set i 0} {$i <= $last} {incr i} {
1676 if {[$m type $i] eq {separator}} {
1679 foreach a $disable_on_lock {
1680 if {[lindex $a 0] ne $m || [lindex $a 2] < $i} {
1684 set disable_on_lock $new_dol
1690 foreach b $all_heads {
1691 $m add radiobutton \
1693 -command [list switch_branch $b] \
1694 -variable current_branch \
1697 lappend disable_on_lock \
1698 [list $m entryconf [$m index last] -state]
1702 proc all_tracking_branches {} {
1703 global tracking_branches
1705 set all_trackings {}
1707 foreach name [array names tracking_branches] {
1708 if {[regsub {/\*$} $name {} name]} {
1711 regsub ^refs/(heads|remotes)/ $name {} name
1712 lappend all_trackings $name
1717 set fd [open "| git for-each-ref --format=%(refname) $cmd" r]
1718 while {[gets $fd name] > 0} {
1719 regsub ^refs/(heads|remotes)/ $name {} name
1720 lappend all_trackings $name
1725 return [lsort -unique $all_trackings]
1728 proc do_create_branch_action {w} {
1729 global all_heads null_sha1 repo_config
1730 global create_branch_checkout create_branch_revtype
1731 global create_branch_head create_branch_trackinghead
1733 set newbranch [string trim [$w.desc.name_t get 0.0 end]]
1734 if {$newbranch eq {}
1735 || $newbranch eq $repo_config(gui.newbranchtemplate)} {
1739 -title [wm title $w] \
1741 -message "Please supply a branch name."
1742 focus $w.desc.name_t
1745 if {![catch {exec git show-ref --verify -- "refs/heads/$newbranch"}]} {
1749 -title [wm title $w] \
1751 -message "Branch '$newbranch' already exists."
1752 focus $w.desc.name_t
1755 if {[catch {exec git check-ref-format "heads/$newbranch"}]} {
1759 -title [wm title $w] \
1761 -message "We do not like '$newbranch' as a branch name."
1762 focus $w.desc.name_t
1767 switch -- $create_branch_revtype {
1768 head {set rev $create_branch_head}
1769 tracking {set rev $create_branch_trackinghead}
1770 expression {set rev [string trim [$w.from.exp_t get 0.0 end]]}
1772 if {[catch {set cmt [exec git rev-parse --verify "${rev}^0"]}]} {
1776 -title [wm title $w] \
1778 -message "Invalid starting revision: $rev"
1781 set cmd [list git update-ref]
1783 lappend cmd "branch: Created from $rev"
1784 lappend cmd "refs/heads/$newbranch"
1786 lappend cmd $null_sha1
1787 if {[catch {eval exec $cmd} err]} {
1791 -title [wm title $w] \
1793 -message "Failed to create '$newbranch'.\n\n$err"
1797 lappend all_heads $newbranch
1798 set all_heads [lsort $all_heads]
1799 populate_branch_menu
1801 if {$create_branch_checkout} {
1802 switch_branch $newbranch
1806 proc radio_selector {varname value args} {
1807 upvar #0 $varname var
1811 trace add variable create_branch_head write \
1812 [list radio_selector create_branch_revtype head]
1813 trace add variable create_branch_trackinghead write \
1814 [list radio_selector create_branch_revtype tracking]
1816 trace add variable delete_branch_head write \
1817 [list radio_selector delete_branch_checktype head]
1818 trace add variable delete_branch_trackinghead write \
1819 [list radio_selector delete_branch_checktype tracking]
1821 proc do_create_branch {} {
1822 global all_heads current_branch repo_config
1823 global create_branch_checkout create_branch_revtype
1824 global create_branch_head create_branch_trackinghead
1826 set w .branch_editor
1828 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
1830 label $w.header -text {Create New Branch} \
1832 pack $w.header -side top -fill x
1835 button $w.buttons.create -text Create \
1838 -command [list do_create_branch_action $w]
1839 pack $w.buttons.create -side right
1840 button $w.buttons.cancel -text {Cancel} \
1842 -command [list destroy $w]
1843 pack $w.buttons.cancel -side right -padx 5
1844 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
1846 labelframe $w.desc \
1847 -text {Branch Description} \
1849 label $w.desc.name_l -text {Name:} -font font_ui
1850 text $w.desc.name_t \
1856 $w.desc.name_t insert 0.0 $repo_config(gui.newbranchtemplate)
1857 grid $w.desc.name_l $w.desc.name_t -stick we -padx {0 5}
1858 bind $w.desc.name_t <Shift-Key-Tab> {focus [tk_focusPrev %W];break}
1859 bind $w.desc.name_t <Key-Tab> {focus [tk_focusNext %W];break}
1860 bind $w.desc.name_t <Key-Return> "do_create_branch_action $w;break"
1861 bind $w.desc.name_t <Key> {
1862 if {{%K} ne {BackSpace}
1865 && {%K} ne {Return}} {
1867 if {[string first %A {~^:?*[}] >= 0} break
1870 grid columnconfigure $w.desc 1 -weight 1
1871 pack $w.desc -anchor nw -fill x -pady 5 -padx 5
1873 labelframe $w.from \
1874 -text {Starting Revision} \
1876 radiobutton $w.from.head_r \
1877 -text {Local Branch:} \
1879 -variable create_branch_revtype \
1881 eval tk_optionMenu $w.from.head_m create_branch_head $all_heads
1882 grid $w.from.head_r $w.from.head_m -sticky w
1883 set all_trackings [all_tracking_branches]
1884 if {$all_trackings ne {}} {
1885 set create_branch_trackinghead [lindex $all_trackings 0]
1886 radiobutton $w.from.tracking_r \
1887 -text {Tracking Branch:} \
1889 -variable create_branch_revtype \
1891 eval tk_optionMenu $w.from.tracking_m \
1892 create_branch_trackinghead \
1894 grid $w.from.tracking_r $w.from.tracking_m -sticky w
1896 radiobutton $w.from.exp_r \
1897 -text {Revision Expression:} \
1899 -variable create_branch_revtype \
1901 text $w.from.exp_t \
1907 grid $w.from.exp_r $w.from.exp_t -stick we -padx {0 5}
1908 bind $w.from.exp_t <Shift-Key-Tab> {focus [tk_focusPrev %W];break}
1909 bind $w.from.exp_t <Key-Tab> {focus [tk_focusNext %W];break}
1910 bind $w.from.exp_t <Key-Return> "do_create_branch_action $w;break"
1911 bind $w.from.exp_t <Key-space> break
1912 bind $w.from.exp_t <Key> {set create_branch_revtype expression}
1913 grid columnconfigure $w.from 1 -weight 1
1914 pack $w.from -anchor nw -fill x -pady 5 -padx 5
1916 labelframe $w.postActions \
1917 -text {Post Creation Actions} \
1919 checkbutton $w.postActions.checkout \
1920 -text {Checkout after creation} \
1921 -variable create_branch_checkout \
1923 pack $w.postActions.checkout -anchor nw
1924 pack $w.postActions -anchor nw -fill x -pady 5 -padx 5
1926 set create_branch_checkout 1
1927 set create_branch_head $current_branch
1928 set create_branch_revtype head
1930 bind $w <Visibility> "grab $w; focus $w.desc.name_t"
1931 bind $w <Key-Escape> "destroy $w"
1932 bind $w <Key-Return> "do_create_branch_action $w;break"
1933 wm title $w "[appname] ([reponame]): Create Branch"
1937 proc do_delete_branch_action {w} {
1939 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
1942 switch -- $delete_branch_checktype {
1943 head {set check_rev $delete_branch_head}
1944 tracking {set check_rev $delete_branch_trackinghead}
1945 always {set check_rev {:none}}
1947 if {$check_rev eq {:none}} {
1949 } elseif {[catch {set check_cmt [exec git rev-parse --verify "${check_rev}^0"]}]} {
1953 -title [wm title $w] \
1955 -message "Invalid check revision: $check_rev"
1959 set to_delete [list]
1960 set not_merged [list]
1961 foreach i [$w.list.l curselection] {
1962 set b [$w.list.l get $i]
1963 if {[catch {set o [exec git rev-parse --verify $b]}]} continue
1964 if {$check_cmt ne {}} {
1965 if {$b eq $check_rev} continue
1966 if {[catch {set m [exec git merge-base $o $check_cmt]}]} continue
1968 lappend not_merged $b
1972 lappend to_delete [list $b $o]
1974 if {$not_merged ne {}} {
1975 set msg "The following branches are not completely merged into $check_rev:
1977 - [join $not_merged "\n - "]"
1981 -title [wm title $w] \
1985 if {$to_delete eq {}} return
1986 if {$delete_branch_checktype eq {always}} {
1987 set msg {Recovering deleted branches is difficult.
1989 Delete the selected branches?}
1990 if {[tk_messageBox \
1993 -title [wm title $w] \
1995 -message $msg] ne yes} {
2001 foreach i $to_delete {
2004 if {[catch {exec git update-ref -d "refs/heads/$b" $o} err]} {
2005 append failed " - $b: $err\n"
2007 set x [lsearch -sorted $all_heads $b]
2009 set all_heads [lreplace $all_heads $x $x]
2014 if {$failed ne {}} {
2018 -title [wm title $w] \
2020 -message "Failed to delete branches:\n$failed"
2023 set all_heads [lsort $all_heads]
2024 populate_branch_menu
2028 proc do_delete_branch {} {
2029 global all_heads tracking_branches current_branch
2030 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
2032 set w .branch_editor
2034 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2036 label $w.header -text {Delete Local Branch} \
2038 pack $w.header -side top -fill x
2041 button $w.buttons.create -text Delete \
2043 -command [list do_delete_branch_action $w]
2044 pack $w.buttons.create -side right
2045 button $w.buttons.cancel -text {Cancel} \
2047 -command [list destroy $w]
2048 pack $w.buttons.cancel -side right -padx 5
2049 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2051 labelframe $w.list \
2052 -text {Local Branches} \
2057 -selectmode extended \
2059 foreach h $all_heads {
2060 if {$h ne $current_branch} {
2061 $w.list.l insert end $h
2064 pack $w.list.l -fill both -pady 5 -padx 5
2065 pack $w.list -fill both -pady 5 -padx 5
2067 labelframe $w.validate \
2068 -text {Delete Only If} \
2070 radiobutton $w.validate.head_r \
2071 -text {Merged Into Local Branch:} \
2073 -variable delete_branch_checktype \
2075 eval tk_optionMenu $w.validate.head_m delete_branch_head $all_heads
2076 grid $w.validate.head_r $w.validate.head_m -sticky w
2077 set all_trackings [all_tracking_branches]
2078 if {$all_trackings ne {}} {
2079 set delete_branch_trackinghead [lindex $all_trackings 0]
2080 radiobutton $w.validate.tracking_r \
2081 -text {Merged Into Tracking Branch:} \
2083 -variable delete_branch_checktype \
2085 eval tk_optionMenu $w.validate.tracking_m \
2086 delete_branch_trackinghead \
2088 grid $w.validate.tracking_r $w.validate.tracking_m -sticky w
2090 radiobutton $w.validate.always_r \
2091 -text {Always (Do not perform merge checks)} \
2093 -variable delete_branch_checktype \
2095 grid $w.validate.always_r -columnspan 2 -sticky w
2096 grid columnconfigure $w.validate 1 -weight 1
2097 pack $w.validate -anchor nw -fill x -pady 5 -padx 5
2099 set delete_branch_head $current_branch
2100 set delete_branch_checktype head
2102 bind $w <Visibility> "grab $w; focus $w"
2103 bind $w <Key-Escape> "destroy $w"
2104 wm title $w "[appname] ([reponame]): Delete Branch"
2108 proc switch_branch {b} {
2109 global HEAD commit_type file_states current_branch
2110 global selected_commit_type ui_comm
2112 if {![lock_index switch]} return
2114 # -- Backup the selected branch (repository_state resets it)
2116 set new_branch $current_branch
2118 # -- Our in memory state should match the repository.
2120 repository_state curType curHEAD curMERGE_HEAD
2121 if {[string match amend* $commit_type]
2122 && $curType eq {normal}
2123 && $curHEAD eq $HEAD} {
2124 } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
2125 info_popup {Last scanned state does not match repository state.
2127 Another Git program has modified this repository
2128 since the last scan. A rescan must be performed
2129 before the current branch can be changed.
2131 The rescan will be automatically started now.
2134 rescan {set ui_status_value {Ready.}}
2138 # -- Toss the message buffer if we are in amend mode.
2140 if {[string match amend* $curType]} {
2141 $ui_comm delete 0.0 end
2143 $ui_comm edit modified false
2146 set selected_commit_type new
2147 set current_branch $new_branch
2150 error "NOT FINISHED"
2153 ######################################################################
2155 ## remote management
2157 proc load_all_remotes {} {
2159 global all_remotes tracking_branches
2161 set all_remotes [list]
2162 array unset tracking_branches
2164 set rm_dir [gitdir remotes]
2165 if {[file isdirectory $rm_dir]} {
2166 set all_remotes [glob \
2170 -directory $rm_dir *]
2172 foreach name $all_remotes {
2174 set fd [open [file join $rm_dir $name] r]
2175 while {[gets $fd line] >= 0} {
2176 if {![regexp {^Pull:[ ]*([^:]+):(.+)$} \
2177 $line line src dst]} continue
2178 if {![regexp ^refs/ $dst]} {
2179 set dst "refs/heads/$dst"
2181 set tracking_branches($dst) [list $name $src]
2188 foreach line [array names repo_config remote.*.url] {
2189 if {![regexp ^remote\.(.*)\.url\$ $line line name]} continue
2190 lappend all_remotes $name
2192 if {[catch {set fl $repo_config(remote.$name.fetch)}]} {
2196 if {![regexp {^([^:]+):(.+)$} $line line src dst]} continue
2197 if {![regexp ^refs/ $dst]} {
2198 set dst "refs/heads/$dst"
2200 set tracking_branches($dst) [list $name $src]
2204 set all_remotes [lsort -unique $all_remotes]
2207 proc populate_fetch_menu {m} {
2208 global all_remotes repo_config
2210 foreach r $all_remotes {
2212 if {![catch {set a $repo_config(remote.$r.url)}]} {
2213 if {![catch {set a $repo_config(remote.$r.fetch)}]} {
2218 set fd [open [gitdir remotes $r] r]
2219 while {[gets $fd n] >= 0} {
2220 if {[regexp {^Pull:[ \t]*([^:]+):} $n]} {
2231 -label "Fetch from $r..." \
2232 -command [list fetch_from $r] \
2238 proc populate_push_menu {m} {
2239 global all_remotes repo_config
2241 foreach r $all_remotes {
2243 if {![catch {set a $repo_config(remote.$r.url)}]} {
2244 if {![catch {set a $repo_config(remote.$r.push)}]} {
2249 set fd [open [gitdir remotes $r] r]
2250 while {[gets $fd n] >= 0} {
2251 if {[regexp {^Push:[ \t]*([^:]+):} $n]} {
2262 -label "Push to $r..." \
2263 -command [list push_to $r] \
2269 proc populate_pull_menu {m} {
2270 global repo_config all_remotes disable_on_lock
2272 foreach remote $all_remotes {
2274 if {[array get repo_config remote.$remote.url] ne {}} {
2275 if {[array get repo_config remote.$remote.fetch] ne {}} {
2276 foreach line $repo_config(remote.$remote.fetch) {
2277 if {[regexp {^([^:]+):} $line line rb]} {
2284 set fd [open [gitdir remotes $remote] r]
2285 while {[gets $fd line] >= 0} {
2286 if {[regexp {^Pull:[ \t]*([^:]+):} $line line rb]} {
2294 foreach rb $rb_list {
2295 regsub ^refs/heads/ $rb {} rb_short
2297 -label "Branch $rb_short from $remote..." \
2298 -command [list pull_remote $remote $rb] \
2300 lappend disable_on_lock \
2301 [list $m entryconf [$m index last] -state]
2306 ######################################################################
2311 #define mask_width 14
2312 #define mask_height 15
2313 static unsigned char mask_bits[] = {
2314 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2315 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2316 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2319 image create bitmap file_plain -background white -foreground black -data {
2320 #define plain_width 14
2321 #define plain_height 15
2322 static unsigned char plain_bits[] = {
2323 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2324 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2325 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2326 } -maskdata $filemask
2328 image create bitmap file_mod -background white -foreground blue -data {
2329 #define mod_width 14
2330 #define mod_height 15
2331 static unsigned char mod_bits[] = {
2332 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2333 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2334 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2335 } -maskdata $filemask
2337 image create bitmap file_fulltick -background white -foreground "#007000" -data {
2338 #define file_fulltick_width 14
2339 #define file_fulltick_height 15
2340 static unsigned char file_fulltick_bits[] = {
2341 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2342 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2343 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2344 } -maskdata $filemask
2346 image create bitmap file_parttick -background white -foreground "#005050" -data {
2347 #define parttick_width 14
2348 #define parttick_height 15
2349 static unsigned char parttick_bits[] = {
2350 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2351 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
2352 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2353 } -maskdata $filemask
2355 image create bitmap file_question -background white -foreground black -data {
2356 #define file_question_width 14
2357 #define file_question_height 15
2358 static unsigned char file_question_bits[] = {
2359 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2360 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2361 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2362 } -maskdata $filemask
2364 image create bitmap file_removed -background white -foreground red -data {
2365 #define file_removed_width 14
2366 #define file_removed_height 15
2367 static unsigned char file_removed_bits[] = {
2368 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2369 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2370 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2371 } -maskdata $filemask
2373 image create bitmap file_merge -background white -foreground blue -data {
2374 #define file_merge_width 14
2375 #define file_merge_height 15
2376 static unsigned char file_merge_bits[] = {
2377 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2378 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2379 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2380 } -maskdata $filemask
2382 set ui_index .vpane.files.index.list
2383 set ui_workdir .vpane.files.workdir.list
2385 set all_icons(_$ui_index) file_plain
2386 set all_icons(A$ui_index) file_fulltick
2387 set all_icons(M$ui_index) file_fulltick
2388 set all_icons(D$ui_index) file_removed
2389 set all_icons(U$ui_index) file_merge
2391 set all_icons(_$ui_workdir) file_plain
2392 set all_icons(M$ui_workdir) file_mod
2393 set all_icons(D$ui_workdir) file_question
2394 set all_icons(U$ui_workdir) file_merge
2395 set all_icons(O$ui_workdir) file_plain
2397 set max_status_desc 0
2401 {_M "Modified, not staged"}
2402 {M_ "Staged for commit"}
2403 {MM "Portions staged for commit"}
2404 {MD "Staged for commit, missing"}
2406 {_O "Untracked, not staged"}
2407 {A_ "Staged for commit"}
2408 {AM "Portions staged for commit"}
2409 {AD "Staged for commit, missing"}
2412 {D_ "Staged for removal"}
2413 {DO "Staged for removal, still present"}
2415 {U_ "Requires merge resolution"}
2416 {UU "Requires merge resolution"}
2417 {UM "Requires merge resolution"}
2418 {UD "Requires merge resolution"}
2420 if {$max_status_desc < [string length [lindex $i 1]]} {
2421 set max_status_desc [string length [lindex $i 1]]
2423 set all_descs([lindex $i 0]) [lindex $i 1]
2427 ######################################################################
2432 global tcl_platform tk_library
2433 if {[tk windowingsystem] eq {aqua}} {
2439 proc is_Windows {} {
2441 if {$tcl_platform(platform) eq {windows}} {
2447 proc bind_button3 {w cmd} {
2448 bind $w <Any-Button-3> $cmd
2450 bind $w <Control-Button-1> $cmd
2454 proc incr_font_size {font {amt 1}} {
2455 set sz [font configure $font -size]
2457 font configure $font -size $sz
2458 font configure ${font}bold -size $sz
2461 proc hook_failed_popup {hook msg} {
2466 label $w.m.l1 -text "$hook hook failed:" \
2471 -background white -borderwidth 1 \
2473 -width 80 -height 10 \
2475 -yscrollcommand [list $w.m.sby set]
2477 -text {You must correct the above errors before committing.} \
2481 scrollbar $w.m.sby -command [list $w.m.t yview]
2482 pack $w.m.l1 -side top -fill x
2483 pack $w.m.l2 -side bottom -fill x
2484 pack $w.m.sby -side right -fill y
2485 pack $w.m.t -side left -fill both -expand 1
2486 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
2488 $w.m.t insert 1.0 $msg
2489 $w.m.t conf -state disabled
2491 button $w.ok -text OK \
2494 -command "destroy $w"
2495 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
2497 bind $w <Visibility> "grab $w; focus $w"
2498 bind $w <Key-Return> "destroy $w"
2499 wm title $w "[appname] ([reponame]): error"
2503 set next_console_id 0
2505 proc new_console {short_title long_title} {
2506 global next_console_id console_data
2507 set w .console[incr next_console_id]
2508 set console_data($w) [list $short_title $long_title]
2509 return [console_init $w]
2512 proc console_init {w} {
2513 global console_cr console_data M1B
2515 set console_cr($w) 1.0
2518 label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
2523 -background white -borderwidth 1 \
2525 -width 80 -height 10 \
2528 -yscrollcommand [list $w.m.sby set]
2529 label $w.m.s -text {Working... please wait...} \
2533 scrollbar $w.m.sby -command [list $w.m.t yview]
2534 pack $w.m.l1 -side top -fill x
2535 pack $w.m.s -side bottom -fill x
2536 pack $w.m.sby -side right -fill y
2537 pack $w.m.t -side left -fill both -expand 1
2538 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
2540 menu $w.ctxm -tearoff 0
2541 $w.ctxm add command -label "Copy" \
2543 -command "tk_textCopy $w.m.t"
2544 $w.ctxm add command -label "Select All" \
2546 -command "$w.m.t tag add sel 0.0 end"
2547 $w.ctxm add command -label "Copy All" \
2550 $w.m.t tag add sel 0.0 end
2552 $w.m.t tag remove sel 0.0 end
2555 button $w.ok -text {Close} \
2558 -command "destroy $w"
2559 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
2561 bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
2562 bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
2563 bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
2564 bind $w <Visibility> "focus $w"
2565 wm title $w "[appname] ([reponame]): [lindex $console_data($w) 0]"
2569 proc console_exec {w cmd {after {}}} {
2570 # -- Windows tosses the enviroment when we exec our child.
2571 # But most users need that so we have to relogin. :-(
2574 set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
2577 # -- Tcl won't let us redirect both stdout and stderr to
2578 # the same pipe. So pass it through cat...
2580 set cmd [concat | $cmd |& cat]
2582 set fd_f [open $cmd r]
2583 fconfigure $fd_f -blocking 0 -translation binary
2584 fileevent $fd_f readable [list console_read $w $fd_f $after]
2587 proc console_read {w fd after} {
2588 global console_cr console_data
2592 if {![winfo exists $w]} {console_init $w}
2593 $w.m.t conf -state normal
2595 set n [string length $buf]
2597 set cr [string first "\r" $buf $c]
2598 set lf [string first "\n" $buf $c]
2599 if {$cr < 0} {set cr [expr {$n + 1}]}
2600 if {$lf < 0} {set lf [expr {$n + 1}]}
2603 $w.m.t insert end [string range $buf $c $lf]
2604 set console_cr($w) [$w.m.t index {end -1c}]
2608 $w.m.t delete $console_cr($w) end
2609 $w.m.t insert end "\n"
2610 $w.m.t insert end [string range $buf $c $cr]
2615 $w.m.t conf -state disabled
2619 fconfigure $fd -blocking 1
2621 if {[catch {close $fd}]} {
2622 if {![winfo exists $w]} {console_init $w}
2623 $w.m.s conf -background red -text {Error: Command Failed}
2624 $w.ok conf -state normal
2626 } elseif {[winfo exists $w]} {
2627 $w.m.s conf -background green -text {Success}
2628 $w.ok conf -state normal
2631 array unset console_cr $w
2632 array unset console_data $w
2634 uplevel #0 $after $ok
2638 fconfigure $fd -blocking 0
2641 ######################################################################
2645 set starting_gitk_msg {Starting gitk... please wait...}
2647 proc do_gitk {revs} {
2648 global ui_status_value starting_gitk_msg
2656 set cmd "sh -c \"exec $cmd\""
2660 if {[catch {eval exec $cmd} err]} {
2661 error_popup "Failed to start gitk:\n\n$err"
2663 set ui_status_value $starting_gitk_msg
2665 if {$ui_status_value eq $starting_gitk_msg} {
2666 set ui_status_value {Ready.}
2673 set w [new_console {gc} {Compressing the object database}]
2674 console_exec $w {git gc}
2677 proc do_fsck_objects {} {
2678 set w [new_console {fsck-objects} \
2679 {Verifying the object database with fsck-objects}]
2680 set cmd [list git fsck-objects]
2683 lappend cmd --strict
2684 console_exec $w $cmd
2690 global ui_comm is_quitting repo_config commit_type
2692 if {$is_quitting} return
2695 # -- Stash our current commit buffer.
2697 set save [gitdir GITGUI_MSG]
2698 set msg [string trim [$ui_comm get 0.0 end]]
2699 if {![string match amend* $commit_type]
2700 && [$ui_comm edit modified]
2703 set fd [open $save w]
2704 puts $fd [string trim [$ui_comm get 0.0 end]]
2708 catch {file delete $save}
2711 # -- Stash our current window geometry into this repository.
2713 set cfg_geometry [list]
2714 lappend cfg_geometry [wm geometry .]
2715 lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
2716 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
2717 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2720 if {$cfg_geometry ne $rc_geometry} {
2721 catch {exec git repo-config gui.geometry $cfg_geometry}
2728 rescan {set ui_status_value {Ready.}}
2731 proc unstage_helper {txt paths} {
2732 global file_states current_diff_path
2734 if {![lock_index begin-update]} return
2738 foreach path $paths {
2739 switch -glob -- [lindex $file_states($path) 0] {
2743 lappend pathList $path
2744 if {$path eq $current_diff_path} {
2745 set after {reshow_diff;}
2750 if {$pathList eq {}} {
2756 [concat $after {set ui_status_value {Ready.}}]
2760 proc do_unstage_selection {} {
2761 global current_diff_path selected_paths
2763 if {[array size selected_paths] > 0} {
2765 {Unstaging selected files from commit} \
2766 [array names selected_paths]
2767 } elseif {$current_diff_path ne {}} {
2769 "Unstaging [short_path $current_diff_path] from commit" \
2770 [list $current_diff_path]
2774 proc add_helper {txt paths} {
2775 global file_states current_diff_path
2777 if {![lock_index begin-update]} return
2781 foreach path $paths {
2782 switch -glob -- [lindex $file_states($path) 0] {
2787 lappend pathList $path
2788 if {$path eq $current_diff_path} {
2789 set after {reshow_diff;}
2794 if {$pathList eq {}} {
2800 [concat $after {set ui_status_value {Ready to commit.}}]
2804 proc do_add_selection {} {
2805 global current_diff_path selected_paths
2807 if {[array size selected_paths] > 0} {
2809 {Adding selected files} \
2810 [array names selected_paths]
2811 } elseif {$current_diff_path ne {}} {
2813 "Adding [short_path $current_diff_path]" \
2814 [list $current_diff_path]
2818 proc do_add_all {} {
2822 foreach path [array names file_states] {
2823 switch -glob -- [lindex $file_states($path) 0] {
2826 ?D {lappend paths $path}
2829 add_helper {Adding all changed files} $paths
2832 proc revert_helper {txt paths} {
2833 global file_states current_diff_path
2835 if {![lock_index begin-update]} return
2839 foreach path $paths {
2840 switch -glob -- [lindex $file_states($path) 0] {
2844 lappend pathList $path
2845 if {$path eq $current_diff_path} {
2846 set after {reshow_diff;}
2852 set n [llength $pathList]
2856 } elseif {$n == 1} {
2857 set s "[short_path [lindex $pathList]]"
2859 set s "these $n files"
2862 set reply [tk_dialog \
2864 "[appname] ([reponame])" \
2865 "Revert changes in $s?
2867 Any unadded changes will be permanently lost by the revert." \
2877 [concat $after {set ui_status_value {Ready.}}]
2883 proc do_revert_selection {} {
2884 global current_diff_path selected_paths
2886 if {[array size selected_paths] > 0} {
2888 {Reverting selected files} \
2889 [array names selected_paths]
2890 } elseif {$current_diff_path ne {}} {
2892 "Reverting [short_path $current_diff_path]" \
2893 [list $current_diff_path]
2897 proc do_signoff {} {
2900 set me [committer_ident]
2901 if {$me eq {}} return
2903 set sob "Signed-off-by: $me"
2904 set last [$ui_comm get {end -1c linestart} {end -1c}]
2905 if {$last ne $sob} {
2906 $ui_comm edit separator
2908 && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
2909 $ui_comm insert end "\n"
2911 $ui_comm insert end "\n$sob"
2912 $ui_comm edit separator
2917 proc do_select_commit_type {} {
2918 global commit_type selected_commit_type
2920 if {$selected_commit_type eq {new}
2921 && [string match amend* $commit_type]} {
2923 } elseif {$selected_commit_type eq {amend}
2924 && ![string match amend* $commit_type]} {
2927 # The amend request was rejected...
2929 if {![string match amend* $commit_type]} {
2930 set selected_commit_type new
2940 global appvers copyright
2941 global tcl_patchLevel tk_patchLevel
2945 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2947 label $w.header -text "About [appname]" \
2949 pack $w.header -side top -fill x
2952 button $w.buttons.close -text {Close} \
2954 -command [list destroy $w]
2955 pack $w.buttons.close -side right
2956 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2959 -text "[appname] - a commit creation tool for Git.
2967 pack $w.desc -side top -fill x -padx 5 -pady 5
2970 append v "[appname] version $appvers\n"
2971 append v "[exec git version]\n"
2973 if {$tcl_patchLevel eq $tk_patchLevel} {
2974 append v "Tcl/Tk version $tcl_patchLevel"
2976 append v "Tcl version $tcl_patchLevel"
2977 append v ", Tk version $tk_patchLevel"
2988 pack $w.vers -side top -fill x -padx 5 -pady 5
2990 menu $w.ctxm -tearoff 0
2991 $w.ctxm add command \
2996 clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
2999 bind $w <Visibility> "grab $w; focus $w"
3000 bind $w <Key-Escape> "destroy $w"
3001 bind_button3 $w.vers "tk_popup $w.ctxm %X %Y; grab $w; focus $w"
3002 wm title $w "About [appname]"
3006 proc do_options {} {
3007 global repo_config global_config font_descs
3008 global repo_config_new global_config_new
3010 array unset repo_config_new
3011 array unset global_config_new
3012 foreach name [array names repo_config] {
3013 set repo_config_new($name) $repo_config($name)
3016 foreach name [array names repo_config] {
3018 gui.diffcontext {continue}
3020 set repo_config_new($name) $repo_config($name)
3022 foreach name [array names global_config] {
3023 set global_config_new($name) $global_config($name)
3026 set w .options_editor
3028 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
3030 label $w.header -text "[appname] Options" \
3032 pack $w.header -side top -fill x
3035 button $w.buttons.restore -text {Restore Defaults} \
3037 -command do_restore_defaults
3038 pack $w.buttons.restore -side left
3039 button $w.buttons.save -text Save \
3042 catch {eval \[bind \[focus -displayof $w\] <FocusOut>\]}
3045 pack $w.buttons.save -side right
3046 button $w.buttons.cancel -text {Cancel} \
3048 -command [list destroy $w]
3049 pack $w.buttons.cancel -side right -padx 5
3050 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
3052 labelframe $w.repo -text "[reponame] Repository" \
3054 -relief raised -borderwidth 2
3055 labelframe $w.global -text {Global (All Repositories)} \
3057 -relief raised -borderwidth 2
3058 pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
3059 pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
3062 {b pullsummary {Show Pull Summary}}
3063 {b trustmtime {Trust File Modification Timestamps}}
3064 {i diffcontext {Number of Diff Context Lines}}
3065 {t newbranchtemplate {New Branch Name Template}}
3067 set type [lindex $option 0]
3068 set name [lindex $option 1]
3069 set text [lindex $option 2]
3070 foreach f {repo global} {
3073 checkbutton $w.$f.$name -text $text \
3074 -variable ${f}_config_new(gui.$name) \
3078 pack $w.$f.$name -side top -anchor w
3082 label $w.$f.$name.l -text "$text:" -font font_ui
3083 pack $w.$f.$name.l -side left -anchor w -fill x
3084 spinbox $w.$f.$name.v \
3085 -textvariable ${f}_config_new(gui.$name) \
3086 -from 1 -to 99 -increment 1 \
3089 bind $w.$f.$name.v <FocusIn> {%W selection range 0 end}
3090 pack $w.$f.$name.v -side right -anchor e -padx 5
3091 pack $w.$f.$name -side top -anchor w -fill x
3095 label $w.$f.$name.l -text "$text:" -font font_ui
3096 text $w.$f.$name.v \
3102 $w.$f.$name.v insert 0.0 [set ${f}_config_new(gui.$name)]
3103 bind $w.$f.$name.v <Shift-Key-Tab> {focus [tk_focusPrev %W];break}
3104 bind $w.$f.$name.v <Key-Tab> {focus [tk_focusNext %W];break}
3105 bind $w.$f.$name.v <Key-Return> break
3106 bind $w.$f.$name.v <FocusIn> "$w.$f.$name.v tag add sel 0.0 end"
3107 bind $w.$f.$name.v <FocusOut> "
3108 set ${f}_config_new(gui.$name) \
3109 \[string trim \[$w.$f.$name.v get 0.0 end\]\]
3111 pack $w.$f.$name.l -side left -anchor w
3112 pack $w.$f.$name.v -side left -anchor w \
3115 pack $w.$f.$name -side top -anchor w -fill x
3121 set all_fonts [lsort [font families]]
3122 foreach option $font_descs {
3123 set name [lindex $option 0]
3124 set font [lindex $option 1]
3125 set text [lindex $option 2]
3127 set global_config_new(gui.$font^^family) \
3128 [font configure $font -family]
3129 set global_config_new(gui.$font^^size) \
3130 [font configure $font -size]
3132 frame $w.global.$name
3133 label $w.global.$name.l -text "$text:" -font font_ui
3134 pack $w.global.$name.l -side left -anchor w -fill x
3135 eval tk_optionMenu $w.global.$name.family \
3136 global_config_new(gui.$font^^family) \
3138 spinbox $w.global.$name.size \
3139 -textvariable global_config_new(gui.$font^^size) \
3140 -from 2 -to 80 -increment 1 \
3143 bind $w.global.$name.size <FocusIn> {%W selection range 0 end}
3144 pack $w.global.$name.size -side right -anchor e
3145 pack $w.global.$name.family -side right -anchor e
3146 pack $w.global.$name -side top -anchor w -fill x
3149 bind $w <Visibility> "grab $w; focus $w"
3150 bind $w <Key-Escape> "destroy $w"
3151 wm title $w "[appname] ([reponame]): Options"
3155 proc do_restore_defaults {} {
3156 global font_descs default_config repo_config
3157 global repo_config_new global_config_new
3159 foreach name [array names default_config] {
3160 set repo_config_new($name) $default_config($name)
3161 set global_config_new($name) $default_config($name)
3164 foreach option $font_descs {
3165 set name [lindex $option 0]
3166 set repo_config(gui.$name) $default_config(gui.$name)
3170 foreach option $font_descs {
3171 set name [lindex $option 0]
3172 set font [lindex $option 1]
3173 set global_config_new(gui.$font^^family) \
3174 [font configure $font -family]
3175 set global_config_new(gui.$font^^size) \
3176 [font configure $font -size]
3180 proc do_save_config {w} {
3181 if {[catch {save_config} err]} {
3182 error_popup "Failed to completely save options:\n\n$err"
3188 proc do_windows_shortcut {} {
3192 set desktop [exec cygpath \
3200 set fn [tk_getSaveFile \
3202 -title "[appname] ([reponame]): Create Desktop Icon" \
3203 -initialdir $desktop \
3204 -initialfile "Git [reponame].bat"]
3208 set sh [exec cygpath \
3212 set me [exec cygpath \
3216 set gd [exec cygpath \
3220 set gw [exec cygpath \
3223 [file dirname [gitdir]]]
3224 regsub -all ' $me "'\\''" me
3225 regsub -all ' $gd "'\\''" gd
3226 puts $fd "@ECHO Entering $gw"
3227 puts $fd "@ECHO Starting git-gui... please wait..."
3228 puts -nonewline $fd "@\"$sh\" --login -c \""
3229 puts -nonewline $fd "GIT_DIR='$gd'"
3230 puts -nonewline $fd " '$me'"
3234 error_popup "Cannot write script:\n\n$err"
3239 proc do_macosx_app {} {
3242 set fn [tk_getSaveFile \
3244 -title "[appname] ([reponame]): Create Desktop Icon" \
3245 -initialdir [file join $env(HOME) Desktop] \
3246 -initialfile "Git [reponame].app"]
3249 set Contents [file join $fn Contents]
3250 set MacOS [file join $Contents MacOS]
3251 set exe [file join $MacOS git-gui]
3255 set fd [open [file join $Contents Info.plist] w]
3256 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
3257 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3258 <plist version="1.0">
3260 <key>CFBundleDevelopmentRegion</key>
3261 <string>English</string>
3262 <key>CFBundleExecutable</key>
3263 <string>git-gui</string>
3264 <key>CFBundleIdentifier</key>
3265 <string>org.spearce.git-gui</string>
3266 <key>CFBundleInfoDictionaryVersion</key>
3267 <string>6.0</string>
3268 <key>CFBundlePackageType</key>
3269 <string>APPL</string>
3270 <key>CFBundleSignature</key>
3271 <string>????</string>
3272 <key>CFBundleVersion</key>
3273 <string>1.0</string>
3274 <key>NSPrincipalClass</key>
3275 <string>NSApplication</string>
3280 set fd [open $exe w]
3281 set gd [file normalize [gitdir]]
3282 set ep [file normalize [exec git --exec-path]]
3283 regsub -all ' $gd "'\\''" gd
3284 regsub -all ' $ep "'\\''" ep
3285 puts $fd "#!/bin/sh"
3286 foreach name [array names env] {
3287 if {[string match GIT_* $name]} {
3288 regsub -all ' $env($name) "'\\''" v
3289 puts $fd "export $name='$v'"
3292 puts $fd "export PATH='$ep':\$PATH"
3293 puts $fd "export GIT_DIR='$gd'"
3294 puts $fd "exec [file normalize $argv0]"
3297 file attributes $exe -permissions u+x,g+x,o+x
3299 error_popup "Cannot write icon:\n\n$err"
3304 proc toggle_or_diff {w x y} {
3305 global file_states file_lists current_diff_path ui_index ui_workdir
3306 global last_clicked selected_paths
3308 set pos [split [$w index @$x,$y] .]
3309 set lno [lindex $pos 0]
3310 set col [lindex $pos 1]
3311 set path [lindex $file_lists($w) [expr {$lno - 1}]]
3317 set last_clicked [list $w $lno]
3318 array unset selected_paths
3319 $ui_index tag remove in_sel 0.0 end
3320 $ui_workdir tag remove in_sel 0.0 end
3323 if {$current_diff_path eq $path} {
3324 set after {reshow_diff;}
3328 if {$w eq $ui_index} {
3330 "Unstaging [short_path $path] from commit" \
3332 [concat $after {set ui_status_value {Ready.}}]
3333 } elseif {$w eq $ui_workdir} {
3335 "Adding [short_path $path]" \
3337 [concat $after {set ui_status_value {Ready.}}]
3340 show_diff $path $w $lno
3344 proc add_one_to_selection {w x y} {
3345 global file_lists last_clicked selected_paths
3347 set lno [lindex [split [$w index @$x,$y] .] 0]
3348 set path [lindex $file_lists($w) [expr {$lno - 1}]]
3354 if {$last_clicked ne {}
3355 && [lindex $last_clicked 0] ne $w} {
3356 array unset selected_paths
3357 [lindex $last_clicked 0] tag remove in_sel 0.0 end
3360 set last_clicked [list $w $lno]
3361 if {[catch {set in_sel $selected_paths($path)}]} {
3365 unset selected_paths($path)
3366 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
3368 set selected_paths($path) 1
3369 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
3373 proc add_range_to_selection {w x y} {
3374 global file_lists last_clicked selected_paths
3376 if {[lindex $last_clicked 0] ne $w} {
3377 toggle_or_diff $w $x $y
3381 set lno [lindex [split [$w index @$x,$y] .] 0]
3382 set lc [lindex $last_clicked 1]
3391 foreach path [lrange $file_lists($w) \
3392 [expr {$begin - 1}] \
3393 [expr {$end - 1}]] {
3394 set selected_paths($path) 1
3396 $w tag add in_sel $begin.0 [expr {$end + 1}].0
3399 ######################################################################
3403 set cursor_ptr arrow
3404 font create font_diff -family Courier -size 10
3408 eval font configure font_ui [font actual [.dummy cget -font]]
3412 font create font_uibold
3413 font create font_diffbold
3418 } elseif {[is_MacOSX]} {
3426 proc apply_config {} {
3427 global repo_config font_descs
3429 foreach option $font_descs {
3430 set name [lindex $option 0]
3431 set font [lindex $option 1]
3433 foreach {cn cv} $repo_config(gui.$name) {
3434 font configure $font $cn $cv
3437 error_popup "Invalid font specified in gui.$name:\n\n$err"
3439 foreach {cn cv} [font configure $font] {
3440 font configure ${font}bold $cn $cv
3442 font configure ${font}bold -weight bold
3446 set default_config(gui.trustmtime) false
3447 set default_config(gui.pullsummary) true
3448 set default_config(gui.diffcontext) 5
3449 set default_config(gui.newbranchtemplate) {}
3450 set default_config(gui.fontui) [font configure font_ui]
3451 set default_config(gui.fontdiff) [font configure font_diff]
3453 {fontui font_ui {Main Font}}
3454 {fontdiff font_diff {Diff/Console Font}}
3459 ######################################################################
3465 menu .mbar -tearoff 0
3466 .mbar add cascade -label Repository -menu .mbar.repository
3467 .mbar add cascade -label Edit -menu .mbar.edit
3468 if {!$single_commit} {
3469 .mbar add cascade -label Branch -menu .mbar.branch
3471 .mbar add cascade -label Commit -menu .mbar.commit
3472 if {!$single_commit} {
3473 .mbar add cascade -label Fetch -menu .mbar.fetch
3474 .mbar add cascade -label Pull -menu .mbar.pull
3475 .mbar add cascade -label Push -menu .mbar.push
3477 . configure -menu .mbar
3479 # -- Repository Menu
3481 menu .mbar.repository
3482 .mbar.repository add command \
3483 -label {Visualize Current Branch} \
3484 -command {do_gitk {}} \
3487 .mbar.repository add command \
3488 -label {Visualize All Branches} \
3489 -command {do_gitk {--all}} \
3492 .mbar.repository add separator
3494 if {!$single_commit} {
3495 .mbar.repository add command -label {Compress Database} \
3499 .mbar.repository add command -label {Verify Database} \
3500 -command do_fsck_objects \
3503 .mbar.repository add separator
3506 .mbar.repository add command \
3507 -label {Create Desktop Icon} \
3508 -command do_windows_shortcut \
3510 } elseif {[is_MacOSX]} {
3511 .mbar.repository add command \
3512 -label {Create Desktop Icon} \
3513 -command do_macosx_app \
3518 .mbar.repository add command -label Quit \
3520 -accelerator $M1T-Q \
3526 .mbar.edit add command -label Undo \
3527 -command {catch {[focus] edit undo}} \
3528 -accelerator $M1T-Z \
3530 .mbar.edit add command -label Redo \
3531 -command {catch {[focus] edit redo}} \
3532 -accelerator $M1T-Y \
3534 .mbar.edit add separator
3535 .mbar.edit add command -label Cut \
3536 -command {catch {tk_textCut [focus]}} \
3537 -accelerator $M1T-X \
3539 .mbar.edit add command -label Copy \
3540 -command {catch {tk_textCopy [focus]}} \
3541 -accelerator $M1T-C \
3543 .mbar.edit add command -label Paste \
3544 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
3545 -accelerator $M1T-V \
3547 .mbar.edit add command -label Delete \
3548 -command {catch {[focus] delete sel.first sel.last}} \
3551 .mbar.edit add separator
3552 .mbar.edit add command -label {Select All} \
3553 -command {catch {[focus] tag add sel 0.0 end}} \
3554 -accelerator $M1T-A \
3559 if {!$single_commit} {
3562 .mbar.branch add command -label {Create...} \
3563 -command do_create_branch \
3564 -accelerator $M1T-N \
3566 lappend disable_on_lock [list .mbar.branch entryconf \
3567 [.mbar.branch index last] -state]
3569 .mbar.branch add command -label {Delete...} \
3570 -command do_delete_branch \
3572 lappend disable_on_lock [list .mbar.branch entryconf \
3573 [.mbar.branch index last] -state]
3580 .mbar.commit add radiobutton \
3581 -label {New Commit} \
3582 -command do_select_commit_type \
3583 -variable selected_commit_type \
3586 lappend disable_on_lock \
3587 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3589 .mbar.commit add radiobutton \
3590 -label {Amend Last Commit} \
3591 -command do_select_commit_type \
3592 -variable selected_commit_type \
3595 lappend disable_on_lock \
3596 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3598 .mbar.commit add separator
3600 .mbar.commit add command -label Rescan \
3601 -command do_rescan \
3604 lappend disable_on_lock \
3605 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3607 .mbar.commit add command -label {Add To Commit} \
3608 -command do_add_selection \
3610 lappend disable_on_lock \
3611 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3613 .mbar.commit add command -label {Add All To Commit} \
3614 -command do_add_all \
3615 -accelerator $M1T-I \
3617 lappend disable_on_lock \
3618 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3620 .mbar.commit add command -label {Unstage From Commit} \
3621 -command do_unstage_selection \
3623 lappend disable_on_lock \
3624 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3626 .mbar.commit add command -label {Revert Changes} \
3627 -command do_revert_selection \
3629 lappend disable_on_lock \
3630 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3632 .mbar.commit add separator
3634 .mbar.commit add command -label {Sign Off} \
3635 -command do_signoff \
3636 -accelerator $M1T-S \
3639 .mbar.commit add command -label Commit \
3640 -command do_commit \
3641 -accelerator $M1T-Return \
3643 lappend disable_on_lock \
3644 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3646 # -- Transport menus
3648 if {!$single_commit} {
3655 # -- Apple Menu (Mac OS X only)
3657 .mbar add cascade -label Apple -menu .mbar.apple
3660 .mbar.apple add command -label "About [appname]" \
3663 .mbar.apple add command -label "[appname] Options..." \
3664 -command do_options \
3669 .mbar.edit add separator
3670 .mbar.edit add command -label {Options...} \
3671 -command do_options \
3676 if {[file exists /usr/local/miga/lib/gui-miga]
3677 && [file exists .pvcsrc]} {
3679 global ui_status_value
3680 if {![lock_index update]} return
3681 set cmd [list sh --login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
3682 set miga_fd [open "|$cmd" r]
3683 fconfigure $miga_fd -blocking 0
3684 fileevent $miga_fd readable [list miga_done $miga_fd]
3685 set ui_status_value {Running miga...}
3687 proc miga_done {fd} {
3692 rescan [list set ui_status_value {Ready.}]
3695 .mbar add cascade -label Tools -menu .mbar.tools
3697 .mbar.tools add command -label "Migrate" \
3700 lappend disable_on_lock \
3701 [list .mbar.tools entryconf [.mbar.tools index last] -state]
3706 .mbar add cascade -label Help -menu .mbar.help
3709 .mbar.help add command -label "About [appname]" \
3721 -text {Current Branch:} \
3726 -textvariable current_branch \
3730 pack .branch.l1 -side left
3731 pack .branch.cb -side left -fill x
3732 pack .branch -side top -fill x
3734 # -- Main Window Layout
3736 panedwindow .vpane -orient vertical
3737 panedwindow .vpane.files -orient horizontal
3738 .vpane add .vpane.files -sticky nsew -height 100 -width 200
3739 pack .vpane -anchor n -side top -fill both -expand 1
3741 # -- Index File List
3743 frame .vpane.files.index -height 100 -width 200
3744 label .vpane.files.index.title -text {Changes To Be Committed} \
3747 text $ui_index -background white -borderwidth 0 \
3748 -width 20 -height 10 \
3751 -cursor $cursor_ptr \
3752 -xscrollcommand {.vpane.files.index.sx set} \
3753 -yscrollcommand {.vpane.files.index.sy set} \
3755 scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
3756 scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
3757 pack .vpane.files.index.title -side top -fill x
3758 pack .vpane.files.index.sx -side bottom -fill x
3759 pack .vpane.files.index.sy -side right -fill y
3760 pack $ui_index -side left -fill both -expand 1
3761 .vpane.files add .vpane.files.index -sticky nsew
3763 # -- Working Directory File List
3765 frame .vpane.files.workdir -height 100 -width 200
3766 label .vpane.files.workdir.title -text {Changed But Not Updated} \
3769 text $ui_workdir -background white -borderwidth 0 \
3770 -width 20 -height 10 \
3773 -cursor $cursor_ptr \
3774 -xscrollcommand {.vpane.files.workdir.sx set} \
3775 -yscrollcommand {.vpane.files.workdir.sy set} \
3777 scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
3778 scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
3779 pack .vpane.files.workdir.title -side top -fill x
3780 pack .vpane.files.workdir.sx -side bottom -fill x
3781 pack .vpane.files.workdir.sy -side right -fill y
3782 pack $ui_workdir -side left -fill both -expand 1
3783 .vpane.files add .vpane.files.workdir -sticky nsew
3785 foreach i [list $ui_index $ui_workdir] {
3786 $i tag conf in_diff -font font_uibold
3787 $i tag conf in_sel \
3788 -background [$i cget -foreground] \
3789 -foreground [$i cget -background]
3793 # -- Diff and Commit Area
3795 frame .vpane.lower -height 300 -width 400
3796 frame .vpane.lower.commarea
3797 frame .vpane.lower.diff -relief sunken -borderwidth 1
3798 pack .vpane.lower.commarea -side top -fill x
3799 pack .vpane.lower.diff -side bottom -fill both -expand 1
3800 .vpane add .vpane.lower -stick nsew
3802 # -- Commit Area Buttons
3804 frame .vpane.lower.commarea.buttons
3805 label .vpane.lower.commarea.buttons.l -text {} \
3809 pack .vpane.lower.commarea.buttons.l -side top -fill x
3810 pack .vpane.lower.commarea.buttons -side left -fill y
3812 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
3813 -command do_rescan \
3815 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3816 lappend disable_on_lock \
3817 {.vpane.lower.commarea.buttons.rescan conf -state}
3819 button .vpane.lower.commarea.buttons.incall -text {Add All} \
3820 -command do_add_all \
3822 pack .vpane.lower.commarea.buttons.incall -side top -fill x
3823 lappend disable_on_lock \
3824 {.vpane.lower.commarea.buttons.incall conf -state}
3826 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
3827 -command do_signoff \
3829 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3831 button .vpane.lower.commarea.buttons.commit -text {Commit} \
3832 -command do_commit \
3834 pack .vpane.lower.commarea.buttons.commit -side top -fill x
3835 lappend disable_on_lock \
3836 {.vpane.lower.commarea.buttons.commit conf -state}
3838 # -- Commit Message Buffer
3840 frame .vpane.lower.commarea.buffer
3841 frame .vpane.lower.commarea.buffer.header
3842 set ui_comm .vpane.lower.commarea.buffer.t
3843 set ui_coml .vpane.lower.commarea.buffer.header.l
3844 radiobutton .vpane.lower.commarea.buffer.header.new \
3845 -text {New Commit} \
3846 -command do_select_commit_type \
3847 -variable selected_commit_type \
3850 lappend disable_on_lock \
3851 [list .vpane.lower.commarea.buffer.header.new conf -state]
3852 radiobutton .vpane.lower.commarea.buffer.header.amend \
3853 -text {Amend Last Commit} \
3854 -command do_select_commit_type \
3855 -variable selected_commit_type \
3858 lappend disable_on_lock \
3859 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3864 proc trace_commit_type {varname args} {
3865 global ui_coml commit_type
3866 switch -glob -- $commit_type {
3867 initial {set txt {Initial Commit Message:}}
3868 amend {set txt {Amended Commit Message:}}
3869 amend-initial {set txt {Amended Initial Commit Message:}}
3870 amend-merge {set txt {Amended Merge Commit Message:}}
3871 merge {set txt {Merge Commit Message:}}
3872 * {set txt {Commit Message:}}
3874 $ui_coml conf -text $txt
3876 trace add variable commit_type write trace_commit_type
3877 pack $ui_coml -side left -fill x
3878 pack .vpane.lower.commarea.buffer.header.amend -side right
3879 pack .vpane.lower.commarea.buffer.header.new -side right
3881 text $ui_comm -background white -borderwidth 1 \
3884 -autoseparators true \
3886 -width 75 -height 9 -wrap none \
3888 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3889 scrollbar .vpane.lower.commarea.buffer.sby \
3890 -command [list $ui_comm yview]
3891 pack .vpane.lower.commarea.buffer.header -side top -fill x
3892 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3893 pack $ui_comm -side left -fill y
3894 pack .vpane.lower.commarea.buffer -side left -fill y
3896 # -- Commit Message Buffer Context Menu
3898 set ctxm .vpane.lower.commarea.buffer.ctxm
3899 menu $ctxm -tearoff 0
3903 -command {tk_textCut $ui_comm}
3907 -command {tk_textCopy $ui_comm}
3911 -command {tk_textPaste $ui_comm}
3915 -command {$ui_comm delete sel.first sel.last}
3918 -label {Select All} \
3920 -command {$ui_comm tag add sel 0.0 end}
3925 $ui_comm tag add sel 0.0 end
3926 tk_textCopy $ui_comm
3927 $ui_comm tag remove sel 0.0 end
3934 bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
3938 set current_diff_path {}
3939 set diff_actions [list]
3940 proc trace_current_diff_path {varname args} {
3941 global current_diff_path diff_actions file_states
3942 if {$current_diff_path eq {}} {
3948 set p $current_diff_path
3949 set s [mapdesc [lindex $file_states($p) 0] $p]
3951 set p [escape_path $p]
3955 .vpane.lower.diff.header.status configure -text $s
3956 .vpane.lower.diff.header.file configure -text $f
3957 .vpane.lower.diff.header.path configure -text $p
3958 foreach w $diff_actions {
3962 trace add variable current_diff_path write trace_current_diff_path
3964 frame .vpane.lower.diff.header -background orange
3965 label .vpane.lower.diff.header.status \
3966 -background orange \
3967 -width $max_status_desc \
3971 label .vpane.lower.diff.header.file \
3972 -background orange \
3976 label .vpane.lower.diff.header.path \
3977 -background orange \
3981 pack .vpane.lower.diff.header.status -side left
3982 pack .vpane.lower.diff.header.file -side left
3983 pack .vpane.lower.diff.header.path -fill x
3984 set ctxm .vpane.lower.diff.header.ctxm
3985 menu $ctxm -tearoff 0
3994 -- $current_diff_path
3996 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3997 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
4001 frame .vpane.lower.diff.body
4002 set ui_diff .vpane.lower.diff.body.t
4003 text $ui_diff -background white -borderwidth 0 \
4004 -width 80 -height 15 -wrap none \
4006 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
4007 -yscrollcommand {.vpane.lower.diff.body.sby set} \
4009 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
4010 -command [list $ui_diff xview]
4011 scrollbar .vpane.lower.diff.body.sby -orient vertical \
4012 -command [list $ui_diff yview]
4013 pack .vpane.lower.diff.body.sbx -side bottom -fill x
4014 pack .vpane.lower.diff.body.sby -side right -fill y
4015 pack $ui_diff -side left -fill both -expand 1
4016 pack .vpane.lower.diff.header -side top -fill x
4017 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
4019 $ui_diff tag conf d_@ -foreground blue -font font_diffbold
4020 $ui_diff tag conf d_+ -foreground {#00a000}
4021 $ui_diff tag conf d_- -foreground red
4023 $ui_diff tag conf d_++ -foreground {#00a000}
4024 $ui_diff tag conf d_-- -foreground red
4025 $ui_diff tag conf d_+s \
4026 -foreground {#00a000} \
4027 -background {#e2effa}
4028 $ui_diff tag conf d_-s \
4030 -background {#e2effa}
4031 $ui_diff tag conf d_s+ \
4032 -foreground {#00a000} \
4034 $ui_diff tag conf d_s- \
4038 $ui_diff tag conf d<<<<<<< \
4039 -foreground orange \
4041 $ui_diff tag conf d======= \
4042 -foreground orange \
4044 $ui_diff tag conf d>>>>>>> \
4045 -foreground orange \
4048 $ui_diff tag raise sel
4050 # -- Diff Body Context Menu
4052 set ctxm .vpane.lower.diff.body.ctxm
4053 menu $ctxm -tearoff 0
4057 -command reshow_diff
4061 -command {tk_textCopy $ui_diff}
4062 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4064 -label {Select All} \
4066 -command {$ui_diff tag add sel 0.0 end}
4067 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4072 $ui_diff tag add sel 0.0 end
4073 tk_textCopy $ui_diff
4074 $ui_diff tag remove sel 0.0 end
4076 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4079 -label {Decrease Font Size} \
4081 -command {incr_font_size font_diff -1}
4082 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4084 -label {Increase Font Size} \
4086 -command {incr_font_size font_diff 1}
4087 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4090 -label {Show Less Context} \
4092 -command {if {$repo_config(gui.diffcontext) >= 2} {
4093 incr repo_config(gui.diffcontext) -1
4096 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4098 -label {Show More Context} \
4101 incr repo_config(gui.diffcontext)
4104 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4106 $ctxm add command -label {Options...} \
4109 bind_button3 $ui_diff "tk_popup $ctxm %X %Y"
4113 set ui_status_value {Initializing...}
4114 label .status -textvariable ui_status_value \
4120 pack .status -anchor w -side bottom -fill x
4125 set gm $repo_config(gui.geometry)
4126 wm geometry . [lindex $gm 0]
4127 .vpane sash place 0 \
4128 [lindex [.vpane sash coord 0] 0] \
4130 .vpane.files sash place 0 \
4132 [lindex [.vpane.files sash coord 0] 1]
4138 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
4139 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
4140 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
4141 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
4142 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
4143 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
4144 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
4145 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
4146 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
4147 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
4148 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
4150 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
4151 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
4152 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
4153 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
4154 bind $ui_diff <$M1B-Key-v> {break}
4155 bind $ui_diff <$M1B-Key-V> {break}
4156 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
4157 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
4158 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
4159 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
4160 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
4161 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
4163 if {!$single_commit} {
4164 bind . <$M1B-Key-n> do_create_branch
4165 bind . <$M1B-Key-N> do_create_branch
4168 bind . <Destroy> do_quit
4169 bind all <Key-F5> do_rescan
4170 bind all <$M1B-Key-r> do_rescan
4171 bind all <$M1B-Key-R> do_rescan
4172 bind . <$M1B-Key-s> do_signoff
4173 bind . <$M1B-Key-S> do_signoff
4174 bind . <$M1B-Key-i> do_add_all
4175 bind . <$M1B-Key-I> do_add_all
4176 bind . <$M1B-Key-Return> do_commit
4177 bind all <$M1B-Key-q> do_quit
4178 bind all <$M1B-Key-Q> do_quit
4179 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
4180 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
4181 foreach i [list $ui_index $ui_workdir] {
4182 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
4183 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
4184 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
4188 set file_lists($ui_index) [list]
4189 set file_lists($ui_workdir) [list]
4193 set MERGE_HEAD [list]
4196 set current_branch {}
4197 set current_diff_path {}
4198 set selected_commit_type new
4200 wm title . "[appname] ([file normalize [file dirname [gitdir]]])"
4201 focus -force $ui_comm
4203 # -- Warn the user about environmental problems. Cygwin's Tcl
4204 # does *not* pass its env array onto any processes it spawns.
4205 # This means that git processes get none of our environment.
4210 set msg "Possible environment issues exist.
4212 The following environment variables are probably
4213 going to be ignored by any Git subprocess run
4217 foreach name [array names env] {
4218 switch -regexp -- $name {
4219 {^GIT_INDEX_FILE$} -
4220 {^GIT_OBJECT_DIRECTORY$} -
4221 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
4223 {^GIT_EXTERNAL_DIFF$} -
4227 {^GIT_CONFIG_LOCAL$} -
4228 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
4229 append msg " - $name\n"
4232 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
4233 append msg " - $name\n"
4235 set suggest_user $name
4239 if {$ignored_env > 0} {
4241 This is due to a known issue with the
4242 Tcl binary distributed by Cygwin."
4244 if {$suggest_user ne {}} {
4247 A good replacement for $suggest_user
4248 is placing values for the user.name and
4249 user.email settings into your personal
4255 unset ignored_env msg suggest_user name
4258 # -- Only initialize complex UI if we are going to stay running.
4260 if {!$single_commit} {
4264 populate_branch_menu
4265 populate_fetch_menu .mbar.fetch
4266 populate_pull_menu .mbar.pull
4267 populate_push_menu .mbar.push
4270 # -- Only suggest a gc run if we are going to stay running.
4272 if {!$single_commit} {
4273 set object_limit 2000
4274 if {[is_Windows]} {set object_limit 200}
4275 regexp {^([0-9]+) objects,} [exec git count-objects] _junk objects_current
4276 if {$objects_current >= $object_limit} {
4278 "This repository currently has $objects_current loose objects.
4280 To maintain optimal performance it is strongly
4281 recommended that you compress the database
4282 when more than $object_limit loose objects exist.
4284 Compress the database now?"] eq yes} {
4288 unset object_limit _junk objects_current
4291 lock_index begin-read