git-gui: Bind M1-N to create branch.
[git-gui.git] / git-gui.sh
blobdb6d014e6660270b2c2f48d68477e0e841a09c71
1 #!/bin/sh
2 # Tcl ignores the next line -*- tcl -*- \
3 exec wish "$0" -- "$@"
5 set appvers {@@GIT_VERSION@@}
6 set copyright {
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 ######################################################################
25 ## read only globals
27 set _appname [lindex [file split $argv0] end]
28 set _gitdir {}
29 set _reponame {}
31 proc appname {} {
32 global _appname
33 return $_appname
36 proc gitdir {args} {
37 global _gitdir
38 if {$args eq {}} {
39 return $_gitdir
41 return [eval [concat [list file join $_gitdir] $args]]
44 proc reponame {} {
45 global _reponame
46 return $_reponame
49 ######################################################################
51 ## config
53 proc is_many_config {name} {
54 switch -glob -- $name {
55 remote.*.fetch -
56 remote.*.push
57 {return 1}
59 {return 0}
63 proc load_config {include_global} {
64 global repo_config global_config default_config
66 array unset global_config
67 if {$include_global} {
68 catch {
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
74 } else {
75 set global_config($name) $value
79 close $fd_rc
83 array unset repo_config
84 catch {
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
90 } else {
91 set repo_config($name) $value
95 close $fd_rc
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}
132 } else {
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}
149 } else {
150 regsub -all "\[{}\]" $value {"} value
151 exec git repo-config $name $value
153 set repo_config($name) $value
158 proc error_popup {msg} {
159 set title [appname]
160 if {[reponame] ne {}} {
161 append title " ([reponame])"
163 set cmd [list tk_messageBox \
164 -icon error \
165 -type ok \
166 -title "$title: error" \
167 -message $msg]
168 if {[winfo ismapped .]} {
169 lappend cmd -parent .
171 eval $cmd
174 proc warn_popup {msg} {
175 set title [appname]
176 if {[reponame] ne {}} {
177 append title " ([reponame])"
179 set cmd [list tk_messageBox \
180 -icon warning \
181 -type ok \
182 -title "$title: warning" \
183 -message $msg]
184 if {[winfo ismapped .]} {
185 lappend cmd -parent .
187 eval $cmd
190 proc info_popup {msg} {
191 set title [appname]
192 if {[reponame] ne {}} {
193 append title " ([reponame])"
195 tk_messageBox \
196 -parent . \
197 -icon info \
198 -type ok \
199 -title $title \
200 -message $msg
203 proc ask_popup {msg} {
204 set title [appname]
205 if {[reponame] ne {}} {
206 append title " ([reponame])"
208 return [tk_messageBox \
209 -parent . \
210 -icon question \
211 -type yesno \
212 -title $title \
213 -message $msg]
216 ######################################################################
218 ## repository setup
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"
224 exit 1
226 if {![file isdirectory $_gitdir]} {
227 catch {wm withdraw .}
228 error_popup "Git directory not found:\n\n$_gitdir"
229 exit 1
231 if {[lindex [file split $_gitdir] end] ne {.git}} {
232 catch {wm withdraw .}
233 error_popup "Cannot use funny .git directory:\n\n$gitdir"
234 exit 1
236 if {[catch {cd [file dirname $_gitdir]} err]} {
237 catch {wm withdraw .}
238 error_popup "No working directory [file dirname $_gitdir]:\n\n$err"
239 exit 1
241 set _reponame [lindex [file split \
242 [file normalize [file dirname $_gitdir]]] \
243 end]
245 set single_commit 0
246 if {[appname] eq {git-citool}} {
247 set single_commit 1
250 ######################################################################
252 ## task management
254 set rescan_active 0
255 set diff_active 0
256 set last_clicked {}
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
269 return 1
270 } elseif {$index_lock_type eq "begin-$type"} {
271 set index_lock_type $type
272 return 1
274 return 0
277 proc unlock_index {} {
278 global index_lock_type disable_on_lock
280 set index_lock_type none
281 foreach w $disable_on_lock {
282 uplevel #0 $w normal
286 ######################################################################
288 ## status
290 proc repository_state {ctvar hdvar mhvar} {
291 global current_branch
292 upvar $ctvar ct $hdvar hd $mhvar mh
294 set mh [list]
296 if {[catch {set current_branch [exec git symbolic-ref HEAD]}]} {
297 set current_branch {}
298 } else {
299 regsub ^refs/((heads|tags|remotes)/)? \
300 $current_branch \
301 {} \
302 current_branch
305 if {[catch {set hd [exec git rev-parse --verify HEAD]}]} {
306 set hd {}
307 set ct initial
308 return
311 set merge_head [gitdir MERGE_HEAD]
312 if {[file exists $merge_head]} {
313 set ct merge
314 set fd_mh [open $merge_head r]
315 while {[gets $fd_mh line] >= 0} {
316 lappend mh $line
318 close $fd_mh
319 return
322 set ct normal
325 proc PARENT {} {
326 global PARENT empty_tree
328 set p [lindex $PARENT 0]
329 if {$p ne {}} {
330 return $p
332 if {$empty_tree eq {}} {
333 set empty_tree [exec git mktree << {}]
335 return $empty_tree
338 proc rescan {after} {
339 global HEAD PARENT MERGE_HEAD commit_type
340 global ui_index ui_workdir ui_status_value ui_comm
341 global rescan_active file_states
342 global repo_config
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} {
350 } else {
351 set HEAD $newHEAD
352 set PARENT $newHEAD
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]} {
365 $ui_comm edit reset
366 $ui_comm edit modified false
369 if {$repo_config(gui.trustmtime) eq {true}} {
370 rescan_stage2 {} $after
371 } else {
372 set rescan_active 1
373 set ui_status_value {Refreshing file status...}
374 set cmd [list git update-index]
375 lappend cmd -q
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
390 if {$fd ne {}} {
391 read $fd
392 if {![eof $fd]} return
393 close $fd
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"
403 set buf_rdi {}
404 set buf_rdf {}
405 set buf_rlo {}
407 set rescan_active 3
408 set ui_status_value {Scanning for modified files ...}
409 set fd_di [open "| git diff-index --cached -z [PARENT]" r]
410 set fd_df [open "| git diff-files -z" r]
411 set fd_lo [open $ls_others r]
413 fconfigure $fd_di -blocking 0 -translation binary
414 fconfigure $fd_df -blocking 0 -translation binary
415 fconfigure $fd_lo -blocking 0 -translation binary
416 fileevent $fd_di readable [list read_diff_index $fd_di $after]
417 fileevent $fd_df readable [list read_diff_files $fd_df $after]
418 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
421 proc load_message {file} {
422 global ui_comm
424 set f [gitdir $file]
425 if {[file isfile $f]} {
426 if {[catch {set fd [open $f r]}]} {
427 return 0
429 set content [string trim [read $fd]]
430 close $fd
431 $ui_comm delete 0.0 end
432 $ui_comm insert end $content
433 return 1
435 return 0
438 proc read_diff_index {fd after} {
439 global buf_rdi
441 append buf_rdi [read $fd]
442 set c 0
443 set n [string length $buf_rdi]
444 while {$c < $n} {
445 set z1 [string first "\0" $buf_rdi $c]
446 if {$z1 == -1} break
447 incr z1
448 set z2 [string first "\0" $buf_rdi $z1]
449 if {$z2 == -1} break
451 incr c
452 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
453 merge_state \
454 [string range $buf_rdi $z1 [expr {$z2 - 1}]] \
455 [lindex $i 4]? \
456 [list [lindex $i 0] [lindex $i 2]] \
457 [list]
458 set c $z2
459 incr c
461 if {$c < $n} {
462 set buf_rdi [string range $buf_rdi $c end]
463 } else {
464 set buf_rdi {}
467 rescan_done $fd buf_rdi $after
470 proc read_diff_files {fd after} {
471 global buf_rdf
473 append buf_rdf [read $fd]
474 set c 0
475 set n [string length $buf_rdf]
476 while {$c < $n} {
477 set z1 [string first "\0" $buf_rdf $c]
478 if {$z1 == -1} break
479 incr z1
480 set z2 [string first "\0" $buf_rdf $z1]
481 if {$z2 == -1} break
483 incr c
484 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
485 merge_state \
486 [string range $buf_rdf $z1 [expr {$z2 - 1}]] \
487 ?[lindex $i 4] \
488 [list] \
489 [list [lindex $i 0] [lindex $i 2]]
490 set c $z2
491 incr c
493 if {$c < $n} {
494 set buf_rdf [string range $buf_rdf $c end]
495 } else {
496 set buf_rdf {}
499 rescan_done $fd buf_rdf $after
502 proc read_ls_others {fd after} {
503 global buf_rlo
505 append buf_rlo [read $fd]
506 set pck [split $buf_rlo "\0"]
507 set buf_rlo [lindex $pck end]
508 foreach p [lrange $pck 0 end-1] {
509 merge_state $p ?O
511 rescan_done $fd buf_rlo $after
514 proc rescan_done {fd buf after} {
515 global rescan_active
516 global file_states repo_config
517 upvar $buf to_clear
519 if {![eof $fd]} return
520 set to_clear {}
521 close $fd
522 if {[incr rescan_active -1] > 0} return
524 prune_selection
525 unlock_index
526 display_all_files
528 if {$repo_config(gui.partialinclude) ne {true}} {
529 set pathList [list]
530 foreach path [array names file_states] {
531 switch -- [lindex $file_states($path) 0] {
532 A? -
533 M? {lappend pathList $path}
536 if {$pathList ne {}} {
537 update_index \
538 "Updating included files" \
539 $pathList \
540 [concat {reshow_diff;} $after]
541 return
545 reshow_diff
546 uplevel #0 $after
549 proc prune_selection {} {
550 global file_states selected_paths
552 foreach path [array names selected_paths] {
553 if {[catch {set still_here $file_states($path)}]} {
554 unset selected_paths($path)
559 ######################################################################
561 ## diff
563 proc clear_diff {} {
564 global ui_diff current_diff ui_index ui_workdir
566 $ui_diff conf -state normal
567 $ui_diff delete 0.0 end
568 $ui_diff conf -state disabled
570 set current_diff {}
572 $ui_index tag remove in_diff 0.0 end
573 $ui_workdir tag remove in_diff 0.0 end
576 proc reshow_diff {} {
577 global current_diff ui_status_value file_states
579 if {$current_diff eq {}
580 || [catch {set s $file_states($current_diff)}]} {
581 clear_diff
582 } else {
583 show_diff $current_diff
587 proc handle_empty_diff {} {
588 global current_diff file_states file_lists
590 set path $current_diff
591 set s $file_states($path)
592 if {[lindex $s 0] ne {_M}} return
594 info_popup "No differences detected.
596 [short_path $path] has no changes.
598 The modification date of this file was updated
599 by another application and you currently have
600 the Trust File Modification Timestamps option
601 enabled, so Git did not automatically detect
602 that there are no content differences in this
603 file.
605 This file will now be removed from the modified
606 files list, to prevent possible confusion.
608 if {[catch {exec git update-index -- $path} err]} {
609 error_popup "Failed to refresh index:\n\n$err"
612 clear_diff
613 display_file $path __
616 proc show_diff {path {w {}} {lno {}}} {
617 global file_states file_lists
618 global is_3way_diff diff_active repo_config
619 global ui_diff current_diff ui_status_value
621 if {$diff_active || ![lock_index read]} return
623 clear_diff
624 if {$w eq {} || $lno == {}} {
625 foreach w [array names file_lists] {
626 set lno [lsearch -sorted $file_lists($w) $path]
627 if {$lno >= 0} {
628 incr lno
629 break
633 if {$w ne {} && $lno >= 1} {
634 $w tag add in_diff $lno.0 [expr {$lno + 1}].0
637 set s $file_states($path)
638 set m [lindex $s 0]
639 set is_3way_diff 0
640 set diff_active 1
641 set current_diff $path
642 set ui_status_value "Loading diff of [escape_path $path]..."
644 set cmd [list | git diff-index]
645 lappend cmd --no-color
646 if {$repo_config(gui.diffcontext) > 0} {
647 lappend cmd "-U$repo_config(gui.diffcontext)"
649 lappend cmd -p
651 switch $m {
652 MM {
653 lappend cmd -c
655 _O {
656 if {[catch {
657 set fd [open $path r]
658 set content [read $fd]
659 close $fd
660 } err ]} {
661 set diff_active 0
662 unlock_index
663 set ui_status_value "Unable to display [escape_path $path]"
664 error_popup "Error loading file:\n\n$err"
665 return
667 $ui_diff conf -state normal
668 $ui_diff insert end $content
669 $ui_diff conf -state disabled
670 set diff_active 0
671 unlock_index
672 set ui_status_value {Ready.}
673 return
677 lappend cmd [PARENT]
678 lappend cmd --
679 lappend cmd $path
681 if {[catch {set fd [open $cmd r]} err]} {
682 set diff_active 0
683 unlock_index
684 set ui_status_value "Unable to display [escape_path $path]"
685 error_popup "Error loading diff:\n\n$err"
686 return
689 fconfigure $fd -blocking 0 -translation auto
690 fileevent $fd readable [list read_diff $fd]
693 proc read_diff {fd} {
694 global ui_diff ui_status_value is_3way_diff diff_active
695 global repo_config
697 $ui_diff conf -state normal
698 while {[gets $fd line] >= 0} {
699 # -- Cleanup uninteresting diff header lines.
701 if {[string match {diff --git *} $line]} continue
702 if {[string match {diff --combined *} $line]} continue
703 if {[string match {--- *} $line]} continue
704 if {[string match {+++ *} $line]} continue
705 if {$line eq {deleted file mode 120000}} {
706 set line "deleted symlink"
709 # -- Automatically detect if this is a 3 way diff.
711 if {[string match {@@@ *} $line]} {set is_3way_diff 1}
713 # -- Reformat a 3 way diff, 'cause its too weird.
715 if {$is_3way_diff} {
716 set op [string range $line 0 1]
717 switch -- $op {
718 {@@} {set tags d_@}
719 {++} {set tags d_+ ; set op { +}}
720 {--} {set tags d_- ; set op { -}}
721 { +} {set tags d_++; set op {++}}
722 { -} {set tags d_--; set op {--}}
723 {+ } {set tags d_-+; set op {-+}}
724 {- } {set tags d_+-; set op {+-}}
725 default {set tags {}}
727 set line [string replace $line 0 1 $op]
728 } else {
729 switch -- [string index $line 0] {
730 @ {set tags d_@}
731 + {set tags d_+}
732 - {set tags d_-}
733 default {set tags {}}
736 $ui_diff insert end $line $tags
737 $ui_diff insert end "\n" $tags
739 $ui_diff conf -state disabled
741 if {[eof $fd]} {
742 close $fd
743 set diff_active 0
744 unlock_index
745 set ui_status_value {Ready.}
747 if {$repo_config(gui.trustmtime) eq {true}
748 && [$ui_diff index end] eq {2.0}} {
749 handle_empty_diff
754 ######################################################################
756 ## commit
758 proc load_last_commit {} {
759 global HEAD PARENT MERGE_HEAD commit_type ui_comm
761 if {[llength $PARENT] == 0} {
762 error_popup {There is nothing to amend.
764 You are about to create the initial commit.
765 There is no commit before this to amend.
767 return
770 repository_state curType curHEAD curMERGE_HEAD
771 if {$curType eq {merge}} {
772 error_popup {Cannot amend while merging.
774 You are currently in the middle of a merge that
775 has not been fully completed. You cannot amend
776 the prior commit unless you first abort the
777 current merge activity.
779 return
782 set msg {}
783 set parents [list]
784 if {[catch {
785 set fd [open "| git cat-file commit $curHEAD" r]
786 while {[gets $fd line] > 0} {
787 if {[string match {parent *} $line]} {
788 lappend parents [string range $line 7 end]
791 set msg [string trim [read $fd]]
792 close $fd
793 } err]} {
794 error_popup "Error loading commit data for amend:\n\n$err"
795 return
798 set HEAD $curHEAD
799 set PARENT $parents
800 set MERGE_HEAD [list]
801 switch -- [llength $parents] {
802 0 {set commit_type amend-initial}
803 1 {set commit_type amend}
804 default {set commit_type amend-merge}
807 $ui_comm delete 0.0 end
808 $ui_comm insert end $msg
809 $ui_comm edit reset
810 $ui_comm edit modified false
811 rescan {set ui_status_value {Ready.}}
814 proc create_new_commit {} {
815 global commit_type ui_comm
817 set commit_type normal
818 $ui_comm delete 0.0 end
819 $ui_comm edit reset
820 $ui_comm edit modified false
821 rescan {set ui_status_value {Ready.}}
824 set GIT_COMMITTER_IDENT {}
826 proc committer_ident {} {
827 global GIT_COMMITTER_IDENT
829 if {$GIT_COMMITTER_IDENT eq {}} {
830 if {[catch {set me [exec git var GIT_COMMITTER_IDENT]} err]} {
831 error_popup "Unable to obtain your identity:\n\n$err"
832 return {}
834 if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \
835 $me me GIT_COMMITTER_IDENT]} {
836 error_popup "Invalid GIT_COMMITTER_IDENT:\n\n$me"
837 return {}
841 return $GIT_COMMITTER_IDENT
844 proc commit_tree {} {
845 global HEAD commit_type file_states ui_comm repo_config
847 if {![lock_index update]} return
848 if {[committer_ident] eq {}} return
850 # -- Our in memory state should match the repository.
852 repository_state curType curHEAD curMERGE_HEAD
853 if {[string match amend* $commit_type]
854 && $curType eq {normal}
855 && $curHEAD eq $HEAD} {
856 } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
857 info_popup {Last scanned state does not match repository state.
859 Another Git program has modified this repository
860 since the last scan. A rescan must be performed
861 before another commit can be created.
863 The rescan will be automatically started now.
865 unlock_index
866 rescan {set ui_status_value {Ready.}}
867 return
870 # -- At least one file should differ in the index.
872 set files_ready 0
873 foreach path [array names file_states] {
874 switch -glob -- [lindex $file_states($path) 0] {
875 _? {continue}
876 A? -
877 D? -
878 M? {set files_ready 1; break}
879 U? {
880 error_popup "Unmerged files cannot be committed.
882 File [short_path $path] has merge conflicts.
883 You must resolve them and include the file before committing.
885 unlock_index
886 return
888 default {
889 error_popup "Unknown file state [lindex $s 0] detected.
891 File [short_path $path] cannot be committed by this program.
896 if {!$files_ready} {
897 error_popup {No included files to commit.
899 You must include at least 1 file before you can commit.
901 unlock_index
902 return
905 # -- A message is required.
907 set msg [string trim [$ui_comm get 1.0 end]]
908 if {$msg eq {}} {
909 error_popup {Please supply a commit message.
911 A good commit message has the following format:
913 - First line: Describe in one sentance what you did.
914 - Second line: Blank
915 - Remaining lines: Describe why this change is good.
917 unlock_index
918 return
921 # -- Update included files if partialincludes are off.
923 if {$repo_config(gui.partialinclude) ne {true}} {
924 set pathList [list]
925 foreach path [array names file_states] {
926 switch -glob -- [lindex $file_states($path) 0] {
927 A? -
928 M? {lappend pathList $path}
931 if {$pathList ne {}} {
932 unlock_index
933 update_index \
934 "Updating included files" \
935 $pathList \
936 [concat {lock_index update;} \
937 [list commit_prehook $curHEAD $msg]]
938 return
942 commit_prehook $curHEAD $msg
945 proc commit_prehook {curHEAD msg} {
946 global ui_status_value pch_error
948 set pchook [gitdir hooks pre-commit]
950 # On Cygwin [file executable] might lie so we need to ask
951 # the shell if the hook is executable. Yes that's annoying.
953 if {[is_Windows] && [file isfile $pchook]} {
954 set pchook [list sh -c [concat \
955 "if test -x \"$pchook\";" \
956 "then exec \"$pchook\" 2>&1;" \
957 "fi"]]
958 } elseif {[file executable $pchook]} {
959 set pchook [list $pchook |& cat]
960 } else {
961 commit_writetree $curHEAD $msg
962 return
965 set ui_status_value {Calling pre-commit hook...}
966 set pch_error {}
967 set fd_ph [open "| $pchook" r]
968 fconfigure $fd_ph -blocking 0 -translation binary
969 fileevent $fd_ph readable \
970 [list commit_prehook_wait $fd_ph $curHEAD $msg]
973 proc commit_prehook_wait {fd_ph curHEAD msg} {
974 global pch_error ui_status_value
976 append pch_error [read $fd_ph]
977 fconfigure $fd_ph -blocking 1
978 if {[eof $fd_ph]} {
979 if {[catch {close $fd_ph}]} {
980 set ui_status_value {Commit declined by pre-commit hook.}
981 hook_failed_popup pre-commit $pch_error
982 unlock_index
983 } else {
984 commit_writetree $curHEAD $msg
986 set pch_error {}
987 return
989 fconfigure $fd_ph -blocking 0
992 proc commit_writetree {curHEAD msg} {
993 global ui_status_value
995 set ui_status_value {Committing changes...}
996 set fd_wt [open "| git write-tree" r]
997 fileevent $fd_wt readable \
998 [list commit_committree $fd_wt $curHEAD $msg]
1001 proc commit_committree {fd_wt curHEAD msg} {
1002 global HEAD PARENT MERGE_HEAD commit_type
1003 global single_commit
1004 global ui_status_value ui_comm selected_commit_type
1005 global file_states selected_paths rescan_active
1007 gets $fd_wt tree_id
1008 if {$tree_id eq {} || [catch {close $fd_wt} err]} {
1009 error_popup "write-tree failed:\n\n$err"
1010 set ui_status_value {Commit failed.}
1011 unlock_index
1012 return
1015 # -- Create the commit.
1017 set cmd [list git commit-tree $tree_id]
1018 set parents [concat $PARENT $MERGE_HEAD]
1019 if {[llength $parents] > 0} {
1020 foreach p $parents {
1021 lappend cmd -p $p
1023 } else {
1024 # git commit-tree writes to stderr during initial commit.
1025 lappend cmd 2>/dev/null
1027 lappend cmd << $msg
1028 if {[catch {set cmt_id [eval exec $cmd]} err]} {
1029 error_popup "commit-tree failed:\n\n$err"
1030 set ui_status_value {Commit failed.}
1031 unlock_index
1032 return
1035 # -- Update the HEAD ref.
1037 set reflogm commit
1038 if {$commit_type ne {normal}} {
1039 append reflogm " ($commit_type)"
1041 set i [string first "\n" $msg]
1042 if {$i >= 0} {
1043 append reflogm {: } [string range $msg 0 [expr {$i - 1}]]
1044 } else {
1045 append reflogm {: } $msg
1047 set cmd [list git update-ref -m $reflogm HEAD $cmt_id $curHEAD]
1048 if {[catch {eval exec $cmd} err]} {
1049 error_popup "update-ref failed:\n\n$err"
1050 set ui_status_value {Commit failed.}
1051 unlock_index
1052 return
1055 # -- Cleanup after ourselves.
1057 catch {file delete [gitdir MERGE_HEAD]}
1058 catch {file delete [gitdir MERGE_MSG]}
1059 catch {file delete [gitdir SQUASH_MSG]}
1060 catch {file delete [gitdir GITGUI_MSG]}
1062 # -- Let rerere do its thing.
1064 if {[file isdirectory [gitdir rr-cache]]} {
1065 catch {exec git rerere}
1068 # -- Run the post-commit hook.
1070 set pchook [gitdir hooks post-commit]
1071 if {[is_Windows] && [file isfile $pchook]} {
1072 set pchook [list sh -c [concat \
1073 "if test -x \"$pchook\";" \
1074 "then exec \"$pchook\";" \
1075 "fi"]]
1076 } elseif {![file executable $pchook]} {
1077 set pchook {}
1079 if {$pchook ne {}} {
1080 catch {exec $pchook &}
1083 $ui_comm delete 0.0 end
1084 $ui_comm edit reset
1085 $ui_comm edit modified false
1087 if {$single_commit} do_quit
1089 # -- Update in memory status
1091 set selected_commit_type new
1092 set commit_type normal
1093 set HEAD $cmt_id
1094 set PARENT $cmt_id
1095 set MERGE_HEAD [list]
1097 foreach path [array names file_states] {
1098 set s $file_states($path)
1099 set m [lindex $s 0]
1100 switch -glob -- $m {
1101 _O -
1102 _M -
1103 _D {continue}
1104 __ -
1105 A_ -
1106 M_ -
1107 D_ {
1108 unset file_states($path)
1109 catch {unset selected_paths($path)}
1111 DO {
1112 set file_states($path) [list _O [lindex $s 1] {} {}]
1114 AM -
1115 AD -
1116 MM -
1117 MD {
1118 set file_states($path) [list \
1119 _[string index $m 1] \
1120 [lindex $s 1] \
1121 [lindex $s 3] \
1127 display_all_files
1128 unlock_index
1129 reshow_diff
1130 set ui_status_value \
1131 "Changes committed as [string range $cmt_id 0 7]."
1134 ######################################################################
1136 ## fetch pull push
1138 proc fetch_from {remote} {
1139 set w [new_console "fetch $remote" \
1140 "Fetching new changes from $remote"]
1141 set cmd [list git fetch]
1142 lappend cmd $remote
1143 console_exec $w $cmd
1146 proc pull_remote {remote branch} {
1147 global HEAD commit_type file_states repo_config
1149 if {![lock_index update]} return
1151 # -- Our in memory state should match the repository.
1153 repository_state curType curHEAD curMERGE_HEAD
1154 if {$commit_type ne $curType || $HEAD ne $curHEAD} {
1155 info_popup {Last scanned state does not match repository state.
1157 Another Git program has modified this repository
1158 since the last scan. A rescan must be performed
1159 before a pull operation can be started.
1161 The rescan will be automatically started now.
1163 unlock_index
1164 rescan {set ui_status_value {Ready.}}
1165 return
1168 # -- No differences should exist before a pull.
1170 if {[array size file_states] != 0} {
1171 error_popup {Uncommitted but modified files are present.
1173 You should not perform a pull with unmodified
1174 files in your working directory as Git will be
1175 unable to recover from an incorrect merge.
1177 You should commit or revert all changes before
1178 starting a pull operation.
1180 unlock_index
1181 return
1184 set w [new_console "pull $remote $branch" \
1185 "Pulling new changes from branch $branch in $remote"]
1186 set cmd [list git pull]
1187 if {$repo_config(gui.pullsummary) eq {false}} {
1188 lappend cmd --no-summary
1190 lappend cmd $remote
1191 lappend cmd $branch
1192 console_exec $w $cmd [list post_pull_remote $remote $branch]
1195 proc post_pull_remote {remote branch success} {
1196 global HEAD PARENT MERGE_HEAD commit_type selected_commit_type
1197 global ui_status_value
1199 unlock_index
1200 if {$success} {
1201 repository_state commit_type HEAD MERGE_HEAD
1202 set PARENT $HEAD
1203 set selected_commit_type new
1204 set ui_status_value "Pulling $branch from $remote complete."
1205 } else {
1206 rescan [list set ui_status_value \
1207 "Conflicts detected while pulling $branch from $remote."]
1211 proc push_to {remote} {
1212 set w [new_console "push $remote" \
1213 "Pushing changes to $remote"]
1214 set cmd [list git push]
1215 lappend cmd $remote
1216 console_exec $w $cmd
1219 ######################################################################
1221 ## ui helpers
1223 proc mapicon {w state path} {
1224 global all_icons
1226 if {[catch {set r $all_icons($state$w)}]} {
1227 puts "error: no icon for $w state={$state} $path"
1228 return file_plain
1230 return $r
1233 proc mapdesc {state path} {
1234 global all_descs
1236 if {[catch {set r $all_descs($state)}]} {
1237 puts "error: no desc for state={$state} $path"
1238 return $state
1240 return $r
1243 proc escape_path {path} {
1244 regsub -all "\n" $path "\\n" path
1245 return $path
1248 proc short_path {path} {
1249 return [escape_path [lindex [file split $path] end]]
1252 set next_icon_id 0
1253 set null_sha1 [string repeat 0 40]
1255 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1256 global file_states next_icon_id null_sha1
1258 set s0 [string index $new_state 0]
1259 set s1 [string index $new_state 1]
1261 if {[catch {set info $file_states($path)}]} {
1262 set state __
1263 set icon n[incr next_icon_id]
1264 } else {
1265 set state [lindex $info 0]
1266 set icon [lindex $info 1]
1267 if {$head_info eq {}} {set head_info [lindex $info 2]}
1268 if {$index_info eq {}} {set index_info [lindex $info 3]}
1271 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1272 elseif {$s0 eq {_}} {set s0 _}
1274 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1275 elseif {$s1 eq {_}} {set s1 _}
1277 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1278 set head_info [list 0 $null_sha1]
1279 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1280 && $head_info eq {}} {
1281 set head_info $index_info
1284 set file_states($path) [list $s0$s1 $icon \
1285 $head_info $index_info \
1287 return $state
1290 proc display_file_helper {w path icon_name old_m new_m} {
1291 global file_lists
1293 if {$new_m eq {_}} {
1294 set lno [lsearch -sorted $file_lists($w) $path]
1295 if {$lno >= 0} {
1296 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1297 incr lno
1298 $w conf -state normal
1299 $w delete $lno.0 [expr {$lno + 1}].0
1300 $w conf -state disabled
1302 } elseif {$old_m eq {_} && $new_m ne {_}} {
1303 lappend file_lists($w) $path
1304 set file_lists($w) [lsort -unique $file_lists($w)]
1305 set lno [lsearch -sorted $file_lists($w) $path]
1306 incr lno
1307 $w conf -state normal
1308 $w image create $lno.0 \
1309 -align center -padx 5 -pady 1 \
1310 -name $icon_name \
1311 -image [mapicon $w $new_m $path]
1312 $w insert $lno.1 "[escape_path $path]\n"
1313 $w conf -state disabled
1314 } elseif {$old_m ne $new_m} {
1315 $w conf -state normal
1316 $w image conf $icon_name -image [mapicon $w $new_m $path]
1317 $w conf -state disabled
1321 proc display_file {path state} {
1322 global file_states selected_paths
1323 global ui_index ui_workdir
1325 set old_m [merge_state $path $state]
1326 set s $file_states($path)
1327 set new_m [lindex $s 0]
1328 set icon_name [lindex $s 1]
1330 display_file_helper $ui_index $path $icon_name \
1331 [string index $old_m 0] \
1332 [string index $new_m 0]
1333 display_file_helper $ui_workdir $path $icon_name \
1334 [string index $old_m 1] \
1335 [string index $new_m 1]
1337 if {$new_m eq {__}} {
1338 unset file_states($path)
1339 catch {unset selected_paths($path)}
1343 proc display_all_files_helper {w path icon_name m} {
1344 global file_lists
1346 lappend file_lists($w) $path
1347 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1348 $w image create end \
1349 -align center -padx 5 -pady 1 \
1350 -name $icon_name \
1351 -image [mapicon $w $m $path]
1352 $w insert end "[escape_path $path]\n"
1355 proc display_all_files {} {
1356 global ui_index ui_workdir
1357 global file_states file_lists
1358 global last_clicked
1360 $ui_index conf -state normal
1361 $ui_workdir conf -state normal
1363 $ui_index delete 0.0 end
1364 $ui_workdir delete 0.0 end
1365 set last_clicked {}
1367 set file_lists($ui_index) [list]
1368 set file_lists($ui_workdir) [list]
1370 foreach path [lsort [array names file_states]] {
1371 set s $file_states($path)
1372 set m [lindex $s 0]
1373 set icon_name [lindex $s 1]
1375 if {[string index $m 0] ne {_}} {
1376 display_all_files_helper $ui_index $path \
1377 $icon_name [string index $m 0]
1379 if {[string index $m 1] ne {_}} {
1380 display_all_files_helper $ui_workdir $path \
1381 $icon_name [string index $m 1]
1385 $ui_index conf -state disabled
1386 $ui_workdir conf -state disabled
1389 proc update_indexinfo {msg pathList after} {
1390 global update_index_cp ui_status_value
1392 if {![lock_index update]} return
1394 set update_index_cp 0
1395 set pathList [lsort $pathList]
1396 set totalCnt [llength $pathList]
1397 set batch [expr {int($totalCnt * .01) + 1}]
1398 if {$batch > 25} {set batch 25}
1400 set ui_status_value [format \
1401 "$msg... %i/%i files (%.2f%%)" \
1402 $update_index_cp \
1403 $totalCnt \
1404 0.0]
1405 set fd [open "| git update-index -z --index-info" w]
1406 fconfigure $fd \
1407 -blocking 0 \
1408 -buffering full \
1409 -buffersize 512 \
1410 -translation binary
1411 fileevent $fd writable [list \
1412 write_update_indexinfo \
1413 $fd \
1414 $pathList \
1415 $totalCnt \
1416 $batch \
1417 $msg \
1418 $after \
1422 proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
1423 global update_index_cp ui_status_value
1424 global file_states current_diff
1426 if {$update_index_cp >= $totalCnt} {
1427 close $fd
1428 unlock_index
1429 uplevel #0 $after
1430 return
1433 for {set i $batch} \
1434 {$update_index_cp < $totalCnt && $i > 0} \
1435 {incr i -1} {
1436 set path [lindex $pathList $update_index_cp]
1437 incr update_index_cp
1439 set s $file_states($path)
1440 switch -glob -- [lindex $s 0] {
1441 A? {set new _O}
1442 M? {set new _M}
1443 D_ {set new _D}
1444 D? {set new _?}
1445 ?? {continue}
1447 set info [lindex $s 2]
1448 if {$info eq {}} continue
1450 puts -nonewline $fd "$info\t$path\0"
1451 display_file $path $new
1454 set ui_status_value [format \
1455 "$msg... %i/%i files (%.2f%%)" \
1456 $update_index_cp \
1457 $totalCnt \
1458 [expr {100.0 * $update_index_cp / $totalCnt}]]
1461 proc update_index {msg pathList after} {
1462 global update_index_cp ui_status_value
1464 if {![lock_index update]} return
1466 set update_index_cp 0
1467 set pathList [lsort $pathList]
1468 set totalCnt [llength $pathList]
1469 set batch [expr {int($totalCnt * .01) + 1}]
1470 if {$batch > 25} {set batch 25}
1472 set ui_status_value [format \
1473 "$msg... %i/%i files (%.2f%%)" \
1474 $update_index_cp \
1475 $totalCnt \
1476 0.0]
1477 set fd [open "| git update-index --add --remove -z --stdin" w]
1478 fconfigure $fd \
1479 -blocking 0 \
1480 -buffering full \
1481 -buffersize 512 \
1482 -translation binary
1483 fileevent $fd writable [list \
1484 write_update_index \
1485 $fd \
1486 $pathList \
1487 $totalCnt \
1488 $batch \
1489 $msg \
1490 $after \
1494 proc write_update_index {fd pathList totalCnt batch msg after} {
1495 global update_index_cp ui_status_value
1496 global file_states current_diff
1498 if {$update_index_cp >= $totalCnt} {
1499 close $fd
1500 unlock_index
1501 uplevel #0 $after
1502 return
1505 for {set i $batch} \
1506 {$update_index_cp < $totalCnt && $i > 0} \
1507 {incr i -1} {
1508 set path [lindex $pathList $update_index_cp]
1509 incr update_index_cp
1511 switch -glob -- [lindex $file_states($path) 0] {
1512 AD {set new __}
1513 ?D {set new D_}
1514 _O -
1515 AM {set new A_}
1516 U_ -
1517 ?M {set new M_}
1518 ?? {continue}
1520 puts -nonewline $fd "$path\0"
1521 display_file $path $new
1524 set ui_status_value [format \
1525 "$msg... %i/%i files (%.2f%%)" \
1526 $update_index_cp \
1527 $totalCnt \
1528 [expr {100.0 * $update_index_cp / $totalCnt}]]
1531 proc checkout_index {msg pathList after} {
1532 global update_index_cp ui_status_value
1534 if {![lock_index update]} return
1536 set update_index_cp 0
1537 set pathList [lsort $pathList]
1538 set totalCnt [llength $pathList]
1539 set batch [expr {int($totalCnt * .01) + 1}]
1540 if {$batch > 25} {set batch 25}
1542 set ui_status_value [format \
1543 "$msg... %i/%i files (%.2f%%)" \
1544 $update_index_cp \
1545 $totalCnt \
1546 0.0]
1547 set cmd [list git checkout-index]
1548 lappend cmd --index
1549 lappend cmd --quiet
1550 lappend cmd --force
1551 lappend cmd -z
1552 lappend cmd --stdin
1553 set fd [open "| $cmd " w]
1554 fconfigure $fd \
1555 -blocking 0 \
1556 -buffering full \
1557 -buffersize 512 \
1558 -translation binary
1559 fileevent $fd writable [list \
1560 write_checkout_index \
1561 $fd \
1562 $pathList \
1563 $totalCnt \
1564 $batch \
1565 $msg \
1566 $after \
1570 proc write_checkout_index {fd pathList totalCnt batch msg after} {
1571 global update_index_cp ui_status_value
1572 global file_states current_diff
1574 if {$update_index_cp >= $totalCnt} {
1575 close $fd
1576 unlock_index
1577 uplevel #0 $after
1578 return
1581 for {set i $batch} \
1582 {$update_index_cp < $totalCnt && $i > 0} \
1583 {incr i -1} {
1584 set path [lindex $pathList $update_index_cp]
1585 incr update_index_cp
1586 switch -glob -- [lindex $file_states($path) 0] {
1587 U? {continue}
1588 ?M -
1589 ?D {
1590 puts -nonewline $fd "$path\0"
1591 display_file $path ?_
1596 set ui_status_value [format \
1597 "$msg... %i/%i files (%.2f%%)" \
1598 $update_index_cp \
1599 $totalCnt \
1600 [expr {100.0 * $update_index_cp / $totalCnt}]]
1603 ######################################################################
1605 ## branch management
1607 proc load_all_heads {} {
1608 global all_heads tracking_branches
1610 set all_heads [list]
1611 set cmd [list git for-each-ref]
1612 lappend cmd --format=%(refname)
1613 lappend cmd refs/heads
1614 set fd [open "| $cmd" r]
1615 while {[gets $fd line] > 0} {
1616 if {![catch {set info $tracking_branches($line)}]} continue
1617 if {![regsub ^refs/heads/ $line {} name]} continue
1618 lappend all_heads $name
1620 close $fd
1622 set all_heads [lsort $all_heads]
1625 proc populate_branch_menu {} {
1626 global all_heads disable_on_lock
1628 set m .mbar.branch
1629 set last [$m index last]
1630 for {set i 0} {$i <= $last} {incr i} {
1631 if {[$m type $i] eq {separator}} {
1632 $m delete $i last
1633 set new_dol [list]
1634 foreach a $disable_on_lock {
1635 if {[lindex $a 0] ne $m || [lindex $a 2] < $i} {
1636 lappend new_dol $a
1639 set disable_on_lock $new_dol
1640 break
1644 $m add separator
1645 foreach b $all_heads {
1646 $m add radiobutton \
1647 -label $b \
1648 -command [list switch_branch $b] \
1649 -variable current_branch \
1650 -value $b \
1651 -font font_ui
1652 lappend disable_on_lock \
1653 [list $m entryconf [$m index last] -state]
1657 proc do_create_branch_action {w} {
1658 global all_heads null_sha1
1659 global create_branch_checkout create_branch_revtype create_branch_head
1661 set newbranch [string trim [$w.name.t get 0.0 end]]
1662 if {![catch {exec git show-ref --verify -- "refs/heads/$newbranch"}]} {
1663 tk_messageBox \
1664 -icon error \
1665 -type ok \
1666 -title [wm title $w] \
1667 -parent $w \
1668 -message "Branch '$newbranch' already exists."
1669 focus $w.name.t
1670 return
1672 if {[catch {exec git check-ref-format "heads/$newbranch"}]} {
1673 tk_messageBox \
1674 -icon error \
1675 -type ok \
1676 -title [wm title $w] \
1677 -parent $w \
1678 -message "We do not like '$newbranch' as a branch name."
1679 focus $w.name.t
1680 return
1683 set rev {}
1684 switch -- $create_branch_revtype {
1685 head {set rev $create_branch_head}
1686 expression {set rev [string trim [$w.from.exp.t get 0.0 end]]}
1688 if {[catch {set cmt [exec git rev-parse --verify "${rev}^0"]}]} {
1689 tk_messageBox \
1690 -icon error \
1691 -type ok \
1692 -title [wm title $w] \
1693 -parent $w \
1694 -message "Invalid starting revision: $rev"
1695 return
1697 set cmd [list git update-ref]
1698 lappend cmd -m
1699 lappend cmd "branch: Created from $rev"
1700 lappend cmd "refs/heads/$newbranch"
1701 lappend cmd $cmt
1702 lappend cmd $null_sha1
1703 if {[catch {eval exec $cmd} err]} {
1704 tk_messageBox \
1705 -icon error \
1706 -type ok \
1707 -title [wm title $w] \
1708 -parent $w \
1709 -message "Failed to create '$newbranch'.\n\n$err"
1710 return
1713 lappend all_heads $newbranch
1714 set all_heads [lsort $all_heads]
1715 populate_branch_menu
1717 destroy $w
1720 proc do_create_branch {} {
1721 global all_heads current_branch
1722 global create_branch_checkout create_branch_revtype create_branch_head
1724 set create_branch_checkout true
1725 set create_branch_revtype head
1726 set create_branch_head $current_branch
1728 set w .branch_editor
1729 toplevel $w
1730 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
1732 label $w.header -text {Create New Branch} \
1733 -font font_uibold
1734 pack $w.header -side top -fill x
1736 frame $w.buttons
1737 button $w.buttons.create -text Create \
1738 -font font_ui \
1739 -default active \
1740 -command [list do_create_branch_action $w]
1741 pack $w.buttons.create -side right
1742 button $w.buttons.cancel -text {Cancel} \
1743 -font font_ui \
1744 -command [list destroy $w]
1745 pack $w.buttons.cancel -side right -padx 5
1746 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
1748 labelframe $w.name \
1749 -text {Branch Description} \
1750 -font font_ui
1751 label $w.name.l -text {Name:} -font font_ui
1752 text $w.name.t \
1753 -height 1 \
1754 -width 40 \
1755 -font font_ui
1756 bind $w.name.t <Shift-Key-Tab> "focus $w.postActions.checkout;break"
1757 bind $w.name.t <Key-Tab> "focus $w.from.exp.t;break"
1758 bind $w.name.t <Key-Return> "do_create_branch_action $w;break"
1759 bind $w.name.t <Key> {
1760 if {{%K} ne {BackSpace}
1761 && {%K} ne {Tab}
1762 && {%K} ne {Escape}
1763 && {%K} ne {Return}} {
1764 if {%k <= 32} break
1765 if {[string first %A {~^:?*[}] >= 0} break
1768 pack $w.name.l -side left -padx 5
1769 pack $w.name.t -side left -fill x -expand 1
1770 pack $w.name -anchor nw -fill x -pady 5 -padx 5
1772 labelframe $w.from \
1773 -text {Starting Revision} \
1774 -font font_ui
1775 frame $w.from.head
1776 radiobutton $w.from.head.r \
1777 -text {Local Branch:} \
1778 -value head \
1779 -variable create_branch_revtype \
1780 -font font_ui
1781 eval tk_optionMenu $w.from.head.m create_branch_head $all_heads
1782 pack $w.from.head.r -side left
1783 pack $w.from.head.m -side left
1784 frame $w.from.exp
1785 radiobutton $w.from.exp.r \
1786 -text {Revision Expression:} \
1787 -value expression \
1788 -variable create_branch_revtype \
1789 -font font_ui
1790 text $w.from.exp.t \
1791 -height 1 \
1792 -width 50 \
1793 -font font_ui
1794 bind $w.from.exp.t <Shift-Key-Tab> "focus $w.name.t;break"
1795 bind $w.from.exp.t <Key-Tab> "focus $w.postActions.checkout;break"
1796 bind $w.from.exp.t <Key-Return> "do_create_branch_action $w;break"
1797 pack $w.from.exp.r -side left
1798 pack $w.from.exp.t -side left -fill x -expand 1
1799 pack $w.from.head -padx 5 -fill x -expand 1
1800 pack $w.from.exp -padx 5 -fill x -expand 1
1801 pack $w.from -anchor nw -fill x -pady 5 -padx 5
1803 labelframe $w.postActions \
1804 -text {Post Creation Actions} \
1805 -font font_ui
1806 checkbutton $w.postActions.checkout \
1807 -text {Checkout after creation} \
1808 -offvalue false \
1809 -onvalue true \
1810 -variable create_branch_checkout \
1811 -font font_ui
1812 pack $w.postActions.checkout -anchor nw
1813 pack $w.postActions -anchor nw -fill x -pady 5 -padx 5
1815 bind $w <Visibility> "grab $w; focus $w.name.t"
1816 bind $w <Key-Escape> "destroy $w"
1817 bind $w <Key-Return> "do_create_branch_action $w;break"
1818 wm title $w "[appname] ([reponame]): Create Branch"
1819 tkwait window $w
1822 proc do_delete_branch {} {
1823 error "NOT IMPLEMENTED"
1826 proc switch_branch {b} {
1827 global HEAD commit_type file_states current_branch
1828 global selected_commit_type ui_comm
1830 if {![lock_index switch]} return
1832 # -- Backup the selected branch (repository_state resets it)
1834 set new_branch $current_branch
1836 # -- Our in memory state should match the repository.
1838 repository_state curType curHEAD curMERGE_HEAD
1839 if {[string match amend* $commit_type]
1840 && $curType eq {normal}
1841 && $curHEAD eq $HEAD} {
1842 } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
1843 info_popup {Last scanned state does not match repository state.
1845 Another Git program has modified this repository
1846 since the last scan. A rescan must be performed
1847 before the current branch can be changed.
1849 The rescan will be automatically started now.
1851 unlock_index
1852 rescan {set ui_status_value {Ready.}}
1853 return
1856 # -- Toss the message buffer if we are in amend mode.
1858 if {[string match amend* $curType]} {
1859 $ui_comm delete 0.0 end
1860 $ui_comm edit reset
1861 $ui_comm edit modified false
1864 set selected_commit_type new
1865 set current_branch $new_branch
1867 unlock_index
1868 error "NOT FINISHED"
1871 ######################################################################
1873 ## remote management
1875 proc load_all_remotes {} {
1876 global repo_config
1877 global all_remotes tracking_branches
1879 set all_remotes [list]
1880 array unset tracking_branches
1882 set rm_dir [gitdir remotes]
1883 if {[file isdirectory $rm_dir]} {
1884 set all_remotes [glob \
1885 -types f \
1886 -tails \
1887 -nocomplain \
1888 -directory $rm_dir *]
1890 foreach name $all_remotes {
1891 catch {
1892 set fd [open [file join $rm_dir $name] r]
1893 while {[gets $fd line] >= 0} {
1894 if {![regexp {^Pull:[ ]*([^:]+):(.+)$} \
1895 $line line src dst]} continue
1896 if {![regexp ^refs/ $dst]} {
1897 set dst "refs/heads/$dst"
1899 set tracking_branches($dst) [list $name $src]
1901 close $fd
1906 foreach line [array names repo_config remote.*.url] {
1907 if {![regexp ^remote\.(.*)\.url\$ $line line name]} continue
1908 lappend all_remotes $name
1910 if {[catch {set fl $repo_config(remote.$name.fetch)}]} {
1911 set fl {}
1913 foreach line $fl {
1914 if {![regexp {^([^:]+):(.+)$} $line line src dst]} continue
1915 if {![regexp ^refs/ $dst]} {
1916 set dst "refs/heads/$dst"
1918 set tracking_branches($dst) [list $name $src]
1922 set all_remotes [lsort -unique $all_remotes]
1925 proc populate_fetch_menu {m} {
1926 global all_remotes repo_config
1928 foreach r $all_remotes {
1929 set enable 0
1930 if {![catch {set a $repo_config(remote.$r.url)}]} {
1931 if {![catch {set a $repo_config(remote.$r.fetch)}]} {
1932 set enable 1
1934 } else {
1935 catch {
1936 set fd [open [gitdir remotes $r] r]
1937 while {[gets $fd n] >= 0} {
1938 if {[regexp {^Pull:[ \t]*([^:]+):} $n]} {
1939 set enable 1
1940 break
1943 close $fd
1947 if {$enable} {
1948 $m add command \
1949 -label "Fetch from $r..." \
1950 -command [list fetch_from $r] \
1951 -font font_ui
1956 proc populate_push_menu {m} {
1957 global all_remotes repo_config
1959 foreach r $all_remotes {
1960 set enable 0
1961 if {![catch {set a $repo_config(remote.$r.url)}]} {
1962 if {![catch {set a $repo_config(remote.$r.push)}]} {
1963 set enable 1
1965 } else {
1966 catch {
1967 set fd [open [gitdir remotes $r] r]
1968 while {[gets $fd n] >= 0} {
1969 if {[regexp {^Push:[ \t]*([^:]+):} $n]} {
1970 set enable 1
1971 break
1974 close $fd
1978 if {$enable} {
1979 $m add command \
1980 -label "Push to $r..." \
1981 -command [list push_to $r] \
1982 -font font_ui
1987 proc populate_pull_menu {m} {
1988 global repo_config all_remotes disable_on_lock
1990 foreach remote $all_remotes {
1991 set rb_list [list]
1992 if {[array get repo_config remote.$remote.url] ne {}} {
1993 if {[array get repo_config remote.$remote.fetch] ne {}} {
1994 foreach line $repo_config(remote.$remote.fetch) {
1995 if {[regexp {^([^:]+):} $line line rb]} {
1996 lappend rb_list $rb
2000 } else {
2001 catch {
2002 set fd [open [gitdir remotes $remote] r]
2003 while {[gets $fd line] >= 0} {
2004 if {[regexp {^Pull:[ \t]*([^:]+):} $line line rb]} {
2005 lappend rb_list $rb
2008 close $fd
2012 foreach rb $rb_list {
2013 regsub ^refs/heads/ $rb {} rb_short
2014 $m add command \
2015 -label "Branch $rb_short from $remote..." \
2016 -command [list pull_remote $remote $rb] \
2017 -font font_ui
2018 lappend disable_on_lock \
2019 [list $m entryconf [$m index last] -state]
2024 ######################################################################
2026 ## icons
2028 set filemask {
2029 #define mask_width 14
2030 #define mask_height 15
2031 static unsigned char mask_bits[] = {
2032 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2033 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2034 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2037 image create bitmap file_plain -background white -foreground black -data {
2038 #define plain_width 14
2039 #define plain_height 15
2040 static unsigned char plain_bits[] = {
2041 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2042 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2043 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2044 } -maskdata $filemask
2046 image create bitmap file_mod -background white -foreground blue -data {
2047 #define mod_width 14
2048 #define mod_height 15
2049 static unsigned char mod_bits[] = {
2050 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2051 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2052 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2053 } -maskdata $filemask
2055 image create bitmap file_fulltick -background white -foreground "#007000" -data {
2056 #define file_fulltick_width 14
2057 #define file_fulltick_height 15
2058 static unsigned char file_fulltick_bits[] = {
2059 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2060 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2061 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2062 } -maskdata $filemask
2064 image create bitmap file_parttick -background white -foreground "#005050" -data {
2065 #define parttick_width 14
2066 #define parttick_height 15
2067 static unsigned char parttick_bits[] = {
2068 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2069 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
2070 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2071 } -maskdata $filemask
2073 image create bitmap file_question -background white -foreground black -data {
2074 #define file_question_width 14
2075 #define file_question_height 15
2076 static unsigned char file_question_bits[] = {
2077 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2078 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2079 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2080 } -maskdata $filemask
2082 image create bitmap file_removed -background white -foreground red -data {
2083 #define file_removed_width 14
2084 #define file_removed_height 15
2085 static unsigned char file_removed_bits[] = {
2086 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2087 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2088 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2089 } -maskdata $filemask
2091 image create bitmap file_merge -background white -foreground blue -data {
2092 #define file_merge_width 14
2093 #define file_merge_height 15
2094 static unsigned char file_merge_bits[] = {
2095 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2096 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2097 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2098 } -maskdata $filemask
2100 set ui_index .vpane.files.index.list
2101 set ui_workdir .vpane.files.workdir.list
2103 set all_icons(_$ui_index) file_plain
2104 set all_icons(A$ui_index) file_fulltick
2105 set all_icons(M$ui_index) file_fulltick
2106 set all_icons(D$ui_index) file_removed
2107 set all_icons(U$ui_index) file_merge
2109 set all_icons(_$ui_workdir) file_plain
2110 set all_icons(M$ui_workdir) file_mod
2111 set all_icons(D$ui_workdir) file_question
2112 set all_icons(O$ui_workdir) file_plain
2114 set max_status_desc 0
2115 foreach i {
2116 {__ "Unmodified"}
2118 {_M "Modified, not staged"}
2119 {M_ "Staged for commit"}
2120 {MM "Portions staged for commit"}
2121 {MD "Staged for commit, missing"}
2123 {_O "Untracked, not staged"}
2124 {A_ "Staged for commit"}
2125 {AM "Portions staged for commit"}
2126 {AD "Staged for commit, missing"}
2128 {_D "Missing"}
2129 {D_ "Staged for removal"}
2130 {DO "Staged for removal, still present"}
2132 {U_ "Requires merge resolution"}
2133 {UM "Requires merge resolution"}
2134 {UD "Requires merge resolution"}
2136 if {$max_status_desc < [string length [lindex $i 1]]} {
2137 set max_status_desc [string length [lindex $i 1]]
2139 set all_descs([lindex $i 0]) [lindex $i 1]
2141 unset i
2143 ######################################################################
2145 ## util
2147 proc is_MacOSX {} {
2148 global tcl_platform tk_library
2149 if {[tk windowingsystem] eq {aqua}} {
2150 return 1
2152 return 0
2155 proc is_Windows {} {
2156 global tcl_platform
2157 if {$tcl_platform(platform) eq {windows}} {
2158 return 1
2160 return 0
2163 proc bind_button3 {w cmd} {
2164 bind $w <Any-Button-3> $cmd
2165 if {[is_MacOSX]} {
2166 bind $w <Control-Button-1> $cmd
2170 proc incr_font_size {font {amt 1}} {
2171 set sz [font configure $font -size]
2172 incr sz $amt
2173 font configure $font -size $sz
2174 font configure ${font}bold -size $sz
2177 proc hook_failed_popup {hook msg} {
2178 set w .hookfail
2179 toplevel $w
2181 frame $w.m
2182 label $w.m.l1 -text "$hook hook failed:" \
2183 -anchor w \
2184 -justify left \
2185 -font font_uibold
2186 text $w.m.t \
2187 -background white -borderwidth 1 \
2188 -relief sunken \
2189 -width 80 -height 10 \
2190 -font font_diff \
2191 -yscrollcommand [list $w.m.sby set]
2192 label $w.m.l2 \
2193 -text {You must correct the above errors before committing.} \
2194 -anchor w \
2195 -justify left \
2196 -font font_uibold
2197 scrollbar $w.m.sby -command [list $w.m.t yview]
2198 pack $w.m.l1 -side top -fill x
2199 pack $w.m.l2 -side bottom -fill x
2200 pack $w.m.sby -side right -fill y
2201 pack $w.m.t -side left -fill both -expand 1
2202 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
2204 $w.m.t insert 1.0 $msg
2205 $w.m.t conf -state disabled
2207 button $w.ok -text OK \
2208 -width 15 \
2209 -font font_ui \
2210 -command "destroy $w"
2211 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
2213 bind $w <Visibility> "grab $w; focus $w"
2214 bind $w <Key-Return> "destroy $w"
2215 wm title $w "[appname] ([reponame]): error"
2216 tkwait window $w
2219 set next_console_id 0
2221 proc new_console {short_title long_title} {
2222 global next_console_id console_data
2223 set w .console[incr next_console_id]
2224 set console_data($w) [list $short_title $long_title]
2225 return [console_init $w]
2228 proc console_init {w} {
2229 global console_cr console_data M1B
2231 set console_cr($w) 1.0
2232 toplevel $w
2233 frame $w.m
2234 label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
2235 -anchor w \
2236 -justify left \
2237 -font font_uibold
2238 text $w.m.t \
2239 -background white -borderwidth 1 \
2240 -relief sunken \
2241 -width 80 -height 10 \
2242 -font font_diff \
2243 -state disabled \
2244 -yscrollcommand [list $w.m.sby set]
2245 label $w.m.s -text {Working... please wait...} \
2246 -anchor w \
2247 -justify left \
2248 -font font_uibold
2249 scrollbar $w.m.sby -command [list $w.m.t yview]
2250 pack $w.m.l1 -side top -fill x
2251 pack $w.m.s -side bottom -fill x
2252 pack $w.m.sby -side right -fill y
2253 pack $w.m.t -side left -fill both -expand 1
2254 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
2256 menu $w.ctxm -tearoff 0
2257 $w.ctxm add command -label "Copy" \
2258 -font font_ui \
2259 -command "tk_textCopy $w.m.t"
2260 $w.ctxm add command -label "Select All" \
2261 -font font_ui \
2262 -command "$w.m.t tag add sel 0.0 end"
2263 $w.ctxm add command -label "Copy All" \
2264 -font font_ui \
2265 -command "
2266 $w.m.t tag add sel 0.0 end
2267 tk_textCopy $w.m.t
2268 $w.m.t tag remove sel 0.0 end
2271 button $w.ok -text {Close} \
2272 -font font_ui \
2273 -state disabled \
2274 -command "destroy $w"
2275 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
2277 bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
2278 bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
2279 bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
2280 bind $w <Visibility> "focus $w"
2281 wm title $w "[appname] ([reponame]): [lindex $console_data($w) 0]"
2282 return $w
2285 proc console_exec {w cmd {after {}}} {
2286 # -- Windows tosses the enviroment when we exec our child.
2287 # But most users need that so we have to relogin. :-(
2289 if {[is_Windows]} {
2290 set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
2293 # -- Tcl won't let us redirect both stdout and stderr to
2294 # the same pipe. So pass it through cat...
2296 set cmd [concat | $cmd |& cat]
2298 set fd_f [open $cmd r]
2299 fconfigure $fd_f -blocking 0 -translation binary
2300 fileevent $fd_f readable [list console_read $w $fd_f $after]
2303 proc console_read {w fd after} {
2304 global console_cr console_data
2306 set buf [read $fd]
2307 if {$buf ne {}} {
2308 if {![winfo exists $w]} {console_init $w}
2309 $w.m.t conf -state normal
2310 set c 0
2311 set n [string length $buf]
2312 while {$c < $n} {
2313 set cr [string first "\r" $buf $c]
2314 set lf [string first "\n" $buf $c]
2315 if {$cr < 0} {set cr [expr {$n + 1}]}
2316 if {$lf < 0} {set lf [expr {$n + 1}]}
2318 if {$lf < $cr} {
2319 $w.m.t insert end [string range $buf $c $lf]
2320 set console_cr($w) [$w.m.t index {end -1c}]
2321 set c $lf
2322 incr c
2323 } else {
2324 $w.m.t delete $console_cr($w) end
2325 $w.m.t insert end "\n"
2326 $w.m.t insert end [string range $buf $c $cr]
2327 set c $cr
2328 incr c
2331 $w.m.t conf -state disabled
2332 $w.m.t see end
2335 fconfigure $fd -blocking 1
2336 if {[eof $fd]} {
2337 if {[catch {close $fd}]} {
2338 if {![winfo exists $w]} {console_init $w}
2339 $w.m.s conf -background red -text {Error: Command Failed}
2340 $w.ok conf -state normal
2341 set ok 0
2342 } elseif {[winfo exists $w]} {
2343 $w.m.s conf -background green -text {Success}
2344 $w.ok conf -state normal
2345 set ok 1
2347 array unset console_cr $w
2348 array unset console_data $w
2349 if {$after ne {}} {
2350 uplevel #0 $after $ok
2352 return
2354 fconfigure $fd -blocking 0
2357 ######################################################################
2359 ## ui commands
2361 set starting_gitk_msg {Starting gitk... please wait...}
2363 proc do_gitk {revs} {
2364 global ui_status_value starting_gitk_msg
2366 set cmd gitk
2367 if {$revs ne {}} {
2368 append cmd { }
2369 append cmd $revs
2371 if {[is_Windows]} {
2372 set cmd "sh -c \"exec $cmd\""
2374 append cmd { &}
2376 if {[catch {eval exec $cmd} err]} {
2377 error_popup "Failed to start gitk:\n\n$err"
2378 } else {
2379 set ui_status_value $starting_gitk_msg
2380 after 10000 {
2381 if {$ui_status_value eq $starting_gitk_msg} {
2382 set ui_status_value {Ready.}
2388 proc do_gc {} {
2389 set w [new_console {gc} {Compressing the object database}]
2390 console_exec $w {git gc}
2393 proc do_fsck_objects {} {
2394 set w [new_console {fsck-objects} \
2395 {Verifying the object database with fsck-objects}]
2396 set cmd [list git fsck-objects]
2397 lappend cmd --full
2398 lappend cmd --cache
2399 lappend cmd --strict
2400 console_exec $w $cmd
2403 set is_quitting 0
2405 proc do_quit {} {
2406 global ui_comm is_quitting repo_config commit_type
2408 if {$is_quitting} return
2409 set is_quitting 1
2411 # -- Stash our current commit buffer.
2413 set save [gitdir GITGUI_MSG]
2414 set msg [string trim [$ui_comm get 0.0 end]]
2415 if {![string match amend* $commit_type]
2416 && [$ui_comm edit modified]
2417 && $msg ne {}} {
2418 catch {
2419 set fd [open $save w]
2420 puts $fd [string trim [$ui_comm get 0.0 end]]
2421 close $fd
2423 } else {
2424 catch {file delete $save}
2427 # -- Stash our current window geometry into this repository.
2429 set cfg_geometry [list]
2430 lappend cfg_geometry [wm geometry .]
2431 lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
2432 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
2433 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2434 set rc_geometry {}
2436 if {$cfg_geometry ne $rc_geometry} {
2437 catch {exec git repo-config gui.geometry $cfg_geometry}
2440 destroy .
2443 proc do_rescan {} {
2444 rescan {set ui_status_value {Ready.}}
2447 proc unstage_helper {txt paths} {
2448 global file_states current_diff
2450 if {![lock_index begin-update]} return
2452 set pathList [list]
2453 set after {}
2454 foreach path $paths {
2455 switch -glob -- [lindex $file_states($path) 0] {
2456 A? -
2457 M? -
2458 D? {
2459 lappend pathList $path
2460 if {$path eq $current_diff} {
2461 set after {reshow_diff;}
2466 if {$pathList eq {}} {
2467 unlock_index
2468 } else {
2469 update_indexinfo \
2470 $txt \
2471 $pathList \
2472 [concat $after {set ui_status_value {Ready.}}]
2476 proc do_unstage_selection {} {
2477 global current_diff selected_paths
2479 if {[array size selected_paths] > 0} {
2480 unstage_helper \
2481 {Unstaging selected files from commit} \
2482 [array names selected_paths]
2483 } elseif {$current_diff ne {}} {
2484 unstage_helper \
2485 "Unstaging [short_path $current_diff] from commit" \
2486 [list $current_diff]
2490 proc add_helper {txt paths} {
2491 global file_states current_diff
2493 if {![lock_index begin-update]} return
2495 set pathList [list]
2496 set after {}
2497 foreach path $paths {
2498 switch -glob -- [lindex $file_states($path) 0] {
2499 _O -
2500 ?M -
2501 ?D -
2502 U? {
2503 lappend pathList $path
2504 if {$path eq $current_diff} {
2505 set after {reshow_diff;}
2510 if {$pathList eq {}} {
2511 unlock_index
2512 } else {
2513 update_index \
2514 $txt \
2515 $pathList \
2516 [concat $after {set ui_status_value {Ready to commit.}}]
2520 proc do_add_selection {} {
2521 global current_diff selected_paths
2523 if {[array size selected_paths] > 0} {
2524 add_helper \
2525 {Adding selected files} \
2526 [array names selected_paths]
2527 } elseif {$current_diff ne {}} {
2528 add_helper \
2529 "Adding [short_path $current_diff]" \
2530 [list $current_diff]
2534 proc do_add_all {} {
2535 global file_states
2537 set paths [list]
2538 foreach path [array names file_states] {
2539 switch -glob -- [lindex $file_states($path) 0] {
2540 U? {continue}
2541 ?M -
2542 ?D {lappend paths $path}
2545 add_helper {Adding all changed files} $paths
2548 proc revert_helper {txt paths} {
2549 global file_states current_diff
2551 if {![lock_index begin-update]} return
2553 set pathList [list]
2554 set after {}
2555 foreach path $paths {
2556 switch -glob -- [lindex $file_states($path) 0] {
2557 U? {continue}
2558 ?M -
2559 ?D {
2560 lappend pathList $path
2561 if {$path eq $current_diff} {
2562 set after {reshow_diff;}
2568 set n [llength $pathList]
2569 if {$n == 0} {
2570 unlock_index
2571 return
2572 } elseif {$n == 1} {
2573 set s "[short_path [lindex $pathList]]"
2574 } else {
2575 set s "these $n files"
2578 set reply [tk_dialog \
2579 .confirm_revert \
2580 "[appname] ([reponame])" \
2581 "Revert changes in $s?
2583 Any unadded changes will be permanently lost by the revert." \
2584 question \
2586 {Do Nothing} \
2587 {Revert Changes} \
2589 if {$reply == 1} {
2590 checkout_index \
2591 $txt \
2592 $pathList \
2593 [concat $after {set ui_status_value {Ready.}}]
2594 } else {
2595 unlock_index
2599 proc do_revert_selection {} {
2600 global current_diff selected_paths
2602 if {[array size selected_paths] > 0} {
2603 revert_helper \
2604 {Reverting selected files} \
2605 [array names selected_paths]
2606 } elseif {$current_diff ne {}} {
2607 revert_helper \
2608 "Reverting [short_path $current_diff]" \
2609 [list $current_diff]
2613 proc do_signoff {} {
2614 global ui_comm
2616 set me [committer_ident]
2617 if {$me eq {}} return
2619 set sob "Signed-off-by: $me"
2620 set last [$ui_comm get {end -1c linestart} {end -1c}]
2621 if {$last ne $sob} {
2622 $ui_comm edit separator
2623 if {$last ne {}
2624 && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
2625 $ui_comm insert end "\n"
2627 $ui_comm insert end "\n$sob"
2628 $ui_comm edit separator
2629 $ui_comm see end
2633 proc do_select_commit_type {} {
2634 global commit_type selected_commit_type
2636 if {$selected_commit_type eq {new}
2637 && [string match amend* $commit_type]} {
2638 create_new_commit
2639 } elseif {$selected_commit_type eq {amend}
2640 && ![string match amend* $commit_type]} {
2641 load_last_commit
2643 # The amend request was rejected...
2645 if {![string match amend* $commit_type]} {
2646 set selected_commit_type new
2651 proc do_commit {} {
2652 commit_tree
2655 proc do_about {} {
2656 global appvers copyright
2657 global tcl_patchLevel tk_patchLevel
2659 set w .about_dialog
2660 toplevel $w
2661 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2663 label $w.header -text "About [appname]" \
2664 -font font_uibold
2665 pack $w.header -side top -fill x
2667 frame $w.buttons
2668 button $w.buttons.close -text {Close} \
2669 -font font_ui \
2670 -command [list destroy $w]
2671 pack $w.buttons.close -side right
2672 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2674 label $w.desc \
2675 -text "[appname] - a commit creation tool for Git.
2676 $copyright" \
2677 -padx 5 -pady 5 \
2678 -justify left \
2679 -anchor w \
2680 -borderwidth 1 \
2681 -relief solid \
2682 -font font_ui
2683 pack $w.desc -side top -fill x -padx 5 -pady 5
2685 set v {}
2686 append v "[appname] version $appvers\n"
2687 append v "[exec git version]\n"
2688 append v "\n"
2689 if {$tcl_patchLevel eq $tk_patchLevel} {
2690 append v "Tcl/Tk version $tcl_patchLevel"
2691 } else {
2692 append v "Tcl version $tcl_patchLevel"
2693 append v ", Tk version $tk_patchLevel"
2696 label $w.vers \
2697 -text $v \
2698 -padx 5 -pady 5 \
2699 -justify left \
2700 -anchor w \
2701 -borderwidth 1 \
2702 -relief solid \
2703 -font font_ui
2704 pack $w.vers -side top -fill x -padx 5 -pady 5
2706 menu $w.ctxm -tearoff 0
2707 $w.ctxm add command \
2708 -label {Copy} \
2709 -font font_ui \
2710 -command "
2711 clipboard clear
2712 clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
2715 bind $w <Visibility> "grab $w; focus $w"
2716 bind $w <Key-Escape> "destroy $w"
2717 bind_button3 $w.vers "tk_popup $w.ctxm %X %Y; grab $w; focus $w"
2718 wm title $w "About [appname]"
2719 tkwait window $w
2722 proc do_options {} {
2723 global repo_config global_config font_descs
2724 global repo_config_new global_config_new
2726 array unset repo_config_new
2727 array unset global_config_new
2728 foreach name [array names repo_config] {
2729 set repo_config_new($name) $repo_config($name)
2731 load_config 1
2732 foreach name [array names repo_config] {
2733 switch -- $name {
2734 gui.diffcontext {continue}
2736 set repo_config_new($name) $repo_config($name)
2738 foreach name [array names global_config] {
2739 set global_config_new($name) $global_config($name)
2742 set w .options_editor
2743 toplevel $w
2744 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2746 label $w.header -text "[appname] Options" \
2747 -font font_uibold
2748 pack $w.header -side top -fill x
2750 frame $w.buttons
2751 button $w.buttons.restore -text {Restore Defaults} \
2752 -font font_ui \
2753 -command do_restore_defaults
2754 pack $w.buttons.restore -side left
2755 button $w.buttons.save -text Save \
2756 -font font_ui \
2757 -command [list do_save_config $w]
2758 pack $w.buttons.save -side right
2759 button $w.buttons.cancel -text {Cancel} \
2760 -font font_ui \
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.repo -text "[reponame] Repository" \
2766 -font font_ui \
2767 -relief raised -borderwidth 2
2768 labelframe $w.global -text {Global (All Repositories)} \
2769 -font font_ui \
2770 -relief raised -borderwidth 2
2771 pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
2772 pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
2774 foreach option {
2775 {b partialinclude {Allow Partially Added Files}}
2776 {b pullsummary {Show Pull Summary}}
2777 {b trustmtime {Trust File Modification Timestamps}}
2778 {i diffcontext {Number of Diff Context Lines}}
2780 set type [lindex $option 0]
2781 set name [lindex $option 1]
2782 set text [lindex $option 2]
2783 foreach f {repo global} {
2784 switch $type {
2786 checkbutton $w.$f.$name -text $text \
2787 -variable ${f}_config_new(gui.$name) \
2788 -onvalue true \
2789 -offvalue false \
2790 -font font_ui
2791 pack $w.$f.$name -side top -anchor w
2794 frame $w.$f.$name
2795 label $w.$f.$name.l -text "$text:" -font font_ui
2796 pack $w.$f.$name.l -side left -anchor w -fill x
2797 spinbox $w.$f.$name.v \
2798 -textvariable ${f}_config_new(gui.$name) \
2799 -from 1 -to 99 -increment 1 \
2800 -width 3 \
2801 -font font_ui
2802 pack $w.$f.$name.v -side right -anchor e
2803 pack $w.$f.$name -side top -anchor w -fill x
2809 set all_fonts [lsort [font families]]
2810 foreach option $font_descs {
2811 set name [lindex $option 0]
2812 set font [lindex $option 1]
2813 set text [lindex $option 2]
2815 set global_config_new(gui.$font^^family) \
2816 [font configure $font -family]
2817 set global_config_new(gui.$font^^size) \
2818 [font configure $font -size]
2820 frame $w.global.$name
2821 label $w.global.$name.l -text "$text:" -font font_ui
2822 pack $w.global.$name.l -side left -anchor w -fill x
2823 eval tk_optionMenu $w.global.$name.family \
2824 global_config_new(gui.$font^^family) \
2825 $all_fonts
2826 spinbox $w.global.$name.size \
2827 -textvariable global_config_new(gui.$font^^size) \
2828 -from 2 -to 80 -increment 1 \
2829 -width 3 \
2830 -font font_ui
2831 pack $w.global.$name.size -side right -anchor e
2832 pack $w.global.$name.family -side right -anchor e
2833 pack $w.global.$name -side top -anchor w -fill x
2836 bind $w <Visibility> "grab $w; focus $w"
2837 bind $w <Key-Escape> "destroy $w"
2838 wm title $w "[appname] ([reponame]): Options"
2839 tkwait window $w
2842 proc do_restore_defaults {} {
2843 global font_descs default_config repo_config
2844 global repo_config_new global_config_new
2846 foreach name [array names default_config] {
2847 set repo_config_new($name) $default_config($name)
2848 set global_config_new($name) $default_config($name)
2851 foreach option $font_descs {
2852 set name [lindex $option 0]
2853 set repo_config(gui.$name) $default_config(gui.$name)
2855 apply_config
2857 foreach option $font_descs {
2858 set name [lindex $option 0]
2859 set font [lindex $option 1]
2860 set global_config_new(gui.$font^^family) \
2861 [font configure $font -family]
2862 set global_config_new(gui.$font^^size) \
2863 [font configure $font -size]
2867 proc do_save_config {w} {
2868 if {[catch {save_config} err]} {
2869 error_popup "Failed to completely save options:\n\n$err"
2871 reshow_diff
2872 destroy $w
2875 proc do_windows_shortcut {} {
2876 global argv0
2878 if {[catch {
2879 set desktop [exec cygpath \
2880 --windows \
2881 --absolute \
2882 --long-name \
2883 --desktop]
2884 }]} {
2885 set desktop .
2887 set fn [tk_getSaveFile \
2888 -parent . \
2889 -title "[appname] ([reponame]): Create Desktop Icon" \
2890 -initialdir $desktop \
2891 -initialfile "Git [reponame].bat"]
2892 if {$fn != {}} {
2893 if {[catch {
2894 set fd [open $fn w]
2895 set sh [exec cygpath \
2896 --windows \
2897 --absolute \
2898 /bin/sh]
2899 set me [exec cygpath \
2900 --unix \
2901 --absolute \
2902 $argv0]
2903 set gd [exec cygpath \
2904 --unix \
2905 --absolute \
2906 [gitdir]]
2907 set gw [exec cygpath \
2908 --windows \
2909 --absolute \
2910 [file dirname [gitdir]]]
2911 regsub -all ' $me "'\\''" me
2912 regsub -all ' $gd "'\\''" gd
2913 puts $fd "@ECHO Entering $gw"
2914 puts $fd "@ECHO Starting git-gui... please wait..."
2915 puts -nonewline $fd "@\"$sh\" --login -c \""
2916 puts -nonewline $fd "GIT_DIR='$gd'"
2917 puts -nonewline $fd " '$me'"
2918 puts $fd "&\""
2919 close $fd
2920 } err]} {
2921 error_popup "Cannot write script:\n\n$err"
2926 proc do_macosx_app {} {
2927 global argv0 env
2929 set fn [tk_getSaveFile \
2930 -parent . \
2931 -title "[appname] ([reponame]): Create Desktop Icon" \
2932 -initialdir [file join $env(HOME) Desktop] \
2933 -initialfile "Git [reponame].app"]
2934 if {$fn != {}} {
2935 if {[catch {
2936 set Contents [file join $fn Contents]
2937 set MacOS [file join $Contents MacOS]
2938 set exe [file join $MacOS git-gui]
2940 file mkdir $MacOS
2942 set fd [open [file join $Contents Info.plist] w]
2943 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
2944 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
2945 <plist version="1.0">
2946 <dict>
2947 <key>CFBundleDevelopmentRegion</key>
2948 <string>English</string>
2949 <key>CFBundleExecutable</key>
2950 <string>git-gui</string>
2951 <key>CFBundleIdentifier</key>
2952 <string>org.spearce.git-gui</string>
2953 <key>CFBundleInfoDictionaryVersion</key>
2954 <string>6.0</string>
2955 <key>CFBundlePackageType</key>
2956 <string>APPL</string>
2957 <key>CFBundleSignature</key>
2958 <string>????</string>
2959 <key>CFBundleVersion</key>
2960 <string>1.0</string>
2961 <key>NSPrincipalClass</key>
2962 <string>NSApplication</string>
2963 </dict>
2964 </plist>}
2965 close $fd
2967 set fd [open $exe w]
2968 set gd [file normalize [gitdir]]
2969 set ep [file normalize [exec git --exec-path]]
2970 regsub -all ' $gd "'\\''" gd
2971 regsub -all ' $ep "'\\''" ep
2972 puts $fd "#!/bin/sh"
2973 foreach name [array names env] {
2974 if {[string match GIT_* $name]} {
2975 regsub -all ' $env($name) "'\\''" v
2976 puts $fd "export $name='$v'"
2979 puts $fd "export PATH='$ep':\$PATH"
2980 puts $fd "export GIT_DIR='$gd'"
2981 puts $fd "exec [file normalize $argv0]"
2982 close $fd
2984 file attributes $exe -permissions u+x,g+x,o+x
2985 } err]} {
2986 error_popup "Cannot write icon:\n\n$err"
2991 proc toggle_or_diff {w x y} {
2992 global file_states file_lists current_diff ui_index ui_workdir
2993 global last_clicked selected_paths
2995 set pos [split [$w index @$x,$y] .]
2996 set lno [lindex $pos 0]
2997 set col [lindex $pos 1]
2998 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2999 if {$path eq {}} {
3000 set last_clicked {}
3001 return
3004 set last_clicked [list $w $lno]
3005 array unset selected_paths
3006 $ui_index tag remove in_sel 0.0 end
3007 $ui_workdir tag remove in_sel 0.0 end
3009 if {$col == 0} {
3010 if {$current_diff eq $path} {
3011 set after {reshow_diff;}
3012 } else {
3013 set after {}
3015 if {$w eq $ui_index} {
3016 update_indexinfo \
3017 "Unstaging [short_path $path] from commit" \
3018 [list $path] \
3019 [concat $after {set ui_status_value {Ready.}}]
3020 } elseif {$w eq $ui_workdir} {
3021 update_index \
3022 "Adding [short_path $path]" \
3023 [list $path] \
3024 [concat $after {set ui_status_value {Ready.}}]
3026 } else {
3027 show_diff $path $w $lno
3031 proc add_one_to_selection {w x y} {
3032 global file_lists last_clicked selected_paths
3034 set lno [lindex [split [$w index @$x,$y] .] 0]
3035 set path [lindex $file_lists($w) [expr {$lno - 1}]]
3036 if {$path eq {}} {
3037 set last_clicked {}
3038 return
3041 if {$last_clicked ne {}
3042 && [lindex $last_clicked 0] ne $w} {
3043 array unset selected_paths
3044 [lindex $last_clicked 0] tag remove in_sel 0.0 end
3047 set last_clicked [list $w $lno]
3048 if {[catch {set in_sel $selected_paths($path)}]} {
3049 set in_sel 0
3051 if {$in_sel} {
3052 unset selected_paths($path)
3053 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
3054 } else {
3055 set selected_paths($path) 1
3056 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
3060 proc add_range_to_selection {w x y} {
3061 global file_lists last_clicked selected_paths
3063 if {[lindex $last_clicked 0] ne $w} {
3064 toggle_or_diff $w $x $y
3065 return
3068 set lno [lindex [split [$w index @$x,$y] .] 0]
3069 set lc [lindex $last_clicked 1]
3070 if {$lc < $lno} {
3071 set begin $lc
3072 set end $lno
3073 } else {
3074 set begin $lno
3075 set end $lc
3078 foreach path [lrange $file_lists($w) \
3079 [expr {$begin - 1}] \
3080 [expr {$end - 1}]] {
3081 set selected_paths($path) 1
3083 $w tag add in_sel $begin.0 [expr {$end + 1}].0
3086 ######################################################################
3088 ## config defaults
3090 set cursor_ptr arrow
3091 font create font_diff -family Courier -size 10
3092 font create font_ui
3093 catch {
3094 label .dummy
3095 eval font configure font_ui [font actual [.dummy cget -font]]
3096 destroy .dummy
3099 font create font_uibold
3100 font create font_diffbold
3102 if {[is_Windows]} {
3103 set M1B Control
3104 set M1T Ctrl
3105 } elseif {[is_MacOSX]} {
3106 set M1B M1
3107 set M1T Cmd
3108 } else {
3109 set M1B M1
3110 set M1T M1
3113 proc apply_config {} {
3114 global repo_config font_descs
3116 foreach option $font_descs {
3117 set name [lindex $option 0]
3118 set font [lindex $option 1]
3119 if {[catch {
3120 foreach {cn cv} $repo_config(gui.$name) {
3121 font configure $font $cn $cv
3123 } err]} {
3124 error_popup "Invalid font specified in gui.$name:\n\n$err"
3126 foreach {cn cv} [font configure $font] {
3127 font configure ${font}bold $cn $cv
3129 font configure ${font}bold -weight bold
3133 set default_config(gui.trustmtime) false
3134 set default_config(gui.pullsummary) true
3135 set default_config(gui.partialinclude) false
3136 set default_config(gui.diffcontext) 5
3137 set default_config(gui.fontui) [font configure font_ui]
3138 set default_config(gui.fontdiff) [font configure font_diff]
3139 set font_descs {
3140 {fontui font_ui {Main Font}}
3141 {fontdiff font_diff {Diff/Console Font}}
3143 load_config 0
3144 apply_config
3146 ######################################################################
3148 ## ui construction
3150 # -- Menu Bar
3152 menu .mbar -tearoff 0
3153 .mbar add cascade -label Repository -menu .mbar.repository
3154 .mbar add cascade -label Edit -menu .mbar.edit
3155 if {!$single_commit} {
3156 .mbar add cascade -label Branch -menu .mbar.branch
3158 .mbar add cascade -label Commit -menu .mbar.commit
3159 if {!$single_commit} {
3160 .mbar add cascade -label Fetch -menu .mbar.fetch
3161 .mbar add cascade -label Pull -menu .mbar.pull
3162 .mbar add cascade -label Push -menu .mbar.push
3164 . configure -menu .mbar
3166 # -- Repository Menu
3168 menu .mbar.repository
3169 .mbar.repository add command \
3170 -label {Visualize Current Branch} \
3171 -command {do_gitk {}} \
3172 -font font_ui
3173 if {![is_MacOSX]} {
3174 .mbar.repository add command \
3175 -label {Visualize All Branches} \
3176 -command {do_gitk {--all}} \
3177 -font font_ui
3179 .mbar.repository add separator
3181 if {!$single_commit} {
3182 .mbar.repository add command -label {Compress Database} \
3183 -command do_gc \
3184 -font font_ui
3186 .mbar.repository add command -label {Verify Database} \
3187 -command do_fsck_objects \
3188 -font font_ui
3190 .mbar.repository add separator
3192 if {[is_Windows]} {
3193 .mbar.repository add command \
3194 -label {Create Desktop Icon} \
3195 -command do_windows_shortcut \
3196 -font font_ui
3197 } elseif {[is_MacOSX]} {
3198 .mbar.repository add command \
3199 -label {Create Desktop Icon} \
3200 -command do_macosx_app \
3201 -font font_ui
3205 .mbar.repository add command -label Quit \
3206 -command do_quit \
3207 -accelerator $M1T-Q \
3208 -font font_ui
3210 # -- Edit Menu
3212 menu .mbar.edit
3213 .mbar.edit add command -label Undo \
3214 -command {catch {[focus] edit undo}} \
3215 -accelerator $M1T-Z \
3216 -font font_ui
3217 .mbar.edit add command -label Redo \
3218 -command {catch {[focus] edit redo}} \
3219 -accelerator $M1T-Y \
3220 -font font_ui
3221 .mbar.edit add separator
3222 .mbar.edit add command -label Cut \
3223 -command {catch {tk_textCut [focus]}} \
3224 -accelerator $M1T-X \
3225 -font font_ui
3226 .mbar.edit add command -label Copy \
3227 -command {catch {tk_textCopy [focus]}} \
3228 -accelerator $M1T-C \
3229 -font font_ui
3230 .mbar.edit add command -label Paste \
3231 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
3232 -accelerator $M1T-V \
3233 -font font_ui
3234 .mbar.edit add command -label Delete \
3235 -command {catch {[focus] delete sel.first sel.last}} \
3236 -accelerator Del \
3237 -font font_ui
3238 .mbar.edit add separator
3239 .mbar.edit add command -label {Select All} \
3240 -command {catch {[focus] tag add sel 0.0 end}} \
3241 -accelerator $M1T-A \
3242 -font font_ui
3244 # -- Branch Menu
3246 if {!$single_commit} {
3247 menu .mbar.branch
3249 .mbar.branch add command -label {Create...} \
3250 -command do_create_branch \
3251 -accelerator $M1T-N \
3252 -font font_ui
3253 lappend disable_on_lock [list .mbar.branch entryconf \
3254 [.mbar.branch index last] -state]
3256 .mbar.branch add command -label {Delete...} \
3257 -command do_delete_branch \
3258 -font font_ui
3259 lappend disable_on_lock [list .mbar.branch entryconf \
3260 [.mbar.branch index last] -state]
3263 # -- Commit Menu
3265 menu .mbar.commit
3267 .mbar.commit add radiobutton \
3268 -label {New Commit} \
3269 -command do_select_commit_type \
3270 -variable selected_commit_type \
3271 -value new \
3272 -font font_ui
3273 lappend disable_on_lock \
3274 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3276 .mbar.commit add radiobutton \
3277 -label {Amend Last Commit} \
3278 -command do_select_commit_type \
3279 -variable selected_commit_type \
3280 -value amend \
3281 -font font_ui
3282 lappend disable_on_lock \
3283 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3285 .mbar.commit add separator
3287 .mbar.commit add command -label Rescan \
3288 -command do_rescan \
3289 -accelerator F5 \
3290 -font font_ui
3291 lappend disable_on_lock \
3292 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3294 .mbar.commit add command -label {Add To Commit} \
3295 -command do_add_selection \
3296 -font font_ui
3297 lappend disable_on_lock \
3298 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3300 .mbar.commit add command -label {Add All To Commit} \
3301 -command do_add_all \
3302 -accelerator $M1T-I \
3303 -font font_ui
3304 lappend disable_on_lock \
3305 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3307 .mbar.commit add command -label {Unstage From Commit} \
3308 -command do_unstage_selection \
3309 -font font_ui
3310 lappend disable_on_lock \
3311 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3313 .mbar.commit add command -label {Revert Changes} \
3314 -command do_revert_selection \
3315 -font font_ui
3316 lappend disable_on_lock \
3317 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3319 .mbar.commit add separator
3321 .mbar.commit add command -label {Sign Off} \
3322 -command do_signoff \
3323 -accelerator $M1T-S \
3324 -font font_ui
3326 .mbar.commit add command -label Commit \
3327 -command do_commit \
3328 -accelerator $M1T-Return \
3329 -font font_ui
3330 lappend disable_on_lock \
3331 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3333 # -- Transport menus
3335 if {!$single_commit} {
3336 menu .mbar.fetch
3337 menu .mbar.pull
3338 menu .mbar.push
3341 if {[is_MacOSX]} {
3342 # -- Apple Menu (Mac OS X only)
3344 .mbar add cascade -label Apple -menu .mbar.apple
3345 menu .mbar.apple
3347 .mbar.apple add command -label "About [appname]" \
3348 -command do_about \
3349 -font font_ui
3350 .mbar.apple add command -label "[appname] Options..." \
3351 -command do_options \
3352 -font font_ui
3353 } else {
3354 # -- Edit Menu
3356 .mbar.edit add separator
3357 .mbar.edit add command -label {Options...} \
3358 -command do_options \
3359 -font font_ui
3361 # -- Tools Menu
3363 if {[file exists /usr/local/miga/lib/gui-miga]
3364 && [file exists .pvcsrc]} {
3365 proc do_miga {} {
3366 global ui_status_value
3367 if {![lock_index update]} return
3368 set cmd [list sh --login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
3369 set miga_fd [open "|$cmd" r]
3370 fconfigure $miga_fd -blocking 0
3371 fileevent $miga_fd readable [list miga_done $miga_fd]
3372 set ui_status_value {Running miga...}
3374 proc miga_done {fd} {
3375 read $fd 512
3376 if {[eof $fd]} {
3377 close $fd
3378 unlock_index
3379 rescan [list set ui_status_value {Ready.}]
3382 .mbar add cascade -label Tools -menu .mbar.tools
3383 menu .mbar.tools
3384 .mbar.tools add command -label "Migrate" \
3385 -command do_miga \
3386 -font font_ui
3387 lappend disable_on_lock \
3388 [list .mbar.tools entryconf [.mbar.tools index last] -state]
3391 # -- Help Menu
3393 .mbar add cascade -label Help -menu .mbar.help
3394 menu .mbar.help
3396 .mbar.help add command -label "About [appname]" \
3397 -command do_about \
3398 -font font_ui
3402 # -- Branch Control
3404 frame .branch \
3405 -borderwidth 1 \
3406 -relief sunken
3407 label .branch.l1 \
3408 -text {Current Branch:} \
3409 -anchor w \
3410 -justify left \
3411 -font font_ui
3412 label .branch.cb \
3413 -textvariable current_branch \
3414 -anchor w \
3415 -justify left \
3416 -font font_ui
3417 pack .branch.l1 -side left
3418 pack .branch.cb -side left -fill x
3419 pack .branch -side top -fill x
3421 # -- Main Window Layout
3423 panedwindow .vpane -orient vertical
3424 panedwindow .vpane.files -orient horizontal
3425 .vpane add .vpane.files -sticky nsew -height 100 -width 400
3426 pack .vpane -anchor n -side top -fill both -expand 1
3428 # -- Index File List
3430 frame .vpane.files.index -height 100 -width 400
3431 label .vpane.files.index.title -text {Changes To Be Committed} \
3432 -background green \
3433 -font font_ui
3434 text $ui_index -background white -borderwidth 0 \
3435 -width 40 -height 10 \
3436 -font font_ui \
3437 -cursor $cursor_ptr \
3438 -yscrollcommand {.vpane.files.index.sb set} \
3439 -state disabled
3440 scrollbar .vpane.files.index.sb -command [list $ui_index yview]
3441 pack .vpane.files.index.title -side top -fill x
3442 pack .vpane.files.index.sb -side right -fill y
3443 pack $ui_index -side left -fill both -expand 1
3444 .vpane.files add .vpane.files.index -sticky nsew
3446 # -- Working Directory File List
3448 frame .vpane.files.workdir -height 100 -width 100
3449 label .vpane.files.workdir.title -text {Changed But Not Updated} \
3450 -background red \
3451 -font font_ui
3452 text $ui_workdir -background white -borderwidth 0 \
3453 -width 40 -height 10 \
3454 -font font_ui \
3455 -cursor $cursor_ptr \
3456 -yscrollcommand {.vpane.files.workdir.sb set} \
3457 -state disabled
3458 scrollbar .vpane.files.workdir.sb -command [list $ui_workdir yview]
3459 pack .vpane.files.workdir.title -side top -fill x
3460 pack .vpane.files.workdir.sb -side right -fill y
3461 pack $ui_workdir -side left -fill both -expand 1
3462 .vpane.files add .vpane.files.workdir -sticky nsew
3464 foreach i [list $ui_index $ui_workdir] {
3465 $i tag conf in_diff -font font_uibold
3466 $i tag conf in_sel \
3467 -background [$i cget -foreground] \
3468 -foreground [$i cget -background]
3470 unset i
3472 # -- Diff and Commit Area
3474 frame .vpane.lower -height 300 -width 400
3475 frame .vpane.lower.commarea
3476 frame .vpane.lower.diff -relief sunken -borderwidth 1
3477 pack .vpane.lower.commarea -side top -fill x
3478 pack .vpane.lower.diff -side bottom -fill both -expand 1
3479 .vpane add .vpane.lower -stick nsew
3481 # -- Commit Area Buttons
3483 frame .vpane.lower.commarea.buttons
3484 label .vpane.lower.commarea.buttons.l -text {} \
3485 -anchor w \
3486 -justify left \
3487 -font font_ui
3488 pack .vpane.lower.commarea.buttons.l -side top -fill x
3489 pack .vpane.lower.commarea.buttons -side left -fill y
3491 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
3492 -command do_rescan \
3493 -font font_ui
3494 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3495 lappend disable_on_lock \
3496 {.vpane.lower.commarea.buttons.rescan conf -state}
3498 button .vpane.lower.commarea.buttons.incall -text {Add All} \
3499 -command do_add_all \
3500 -font font_ui
3501 pack .vpane.lower.commarea.buttons.incall -side top -fill x
3502 lappend disable_on_lock \
3503 {.vpane.lower.commarea.buttons.incall conf -state}
3505 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
3506 -command do_signoff \
3507 -font font_ui
3508 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3510 button .vpane.lower.commarea.buttons.commit -text {Commit} \
3511 -command do_commit \
3512 -font font_ui
3513 pack .vpane.lower.commarea.buttons.commit -side top -fill x
3514 lappend disable_on_lock \
3515 {.vpane.lower.commarea.buttons.commit conf -state}
3517 # -- Commit Message Buffer
3519 frame .vpane.lower.commarea.buffer
3520 frame .vpane.lower.commarea.buffer.header
3521 set ui_comm .vpane.lower.commarea.buffer.t
3522 set ui_coml .vpane.lower.commarea.buffer.header.l
3523 radiobutton .vpane.lower.commarea.buffer.header.new \
3524 -text {New Commit} \
3525 -command do_select_commit_type \
3526 -variable selected_commit_type \
3527 -value new \
3528 -font font_ui
3529 lappend disable_on_lock \
3530 [list .vpane.lower.commarea.buffer.header.new conf -state]
3531 radiobutton .vpane.lower.commarea.buffer.header.amend \
3532 -text {Amend Last Commit} \
3533 -command do_select_commit_type \
3534 -variable selected_commit_type \
3535 -value amend \
3536 -font font_ui
3537 lappend disable_on_lock \
3538 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3539 label $ui_coml \
3540 -anchor w \
3541 -justify left \
3542 -font font_ui
3543 proc trace_commit_type {varname args} {
3544 global ui_coml commit_type
3545 switch -glob -- $commit_type {
3546 initial {set txt {Initial Commit Message:}}
3547 amend {set txt {Amended Commit Message:}}
3548 amend-initial {set txt {Amended Initial Commit Message:}}
3549 amend-merge {set txt {Amended Merge Commit Message:}}
3550 merge {set txt {Merge Commit Message:}}
3551 * {set txt {Commit Message:}}
3553 $ui_coml conf -text $txt
3555 trace add variable commit_type write trace_commit_type
3556 pack $ui_coml -side left -fill x
3557 pack .vpane.lower.commarea.buffer.header.amend -side right
3558 pack .vpane.lower.commarea.buffer.header.new -side right
3560 text $ui_comm -background white -borderwidth 1 \
3561 -undo true \
3562 -maxundo 20 \
3563 -autoseparators true \
3564 -relief sunken \
3565 -width 75 -height 9 -wrap none \
3566 -font font_diff \
3567 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3568 scrollbar .vpane.lower.commarea.buffer.sby \
3569 -command [list $ui_comm yview]
3570 pack .vpane.lower.commarea.buffer.header -side top -fill x
3571 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3572 pack $ui_comm -side left -fill y
3573 pack .vpane.lower.commarea.buffer -side left -fill y
3575 # -- Commit Message Buffer Context Menu
3577 set ctxm .vpane.lower.commarea.buffer.ctxm
3578 menu $ctxm -tearoff 0
3579 $ctxm add command \
3580 -label {Cut} \
3581 -font font_ui \
3582 -command {tk_textCut $ui_comm}
3583 $ctxm add command \
3584 -label {Copy} \
3585 -font font_ui \
3586 -command {tk_textCopy $ui_comm}
3587 $ctxm add command \
3588 -label {Paste} \
3589 -font font_ui \
3590 -command {tk_textPaste $ui_comm}
3591 $ctxm add command \
3592 -label {Delete} \
3593 -font font_ui \
3594 -command {$ui_comm delete sel.first sel.last}
3595 $ctxm add separator
3596 $ctxm add command \
3597 -label {Select All} \
3598 -font font_ui \
3599 -command {$ui_comm tag add sel 0.0 end}
3600 $ctxm add command \
3601 -label {Copy All} \
3602 -font font_ui \
3603 -command {
3604 $ui_comm tag add sel 0.0 end
3605 tk_textCopy $ui_comm
3606 $ui_comm tag remove sel 0.0 end
3608 $ctxm add separator
3609 $ctxm add command \
3610 -label {Sign Off} \
3611 -font font_ui \
3612 -command do_signoff
3613 bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
3615 # -- Diff Header
3617 set current_diff {}
3618 set diff_actions [list]
3619 proc trace_current_diff {varname args} {
3620 global current_diff diff_actions file_states
3621 if {$current_diff eq {}} {
3622 set s {}
3623 set f {}
3624 set p {}
3625 set o disabled
3626 } else {
3627 set p $current_diff
3628 set s [mapdesc [lindex $file_states($p) 0] $p]
3629 set f {File:}
3630 set p [escape_path $p]
3631 set o normal
3634 .vpane.lower.diff.header.status configure -text $s
3635 .vpane.lower.diff.header.file configure -text $f
3636 .vpane.lower.diff.header.path configure -text $p
3637 foreach w $diff_actions {
3638 uplevel #0 $w $o
3641 trace add variable current_diff write trace_current_diff
3643 frame .vpane.lower.diff.header -background orange
3644 label .vpane.lower.diff.header.status \
3645 -background orange \
3646 -width $max_status_desc \
3647 -anchor w \
3648 -justify left \
3649 -font font_ui
3650 label .vpane.lower.diff.header.file \
3651 -background orange \
3652 -anchor w \
3653 -justify left \
3654 -font font_ui
3655 label .vpane.lower.diff.header.path \
3656 -background orange \
3657 -anchor w \
3658 -justify left \
3659 -font font_ui
3660 pack .vpane.lower.diff.header.status -side left
3661 pack .vpane.lower.diff.header.file -side left
3662 pack .vpane.lower.diff.header.path -fill x
3663 set ctxm .vpane.lower.diff.header.ctxm
3664 menu $ctxm -tearoff 0
3665 $ctxm add command \
3666 -label {Copy} \
3667 -font font_ui \
3668 -command {
3669 clipboard clear
3670 clipboard append \
3671 -format STRING \
3672 -type STRING \
3673 -- $current_diff
3675 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3676 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3678 # -- Diff Body
3680 frame .vpane.lower.diff.body
3681 set ui_diff .vpane.lower.diff.body.t
3682 text $ui_diff -background white -borderwidth 0 \
3683 -width 80 -height 15 -wrap none \
3684 -font font_diff \
3685 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3686 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3687 -state disabled
3688 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3689 -command [list $ui_diff xview]
3690 scrollbar .vpane.lower.diff.body.sby -orient vertical \
3691 -command [list $ui_diff yview]
3692 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3693 pack .vpane.lower.diff.body.sby -side right -fill y
3694 pack $ui_diff -side left -fill both -expand 1
3695 pack .vpane.lower.diff.header -side top -fill x
3696 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3698 $ui_diff tag conf d_@ -font font_diffbold
3699 $ui_diff tag conf d_+ -foreground blue
3700 $ui_diff tag conf d_- -foreground red
3701 $ui_diff tag conf d_++ -foreground {#00a000}
3702 $ui_diff tag conf d_-- -foreground {#a000a0}
3703 $ui_diff tag conf d_+- \
3704 -foreground red \
3705 -background {light goldenrod yellow}
3706 $ui_diff tag conf d_-+ \
3707 -foreground blue \
3708 -background azure2
3710 # -- Diff Body Context Menu
3712 set ctxm .vpane.lower.diff.body.ctxm
3713 menu $ctxm -tearoff 0
3714 $ctxm add command \
3715 -label {Copy} \
3716 -font font_ui \
3717 -command {tk_textCopy $ui_diff}
3718 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3719 $ctxm add command \
3720 -label {Select All} \
3721 -font font_ui \
3722 -command {$ui_diff tag add sel 0.0 end}
3723 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3724 $ctxm add command \
3725 -label {Copy All} \
3726 -font font_ui \
3727 -command {
3728 $ui_diff tag add sel 0.0 end
3729 tk_textCopy $ui_diff
3730 $ui_diff tag remove sel 0.0 end
3732 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3733 $ctxm add separator
3734 $ctxm add command \
3735 -label {Decrease Font Size} \
3736 -font font_ui \
3737 -command {incr_font_size font_diff -1}
3738 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3739 $ctxm add command \
3740 -label {Increase Font Size} \
3741 -font font_ui \
3742 -command {incr_font_size font_diff 1}
3743 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3744 $ctxm add separator
3745 $ctxm add command \
3746 -label {Show Less Context} \
3747 -font font_ui \
3748 -command {if {$repo_config(gui.diffcontext) >= 2} {
3749 incr repo_config(gui.diffcontext) -1
3750 reshow_diff
3752 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3753 $ctxm add command \
3754 -label {Show More Context} \
3755 -font font_ui \
3756 -command {
3757 incr repo_config(gui.diffcontext)
3758 reshow_diff
3760 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3761 $ctxm add separator
3762 $ctxm add command -label {Options...} \
3763 -font font_ui \
3764 -command do_options
3765 bind_button3 $ui_diff "tk_popup $ctxm %X %Y"
3767 # -- Status Bar
3769 set ui_status_value {Initializing...}
3770 label .status -textvariable ui_status_value \
3771 -anchor w \
3772 -justify left \
3773 -borderwidth 1 \
3774 -relief sunken \
3775 -font font_ui
3776 pack .status -anchor w -side bottom -fill x
3778 # -- Load geometry
3780 catch {
3781 set gm $repo_config(gui.geometry)
3782 wm geometry . [lindex $gm 0]
3783 .vpane sash place 0 \
3784 [lindex [.vpane sash coord 0] 0] \
3785 [lindex $gm 1]
3786 .vpane.files sash place 0 \
3787 [lindex $gm 2] \
3788 [lindex [.vpane.files sash coord 0] 1]
3789 unset gm
3792 # -- Key Bindings
3794 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3795 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
3796 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
3797 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3798 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3799 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3800 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3801 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3802 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3803 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3804 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3806 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3807 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3808 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3809 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3810 bind $ui_diff <$M1B-Key-v> {break}
3811 bind $ui_diff <$M1B-Key-V> {break}
3812 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3813 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3814 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3815 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3816 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3817 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3819 if {!$single_commit} {
3820 bind . <$M1B-Key-n> do_create_branch
3821 bind . <$M1B-Key-N> do_create_branch
3824 bind . <Destroy> do_quit
3825 bind all <Key-F5> do_rescan
3826 bind all <$M1B-Key-r> do_rescan
3827 bind all <$M1B-Key-R> do_rescan
3828 bind . <$M1B-Key-s> do_signoff
3829 bind . <$M1B-Key-S> do_signoff
3830 bind . <$M1B-Key-i> do_add_all
3831 bind . <$M1B-Key-I> do_add_all
3832 bind . <$M1B-Key-Return> do_commit
3833 bind all <$M1B-Key-q> do_quit
3834 bind all <$M1B-Key-Q> do_quit
3835 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
3836 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
3837 foreach i [list $ui_index $ui_workdir] {
3838 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
3839 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3840 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
3842 unset i
3844 set file_lists($ui_index) [list]
3845 set file_lists($ui_workdir) [list]
3847 set HEAD {}
3848 set PARENT {}
3849 set MERGE_HEAD [list]
3850 set commit_type {}
3851 set empty_tree {}
3852 set current_branch {}
3853 set current_diff {}
3854 set selected_commit_type new
3856 wm title . "[appname] ([file normalize [file dirname [gitdir]]])"
3857 focus -force $ui_comm
3859 # -- Warn the user about environmental problems. Cygwin's Tcl
3860 # does *not* pass its env array onto any processes it spawns.
3861 # This means that git processes get none of our environment.
3863 if {[is_Windows]} {
3864 set ignored_env 0
3865 set suggest_user {}
3866 set msg "Possible environment issues exist.
3868 The following environment variables are probably
3869 going to be ignored by any Git subprocess run
3870 by [appname]:
3873 foreach name [array names env] {
3874 switch -regexp -- $name {
3875 {^GIT_INDEX_FILE$} -
3876 {^GIT_OBJECT_DIRECTORY$} -
3877 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3878 {^GIT_DIFF_OPTS$} -
3879 {^GIT_EXTERNAL_DIFF$} -
3880 {^GIT_PAGER$} -
3881 {^GIT_TRACE$} -
3882 {^GIT_CONFIG$} -
3883 {^GIT_CONFIG_LOCAL$} -
3884 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3885 append msg " - $name\n"
3886 incr ignored_env
3888 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3889 append msg " - $name\n"
3890 incr ignored_env
3891 set suggest_user $name
3895 if {$ignored_env > 0} {
3896 append msg "
3897 This is due to a known issue with the
3898 Tcl binary distributed by Cygwin."
3900 if {$suggest_user ne {}} {
3901 append msg "
3903 A good replacement for $suggest_user
3904 is placing values for the user.name and
3905 user.email settings into your personal
3906 ~/.gitconfig file.
3909 warn_popup $msg
3911 unset ignored_env msg suggest_user name
3914 # -- Only initialize complex UI if we are going to stay running.
3916 if {!$single_commit} {
3917 load_all_remotes
3918 load_all_heads
3920 populate_branch_menu
3921 populate_fetch_menu .mbar.fetch
3922 populate_pull_menu .mbar.pull
3923 populate_push_menu .mbar.push
3926 # -- Only suggest a gc run if we are going to stay running.
3928 if {!$single_commit} {
3929 set object_limit 2000
3930 if {[is_Windows]} {set object_limit 200}
3931 regexp {^([0-9]+) objects,} [exec git count-objects] _junk objects_current
3932 if {$objects_current >= $object_limit} {
3933 if {[ask_popup \
3934 "This repository currently has $objects_current loose objects.
3936 To maintain optimal performance it is strongly
3937 recommended that you compress the database
3938 when more than $object_limit loose objects exist.
3940 Compress the database now?"] eq yes} {
3941 do_gc
3944 unset object_limit _junk objects_current
3947 lock_index begin-read
3948 after 1 do_rescan