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 != $global_config($name)} {
94 if {$value == $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 == $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 != $repo_config($name)} {
111 if {$value == $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 == {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 == {none}} {
198 set index_lock_type $type
199 foreach w $disable_on_lock {
200 uplevel #0 $w disabled
203 } elseif {$index_lock_type == {begin-update} && $type == {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 == {amend}
246 && $new_type == {normal}
247 && $new_HEAD == $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]] == {}} {
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) == {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 == {}
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] != {_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 == {} || $lno == {}} {
498 foreach w [array names file_lists] {
499 set lno [lsearch -sorted $file_lists($w) $path]
506 if {$w != {} && $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) == {true}
608 && [$ui_diff index end] == {2.0}} {
614 ######################################################################
618 proc load_last_commit {} {
619 global HEAD PARENT commit_type ui_comm
621 if {$commit_type == {amend}} return
622 if {$commit_type != {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 == {amend}
675 && $cur_type == {normal}
676 && $curHEAD == $HEAD} {
677 } elseif {$commit_type != $cur_type || $HEAD != $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) == {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
797 global ui_status_value ui_comm
801 if {$tree_id == {} || [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 == {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 != {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 $ui_comm delete 0.0 end
874 $ui_comm edit modified false
877 if {$single_commit} do_quit
879 # -- Update status without invoking any git commands.
881 set commit_type normal
885 foreach path [array names file_states] {
886 set s $file_states($path)
891 D? {set m _[string index $m 1]}
895 unset file_states($path)
897 lset file_states($path) 0 $m
904 set ui_status_value \
905 "Changes committed as [string range $cmt_id 0 7]."
908 ######################################################################
912 proc fetch_from {remote} {
913 set w [new_console "fetch $remote" \
914 "Fetching new changes from $remote"]
915 set cmd [list git fetch]
920 proc pull_remote {remote branch} {
921 global HEAD commit_type file_states repo_config
923 if {![lock_index update]} return
925 # -- Our in memory state should match the repository.
927 repository_state curHEAD cur_type
928 if {$commit_type != $cur_type || $HEAD != $curHEAD} {
929 error_popup {Last scanned state does not match repository state.
931 Its highly likely that another Git program modified the
932 repository since our last scan. A rescan is required
933 before a pull can be started.
940 # -- No differences should exist before a pull.
942 if {[array size file_states] != 0} {
943 error_popup {Uncommitted but modified files are present.
945 You should not perform a pull with unmodified files in your working
946 directory as Git would be unable to recover from an incorrect merge.
948 Commit or throw away all changes before starting a pull operation.
954 set w [new_console "pull $remote $branch" \
955 "Pulling new changes from branch $branch in $remote"]
956 set cmd [list git pull]
957 if {$repo_config(gui.pullsummary) == {false}} {
958 lappend cmd --no-summary
962 console_exec $w $cmd [list post_pull_remote $remote $branch]
965 proc post_pull_remote {remote branch success} {
966 global HEAD PARENT commit_type
967 global ui_status_value
971 repository_state HEAD commit_type
973 set $ui_status_value {Ready.}
976 "Conflicts detected while pulling $branch from $remote."
980 proc push_to {remote} {
981 set w [new_console "push $remote" \
982 "Pushing changes to $remote"]
983 set cmd [list git push]
988 ######################################################################
992 proc mapcol {state path} {
993 global all_cols ui_other
995 if {[catch {set r $all_cols($state)}]} {
996 puts "error: no column for state={$state} $path"
1002 proc mapicon {state path} {
1005 if {[catch {set r $all_icons($state)}]} {
1006 puts "error: no icon for state={$state} $path"
1012 proc mapdesc {state path} {
1015 if {[catch {set r $all_descs($state)}]} {
1016 puts "error: no desc for state={$state} $path"
1022 proc escape_path {path} {
1023 regsub -all "\n" $path "\\n" path
1027 proc short_path {path} {
1028 return [escape_path [lindex [file split $path] end]]
1033 proc merge_state {path new_state} {
1034 global file_states next_icon_id
1036 set s0 [string index $new_state 0]
1037 set s1 [string index $new_state 1]
1039 if {[catch {set info $file_states($path)}]} {
1041 set icon n[incr next_icon_id]
1043 set state [lindex $info 0]
1044 set icon [lindex $info 1]
1048 set s0 [string index $state 0]
1049 } elseif {$s0 == {*}} {
1054 set s1 [string index $state 1]
1055 } elseif {$s1 == {*}} {
1059 set file_states($path) [list $s0$s1 $icon]
1063 proc display_file {path state} {
1064 global file_states file_lists status_active
1066 set old_m [merge_state $path $state]
1067 if {$status_active} return
1069 set s $file_states($path)
1070 set new_m [lindex $s 0]
1071 set new_w [mapcol $new_m $path]
1072 set old_w [mapcol $old_m $path]
1073 set new_icon [mapicon $new_m $path]
1075 if {$new_w != $old_w} {
1076 set lno [lsearch -sorted $file_lists($old_w) $path]
1079 $old_w conf -state normal
1080 $old_w delete $lno.0 [expr $lno + 1].0
1081 $old_w conf -state disabled
1084 lappend file_lists($new_w) $path
1085 set file_lists($new_w) [lsort $file_lists($new_w)]
1086 set lno [lsearch -sorted $file_lists($new_w) $path]
1088 $new_w conf -state normal
1089 $new_w image create $lno.0 \
1090 -align center -padx 5 -pady 1 \
1091 -name [lindex $s 1] \
1093 $new_w insert $lno.1 "[escape_path $path]\n"
1094 $new_w conf -state disabled
1095 } elseif {$new_icon != [mapicon $old_m $path]} {
1096 $new_w conf -state normal
1097 $new_w image conf [lindex $s 1] -image $new_icon
1098 $new_w conf -state disabled
1102 proc display_all_files {} {
1103 global ui_index ui_other file_states file_lists
1105 $ui_index conf -state normal
1106 $ui_other conf -state normal
1108 $ui_index delete 0.0 end
1109 $ui_other delete 0.0 end
1111 set file_lists($ui_index) [list]
1112 set file_lists($ui_other) [list]
1114 foreach path [lsort [array names file_states]] {
1115 set s $file_states($path)
1117 set w [mapcol $m $path]
1118 lappend file_lists($w) $path
1119 $w image create end \
1120 -align center -padx 5 -pady 1 \
1121 -name [lindex $s 1] \
1122 -image [mapicon $m $path]
1123 $w insert end "[escape_path $path]\n"
1126 $ui_index conf -state disabled
1127 $ui_other conf -state disabled
1130 proc update_index {pathList} {
1131 global update_index_cp ui_status_value
1133 if {![lock_index update]} return
1135 set update_index_cp 0
1136 set totalCnt [llength $pathList]
1137 set batch [expr {int($totalCnt * .01) + 1}]
1138 if {$batch > 25} {set batch 25}
1140 set ui_status_value "Including files ... 0/$totalCnt 0%"
1141 set ui_status_value [format \
1142 "Including files ... %i/%i files (%.2f%%)" \
1146 set fd [open "| git update-index --add --remove -z --stdin" w]
1147 fconfigure $fd -blocking 0 -translation binary
1148 fileevent $fd writable [list \
1149 write_update_index \
1157 proc write_update_index {fd pathList totalCnt batch} {
1158 global update_index_cp ui_status_value
1159 global file_states ui_fname_value
1161 if {$update_index_cp >= $totalCnt} {
1164 set ui_status_value {Ready.}
1168 for {set i $batch} \
1169 {$update_index_cp < $totalCnt && $i > 0} \
1171 set path [lindex $pathList $update_index_cp]
1172 incr update_index_cp
1174 switch -- [lindex $file_states($path) 0] {
1184 puts -nonewline $fd $path
1185 puts -nonewline $fd "\0"
1186 display_file $path $new
1187 if {$ui_fname_value == $path} {
1192 set ui_status_value [format \
1193 "Including files ... %i/%i files (%.2f%%)" \
1196 [expr {100.0 * $update_index_cp / $totalCnt}]]
1199 ######################################################################
1201 ## remote management
1203 proc load_all_remotes {} {
1204 global gitdir all_remotes repo_config
1206 set all_remotes [list]
1207 set rm_dir [file join $gitdir remotes]
1208 if {[file isdirectory $rm_dir]} {
1209 set all_remotes [concat $all_remotes [glob \
1213 -directory $rm_dir *]]
1216 foreach line [array names repo_config remote.*.url] {
1217 if {[regexp ^remote\.(.*)\.url\$ $line line name]} {
1218 lappend all_remotes $name
1222 set all_remotes [lsort -unique $all_remotes]
1225 proc populate_remote_menu {m pfx op} {
1228 foreach remote $all_remotes {
1229 $m add command -label "$pfx $remote..." \
1230 -command [list $op $remote] \
1235 proc populate_pull_menu {m} {
1236 global gitdir repo_config all_remotes disable_on_lock
1238 foreach remote $all_remotes {
1240 if {[array get repo_config remote.$remote.url] != {}} {
1241 if {[array get repo_config remote.$remote.fetch] != {}} {
1242 regexp {^([^:]+):} \
1243 [lindex $repo_config(remote.$remote.fetch) 0] \
1248 set fd [open [file join $gitdir remotes $remote] r]
1249 while {[gets $fd line] >= 0} {
1250 if {[regexp {^Pull:[ \t]*([^:]+):} $line line rb]} {
1259 regsub ^refs/heads/ $rb {} rb_short
1260 if {$rb_short != {}} {
1262 -label "Branch $rb_short from $remote..." \
1263 -command [list pull_remote $remote $rb] \
1265 lappend disable_on_lock \
1266 [list $m entryconf [$m index last] -state]
1271 ######################################################################
1276 #define mask_width 14
1277 #define mask_height 15
1278 static unsigned char mask_bits[] = {
1279 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1280 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1281 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1284 image create bitmap file_plain -background white -foreground black -data {
1285 #define plain_width 14
1286 #define plain_height 15
1287 static unsigned char plain_bits[] = {
1288 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1289 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1290 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1291 } -maskdata $filemask
1293 image create bitmap file_mod -background white -foreground blue -data {
1294 #define mod_width 14
1295 #define mod_height 15
1296 static unsigned char mod_bits[] = {
1297 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1298 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1299 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1300 } -maskdata $filemask
1302 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1303 #define file_fulltick_width 14
1304 #define file_fulltick_height 15
1305 static unsigned char file_fulltick_bits[] = {
1306 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1307 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1308 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1309 } -maskdata $filemask
1311 image create bitmap file_parttick -background white -foreground "#005050" -data {
1312 #define parttick_width 14
1313 #define parttick_height 15
1314 static unsigned char parttick_bits[] = {
1315 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1316 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1317 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1318 } -maskdata $filemask
1320 image create bitmap file_question -background white -foreground black -data {
1321 #define file_question_width 14
1322 #define file_question_height 15
1323 static unsigned char file_question_bits[] = {
1324 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1325 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1326 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1327 } -maskdata $filemask
1329 image create bitmap file_removed -background white -foreground red -data {
1330 #define file_removed_width 14
1331 #define file_removed_height 15
1332 static unsigned char file_removed_bits[] = {
1333 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1334 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1335 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1336 } -maskdata $filemask
1338 image create bitmap file_merge -background white -foreground blue -data {
1339 #define file_merge_width 14
1340 #define file_merge_height 15
1341 static unsigned char file_merge_bits[] = {
1342 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1343 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1344 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1345 } -maskdata $filemask
1347 set ui_index .vpane.files.index.list
1348 set ui_other .vpane.files.other.list
1349 set max_status_desc 0
1351 {__ i plain "Unmodified"}
1352 {_M i mod "Modified"}
1353 {M_ i fulltick "Checked in"}
1354 {MM i parttick "Partially included"}
1356 {_O o plain "Untracked"}
1357 {A_ o fulltick "Added"}
1358 {AM o parttick "Partially added"}
1359 {AD o question "Added (but now gone)"}
1361 {_D i question "Missing"}
1362 {D_ i removed "Removed"}
1363 {DD i removed "Removed"}
1364 {DO i removed "Removed (still exists)"}
1366 {UM i merge "Merge conflicts"}
1367 {U_ i merge "Merge conflicts"}
1369 if {$max_status_desc < [string length [lindex $i 3]]} {
1370 set max_status_desc [string length [lindex $i 3]]
1372 if {[lindex $i 1] == {i}} {
1373 set all_cols([lindex $i 0]) $ui_index
1375 set all_cols([lindex $i 0]) $ui_other
1377 set all_icons([lindex $i 0]) file_[lindex $i 2]
1378 set all_descs([lindex $i 0]) [lindex $i 3]
1382 ######################################################################
1387 global tcl_platform tk_library
1388 if {$tcl_platform(platform) == {unix}
1389 && $tcl_platform(os) == {Darwin}
1390 && [string match /Library/Frameworks/* $tk_library]} {
1396 proc bind_button3 {w cmd} {
1397 bind $w <Any-Button-3> $cmd
1399 bind $w <Control-Button-1> $cmd
1403 proc incr_font_size {font {amt 1}} {
1404 set sz [font configure $font -size]
1406 font configure $font -size $sz
1407 font configure ${font}bold -size $sz
1410 proc hook_failed_popup {hook msg} {
1411 global gitdir appname
1417 label $w.m.l1 -text "$hook hook failed:" \
1422 -background white -borderwidth 1 \
1424 -width 80 -height 10 \
1426 -yscrollcommand [list $w.m.sby set]
1428 -text {You must correct the above errors before committing.} \
1432 scrollbar $w.m.sby -command [list $w.m.t yview]
1433 pack $w.m.l1 -side top -fill x
1434 pack $w.m.l2 -side bottom -fill x
1435 pack $w.m.sby -side right -fill y
1436 pack $w.m.t -side left -fill both -expand 1
1437 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
1439 $w.m.t insert 1.0 $msg
1440 $w.m.t conf -state disabled
1442 button $w.ok -text OK \
1445 -command "destroy $w"
1446 pack $w.ok -side bottom
1448 bind $w <Visibility> "grab $w; focus $w"
1449 bind $w <Key-Return> "destroy $w"
1450 wm title $w "$appname ([lindex [file split \
1451 [file normalize [file dirname $gitdir]]] \
1456 set next_console_id 0
1458 proc new_console {short_title long_title} {
1459 global next_console_id console_data
1460 set w .console[incr next_console_id]
1461 set console_data($w) [list $short_title $long_title]
1462 return [console_init $w]
1465 proc console_init {w} {
1466 global console_cr console_data
1467 global gitdir appname M1B
1469 set console_cr($w) 1.0
1472 label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
1477 -background white -borderwidth 1 \
1479 -width 80 -height 10 \
1482 -yscrollcommand [list $w.m.sby set]
1483 label $w.m.s -anchor w \
1486 scrollbar $w.m.sby -command [list $w.m.t yview]
1487 pack $w.m.l1 -side top -fill x
1488 pack $w.m.s -side bottom -fill x
1489 pack $w.m.sby -side right -fill y
1490 pack $w.m.t -side left -fill both -expand 1
1491 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
1493 menu $w.ctxm -tearoff 0
1494 $w.ctxm add command -label "Copy" \
1496 -command "tk_textCopy $w.m.t"
1497 $w.ctxm add command -label "Select All" \
1499 -command "$w.m.t tag add sel 0.0 end"
1500 $w.ctxm add command -label "Copy All" \
1503 $w.m.t tag add sel 0.0 end
1505 $w.m.t tag remove sel 0.0 end
1508 button $w.ok -text {Running...} \
1512 -command "destroy $w"
1513 pack $w.ok -side bottom
1515 bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
1516 bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
1517 bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
1518 bind $w <Visibility> "focus $w"
1519 wm title $w "$appname ([lindex [file split \
1520 [file normalize [file dirname $gitdir]]] \
1521 end]): [lindex $console_data($w) 0]"
1525 proc console_exec {w cmd {after {}}} {
1528 # -- Windows tosses the enviroment when we exec our child.
1529 # But most users need that so we have to relogin. :-(
1531 if {$tcl_platform(platform) == {windows}} {
1532 set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
1535 # -- Tcl won't let us redirect both stdout and stderr to
1536 # the same pipe. So pass it through cat...
1538 set cmd [concat | $cmd |& cat]
1540 set fd_f [open $cmd r]
1541 fconfigure $fd_f -blocking 0 -translation binary
1542 fileevent $fd_f readable [list console_read $w $fd_f $after]
1545 proc console_read {w fd after} {
1546 global console_cr console_data
1550 if {![winfo exists $w]} {console_init $w}
1551 $w.m.t conf -state normal
1553 set n [string length $buf]
1555 set cr [string first "\r" $buf $c]
1556 set lf [string first "\n" $buf $c]
1557 if {$cr < 0} {set cr [expr $n + 1]}
1558 if {$lf < 0} {set lf [expr $n + 1]}
1561 $w.m.t insert end [string range $buf $c $lf]
1562 set console_cr($w) [$w.m.t index {end -1c}]
1566 $w.m.t delete $console_cr($w) end
1567 $w.m.t insert end "\n"
1568 $w.m.t insert end [string range $buf $c $cr]
1573 $w.m.t conf -state disabled
1577 fconfigure $fd -blocking 1
1579 if {[catch {close $fd}]} {
1580 if {![winfo exists $w]} {console_init $w}
1581 $w.m.s conf -background red -text {Error: Command Failed}
1582 $w.ok conf -text Close
1583 $w.ok conf -state normal
1585 } elseif {[winfo exists $w]} {
1586 $w.m.s conf -background green -text {Success}
1587 $w.ok conf -text Close
1588 $w.ok conf -state normal
1591 array unset console_cr $w
1592 array unset console_data $w
1594 uplevel #0 $after $ok
1598 fconfigure $fd -blocking 0
1601 ######################################################################
1605 set starting_gitk_msg {Please wait... Starting gitk...}
1608 global tcl_platform ui_status_value starting_gitk_msg
1610 set ui_status_value $starting_gitk_msg
1612 if {$ui_status_value == $starting_gitk_msg} {
1613 set ui_status_value {Ready.}
1617 if {$tcl_platform(platform) == {windows}} {
1625 set w [new_console "repack" "Repacking the object database"]
1626 set cmd [list git repack]
1629 console_exec $w $cmd
1635 global gitdir ui_comm is_quitting repo_config
1637 if {$is_quitting} return
1640 # -- Stash our current commit buffer.
1642 set save [file join $gitdir GITGUI_MSG]
1643 set msg [string trim [$ui_comm get 0.0 end]]
1644 if {[$ui_comm edit modified] && $msg != {}} {
1646 set fd [open $save w]
1647 puts $fd [string trim [$ui_comm get 0.0 end]]
1650 } elseif {$msg == {} && [file exists $save]} {
1654 # -- Stash our current window geometry into this repository.
1656 set cfg_geometry [list]
1657 lappend cfg_geometry [wm geometry .]
1658 lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
1659 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
1660 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
1663 if {$cfg_geometry != $rc_geometry} {
1664 catch {exec git repo-config gui.geometry $cfg_geometry}
1674 proc do_include_all {} {
1677 if {![lock_index begin-update]} return
1680 foreach path [array names file_states] {
1681 set s $file_states($path)
1687 _D {lappend pathList $path}
1690 if {$pathList == {}} {
1693 update_index $pathList
1697 set GIT_COMMITTER_IDENT {}
1699 proc do_signoff {} {
1700 global ui_comm GIT_COMMITTER_IDENT
1702 if {$GIT_COMMITTER_IDENT == {}} {
1703 if {[catch {set me [exec git var GIT_COMMITTER_IDENT]} err]} {
1704 error_popup "Unable to obtain your identity:\n\n$err"
1707 if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \
1708 $me me GIT_COMMITTER_IDENT]} {
1709 error_popup "Invalid GIT_COMMITTER_IDENT:\n\n$me"
1714 set sob "Signed-off-by: $GIT_COMMITTER_IDENT"
1715 set last [$ui_comm get {end -1c linestart} {end -1c}]
1716 if {$last != $sob} {
1717 $ui_comm edit separator
1719 && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
1720 $ui_comm insert end "\n"
1722 $ui_comm insert end "\n$sob"
1723 $ui_comm edit separator
1728 proc do_amend_last {} {
1736 proc do_options {} {
1737 global appname gitdir font_descs
1738 global repo_config global_config
1739 global repo_config_new global_config_new
1742 array unset repo_config_new
1743 array unset global_config_new
1744 foreach name [array names repo_config] {
1745 set repo_config_new($name) $repo_config($name)
1747 foreach name [array names global_config] {
1748 set global_config_new($name) $global_config($name)
1750 set reponame [lindex [file split \
1751 [file normalize [file dirname $gitdir]]] \
1754 set w .options_editor
1756 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
1758 label $w.header -text "$appname Options" \
1760 pack $w.header -side top -fill x
1763 button $w.buttons.restore -text {Restore Defaults} \
1765 -command do_restore_defaults
1766 pack $w.buttons.restore -side left
1767 button $w.buttons.save -text Save \
1769 -command [list do_save_config $w]
1770 pack $w.buttons.save -side right
1771 button $w.buttons.cancel -text {Cancel} \
1773 -command [list destroy $w]
1774 pack $w.buttons.cancel -side right
1775 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
1777 labelframe $w.repo -text "$reponame Repository" \
1779 -relief raised -borderwidth 2
1780 labelframe $w.global -text {Global (All Repositories)} \
1782 -relief raised -borderwidth 2
1783 pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
1784 pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
1787 {pullsummary {Show Pull Summary}}
1788 {trustmtime {Trust File Modification Timestamps}}
1790 set name [lindex $option 0]
1791 set text [lindex $option 1]
1792 foreach f {repo global} {
1793 checkbutton $w.$f.$name -text $text \
1794 -variable ${f}_config_new(gui.$name) \
1798 pack $w.$f.$name -side top -anchor w
1802 set all_fonts [lsort [font families]]
1803 foreach option $font_descs {
1804 set name [lindex $option 0]
1805 set font [lindex $option 1]
1806 set text [lindex $option 2]
1808 set global_config_new(gui.$font^^family) \
1809 [font configure $font -family]
1810 set global_config_new(gui.$font^^size) \
1811 [font configure $font -size]
1813 frame $w.global.$name
1814 label $w.global.$name.l -text "$text:" -font font_ui
1815 pack $w.global.$name.l -side left -anchor w -fill x
1816 eval tk_optionMenu $w.global.$name.family \
1817 global_config_new(gui.$font^^family) \
1819 spinbox $w.global.$name.size \
1820 -textvariable global_config_new(gui.$font^^size) \
1821 -from 2 -to 80 -increment 1 \
1824 pack $w.global.$name.size -side right -anchor e
1825 pack $w.global.$name.family -side right -anchor e
1826 pack $w.global.$name -side top -anchor w -fill x
1829 bind $w <Visibility> "grab $w; focus $w"
1830 bind $w <Key-Escape> "destroy $w"
1831 wm title $w "$appname ($reponame): Options"
1835 proc do_restore_defaults {} {
1836 global font_descs default_config repo_config
1837 global repo_config_new global_config_new
1839 foreach name [array names default_config] {
1840 set repo_config_new($name) $default_config($name)
1841 set global_config_new($name) $default_config($name)
1844 foreach option $font_descs {
1845 set name [lindex $option 0]
1846 set repo_config(gui.$name) $default_config(gui.$name)
1850 foreach option $font_descs {
1851 set name [lindex $option 0]
1852 set font [lindex $option 1]
1853 set global_config_new(gui.$font^^family) \
1854 [font configure $font -family]
1855 set global_config_new(gui.$font^^size) \
1856 [font configure $font -size]
1860 proc do_save_config {w} {
1861 if {[catch {save_config} err]} {
1862 error_popup "Failed to completely save options:\n\n$err"
1867 # shift == 1: left click
1869 proc click {w x y shift wx wy} {
1870 global ui_index ui_other file_lists
1872 set pos [split [$w index @$x,$y] .]
1873 set lno [lindex $pos 0]
1874 set col [lindex $pos 1]
1875 set path [lindex $file_lists($w) [expr $lno - 1]]
1876 if {$path == {}} return
1878 if {$col > 0 && $shift == 1} {
1879 show_diff $path $w $lno
1883 proc unclick {w x y} {
1886 set pos [split [$w index @$x,$y] .]
1887 set lno [lindex $pos 0]
1888 set col [lindex $pos 1]
1889 set path [lindex $file_lists($w) [expr $lno - 1]]
1890 if {$path == {}} return
1893 update_index [list $path]
1897 ######################################################################
1901 set cursor_ptr arrow
1902 font create font_diff -family Courier -size 10
1906 eval font configure font_ui [font actual [.dummy cget -font]]
1910 font create font_uibold
1911 font create font_diffbold
1915 if {$tcl_platform(platform) == {windows}} {
1918 } elseif {[is_MacOSX]} {
1923 proc apply_config {} {
1924 global repo_config font_descs
1926 foreach option $font_descs {
1927 set name [lindex $option 0]
1928 set font [lindex $option 1]
1930 foreach {cn cv} $repo_config(gui.$name) {
1931 font configure $font $cn $cv
1934 error_popup "Invalid font specified in gui.$name:\n\n$err"
1936 foreach {cn cv} [font configure $font] {
1937 font configure ${font}bold $cn $cv
1939 font configure ${font}bold -weight bold
1943 set default_config(gui.trustmtime) false
1944 set default_config(gui.pullsummary) true
1945 set default_config(gui.fontui) [font configure font_ui]
1946 set default_config(gui.fontdiff) [font configure font_diff]
1948 {fontui font_ui {Main Font}}
1949 {fontdiff font_diff {Diff/Console Font}}
1954 ######################################################################
1959 menu .mbar -tearoff 0
1960 .mbar add cascade -label Project -menu .mbar.project
1961 .mbar add cascade -label Edit -menu .mbar.edit
1962 .mbar add cascade -label Commit -menu .mbar.commit
1963 if {!$single_commit} {
1964 .mbar add cascade -label Fetch -menu .mbar.fetch
1965 .mbar add cascade -label Pull -menu .mbar.pull
1966 .mbar add cascade -label Push -menu .mbar.push
1968 . configure -menu .mbar
1972 .mbar.project add command -label Visualize \
1975 if {!$single_commit} {
1976 .mbar.project add command -label {Repack Database} \
1977 -command do_repack \
1980 .mbar.project add command -label Quit \
1982 -accelerator $M1T-Q \
1988 .mbar.edit add command -label Undo \
1989 -command {catch {[focus] edit undo}} \
1990 -accelerator $M1T-Z \
1992 .mbar.edit add command -label Redo \
1993 -command {catch {[focus] edit redo}} \
1994 -accelerator $M1T-Y \
1996 .mbar.edit add separator
1997 .mbar.edit add command -label Cut \
1998 -command {catch {tk_textCut [focus]}} \
1999 -accelerator $M1T-X \
2001 .mbar.edit add command -label Copy \
2002 -command {catch {tk_textCopy [focus]}} \
2003 -accelerator $M1T-C \
2005 .mbar.edit add command -label Paste \
2006 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
2007 -accelerator $M1T-V \
2009 .mbar.edit add command -label Delete \
2010 -command {catch {[focus] delete sel.first sel.last}} \
2013 .mbar.edit add separator
2014 .mbar.edit add command -label {Select All} \
2015 -command {catch {[focus] tag add sel 0.0 end}} \
2016 -accelerator $M1T-A \
2018 .mbar.edit add separator
2019 .mbar.edit add command -label {Options...} \
2020 -command do_options \
2025 .mbar.commit add command -label Rescan \
2026 -command do_rescan \
2029 lappend disable_on_lock \
2030 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2031 .mbar.commit add command -label {Amend Last Commit} \
2032 -command do_amend_last \
2034 lappend disable_on_lock \
2035 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2036 .mbar.commit add command -label {Include All Files} \
2037 -command do_include_all \
2038 -accelerator $M1T-I \
2040 lappend disable_on_lock \
2041 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2042 .mbar.commit add command -label {Sign Off} \
2043 -command do_signoff \
2044 -accelerator $M1T-S \
2046 .mbar.commit add command -label Commit \
2047 -command do_commit \
2048 -accelerator $M1T-Return \
2050 lappend disable_on_lock \
2051 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2053 if {!$single_commit} {
2064 # -- Main Window Layout
2065 panedwindow .vpane -orient vertical
2066 panedwindow .vpane.files -orient horizontal
2067 .vpane add .vpane.files -sticky nsew -height 100 -width 400
2068 pack .vpane -anchor n -side top -fill both -expand 1
2070 # -- Index File List
2071 frame .vpane.files.index -height 100 -width 400
2072 label .vpane.files.index.title -text {Modified Files} \
2075 text $ui_index -background white -borderwidth 0 \
2076 -width 40 -height 10 \
2078 -cursor $cursor_ptr \
2079 -yscrollcommand {.vpane.files.index.sb set} \
2081 scrollbar .vpane.files.index.sb -command [list $ui_index yview]
2082 pack .vpane.files.index.title -side top -fill x
2083 pack .vpane.files.index.sb -side right -fill y
2084 pack $ui_index -side left -fill both -expand 1
2085 .vpane.files add .vpane.files.index -sticky nsew
2087 # -- Other (Add) File List
2088 frame .vpane.files.other -height 100 -width 100
2089 label .vpane.files.other.title -text {Untracked Files} \
2092 text $ui_other -background white -borderwidth 0 \
2093 -width 40 -height 10 \
2095 -cursor $cursor_ptr \
2096 -yscrollcommand {.vpane.files.other.sb set} \
2098 scrollbar .vpane.files.other.sb -command [list $ui_other yview]
2099 pack .vpane.files.other.title -side top -fill x
2100 pack .vpane.files.other.sb -side right -fill y
2101 pack $ui_other -side left -fill both -expand 1
2102 .vpane.files add .vpane.files.other -sticky nsew
2104 $ui_index tag conf in_diff -font font_uibold
2105 $ui_other tag conf in_diff -font font_uibold
2107 # -- Diff and Commit Area
2108 frame .vpane.lower -height 300 -width 400
2109 frame .vpane.lower.commarea
2110 frame .vpane.lower.diff -relief sunken -borderwidth 1
2111 pack .vpane.lower.commarea -side top -fill x
2112 pack .vpane.lower.diff -side bottom -fill both -expand 1
2113 .vpane add .vpane.lower -stick nsew
2115 # -- Commit Area Buttons
2116 frame .vpane.lower.commarea.buttons
2117 label .vpane.lower.commarea.buttons.l -text {} \
2121 pack .vpane.lower.commarea.buttons.l -side top -fill x
2122 pack .vpane.lower.commarea.buttons -side left -fill y
2124 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
2125 -command do_rescan \
2127 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
2128 lappend disable_on_lock \
2129 {.vpane.lower.commarea.buttons.rescan conf -state}
2131 button .vpane.lower.commarea.buttons.amend -text {Amend Last} \
2132 -command do_amend_last \
2134 pack .vpane.lower.commarea.buttons.amend -side top -fill x
2135 lappend disable_on_lock \
2136 {.vpane.lower.commarea.buttons.amend conf -state}
2138 button .vpane.lower.commarea.buttons.incall -text {Include All} \
2139 -command do_include_all \
2141 pack .vpane.lower.commarea.buttons.incall -side top -fill x
2142 lappend disable_on_lock \
2143 {.vpane.lower.commarea.buttons.incall conf -state}
2145 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
2146 -command do_signoff \
2148 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
2150 button .vpane.lower.commarea.buttons.commit -text {Commit} \
2151 -command do_commit \
2153 pack .vpane.lower.commarea.buttons.commit -side top -fill x
2154 lappend disable_on_lock \
2155 {.vpane.lower.commarea.buttons.commit conf -state}
2157 # -- Commit Message Buffer
2158 frame .vpane.lower.commarea.buffer
2159 set ui_comm .vpane.lower.commarea.buffer.t
2160 set ui_coml .vpane.lower.commarea.buffer.l
2161 label $ui_coml -text {Commit Message:} \
2165 trace add variable commit_type write {uplevel #0 {
2166 switch -glob $commit_type \
2167 initial {$ui_coml conf -text {Initial Commit Message:}} \
2168 amend {$ui_coml conf -text {Amended Commit Message:}} \
2169 merge {$ui_coml conf -text {Merge Commit Message:}} \
2170 * {$ui_coml conf -text {Commit Message:}}
2172 text $ui_comm -background white -borderwidth 1 \
2175 -autoseparators true \
2177 -width 75 -height 9 -wrap none \
2179 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
2180 scrollbar .vpane.lower.commarea.buffer.sby \
2181 -command [list $ui_comm yview]
2182 pack $ui_coml -side top -fill x
2183 pack .vpane.lower.commarea.buffer.sby -side right -fill y
2184 pack $ui_comm -side left -fill y
2185 pack .vpane.lower.commarea.buffer -side left -fill y
2187 # -- Commit Message Buffer Context Menu
2189 menu $ui_comm.ctxm -tearoff 0
2190 $ui_comm.ctxm add command -label "Cut" \
2192 -command "tk_textCut $ui_comm"
2193 $ui_comm.ctxm add command -label "Copy" \
2195 -command "tk_textCopy $ui_comm"
2196 $ui_comm.ctxm add command -label "Paste" \
2198 -command "tk_textPaste $ui_comm"
2199 $ui_comm.ctxm add command -label "Delete" \
2201 -command "$ui_comm delete sel.first sel.last"
2202 $ui_comm.ctxm add separator
2203 $ui_comm.ctxm add command -label "Select All" \
2205 -command "$ui_comm tag add sel 0.0 end"
2206 $ui_comm.ctxm add command -label "Copy All" \
2209 $ui_comm tag add sel 0.0 end
2210 tk_textCopy $ui_comm
2211 $ui_comm tag remove sel 0.0 end
2213 $ui_comm.ctxm add separator
2214 $ui_comm.ctxm add command -label "Sign Off" \
2217 bind_button3 $ui_comm "tk_popup $ui_comm.ctxm %X %Y"
2220 set ui_fname_value {}
2221 set ui_fstatus_value {}
2222 frame .vpane.lower.diff.header -background orange
2223 label .vpane.lower.diff.header.l1 -text {File:} \
2224 -background orange \
2226 label .vpane.lower.diff.header.l2 -textvariable ui_fname_value \
2227 -background orange \
2231 label .vpane.lower.diff.header.l3 -text {Status:} \
2232 -background orange \
2234 label .vpane.lower.diff.header.l4 -textvariable ui_fstatus_value \
2235 -background orange \
2236 -width $max_status_desc \
2240 pack .vpane.lower.diff.header.l1 -side left
2241 pack .vpane.lower.diff.header.l2 -side left -fill x
2242 pack .vpane.lower.diff.header.l4 -side right
2243 pack .vpane.lower.diff.header.l3 -side right
2246 frame .vpane.lower.diff.body
2247 set ui_diff .vpane.lower.diff.body.t
2248 text $ui_diff -background white -borderwidth 0 \
2249 -width 80 -height 15 -wrap none \
2251 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
2252 -yscrollcommand {.vpane.lower.diff.body.sby set} \
2254 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
2255 -command [list $ui_diff xview]
2256 scrollbar .vpane.lower.diff.body.sby -orient vertical \
2257 -command [list $ui_diff yview]
2258 pack .vpane.lower.diff.body.sbx -side bottom -fill x
2259 pack .vpane.lower.diff.body.sby -side right -fill y
2260 pack $ui_diff -side left -fill both -expand 1
2261 pack .vpane.lower.diff.header -side top -fill x
2262 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
2264 $ui_diff tag conf dm -foreground red
2265 $ui_diff tag conf dp -foreground blue
2266 $ui_diff tag conf di -foreground {#00a000}
2267 $ui_diff tag conf dni -foreground {#a000a0}
2268 $ui_diff tag conf da -font font_diffbold
2269 $ui_diff tag conf bold -font font_diffbold
2271 # -- Diff Body Context Menu
2273 menu $ui_diff.ctxm -tearoff 0
2274 $ui_diff.ctxm add command -label "Copy" \
2276 -command "tk_textCopy $ui_diff"
2277 $ui_diff.ctxm add command -label "Select All" \
2279 -command "$ui_diff tag add sel 0.0 end"
2280 $ui_diff.ctxm add command -label "Copy All" \
2283 $ui_diff tag add sel 0.0 end
2284 tk_textCopy $ui_diff
2285 $ui_diff tag remove sel 0.0 end
2287 $ui_diff.ctxm add separator
2288 $ui_diff.ctxm add command -label "Decrease Font Size" \
2290 -command {incr_font_size font_diff -1}
2291 $ui_diff.ctxm add command -label "Increase Font Size" \
2293 -command {incr_font_size font_diff 1}
2294 $ui_diff.ctxm add command -label {Options...} \
2297 bind_button3 $ui_diff "tk_popup $ui_diff.ctxm %X %Y"
2300 set ui_status_value {Initializing...}
2301 label .status -textvariable ui_status_value \
2307 pack .status -anchor w -side bottom -fill x
2311 set gm $repo_config(gui.geometry)
2312 wm geometry . [lindex $gm 0]
2313 .vpane sash place 0 \
2314 [lindex [.vpane sash coord 0] 0] \
2316 .vpane.files sash place 0 \
2318 [lindex [.vpane.files sash coord 0] 1]
2323 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
2324 bind $ui_comm <$M1B-Key-i> {do_include_all;break}
2325 bind $ui_comm <$M1B-Key-I> {do_include_all;break}
2326 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
2327 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
2328 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
2329 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
2330 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
2331 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
2332 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2333 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
2335 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
2336 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
2337 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
2338 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
2339 bind $ui_diff <$M1B-Key-v> {break}
2340 bind $ui_diff <$M1B-Key-V> {break}
2341 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2342 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
2343 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
2344 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
2345 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
2346 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
2348 bind . <Destroy> do_quit
2349 bind all <Key-F5> do_rescan
2350 bind all <$M1B-Key-r> do_rescan
2351 bind all <$M1B-Key-R> do_rescan
2352 bind . <$M1B-Key-s> do_signoff
2353 bind . <$M1B-Key-S> do_signoff
2354 bind . <$M1B-Key-i> do_include_all
2355 bind . <$M1B-Key-I> do_include_all
2356 bind . <$M1B-Key-Return> do_commit
2357 bind all <$M1B-Key-q> do_quit
2358 bind all <$M1B-Key-Q> do_quit
2359 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
2360 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
2361 foreach i [list $ui_index $ui_other] {
2362 bind $i <Button-1> {click %W %x %y 1 %X %Y; break}
2363 bind $i <ButtonRelease-1> {unclick %W %x %y; break}
2364 bind_button3 $i {click %W %x %y 3 %X %Y; break}
2368 set file_lists($ui_index) [list]
2369 set file_lists($ui_other) [list]
2371 wm title . "$appname ([file normalize [file dirname $gitdir]])"
2372 focus -force $ui_comm
2373 if {!$single_commit} {
2375 populate_remote_menu .mbar.fetch From fetch_from
2376 populate_remote_menu .mbar.push To push_to
2377 populate_pull_menu .mbar.pull
2379 after 1 update_status