2 # Tcl ignores the next line -*- tcl -*- \
5 # Copyright (C) 2006 Shawn Pearce, Paul Mackerras. All rights reserved.
6 # This program is free software; it may be used, copied, modified
7 # and distributed under the terms of the GNU General Public Licence,
8 # either version 2, or (at your option) any later version.
10 set appname [lindex [file split $argv0] end]
13 ######################################################################
17 proc is_many_config {name} {
18 switch -glob -- $name {
27 proc load_config {include_global} {
28 global repo_config global_config default_config
30 array unset global_config
31 if {$include_global} {
33 set fd_rc [open "| git repo-config --global --list" r]
34 while {[gets $fd_rc line] >= 0} {
35 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
36 if {[is_many_config $name]} {
37 lappend global_config($name) $value
39 set global_config($name) $value
47 array unset repo_config
49 set fd_rc [open "| git repo-config --list" r]
50 while {[gets $fd_rc line] >= 0} {
51 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
52 if {[is_many_config $name]} {
53 lappend repo_config($name) $value
55 set repo_config($name) $value
62 foreach name [array names default_config] {
63 if {[catch {set v $global_config($name)}]} {
64 set global_config($name) $default_config($name)
66 if {[catch {set v $repo_config($name)}]} {
67 set repo_config($name) $default_config($name)
73 global default_config font_descs
74 global repo_config global_config
75 global repo_config_new global_config_new
77 foreach option $font_descs {
78 set name [lindex $option 0]
79 set font [lindex $option 1]
80 font configure $font \
81 -family $global_config_new(gui.$font^^family) \
82 -size $global_config_new(gui.$font^^size)
83 font configure ${font}bold \
84 -family $global_config_new(gui.$font^^family) \
85 -size $global_config_new(gui.$font^^size)
86 set global_config_new(gui.$name) [font configure $font]
87 unset global_config_new(gui.$font^^family)
88 unset global_config_new(gui.$font^^size)
91 foreach name [array names default_config] {
92 set value $global_config_new($name)
93 if {$value ne $global_config($name)} {
94 if {$value eq $default_config($name)} {
95 catch {exec git repo-config --global --unset $name}
97 regsub -all "\[{}\]" $value {"} value
98 exec git repo-config --global $name $value
100 set global_config($name) $value
101 if {$value eq $repo_config($name)} {
102 catch {exec git repo-config --unset $name}
103 set repo_config($name) $value
108 foreach name [array names default_config] {
109 set value $repo_config_new($name)
110 if {$value ne $repo_config($name)} {
111 if {$value eq $global_config($name)} {
112 catch {exec git repo-config --unset $name}
114 regsub -all "\[{}\]" $value {"} value
115 exec git repo-config $name $value
117 set repo_config($name) $value
122 proc error_popup {msg} {
123 global gitdir appname
128 append title [lindex \
129 [file split [file normalize [file dirname $gitdir]]] \
137 -title "$title: error" \
141 proc info_popup {msg} {
142 global gitdir appname
147 append title [lindex \
148 [file split [file normalize [file dirname $gitdir]]] \
160 ######################################################################
164 if { [catch {set cdup [exec git rev-parse --show-cdup]} err]
165 || [catch {set gitdir [exec git rev-parse --git-dir]} err]} {
166 catch {wm withdraw .}
167 error_popup "Cannot find the git directory:\n\n$err"
176 if {$appname eq {git-citool}} {
180 ######################################################################
187 set disable_on_lock [list]
188 set index_lock_type none
194 proc lock_index {type} {
195 global index_lock_type disable_on_lock
197 if {$index_lock_type eq {none}} {
198 set index_lock_type $type
199 foreach w $disable_on_lock {
200 uplevel #0 $w disabled
203 } elseif {$index_lock_type eq {begin-update} && $type eq {update}} {
204 set index_lock_type $type
210 proc unlock_index {} {
211 global index_lock_type disable_on_lock
213 set index_lock_type none
214 foreach w $disable_on_lock {
219 ######################################################################
223 proc repository_state {hdvar ctvar} {
225 upvar $hdvar hd $ctvar ct
227 if {[catch {set hd [exec git rev-parse --verify HEAD]}]} {
229 } elseif {[file exists [file join $gitdir MERGE_HEAD]]} {
236 proc update_status {{final Ready.}} {
237 global HEAD PARENT commit_type
238 global ui_index ui_other ui_status_value ui_comm
239 global status_active file_states
242 if {$status_active || ![lock_index read]} return
244 repository_state new_HEAD new_type
245 if {$commit_type eq {amend}
246 && $new_type eq {normal}
247 && $new_HEAD eq $HEAD} {
251 set commit_type $new_type
254 array unset file_states
256 if {![$ui_comm edit modified]
257 || [string trim [$ui_comm get 0.0 end]] eq {}} {
258 if {[load_message GITGUI_MSG]} {
259 } elseif {[load_message MERGE_MSG]} {
260 } elseif {[load_message SQUASH_MSG]} {
262 $ui_comm edit modified false
266 if {$repo_config(gui.trustmtime) eq {true}} {
267 update_status_stage2 {} $final
270 set ui_status_value {Refreshing file status...}
271 set cmd [list git update-index]
273 lappend cmd --unmerged
274 lappend cmd --ignore-missing
275 lappend cmd --refresh
276 set fd_rf [open "| $cmd" r]
277 fconfigure $fd_rf -blocking 0 -translation binary
278 fileevent $fd_rf readable \
279 [list update_status_stage2 $fd_rf $final]
283 proc update_status_stage2 {fd final} {
284 global gitdir PARENT commit_type
285 global ui_index ui_other ui_status_value ui_comm
287 global buf_rdi buf_rdf buf_rlo
291 if {![eof $fd]} return
295 set ls_others [list | git ls-files --others -z \
296 --exclude-per-directory=.gitignore]
297 set info_exclude [file join $gitdir info exclude]
298 if {[file readable $info_exclude]} {
299 lappend ls_others "--exclude-from=$info_exclude"
307 set ui_status_value {Scanning for modified files ...}
308 set fd_di [open "| git diff-index --cached -z $PARENT" r]
309 set fd_df [open "| git diff-files -z" r]
310 set fd_lo [open $ls_others r]
312 fconfigure $fd_di -blocking 0 -translation binary
313 fconfigure $fd_df -blocking 0 -translation binary
314 fconfigure $fd_lo -blocking 0 -translation binary
315 fileevent $fd_di readable [list read_diff_index $fd_di $final]
316 fileevent $fd_df readable [list read_diff_files $fd_df $final]
317 fileevent $fd_lo readable [list read_ls_others $fd_lo $final]
320 proc load_message {file} {
321 global gitdir ui_comm
323 set f [file join $gitdir $file]
324 if {[file isfile $f]} {
325 if {[catch {set fd [open $f r]}]} {
328 set content [string trim [read $fd]]
330 $ui_comm delete 0.0 end
331 $ui_comm insert end $content
337 proc read_diff_index {fd final} {
340 append buf_rdi [read $fd]
342 set n [string length $buf_rdi]
344 set z1 [string first "\0" $buf_rdi $c]
347 set z2 [string first "\0" $buf_rdi $z1]
353 [string range $buf_rdi $z1 $z2] \
354 [string index $buf_rdi [expr $z1 - 2]]_
358 set buf_rdi [string range $buf_rdi $c end]
363 status_eof $fd buf_rdi $final
366 proc read_diff_files {fd final} {
369 append buf_rdf [read $fd]
371 set n [string length $buf_rdf]
373 set z1 [string first "\0" $buf_rdf $c]
376 set z2 [string first "\0" $buf_rdf $z1]
382 [string range $buf_rdf $z1 $z2] \
383 _[string index $buf_rdf [expr $z1 - 2]]
387 set buf_rdf [string range $buf_rdf $c end]
392 status_eof $fd buf_rdf $final
395 proc read_ls_others {fd final} {
398 append buf_rlo [read $fd]
399 set pck [split $buf_rlo "\0"]
400 set buf_rlo [lindex $pck end]
401 foreach p [lrange $pck 0 end-1] {
404 status_eof $fd buf_rlo $final
407 proc status_eof {fd buf final} {
408 global status_active ui_status_value
415 if {[incr status_active -1] == 0} {
419 set ui_status_value $final
424 ######################################################################
429 global ui_diff ui_fname_value ui_fstatus_value ui_index ui_other
431 $ui_diff conf -state normal
432 $ui_diff delete 0.0 end
433 $ui_diff conf -state disabled
435 set ui_fname_value {}
436 set ui_fstatus_value {}
438 $ui_index tag remove in_diff 0.0 end
439 $ui_other tag remove in_diff 0.0 end
442 proc reshow_diff {} {
443 global ui_fname_value ui_status_value file_states
445 if {$ui_fname_value eq {}
446 || [catch {set s $file_states($ui_fname_value)}]} {
449 show_diff $ui_fname_value
453 proc handle_empty_diff {} {
454 global ui_fname_value file_states file_lists
456 set path $ui_fname_value
457 set s $file_states($path)
458 if {[lindex $s 0] ne {_M}} return
460 info_popup "No differences detected.
462 [short_path $path] has no changes.
464 The modification date of this file was updated by another
465 application and you currently have the Trust File Modification
466 Timestamps option enabled, so Git did not automatically detect
467 that there are no content differences in this file.
469 This file will now be removed from the modified files list, to
470 prevent possible confusion.
472 if {[catch {exec git update-index -- $path} err]} {
473 error_popup "Failed to refresh index:\n\n$err"
477 set old_w [mapcol [lindex $file_states($path) 0] $path]
478 set lno [lsearch -sorted $file_lists($old_w) $path]
480 set file_lists($old_w) \
481 [lreplace $file_lists($old_w) $lno $lno]
483 $old_w conf -state normal
484 $old_w delete $lno.0 [expr $lno + 1].0
485 $old_w conf -state disabled
489 proc show_diff {path {w {}} {lno {}}} {
490 global file_states file_lists
491 global PARENT diff_3way diff_active
492 global ui_diff ui_fname_value ui_fstatus_value ui_status_value
494 if {$diff_active || ![lock_index read]} return
497 if {$w eq {} || $lno == {}} {
498 foreach w [array names file_lists] {
499 set lno [lsearch -sorted $file_lists($w) $path]
506 if {$w ne {} && $lno >= 1} {
507 $w tag add in_diff $lno.0 [expr $lno + 1].0
510 set s $file_states($path)
514 set ui_fname_value [escape_path $path]
515 set ui_fstatus_value [mapdesc $m $path]
516 set ui_status_value "Loading diff of [escape_path $path]..."
518 set cmd [list | git diff-index -p $PARENT -- $path]
521 set cmd [list | git diff-index -p -c $PARENT $path]
525 set fd [open $path r]
526 set content [read $fd]
531 set ui_status_value "Unable to display [escape_path $path]"
532 error_popup "Error loading file:\n\n$err"
535 $ui_diff conf -state normal
536 $ui_diff insert end $content
537 $ui_diff conf -state disabled
540 set ui_status_value {Ready.}
545 if {[catch {set fd [open $cmd r]} err]} {
548 set ui_status_value "Unable to display [escape_path $path]"
549 error_popup "Error loading diff:\n\n$err"
553 fconfigure $fd -blocking 0 -translation auto
554 fileevent $fd readable [list read_diff $fd]
557 proc read_diff {fd} {
558 global ui_diff ui_status_value diff_3way diff_active
561 while {[gets $fd line] >= 0} {
562 if {[string match {diff --git *} $line]} continue
563 if {[string match {diff --combined *} $line]} continue
564 if {[string match {--- *} $line]} continue
565 if {[string match {+++ *} $line]} continue
566 if {[string match index* $line]} {
567 if {[string first , $line] >= 0} {
572 $ui_diff conf -state normal
574 set x [string index $line 0]
579 default {set tags {}}
582 set x [string range $line 0 1]
584 default {set tags {}}
586 "++" {set tags dp; set x " +"}
587 " +" {set tags {di bold}; set x "++"}
588 "+ " {set tags dni; set x "-+"}
589 "--" {set tags dm; set x " -"}
590 " -" {set tags {dm bold}; set x "--"}
591 "- " {set tags di; set x "+-"}
592 default {set tags {}}
594 set line [string replace $line 0 1 $x]
596 $ui_diff insert end $line $tags
597 $ui_diff insert end "\n"
598 $ui_diff conf -state disabled
605 set ui_status_value {Ready.}
607 if {$repo_config(gui.trustmtime) eq {true}
608 && [$ui_diff index end] eq {2.0}} {
614 ######################################################################
618 proc load_last_commit {} {
619 global HEAD PARENT commit_type ui_comm
621 if {$commit_type eq {amend}} return
622 if {$commit_type ne {normal}} {
623 error_popup "Can't amend a $commit_type commit."
631 set fd [open "| git cat-file commit $HEAD" r]
632 while {[gets $fd line] > 0} {
633 if {[string match {parent *} $line]} {
634 set parent [string range $line 7 end]
638 set msg [string trim [read $fd]]
641 error_popup "Error loading commit data for amend:\n\n$err"
645 if {$parent_count == 0} {
646 set commit_type amend
650 } elseif {$parent_count == 1} {
651 set commit_type amend
653 $ui_comm delete 0.0 end
654 $ui_comm insert end $msg
655 $ui_comm edit modified false
659 error_popup {You can't amend a merge commit.}
664 proc commit_tree {} {
665 global tcl_platform HEAD gitdir commit_type file_states
667 global ui_status_value ui_comm
669 if {![lock_index update]} return
671 # -- Our in memory state should match the repository.
673 repository_state curHEAD cur_type
674 if {$commit_type eq {amend}
675 && $cur_type eq {normal}
676 && $curHEAD eq $HEAD} {
677 } elseif {$commit_type ne $cur_type || $HEAD ne $curHEAD} {
678 error_popup {Last scanned state does not match repository state.
680 Its highly likely that another Git program modified the
681 repository since our last scan. A rescan is required
689 # -- At least one file should differ in the index.
692 foreach path [array names file_states] {
693 set s $file_states($path)
694 switch -glob -- [lindex $s 0] {
698 M? {set files_ready 1; break}
700 error_popup "Unmerged files cannot be committed.
702 File [short_path $path] has merge conflicts.
703 You must resolve them and include the file before committing.
709 error_popup "Unknown file state [lindex $s 0] detected.
711 File [short_path $path] cannot be committed by this program.
717 error_popup {No included files to commit.
719 You must include at least 1 file before you can commit.
725 # -- A message is required.
727 set msg [string trim [$ui_comm get 1.0 end]]
729 error_popup {Please supply a commit message.
731 A good commit message has the following format:
733 - First line: Describe in one sentance what you did.
735 - Remaining lines: Describe why this change is good.
741 # -- Ask the pre-commit hook for the go-ahead.
743 set pchook [file join $gitdir hooks pre-commit]
744 if {$tcl_platform(platform) eq {windows} && [file isfile $pchook]} {
745 set pchook [list sh -c [concat \
746 "if test -x \"$pchook\";" \
747 "then exec \"$pchook\" 2>&1;" \
749 } elseif {[file executable $pchook]} {
750 set pchook [list $pchook |& cat]
755 set ui_status_value {Calling pre-commit hook...}
757 set fd_ph [open "| $pchook" r]
758 fconfigure $fd_ph -blocking 0 -translation binary
759 fileevent $fd_ph readable \
760 [list commit_stage1 $fd_ph $curHEAD $msg]
762 commit_stage2 $curHEAD $msg
766 proc commit_stage1 {fd_ph curHEAD msg} {
767 global pch_error ui_status_value
769 append pch_error [read $fd_ph]
770 fconfigure $fd_ph -blocking 1
772 if {[catch {close $fd_ph}]} {
773 set ui_status_value {Commit declined by pre-commit hook.}
774 hook_failed_popup pre-commit $pch_error
777 commit_stage2 $curHEAD $msg
781 fconfigure $fd_ph -blocking 0
785 proc commit_stage2 {curHEAD msg} {
786 global ui_status_value
788 # -- Write the tree in the background.
790 set ui_status_value {Committing changes...}
791 set fd_wt [open "| git write-tree" r]
792 fileevent $fd_wt readable [list commit_stage3 $fd_wt $curHEAD $msg]
795 proc commit_stage3 {fd_wt curHEAD msg} {
796 global single_commit gitdir HEAD PARENT commit_type tcl_platform
797 global ui_status_value ui_comm
801 if {$tree_id eq {} || [catch {close $fd_wt} err]} {
802 error_popup "write-tree failed:\n\n$err"
803 set ui_status_value {Commit failed.}
808 # -- Create the commit.
810 set cmd [list git commit-tree $tree_id]
812 lappend cmd -p $PARENT
814 if {$commit_type eq {merge}} {
816 set fd_mh [open [file join $gitdir MERGE_HEAD] r]
817 while {[gets $fd_mh merge_head] >= 0} {
818 lappend cmd -p $merge_head
822 error_popup "Loading MERGE_HEAD failed:\n\n$err"
823 set ui_status_value {Commit failed.}
829 # git commit-tree writes to stderr during initial commit.
830 lappend cmd 2>/dev/null
833 if {[catch {set cmt_id [eval exec $cmd]} err]} {
834 error_popup "commit-tree failed:\n\n$err"
835 set ui_status_value {Commit failed.}
840 # -- Update the HEAD ref.
843 if {$commit_type ne {normal}} {
844 append reflogm " ($commit_type)"
846 set i [string first "\n" $msg]
848 append reflogm {: } [string range $msg 0 [expr $i - 1]]
850 append reflogm {: } $msg
852 set cmd [list git update-ref -m $reflogm HEAD $cmt_id $curHEAD]
853 if {[catch {eval exec $cmd} err]} {
854 error_popup "update-ref failed:\n\n$err"
855 set ui_status_value {Commit failed.}
860 # -- Cleanup after ourselves.
862 catch {file delete [file join $gitdir MERGE_HEAD]}
863 catch {file delete [file join $gitdir MERGE_MSG]}
864 catch {file delete [file join $gitdir SQUASH_MSG]}
865 catch {file delete [file join $gitdir GITGUI_MSG]}
867 # -- Let rerere do its thing.
869 if {[file isdirectory [file join $gitdir rr-cache]]} {
870 catch {exec git rerere}
873 # -- Run the post-commit hook.
875 set pchook [file join $gitdir hooks post-commit]
876 if {$tcl_platform(platform) eq {windows} && [file isfile $pchook]} {
877 set pchook [list sh -c [concat \
878 "if test -x \"$pchook\";" \
879 "then exec \"$pchook\";" \
881 } elseif {![file executable $pchook]} {
885 catch {exec $pchook &}
888 $ui_comm delete 0.0 end
889 $ui_comm edit modified false
892 if {$single_commit} do_quit
894 # -- Update status without invoking any git commands.
896 set commit_type normal
900 foreach path [array names file_states] {
901 set s $file_states($path)
906 D? {set m _[string index $m 1]}
910 unset file_states($path)
912 lset file_states($path) 0 $m
919 set ui_status_value \
920 "Changes committed as [string range $cmt_id 0 7]."
923 ######################################################################
927 proc fetch_from {remote} {
928 set w [new_console "fetch $remote" \
929 "Fetching new changes from $remote"]
930 set cmd [list git fetch]
935 proc pull_remote {remote branch} {
936 global HEAD commit_type file_states repo_config
938 if {![lock_index update]} return
940 # -- Our in memory state should match the repository.
942 repository_state curHEAD cur_type
943 if {$commit_type ne $cur_type || $HEAD ne $curHEAD} {
944 error_popup {Last scanned state does not match repository state.
946 Its highly likely that another Git program modified the
947 repository since our last scan. A rescan is required
948 before a pull can be started.
955 # -- No differences should exist before a pull.
957 if {[array size file_states] != 0} {
958 error_popup {Uncommitted but modified files are present.
960 You should not perform a pull with unmodified files in your working
961 directory as Git would be unable to recover from an incorrect merge.
963 Commit or throw away all changes before starting a pull operation.
969 set w [new_console "pull $remote $branch" \
970 "Pulling new changes from branch $branch in $remote"]
971 set cmd [list git pull]
972 if {$repo_config(gui.pullsummary) eq {false}} {
973 lappend cmd --no-summary
977 console_exec $w $cmd [list post_pull_remote $remote $branch]
980 proc post_pull_remote {remote branch success} {
981 global HEAD PARENT commit_type
982 global ui_status_value
986 repository_state HEAD commit_type
988 set $ui_status_value {Ready.}
991 "Conflicts detected while pulling $branch from $remote."
995 proc push_to {remote} {
996 set w [new_console "push $remote" \
997 "Pushing changes to $remote"]
998 set cmd [list git push]
1000 console_exec $w $cmd
1003 ######################################################################
1007 proc mapcol {state path} {
1008 global all_cols ui_other
1010 if {[catch {set r $all_cols($state)}]} {
1011 puts "error: no column for state={$state} $path"
1017 proc mapicon {state path} {
1020 if {[catch {set r $all_icons($state)}]} {
1021 puts "error: no icon for state={$state} $path"
1027 proc mapdesc {state path} {
1030 if {[catch {set r $all_descs($state)}]} {
1031 puts "error: no desc for state={$state} $path"
1037 proc escape_path {path} {
1038 regsub -all "\n" $path "\\n" path
1042 proc short_path {path} {
1043 return [escape_path [lindex [file split $path] end]]
1048 proc merge_state {path new_state} {
1049 global file_states next_icon_id
1051 set s0 [string index $new_state 0]
1052 set s1 [string index $new_state 1]
1054 if {[catch {set info $file_states($path)}]} {
1056 set icon n[incr next_icon_id]
1058 set state [lindex $info 0]
1059 set icon [lindex $info 1]
1063 set s0 [string index $state 0]
1064 } elseif {$s0 eq {*}} {
1069 set s1 [string index $state 1]
1070 } elseif {$s1 eq {*}} {
1074 set file_states($path) [list $s0$s1 $icon]
1078 proc display_file {path state} {
1079 global file_states file_lists status_active
1081 set old_m [merge_state $path $state]
1082 if {$status_active} return
1084 set s $file_states($path)
1085 set new_m [lindex $s 0]
1086 set new_w [mapcol $new_m $path]
1087 set old_w [mapcol $old_m $path]
1088 set new_icon [mapicon $new_m $path]
1090 if {$new_w ne $old_w} {
1091 set lno [lsearch -sorted $file_lists($old_w) $path]
1094 $old_w conf -state normal
1095 $old_w delete $lno.0 [expr $lno + 1].0
1096 $old_w conf -state disabled
1099 lappend file_lists($new_w) $path
1100 set file_lists($new_w) [lsort $file_lists($new_w)]
1101 set lno [lsearch -sorted $file_lists($new_w) $path]
1103 $new_w conf -state normal
1104 $new_w image create $lno.0 \
1105 -align center -padx 5 -pady 1 \
1106 -name [lindex $s 1] \
1108 $new_w insert $lno.1 "[escape_path $path]\n"
1109 $new_w conf -state disabled
1110 } elseif {$new_icon ne [mapicon $old_m $path]} {
1111 $new_w conf -state normal
1112 $new_w image conf [lindex $s 1] -image $new_icon
1113 $new_w conf -state disabled
1117 proc display_all_files {} {
1118 global ui_index ui_other file_states file_lists
1120 $ui_index conf -state normal
1121 $ui_other conf -state normal
1123 $ui_index delete 0.0 end
1124 $ui_other delete 0.0 end
1126 set file_lists($ui_index) [list]
1127 set file_lists($ui_other) [list]
1129 foreach path [lsort [array names file_states]] {
1130 set s $file_states($path)
1132 set w [mapcol $m $path]
1133 lappend file_lists($w) $path
1134 $w image create end \
1135 -align center -padx 5 -pady 1 \
1136 -name [lindex $s 1] \
1137 -image [mapicon $m $path]
1138 $w insert end "[escape_path $path]\n"
1141 $ui_index conf -state disabled
1142 $ui_other conf -state disabled
1145 proc update_index {pathList} {
1146 global update_index_cp update_index_rsd ui_status_value
1148 if {![lock_index update]} return
1150 set update_index_cp 0
1151 set update_index_rsd 0
1152 set totalCnt [llength $pathList]
1153 set batch [expr {int($totalCnt * .01) + 1}]
1154 if {$batch > 25} {set batch 25}
1156 set ui_status_value "Including files ... 0/$totalCnt 0%"
1157 set ui_status_value [format \
1158 "Including files ... %i/%i files (%.2f%%)" \
1162 set fd [open "| git update-index --add --remove -z --stdin" w]
1163 fconfigure $fd -blocking 0 -translation binary
1164 fileevent $fd writable [list \
1165 write_update_index \
1173 proc write_update_index {fd pathList totalCnt batch} {
1174 global update_index_cp update_index_rsd ui_status_value
1175 global file_states ui_fname_value
1177 if {$update_index_cp >= $totalCnt} {
1180 if {$update_index_rsd} {
1181 show_diff $ui_fname_value
1183 set ui_status_value {Ready.}
1188 for {set i $batch} \
1189 {$update_index_cp < $totalCnt && $i > 0} \
1191 set path [lindex $pathList $update_index_cp]
1192 incr update_index_cp
1194 switch -- [lindex $file_states($path) 0] {
1204 puts -nonewline $fd $path
1205 puts -nonewline $fd "\0"
1206 display_file $path $new
1207 if {$ui_fname_value eq $path} {
1208 set update_index_rsd 1
1212 set ui_status_value [format \
1213 "Including files ... %i/%i files (%.2f%%)" \
1216 [expr {100.0 * $update_index_cp / $totalCnt}]]
1219 ######################################################################
1221 ## remote management
1223 proc load_all_remotes {} {
1224 global gitdir all_remotes repo_config
1226 set all_remotes [list]
1227 set rm_dir [file join $gitdir remotes]
1228 if {[file isdirectory $rm_dir]} {
1229 set all_remotes [concat $all_remotes [glob \
1233 -directory $rm_dir *]]
1236 foreach line [array names repo_config remote.*.url] {
1237 if {[regexp ^remote\.(.*)\.url\$ $line line name]} {
1238 lappend all_remotes $name
1242 set all_remotes [lsort -unique $all_remotes]
1245 proc populate_remote_menu {m pfx op} {
1248 foreach remote $all_remotes {
1249 $m add command -label "$pfx $remote..." \
1250 -command [list $op $remote] \
1255 proc populate_pull_menu {m} {
1256 global gitdir repo_config all_remotes disable_on_lock
1258 foreach remote $all_remotes {
1260 if {[array get repo_config remote.$remote.url] ne {}} {
1261 if {[array get repo_config remote.$remote.fetch] ne {}} {
1262 regexp {^([^:]+):} \
1263 [lindex $repo_config(remote.$remote.fetch) 0] \
1268 set fd [open [file join $gitdir remotes $remote] r]
1269 while {[gets $fd line] >= 0} {
1270 if {[regexp {^Pull:[ \t]*([^:]+):} $line line rb]} {
1279 regsub ^refs/heads/ $rb {} rb_short
1280 if {$rb_short ne {}} {
1282 -label "Branch $rb_short from $remote..." \
1283 -command [list pull_remote $remote $rb] \
1285 lappend disable_on_lock \
1286 [list $m entryconf [$m index last] -state]
1291 ######################################################################
1296 #define mask_width 14
1297 #define mask_height 15
1298 static unsigned char mask_bits[] = {
1299 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1300 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1301 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1304 image create bitmap file_plain -background white -foreground black -data {
1305 #define plain_width 14
1306 #define plain_height 15
1307 static unsigned char plain_bits[] = {
1308 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1309 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1310 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1311 } -maskdata $filemask
1313 image create bitmap file_mod -background white -foreground blue -data {
1314 #define mod_width 14
1315 #define mod_height 15
1316 static unsigned char mod_bits[] = {
1317 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1318 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1319 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1320 } -maskdata $filemask
1322 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1323 #define file_fulltick_width 14
1324 #define file_fulltick_height 15
1325 static unsigned char file_fulltick_bits[] = {
1326 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1327 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1328 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1329 } -maskdata $filemask
1331 image create bitmap file_parttick -background white -foreground "#005050" -data {
1332 #define parttick_width 14
1333 #define parttick_height 15
1334 static unsigned char parttick_bits[] = {
1335 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1336 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1337 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1338 } -maskdata $filemask
1340 image create bitmap file_question -background white -foreground black -data {
1341 #define file_question_width 14
1342 #define file_question_height 15
1343 static unsigned char file_question_bits[] = {
1344 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1345 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1346 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1347 } -maskdata $filemask
1349 image create bitmap file_removed -background white -foreground red -data {
1350 #define file_removed_width 14
1351 #define file_removed_height 15
1352 static unsigned char file_removed_bits[] = {
1353 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1354 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1355 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1356 } -maskdata $filemask
1358 image create bitmap file_merge -background white -foreground blue -data {
1359 #define file_merge_width 14
1360 #define file_merge_height 15
1361 static unsigned char file_merge_bits[] = {
1362 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1363 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1364 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1365 } -maskdata $filemask
1367 set ui_index .vpane.files.index.list
1368 set ui_other .vpane.files.other.list
1369 set max_status_desc 0
1371 {__ i plain "Unmodified"}
1372 {_M i mod "Modified"}
1373 {M_ i fulltick "Checked in"}
1374 {MM i parttick "Partially included"}
1376 {_O o plain "Untracked"}
1377 {A_ o fulltick "Added"}
1378 {AM o parttick "Partially added"}
1379 {AD o question "Added (but now gone)"}
1381 {_D i question "Missing"}
1382 {D_ i removed "Removed"}
1383 {DD i removed "Removed"}
1384 {DO i removed "Removed (still exists)"}
1386 {UM i merge "Merge conflicts"}
1387 {U_ i merge "Merge conflicts"}
1389 if {$max_status_desc < [string length [lindex $i 3]]} {
1390 set max_status_desc [string length [lindex $i 3]]
1392 if {[lindex $i 1] eq {i}} {
1393 set all_cols([lindex $i 0]) $ui_index
1395 set all_cols([lindex $i 0]) $ui_other
1397 set all_icons([lindex $i 0]) file_[lindex $i 2]
1398 set all_descs([lindex $i 0]) [lindex $i 3]
1402 ######################################################################
1407 global tcl_platform tk_library
1408 if {$tcl_platform(platform) eq {unix}
1409 && $tcl_platform(os) eq {Darwin}
1410 && [string match /Library/Frameworks/* $tk_library]} {
1416 proc bind_button3 {w cmd} {
1417 bind $w <Any-Button-3> $cmd
1419 bind $w <Control-Button-1> $cmd
1423 proc incr_font_size {font {amt 1}} {
1424 set sz [font configure $font -size]
1426 font configure $font -size $sz
1427 font configure ${font}bold -size $sz
1430 proc hook_failed_popup {hook msg} {
1431 global gitdir appname
1437 label $w.m.l1 -text "$hook hook failed:" \
1442 -background white -borderwidth 1 \
1444 -width 80 -height 10 \
1446 -yscrollcommand [list $w.m.sby set]
1448 -text {You must correct the above errors before committing.} \
1452 scrollbar $w.m.sby -command [list $w.m.t yview]
1453 pack $w.m.l1 -side top -fill x
1454 pack $w.m.l2 -side bottom -fill x
1455 pack $w.m.sby -side right -fill y
1456 pack $w.m.t -side left -fill both -expand 1
1457 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
1459 $w.m.t insert 1.0 $msg
1460 $w.m.t conf -state disabled
1462 button $w.ok -text OK \
1465 -command "destroy $w"
1466 pack $w.ok -side bottom
1468 bind $w <Visibility> "grab $w; focus $w"
1469 bind $w <Key-Return> "destroy $w"
1470 wm title $w "$appname ([lindex [file split \
1471 [file normalize [file dirname $gitdir]]] \
1476 set next_console_id 0
1478 proc new_console {short_title long_title} {
1479 global next_console_id console_data
1480 set w .console[incr next_console_id]
1481 set console_data($w) [list $short_title $long_title]
1482 return [console_init $w]
1485 proc console_init {w} {
1486 global console_cr console_data
1487 global gitdir appname M1B
1489 set console_cr($w) 1.0
1492 label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
1497 -background white -borderwidth 1 \
1499 -width 80 -height 10 \
1502 -yscrollcommand [list $w.m.sby set]
1503 label $w.m.s -anchor w \
1506 scrollbar $w.m.sby -command [list $w.m.t yview]
1507 pack $w.m.l1 -side top -fill x
1508 pack $w.m.s -side bottom -fill x
1509 pack $w.m.sby -side right -fill y
1510 pack $w.m.t -side left -fill both -expand 1
1511 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
1513 menu $w.ctxm -tearoff 0
1514 $w.ctxm add command -label "Copy" \
1516 -command "tk_textCopy $w.m.t"
1517 $w.ctxm add command -label "Select All" \
1519 -command "$w.m.t tag add sel 0.0 end"
1520 $w.ctxm add command -label "Copy All" \
1523 $w.m.t tag add sel 0.0 end
1525 $w.m.t tag remove sel 0.0 end
1528 button $w.ok -text {Running...} \
1532 -command "destroy $w"
1533 pack $w.ok -side bottom
1535 bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
1536 bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
1537 bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
1538 bind $w <Visibility> "focus $w"
1539 wm title $w "$appname ([lindex [file split \
1540 [file normalize [file dirname $gitdir]]] \
1541 end]): [lindex $console_data($w) 0]"
1545 proc console_exec {w cmd {after {}}} {
1548 # -- Windows tosses the enviroment when we exec our child.
1549 # But most users need that so we have to relogin. :-(
1551 if {$tcl_platform(platform) eq {windows}} {
1552 set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
1555 # -- Tcl won't let us redirect both stdout and stderr to
1556 # the same pipe. So pass it through cat...
1558 set cmd [concat | $cmd |& cat]
1560 set fd_f [open $cmd r]
1561 fconfigure $fd_f -blocking 0 -translation binary
1562 fileevent $fd_f readable [list console_read $w $fd_f $after]
1565 proc console_read {w fd after} {
1566 global console_cr console_data
1570 if {![winfo exists $w]} {console_init $w}
1571 $w.m.t conf -state normal
1573 set n [string length $buf]
1575 set cr [string first "\r" $buf $c]
1576 set lf [string first "\n" $buf $c]
1577 if {$cr < 0} {set cr [expr $n + 1]}
1578 if {$lf < 0} {set lf [expr $n + 1]}
1581 $w.m.t insert end [string range $buf $c $lf]
1582 set console_cr($w) [$w.m.t index {end -1c}]
1586 $w.m.t delete $console_cr($w) end
1587 $w.m.t insert end "\n"
1588 $w.m.t insert end [string range $buf $c $cr]
1593 $w.m.t conf -state disabled
1597 fconfigure $fd -blocking 1
1599 if {[catch {close $fd}]} {
1600 if {![winfo exists $w]} {console_init $w}
1601 $w.m.s conf -background red -text {Error: Command Failed}
1602 $w.ok conf -text Close
1603 $w.ok conf -state normal
1605 } elseif {[winfo exists $w]} {
1606 $w.m.s conf -background green -text {Success}
1607 $w.ok conf -text Close
1608 $w.ok conf -state normal
1611 array unset console_cr $w
1612 array unset console_data $w
1614 uplevel #0 $after $ok
1618 fconfigure $fd -blocking 0
1621 ######################################################################
1625 set starting_gitk_msg {Please wait... Starting gitk...}
1628 global tcl_platform ui_status_value starting_gitk_msg
1630 set ui_status_value $starting_gitk_msg
1632 if {$ui_status_value eq $starting_gitk_msg} {
1633 set ui_status_value {Ready.}
1637 if {$tcl_platform(platform) eq {windows}} {
1645 set w [new_console "repack" "Repacking the object database"]
1646 set cmd [list git repack]
1649 console_exec $w $cmd
1655 global gitdir ui_comm is_quitting repo_config
1657 if {$is_quitting} return
1660 # -- Stash our current commit buffer.
1662 set save [file join $gitdir GITGUI_MSG]
1663 set msg [string trim [$ui_comm get 0.0 end]]
1664 if {[$ui_comm edit modified] && $msg ne {}} {
1666 set fd [open $save w]
1667 puts $fd [string trim [$ui_comm get 0.0 end]]
1670 } elseif {$msg eq {} && [file exists $save]} {
1674 # -- Stash our current window geometry into this repository.
1676 set cfg_geometry [list]
1677 lappend cfg_geometry [wm geometry .]
1678 lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
1679 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
1680 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
1683 if {$cfg_geometry ne $rc_geometry} {
1684 catch {exec git repo-config gui.geometry $cfg_geometry}
1694 proc do_include_all {} {
1697 if {![lock_index begin-update]} return
1700 foreach path [array names file_states] {
1701 set s $file_states($path)
1707 _D {lappend pathList $path}
1710 if {$pathList eq {}} {
1713 update_index $pathList
1717 set GIT_COMMITTER_IDENT {}
1719 proc do_signoff {} {
1720 global ui_comm GIT_COMMITTER_IDENT
1722 if {$GIT_COMMITTER_IDENT eq {}} {
1723 if {[catch {set me [exec git var GIT_COMMITTER_IDENT]} err]} {
1724 error_popup "Unable to obtain your identity:\n\n$err"
1727 if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \
1728 $me me GIT_COMMITTER_IDENT]} {
1729 error_popup "Invalid GIT_COMMITTER_IDENT:\n\n$me"
1734 set sob "Signed-off-by: $GIT_COMMITTER_IDENT"
1735 set last [$ui_comm get {end -1c linestart} {end -1c}]
1736 if {$last ne $sob} {
1737 $ui_comm edit separator
1739 && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
1740 $ui_comm insert end "\n"
1742 $ui_comm insert end "\n$sob"
1743 $ui_comm edit separator
1748 proc do_amend_last {} {
1756 proc do_options {} {
1757 global appname gitdir font_descs
1758 global repo_config global_config
1759 global repo_config_new global_config_new
1762 array unset repo_config_new
1763 array unset global_config_new
1764 foreach name [array names repo_config] {
1765 set repo_config_new($name) $repo_config($name)
1767 foreach name [array names global_config] {
1768 set global_config_new($name) $global_config($name)
1770 set reponame [lindex [file split \
1771 [file normalize [file dirname $gitdir]]] \
1774 set w .options_editor
1776 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
1778 label $w.header -text "$appname Options" \
1780 pack $w.header -side top -fill x
1783 button $w.buttons.restore -text {Restore Defaults} \
1785 -command do_restore_defaults
1786 pack $w.buttons.restore -side left
1787 button $w.buttons.save -text Save \
1789 -command [list do_save_config $w]
1790 pack $w.buttons.save -side right
1791 button $w.buttons.cancel -text {Cancel} \
1793 -command [list destroy $w]
1794 pack $w.buttons.cancel -side right
1795 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
1797 labelframe $w.repo -text "$reponame Repository" \
1799 -relief raised -borderwidth 2
1800 labelframe $w.global -text {Global (All Repositories)} \
1802 -relief raised -borderwidth 2
1803 pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
1804 pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
1807 {pullsummary {Show Pull Summary}}
1808 {trustmtime {Trust File Modification Timestamps}}
1810 set name [lindex $option 0]
1811 set text [lindex $option 1]
1812 foreach f {repo global} {
1813 checkbutton $w.$f.$name -text $text \
1814 -variable ${f}_config_new(gui.$name) \
1818 pack $w.$f.$name -side top -anchor w
1822 set all_fonts [lsort [font families]]
1823 foreach option $font_descs {
1824 set name [lindex $option 0]
1825 set font [lindex $option 1]
1826 set text [lindex $option 2]
1828 set global_config_new(gui.$font^^family) \
1829 [font configure $font -family]
1830 set global_config_new(gui.$font^^size) \
1831 [font configure $font -size]
1833 frame $w.global.$name
1834 label $w.global.$name.l -text "$text:" -font font_ui
1835 pack $w.global.$name.l -side left -anchor w -fill x
1836 eval tk_optionMenu $w.global.$name.family \
1837 global_config_new(gui.$font^^family) \
1839 spinbox $w.global.$name.size \
1840 -textvariable global_config_new(gui.$font^^size) \
1841 -from 2 -to 80 -increment 1 \
1844 pack $w.global.$name.size -side right -anchor e
1845 pack $w.global.$name.family -side right -anchor e
1846 pack $w.global.$name -side top -anchor w -fill x
1849 bind $w <Visibility> "grab $w; focus $w"
1850 bind $w <Key-Escape> "destroy $w"
1851 wm title $w "$appname ($reponame): Options"
1855 proc do_restore_defaults {} {
1856 global font_descs default_config repo_config
1857 global repo_config_new global_config_new
1859 foreach name [array names default_config] {
1860 set repo_config_new($name) $default_config($name)
1861 set global_config_new($name) $default_config($name)
1864 foreach option $font_descs {
1865 set name [lindex $option 0]
1866 set repo_config(gui.$name) $default_config(gui.$name)
1870 foreach option $font_descs {
1871 set name [lindex $option 0]
1872 set font [lindex $option 1]
1873 set global_config_new(gui.$font^^family) \
1874 [font configure $font -family]
1875 set global_config_new(gui.$font^^size) \
1876 [font configure $font -size]
1880 proc do_save_config {w} {
1881 if {[catch {save_config} err]} {
1882 error_popup "Failed to completely save options:\n\n$err"
1887 # shift == 1: left click
1889 proc click {w x y shift wx wy} {
1890 global ui_index ui_other file_lists
1892 set pos [split [$w index @$x,$y] .]
1893 set lno [lindex $pos 0]
1894 set col [lindex $pos 1]
1895 set path [lindex $file_lists($w) [expr $lno - 1]]
1896 if {$path eq {}} return
1898 if {$col > 0 && $shift == 1} {
1899 show_diff $path $w $lno
1903 proc unclick {w x y} {
1906 set pos [split [$w index @$x,$y] .]
1907 set lno [lindex $pos 0]
1908 set col [lindex $pos 1]
1909 set path [lindex $file_lists($w) [expr $lno - 1]]
1910 if {$path eq {}} return
1913 update_index [list $path]
1917 ######################################################################
1921 set cursor_ptr arrow
1922 font create font_diff -family Courier -size 10
1926 eval font configure font_ui [font actual [.dummy cget -font]]
1930 font create font_uibold
1931 font create font_diffbold
1935 if {$tcl_platform(platform) eq {windows}} {
1938 } elseif {[is_MacOSX]} {
1943 proc apply_config {} {
1944 global repo_config font_descs
1946 foreach option $font_descs {
1947 set name [lindex $option 0]
1948 set font [lindex $option 1]
1950 foreach {cn cv} $repo_config(gui.$name) {
1951 font configure $font $cn $cv
1954 error_popup "Invalid font specified in gui.$name:\n\n$err"
1956 foreach {cn cv} [font configure $font] {
1957 font configure ${font}bold $cn $cv
1959 font configure ${font}bold -weight bold
1963 set default_config(gui.trustmtime) false
1964 set default_config(gui.pullsummary) true
1965 set default_config(gui.fontui) [font configure font_ui]
1966 set default_config(gui.fontdiff) [font configure font_diff]
1968 {fontui font_ui {Main Font}}
1969 {fontdiff font_diff {Diff/Console Font}}
1974 ######################################################################
1979 menu .mbar -tearoff 0
1980 .mbar add cascade -label Project -menu .mbar.project
1981 .mbar add cascade -label Edit -menu .mbar.edit
1982 .mbar add cascade -label Commit -menu .mbar.commit
1983 if {!$single_commit} {
1984 .mbar add cascade -label Fetch -menu .mbar.fetch
1985 .mbar add cascade -label Pull -menu .mbar.pull
1986 .mbar add cascade -label Push -menu .mbar.push
1988 . configure -menu .mbar
1992 .mbar.project add command -label Visualize \
1995 if {!$single_commit} {
1996 .mbar.project add command -label {Repack Database} \
1997 -command do_repack \
2000 .mbar.project add command -label Quit \
2002 -accelerator $M1T-Q \
2008 .mbar.edit add command -label Undo \
2009 -command {catch {[focus] edit undo}} \
2010 -accelerator $M1T-Z \
2012 .mbar.edit add command -label Redo \
2013 -command {catch {[focus] edit redo}} \
2014 -accelerator $M1T-Y \
2016 .mbar.edit add separator
2017 .mbar.edit add command -label Cut \
2018 -command {catch {tk_textCut [focus]}} \
2019 -accelerator $M1T-X \
2021 .mbar.edit add command -label Copy \
2022 -command {catch {tk_textCopy [focus]}} \
2023 -accelerator $M1T-C \
2025 .mbar.edit add command -label Paste \
2026 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
2027 -accelerator $M1T-V \
2029 .mbar.edit add command -label Delete \
2030 -command {catch {[focus] delete sel.first sel.last}} \
2033 .mbar.edit add separator
2034 .mbar.edit add command -label {Select All} \
2035 -command {catch {[focus] tag add sel 0.0 end}} \
2036 -accelerator $M1T-A \
2038 .mbar.edit add separator
2039 .mbar.edit add command -label {Options...} \
2040 -command do_options \
2045 .mbar.commit add command -label Rescan \
2046 -command do_rescan \
2049 lappend disable_on_lock \
2050 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2051 .mbar.commit add command -label {Amend Last Commit} \
2052 -command do_amend_last \
2054 lappend disable_on_lock \
2055 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2056 .mbar.commit add command -label {Include All Files} \
2057 -command do_include_all \
2058 -accelerator $M1T-I \
2060 lappend disable_on_lock \
2061 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2062 .mbar.commit add command -label {Sign Off} \
2063 -command do_signoff \
2064 -accelerator $M1T-S \
2066 .mbar.commit add command -label Commit \
2067 -command do_commit \
2068 -accelerator $M1T-Return \
2070 lappend disable_on_lock \
2071 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2073 if {!$single_commit} {
2084 # -- Main Window Layout
2085 panedwindow .vpane -orient vertical
2086 panedwindow .vpane.files -orient horizontal
2087 .vpane add .vpane.files -sticky nsew -height 100 -width 400
2088 pack .vpane -anchor n -side top -fill both -expand 1
2090 # -- Index File List
2091 frame .vpane.files.index -height 100 -width 400
2092 label .vpane.files.index.title -text {Modified Files} \
2095 text $ui_index -background white -borderwidth 0 \
2096 -width 40 -height 10 \
2098 -cursor $cursor_ptr \
2099 -yscrollcommand {.vpane.files.index.sb set} \
2101 scrollbar .vpane.files.index.sb -command [list $ui_index yview]
2102 pack .vpane.files.index.title -side top -fill x
2103 pack .vpane.files.index.sb -side right -fill y
2104 pack $ui_index -side left -fill both -expand 1
2105 .vpane.files add .vpane.files.index -sticky nsew
2107 # -- Other (Add) File List
2108 frame .vpane.files.other -height 100 -width 100
2109 label .vpane.files.other.title -text {Untracked Files} \
2112 text $ui_other -background white -borderwidth 0 \
2113 -width 40 -height 10 \
2115 -cursor $cursor_ptr \
2116 -yscrollcommand {.vpane.files.other.sb set} \
2118 scrollbar .vpane.files.other.sb -command [list $ui_other yview]
2119 pack .vpane.files.other.title -side top -fill x
2120 pack .vpane.files.other.sb -side right -fill y
2121 pack $ui_other -side left -fill both -expand 1
2122 .vpane.files add .vpane.files.other -sticky nsew
2124 $ui_index tag conf in_diff -font font_uibold
2125 $ui_other tag conf in_diff -font font_uibold
2127 # -- Diff and Commit Area
2128 frame .vpane.lower -height 300 -width 400
2129 frame .vpane.lower.commarea
2130 frame .vpane.lower.diff -relief sunken -borderwidth 1
2131 pack .vpane.lower.commarea -side top -fill x
2132 pack .vpane.lower.diff -side bottom -fill both -expand 1
2133 .vpane add .vpane.lower -stick nsew
2135 # -- Commit Area Buttons
2136 frame .vpane.lower.commarea.buttons
2137 label .vpane.lower.commarea.buttons.l -text {} \
2141 pack .vpane.lower.commarea.buttons.l -side top -fill x
2142 pack .vpane.lower.commarea.buttons -side left -fill y
2144 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
2145 -command do_rescan \
2147 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
2148 lappend disable_on_lock \
2149 {.vpane.lower.commarea.buttons.rescan conf -state}
2151 button .vpane.lower.commarea.buttons.amend -text {Amend Last} \
2152 -command do_amend_last \
2154 pack .vpane.lower.commarea.buttons.amend -side top -fill x
2155 lappend disable_on_lock \
2156 {.vpane.lower.commarea.buttons.amend conf -state}
2158 button .vpane.lower.commarea.buttons.incall -text {Include All} \
2159 -command do_include_all \
2161 pack .vpane.lower.commarea.buttons.incall -side top -fill x
2162 lappend disable_on_lock \
2163 {.vpane.lower.commarea.buttons.incall conf -state}
2165 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
2166 -command do_signoff \
2168 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
2170 button .vpane.lower.commarea.buttons.commit -text {Commit} \
2171 -command do_commit \
2173 pack .vpane.lower.commarea.buttons.commit -side top -fill x
2174 lappend disable_on_lock \
2175 {.vpane.lower.commarea.buttons.commit conf -state}
2177 # -- Commit Message Buffer
2178 frame .vpane.lower.commarea.buffer
2179 set ui_comm .vpane.lower.commarea.buffer.t
2180 set ui_coml .vpane.lower.commarea.buffer.l
2181 label $ui_coml -text {Commit Message:} \
2185 trace add variable commit_type write {uplevel #0 {
2186 switch -glob $commit_type \
2187 initial {$ui_coml conf -text {Initial Commit Message:}} \
2188 amend {$ui_coml conf -text {Amended Commit Message:}} \
2189 merge {$ui_coml conf -text {Merge Commit Message:}} \
2190 * {$ui_coml conf -text {Commit Message:}}
2192 text $ui_comm -background white -borderwidth 1 \
2195 -autoseparators true \
2197 -width 75 -height 9 -wrap none \
2199 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
2200 scrollbar .vpane.lower.commarea.buffer.sby \
2201 -command [list $ui_comm yview]
2202 pack $ui_coml -side top -fill x
2203 pack .vpane.lower.commarea.buffer.sby -side right -fill y
2204 pack $ui_comm -side left -fill y
2205 pack .vpane.lower.commarea.buffer -side left -fill y
2207 # -- Commit Message Buffer Context Menu
2209 menu $ui_comm.ctxm -tearoff 0
2210 $ui_comm.ctxm add command -label "Cut" \
2212 -command "tk_textCut $ui_comm"
2213 $ui_comm.ctxm add command -label "Copy" \
2215 -command "tk_textCopy $ui_comm"
2216 $ui_comm.ctxm add command -label "Paste" \
2218 -command "tk_textPaste $ui_comm"
2219 $ui_comm.ctxm add command -label "Delete" \
2221 -command "$ui_comm delete sel.first sel.last"
2222 $ui_comm.ctxm add separator
2223 $ui_comm.ctxm add command -label "Select All" \
2225 -command "$ui_comm tag add sel 0.0 end"
2226 $ui_comm.ctxm add command -label "Copy All" \
2229 $ui_comm tag add sel 0.0 end
2230 tk_textCopy $ui_comm
2231 $ui_comm tag remove sel 0.0 end
2233 $ui_comm.ctxm add separator
2234 $ui_comm.ctxm add command -label "Sign Off" \
2237 bind_button3 $ui_comm "tk_popup $ui_comm.ctxm %X %Y"
2240 set ui_fname_value {}
2241 set ui_fstatus_value {}
2242 frame .vpane.lower.diff.header -background orange
2243 label .vpane.lower.diff.header.l1 -text {File:} \
2244 -background orange \
2246 label .vpane.lower.diff.header.l2 -textvariable ui_fname_value \
2247 -background orange \
2251 label .vpane.lower.diff.header.l3 -text {Status:} \
2252 -background orange \
2254 label .vpane.lower.diff.header.l4 -textvariable ui_fstatus_value \
2255 -background orange \
2256 -width $max_status_desc \
2260 pack .vpane.lower.diff.header.l1 -side left
2261 pack .vpane.lower.diff.header.l2 -side left -fill x
2262 pack .vpane.lower.diff.header.l4 -side right
2263 pack .vpane.lower.diff.header.l3 -side right
2266 frame .vpane.lower.diff.body
2267 set ui_diff .vpane.lower.diff.body.t
2268 text $ui_diff -background white -borderwidth 0 \
2269 -width 80 -height 15 -wrap none \
2271 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
2272 -yscrollcommand {.vpane.lower.diff.body.sby set} \
2274 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
2275 -command [list $ui_diff xview]
2276 scrollbar .vpane.lower.diff.body.sby -orient vertical \
2277 -command [list $ui_diff yview]
2278 pack .vpane.lower.diff.body.sbx -side bottom -fill x
2279 pack .vpane.lower.diff.body.sby -side right -fill y
2280 pack $ui_diff -side left -fill both -expand 1
2281 pack .vpane.lower.diff.header -side top -fill x
2282 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
2284 $ui_diff tag conf dm -foreground red
2285 $ui_diff tag conf dp -foreground blue
2286 $ui_diff tag conf di -foreground {#00a000}
2287 $ui_diff tag conf dni -foreground {#a000a0}
2288 $ui_diff tag conf da -font font_diffbold
2289 $ui_diff tag conf bold -font font_diffbold
2291 # -- Diff Body Context Menu
2293 menu $ui_diff.ctxm -tearoff 0
2294 $ui_diff.ctxm add command -label "Copy" \
2296 -command "tk_textCopy $ui_diff"
2297 $ui_diff.ctxm add command -label "Select All" \
2299 -command "$ui_diff tag add sel 0.0 end"
2300 $ui_diff.ctxm add command -label "Copy All" \
2303 $ui_diff tag add sel 0.0 end
2304 tk_textCopy $ui_diff
2305 $ui_diff tag remove sel 0.0 end
2307 $ui_diff.ctxm add separator
2308 $ui_diff.ctxm add command -label "Decrease Font Size" \
2310 -command {incr_font_size font_diff -1}
2311 $ui_diff.ctxm add command -label "Increase Font Size" \
2313 -command {incr_font_size font_diff 1}
2314 $ui_diff.ctxm add command -label {Options...} \
2317 bind_button3 $ui_diff "tk_popup $ui_diff.ctxm %X %Y"
2320 set ui_status_value {Initializing...}
2321 label .status -textvariable ui_status_value \
2327 pack .status -anchor w -side bottom -fill x
2331 set gm $repo_config(gui.geometry)
2332 wm geometry . [lindex $gm 0]
2333 .vpane sash place 0 \
2334 [lindex [.vpane sash coord 0] 0] \
2336 .vpane.files sash place 0 \
2338 [lindex [.vpane.files sash coord 0] 1]
2343 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
2344 bind $ui_comm <$M1B-Key-i> {do_include_all;break}
2345 bind $ui_comm <$M1B-Key-I> {do_include_all;break}
2346 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
2347 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
2348 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
2349 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
2350 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
2351 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
2352 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2353 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
2355 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
2356 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
2357 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
2358 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
2359 bind $ui_diff <$M1B-Key-v> {break}
2360 bind $ui_diff <$M1B-Key-V> {break}
2361 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2362 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
2363 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
2364 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
2365 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
2366 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
2368 bind . <Destroy> do_quit
2369 bind all <Key-F5> do_rescan
2370 bind all <$M1B-Key-r> do_rescan
2371 bind all <$M1B-Key-R> do_rescan
2372 bind . <$M1B-Key-s> do_signoff
2373 bind . <$M1B-Key-S> do_signoff
2374 bind . <$M1B-Key-i> do_include_all
2375 bind . <$M1B-Key-I> do_include_all
2376 bind . <$M1B-Key-Return> do_commit
2377 bind all <$M1B-Key-q> do_quit
2378 bind all <$M1B-Key-Q> do_quit
2379 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
2380 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
2381 foreach i [list $ui_index $ui_other] {
2382 bind $i <Button-1> {click %W %x %y 1 %X %Y; break}
2383 bind $i <ButtonRelease-1> {unclick %W %x %y; break}
2384 bind_button3 $i {click %W %x %y 3 %X %Y; break}
2388 set file_lists($ui_index) [list]
2389 set file_lists($ui_other) [list]
2391 wm title . "$appname ([file normalize [file dirname $gitdir]])"
2392 focus -force $ui_comm
2393 if {!$single_commit} {
2395 populate_remote_menu .mbar.fetch From fetch_from
2396 populate_remote_menu .mbar.push To push_to
2397 populate_pull_menu .mbar.pull
2399 after 1 update_status