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 {parent .}} {
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 {honor_trustmtime 1}} {
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 {$honor_trustmtime && $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 -encoding binary
414 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
415 fconfigure $fd_lo -blocking 0 -translation binary -encoding 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 regsub -all -line {[ \r\t]+$} $content {} content
432 $ui_comm delete 0.0 end
433 $ui_comm insert end $content
439 proc read_diff_index {fd after} {
442 append buf_rdi [read $fd]
444 set n [string length $buf_rdi]
446 set z1 [string first "\0" $buf_rdi $c]
449 set z2 [string first "\0" $buf_rdi $z1]
453 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
454 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
456 [encoding convertfrom $p] \
458 [list [lindex $i 0] [lindex $i 2]] \
464 set buf_rdi [string range $buf_rdi $c end]
469 rescan_done $fd buf_rdi $after
472 proc read_diff_files {fd after} {
475 append buf_rdf [read $fd]
477 set n [string length $buf_rdf]
479 set z1 [string first "\0" $buf_rdf $c]
482 set z2 [string first "\0" $buf_rdf $z1]
486 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
487 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
489 [encoding convertfrom $p] \
492 [list [lindex $i 0] [lindex $i 2]]
497 set buf_rdf [string range $buf_rdf $c end]
502 rescan_done $fd buf_rdf $after
505 proc read_ls_others {fd after} {
508 append buf_rlo [read $fd]
509 set pck [split $buf_rlo "\0"]
510 set buf_rlo [lindex $pck end]
511 foreach p [lrange $pck 0 end-1] {
512 merge_state [encoding convertfrom $p] ?O
514 rescan_done $fd buf_rlo $after
517 proc rescan_done {fd buf after} {
519 global file_states repo_config
522 if {![eof $fd]} return
525 if {[incr rescan_active -1] > 0} return
534 proc prune_selection {} {
535 global file_states selected_paths
537 foreach path [array names selected_paths] {
538 if {[catch {set still_here $file_states($path)}]} {
539 unset selected_paths($path)
544 ######################################################################
549 global ui_diff current_diff_path current_diff_header
550 global ui_index ui_workdir
552 $ui_diff conf -state normal
553 $ui_diff delete 0.0 end
554 $ui_diff conf -state disabled
556 set current_diff_path {}
557 set current_diff_header {}
559 $ui_index tag remove in_diff 0.0 end
560 $ui_workdir tag remove in_diff 0.0 end
563 proc reshow_diff {} {
564 global ui_status_value file_states file_lists
565 global current_diff_path current_diff_side
567 set p $current_diff_path
569 || $current_diff_side eq {}
570 || [catch {set s $file_states($p)}]
571 || [lsearch -sorted -exact $file_lists($current_diff_side) $p] == -1} {
574 show_diff $p $current_diff_side
578 proc handle_empty_diff {} {
579 global current_diff_path file_states file_lists
581 set path $current_diff_path
582 set s $file_states($path)
583 if {[lindex $s 0] ne {_M}} return
585 info_popup "No differences detected.
587 [short_path $path] has no changes.
589 The modification date of this file was updated
590 by another application, but the content within
591 the file was not changed.
593 A rescan will be automatically started to find
594 other files which may have the same state."
597 display_file $path __
598 rescan {set ui_status_value {Ready.}} 0
601 proc show_diff {path w {lno {}}} {
602 global file_states file_lists
603 global is_3way_diff diff_active repo_config
604 global ui_diff ui_status_value ui_index ui_workdir
605 global current_diff_path current_diff_side current_diff_header
607 if {$diff_active || ![lock_index read]} return
611 set lno [lsearch -sorted -exact $file_lists($w) $path]
617 $w tag add in_diff $lno.0 [expr {$lno + 1}].0
620 set s $file_states($path)
624 set current_diff_path $path
625 set current_diff_side $w
626 set current_diff_header {}
627 set ui_status_value "Loading diff of [escape_path $path]..."
629 # - Git won't give us the diff, there's nothing to compare to!
632 set max_sz [expr {128 * 1024}]
634 set fd [open $path r]
635 set content [read $fd $max_sz]
637 set sz [file size $path]
641 set ui_status_value "Unable to display [escape_path $path]"
642 error_popup "Error loading file:\n\n$err"
645 $ui_diff conf -state normal
646 if {![catch {set type [exec file $path]}]} {
647 set n [string length $path]
648 if {[string equal -length $n $path $type]} {
649 set type [string range $type $n end]
650 regsub {^:?\s*} $type {} type
652 $ui_diff insert end "* $type\n" d_@
654 if {[string first "\0" $content] != -1} {
655 $ui_diff insert end \
656 "* Binary file (not showing content)." \
660 $ui_diff insert end \
661 "* Untracked file is $sz bytes.
662 * Showing only first $max_sz bytes.
665 $ui_diff insert end $content
667 $ui_diff insert end "
668 * Untracked file clipped here by [appname].
669 * To see the entire file, use an external editor.
673 $ui_diff conf -state disabled
676 set ui_status_value {Ready.}
681 if {$w eq $ui_index} {
682 lappend cmd diff-index
684 } elseif {$w eq $ui_workdir} {
685 if {[string index $m 0] eq {U}} {
688 lappend cmd diff-files
693 lappend cmd --no-color
694 if {$repo_config(gui.diffcontext) > 0} {
695 lappend cmd "-U$repo_config(gui.diffcontext)"
697 if {$w eq $ui_index} {
703 if {[catch {set fd [open $cmd r]} err]} {
706 set ui_status_value "Unable to display [escape_path $path]"
707 error_popup "Error loading diff:\n\n$err"
715 fileevent $fd readable [list read_diff $fd]
718 proc read_diff {fd} {
719 global ui_diff ui_status_value diff_active
720 global is_3way_diff current_diff_header
722 $ui_diff conf -state normal
723 while {[gets $fd line] >= 0} {
724 # -- Cleanup uninteresting diff header lines.
726 if { [string match {diff --git *} $line]
727 || [string match {diff --cc *} $line]
728 || [string match {diff --combined *} $line]
729 || [string match {--- *} $line]
730 || [string match {+++ *} $line]} {
731 append current_diff_header $line "\n"
734 if {[string match {index *} $line]} continue
735 if {$line eq {deleted file mode 120000}} {
736 set line "deleted symlink"
739 # -- Automatically detect if this is a 3 way diff.
741 if {[string match {@@@ *} $line]} {set is_3way_diff 1}
743 if {[string match {mode *} $line]
744 || [string match {new file *} $line]
745 || [string match {deleted file *} $line]
746 || [string match {Binary files * and * differ} $line]
747 || $line eq {\ No newline at end of file}
748 || [regexp {^\* Unmerged path } $line]} {
750 } elseif {$is_3way_diff} {
751 set op [string range $line 0 1]
761 if {[regexp {^\+\+([<>]{7} |={7})} $line _g op]} {
762 set line [string replace $line 0 1 { }]
769 puts "error: Unhandled 3 way diff marker: {$op}"
774 set op [string index $line 0]
780 if {[regexp {^\+([<>]{7} |={7})} $line _g op]} {
781 set line [string replace $line 0 0 { }]
788 puts "error: Unhandled 2 way diff marker: {$op}"
793 $ui_diff insert end $line $tags
794 if {[string index $line end] eq "\r"} {
795 $ui_diff tag add d_cr {end - 2c}
797 $ui_diff insert end "\n" $tags
799 $ui_diff conf -state disabled
805 set ui_status_value {Ready.}
807 if {[$ui_diff index end] eq {2.0}} {
813 proc apply_hunk {x y} {
814 global current_diff_path current_diff_header current_diff_side
815 global ui_diff ui_index file_states
817 if {$current_diff_path eq {} || $current_diff_header eq {}} return
818 if {![lock_index apply_hunk]} return
820 set apply_cmd {git apply --cached --whitespace=nowarn}
821 set mi [lindex $file_states($current_diff_path) 0]
822 if {$current_diff_side eq $ui_index} {
824 lappend apply_cmd --reverse
825 if {[string index $mi 0] ne {M}} {
831 if {[string index $mi 1] ne {M}} {
837 set s_lno [lindex [split [$ui_diff index @$x,$y] .] 0]
838 set s_lno [$ui_diff search -backwards -regexp ^@@ $s_lno.0 0.0]
844 set e_lno [$ui_diff search -forwards -regexp ^@@ "$s_lno + 1 lines" end]
850 set p [open "| $apply_cmd" w]
851 fconfigure $p -translation binary -encoding binary
852 puts -nonewline $p $current_diff_header
853 puts -nonewline $p [$ui_diff get $s_lno $e_lno]
855 error_popup "Failed to $mode selected hunk.\n\n$err"
860 $ui_diff conf -state normal
861 $ui_diff delete $s_lno $e_lno
862 $ui_diff conf -state disabled
864 if {[$ui_diff get 1.0 end] eq "\n"} {
870 if {$current_diff_side eq $ui_index} {
872 } elseif {[string index $mi 0] eq {_}} {
878 display_file $current_diff_path $mi
884 ######################################################################
888 proc load_last_commit {} {
889 global HEAD PARENT MERGE_HEAD commit_type ui_comm
892 if {[llength $PARENT] == 0} {
893 error_popup {There is nothing to amend.
895 You are about to create the initial commit.
896 There is no commit before this to amend.
901 repository_state curType curHEAD curMERGE_HEAD
902 if {$curType eq {merge}} {
903 error_popup {Cannot amend while merging.
905 You are currently in the middle of a merge that
906 has not been fully completed. You cannot amend
907 the prior commit unless you first abort the
908 current merge activity.
916 set fd [open "| git cat-file commit $curHEAD" r]
917 fconfigure $fd -encoding binary -translation lf
918 if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
921 while {[gets $fd line] > 0} {
922 if {[string match {parent *} $line]} {
923 lappend parents [string range $line 7 end]
924 } elseif {[string match {encoding *} $line]} {
925 set enc [string tolower [string range $line 9 end]]
928 fconfigure $fd -encoding $enc
929 set msg [string trim [read $fd]]
932 error_popup "Error loading commit data for amend:\n\n$err"
938 set MERGE_HEAD [list]
939 switch -- [llength $parents] {
940 0 {set commit_type amend-initial}
941 1 {set commit_type amend}
942 default {set commit_type amend-merge}
945 $ui_comm delete 0.0 end
946 $ui_comm insert end $msg
948 $ui_comm edit modified false
949 rescan {set ui_status_value {Ready.}}
952 proc create_new_commit {} {
953 global commit_type ui_comm
955 set commit_type normal
956 $ui_comm delete 0.0 end
958 $ui_comm edit modified false
959 rescan {set ui_status_value {Ready.}}
962 set GIT_COMMITTER_IDENT {}
964 proc committer_ident {} {
965 global GIT_COMMITTER_IDENT
967 if {$GIT_COMMITTER_IDENT eq {}} {
968 if {[catch {set me [exec git var GIT_COMMITTER_IDENT]} err]} {
969 error_popup "Unable to obtain your identity:\n\n$err"
972 if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \
973 $me me GIT_COMMITTER_IDENT]} {
974 error_popup "Invalid GIT_COMMITTER_IDENT:\n\n$me"
979 return $GIT_COMMITTER_IDENT
982 proc commit_tree {} {
983 global HEAD commit_type file_states ui_comm repo_config
984 global ui_status_value pch_error
986 if {[committer_ident] eq {}} return
987 if {![lock_index update]} return
989 # -- Our in memory state should match the repository.
991 repository_state curType curHEAD curMERGE_HEAD
992 if {[string match amend* $commit_type]
993 && $curType eq {normal}
994 && $curHEAD eq $HEAD} {
995 } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
996 info_popup {Last scanned state does not match repository state.
998 Another Git program has modified this repository
999 since the last scan. A rescan must be performed
1000 before another commit can be created.
1002 The rescan will be automatically started now.
1005 rescan {set ui_status_value {Ready.}}
1009 # -- At least one file should differ in the index.
1012 foreach path [array names file_states] {
1013 switch -glob -- [lindex $file_states($path) 0] {
1017 M? {set files_ready 1}
1019 error_popup "Unmerged files cannot be committed.
1021 File [short_path $path] has merge conflicts.
1022 You must resolve them and add the file before committing.
1028 error_popup "Unknown file state [lindex $s 0] detected.
1030 File [short_path $path] cannot be committed by this program.
1035 if {!$files_ready} {
1036 info_popup {No changes to commit.
1038 You must add at least 1 file before you can commit.
1044 # -- A message is required.
1046 set msg [string trim [$ui_comm get 1.0 end]]
1047 regsub -all -line {[ \t\r]+$} $msg {} msg
1049 error_popup {Please supply a commit message.
1051 A good commit message has the following format:
1053 - First line: Describe in one sentance what you did.
1054 - Second line: Blank
1055 - Remaining lines: Describe why this change is good.
1061 # -- Run the pre-commit hook.
1063 set pchook [gitdir hooks pre-commit]
1065 # On Cygwin [file executable] might lie so we need to ask
1066 # the shell if the hook is executable. Yes that's annoying.
1068 if {[is_Windows] && [file isfile $pchook]} {
1069 set pchook [list sh -c [concat \
1070 "if test -x \"$pchook\";" \
1071 "then exec \"$pchook\" 2>&1;" \
1073 } elseif {[file executable $pchook]} {
1074 set pchook [list $pchook |& cat]
1076 commit_writetree $curHEAD $msg
1080 set ui_status_value {Calling pre-commit hook...}
1082 set fd_ph [open "| $pchook" r]
1083 fconfigure $fd_ph -blocking 0 -translation binary
1084 fileevent $fd_ph readable \
1085 [list commit_prehook_wait $fd_ph $curHEAD $msg]
1088 proc commit_prehook_wait {fd_ph curHEAD msg} {
1089 global pch_error ui_status_value
1091 append pch_error [read $fd_ph]
1092 fconfigure $fd_ph -blocking 1
1094 if {[catch {close $fd_ph}]} {
1095 set ui_status_value {Commit declined by pre-commit hook.}
1096 hook_failed_popup pre-commit $pch_error
1099 commit_writetree $curHEAD $msg
1104 fconfigure $fd_ph -blocking 0
1107 proc commit_writetree {curHEAD msg} {
1108 global ui_status_value
1110 set ui_status_value {Committing changes...}
1111 set fd_wt [open "| git write-tree" r]
1112 fileevent $fd_wt readable \
1113 [list commit_committree $fd_wt $curHEAD $msg]
1116 proc commit_committree {fd_wt curHEAD msg} {
1117 global HEAD PARENT MERGE_HEAD commit_type
1118 global single_commit all_heads current_branch
1119 global ui_status_value ui_comm selected_commit_type
1120 global file_states selected_paths rescan_active
1124 if {$tree_id eq {} || [catch {close $fd_wt} err]} {
1125 error_popup "write-tree failed:\n\n$err"
1126 set ui_status_value {Commit failed.}
1131 # -- Build the message.
1133 set msg_p [gitdir COMMIT_EDITMSG]
1134 set msg_wt [open $msg_p w]
1135 if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
1138 fconfigure $msg_wt -encoding $enc -translation binary
1139 puts -nonewline $msg_wt $msg
1142 # -- Create the commit.
1144 set cmd [list git commit-tree $tree_id]
1145 set parents [concat $PARENT $MERGE_HEAD]
1146 if {[llength $parents] > 0} {
1147 foreach p $parents {
1151 # git commit-tree writes to stderr during initial commit.
1152 lappend cmd 2>/dev/null
1155 if {[catch {set cmt_id [eval exec $cmd]} err]} {
1156 error_popup "commit-tree failed:\n\n$err"
1157 set ui_status_value {Commit failed.}
1162 # -- Update the HEAD ref.
1165 if {$commit_type ne {normal}} {
1166 append reflogm " ($commit_type)"
1168 set i [string first "\n" $msg]
1170 append reflogm {: } [string range $msg 0 [expr {$i - 1}]]
1172 append reflogm {: } $msg
1174 set cmd [list git update-ref -m $reflogm HEAD $cmt_id $curHEAD]
1175 if {[catch {eval exec $cmd} err]} {
1176 error_popup "update-ref failed:\n\n$err"
1177 set ui_status_value {Commit failed.}
1182 # -- Make sure our current branch exists.
1184 if {$commit_type eq {initial}} {
1185 lappend all_heads $current_branch
1186 set all_heads [lsort -unique $all_heads]
1187 populate_branch_menu
1190 # -- Cleanup after ourselves.
1192 catch {file delete $msg_p}
1193 catch {file delete [gitdir MERGE_HEAD]}
1194 catch {file delete [gitdir MERGE_MSG]}
1195 catch {file delete [gitdir SQUASH_MSG]}
1196 catch {file delete [gitdir GITGUI_MSG]}
1198 # -- Let rerere do its thing.
1200 if {[file isdirectory [gitdir rr-cache]]} {
1201 catch {exec git rerere}
1204 # -- Run the post-commit hook.
1206 set pchook [gitdir hooks post-commit]
1207 if {[is_Windows] && [file isfile $pchook]} {
1208 set pchook [list sh -c [concat \
1209 "if test -x \"$pchook\";" \
1210 "then exec \"$pchook\";" \
1212 } elseif {![file executable $pchook]} {
1215 if {$pchook ne {}} {
1216 catch {exec $pchook &}
1219 $ui_comm delete 0.0 end
1221 $ui_comm edit modified false
1223 if {$single_commit} do_quit
1225 # -- Update in memory status
1227 set selected_commit_type new
1228 set commit_type normal
1231 set MERGE_HEAD [list]
1233 foreach path [array names file_states] {
1234 set s $file_states($path)
1236 switch -glob -- $m {
1244 unset file_states($path)
1245 catch {unset selected_paths($path)}
1248 set file_states($path) [list _O [lindex $s 1] {} {}]
1254 set file_states($path) [list \
1255 _[string index $m 1] \
1266 set ui_status_value \
1267 "Changes committed as [string range $cmt_id 0 7]."
1270 ######################################################################
1274 proc fetch_from {remote} {
1275 set w [new_console \
1277 "Fetching new changes from $remote"]
1278 set cmd [list git fetch]
1280 console_exec $w $cmd console_done
1283 proc push_to {remote} {
1284 set w [new_console \
1286 "Pushing changes to $remote"]
1287 set cmd [list git push]
1290 console_exec $w $cmd console_done
1293 ######################################################################
1297 proc mapicon {w state path} {
1300 if {[catch {set r $all_icons($state$w)}]} {
1301 puts "error: no icon for $w state={$state} $path"
1307 proc mapdesc {state path} {
1310 if {[catch {set r $all_descs($state)}]} {
1311 puts "error: no desc for state={$state} $path"
1317 proc escape_path {path} {
1318 regsub -all "\n" $path "\\n" path
1322 proc short_path {path} {
1323 return [escape_path [lindex [file split $path] end]]
1327 set null_sha1 [string repeat 0 40]
1329 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1330 global file_states next_icon_id null_sha1
1332 set s0 [string index $new_state 0]
1333 set s1 [string index $new_state 1]
1335 if {[catch {set info $file_states($path)}]} {
1337 set icon n[incr next_icon_id]
1339 set state [lindex $info 0]
1340 set icon [lindex $info 1]
1341 if {$head_info eq {}} {set head_info [lindex $info 2]}
1342 if {$index_info eq {}} {set index_info [lindex $info 3]}
1345 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1346 elseif {$s0 eq {_}} {set s0 _}
1348 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1349 elseif {$s1 eq {_}} {set s1 _}
1351 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1352 set head_info [list 0 $null_sha1]
1353 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1354 && $head_info eq {}} {
1355 set head_info $index_info
1358 set file_states($path) [list $s0$s1 $icon \
1359 $head_info $index_info \
1364 proc display_file_helper {w path icon_name old_m new_m} {
1367 if {$new_m eq {_}} {
1368 set lno [lsearch -sorted -exact $file_lists($w) $path]
1370 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1372 $w conf -state normal
1373 $w delete $lno.0 [expr {$lno + 1}].0
1374 $w conf -state disabled
1376 } elseif {$old_m eq {_} && $new_m ne {_}} {
1377 lappend file_lists($w) $path
1378 set file_lists($w) [lsort -unique $file_lists($w)]
1379 set lno [lsearch -sorted -exact $file_lists($w) $path]
1381 $w conf -state normal
1382 $w image create $lno.0 \
1383 -align center -padx 5 -pady 1 \
1385 -image [mapicon $w $new_m $path]
1386 $w insert $lno.1 "[escape_path $path]\n"
1387 $w conf -state disabled
1388 } elseif {$old_m ne $new_m} {
1389 $w conf -state normal
1390 $w image conf $icon_name -image [mapicon $w $new_m $path]
1391 $w conf -state disabled
1395 proc display_file {path state} {
1396 global file_states selected_paths
1397 global ui_index ui_workdir
1399 set old_m [merge_state $path $state]
1400 set s $file_states($path)
1401 set new_m [lindex $s 0]
1402 set icon_name [lindex $s 1]
1404 set o [string index $old_m 0]
1405 set n [string index $new_m 0]
1412 display_file_helper $ui_index $path $icon_name $o $n
1414 if {[string index $old_m 0] eq {U}} {
1417 set o [string index $old_m 1]
1419 if {[string index $new_m 0] eq {U}} {
1422 set n [string index $new_m 1]
1424 display_file_helper $ui_workdir $path $icon_name $o $n
1426 if {$new_m eq {__}} {
1427 unset file_states($path)
1428 catch {unset selected_paths($path)}
1432 proc display_all_files_helper {w path icon_name m} {
1435 lappend file_lists($w) $path
1436 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1437 $w image create end \
1438 -align center -padx 5 -pady 1 \
1440 -image [mapicon $w $m $path]
1441 $w insert end "[escape_path $path]\n"
1444 proc display_all_files {} {
1445 global ui_index ui_workdir
1446 global file_states file_lists
1449 $ui_index conf -state normal
1450 $ui_workdir conf -state normal
1452 $ui_index delete 0.0 end
1453 $ui_workdir delete 0.0 end
1456 set file_lists($ui_index) [list]
1457 set file_lists($ui_workdir) [list]
1459 foreach path [lsort [array names file_states]] {
1460 set s $file_states($path)
1462 set icon_name [lindex $s 1]
1464 set s [string index $m 0]
1465 if {$s ne {U} && $s ne {_}} {
1466 display_all_files_helper $ui_index $path \
1470 if {[string index $m 0] eq {U}} {
1473 set s [string index $m 1]
1476 display_all_files_helper $ui_workdir $path \
1481 $ui_index conf -state disabled
1482 $ui_workdir conf -state disabled
1485 proc update_indexinfo {msg pathList after} {
1486 global update_index_cp ui_status_value
1488 if {![lock_index update]} return
1490 set update_index_cp 0
1491 set pathList [lsort $pathList]
1492 set totalCnt [llength $pathList]
1493 set batch [expr {int($totalCnt * .01) + 1}]
1494 if {$batch > 25} {set batch 25}
1496 set ui_status_value [format \
1497 "$msg... %i/%i files (%.2f%%)" \
1501 set fd [open "| git update-index -z --index-info" w]
1508 fileevent $fd writable [list \
1509 write_update_indexinfo \
1519 proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
1520 global update_index_cp ui_status_value
1521 global file_states current_diff_path
1523 if {$update_index_cp >= $totalCnt} {
1530 for {set i $batch} \
1531 {$update_index_cp < $totalCnt && $i > 0} \
1533 set path [lindex $pathList $update_index_cp]
1534 incr update_index_cp
1536 set s $file_states($path)
1537 switch -glob -- [lindex $s 0] {
1544 set info [lindex $s 2]
1545 if {$info eq {}} continue
1547 puts -nonewline $fd "$info\t[encoding convertto $path]\0"
1548 display_file $path $new
1551 set ui_status_value [format \
1552 "$msg... %i/%i files (%.2f%%)" \
1555 [expr {100.0 * $update_index_cp / $totalCnt}]]
1558 proc update_index {msg pathList after} {
1559 global update_index_cp ui_status_value
1561 if {![lock_index update]} return
1563 set update_index_cp 0
1564 set pathList [lsort $pathList]
1565 set totalCnt [llength $pathList]
1566 set batch [expr {int($totalCnt * .01) + 1}]
1567 if {$batch > 25} {set batch 25}
1569 set ui_status_value [format \
1570 "$msg... %i/%i files (%.2f%%)" \
1574 set fd [open "| git update-index --add --remove -z --stdin" w]
1581 fileevent $fd writable [list \
1582 write_update_index \
1592 proc write_update_index {fd pathList totalCnt batch msg after} {
1593 global update_index_cp ui_status_value
1594 global file_states current_diff_path
1596 if {$update_index_cp >= $totalCnt} {
1603 for {set i $batch} \
1604 {$update_index_cp < $totalCnt && $i > 0} \
1606 set path [lindex $pathList $update_index_cp]
1607 incr update_index_cp
1609 switch -glob -- [lindex $file_states($path) 0] {
1615 if {[file exists $path]} {
1624 puts -nonewline $fd "[encoding convertto $path]\0"
1625 display_file $path $new
1628 set ui_status_value [format \
1629 "$msg... %i/%i files (%.2f%%)" \
1632 [expr {100.0 * $update_index_cp / $totalCnt}]]
1635 proc checkout_index {msg pathList after} {
1636 global update_index_cp ui_status_value
1638 if {![lock_index update]} return
1640 set update_index_cp 0
1641 set pathList [lsort $pathList]
1642 set totalCnt [llength $pathList]
1643 set batch [expr {int($totalCnt * .01) + 1}]
1644 if {$batch > 25} {set batch 25}
1646 set ui_status_value [format \
1647 "$msg... %i/%i files (%.2f%%)" \
1651 set cmd [list git checkout-index]
1657 set fd [open "| $cmd " w]
1664 fileevent $fd writable [list \
1665 write_checkout_index \
1675 proc write_checkout_index {fd pathList totalCnt batch msg after} {
1676 global update_index_cp ui_status_value
1677 global file_states current_diff_path
1679 if {$update_index_cp >= $totalCnt} {
1686 for {set i $batch} \
1687 {$update_index_cp < $totalCnt && $i > 0} \
1689 set path [lindex $pathList $update_index_cp]
1690 incr update_index_cp
1691 switch -glob -- [lindex $file_states($path) 0] {
1695 puts -nonewline $fd "[encoding convertto $path]\0"
1696 display_file $path ?_
1701 set ui_status_value [format \
1702 "$msg... %i/%i files (%.2f%%)" \
1705 [expr {100.0 * $update_index_cp / $totalCnt}]]
1708 ######################################################################
1710 ## branch management
1712 proc is_tracking_branch {name} {
1713 global tracking_branches
1715 if {![catch {set info $tracking_branches($name)}]} {
1718 foreach t [array names tracking_branches] {
1719 if {[string match {*/\*} $t] && [string match $t $name]} {
1726 proc load_all_heads {} {
1729 set all_heads [list]
1730 set fd [open "| git for-each-ref --format=%(refname) refs/heads" r]
1731 while {[gets $fd line] > 0} {
1732 if {[is_tracking_branch $line]} continue
1733 if {![regsub ^refs/heads/ $line {} name]} continue
1734 lappend all_heads $name
1738 set all_heads [lsort $all_heads]
1741 proc populate_branch_menu {} {
1742 global all_heads disable_on_lock
1745 set last [$m index last]
1746 for {set i 0} {$i <= $last} {incr i} {
1747 if {[$m type $i] eq {separator}} {
1750 foreach a $disable_on_lock {
1751 if {[lindex $a 0] ne $m || [lindex $a 2] < $i} {
1755 set disable_on_lock $new_dol
1760 if {$all_heads ne {}} {
1763 foreach b $all_heads {
1764 $m add radiobutton \
1766 -command [list switch_branch $b] \
1767 -variable current_branch \
1770 lappend disable_on_lock \
1771 [list $m entryconf [$m index last] -state]
1775 proc all_tracking_branches {} {
1776 global tracking_branches
1778 set all_trackings {}
1780 foreach name [array names tracking_branches] {
1781 if {[regsub {/\*$} $name {} name]} {
1784 regsub ^refs/(heads|remotes)/ $name {} name
1785 lappend all_trackings $name
1790 set fd [open "| git for-each-ref --format=%(refname) $cmd" r]
1791 while {[gets $fd name] > 0} {
1792 regsub ^refs/(heads|remotes)/ $name {} name
1793 lappend all_trackings $name
1798 return [lsort -unique $all_trackings]
1801 proc do_create_branch_action {w} {
1802 global all_heads null_sha1 repo_config
1803 global create_branch_checkout create_branch_revtype
1804 global create_branch_head create_branch_trackinghead
1805 global create_branch_name create_branch_revexp
1807 set newbranch $create_branch_name
1808 if {$newbranch eq {}
1809 || $newbranch eq $repo_config(gui.newbranchtemplate)} {
1813 -title [wm title $w] \
1815 -message "Please supply a branch name."
1816 focus $w.desc.name_t
1819 if {![catch {exec git show-ref --verify -- "refs/heads/$newbranch"}]} {
1823 -title [wm title $w] \
1825 -message "Branch '$newbranch' already exists."
1826 focus $w.desc.name_t
1829 if {[catch {exec git check-ref-format "heads/$newbranch"}]} {
1833 -title [wm title $w] \
1835 -message "We do not like '$newbranch' as a branch name."
1836 focus $w.desc.name_t
1841 switch -- $create_branch_revtype {
1842 head {set rev $create_branch_head}
1843 tracking {set rev $create_branch_trackinghead}
1844 expression {set rev $create_branch_revexp}
1846 if {[catch {set cmt [exec git rev-parse --verify "${rev}^0"]}]} {
1850 -title [wm title $w] \
1852 -message "Invalid starting revision: $rev"
1855 set cmd [list git update-ref]
1857 lappend cmd "branch: Created from $rev"
1858 lappend cmd "refs/heads/$newbranch"
1860 lappend cmd $null_sha1
1861 if {[catch {eval exec $cmd} err]} {
1865 -title [wm title $w] \
1867 -message "Failed to create '$newbranch'.\n\n$err"
1871 lappend all_heads $newbranch
1872 set all_heads [lsort $all_heads]
1873 populate_branch_menu
1875 if {$create_branch_checkout} {
1876 switch_branch $newbranch
1880 proc radio_selector {varname value args} {
1881 upvar #0 $varname var
1885 trace add variable create_branch_head write \
1886 [list radio_selector create_branch_revtype head]
1887 trace add variable create_branch_trackinghead write \
1888 [list radio_selector create_branch_revtype tracking]
1890 trace add variable delete_branch_head write \
1891 [list radio_selector delete_branch_checktype head]
1892 trace add variable delete_branch_trackinghead write \
1893 [list radio_selector delete_branch_checktype tracking]
1895 proc do_create_branch {} {
1896 global all_heads current_branch repo_config
1897 global create_branch_checkout create_branch_revtype
1898 global create_branch_head create_branch_trackinghead
1899 global create_branch_name create_branch_revexp
1901 set w .branch_editor
1903 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
1905 label $w.header -text {Create New Branch} \
1907 pack $w.header -side top -fill x
1910 button $w.buttons.create -text Create \
1913 -command [list do_create_branch_action $w]
1914 pack $w.buttons.create -side right
1915 button $w.buttons.cancel -text {Cancel} \
1917 -command [list destroy $w]
1918 pack $w.buttons.cancel -side right -padx 5
1919 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
1921 labelframe $w.desc \
1922 -text {Branch Description} \
1924 label $w.desc.name_l -text {Name:} -font font_ui
1925 entry $w.desc.name_t \
1929 -textvariable create_branch_name \
1933 if {%d == 1 && [regexp {[~^:?*\[\0- ]} %S]} {return 0}
1936 grid $w.desc.name_l $w.desc.name_t -sticky we -padx {0 5}
1937 grid columnconfigure $w.desc 1 -weight 1
1938 pack $w.desc -anchor nw -fill x -pady 5 -padx 5
1940 labelframe $w.from \
1941 -text {Starting Revision} \
1943 radiobutton $w.from.head_r \
1944 -text {Local Branch:} \
1946 -variable create_branch_revtype \
1948 eval tk_optionMenu $w.from.head_m create_branch_head $all_heads
1949 grid $w.from.head_r $w.from.head_m -sticky w
1950 set all_trackings [all_tracking_branches]
1951 if {$all_trackings ne {}} {
1952 set create_branch_trackinghead [lindex $all_trackings 0]
1953 radiobutton $w.from.tracking_r \
1954 -text {Tracking Branch:} \
1956 -variable create_branch_revtype \
1958 eval tk_optionMenu $w.from.tracking_m \
1959 create_branch_trackinghead \
1961 grid $w.from.tracking_r $w.from.tracking_m -sticky w
1963 radiobutton $w.from.exp_r \
1964 -text {Revision Expression:} \
1966 -variable create_branch_revtype \
1968 entry $w.from.exp_t \
1972 -textvariable create_branch_revexp \
1976 if {%d == 1 && [regexp {\s} %S]} {return 0}
1977 if {%d == 1 && [string length %S] > 0} {
1978 set create_branch_revtype expression
1982 grid $w.from.exp_r $w.from.exp_t -sticky we -padx {0 5}
1983 grid columnconfigure $w.from 1 -weight 1
1984 pack $w.from -anchor nw -fill x -pady 5 -padx 5
1986 labelframe $w.postActions \
1987 -text {Post Creation Actions} \
1989 checkbutton $w.postActions.checkout \
1990 -text {Checkout after creation} \
1991 -variable create_branch_checkout \
1993 pack $w.postActions.checkout -anchor nw
1994 pack $w.postActions -anchor nw -fill x -pady 5 -padx 5
1996 set create_branch_checkout 1
1997 set create_branch_head $current_branch
1998 set create_branch_revtype head
1999 set create_branch_name $repo_config(gui.newbranchtemplate)
2000 set create_branch_revexp {}
2002 bind $w <Visibility> "
2004 $w.desc.name_t icursor end
2005 focus $w.desc.name_t
2007 bind $w <Key-Escape> "destroy $w"
2008 bind $w <Key-Return> "do_create_branch_action $w;break"
2009 wm title $w "[appname] ([reponame]): Create Branch"
2013 proc do_delete_branch_action {w} {
2015 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
2018 switch -- $delete_branch_checktype {
2019 head {set check_rev $delete_branch_head}
2020 tracking {set check_rev $delete_branch_trackinghead}
2021 always {set check_rev {:none}}
2023 if {$check_rev eq {:none}} {
2025 } elseif {[catch {set check_cmt [exec git rev-parse --verify "${check_rev}^0"]}]} {
2029 -title [wm title $w] \
2031 -message "Invalid check revision: $check_rev"
2035 set to_delete [list]
2036 set not_merged [list]
2037 foreach i [$w.list.l curselection] {
2038 set b [$w.list.l get $i]
2039 if {[catch {set o [exec git rev-parse --verify $b]}]} continue
2040 if {$check_cmt ne {}} {
2041 if {$b eq $check_rev} continue
2042 if {[catch {set m [exec git merge-base $o $check_cmt]}]} continue
2044 lappend not_merged $b
2048 lappend to_delete [list $b $o]
2050 if {$not_merged ne {}} {
2051 set msg "The following branches are not completely merged into $check_rev:
2053 - [join $not_merged "\n - "]"
2057 -title [wm title $w] \
2061 if {$to_delete eq {}} return
2062 if {$delete_branch_checktype eq {always}} {
2063 set msg {Recovering deleted branches is difficult.
2065 Delete the selected branches?}
2066 if {[tk_messageBox \
2069 -title [wm title $w] \
2071 -message $msg] ne yes} {
2077 foreach i $to_delete {
2080 if {[catch {exec git update-ref -d "refs/heads/$b" $o} err]} {
2081 append failed " - $b: $err\n"
2083 set x [lsearch -sorted -exact $all_heads $b]
2085 set all_heads [lreplace $all_heads $x $x]
2090 if {$failed ne {}} {
2094 -title [wm title $w] \
2096 -message "Failed to delete branches:\n$failed"
2099 set all_heads [lsort $all_heads]
2100 populate_branch_menu
2104 proc do_delete_branch {} {
2105 global all_heads tracking_branches current_branch
2106 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
2108 set w .branch_editor
2110 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2112 label $w.header -text {Delete Local Branch} \
2114 pack $w.header -side top -fill x
2117 button $w.buttons.create -text Delete \
2119 -command [list do_delete_branch_action $w]
2120 pack $w.buttons.create -side right
2121 button $w.buttons.cancel -text {Cancel} \
2123 -command [list destroy $w]
2124 pack $w.buttons.cancel -side right -padx 5
2125 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2127 labelframe $w.list \
2128 -text {Local Branches} \
2133 -selectmode extended \
2135 foreach h $all_heads {
2136 if {$h ne $current_branch} {
2137 $w.list.l insert end $h
2140 pack $w.list.l -fill both -pady 5 -padx 5
2141 pack $w.list -fill both -pady 5 -padx 5
2143 labelframe $w.validate \
2144 -text {Delete Only If} \
2146 radiobutton $w.validate.head_r \
2147 -text {Merged Into Local Branch:} \
2149 -variable delete_branch_checktype \
2151 eval tk_optionMenu $w.validate.head_m delete_branch_head $all_heads
2152 grid $w.validate.head_r $w.validate.head_m -sticky w
2153 set all_trackings [all_tracking_branches]
2154 if {$all_trackings ne {}} {
2155 set delete_branch_trackinghead [lindex $all_trackings 0]
2156 radiobutton $w.validate.tracking_r \
2157 -text {Merged Into Tracking Branch:} \
2159 -variable delete_branch_checktype \
2161 eval tk_optionMenu $w.validate.tracking_m \
2162 delete_branch_trackinghead \
2164 grid $w.validate.tracking_r $w.validate.tracking_m -sticky w
2166 radiobutton $w.validate.always_r \
2167 -text {Always (Do not perform merge checks)} \
2169 -variable delete_branch_checktype \
2171 grid $w.validate.always_r -columnspan 2 -sticky w
2172 grid columnconfigure $w.validate 1 -weight 1
2173 pack $w.validate -anchor nw -fill x -pady 5 -padx 5
2175 set delete_branch_head $current_branch
2176 set delete_branch_checktype head
2178 bind $w <Visibility> "grab $w; focus $w"
2179 bind $w <Key-Escape> "destroy $w"
2180 wm title $w "[appname] ([reponame]): Delete Branch"
2184 proc switch_branch {new_branch} {
2185 global HEAD commit_type current_branch repo_config
2187 if {![lock_index switch]} return
2189 # -- Our in memory state should match the repository.
2191 repository_state curType curHEAD curMERGE_HEAD
2192 if {[string match amend* $commit_type]
2193 && $curType eq {normal}
2194 && $curHEAD eq $HEAD} {
2195 } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
2196 info_popup {Last scanned state does not match repository state.
2198 Another Git program has modified this repository
2199 since the last scan. A rescan must be performed
2200 before the current branch can be changed.
2202 The rescan will be automatically started now.
2205 rescan {set ui_status_value {Ready.}}
2209 # -- Don't do a pointless switch.
2211 if {$current_branch eq $new_branch} {
2216 if {$repo_config(gui.trustmtime) eq {true}} {
2217 switch_branch_stage2 {} $new_branch
2219 set ui_status_value {Refreshing file status...}
2220 set cmd [list git update-index]
2222 lappend cmd --unmerged
2223 lappend cmd --ignore-missing
2224 lappend cmd --refresh
2225 set fd_rf [open "| $cmd" r]
2226 fconfigure $fd_rf -blocking 0 -translation binary
2227 fileevent $fd_rf readable \
2228 [list switch_branch_stage2 $fd_rf $new_branch]
2232 proc switch_branch_stage2 {fd_rf new_branch} {
2233 global ui_status_value HEAD
2237 if {![eof $fd_rf]} return
2241 set ui_status_value "Updating working directory to '$new_branch'..."
2242 set cmd [list git read-tree]
2245 lappend cmd --exclude-per-directory=.gitignore
2247 lappend cmd $new_branch
2248 set fd_rt [open "| $cmd" r]
2249 fconfigure $fd_rt -blocking 0 -translation binary
2250 fileevent $fd_rt readable \
2251 [list switch_branch_readtree_wait $fd_rt $new_branch]
2254 proc switch_branch_readtree_wait {fd_rt new_branch} {
2255 global selected_commit_type commit_type HEAD MERGE_HEAD PARENT
2256 global current_branch
2257 global ui_comm ui_status_value
2259 # -- We never get interesting output on stdout; only stderr.
2262 fconfigure $fd_rt -blocking 1
2263 if {![eof $fd_rt]} {
2264 fconfigure $fd_rt -blocking 0
2268 # -- The working directory wasn't in sync with the index and
2269 # we'd have to overwrite something to make the switch. A
2270 # merge is required.
2272 if {[catch {close $fd_rt} err]} {
2273 regsub {^fatal: } $err {} err
2274 warn_popup "File level merge required.
2278 Staying on branch '$current_branch'."
2279 set ui_status_value "Aborted checkout of '$new_branch' (file level merging is required)."
2284 # -- Update the symbolic ref. Core git doesn't even check for failure
2285 # here, it Just Works(tm). If it doesn't we are in some really ugly
2286 # state that is difficult to recover from within git-gui.
2288 if {[catch {exec git symbolic-ref HEAD "refs/heads/$new_branch"} err]} {
2289 error_popup "Failed to set current branch.
2291 This working directory is only partially switched.
2292 We successfully updated your files, but failed to
2293 update an internal Git file.
2295 This should not have occurred. [appname] will now
2303 # -- Update our repository state. If we were previously in amend mode
2304 # we need to toss the current buffer and do a full rescan to update
2305 # our file lists. If we weren't in amend mode our file lists are
2306 # accurate and we can avoid the rescan.
2309 set selected_commit_type new
2310 if {[string match amend* $commit_type]} {
2311 $ui_comm delete 0.0 end
2313 $ui_comm edit modified false
2314 rescan {set ui_status_value "Checked out branch '$current_branch'."}
2316 repository_state commit_type HEAD MERGE_HEAD
2318 set ui_status_value "Checked out branch '$current_branch'."
2322 ######################################################################
2324 ## remote management
2326 proc load_all_remotes {} {
2328 global all_remotes tracking_branches
2330 set all_remotes [list]
2331 array unset tracking_branches
2333 set rm_dir [gitdir remotes]
2334 if {[file isdirectory $rm_dir]} {
2335 set all_remotes [glob \
2339 -directory $rm_dir *]
2341 foreach name $all_remotes {
2343 set fd [open [file join $rm_dir $name] r]
2344 while {[gets $fd line] >= 0} {
2345 if {![regexp {^Pull:[ ]*([^:]+):(.+)$} \
2346 $line line src dst]} continue
2347 if {![regexp ^refs/ $dst]} {
2348 set dst "refs/heads/$dst"
2350 set tracking_branches($dst) [list $name $src]
2357 foreach line [array names repo_config remote.*.url] {
2358 if {![regexp ^remote\.(.*)\.url\$ $line line name]} continue
2359 lappend all_remotes $name
2361 if {[catch {set fl $repo_config(remote.$name.fetch)}]} {
2365 if {![regexp {^([^:]+):(.+)$} $line line src dst]} continue
2366 if {![regexp ^refs/ $dst]} {
2367 set dst "refs/heads/$dst"
2369 set tracking_branches($dst) [list $name $src]
2373 set all_remotes [lsort -unique $all_remotes]
2376 proc populate_fetch_menu {} {
2377 global all_remotes repo_config
2380 foreach r $all_remotes {
2382 if {![catch {set a $repo_config(remote.$r.url)}]} {
2383 if {![catch {set a $repo_config(remote.$r.fetch)}]} {
2388 set fd [open [gitdir remotes $r] r]
2389 while {[gets $fd n] >= 0} {
2390 if {[regexp {^Pull:[ \t]*([^:]+):} $n]} {
2401 -label "Fetch from $r..." \
2402 -command [list fetch_from $r] \
2408 proc populate_push_menu {} {
2409 global all_remotes repo_config
2413 foreach r $all_remotes {
2415 if {![catch {set a $repo_config(remote.$r.url)}]} {
2416 if {![catch {set a $repo_config(remote.$r.push)}]} {
2421 set fd [open [gitdir remotes $r] r]
2422 while {[gets $fd n] >= 0} {
2423 if {[regexp {^Push:[ \t]*([^:]+):} $n]} {
2437 -label "Push to $r..." \
2438 -command [list push_to $r] \
2445 proc start_push_anywhere_action {w} {
2446 global push_urltype push_remote push_url push_thin push_tags
2449 switch -- $push_urltype {
2450 remote {set r_url $push_remote}
2451 url {set r_url $push_url}
2453 if {$r_url eq {}} return
2455 set cmd [list git push]
2465 foreach i [$w.source.l curselection] {
2466 set b [$w.source.l get $i]
2467 lappend cmd "refs/heads/$b:refs/heads/$b"
2472 } elseif {$cnt == 1} {
2478 set cons [new_console "push $r_url" "Pushing $cnt $unit to $r_url"]
2479 console_exec $cons $cmd console_done
2483 trace add variable push_remote write \
2484 [list radio_selector push_urltype remote]
2486 proc do_push_anywhere {} {
2487 global all_heads all_remotes current_branch
2488 global push_urltype push_remote push_url push_thin push_tags
2492 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2494 label $w.header -text {Push Branches} -font font_uibold
2495 pack $w.header -side top -fill x
2498 button $w.buttons.create -text Push \
2500 -command [list start_push_anywhere_action $w]
2501 pack $w.buttons.create -side right
2502 button $w.buttons.cancel -text {Cancel} \
2504 -command [list destroy $w]
2505 pack $w.buttons.cancel -side right -padx 5
2506 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2508 labelframe $w.source \
2509 -text {Source Branches} \
2511 listbox $w.source.l \
2514 -selectmode extended \
2516 foreach h $all_heads {
2517 $w.source.l insert end $h
2518 if {$h eq $current_branch} {
2519 $w.source.l select set end
2522 pack $w.source.l -fill both -pady 5 -padx 5
2523 pack $w.source -fill both -pady 5 -padx 5
2525 labelframe $w.dest \
2526 -text {Destination Repository} \
2528 if {$all_remotes ne {}} {
2529 radiobutton $w.dest.remote_r \
2532 -variable push_urltype \
2534 eval tk_optionMenu $w.dest.remote_m push_remote $all_remotes
2535 grid $w.dest.remote_r $w.dest.remote_m -sticky w
2536 if {[lsearch -sorted -exact $all_remotes origin] != -1} {
2537 set push_remote origin
2539 set push_remote [lindex $all_remotes 0]
2541 set push_urltype remote
2543 set push_urltype url
2545 radiobutton $w.dest.url_r \
2546 -text {Arbitrary URL:} \
2548 -variable push_urltype \
2550 entry $w.dest.url_t \
2554 -textvariable push_url \
2558 if {%d == 1 && [regexp {\s} %S]} {return 0}
2559 if {%d == 1 && [string length %S] > 0} {
2560 set push_urltype url
2564 grid $w.dest.url_r $w.dest.url_t -sticky we -padx {0 5}
2565 grid columnconfigure $w.dest 1 -weight 1
2566 pack $w.dest -anchor nw -fill x -pady 5 -padx 5
2568 labelframe $w.options \
2569 -text {Transfer Options} \
2571 checkbutton $w.options.thin \
2572 -text {Use thin pack (for slow network connections)} \
2573 -variable push_thin \
2575 grid $w.options.thin -columnspan 2 -sticky w
2576 checkbutton $w.options.tags \
2577 -text {Include tags} \
2578 -variable push_tags \
2580 grid $w.options.tags -columnspan 2 -sticky w
2581 grid columnconfigure $w.options 1 -weight 1
2582 pack $w.options -anchor nw -fill x -pady 5 -padx 5
2588 bind $w <Visibility> "grab $w"
2589 bind $w <Key-Escape> "destroy $w"
2590 wm title $w "[appname] ([reponame]): Push"
2594 ######################################################################
2599 global HEAD commit_type file_states
2601 if {[string match amend* $commit_type]} {
2602 info_popup {Cannot merge while amending.
2604 You must finish amending this commit before
2605 starting any type of merge.
2610 if {[committer_ident] eq {}} {return 0}
2611 if {![lock_index merge]} {return 0}
2613 # -- Our in memory state should match the repository.
2615 repository_state curType curHEAD curMERGE_HEAD
2616 if {$commit_type ne $curType || $HEAD ne $curHEAD} {
2617 info_popup {Last scanned state does not match repository state.
2619 Another Git program has modified this repository
2620 since the last scan. A rescan must be performed
2621 before a merge can be performed.
2623 The rescan will be automatically started now.
2626 rescan {set ui_status_value {Ready.}}
2630 foreach path [array names file_states] {
2631 switch -glob -- [lindex $file_states($path) 0] {
2633 error_popup "You are in the middle of a conflicted merge.
2635 File [short_path $path] has merge conflicts.
2637 You must resolve them, add the file, and commit to
2638 complete the current merge. Only then can you
2639 begin another merge.
2650 proc visualize_local_merge {w} {
2652 foreach i [$w.source.l curselection] {
2653 lappend revs [$w.source.l get $i]
2655 if {$revs eq {}} return
2656 lappend revs --not HEAD
2660 proc start_local_merge_action {w} {
2661 global HEAD ui_status_value current_branch
2663 set cmd [list git merge]
2666 foreach i [$w.source.l curselection] {
2667 set b [$w.source.l get $i]
2675 } elseif {$revcnt == 1} {
2677 } elseif {$revcnt <= 15} {
2683 -title [wm title $w] \
2685 -message "Too many branches selected.
2687 You have requested to merge $revcnt branches
2688 in an octopus merge. This exceeds Git's
2689 internal limit of 15 branches per merge.
2691 Please select fewer branches. To merge more
2692 than 15 branches, merge the branches in batches.
2697 set msg "Merging $current_branch, [join $names {, }]"
2698 set ui_status_value "$msg..."
2699 set cons [new_console "Merge" $msg]
2700 console_exec $cons $cmd [list finish_merge $revcnt]
2701 bind $w <Destroy> {}
2705 proc finish_merge {revcnt w ok} {
2708 set msg {Merge completed successfully.}
2711 info_popup "Octopus merge failed.
2713 Your merge of $revcnt branches has failed.
2715 There are file-level conflicts between the
2716 branches which must be resolved manually.
2718 The working directory will now be reset.
2720 You can attempt this merge again
2721 by merging only one branch at a time." $w
2723 set fd [open "| git read-tree --reset -u HEAD" r]
2724 fconfigure $fd -blocking 0 -translation binary
2725 fileevent $fd readable [list reset_hard_wait $fd]
2726 set ui_status_value {Aborting... please wait...}
2730 set msg {Merge failed. Conflict resolution is required.}
2733 rescan [list set ui_status_value $msg]
2736 proc do_local_merge {} {
2737 global current_branch
2739 if {![can_merge]} return
2743 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2746 -text "Merge Into $current_branch" \
2748 pack $w.header -side top -fill x
2751 button $w.buttons.visualize -text Visualize \
2753 -command [list visualize_local_merge $w]
2754 pack $w.buttons.visualize -side left
2755 button $w.buttons.create -text Merge \
2757 -command [list start_local_merge_action $w]
2758 pack $w.buttons.create -side right
2759 button $w.buttons.cancel -text {Cancel} \
2761 -command [list destroy $w]
2762 pack $w.buttons.cancel -side right -padx 5
2763 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2765 labelframe $w.source \
2766 -text {Source Branches} \
2768 listbox $w.source.l \
2771 -selectmode extended \
2772 -yscrollcommand [list $w.source.sby set] \
2774 scrollbar $w.source.sby -command [list $w.source.l yview]
2775 pack $w.source.sby -side right -fill y
2776 pack $w.source.l -side left -fill both -expand 1
2777 pack $w.source -fill both -expand 1 -pady 5 -padx 5
2779 set cmd [list git for-each-ref]
2780 lappend cmd {--format=%(objectname) %(refname)}
2781 lappend cmd refs/heads
2782 lappend cmd refs/remotes
2783 set fr_fd [open "| $cmd" r]
2784 fconfigure $fr_fd -translation binary
2785 while {[gets $fr_fd line] > 0} {
2786 set line [split $line { }]
2787 set sha1([lindex $line 0]) [lindex $line 1]
2792 set fr_fd [open "| git rev-list --all --not HEAD"]
2793 while {[gets $fr_fd line] > 0} {
2794 if {[catch {set ref $sha1($line)}]} continue
2795 regsub ^refs/(heads|remotes)/ $ref {} ref
2796 lappend to_show $ref
2800 foreach ref [lsort -unique $to_show] {
2801 $w.source.l insert end $ref
2804 bind $w <Visibility> "grab $w"
2805 bind $w <Key-Escape> "unlock_index;destroy $w"
2806 bind $w <Destroy> unlock_index
2807 wm title $w "[appname] ([reponame]): Merge"
2811 proc do_reset_hard {} {
2812 global HEAD commit_type file_states
2814 if {[string match amend* $commit_type]} {
2815 info_popup {Cannot abort while amending.
2817 You must finish amending this commit.
2822 if {![lock_index abort]} return
2824 if {[string match *merge* $commit_type]} {
2830 if {[ask_popup "Abort $op?
2832 Aborting the current $op will cause
2833 *ALL* uncommitted changes to be lost.
2835 Continue with aborting the current $op?"] eq {yes}} {
2836 set fd [open "| git read-tree --reset -u HEAD" r]
2837 fconfigure $fd -blocking 0 -translation binary
2838 fileevent $fd readable [list reset_hard_wait $fd]
2839 set ui_status_value {Aborting... please wait...}
2845 proc reset_hard_wait {fd} {
2853 $ui_comm delete 0.0 end
2854 $ui_comm edit modified false
2856 catch {file delete [gitdir MERGE_HEAD]}
2857 catch {file delete [gitdir rr-cache MERGE_RR]}
2858 catch {file delete [gitdir SQUASH_MSG]}
2859 catch {file delete [gitdir MERGE_MSG]}
2860 catch {file delete [gitdir GITGUI_MSG]}
2862 rescan {set ui_status_value {Abort completed. Ready.}}
2866 ######################################################################
2871 #define mask_width 14
2872 #define mask_height 15
2873 static unsigned char mask_bits[] = {
2874 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2875 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2876 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2879 image create bitmap file_plain -background white -foreground black -data {
2880 #define plain_width 14
2881 #define plain_height 15
2882 static unsigned char plain_bits[] = {
2883 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2884 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2885 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2886 } -maskdata $filemask
2888 image create bitmap file_mod -background white -foreground blue -data {
2889 #define mod_width 14
2890 #define mod_height 15
2891 static unsigned char mod_bits[] = {
2892 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2893 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2894 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2895 } -maskdata $filemask
2897 image create bitmap file_fulltick -background white -foreground "#007000" -data {
2898 #define file_fulltick_width 14
2899 #define file_fulltick_height 15
2900 static unsigned char file_fulltick_bits[] = {
2901 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2902 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2903 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2904 } -maskdata $filemask
2906 image create bitmap file_parttick -background white -foreground "#005050" -data {
2907 #define parttick_width 14
2908 #define parttick_height 15
2909 static unsigned char parttick_bits[] = {
2910 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2911 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
2912 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2913 } -maskdata $filemask
2915 image create bitmap file_question -background white -foreground black -data {
2916 #define file_question_width 14
2917 #define file_question_height 15
2918 static unsigned char file_question_bits[] = {
2919 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2920 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2921 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2922 } -maskdata $filemask
2924 image create bitmap file_removed -background white -foreground red -data {
2925 #define file_removed_width 14
2926 #define file_removed_height 15
2927 static unsigned char file_removed_bits[] = {
2928 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2929 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2930 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2931 } -maskdata $filemask
2933 image create bitmap file_merge -background white -foreground blue -data {
2934 #define file_merge_width 14
2935 #define file_merge_height 15
2936 static unsigned char file_merge_bits[] = {
2937 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2938 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2939 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2940 } -maskdata $filemask
2942 set ui_index .vpane.files.index.list
2943 set ui_workdir .vpane.files.workdir.list
2945 set all_icons(_$ui_index) file_plain
2946 set all_icons(A$ui_index) file_fulltick
2947 set all_icons(M$ui_index) file_fulltick
2948 set all_icons(D$ui_index) file_removed
2949 set all_icons(U$ui_index) file_merge
2951 set all_icons(_$ui_workdir) file_plain
2952 set all_icons(M$ui_workdir) file_mod
2953 set all_icons(D$ui_workdir) file_question
2954 set all_icons(U$ui_workdir) file_merge
2955 set all_icons(O$ui_workdir) file_plain
2957 set max_status_desc 0
2961 {_M "Modified, not staged"}
2962 {M_ "Staged for commit"}
2963 {MM "Portions staged for commit"}
2964 {MD "Staged for commit, missing"}
2966 {_O "Untracked, not staged"}
2967 {A_ "Staged for commit"}
2968 {AM "Portions staged for commit"}
2969 {AD "Staged for commit, missing"}
2972 {D_ "Staged for removal"}
2973 {DO "Staged for removal, still present"}
2975 {U_ "Requires merge resolution"}
2976 {UU "Requires merge resolution"}
2977 {UM "Requires merge resolution"}
2978 {UD "Requires merge resolution"}
2980 if {$max_status_desc < [string length [lindex $i 1]]} {
2981 set max_status_desc [string length [lindex $i 1]]
2983 set all_descs([lindex $i 0]) [lindex $i 1]
2987 ######################################################################
2992 global tcl_platform tk_library
2993 if {[tk windowingsystem] eq {aqua}} {
2999 proc is_Windows {} {
3001 if {$tcl_platform(platform) eq {windows}} {
3007 proc bind_button3 {w cmd} {
3008 bind $w <Any-Button-3> $cmd
3010 bind $w <Control-Button-1> $cmd
3014 proc incr_font_size {font {amt 1}} {
3015 set sz [font configure $font -size]
3017 font configure $font -size $sz
3018 font configure ${font}bold -size $sz
3021 proc hook_failed_popup {hook msg} {
3026 label $w.m.l1 -text "$hook hook failed:" \
3031 -background white -borderwidth 1 \
3033 -width 80 -height 10 \
3035 -yscrollcommand [list $w.m.sby set]
3037 -text {You must correct the above errors before committing.} \
3041 scrollbar $w.m.sby -command [list $w.m.t yview]
3042 pack $w.m.l1 -side top -fill x
3043 pack $w.m.l2 -side bottom -fill x
3044 pack $w.m.sby -side right -fill y
3045 pack $w.m.t -side left -fill both -expand 1
3046 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
3048 $w.m.t insert 1.0 $msg
3049 $w.m.t conf -state disabled
3051 button $w.ok -text OK \
3054 -command "destroy $w"
3055 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
3057 bind $w <Visibility> "grab $w; focus $w"
3058 bind $w <Key-Return> "destroy $w"
3059 wm title $w "[appname] ([reponame]): error"
3063 set next_console_id 0
3065 proc new_console {short_title long_title} {
3066 global next_console_id console_data
3067 set w .console[incr next_console_id]
3068 set console_data($w) [list $short_title $long_title]
3069 return [console_init $w]
3072 proc console_init {w} {
3073 global console_cr console_data M1B
3075 set console_cr($w) 1.0
3078 label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
3083 -background white -borderwidth 1 \
3085 -width 80 -height 10 \
3088 -yscrollcommand [list $w.m.sby set]
3089 label $w.m.s -text {Working... please wait...} \
3093 scrollbar $w.m.sby -command [list $w.m.t yview]
3094 pack $w.m.l1 -side top -fill x
3095 pack $w.m.s -side bottom -fill x
3096 pack $w.m.sby -side right -fill y
3097 pack $w.m.t -side left -fill both -expand 1
3098 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
3100 menu $w.ctxm -tearoff 0
3101 $w.ctxm add command -label "Copy" \
3103 -command "tk_textCopy $w.m.t"
3104 $w.ctxm add command -label "Select All" \
3106 -command "focus $w.m.t;$w.m.t tag add sel 0.0 end"
3107 $w.ctxm add command -label "Copy All" \
3110 $w.m.t tag add sel 0.0 end
3112 $w.m.t tag remove sel 0.0 end
3115 button $w.ok -text {Close} \
3118 -command "destroy $w"
3119 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
3121 bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
3122 bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
3123 bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
3124 bind $w <Visibility> "focus $w"
3125 wm title $w "[appname] ([reponame]): [lindex $console_data($w) 0]"
3129 proc console_exec {w cmd after} {
3130 # -- Windows tosses the enviroment when we exec our child.
3131 # But most users need that so we have to relogin. :-(
3134 set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
3137 # -- Tcl won't let us redirect both stdout and stderr to
3138 # the same pipe. So pass it through cat...
3140 set cmd [concat | $cmd |& cat]
3142 set fd_f [open $cmd r]
3143 fconfigure $fd_f -blocking 0 -translation binary
3144 fileevent $fd_f readable [list console_read $w $fd_f $after]
3147 proc console_read {w fd after} {
3152 if {![winfo exists $w]} {console_init $w}
3153 $w.m.t conf -state normal
3155 set n [string length $buf]
3157 set cr [string first "\r" $buf $c]
3158 set lf [string first "\n" $buf $c]
3159 if {$cr < 0} {set cr [expr {$n + 1}]}
3160 if {$lf < 0} {set lf [expr {$n + 1}]}
3163 $w.m.t insert end [string range $buf $c $lf]
3164 set console_cr($w) [$w.m.t index {end -1c}]
3168 $w.m.t delete $console_cr($w) end
3169 $w.m.t insert end "\n"
3170 $w.m.t insert end [string range $buf $c $cr]
3175 $w.m.t conf -state disabled
3179 fconfigure $fd -blocking 1
3181 if {[catch {close $fd}]} {
3186 uplevel #0 $after $w $ok
3189 fconfigure $fd -blocking 0
3192 proc console_chain {cmdlist w {ok 1}} {
3194 if {[llength $cmdlist] == 0} {
3199 set cmd [lindex $cmdlist 0]
3200 set cmdlist [lrange $cmdlist 1 end]
3202 if {[lindex $cmd 0] eq {console_exec}} {
3205 [list console_chain $cmdlist]
3207 uplevel #0 $cmd $cmdlist $w $ok
3214 proc console_done {args} {
3215 global console_cr console_data
3217 switch -- [llength $args] {
3219 set w [lindex $args 0]
3220 set ok [lindex $args 1]
3223 set w [lindex $args 1]
3224 set ok [lindex $args 2]
3227 error "wrong number of args: console_done ?ignored? w ok"
3232 if {[winfo exists $w]} {
3233 $w.m.s conf -background green -text {Success}
3234 $w.ok conf -state normal
3237 if {![winfo exists $w]} {
3240 $w.m.s conf -background red -text {Error: Command Failed}
3241 $w.ok conf -state normal
3244 array unset console_cr $w
3245 array unset console_data $w
3248 ######################################################################
3252 set starting_gitk_msg {Starting gitk... please wait...}
3254 proc do_gitk {revs} {
3255 global ui_status_value starting_gitk_msg
3263 set cmd "sh -c \"exec $cmd\""
3267 if {[catch {eval exec $cmd} err]} {
3268 error_popup "Failed to start gitk:\n\n$err"
3270 set ui_status_value $starting_gitk_msg
3272 if {$ui_status_value eq $starting_gitk_msg} {
3273 set ui_status_value {Ready.}
3280 set fd [open "| git count-objects -v" r]
3281 while {[gets $fd line] > 0} {
3282 if {[regexp {^([^:]+): (\d+)$} $line _ name value]} {
3283 set stats($name) $value
3289 foreach p [glob -directory [gitdir objects pack] \
3292 incr packed_sz [file size $p]
3294 if {$packed_sz > 0} {
3295 set stats(size-pack) [expr {$packed_sz / 1024}]
3300 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
3302 label $w.header -text {Database Statistics} \
3304 pack $w.header -side top -fill x
3306 frame $w.buttons -border 1
3307 button $w.buttons.close -text Close \
3309 -command [list destroy $w]
3310 button $w.buttons.gc -text {Compress Database} \
3312 -command "destroy $w;do_gc"
3313 pack $w.buttons.close -side right
3314 pack $w.buttons.gc -side left
3315 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
3317 frame $w.stat -borderwidth 1 -relief solid
3319 {count {Number of loose objects}}
3320 {size {Disk space used by loose objects} { KiB}}
3321 {in-pack {Number of packed objects}}
3322 {packs {Number of packs}}
3323 {size-pack {Disk space used by packed objects} { KiB}}
3324 {prune-packable {Packed objects waiting for pruning}}
3325 {garbage {Garbage files}}
3327 set name [lindex $s 0]
3328 set label [lindex $s 1]
3329 if {[catch {set value $stats($name)}]} continue
3330 if {[llength $s] > 2} {
3331 set value "$value[lindex $s 2]"
3334 label $w.stat.l_$name -text "$label:" -anchor w -font font_ui
3335 label $w.stat.v_$name -text $value -anchor w -font font_ui
3336 grid $w.stat.l_$name $w.stat.v_$name -sticky we -padx {0 5}
3338 pack $w.stat -pady 10 -padx 10
3340 bind $w <Visibility> "grab $w; focus $w"
3341 bind $w <Key-Escape> [list destroy $w]
3342 bind $w <Key-Return> [list destroy $w]
3343 wm title $w "[appname] ([reponame]): Database Statistics"
3348 set w [new_console {gc} {Compressing the object database}]
3350 {console_exec {git pack-refs --prune}}
3351 {console_exec {git reflog expire --all}}
3352 {console_exec {git repack -a -d -l}}
3353 {console_exec {git rerere gc}}
3357 proc do_fsck_objects {} {
3358 set w [new_console {fsck-objects} \
3359 {Verifying the object database with fsck-objects}]
3360 set cmd [list git fsck-objects]
3363 lappend cmd --strict
3364 console_exec $w $cmd console_done
3370 global ui_comm is_quitting repo_config commit_type
3372 if {$is_quitting} return
3375 # -- Stash our current commit buffer.
3377 set save [gitdir GITGUI_MSG]
3378 set msg [string trim [$ui_comm get 0.0 end]]
3379 regsub -all -line {[ \r\t]+$} $msg {} msg
3380 if {(![string match amend* $commit_type]
3381 || [$ui_comm edit modified])
3384 set fd [open $save w]
3385 puts -nonewline $fd $msg
3389 catch {file delete $save}
3392 # -- Stash our current window geometry into this repository.
3394 set cfg_geometry [list]
3395 lappend cfg_geometry [wm geometry .]
3396 lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
3397 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
3398 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
3401 if {$cfg_geometry ne $rc_geometry} {
3402 catch {exec git repo-config gui.geometry $cfg_geometry}
3409 rescan {set ui_status_value {Ready.}}
3412 proc unstage_helper {txt paths} {
3413 global file_states current_diff_path
3415 if {![lock_index begin-update]} return
3419 foreach path $paths {
3420 switch -glob -- [lindex $file_states($path) 0] {
3424 lappend pathList $path
3425 if {$path eq $current_diff_path} {
3426 set after {reshow_diff;}
3431 if {$pathList eq {}} {
3437 [concat $after {set ui_status_value {Ready.}}]
3441 proc do_unstage_selection {} {
3442 global current_diff_path selected_paths
3444 if {[array size selected_paths] > 0} {
3446 {Unstaging selected files from commit} \
3447 [array names selected_paths]
3448 } elseif {$current_diff_path ne {}} {
3450 "Unstaging [short_path $current_diff_path] from commit" \
3451 [list $current_diff_path]
3455 proc add_helper {txt paths} {
3456 global file_states current_diff_path
3458 if {![lock_index begin-update]} return
3462 foreach path $paths {
3463 switch -glob -- [lindex $file_states($path) 0] {
3468 lappend pathList $path
3469 if {$path eq $current_diff_path} {
3470 set after {reshow_diff;}
3475 if {$pathList eq {}} {
3481 [concat $after {set ui_status_value {Ready to commit.}}]
3485 proc do_add_selection {} {
3486 global current_diff_path selected_paths
3488 if {[array size selected_paths] > 0} {
3490 {Adding selected files} \
3491 [array names selected_paths]
3492 } elseif {$current_diff_path ne {}} {
3494 "Adding [short_path $current_diff_path]" \
3495 [list $current_diff_path]
3499 proc do_add_all {} {
3503 foreach path [array names file_states] {
3504 switch -glob -- [lindex $file_states($path) 0] {
3507 ?D {lappend paths $path}
3510 add_helper {Adding all changed files} $paths
3513 proc revert_helper {txt paths} {
3514 global file_states current_diff_path
3516 if {![lock_index begin-update]} return
3520 foreach path $paths {
3521 switch -glob -- [lindex $file_states($path) 0] {
3525 lappend pathList $path
3526 if {$path eq $current_diff_path} {
3527 set after {reshow_diff;}
3533 set n [llength $pathList]
3537 } elseif {$n == 1} {
3538 set s "[short_path [lindex $pathList]]"
3540 set s "these $n files"
3543 set reply [tk_dialog \
3545 "[appname] ([reponame])" \
3546 "Revert changes in $s?
3548 Any unadded changes will be permanently lost by the revert." \
3558 [concat $after {set ui_status_value {Ready.}}]
3564 proc do_revert_selection {} {
3565 global current_diff_path selected_paths
3567 if {[array size selected_paths] > 0} {
3569 {Reverting selected files} \
3570 [array names selected_paths]
3571 } elseif {$current_diff_path ne {}} {
3573 "Reverting [short_path $current_diff_path]" \
3574 [list $current_diff_path]
3578 proc do_signoff {} {
3581 set me [committer_ident]
3582 if {$me eq {}} return
3584 set sob "Signed-off-by: $me"
3585 set last [$ui_comm get {end -1c linestart} {end -1c}]
3586 if {$last ne $sob} {
3587 $ui_comm edit separator
3589 && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
3590 $ui_comm insert end "\n"
3592 $ui_comm insert end "\n$sob"
3593 $ui_comm edit separator
3598 proc do_select_commit_type {} {
3599 global commit_type selected_commit_type
3601 if {$selected_commit_type eq {new}
3602 && [string match amend* $commit_type]} {
3604 } elseif {$selected_commit_type eq {amend}
3605 && ![string match amend* $commit_type]} {
3608 # The amend request was rejected...
3610 if {![string match amend* $commit_type]} {
3611 set selected_commit_type new
3621 global appvers copyright
3622 global tcl_patchLevel tk_patchLevel
3626 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
3628 label $w.header -text "About [appname]" \
3630 pack $w.header -side top -fill x
3633 button $w.buttons.close -text {Close} \
3635 -command [list destroy $w]
3636 pack $w.buttons.close -side right
3637 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
3640 -text "[appname] - a commit creation tool for Git.
3648 pack $w.desc -side top -fill x -padx 5 -pady 5
3651 append v "[appname] version $appvers\n"
3652 append v "[exec git version]\n"
3654 if {$tcl_patchLevel eq $tk_patchLevel} {
3655 append v "Tcl/Tk version $tcl_patchLevel"
3657 append v "Tcl version $tcl_patchLevel"
3658 append v ", Tk version $tk_patchLevel"
3669 pack $w.vers -side top -fill x -padx 5 -pady 5
3671 menu $w.ctxm -tearoff 0
3672 $w.ctxm add command \
3677 clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
3680 bind $w <Visibility> "grab $w; focus $w"
3681 bind $w <Key-Escape> "destroy $w"
3682 bind_button3 $w.vers "tk_popup $w.ctxm %X %Y; grab $w; focus $w"
3683 wm title $w "About [appname]"
3687 proc do_options {} {
3688 global repo_config global_config font_descs
3689 global repo_config_new global_config_new
3691 array unset repo_config_new
3692 array unset global_config_new
3693 foreach name [array names repo_config] {
3694 set repo_config_new($name) $repo_config($name)
3697 foreach name [array names repo_config] {
3699 gui.diffcontext {continue}
3701 set repo_config_new($name) $repo_config($name)
3703 foreach name [array names global_config] {
3704 set global_config_new($name) $global_config($name)
3707 set w .options_editor
3709 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
3711 label $w.header -text "[appname] Options" \
3713 pack $w.header -side top -fill x
3716 button $w.buttons.restore -text {Restore Defaults} \
3718 -command do_restore_defaults
3719 pack $w.buttons.restore -side left
3720 button $w.buttons.save -text Save \
3722 -command [list do_save_config $w]
3723 pack $w.buttons.save -side right
3724 button $w.buttons.cancel -text {Cancel} \
3726 -command [list destroy $w]
3727 pack $w.buttons.cancel -side right -padx 5
3728 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
3730 labelframe $w.repo -text "[reponame] Repository" \
3732 labelframe $w.global -text {Global (All Repositories)} \
3734 pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
3735 pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
3738 {b pullsummary {Show Pull Summary}}
3739 {b trustmtime {Trust File Modification Timestamps}}
3740 {i diffcontext {Number of Diff Context Lines}}
3741 {t newbranchtemplate {New Branch Name Template}}
3743 set type [lindex $option 0]
3744 set name [lindex $option 1]
3745 set text [lindex $option 2]
3746 foreach f {repo global} {
3749 checkbutton $w.$f.$name -text $text \
3750 -variable ${f}_config_new(gui.$name) \
3754 pack $w.$f.$name -side top -anchor w
3758 label $w.$f.$name.l -text "$text:" -font font_ui
3759 pack $w.$f.$name.l -side left -anchor w -fill x
3760 spinbox $w.$f.$name.v \
3761 -textvariable ${f}_config_new(gui.$name) \
3762 -from 1 -to 99 -increment 1 \
3765 bind $w.$f.$name.v <FocusIn> {%W selection range 0 end}
3766 pack $w.$f.$name.v -side right -anchor e -padx 5
3767 pack $w.$f.$name -side top -anchor w -fill x
3771 label $w.$f.$name.l -text "$text:" -font font_ui
3772 entry $w.$f.$name.v \
3776 -textvariable ${f}_config_new(gui.$name) \
3778 pack $w.$f.$name.l -side left -anchor w
3779 pack $w.$f.$name.v -side left -anchor w \
3782 pack $w.$f.$name -side top -anchor w -fill x
3788 set all_fonts [lsort [font families]]
3789 foreach option $font_descs {
3790 set name [lindex $option 0]
3791 set font [lindex $option 1]
3792 set text [lindex $option 2]
3794 set global_config_new(gui.$font^^family) \
3795 [font configure $font -family]
3796 set global_config_new(gui.$font^^size) \
3797 [font configure $font -size]
3799 frame $w.global.$name
3800 label $w.global.$name.l -text "$text:" -font font_ui
3801 pack $w.global.$name.l -side left -anchor w -fill x
3802 eval tk_optionMenu $w.global.$name.family \
3803 global_config_new(gui.$font^^family) \
3805 spinbox $w.global.$name.size \
3806 -textvariable global_config_new(gui.$font^^size) \
3807 -from 2 -to 80 -increment 1 \
3810 bind $w.global.$name.size <FocusIn> {%W selection range 0 end}
3811 pack $w.global.$name.size -side right -anchor e
3812 pack $w.global.$name.family -side right -anchor e
3813 pack $w.global.$name -side top -anchor w -fill x
3816 bind $w <Visibility> "grab $w; focus $w"
3817 bind $w <Key-Escape> "destroy $w"
3818 wm title $w "[appname] ([reponame]): Options"
3822 proc do_restore_defaults {} {
3823 global font_descs default_config repo_config
3824 global repo_config_new global_config_new
3826 foreach name [array names default_config] {
3827 set repo_config_new($name) $default_config($name)
3828 set global_config_new($name) $default_config($name)
3831 foreach option $font_descs {
3832 set name [lindex $option 0]
3833 set repo_config(gui.$name) $default_config(gui.$name)
3837 foreach option $font_descs {
3838 set name [lindex $option 0]
3839 set font [lindex $option 1]
3840 set global_config_new(gui.$font^^family) \
3841 [font configure $font -family]
3842 set global_config_new(gui.$font^^size) \
3843 [font configure $font -size]
3847 proc do_save_config {w} {
3848 if {[catch {save_config} err]} {
3849 error_popup "Failed to completely save options:\n\n$err"
3855 proc do_windows_shortcut {} {
3859 set desktop [exec cygpath \
3867 set fn [tk_getSaveFile \
3869 -title "[appname] ([reponame]): Create Desktop Icon" \
3870 -initialdir $desktop \
3871 -initialfile "Git [reponame].bat"]
3875 set sh [exec cygpath \
3879 set me [exec cygpath \
3883 set gd [exec cygpath \
3887 set gw [exec cygpath \
3890 [file dirname [gitdir]]]
3891 regsub -all ' $me "'\\''" me
3892 regsub -all ' $gd "'\\''" gd
3893 puts $fd "@ECHO Entering $gw"
3894 puts $fd "@ECHO Starting git-gui... please wait..."
3895 puts -nonewline $fd "@\"$sh\" --login -c \""
3896 puts -nonewline $fd "GIT_DIR='$gd'"
3897 puts -nonewline $fd " '$me'"
3901 error_popup "Cannot write script:\n\n$err"
3906 proc do_macosx_app {} {
3909 set fn [tk_getSaveFile \
3911 -title "[appname] ([reponame]): Create Desktop Icon" \
3912 -initialdir [file join $env(HOME) Desktop] \
3913 -initialfile "Git [reponame].app"]
3916 set Contents [file join $fn Contents]
3917 set MacOS [file join $Contents MacOS]
3918 set exe [file join $MacOS git-gui]
3922 set fd [open [file join $Contents Info.plist] w]
3923 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
3924 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3925 <plist version="1.0">
3927 <key>CFBundleDevelopmentRegion</key>
3928 <string>English</string>
3929 <key>CFBundleExecutable</key>
3930 <string>git-gui</string>
3931 <key>CFBundleIdentifier</key>
3932 <string>org.spearce.git-gui</string>
3933 <key>CFBundleInfoDictionaryVersion</key>
3934 <string>6.0</string>
3935 <key>CFBundlePackageType</key>
3936 <string>APPL</string>
3937 <key>CFBundleSignature</key>
3938 <string>????</string>
3939 <key>CFBundleVersion</key>
3940 <string>1.0</string>
3941 <key>NSPrincipalClass</key>
3942 <string>NSApplication</string>
3947 set fd [open $exe w]
3948 set gd [file normalize [gitdir]]
3949 set ep [file normalize [exec git --exec-path]]
3950 regsub -all ' $gd "'\\''" gd
3951 regsub -all ' $ep "'\\''" ep
3952 puts $fd "#!/bin/sh"
3953 foreach name [array names env] {
3954 if {[string match GIT_* $name]} {
3955 regsub -all ' $env($name) "'\\''" v
3956 puts $fd "export $name='$v'"
3959 puts $fd "export PATH='$ep':\$PATH"
3960 puts $fd "export GIT_DIR='$gd'"
3961 puts $fd "exec [file normalize $argv0]"
3964 file attributes $exe -permissions u+x,g+x,o+x
3966 error_popup "Cannot write icon:\n\n$err"
3971 proc toggle_or_diff {w x y} {
3972 global file_states file_lists current_diff_path ui_index ui_workdir
3973 global last_clicked selected_paths
3975 set pos [split [$w index @$x,$y] .]
3976 set lno [lindex $pos 0]
3977 set col [lindex $pos 1]
3978 set path [lindex $file_lists($w) [expr {$lno - 1}]]
3984 set last_clicked [list $w $lno]
3985 array unset selected_paths
3986 $ui_index tag remove in_sel 0.0 end
3987 $ui_workdir tag remove in_sel 0.0 end
3990 if {$current_diff_path eq $path} {
3991 set after {reshow_diff;}
3995 if {$w eq $ui_index} {
3997 "Unstaging [short_path $path] from commit" \
3999 [concat $after {set ui_status_value {Ready.}}]
4000 } elseif {$w eq $ui_workdir} {
4002 "Adding [short_path $path]" \
4004 [concat $after {set ui_status_value {Ready.}}]
4007 show_diff $path $w $lno
4011 proc add_one_to_selection {w x y} {
4012 global file_lists last_clicked selected_paths
4014 set lno [lindex [split [$w index @$x,$y] .] 0]
4015 set path [lindex $file_lists($w) [expr {$lno - 1}]]
4021 if {$last_clicked ne {}
4022 && [lindex $last_clicked 0] ne $w} {
4023 array unset selected_paths
4024 [lindex $last_clicked 0] tag remove in_sel 0.0 end
4027 set last_clicked [list $w $lno]
4028 if {[catch {set in_sel $selected_paths($path)}]} {
4032 unset selected_paths($path)
4033 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
4035 set selected_paths($path) 1
4036 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
4040 proc add_range_to_selection {w x y} {
4041 global file_lists last_clicked selected_paths
4043 if {[lindex $last_clicked 0] ne $w} {
4044 toggle_or_diff $w $x $y
4048 set lno [lindex [split [$w index @$x,$y] .] 0]
4049 set lc [lindex $last_clicked 1]
4058 foreach path [lrange $file_lists($w) \
4059 [expr {$begin - 1}] \
4060 [expr {$end - 1}]] {
4061 set selected_paths($path) 1
4063 $w tag add in_sel $begin.0 [expr {$end + 1}].0
4066 ######################################################################
4070 set cursor_ptr arrow
4071 font create font_diff -family Courier -size 10
4075 eval font configure font_ui [font actual [.dummy cget -font]]
4079 font create font_uibold
4080 font create font_diffbold
4085 } elseif {[is_MacOSX]} {
4093 proc apply_config {} {
4094 global repo_config font_descs
4096 foreach option $font_descs {
4097 set name [lindex $option 0]
4098 set font [lindex $option 1]
4100 foreach {cn cv} $repo_config(gui.$name) {
4101 font configure $font $cn $cv
4104 error_popup "Invalid font specified in gui.$name:\n\n$err"
4106 foreach {cn cv} [font configure $font] {
4107 font configure ${font}bold $cn $cv
4109 font configure ${font}bold -weight bold
4113 set default_config(gui.trustmtime) false
4114 set default_config(gui.pullsummary) true
4115 set default_config(gui.diffcontext) 5
4116 set default_config(gui.newbranchtemplate) {}
4117 set default_config(gui.fontui) [font configure font_ui]
4118 set default_config(gui.fontdiff) [font configure font_diff]
4120 {fontui font_ui {Main Font}}
4121 {fontdiff font_diff {Diff/Console Font}}
4126 ######################################################################
4132 menu .mbar -tearoff 0
4133 .mbar add cascade -label Repository -menu .mbar.repository
4134 .mbar add cascade -label Edit -menu .mbar.edit
4135 if {!$single_commit} {
4136 .mbar add cascade -label Branch -menu .mbar.branch
4138 .mbar add cascade -label Commit -menu .mbar.commit
4139 if {!$single_commit} {
4140 .mbar add cascade -label Merge -menu .mbar.merge
4141 .mbar add cascade -label Fetch -menu .mbar.fetch
4142 .mbar add cascade -label Push -menu .mbar.push
4144 . configure -menu .mbar
4146 # -- Repository Menu
4148 menu .mbar.repository
4149 .mbar.repository add command \
4150 -label {Visualize Current Branch} \
4151 -command {do_gitk {}} \
4153 .mbar.repository add command \
4154 -label {Visualize All Branches} \
4155 -command {do_gitk {--all}} \
4157 .mbar.repository add separator
4159 if {!$single_commit} {
4160 .mbar.repository add command -label {Database Statistics} \
4164 .mbar.repository add command -label {Compress Database} \
4168 .mbar.repository add command -label {Verify Database} \
4169 -command do_fsck_objects \
4172 .mbar.repository add separator
4175 .mbar.repository add command \
4176 -label {Create Desktop Icon} \
4177 -command do_windows_shortcut \
4179 } elseif {[is_MacOSX]} {
4180 .mbar.repository add command \
4181 -label {Create Desktop Icon} \
4182 -command do_macosx_app \
4187 .mbar.repository add command -label Quit \
4189 -accelerator $M1T-Q \
4195 .mbar.edit add command -label Undo \
4196 -command {catch {[focus] edit undo}} \
4197 -accelerator $M1T-Z \
4199 .mbar.edit add command -label Redo \
4200 -command {catch {[focus] edit redo}} \
4201 -accelerator $M1T-Y \
4203 .mbar.edit add separator
4204 .mbar.edit add command -label Cut \
4205 -command {catch {tk_textCut [focus]}} \
4206 -accelerator $M1T-X \
4208 .mbar.edit add command -label Copy \
4209 -command {catch {tk_textCopy [focus]}} \
4210 -accelerator $M1T-C \
4212 .mbar.edit add command -label Paste \
4213 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
4214 -accelerator $M1T-V \
4216 .mbar.edit add command -label Delete \
4217 -command {catch {[focus] delete sel.first sel.last}} \
4220 .mbar.edit add separator
4221 .mbar.edit add command -label {Select All} \
4222 -command {catch {[focus] tag add sel 0.0 end}} \
4223 -accelerator $M1T-A \
4228 if {!$single_commit} {
4231 .mbar.branch add command -label {Create...} \
4232 -command do_create_branch \
4233 -accelerator $M1T-N \
4235 lappend disable_on_lock [list .mbar.branch entryconf \
4236 [.mbar.branch index last] -state]
4238 .mbar.branch add command -label {Delete...} \
4239 -command do_delete_branch \
4241 lappend disable_on_lock [list .mbar.branch entryconf \
4242 [.mbar.branch index last] -state]
4249 .mbar.commit add radiobutton \
4250 -label {New Commit} \
4251 -command do_select_commit_type \
4252 -variable selected_commit_type \
4255 lappend disable_on_lock \
4256 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4258 .mbar.commit add radiobutton \
4259 -label {Amend Last Commit} \
4260 -command do_select_commit_type \
4261 -variable selected_commit_type \
4264 lappend disable_on_lock \
4265 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4267 .mbar.commit add separator
4269 .mbar.commit add command -label Rescan \
4270 -command do_rescan \
4273 lappend disable_on_lock \
4274 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4276 .mbar.commit add command -label {Add To Commit} \
4277 -command do_add_selection \
4279 lappend disable_on_lock \
4280 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4282 .mbar.commit add command -label {Add All To Commit} \
4283 -command do_add_all \
4284 -accelerator $M1T-I \
4286 lappend disable_on_lock \
4287 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4289 .mbar.commit add command -label {Unstage From Commit} \
4290 -command do_unstage_selection \
4292 lappend disable_on_lock \
4293 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4295 .mbar.commit add command -label {Revert Changes} \
4296 -command do_revert_selection \
4298 lappend disable_on_lock \
4299 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4301 .mbar.commit add separator
4303 .mbar.commit add command -label {Sign Off} \
4304 -command do_signoff \
4305 -accelerator $M1T-S \
4308 .mbar.commit add command -label Commit \
4309 -command do_commit \
4310 -accelerator $M1T-Return \
4312 lappend disable_on_lock \
4313 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4316 # -- Apple Menu (Mac OS X only)
4318 .mbar add cascade -label Apple -menu .mbar.apple
4321 .mbar.apple add command -label "About [appname]" \
4324 .mbar.apple add command -label "[appname] Options..." \
4325 -command do_options \
4330 .mbar.edit add separator
4331 .mbar.edit add command -label {Options...} \
4332 -command do_options \
4337 if {[file exists /usr/local/miga/lib/gui-miga]
4338 && [file exists .pvcsrc]} {
4340 global ui_status_value
4341 if {![lock_index update]} return
4342 set cmd [list sh --login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
4343 set miga_fd [open "|$cmd" r]
4344 fconfigure $miga_fd -blocking 0
4345 fileevent $miga_fd readable [list miga_done $miga_fd]
4346 set ui_status_value {Running miga...}
4348 proc miga_done {fd} {
4353 rescan [list set ui_status_value {Ready.}]
4356 .mbar add cascade -label Tools -menu .mbar.tools
4358 .mbar.tools add command -label "Migrate" \
4361 lappend disable_on_lock \
4362 [list .mbar.tools entryconf [.mbar.tools index last] -state]
4367 .mbar add cascade -label Help -menu .mbar.help
4370 .mbar.help add command -label "About [appname]" \
4382 -text {Current Branch:} \
4387 -textvariable current_branch \
4391 pack .branch.l1 -side left
4392 pack .branch.cb -side left -fill x
4393 pack .branch -side top -fill x
4395 if {!$single_commit} {
4397 .mbar.merge add command -label {Local Merge...} \
4398 -command do_local_merge \
4400 lappend disable_on_lock \
4401 [list .mbar.merge entryconf [.mbar.merge index last] -state]
4402 .mbar.merge add command -label {Abort Merge...} \
4403 -command do_reset_hard \
4405 lappend disable_on_lock \
4406 [list .mbar.merge entryconf [.mbar.merge index last] -state]
4412 .mbar.push add command -label {Push...} \
4413 -command do_push_anywhere \
4417 # -- Main Window Layout
4419 panedwindow .vpane -orient vertical
4420 panedwindow .vpane.files -orient horizontal
4421 .vpane add .vpane.files -sticky nsew -height 100 -width 200
4422 pack .vpane -anchor n -side top -fill both -expand 1
4424 # -- Index File List
4426 frame .vpane.files.index -height 100 -width 200
4427 label .vpane.files.index.title -text {Changes To Be Committed} \
4430 text $ui_index -background white -borderwidth 0 \
4431 -width 20 -height 10 \
4434 -cursor $cursor_ptr \
4435 -xscrollcommand {.vpane.files.index.sx set} \
4436 -yscrollcommand {.vpane.files.index.sy set} \
4438 scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
4439 scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
4440 pack .vpane.files.index.title -side top -fill x
4441 pack .vpane.files.index.sx -side bottom -fill x
4442 pack .vpane.files.index.sy -side right -fill y
4443 pack $ui_index -side left -fill both -expand 1
4444 .vpane.files add .vpane.files.index -sticky nsew
4446 # -- Working Directory File List
4448 frame .vpane.files.workdir -height 100 -width 200
4449 label .vpane.files.workdir.title -text {Changed But Not Updated} \
4452 text $ui_workdir -background white -borderwidth 0 \
4453 -width 20 -height 10 \
4456 -cursor $cursor_ptr \
4457 -xscrollcommand {.vpane.files.workdir.sx set} \
4458 -yscrollcommand {.vpane.files.workdir.sy set} \
4460 scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
4461 scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
4462 pack .vpane.files.workdir.title -side top -fill x
4463 pack .vpane.files.workdir.sx -side bottom -fill x
4464 pack .vpane.files.workdir.sy -side right -fill y
4465 pack $ui_workdir -side left -fill both -expand 1
4466 .vpane.files add .vpane.files.workdir -sticky nsew
4468 foreach i [list $ui_index $ui_workdir] {
4469 $i tag conf in_diff -font font_uibold
4470 $i tag conf in_sel \
4471 -background [$i cget -foreground] \
4472 -foreground [$i cget -background]
4476 # -- Diff and Commit Area
4478 frame .vpane.lower -height 300 -width 400
4479 frame .vpane.lower.commarea
4480 frame .vpane.lower.diff -relief sunken -borderwidth 1
4481 pack .vpane.lower.commarea -side top -fill x
4482 pack .vpane.lower.diff -side bottom -fill both -expand 1
4483 .vpane add .vpane.lower -sticky nsew
4485 # -- Commit Area Buttons
4487 frame .vpane.lower.commarea.buttons
4488 label .vpane.lower.commarea.buttons.l -text {} \
4492 pack .vpane.lower.commarea.buttons.l -side top -fill x
4493 pack .vpane.lower.commarea.buttons -side left -fill y
4495 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
4496 -command do_rescan \
4498 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
4499 lappend disable_on_lock \
4500 {.vpane.lower.commarea.buttons.rescan conf -state}
4502 button .vpane.lower.commarea.buttons.incall -text {Add All} \
4503 -command do_add_all \
4505 pack .vpane.lower.commarea.buttons.incall -side top -fill x
4506 lappend disable_on_lock \
4507 {.vpane.lower.commarea.buttons.incall conf -state}
4509 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
4510 -command do_signoff \
4512 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
4514 button .vpane.lower.commarea.buttons.commit -text {Commit} \
4515 -command do_commit \
4517 pack .vpane.lower.commarea.buttons.commit -side top -fill x
4518 lappend disable_on_lock \
4519 {.vpane.lower.commarea.buttons.commit conf -state}
4521 # -- Commit Message Buffer
4523 frame .vpane.lower.commarea.buffer
4524 frame .vpane.lower.commarea.buffer.header
4525 set ui_comm .vpane.lower.commarea.buffer.t
4526 set ui_coml .vpane.lower.commarea.buffer.header.l
4527 radiobutton .vpane.lower.commarea.buffer.header.new \
4528 -text {New Commit} \
4529 -command do_select_commit_type \
4530 -variable selected_commit_type \
4533 lappend disable_on_lock \
4534 [list .vpane.lower.commarea.buffer.header.new conf -state]
4535 radiobutton .vpane.lower.commarea.buffer.header.amend \
4536 -text {Amend Last Commit} \
4537 -command do_select_commit_type \
4538 -variable selected_commit_type \
4541 lappend disable_on_lock \
4542 [list .vpane.lower.commarea.buffer.header.amend conf -state]
4547 proc trace_commit_type {varname args} {
4548 global ui_coml commit_type
4549 switch -glob -- $commit_type {
4550 initial {set txt {Initial Commit Message:}}
4551 amend {set txt {Amended Commit Message:}}
4552 amend-initial {set txt {Amended Initial Commit Message:}}
4553 amend-merge {set txt {Amended Merge Commit Message:}}
4554 merge {set txt {Merge Commit Message:}}
4555 * {set txt {Commit Message:}}
4557 $ui_coml conf -text $txt
4559 trace add variable commit_type write trace_commit_type
4560 pack $ui_coml -side left -fill x
4561 pack .vpane.lower.commarea.buffer.header.amend -side right
4562 pack .vpane.lower.commarea.buffer.header.new -side right
4564 text $ui_comm -background white -borderwidth 1 \
4567 -autoseparators true \
4569 -width 75 -height 9 -wrap none \
4571 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
4572 scrollbar .vpane.lower.commarea.buffer.sby \
4573 -command [list $ui_comm yview]
4574 pack .vpane.lower.commarea.buffer.header -side top -fill x
4575 pack .vpane.lower.commarea.buffer.sby -side right -fill y
4576 pack $ui_comm -side left -fill y
4577 pack .vpane.lower.commarea.buffer -side left -fill y
4579 # -- Commit Message Buffer Context Menu
4581 set ctxm .vpane.lower.commarea.buffer.ctxm
4582 menu $ctxm -tearoff 0
4586 -command {tk_textCut $ui_comm}
4590 -command {tk_textCopy $ui_comm}
4594 -command {tk_textPaste $ui_comm}
4598 -command {$ui_comm delete sel.first sel.last}
4601 -label {Select All} \
4603 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
4608 $ui_comm tag add sel 0.0 end
4609 tk_textCopy $ui_comm
4610 $ui_comm tag remove sel 0.0 end
4617 bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
4621 set current_diff_path {}
4622 set current_diff_side {}
4623 set diff_actions [list]
4624 proc trace_current_diff_path {varname args} {
4625 global current_diff_path diff_actions file_states
4626 if {$current_diff_path eq {}} {
4632 set p $current_diff_path
4633 set s [mapdesc [lindex $file_states($p) 0] $p]
4635 set p [escape_path $p]
4639 .vpane.lower.diff.header.status configure -text $s
4640 .vpane.lower.diff.header.file configure -text $f
4641 .vpane.lower.diff.header.path configure -text $p
4642 foreach w $diff_actions {
4646 trace add variable current_diff_path write trace_current_diff_path
4648 frame .vpane.lower.diff.header -background orange
4649 label .vpane.lower.diff.header.status \
4650 -background orange \
4651 -width $max_status_desc \
4655 label .vpane.lower.diff.header.file \
4656 -background orange \
4660 label .vpane.lower.diff.header.path \
4661 -background orange \
4665 pack .vpane.lower.diff.header.status -side left
4666 pack .vpane.lower.diff.header.file -side left
4667 pack .vpane.lower.diff.header.path -fill x
4668 set ctxm .vpane.lower.diff.header.ctxm
4669 menu $ctxm -tearoff 0
4678 -- $current_diff_path
4680 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4681 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
4685 frame .vpane.lower.diff.body
4686 set ui_diff .vpane.lower.diff.body.t
4687 text $ui_diff -background white -borderwidth 0 \
4688 -width 80 -height 15 -wrap none \
4690 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
4691 -yscrollcommand {.vpane.lower.diff.body.sby set} \
4693 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
4694 -command [list $ui_diff xview]
4695 scrollbar .vpane.lower.diff.body.sby -orient vertical \
4696 -command [list $ui_diff yview]
4697 pack .vpane.lower.diff.body.sbx -side bottom -fill x
4698 pack .vpane.lower.diff.body.sby -side right -fill y
4699 pack $ui_diff -side left -fill both -expand 1
4700 pack .vpane.lower.diff.header -side top -fill x
4701 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
4703 $ui_diff tag conf d_cr -elide true
4704 $ui_diff tag conf d_@ -foreground blue -font font_diffbold
4705 $ui_diff tag conf d_+ -foreground {#00a000}
4706 $ui_diff tag conf d_- -foreground red
4708 $ui_diff tag conf d_++ -foreground {#00a000}
4709 $ui_diff tag conf d_-- -foreground red
4710 $ui_diff tag conf d_+s \
4711 -foreground {#00a000} \
4712 -background {#e2effa}
4713 $ui_diff tag conf d_-s \
4715 -background {#e2effa}
4716 $ui_diff tag conf d_s+ \
4717 -foreground {#00a000} \
4719 $ui_diff tag conf d_s- \
4723 $ui_diff tag conf d<<<<<<< \
4724 -foreground orange \
4726 $ui_diff tag conf d======= \
4727 -foreground orange \
4729 $ui_diff tag conf d>>>>>>> \
4730 -foreground orange \
4733 $ui_diff tag raise sel
4735 # -- Diff Body Context Menu
4737 set ctxm .vpane.lower.diff.body.ctxm
4738 menu $ctxm -tearoff 0
4742 -command reshow_diff
4743 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4747 -command {tk_textCopy $ui_diff}
4748 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4750 -label {Select All} \
4752 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
4753 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4758 $ui_diff tag add sel 0.0 end
4759 tk_textCopy $ui_diff
4760 $ui_diff tag remove sel 0.0 end
4762 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4765 -label {Apply/Reverse Hunk} \
4767 -command {apply_hunk $cursorX $cursorY}
4768 set ui_diff_applyhunk [$ctxm index last]
4769 lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
4772 -label {Decrease Font Size} \
4774 -command {incr_font_size font_diff -1}
4775 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4777 -label {Increase Font Size} \
4779 -command {incr_font_size font_diff 1}
4780 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4783 -label {Show Less Context} \
4785 -command {if {$repo_config(gui.diffcontext) >= 2} {
4786 incr repo_config(gui.diffcontext) -1
4789 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4791 -label {Show More Context} \
4794 incr repo_config(gui.diffcontext)
4797 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4799 $ctxm add command -label {Options...} \
4802 bind_button3 $ui_diff "
4805 if {\$ui_index eq \$current_diff_side} {
4806 $ctxm entryconf $ui_diff_applyhunk -label {Unstage Hunk From Commit}
4808 $ctxm entryconf $ui_diff_applyhunk -label {Stage Hunk For Commit}
4810 tk_popup $ctxm %X %Y
4812 unset ui_diff_applyhunk
4816 set ui_status_value {Initializing...}
4817 label .status -textvariable ui_status_value \
4823 pack .status -anchor w -side bottom -fill x
4828 set gm $repo_config(gui.geometry)
4829 wm geometry . [lindex $gm 0]
4830 .vpane sash place 0 \
4831 [lindex [.vpane sash coord 0] 0] \
4833 .vpane.files sash place 0 \
4835 [lindex [.vpane.files sash coord 0] 1]
4841 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
4842 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
4843 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
4844 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
4845 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
4846 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
4847 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
4848 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
4849 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
4850 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
4851 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
4853 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
4854 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
4855 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
4856 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
4857 bind $ui_diff <$M1B-Key-v> {break}
4858 bind $ui_diff <$M1B-Key-V> {break}
4859 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
4860 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
4861 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
4862 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
4863 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
4864 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
4865 bind $ui_diff <Button-1> {focus %W}
4867 if {!$single_commit} {
4868 bind . <$M1B-Key-n> do_create_branch
4869 bind . <$M1B-Key-N> do_create_branch
4872 bind . <Destroy> do_quit
4873 bind all <Key-F5> do_rescan
4874 bind all <$M1B-Key-r> do_rescan
4875 bind all <$M1B-Key-R> do_rescan
4876 bind . <$M1B-Key-s> do_signoff
4877 bind . <$M1B-Key-S> do_signoff
4878 bind . <$M1B-Key-i> do_add_all
4879 bind . <$M1B-Key-I> do_add_all
4880 bind . <$M1B-Key-Return> do_commit
4881 bind all <$M1B-Key-q> do_quit
4882 bind all <$M1B-Key-Q> do_quit
4883 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
4884 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
4885 foreach i [list $ui_index $ui_workdir] {
4886 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
4887 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
4888 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
4892 set file_lists($ui_index) [list]
4893 set file_lists($ui_workdir) [list]
4897 set MERGE_HEAD [list]
4900 set current_branch {}
4901 set current_diff_path {}
4902 set selected_commit_type new
4904 wm title . "[appname] ([file normalize [file dirname [gitdir]]])"
4905 focus -force $ui_comm
4907 # -- Warn the user about environmental problems. Cygwin's Tcl
4908 # does *not* pass its env array onto any processes it spawns.
4909 # This means that git processes get none of our environment.
4914 set msg "Possible environment issues exist.
4916 The following environment variables are probably
4917 going to be ignored by any Git subprocess run
4921 foreach name [array names env] {
4922 switch -regexp -- $name {
4923 {^GIT_INDEX_FILE$} -
4924 {^GIT_OBJECT_DIRECTORY$} -
4925 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
4927 {^GIT_EXTERNAL_DIFF$} -
4931 {^GIT_CONFIG_LOCAL$} -
4932 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
4933 append msg " - $name\n"
4936 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
4937 append msg " - $name\n"
4939 set suggest_user $name
4943 if {$ignored_env > 0} {
4945 This is due to a known issue with the
4946 Tcl binary distributed by Cygwin."
4948 if {$suggest_user ne {}} {
4951 A good replacement for $suggest_user
4952 is placing values for the user.name and
4953 user.email settings into your personal
4959 unset ignored_env msg suggest_user name
4962 # -- Only initialize complex UI if we are going to stay running.
4964 if {!$single_commit} {
4968 populate_branch_menu
4973 # -- Only suggest a gc run if we are going to stay running.
4975 if {!$single_commit} {
4976 set object_limit 2000
4977 if {[is_Windows]} {set object_limit 200}
4978 regexp {^([0-9]+) objects,} [exec git count-objects] _junk objects_current
4979 if {$objects_current >= $object_limit} {
4981 "This repository currently has $objects_current loose objects.
4983 To maintain optimal performance it is strongly
4984 recommended that you compress the database
4985 when more than $object_limit loose objects exist.
4987 Compress the database now?"] eq yes} {
4991 unset object_limit _junk objects_current
4994 lock_index begin-read