1 # Tcl ignores the next line -*- tcl -*- \
4 # Copyright (C) 2006 Shawn Pearce, Paul Mackerras. All rights reserved.
5 # This program is free software; it may be used, copied, modified
6 # and distributed under the terms of the GNU General Public Licence,
7 # either version 2, or (at your option) any later version.
9 set appname [lindex [file split $argv0] end]
12 ######################################################################
16 proc is_many_config {name} {
17 switch -glob -- $name {
26 proc load_config {include_global} {
27 global repo_config global_config default_config
29 array unset global_config
30 if {$include_global} {
32 set fd_rc [open "| git repo-config --global --list" r]
33 while {[gets $fd_rc line] >= 0} {
34 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
35 if {[is_many_config $name]} {
36 lappend global_config($name) $value
38 set global_config($name) $value
46 array unset repo_config
48 set fd_rc [open "| git repo-config --list" r]
49 while {[gets $fd_rc line] >= 0} {
50 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
51 if {[is_many_config $name]} {
52 lappend repo_config($name) $value
54 set repo_config($name) $value
61 foreach name [array names default_config] {
62 if {[catch {set v $global_config($name)}]} {
63 set global_config($name) $default_config($name)
65 if {[catch {set v $repo_config($name)}]} {
66 set repo_config($name) $default_config($name)
72 global default_config font_descs
73 global repo_config global_config
74 global repo_config_new global_config_new
76 foreach option $font_descs {
77 set name [lindex $option 0]
78 set font [lindex $option 1]
79 font configure $font \
80 -family $global_config_new(gui.$font^^family) \
81 -size $global_config_new(gui.$font^^size)
82 font configure ${font}bold \
83 -family $global_config_new(gui.$font^^family) \
84 -size $global_config_new(gui.$font^^size)
85 set global_config_new(gui.$name) [font configure $font]
86 unset global_config_new(gui.$font^^family)
87 unset global_config_new(gui.$font^^size)
90 foreach name [array names default_config] {
91 set value $global_config_new($name)
92 if {$value ne $global_config($name)} {
93 if {$value eq $default_config($name)} {
94 catch {exec git repo-config --global --unset $name}
96 regsub -all "\[{}\]" $value {"} value
97 exec git repo-config --global $name $value
99 set global_config($name) $value
100 if {$value eq $repo_config($name)} {
101 catch {exec git repo-config --unset $name}
102 set repo_config($name) $value
107 foreach name [array names default_config] {
108 set value $repo_config_new($name)
109 if {$value ne $repo_config($name)} {
110 if {$value eq $global_config($name)} {
111 catch {exec git repo-config --unset $name}
113 regsub -all "\[{}\]" $value {"} value
114 exec git repo-config $name $value
116 set repo_config($name) $value
121 proc error_popup {msg} {
122 global gitdir appname
127 append title [lindex \
128 [file split [file normalize [file dirname $gitdir]]] \
132 set cmd [list tk_messageBox \
135 -title "$title: error" \
137 if {[winfo ismapped .]} {
138 lappend cmd -parent .
143 proc info_popup {msg} {
144 global gitdir appname
149 append title [lindex \
150 [file split [file normalize [file dirname $gitdir]]] \
162 ######################################################################
166 if { [catch {set gitdir $env(GIT_DIR)}]
167 && [catch {set gitdir [exec git rev-parse --git-dir]} err]} {
168 catch {wm withdraw .}
169 error_popup "Cannot find the git directory:\n\n$err"
172 if {![file isdirectory $gitdir]} {
173 catch {wm withdraw .}
174 error_popup "Git directory not found:\n\n$gitdir"
177 if {[lindex [file split $gitdir] end] ne {.git}} {
178 catch {wm withdraw .}
179 error_popup "Cannot use funny .git directory:\n\n$gitdir"
182 if {[catch {cd [file dirname $gitdir]} err]} {
183 catch {wm withdraw .}
184 error_popup "No working directory [file dirname $gitdir]:\n\n$err"
189 if {$appname eq {git-citool}} {
193 ######################################################################
201 set disable_on_lock [list]
202 set index_lock_type none
204 proc lock_index {type} {
205 global index_lock_type disable_on_lock
207 if {$index_lock_type eq {none}} {
208 set index_lock_type $type
209 foreach w $disable_on_lock {
210 uplevel #0 $w disabled
213 } elseif {$index_lock_type eq "begin-$type"} {
214 set index_lock_type $type
220 proc unlock_index {} {
221 global index_lock_type disable_on_lock
223 set index_lock_type none
224 foreach w $disable_on_lock {
229 ######################################################################
233 proc repository_state {hdvar ctvar} {
235 upvar $hdvar hd $ctvar ct
237 if {[catch {set hd [exec git rev-parse --verify HEAD]}]} {
240 } elseif {[file exists [file join $gitdir MERGE_HEAD]]} {
248 global PARENT empty_tree
253 if {$empty_tree eq {}} {
254 set empty_tree [exec git mktree << {}]
259 proc rescan {after} {
260 global HEAD PARENT commit_type
261 global ui_index ui_other ui_status_value ui_comm
262 global rescan_active file_states
265 if {$rescan_active > 0 || ![lock_index read]} return
267 repository_state new_HEAD new_type
268 if {[string match amend* $commit_type]
269 && $new_type eq {normal}
270 && $new_HEAD eq $HEAD} {
274 set commit_type $new_type
277 array unset file_states
279 if {![$ui_comm edit modified]
280 || [string trim [$ui_comm get 0.0 end]] eq {}} {
281 if {[load_message GITGUI_MSG]} {
282 } elseif {[load_message MERGE_MSG]} {
283 } elseif {[load_message SQUASH_MSG]} {
285 $ui_comm edit modified false
289 if {$repo_config(gui.trustmtime) eq {true}} {
290 rescan_stage2 {} $after
293 set ui_status_value {Refreshing file status...}
294 set cmd [list git update-index]
296 lappend cmd --unmerged
297 lappend cmd --ignore-missing
298 lappend cmd --refresh
299 set fd_rf [open "| $cmd" r]
300 fconfigure $fd_rf -blocking 0 -translation binary
301 fileevent $fd_rf readable \
302 [list rescan_stage2 $fd_rf $after]
306 proc rescan_stage2 {fd after} {
307 global gitdir ui_status_value
308 global rescan_active buf_rdi buf_rdf buf_rlo
312 if {![eof $fd]} return
316 set ls_others [list | git ls-files --others -z \
317 --exclude-per-directory=.gitignore]
318 set info_exclude [file join $gitdir info exclude]
319 if {[file readable $info_exclude]} {
320 lappend ls_others "--exclude-from=$info_exclude"
328 set ui_status_value {Scanning for modified files ...}
329 set fd_di [open "| git diff-index --cached -z [PARENT]" r]
330 set fd_df [open "| git diff-files -z" r]
331 set fd_lo [open $ls_others r]
333 fconfigure $fd_di -blocking 0 -translation binary
334 fconfigure $fd_df -blocking 0 -translation binary
335 fconfigure $fd_lo -blocking 0 -translation binary
336 fileevent $fd_di readable [list read_diff_index $fd_di $after]
337 fileevent $fd_df readable [list read_diff_files $fd_df $after]
338 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
341 proc load_message {file} {
342 global gitdir ui_comm
344 set f [file join $gitdir $file]
345 if {[file isfile $f]} {
346 if {[catch {set fd [open $f r]}]} {
349 set content [string trim [read $fd]]
351 $ui_comm delete 0.0 end
352 $ui_comm insert end $content
358 proc read_diff_index {fd after} {
361 append buf_rdi [read $fd]
363 set n [string length $buf_rdi]
365 set z1 [string first "\0" $buf_rdi $c]
368 set z2 [string first "\0" $buf_rdi $z1]
372 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
374 [string range $buf_rdi $z1 [expr {$z2 - 1}]] \
376 [list [lindex $i 0] [lindex $i 2]] \
382 set buf_rdi [string range $buf_rdi $c end]
387 rescan_done $fd buf_rdi $after
390 proc read_diff_files {fd after} {
393 append buf_rdf [read $fd]
395 set n [string length $buf_rdf]
397 set z1 [string first "\0" $buf_rdf $c]
400 set z2 [string first "\0" $buf_rdf $z1]
404 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
406 [string range $buf_rdf $z1 [expr {$z2 - 1}]] \
409 [list [lindex $i 0] [lindex $i 2]]
414 set buf_rdf [string range $buf_rdf $c end]
419 rescan_done $fd buf_rdf $after
422 proc read_ls_others {fd after} {
425 append buf_rlo [read $fd]
426 set pck [split $buf_rlo "\0"]
427 set buf_rlo [lindex $pck end]
428 foreach p [lrange $pck 0 end-1] {
431 rescan_done $fd buf_rlo $after
434 proc rescan_done {fd buf after} {
436 global file_states repo_config
439 if {![eof $fd]} return
442 if {[incr rescan_active -1] > 0} return
448 if {$repo_config(gui.partialinclude) ne {true}} {
450 foreach path [array names file_states] {
451 switch -- [lindex $file_states($path) 0] {
453 MM {lappend pathList $path}
456 if {$pathList ne {}} {
458 "Updating included files" \
460 [concat {reshow_diff;} $after]
469 proc prune_selection {} {
470 global file_states selected_paths
472 foreach path [array names selected_paths] {
473 if {[catch {set still_here $file_states($path)}]} {
474 unset selected_paths($path)
479 ######################################################################
484 global ui_diff current_diff ui_index ui_other
486 $ui_diff conf -state normal
487 $ui_diff delete 0.0 end
488 $ui_diff conf -state disabled
492 $ui_index tag remove in_diff 0.0 end
493 $ui_other tag remove in_diff 0.0 end
496 proc reshow_diff {} {
497 global current_diff ui_status_value file_states
499 if {$current_diff eq {}
500 || [catch {set s $file_states($current_diff)}]} {
503 show_diff $current_diff
507 proc handle_empty_diff {} {
508 global current_diff file_states file_lists
510 set path $current_diff
511 set s $file_states($path)
512 if {[lindex $s 0] ne {_M}} return
514 info_popup "No differences detected.
516 [short_path $path] has no changes.
518 The modification date of this file was updated
519 by another application and you currently have
520 the Trust File Modification Timestamps option
521 enabled, so Git did not automatically detect
522 that there are no content differences in this
525 This file will now be removed from the modified
526 files list, to prevent possible confusion.
528 if {[catch {exec git update-index -- $path} err]} {
529 error_popup "Failed to refresh index:\n\n$err"
533 set old_w [mapcol [lindex $file_states($path) 0] $path]
534 set lno [lsearch -sorted $file_lists($old_w) $path]
536 set file_lists($old_w) \
537 [lreplace $file_lists($old_w) $lno $lno]
539 $old_w conf -state normal
540 $old_w delete $lno.0 [expr {$lno + 1}].0
541 $old_w conf -state disabled
545 proc show_diff {path {w {}} {lno {}}} {
546 global file_states file_lists
547 global diff_3way diff_active repo_config
548 global ui_diff current_diff ui_status_value
550 if {$diff_active || ![lock_index read]} return
553 if {$w eq {} || $lno == {}} {
554 foreach w [array names file_lists] {
555 set lno [lsearch -sorted $file_lists($w) $path]
562 if {$w ne {} && $lno >= 1} {
563 $w tag add in_diff $lno.0 [expr {$lno + 1}].0
566 set s $file_states($path)
570 set current_diff $path
571 set ui_status_value "Loading diff of [escape_path $path]..."
573 set cmd [list | git diff-index]
574 lappend cmd --no-color
575 if {$repo_config(gui.diffcontext) > 0} {
576 lappend cmd "-U$repo_config(gui.diffcontext)"
586 set fd [open $path r]
587 set content [read $fd]
592 set ui_status_value "Unable to display [escape_path $path]"
593 error_popup "Error loading file:\n\n$err"
596 $ui_diff conf -state normal
597 $ui_diff insert end $content
598 $ui_diff conf -state disabled
601 set ui_status_value {Ready.}
610 if {[catch {set fd [open $cmd r]} err]} {
613 set ui_status_value "Unable to display [escape_path $path]"
614 error_popup "Error loading diff:\n\n$err"
618 fconfigure $fd -blocking 0 -translation auto
619 fileevent $fd readable [list read_diff $fd]
622 proc read_diff {fd} {
623 global ui_diff ui_status_value diff_3way diff_active
626 while {[gets $fd line] >= 0} {
627 if {[string match {diff --git *} $line]} continue
628 if {[string match {diff --combined *} $line]} continue
629 if {[string match {--- *} $line]} continue
630 if {[string match {+++ *} $line]} continue
631 if {[string match index* $line]} {
632 if {[string first , $line] >= 0} {
637 $ui_diff conf -state normal
639 set x [string index $line 0]
644 default {set tags {}}
647 set x [string range $line 0 1]
649 default {set tags {}}
651 "++" {set tags dp; set x " +"}
652 " +" {set tags {di bold}; set x "++"}
653 "+ " {set tags dni; set x "-+"}
654 "--" {set tags dm; set x " -"}
655 " -" {set tags {dm bold}; set x "--"}
656 "- " {set tags di; set x "+-"}
657 default {set tags {}}
659 set line [string replace $line 0 1 $x]
661 $ui_diff insert end $line $tags
662 $ui_diff insert end "\n"
663 $ui_diff conf -state disabled
670 set ui_status_value {Ready.}
672 if {$repo_config(gui.trustmtime) eq {true}
673 && [$ui_diff index end] eq {2.0}} {
679 ######################################################################
683 proc load_last_commit {} {
684 global HEAD PARENT commit_type ui_comm
686 if {[string match amend* $commit_type]} return
687 if {$commit_type ne {normal}} {
688 error_popup "Can't amend a $commit_type commit."
696 set fd [open "| git cat-file commit $HEAD" r]
697 while {[gets $fd line] > 0} {
698 if {[string match {parent *} $line]} {
699 set parent [string range $line 7 end]
703 set msg [string trim [read $fd]]
706 error_popup "Error loading commit data for amend:\n\n$err"
710 if {$parent_count > 1} {
711 error_popup {Can't amend a merge commit.}
715 if {$parent_count == 0} {
716 set commit_type amend-initial
718 } elseif {$parent_count == 1} {
719 set commit_type amend
723 $ui_comm delete 0.0 end
724 $ui_comm insert end $msg
725 $ui_comm edit modified false
727 rescan {set ui_status_value {Ready.}}
730 proc create_new_commit {} {
731 global commit_type ui_comm
733 set commit_type normal
734 $ui_comm delete 0.0 end
735 $ui_comm edit modified false
737 rescan {set ui_status_value {Ready.}}
740 set GIT_COMMITTER_IDENT {}
742 proc committer_ident {} {
743 global GIT_COMMITTER_IDENT
745 if {$GIT_COMMITTER_IDENT eq {}} {
746 if {[catch {set me [exec git var GIT_COMMITTER_IDENT]} err]} {
747 error_popup "Unable to obtain your identity:\n\n$err"
750 if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \
751 $me me GIT_COMMITTER_IDENT]} {
752 error_popup "Invalid GIT_COMMITTER_IDENT:\n\n$me"
757 return $GIT_COMMITTER_IDENT
760 proc commit_tree {} {
761 global HEAD commit_type file_states ui_comm repo_config
763 if {![lock_index update]} return
764 if {[committer_ident] eq {}} return
766 # -- Our in memory state should match the repository.
768 repository_state curHEAD cur_type
769 if {[string match amend* $commit_type]
770 && $cur_type eq {normal}
771 && $curHEAD eq $HEAD} {
772 } elseif {$commit_type ne $cur_type || $HEAD ne $curHEAD} {
773 info_popup {Last scanned state does not match repository state.
775 Another Git program has modified this repository
776 since the last scan. A rescan must be performed
777 before another commit can be created.
779 The rescan will be automatically started now.
782 rescan {set ui_status_value {Ready.}}
786 # -- At least one file should differ in the index.
789 foreach path [array names file_states] {
790 switch -glob -- [lindex $file_states($path) 0] {
794 M? {set files_ready 1; break}
796 error_popup "Unmerged files cannot be committed.
798 File [short_path $path] has merge conflicts.
799 You must resolve them and include the file before committing.
805 error_popup "Unknown file state [lindex $s 0] detected.
807 File [short_path $path] cannot be committed by this program.
813 error_popup {No included files to commit.
815 You must include at least 1 file before you can commit.
821 # -- A message is required.
823 set msg [string trim [$ui_comm get 1.0 end]]
825 error_popup {Please supply a commit message.
827 A good commit message has the following format:
829 - First line: Describe in one sentance what you did.
831 - Remaining lines: Describe why this change is good.
837 # -- Update included files if partialincludes are off.
839 if {$repo_config(gui.partialinclude) ne {true}} {
841 foreach path [array names file_states] {
842 switch -glob -- [lindex $file_states($path) 0] {
844 M? {lappend pathList $path}
847 if {$pathList ne {}} {
850 "Updating included files" \
852 [concat {lock_index update;} \
853 [list commit_prehook $curHEAD $msg]]
858 commit_prehook $curHEAD $msg
861 proc commit_prehook {curHEAD msg} {
862 global tcl_platform gitdir ui_status_value pch_error
864 # On Cygwin [file executable] might lie so we need to ask
865 # the shell if the hook is executable. Yes that's annoying.
867 set pchook [file join $gitdir hooks pre-commit]
868 if {$tcl_platform(platform) eq {windows}
869 && [file isfile $pchook]} {
870 set pchook [list sh -c [concat \
871 "if test -x \"$pchook\";" \
872 "then exec \"$pchook\" 2>&1;" \
874 } elseif {[file executable $pchook]} {
875 set pchook [list $pchook |& cat]
877 commit_writetree $curHEAD $msg
881 set ui_status_value {Calling pre-commit hook...}
883 set fd_ph [open "| $pchook" r]
884 fconfigure $fd_ph -blocking 0 -translation binary
885 fileevent $fd_ph readable \
886 [list commit_prehook_wait $fd_ph $curHEAD $msg]
889 proc commit_prehook_wait {fd_ph curHEAD msg} {
890 global pch_error ui_status_value
892 append pch_error [read $fd_ph]
893 fconfigure $fd_ph -blocking 1
895 if {[catch {close $fd_ph}]} {
896 set ui_status_value {Commit declined by pre-commit hook.}
897 hook_failed_popup pre-commit $pch_error
900 commit_writetree $curHEAD $msg
905 fconfigure $fd_ph -blocking 0
908 proc commit_writetree {curHEAD msg} {
909 global ui_status_value
911 set ui_status_value {Committing changes...}
912 set fd_wt [open "| git write-tree" r]
913 fileevent $fd_wt readable \
914 [list commit_committree $fd_wt $curHEAD $msg]
917 proc commit_committree {fd_wt curHEAD msg} {
918 global single_commit gitdir HEAD PARENT commit_type tcl_platform
919 global ui_status_value ui_comm selected_commit_type
920 global file_states selected_paths
923 if {$tree_id eq {} || [catch {close $fd_wt} err]} {
924 error_popup "write-tree failed:\n\n$err"
925 set ui_status_value {Commit failed.}
930 # -- Create the commit.
932 set cmd [list git commit-tree $tree_id]
934 lappend cmd -p $PARENT
936 if {$commit_type eq {merge}} {
938 set fd_mh [open [file join $gitdir MERGE_HEAD] r]
939 while {[gets $fd_mh merge_head] >= 0} {
940 lappend cmd -p $merge_head
944 error_popup "Loading MERGE_HEAD failed:\n\n$err"
945 set ui_status_value {Commit failed.}
951 # git commit-tree writes to stderr during initial commit.
952 lappend cmd 2>/dev/null
955 if {[catch {set cmt_id [eval exec $cmd]} err]} {
956 error_popup "commit-tree failed:\n\n$err"
957 set ui_status_value {Commit failed.}
962 # -- Update the HEAD ref.
965 if {$commit_type ne {normal}} {
966 append reflogm " ($commit_type)"
968 set i [string first "\n" $msg]
970 append reflogm {: } [string range $msg 0 [expr {$i - 1}]]
972 append reflogm {: } $msg
974 set cmd [list git update-ref -m $reflogm HEAD $cmt_id $curHEAD]
975 if {[catch {eval exec $cmd} err]} {
976 error_popup "update-ref failed:\n\n$err"
977 set ui_status_value {Commit failed.}
982 # -- Cleanup after ourselves.
984 catch {file delete [file join $gitdir MERGE_HEAD]}
985 catch {file delete [file join $gitdir MERGE_MSG]}
986 catch {file delete [file join $gitdir SQUASH_MSG]}
987 catch {file delete [file join $gitdir GITGUI_MSG]}
989 # -- Let rerere do its thing.
991 if {[file isdirectory [file join $gitdir rr-cache]]} {
992 catch {exec git rerere}
995 # -- Run the post-commit hook.
997 set pchook [file join $gitdir hooks post-commit]
998 if {$tcl_platform(platform) eq {windows} && [file isfile $pchook]} {
999 set pchook [list sh -c [concat \
1000 "if test -x \"$pchook\";" \
1001 "then exec \"$pchook\";" \
1003 } elseif {![file executable $pchook]} {
1006 if {$pchook ne {}} {
1007 catch {exec $pchook &}
1010 $ui_comm delete 0.0 end
1011 $ui_comm edit modified false
1014 if {$single_commit} do_quit
1016 # -- Update status without invoking any git commands.
1018 set commit_type normal
1019 set selected_commit_type new
1023 foreach path [array names file_states] {
1024 set s $file_states($path)
1026 switch -glob -- $m {
1031 D? {set m _[string index $m 1]}
1035 unset file_states($path)
1036 catch {unset selected_paths($path)}
1038 lset file_states($path) 0 $m
1045 set ui_status_value \
1046 "Changes committed as [string range $cmt_id 0 7]."
1049 ######################################################################
1053 proc fetch_from {remote} {
1054 set w [new_console "fetch $remote" \
1055 "Fetching new changes from $remote"]
1056 set cmd [list git fetch]
1058 console_exec $w $cmd
1061 proc pull_remote {remote branch} {
1062 global HEAD commit_type file_states repo_config
1064 if {![lock_index update]} return
1066 # -- Our in memory state should match the repository.
1068 repository_state curHEAD cur_type
1069 if {$commit_type ne $cur_type || $HEAD ne $curHEAD} {
1070 error_popup {Last scanned state does not match repository state.
1072 Its highly likely that another Git program modified the
1073 repository since our last scan. A rescan is required
1074 before a pull can be started.
1077 rescan {set ui_status_value {Ready.}}
1081 # -- No differences should exist before a pull.
1083 if {[array size file_states] != 0} {
1084 error_popup {Uncommitted but modified files are present.
1086 You should not perform a pull with unmodified files in your working
1087 directory as Git would be unable to recover from an incorrect merge.
1089 Commit or throw away all changes before starting a pull operation.
1095 set w [new_console "pull $remote $branch" \
1096 "Pulling new changes from branch $branch in $remote"]
1097 set cmd [list git pull]
1098 if {$repo_config(gui.pullsummary) eq {false}} {
1099 lappend cmd --no-summary
1103 console_exec $w $cmd [list post_pull_remote $remote $branch]
1106 proc post_pull_remote {remote branch success} {
1107 global HEAD PARENT commit_type selected_commit_type
1108 global ui_status_value
1112 repository_state HEAD commit_type
1114 set selected_commit_type new
1115 set $ui_status_value "Pulling $branch from $remote complete."
1117 set m "Conflicts detected while pulling $branch from $remote."
1118 rescan "set ui_status_value {$m}"
1122 proc push_to {remote} {
1123 set w [new_console "push $remote" \
1124 "Pushing changes to $remote"]
1125 set cmd [list git push]
1127 console_exec $w $cmd
1130 ######################################################################
1134 proc mapcol {state path} {
1135 global all_cols ui_other
1137 if {[catch {set r $all_cols($state)}]} {
1138 puts "error: no column for state={$state} $path"
1144 proc mapicon {state path} {
1147 if {[catch {set r $all_icons($state)}]} {
1148 puts "error: no icon for state={$state} $path"
1154 proc mapdesc {state path} {
1157 if {[catch {set r $all_descs($state)}]} {
1158 puts "error: no desc for state={$state} $path"
1164 proc escape_path {path} {
1165 regsub -all "\n" $path "\\n" path
1169 proc short_path {path} {
1170 return [escape_path [lindex [file split $path] end]]
1175 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1176 global file_states next_icon_id
1178 set s0 [string index $new_state 0]
1179 set s1 [string index $new_state 1]
1181 if {[catch {set info $file_states($path)}]} {
1183 set icon n[incr next_icon_id]
1185 set state [lindex $info 0]
1186 set icon [lindex $info 1]
1187 if {$head_info eq {}} {set head_info [lindex $info 2]}
1188 if {$index_info eq {}} {set index_info [lindex $info 3]}
1191 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1192 elseif {$s0 eq {_}} {set s0 _}
1194 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1195 elseif {$s1 eq {_}} {set s1 _}
1197 if {$s0 ne {_} && [string index $state 0] eq {_}
1198 && $head_info eq {}} {
1199 set head_info $index_info
1202 set file_states($path) [list $s0$s1 $icon \
1203 $head_info $index_info \
1208 proc display_file {path state} {
1209 global file_states file_lists selected_paths
1211 set old_m [merge_state $path $state]
1212 set s $file_states($path)
1213 set new_m [lindex $s 0]
1214 set new_w [mapcol $new_m $path]
1215 set old_w [mapcol $old_m $path]
1216 set new_icon [mapicon $new_m $path]
1218 if {$new_w ne $old_w} {
1219 set lno [lsearch -sorted $file_lists($old_w) $path]
1222 $old_w conf -state normal
1223 $old_w delete $lno.0 [expr {$lno + 1}].0
1224 $old_w conf -state disabled
1227 lappend file_lists($new_w) $path
1228 set file_lists($new_w) [lsort $file_lists($new_w)]
1229 set lno [lsearch -sorted $file_lists($new_w) $path]
1231 $new_w conf -state normal
1232 $new_w image create $lno.0 \
1233 -align center -padx 5 -pady 1 \
1234 -name [lindex $s 1] \
1236 $new_w insert $lno.1 "[escape_path $path]\n"
1237 if {[catch {set in_sel $selected_paths($path)}]} {
1241 $new_w tag add in_sel $lno.0 [expr {$lno + 1}].0
1243 $new_w conf -state disabled
1244 } elseif {$new_icon ne [mapicon $old_m $path]} {
1245 $new_w conf -state normal
1246 $new_w image conf [lindex $s 1] -image $new_icon
1247 $new_w conf -state disabled
1251 proc display_all_files {} {
1252 global ui_index ui_other
1253 global file_states file_lists
1254 global last_clicked selected_paths
1256 $ui_index conf -state normal
1257 $ui_other conf -state normal
1259 $ui_index delete 0.0 end
1260 $ui_other delete 0.0 end
1263 set file_lists($ui_index) [list]
1264 set file_lists($ui_other) [list]
1266 foreach path [lsort [array names file_states]] {
1267 set s $file_states($path)
1269 set w [mapcol $m $path]
1270 lappend file_lists($w) $path
1271 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1272 $w image create end \
1273 -align center -padx 5 -pady 1 \
1274 -name [lindex $s 1] \
1275 -image [mapicon $m $path]
1276 $w insert end "[escape_path $path]\n"
1277 if {[catch {set in_sel $selected_paths($path)}]} {
1281 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
1285 $ui_index conf -state disabled
1286 $ui_other conf -state disabled
1289 proc update_indexinfo {msg pathList after} {
1290 global update_index_cp ui_status_value
1292 if {![lock_index update]} return
1294 set update_index_cp 0
1295 set pathList [lsort $pathList]
1296 set totalCnt [llength $pathList]
1297 set batch [expr {int($totalCnt * .01) + 1}]
1298 if {$batch > 25} {set batch 25}
1300 set ui_status_value [format \
1301 "$msg... %i/%i files (%.2f%%)" \
1305 set fd [open "| git update-index -z --index-info" w]
1311 fileevent $fd writable [list \
1312 write_update_indexinfo \
1322 proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
1323 global update_index_cp ui_status_value
1324 global file_states current_diff
1326 if {$update_index_cp >= $totalCnt} {
1333 for {set i $batch} \
1334 {$update_index_cp < $totalCnt && $i > 0} \
1336 set path [lindex $pathList $update_index_cp]
1337 incr update_index_cp
1339 set s $file_states($path)
1340 switch -glob -- [lindex $s 0] {
1346 set info [lindex $s 2]
1347 if {$info eq {}} continue
1349 puts -nonewline $fd $info
1350 puts -nonewline $fd "\t"
1351 puts -nonewline $fd $path
1352 puts -nonewline $fd "\0"
1353 display_file $path $new
1356 set ui_status_value [format \
1357 "$msg... %i/%i files (%.2f%%)" \
1360 [expr {100.0 * $update_index_cp / $totalCnt}]]
1363 proc update_index {msg pathList after} {
1364 global update_index_cp ui_status_value
1366 if {![lock_index update]} return
1368 set update_index_cp 0
1369 set pathList [lsort $pathList]
1370 set totalCnt [llength $pathList]
1371 set batch [expr {int($totalCnt * .01) + 1}]
1372 if {$batch > 25} {set batch 25}
1374 set ui_status_value [format \
1375 "$msg... %i/%i files (%.2f%%)" \
1379 set fd [open "| git update-index --add --remove -z --stdin" w]
1385 fileevent $fd writable [list \
1386 write_update_index \
1396 proc write_update_index {fd pathList totalCnt batch msg after} {
1397 global update_index_cp ui_status_value
1398 global file_states current_diff
1400 if {$update_index_cp >= $totalCnt} {
1407 for {set i $batch} \
1408 {$update_index_cp < $totalCnt && $i > 0} \
1410 set path [lindex $pathList $update_index_cp]
1411 incr update_index_cp
1413 switch -glob -- [lindex $file_states($path) 0] {
1429 puts -nonewline $fd $path
1430 puts -nonewline $fd "\0"
1431 display_file $path $new
1434 set ui_status_value [format \
1435 "$msg... %i/%i files (%.2f%%)" \
1438 [expr {100.0 * $update_index_cp / $totalCnt}]]
1441 ######################################################################
1443 ## remote management
1445 proc load_all_remotes {} {
1446 global gitdir all_remotes repo_config
1448 set all_remotes [list]
1449 set rm_dir [file join $gitdir remotes]
1450 if {[file isdirectory $rm_dir]} {
1451 set all_remotes [concat $all_remotes [glob \
1455 -directory $rm_dir *]]
1458 foreach line [array names repo_config remote.*.url] {
1459 if {[regexp ^remote\.(.*)\.url\$ $line line name]} {
1460 lappend all_remotes $name
1464 set all_remotes [lsort -unique $all_remotes]
1467 proc populate_fetch_menu {m} {
1468 global gitdir all_remotes repo_config
1470 foreach r $all_remotes {
1472 if {![catch {set a $repo_config(remote.$r.url)}]} {
1473 if {![catch {set a $repo_config(remote.$r.fetch)}]} {
1478 set fd [open [file join $gitdir remotes $r] r]
1479 while {[gets $fd n] >= 0} {
1480 if {[regexp {^Pull:[ \t]*([^:]+):} $n]} {
1491 -label "Fetch from $r..." \
1492 -command [list fetch_from $r] \
1498 proc populate_push_menu {m} {
1499 global gitdir all_remotes repo_config
1501 foreach r $all_remotes {
1503 if {![catch {set a $repo_config(remote.$r.url)}]} {
1504 if {![catch {set a $repo_config(remote.$r.push)}]} {
1509 set fd [open [file join $gitdir remotes $r] r]
1510 while {[gets $fd n] >= 0} {
1511 if {[regexp {^Push:[ \t]*([^:]+):} $n]} {
1522 -label "Push to $r..." \
1523 -command [list push_to $r] \
1529 proc populate_pull_menu {m} {
1530 global gitdir repo_config all_remotes disable_on_lock
1532 foreach remote $all_remotes {
1534 if {[array get repo_config remote.$remote.url] ne {}} {
1535 if {[array get repo_config remote.$remote.fetch] ne {}} {
1536 regexp {^([^:]+):} \
1537 [lindex $repo_config(remote.$remote.fetch) 0] \
1542 set fd [open [file join $gitdir remotes $remote] r]
1543 while {[gets $fd line] >= 0} {
1544 if {[regexp {^Pull:[ \t]*([^:]+):} $line line rb]} {
1553 regsub ^refs/heads/ $rb {} rb_short
1554 if {$rb_short ne {}} {
1556 -label "Branch $rb_short from $remote..." \
1557 -command [list pull_remote $remote $rb] \
1559 lappend disable_on_lock \
1560 [list $m entryconf [$m index last] -state]
1565 ######################################################################
1570 #define mask_width 14
1571 #define mask_height 15
1572 static unsigned char mask_bits[] = {
1573 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1574 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1575 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1578 image create bitmap file_plain -background white -foreground black -data {
1579 #define plain_width 14
1580 #define plain_height 15
1581 static unsigned char plain_bits[] = {
1582 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1583 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1584 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1585 } -maskdata $filemask
1587 image create bitmap file_mod -background white -foreground blue -data {
1588 #define mod_width 14
1589 #define mod_height 15
1590 static unsigned char mod_bits[] = {
1591 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1592 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1593 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1594 } -maskdata $filemask
1596 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1597 #define file_fulltick_width 14
1598 #define file_fulltick_height 15
1599 static unsigned char file_fulltick_bits[] = {
1600 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1601 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1602 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1603 } -maskdata $filemask
1605 image create bitmap file_parttick -background white -foreground "#005050" -data {
1606 #define parttick_width 14
1607 #define parttick_height 15
1608 static unsigned char parttick_bits[] = {
1609 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1610 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1611 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1612 } -maskdata $filemask
1614 image create bitmap file_question -background white -foreground black -data {
1615 #define file_question_width 14
1616 #define file_question_height 15
1617 static unsigned char file_question_bits[] = {
1618 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1619 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1620 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1621 } -maskdata $filemask
1623 image create bitmap file_removed -background white -foreground red -data {
1624 #define file_removed_width 14
1625 #define file_removed_height 15
1626 static unsigned char file_removed_bits[] = {
1627 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1628 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1629 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1630 } -maskdata $filemask
1632 image create bitmap file_merge -background white -foreground blue -data {
1633 #define file_merge_width 14
1634 #define file_merge_height 15
1635 static unsigned char file_merge_bits[] = {
1636 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1637 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1638 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1639 } -maskdata $filemask
1641 set ui_index .vpane.files.index.list
1642 set ui_other .vpane.files.other.list
1643 set max_status_desc 0
1645 {__ i plain "Unmodified"}
1646 {_M i mod "Modified"}
1647 {M_ i fulltick "Included in commit"}
1648 {MM i parttick "Partially included"}
1650 {_O o plain "Untracked"}
1651 {A_ o fulltick "Added by commit"}
1652 {AM o parttick "Partially added"}
1653 {AD o question "Added (but now gone)"}
1655 {_D i question "Missing"}
1656 {D_ i removed "Removed by commit"}
1657 {DD i removed "Removed by commit"}
1658 {DO i removed "Removed (still exists)"}
1660 {UM i merge "Merge conflicts"}
1661 {U_ i merge "Merge conflicts"}
1663 if {$max_status_desc < [string length [lindex $i 3]]} {
1664 set max_status_desc [string length [lindex $i 3]]
1666 if {[lindex $i 1] eq {i}} {
1667 set all_cols([lindex $i 0]) $ui_index
1669 set all_cols([lindex $i 0]) $ui_other
1671 set all_icons([lindex $i 0]) file_[lindex $i 2]
1672 set all_descs([lindex $i 0]) [lindex $i 3]
1676 ######################################################################
1681 global tcl_platform tk_library
1682 if {$tcl_platform(platform) eq {unix}
1683 && $tcl_platform(os) eq {Darwin}
1684 && [string match /Library/Frameworks/* $tk_library]} {
1690 proc bind_button3 {w cmd} {
1691 bind $w <Any-Button-3> $cmd
1693 bind $w <Control-Button-1> $cmd
1697 proc incr_font_size {font {amt 1}} {
1698 set sz [font configure $font -size]
1700 font configure $font -size $sz
1701 font configure ${font}bold -size $sz
1704 proc hook_failed_popup {hook msg} {
1705 global gitdir appname
1711 label $w.m.l1 -text "$hook hook failed:" \
1716 -background white -borderwidth 1 \
1718 -width 80 -height 10 \
1720 -yscrollcommand [list $w.m.sby set]
1722 -text {You must correct the above errors before committing.} \
1726 scrollbar $w.m.sby -command [list $w.m.t yview]
1727 pack $w.m.l1 -side top -fill x
1728 pack $w.m.l2 -side bottom -fill x
1729 pack $w.m.sby -side right -fill y
1730 pack $w.m.t -side left -fill both -expand 1
1731 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
1733 $w.m.t insert 1.0 $msg
1734 $w.m.t conf -state disabled
1736 button $w.ok -text OK \
1739 -command "destroy $w"
1740 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
1742 bind $w <Visibility> "grab $w; focus $w"
1743 bind $w <Key-Return> "destroy $w"
1744 wm title $w "$appname ([lindex [file split \
1745 [file normalize [file dirname $gitdir]]] \
1750 set next_console_id 0
1752 proc new_console {short_title long_title} {
1753 global next_console_id console_data
1754 set w .console[incr next_console_id]
1755 set console_data($w) [list $short_title $long_title]
1756 return [console_init $w]
1759 proc console_init {w} {
1760 global console_cr console_data
1761 global gitdir appname M1B
1763 set console_cr($w) 1.0
1766 label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
1771 -background white -borderwidth 1 \
1773 -width 80 -height 10 \
1776 -yscrollcommand [list $w.m.sby set]
1777 label $w.m.s -text {Working... please wait...} \
1781 scrollbar $w.m.sby -command [list $w.m.t yview]
1782 pack $w.m.l1 -side top -fill x
1783 pack $w.m.s -side bottom -fill x
1784 pack $w.m.sby -side right -fill y
1785 pack $w.m.t -side left -fill both -expand 1
1786 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
1788 menu $w.ctxm -tearoff 0
1789 $w.ctxm add command -label "Copy" \
1791 -command "tk_textCopy $w.m.t"
1792 $w.ctxm add command -label "Select All" \
1794 -command "$w.m.t tag add sel 0.0 end"
1795 $w.ctxm add command -label "Copy All" \
1798 $w.m.t tag add sel 0.0 end
1800 $w.m.t tag remove sel 0.0 end
1803 button $w.ok -text {Close} \
1806 -command "destroy $w"
1807 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
1809 bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
1810 bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
1811 bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
1812 bind $w <Visibility> "focus $w"
1813 wm title $w "$appname ([lindex [file split \
1814 [file normalize [file dirname $gitdir]]] \
1815 end]): [lindex $console_data($w) 0]"
1819 proc console_exec {w cmd {after {}}} {
1822 # -- Windows tosses the enviroment when we exec our child.
1823 # But most users need that so we have to relogin. :-(
1825 if {$tcl_platform(platform) eq {windows}} {
1826 set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
1829 # -- Tcl won't let us redirect both stdout and stderr to
1830 # the same pipe. So pass it through cat...
1832 set cmd [concat | $cmd |& cat]
1834 set fd_f [open $cmd r]
1835 fconfigure $fd_f -blocking 0 -translation binary
1836 fileevent $fd_f readable [list console_read $w $fd_f $after]
1839 proc console_read {w fd after} {
1840 global console_cr console_data
1844 if {![winfo exists $w]} {console_init $w}
1845 $w.m.t conf -state normal
1847 set n [string length $buf]
1849 set cr [string first "\r" $buf $c]
1850 set lf [string first "\n" $buf $c]
1851 if {$cr < 0} {set cr [expr {$n + 1}]}
1852 if {$lf < 0} {set lf [expr {$n + 1}]}
1855 $w.m.t insert end [string range $buf $c $lf]
1856 set console_cr($w) [$w.m.t index {end -1c}]
1860 $w.m.t delete $console_cr($w) end
1861 $w.m.t insert end "\n"
1862 $w.m.t insert end [string range $buf $c $cr]
1867 $w.m.t conf -state disabled
1871 fconfigure $fd -blocking 1
1873 if {[catch {close $fd}]} {
1874 if {![winfo exists $w]} {console_init $w}
1875 $w.m.s conf -background red -text {Error: Command Failed}
1876 $w.ok conf -state normal
1878 } elseif {[winfo exists $w]} {
1879 $w.m.s conf -background green -text {Success}
1880 $w.ok conf -state normal
1883 array unset console_cr $w
1884 array unset console_data $w
1886 uplevel #0 $after $ok
1890 fconfigure $fd -blocking 0
1893 ######################################################################
1897 set starting_gitk_msg {Please wait... Starting gitk...}
1900 global tcl_platform ui_status_value starting_gitk_msg
1902 set ui_status_value $starting_gitk_msg
1904 if {$ui_status_value eq $starting_gitk_msg} {
1905 set ui_status_value {Ready.}
1909 if {$tcl_platform(platform) eq {windows}} {
1917 set w [new_console "repack" "Repacking the object database"]
1918 set cmd [list git repack]
1921 console_exec $w $cmd
1927 global gitdir ui_comm is_quitting repo_config
1929 if {$is_quitting} return
1932 # -- Stash our current commit buffer.
1934 set save [file join $gitdir GITGUI_MSG]
1935 set msg [string trim [$ui_comm get 0.0 end]]
1936 if {[$ui_comm edit modified] && $msg ne {}} {
1938 set fd [open $save w]
1939 puts $fd [string trim [$ui_comm get 0.0 end]]
1942 } elseif {$msg eq {} && [file exists $save]} {
1946 # -- Stash our current window geometry into this repository.
1948 set cfg_geometry [list]
1949 lappend cfg_geometry [wm geometry .]
1950 lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
1951 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
1952 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
1955 if {$cfg_geometry ne $rc_geometry} {
1956 catch {exec git repo-config gui.geometry $cfg_geometry}
1963 rescan {set ui_status_value {Ready.}}
1966 proc remove_helper {txt paths} {
1967 global file_states current_diff
1969 if {![lock_index begin-update]} return
1973 foreach path $paths {
1974 switch -glob -- [lindex $file_states($path) 0] {
1978 lappend pathList $path
1979 if {$path eq $current_diff} {
1980 set after {reshow_diff;}
1985 if {$pathList eq {}} {
1991 [concat $after {set ui_status_value {Ready.}}]
1995 proc do_remove_selection {} {
1996 global current_diff selected_paths
1998 if {[array size selected_paths] > 0} {
2000 {Removing selected files from commit} \
2001 [array names selected_paths]
2002 } elseif {$current_diff ne {}} {
2004 "Removing [short_path $current_diff] from commit" \
2005 [list $current_diff]
2009 proc include_helper {txt paths} {
2010 global file_states current_diff
2012 if {![lock_index begin-update]} return
2016 foreach path $paths {
2017 switch -- [lindex $file_states($path) 0] {
2026 lappend pathList $path
2027 if {$path eq $current_diff} {
2028 set after {reshow_diff;}
2033 if {$pathList eq {}} {
2039 [concat $after {set ui_status_value {Ready to commit.}}]
2043 proc do_include_selection {} {
2044 global current_diff selected_paths
2046 if {[array size selected_paths] > 0} {
2048 {Including selected files} \
2049 [array names selected_paths]
2050 } elseif {$current_diff ne {}} {
2052 "Including [short_path $current_diff]" \
2053 [list $current_diff]
2057 proc do_include_all {} {
2061 foreach path [array names file_states] {
2062 switch -- [lindex $file_states($path) 0] {
2067 _D {lappend paths $path}
2071 {Including all modified files} \
2075 proc do_signoff {} {
2078 set me [committer_ident]
2079 if {$me eq {}} return
2081 set sob "Signed-off-by: $me"
2082 set last [$ui_comm get {end -1c linestart} {end -1c}]
2083 if {$last ne $sob} {
2084 $ui_comm edit separator
2086 && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
2087 $ui_comm insert end "\n"
2089 $ui_comm insert end "\n$sob"
2090 $ui_comm edit separator
2095 proc do_select_commit_type {} {
2096 global commit_type selected_commit_type
2098 if {$selected_commit_type eq {new}
2099 && [string match amend* $commit_type]} {
2101 } elseif {$selected_commit_type eq {amend}
2102 && ![string match amend* $commit_type]} {
2105 # The amend request was rejected...
2107 if {![string match amend* $commit_type]} {
2108 set selected_commit_type new
2117 proc do_options {} {
2118 global appname gitdir font_descs
2119 global repo_config global_config
2120 global repo_config_new global_config_new
2122 array unset repo_config_new
2123 array unset global_config_new
2124 foreach name [array names repo_config] {
2125 set repo_config_new($name) $repo_config($name)
2128 foreach name [array names repo_config] {
2130 gui.diffcontext {continue}
2132 set repo_config_new($name) $repo_config($name)
2134 foreach name [array names global_config] {
2135 set global_config_new($name) $global_config($name)
2137 set reponame [lindex [file split \
2138 [file normalize [file dirname $gitdir]]] \
2141 set w .options_editor
2143 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2145 label $w.header -text "$appname Options" \
2147 pack $w.header -side top -fill x
2150 button $w.buttons.restore -text {Restore Defaults} \
2152 -command do_restore_defaults
2153 pack $w.buttons.restore -side left
2154 button $w.buttons.save -text Save \
2156 -command [list do_save_config $w]
2157 pack $w.buttons.save -side right
2158 button $w.buttons.cancel -text {Cancel} \
2160 -command [list destroy $w]
2161 pack $w.buttons.cancel -side right
2162 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2164 labelframe $w.repo -text "$reponame Repository" \
2166 -relief raised -borderwidth 2
2167 labelframe $w.global -text {Global (All Repositories)} \
2169 -relief raised -borderwidth 2
2170 pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
2171 pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
2174 {b partialinclude {Allow Partially Included Files}}
2175 {b pullsummary {Show Pull Summary}}
2176 {b trustmtime {Trust File Modification Timestamps}}
2177 {i diffcontext {Number of Diff Context Lines}}
2179 set type [lindex $option 0]
2180 set name [lindex $option 1]
2181 set text [lindex $option 2]
2182 foreach f {repo global} {
2185 checkbutton $w.$f.$name -text $text \
2186 -variable ${f}_config_new(gui.$name) \
2190 pack $w.$f.$name -side top -anchor w
2194 label $w.$f.$name.l -text "$text:" -font font_ui
2195 pack $w.$f.$name.l -side left -anchor w -fill x
2196 spinbox $w.$f.$name.v \
2197 -textvariable ${f}_config_new(gui.$name) \
2198 -from 1 -to 99 -increment 1 \
2201 pack $w.$f.$name.v -side right -anchor e
2202 pack $w.$f.$name -side top -anchor w -fill x
2208 set all_fonts [lsort [font families]]
2209 foreach option $font_descs {
2210 set name [lindex $option 0]
2211 set font [lindex $option 1]
2212 set text [lindex $option 2]
2214 set global_config_new(gui.$font^^family) \
2215 [font configure $font -family]
2216 set global_config_new(gui.$font^^size) \
2217 [font configure $font -size]
2219 frame $w.global.$name
2220 label $w.global.$name.l -text "$text:" -font font_ui
2221 pack $w.global.$name.l -side left -anchor w -fill x
2222 eval tk_optionMenu $w.global.$name.family \
2223 global_config_new(gui.$font^^family) \
2225 spinbox $w.global.$name.size \
2226 -textvariable global_config_new(gui.$font^^size) \
2227 -from 2 -to 80 -increment 1 \
2230 pack $w.global.$name.size -side right -anchor e
2231 pack $w.global.$name.family -side right -anchor e
2232 pack $w.global.$name -side top -anchor w -fill x
2235 bind $w <Visibility> "grab $w; focus $w"
2236 bind $w <Key-Escape> "destroy $w"
2237 wm title $w "$appname ($reponame): Options"
2241 proc do_restore_defaults {} {
2242 global font_descs default_config repo_config
2243 global repo_config_new global_config_new
2245 foreach name [array names default_config] {
2246 set repo_config_new($name) $default_config($name)
2247 set global_config_new($name) $default_config($name)
2250 foreach option $font_descs {
2251 set name [lindex $option 0]
2252 set repo_config(gui.$name) $default_config(gui.$name)
2256 foreach option $font_descs {
2257 set name [lindex $option 0]
2258 set font [lindex $option 1]
2259 set global_config_new(gui.$font^^family) \
2260 [font configure $font -family]
2261 set global_config_new(gui.$font^^size) \
2262 [font configure $font -size]
2266 proc do_save_config {w} {
2267 if {[catch {save_config} err]} {
2268 error_popup "Failed to completely save options:\n\n$err"
2274 proc do_windows_shortcut {} {
2275 global gitdir appname argv0
2277 set reponame [lindex [file split \
2278 [file normalize [file dirname $gitdir]]] \
2282 set desktop [exec cygpath \
2290 set fn [tk_getSaveFile \
2292 -title "$appname ($reponame): Create Desktop Icon" \
2293 -initialdir $desktop \
2294 -initialfile "Git $reponame.bat"]
2298 set sh [exec cygpath \
2303 set me [exec cygpath \
2307 set gd [exec cygpath \
2311 regsub -all ' $me "'\\''" me
2312 regsub -all ' $gd "'\\''" gd
2313 puts -nonewline $fd "\"$sh\" --login -c \""
2314 puts -nonewline $fd "GIT_DIR='$gd'"
2315 puts -nonewline $fd " '$me'"
2319 error_popup "Cannot write script:\n\n$err"
2324 proc do_macosx_app {} {
2325 global gitdir appname argv0 env
2327 set reponame [lindex [file split \
2328 [file normalize [file dirname $gitdir]]] \
2331 set fn [tk_getSaveFile \
2333 -title "$appname ($reponame): Create Desktop Icon" \
2334 -initialdir [file join $env(HOME) Desktop] \
2335 -initialfile "Git $reponame.app"]
2338 set Contents [file join $fn Contents]
2339 set MacOS [file join $Contents MacOS]
2340 set exe [file join $MacOS git-gui]
2344 set fd [open [file join $Contents Info.plist] w]
2345 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
2346 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
2347 <plist version="1.0">
2349 <key>CFBundleDevelopmentRegion</key>
2350 <string>English</string>
2351 <key>CFBundleExecutable</key>
2352 <string>git-gui</string>
2353 <key>CFBundleIdentifier</key>
2354 <string>org.spearce.git-gui</string>
2355 <key>CFBundleInfoDictionaryVersion</key>
2356 <string>6.0</string>
2357 <key>CFBundlePackageType</key>
2358 <string>APPL</string>
2359 <key>CFBundleSignature</key>
2360 <string>????</string>
2361 <key>CFBundleVersion</key>
2362 <string>1.0</string>
2363 <key>NSPrincipalClass</key>
2364 <string>NSApplication</string>
2369 set fd [open $exe w]
2370 set gd [file normalize $gitdir]
2371 set ep [file normalize [exec git --exec-path]]
2372 regsub -all ' $gd "'\\''" gd
2373 regsub -all ' $ep "'\\''" ep
2374 puts $fd "#!/bin/sh"
2375 foreach name [array names env] {
2376 if {[string match GIT_* $name]} {
2377 regsub -all ' $env($name) "'\\''" v
2378 puts $fd "export $name='$v'"
2381 puts $fd "export PATH='$ep':\$PATH"
2382 puts $fd "export GIT_DIR='$gd'"
2383 puts $fd "exec [file normalize $argv0]"
2386 file attributes $exe -permissions u+x,g+x,o+x
2388 error_popup "Cannot write icon:\n\n$err"
2393 proc toggle_or_diff {w x y} {
2394 global file_states file_lists current_diff ui_index ui_other
2395 global last_clicked selected_paths
2397 set pos [split [$w index @$x,$y] .]
2398 set lno [lindex $pos 0]
2399 set col [lindex $pos 1]
2400 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2406 set last_clicked [list $w $lno]
2407 array unset selected_paths
2408 $ui_index tag remove in_sel 0.0 end
2409 $ui_other tag remove in_sel 0.0 end
2412 if {$current_diff eq $path} {
2413 set after {reshow_diff;}
2417 switch -glob -- [lindex $file_states($path) 0] {
2424 "Removing [short_path $path] from commit" \
2426 [concat $after {set ui_status_value {Ready.}}]
2430 "Including [short_path $path]" \
2432 [concat $after {set ui_status_value {Ready.}}]
2436 show_diff $path $w $lno
2440 proc add_one_to_selection {w x y} {
2442 global last_clicked selected_paths
2444 set pos [split [$w index @$x,$y] .]
2445 set lno [lindex $pos 0]
2446 set col [lindex $pos 1]
2447 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2453 set last_clicked [list $w $lno]
2454 if {[catch {set in_sel $selected_paths($path)}]} {
2458 unset selected_paths($path)
2459 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2461 set selected_paths($path) 1
2462 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2466 proc add_range_to_selection {w x y} {
2468 global last_clicked selected_paths
2470 if {[lindex $last_clicked 0] ne $w} {
2471 toggle_or_diff $w $x $y
2475 set pos [split [$w index @$x,$y] .]
2476 set lno [lindex $pos 0]
2477 set lc [lindex $last_clicked 1]
2486 foreach path [lrange $file_lists($w) \
2487 [expr {$begin - 1}] \
2488 [expr {$end - 1}]] {
2489 set selected_paths($path) 1
2491 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2494 ######################################################################
2498 set cursor_ptr arrow
2499 font create font_diff -family Courier -size 10
2503 eval font configure font_ui [font actual [.dummy cget -font]]
2507 font create font_uibold
2508 font create font_diffbold
2512 if {$tcl_platform(platform) eq {windows}} {
2515 } elseif {[is_MacOSX]} {
2520 proc apply_config {} {
2521 global repo_config font_descs
2523 foreach option $font_descs {
2524 set name [lindex $option 0]
2525 set font [lindex $option 1]
2527 foreach {cn cv} $repo_config(gui.$name) {
2528 font configure $font $cn $cv
2531 error_popup "Invalid font specified in gui.$name:\n\n$err"
2533 foreach {cn cv} [font configure $font] {
2534 font configure ${font}bold $cn $cv
2536 font configure ${font}bold -weight bold
2540 set default_config(gui.trustmtime) false
2541 set default_config(gui.pullsummary) true
2542 set default_config(gui.partialinclude) false
2543 set default_config(gui.diffcontext) 5
2544 set default_config(gui.fontui) [font configure font_ui]
2545 set default_config(gui.fontdiff) [font configure font_diff]
2547 {fontui font_ui {Main Font}}
2548 {fontdiff font_diff {Diff/Console Font}}
2553 ######################################################################
2559 menu .mbar -tearoff 0
2560 .mbar add cascade -label Project -menu .mbar.project
2561 .mbar add cascade -label Edit -menu .mbar.edit
2562 .mbar add cascade -label Commit -menu .mbar.commit
2563 if {!$single_commit} {
2564 .mbar add cascade -label Fetch -menu .mbar.fetch
2565 .mbar add cascade -label Pull -menu .mbar.pull
2566 .mbar add cascade -label Push -menu .mbar.push
2568 . configure -menu .mbar
2573 .mbar.project add command -label Visualize \
2576 if {!$single_commit} {
2577 .mbar.project add command -label {Repack Database} \
2578 -command do_repack \
2581 if {$tcl_platform(platform) eq {windows}} {
2582 .mbar.project add command \
2583 -label {Create Desktop Icon} \
2584 -command do_windows_shortcut \
2586 } elseif {[is_MacOSX]} {
2587 .mbar.project add command \
2588 -label {Create Desktop Icon} \
2589 -command do_macosx_app \
2593 .mbar.project add command -label Quit \
2595 -accelerator $M1T-Q \
2601 .mbar.edit add command -label Undo \
2602 -command {catch {[focus] edit undo}} \
2603 -accelerator $M1T-Z \
2605 .mbar.edit add command -label Redo \
2606 -command {catch {[focus] edit redo}} \
2607 -accelerator $M1T-Y \
2609 .mbar.edit add separator
2610 .mbar.edit add command -label Cut \
2611 -command {catch {tk_textCut [focus]}} \
2612 -accelerator $M1T-X \
2614 .mbar.edit add command -label Copy \
2615 -command {catch {tk_textCopy [focus]}} \
2616 -accelerator $M1T-C \
2618 .mbar.edit add command -label Paste \
2619 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
2620 -accelerator $M1T-V \
2622 .mbar.edit add command -label Delete \
2623 -command {catch {[focus] delete sel.first sel.last}} \
2626 .mbar.edit add separator
2627 .mbar.edit add command -label {Select All} \
2628 -command {catch {[focus] tag add sel 0.0 end}} \
2629 -accelerator $M1T-A \
2631 .mbar.edit add separator
2632 .mbar.edit add command -label {Options...} \
2633 -command do_options \
2640 .mbar.commit add radiobutton \
2641 -label {New Commit} \
2642 -command do_select_commit_type \
2643 -variable selected_commit_type \
2646 lappend disable_on_lock \
2647 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2649 .mbar.commit add radiobutton \
2650 -label {Amend Last Commit} \
2651 -command do_select_commit_type \
2652 -variable selected_commit_type \
2655 lappend disable_on_lock \
2656 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2658 .mbar.commit add separator
2660 .mbar.commit add command -label Rescan \
2661 -command do_rescan \
2664 lappend disable_on_lock \
2665 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2667 .mbar.commit add command -label {Remove From Commit} \
2668 -command do_remove_selection \
2670 lappend disable_on_lock \
2671 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2673 .mbar.commit add command -label {Include In Commit} \
2674 -command do_include_selection \
2676 lappend disable_on_lock \
2677 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2679 .mbar.commit add command -label {Include All} \
2680 -command do_include_all \
2681 -accelerator $M1T-I \
2683 lappend disable_on_lock \
2684 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2686 .mbar.commit add separator
2688 .mbar.commit add command -label {Sign Off} \
2689 -command do_signoff \
2690 -accelerator $M1T-S \
2693 .mbar.commit add command -label Commit \
2694 -command do_commit \
2695 -accelerator $M1T-Return \
2697 lappend disable_on_lock \
2698 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2700 # -- Transport menus
2702 if {!$single_commit} {
2708 # -- Main Window Layout
2710 panedwindow .vpane -orient vertical
2711 panedwindow .vpane.files -orient horizontal
2712 .vpane add .vpane.files -sticky nsew -height 100 -width 400
2713 pack .vpane -anchor n -side top -fill both -expand 1
2715 # -- Index File List
2717 frame .vpane.files.index -height 100 -width 400
2718 label .vpane.files.index.title -text {Modified Files} \
2721 text $ui_index -background white -borderwidth 0 \
2722 -width 40 -height 10 \
2724 -cursor $cursor_ptr \
2725 -yscrollcommand {.vpane.files.index.sb set} \
2727 scrollbar .vpane.files.index.sb -command [list $ui_index yview]
2728 pack .vpane.files.index.title -side top -fill x
2729 pack .vpane.files.index.sb -side right -fill y
2730 pack $ui_index -side left -fill both -expand 1
2731 .vpane.files add .vpane.files.index -sticky nsew
2733 # -- Other (Add) File List
2735 frame .vpane.files.other -height 100 -width 100
2736 label .vpane.files.other.title -text {Untracked Files} \
2739 text $ui_other -background white -borderwidth 0 \
2740 -width 40 -height 10 \
2742 -cursor $cursor_ptr \
2743 -yscrollcommand {.vpane.files.other.sb set} \
2745 scrollbar .vpane.files.other.sb -command [list $ui_other yview]
2746 pack .vpane.files.other.title -side top -fill x
2747 pack .vpane.files.other.sb -side right -fill y
2748 pack $ui_other -side left -fill both -expand 1
2749 .vpane.files add .vpane.files.other -sticky nsew
2751 foreach i [list $ui_index $ui_other] {
2752 $i tag conf in_diff -font font_uibold
2753 $i tag conf in_sel \
2754 -background [$i cget -foreground] \
2755 -foreground [$i cget -background]
2759 # -- Diff and Commit Area
2761 frame .vpane.lower -height 300 -width 400
2762 frame .vpane.lower.commarea
2763 frame .vpane.lower.diff -relief sunken -borderwidth 1
2764 pack .vpane.lower.commarea -side top -fill x
2765 pack .vpane.lower.diff -side bottom -fill both -expand 1
2766 .vpane add .vpane.lower -stick nsew
2768 # -- Commit Area Buttons
2770 frame .vpane.lower.commarea.buttons
2771 label .vpane.lower.commarea.buttons.l -text {} \
2775 pack .vpane.lower.commarea.buttons.l -side top -fill x
2776 pack .vpane.lower.commarea.buttons -side left -fill y
2778 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
2779 -command do_rescan \
2781 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
2782 lappend disable_on_lock \
2783 {.vpane.lower.commarea.buttons.rescan conf -state}
2785 button .vpane.lower.commarea.buttons.incall -text {Include All} \
2786 -command do_include_all \
2788 pack .vpane.lower.commarea.buttons.incall -side top -fill x
2789 lappend disable_on_lock \
2790 {.vpane.lower.commarea.buttons.incall conf -state}
2792 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
2793 -command do_signoff \
2795 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
2797 button .vpane.lower.commarea.buttons.commit -text {Commit} \
2798 -command do_commit \
2800 pack .vpane.lower.commarea.buttons.commit -side top -fill x
2801 lappend disable_on_lock \
2802 {.vpane.lower.commarea.buttons.commit conf -state}
2804 # -- Commit Message Buffer
2806 frame .vpane.lower.commarea.buffer
2807 frame .vpane.lower.commarea.buffer.header
2808 set ui_comm .vpane.lower.commarea.buffer.t
2809 set ui_coml .vpane.lower.commarea.buffer.header.l
2810 radiobutton .vpane.lower.commarea.buffer.header.new \
2811 -text {New Commit} \
2812 -command do_select_commit_type \
2813 -variable selected_commit_type \
2816 lappend disable_on_lock \
2817 [list .vpane.lower.commarea.buffer.header.new conf -state]
2818 radiobutton .vpane.lower.commarea.buffer.header.amend \
2819 -text {Amend Last Commit} \
2820 -command do_select_commit_type \
2821 -variable selected_commit_type \
2824 lappend disable_on_lock \
2825 [list .vpane.lower.commarea.buffer.header.amend conf -state]
2830 proc trace_commit_type {varname args} {
2831 global ui_coml commit_type
2832 switch -glob -- $commit_type {
2833 initial {set txt {Initial Commit Message:}}
2834 amend {set txt {Amended Commit Message:}}
2835 amend-initial {set txt {Amended Initial Commit Message:}}
2836 merge {set txt {Merge Commit Message:}}
2837 * {set txt {Commit Message:}}
2839 $ui_coml conf -text $txt
2841 trace add variable commit_type write trace_commit_type
2842 pack $ui_coml -side left -fill x
2843 pack .vpane.lower.commarea.buffer.header.amend -side right
2844 pack .vpane.lower.commarea.buffer.header.new -side right
2846 text $ui_comm -background white -borderwidth 1 \
2849 -autoseparators true \
2851 -width 75 -height 9 -wrap none \
2853 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
2854 scrollbar .vpane.lower.commarea.buffer.sby \
2855 -command [list $ui_comm yview]
2856 pack .vpane.lower.commarea.buffer.header -side top -fill x
2857 pack .vpane.lower.commarea.buffer.sby -side right -fill y
2858 pack $ui_comm -side left -fill y
2859 pack .vpane.lower.commarea.buffer -side left -fill y
2861 # -- Commit Message Buffer Context Menu
2863 set ctxm .vpane.lower.commarea.buffer.ctxm
2864 menu $ctxm -tearoff 0
2868 -command {tk_textCut $ui_comm}
2872 -command {tk_textCopy $ui_comm}
2876 -command {tk_textPaste $ui_comm}
2880 -command {$ui_comm delete sel.first sel.last}
2883 -label {Select All} \
2885 -command {$ui_comm tag add sel 0.0 end}
2890 $ui_comm tag add sel 0.0 end
2891 tk_textCopy $ui_comm
2892 $ui_comm tag remove sel 0.0 end
2899 bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
2904 set diff_actions [list]
2905 proc trace_current_diff {varname args} {
2906 global current_diff diff_actions file_states
2907 if {$current_diff eq {}} {
2914 set s [mapdesc [lindex $file_states($p) 0] $p]
2916 set p [escape_path $p]
2920 .vpane.lower.diff.header.status configure -text $s
2921 .vpane.lower.diff.header.file configure -text $f
2922 .vpane.lower.diff.header.path configure -text $p
2923 foreach w $diff_actions {
2927 trace add variable current_diff write trace_current_diff
2929 frame .vpane.lower.diff.header -background orange
2930 label .vpane.lower.diff.header.status \
2931 -background orange \
2932 -width $max_status_desc \
2936 label .vpane.lower.diff.header.file \
2937 -background orange \
2941 label .vpane.lower.diff.header.path \
2942 -background orange \
2946 pack .vpane.lower.diff.header.status -side left
2947 pack .vpane.lower.diff.header.file -side left
2948 pack .vpane.lower.diff.header.path -fill x
2949 set ctxm .vpane.lower.diff.header.ctxm
2950 menu $ctxm -tearoff 0
2961 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
2962 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
2966 frame .vpane.lower.diff.body
2967 set ui_diff .vpane.lower.diff.body.t
2968 text $ui_diff -background white -borderwidth 0 \
2969 -width 80 -height 15 -wrap none \
2971 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
2972 -yscrollcommand {.vpane.lower.diff.body.sby set} \
2974 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
2975 -command [list $ui_diff xview]
2976 scrollbar .vpane.lower.diff.body.sby -orient vertical \
2977 -command [list $ui_diff yview]
2978 pack .vpane.lower.diff.body.sbx -side bottom -fill x
2979 pack .vpane.lower.diff.body.sby -side right -fill y
2980 pack $ui_diff -side left -fill both -expand 1
2981 pack .vpane.lower.diff.header -side top -fill x
2982 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
2984 $ui_diff tag conf dm -foreground red
2985 $ui_diff tag conf dp -foreground blue
2986 $ui_diff tag conf di -foreground {#00a000}
2987 $ui_diff tag conf dni -foreground {#a000a0}
2988 $ui_diff tag conf da -font font_diffbold
2989 $ui_diff tag conf bold -font font_diffbold
2991 # -- Diff Body Context Menu
2993 set ctxm .vpane.lower.diff.body.ctxm
2994 menu $ctxm -tearoff 0
2998 -command {tk_textCopy $ui_diff}
2999 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3001 -label {Select All} \
3003 -command {$ui_diff tag add sel 0.0 end}
3004 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3009 $ui_diff tag add sel 0.0 end
3010 tk_textCopy $ui_diff
3011 $ui_diff tag remove sel 0.0 end
3013 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3016 -label {Decrease Font Size} \
3018 -command {incr_font_size font_diff -1}
3019 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3021 -label {Increase Font Size} \
3023 -command {incr_font_size font_diff 1}
3024 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3027 -label {Show Less Context} \
3029 -command {if {$repo_config(gui.diffcontext) >= 2} {
3030 incr repo_config(gui.diffcontext) -1
3033 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3035 -label {Show More Context} \
3038 incr repo_config(gui.diffcontext)
3041 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3043 $ctxm add command -label {Options...} \
3046 bind_button3 $ui_diff "tk_popup $ctxm %X %Y"
3050 set ui_status_value {Initializing...}
3051 label .status -textvariable ui_status_value \
3057 pack .status -anchor w -side bottom -fill x
3062 set gm $repo_config(gui.geometry)
3063 wm geometry . [lindex $gm 0]
3064 .vpane sash place 0 \
3065 [lindex [.vpane sash coord 0] 0] \
3067 .vpane.files sash place 0 \
3069 [lindex [.vpane.files sash coord 0] 1]
3075 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3076 bind $ui_comm <$M1B-Key-i> {do_include_all;break}
3077 bind $ui_comm <$M1B-Key-I> {do_include_all;break}
3078 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3079 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3080 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3081 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3082 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3083 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3084 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3085 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3087 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3088 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3089 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3090 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3091 bind $ui_diff <$M1B-Key-v> {break}
3092 bind $ui_diff <$M1B-Key-V> {break}
3093 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3094 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3095 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3096 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3097 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3098 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3100 bind . <Destroy> do_quit
3101 bind all <Key-F5> do_rescan
3102 bind all <$M1B-Key-r> do_rescan
3103 bind all <$M1B-Key-R> do_rescan
3104 bind . <$M1B-Key-s> do_signoff
3105 bind . <$M1B-Key-S> do_signoff
3106 bind . <$M1B-Key-i> do_include_all
3107 bind . <$M1B-Key-I> do_include_all
3108 bind . <$M1B-Key-Return> do_commit
3109 bind all <$M1B-Key-q> do_quit
3110 bind all <$M1B-Key-Q> do_quit
3111 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
3112 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
3113 foreach i [list $ui_index $ui_other] {
3114 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
3115 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3116 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
3120 set file_lists($ui_index) [list]
3121 set file_lists($ui_other) [list]
3128 set selected_commit_type new
3130 wm title . "$appname ([file normalize [file dirname $gitdir]])"
3131 focus -force $ui_comm
3132 if {!$single_commit} {
3134 populate_fetch_menu .mbar.fetch
3135 populate_pull_menu .mbar.pull
3136 populate_push_menu .mbar.push
3138 lock_index begin-read