e2dc931e4889ef2ba16bb080562ef14eeacf8a74
1#!/bin/sh
2# Tcl ignores the next line -*- tcl -*- \
3exec wish "$0" -- "$@"
4set copyright {
6Copyright © 2006, 2007 Shawn Pearce, Paul Mackerras.
7This program is free software; you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by
10the Free Software Foundation; either version 2 of the License, or
11(at your option) any later version.
12This program is distributed in the hope that it will be useful,
14but WITHOUT ANY WARRANTY; without even the implied warranty of
15MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16GNU General Public License for more details.
17You should have received a copy of the GNU General Public License
19along with this program; if not, write to the Free Software
20Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA}
21set appvers {@@GIT_VERSION@@}
23set appname [lindex [file split $argv0] end]
24set gitdir {}
25######################################################################
27##
28## config
29proc is_many_config {name} {
31 switch -glob -- $name {
32 remote.*.fetch -
33 remote.*.push
34 {return 1}
35 *
36 {return 0}
37 }
38}
39proc load_config {include_global} {
41 global repo_config global_config default_config
42 array unset global_config
44 if {$include_global} {
45 catch {
46 set fd_rc [open "| git repo-config --global --list" r]
47 while {[gets $fd_rc line] >= 0} {
48 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
49 if {[is_many_config $name]} {
50 lappend global_config($name) $value
51 } else {
52 set global_config($name) $value
53 }
54 }
55 }
56 close $fd_rc
57 }
58 }
59 array unset repo_config
61 catch {
62 set fd_rc [open "| git repo-config --list" r]
63 while {[gets $fd_rc line] >= 0} {
64 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
65 if {[is_many_config $name]} {
66 lappend repo_config($name) $value
67 } else {
68 set repo_config($name) $value
69 }
70 }
71 }
72 close $fd_rc
73 }
74 foreach name [array names default_config] {
76 if {[catch {set v $global_config($name)}]} {
77 set global_config($name) $default_config($name)
78 }
79 if {[catch {set v $repo_config($name)}]} {
80 set repo_config($name) $default_config($name)
81 }
82 }
83}
84proc save_config {} {
86 global default_config font_descs
87 global repo_config global_config
88 global repo_config_new global_config_new
89 foreach option $font_descs {
91 set name [lindex $option 0]
92 set font [lindex $option 1]
93 font configure $font \
94 -family $global_config_new(gui.$font^^family) \
95 -size $global_config_new(gui.$font^^size)
96 font configure ${font}bold \
97 -family $global_config_new(gui.$font^^family) \
98 -size $global_config_new(gui.$font^^size)
99 set global_config_new(gui.$name) [font configure $font]
100 unset global_config_new(gui.$font^^family)
101 unset global_config_new(gui.$font^^size)
102 }
103 foreach name [array names default_config] {
105 set value $global_config_new($name)
106 if {$value ne $global_config($name)} {
107 if {$value eq $default_config($name)} {
108 catch {exec git repo-config --global --unset $name}
109 } else {
110 regsub -all "\[{}\]" $value {"} value
111 exec git repo-config --global $name $value
112 }
113 set global_config($name) $value
114 if {$value eq $repo_config($name)} {
115 catch {exec git repo-config --unset $name}
116 set repo_config($name) $value
117 }
118 }
119 }
120 foreach name [array names default_config] {
122 set value $repo_config_new($name)
123 if {$value ne $repo_config($name)} {
124 if {$value eq $global_config($name)} {
125 catch {exec git repo-config --unset $name}
126 } else {
127 regsub -all "\[{}\]" $value {"} value
128 exec git repo-config $name $value
129 }
130 set repo_config($name) $value
131 }
132 }
133}
134proc error_popup {msg} {
136 global gitdir appname
137 set title $appname
139 if {$gitdir ne {}} {
140 append title { (}
141 append title [lindex \
142 [file split [file normalize [file dirname $gitdir]]] \
143 end]
144 append title {)}
145 }
146 set cmd [list tk_messageBox \
147 -icon error \
148 -type ok \
149 -title "$title: error" \
150 -message $msg]
151 if {[winfo ismapped .]} {
152 lappend cmd -parent .
153 }
154 eval $cmd
155}
156proc warn_popup {msg} {
158 global gitdir appname
159 set title $appname
161 if {$gitdir ne {}} {
162 append title { (}
163 append title [lindex \
164 [file split [file normalize [file dirname $gitdir]]] \
165 end]
166 append title {)}
167 }
168 set cmd [list tk_messageBox \
169 -icon warning \
170 -type ok \
171 -title "$title: warning" \
172 -message $msg]
173 if {[winfo ismapped .]} {
174 lappend cmd -parent .
175 }
176 eval $cmd
177}
178proc info_popup {msg} {
180 global gitdir appname
181 set title $appname
183 if {$gitdir ne {}} {
184 append title { (}
185 append title [lindex \
186 [file split [file normalize [file dirname $gitdir]]] \
187 end]
188 append title {)}
189 }
190 tk_messageBox \
191 -parent . \
192 -icon info \
193 -type ok \
194 -title $title \
195 -message $msg
196}
197######################################################################
199##
200## repository setup
201if { [catch {set gitdir $env(GIT_DIR)}]
203 && [catch {set gitdir [exec git rev-parse --git-dir]} err]} {
204 catch {wm withdraw .}
205 error_popup "Cannot find the git directory:\n\n$err"
206 exit 1
207}
208if {![file isdirectory $gitdir]} {
209 catch {wm withdraw .}
210 error_popup "Git directory not found:\n\n$gitdir"
211 exit 1
212}
213if {[lindex [file split $gitdir] end] ne {.git}} {
214 catch {wm withdraw .}
215 error_popup "Cannot use funny .git directory:\n\n$gitdir"
216 exit 1
217}
218if {[catch {cd [file dirname $gitdir]} err]} {
219 catch {wm withdraw .}
220 error_popup "No working directory [file dirname $gitdir]:\n\n$err"
221 exit 1
222}
223set single_commit 0
225if {$appname eq {git-citool}} {
226 set single_commit 1
227}
228######################################################################
230##
231## task management
232set rescan_active 0
234set diff_active 0
235set last_clicked {}
236set disable_on_lock [list]
238set index_lock_type none
239proc lock_index {type} {
241 global index_lock_type disable_on_lock
242 if {$index_lock_type eq {none}} {
244 set index_lock_type $type
245 foreach w $disable_on_lock {
246 uplevel #0 $w disabled
247 }
248 return 1
249 } elseif {$index_lock_type eq "begin-$type"} {
250 set index_lock_type $type
251 return 1
252 }
253 return 0
254}
255proc unlock_index {} {
257 global index_lock_type disable_on_lock
258 set index_lock_type none
260 foreach w $disable_on_lock {
261 uplevel #0 $w normal
262 }
263}
264######################################################################
266##
267## status
268proc repository_state {ctvar hdvar mhvar} {
270 global gitdir current_branch
271 upvar $ctvar ct $hdvar hd $mhvar mh
272 set mh [list]
274 if {[catch {set current_branch [exec git symbolic-ref HEAD]}]} {
276 set current_branch {}
277 } else {
278 regsub ^refs/((heads|tags|remotes)/)? \
279 $current_branch \
280 {} \
281 current_branch
282 }
283 if {[catch {set hd [exec git rev-parse --verify HEAD]}]} {
285 set hd {}
286 set ct initial
287 return
288 }
289 set merge_head [file join $gitdir MERGE_HEAD]
291 if {[file exists $merge_head]} {
292 set ct merge
293 set fd_mh [open $merge_head r]
294 while {[gets $fd_mh line] >= 0} {
295 lappend mh $line
296 }
297 close $fd_mh
298 return
299 }
300 set ct normal
302}
303proc PARENT {} {
305 global PARENT empty_tree
306 set p [lindex $PARENT 0]
308 if {$p ne {}} {
309 return $p
310 }
311 if {$empty_tree eq {}} {
312 set empty_tree [exec git mktree << {}]
313 }
314 return $empty_tree
315}
316proc rescan {after} {
318 global HEAD PARENT MERGE_HEAD commit_type
319 global ui_index ui_other ui_status_value ui_comm
320 global rescan_active file_states
321 global repo_config
322 if {$rescan_active > 0 || ![lock_index read]} return
324 repository_state newType newHEAD newMERGE_HEAD
326 if {[string match amend* $commit_type]
327 && $newType eq {normal}
328 && $newHEAD eq $HEAD} {
329 } else {
330 set HEAD $newHEAD
331 set PARENT $newHEAD
332 set MERGE_HEAD $newMERGE_HEAD
333 set commit_type $newType
334 }
335 array unset file_states
337 if {![$ui_comm edit modified]
339 || [string trim [$ui_comm get 0.0 end]] eq {}} {
340 if {[load_message GITGUI_MSG]} {
341 } elseif {[load_message MERGE_MSG]} {
342 } elseif {[load_message SQUASH_MSG]} {
343 }
344 $ui_comm edit reset
345 $ui_comm edit modified false
346 }
347 if {$repo_config(gui.trustmtime) eq {true}} {
349 rescan_stage2 {} $after
350 } else {
351 set rescan_active 1
352 set ui_status_value {Refreshing file status...}
353 set cmd [list git update-index]
354 lappend cmd -q
355 lappend cmd --unmerged
356 lappend cmd --ignore-missing
357 lappend cmd --refresh
358 set fd_rf [open "| $cmd" r]
359 fconfigure $fd_rf -blocking 0 -translation binary
360 fileevent $fd_rf readable \
361 [list rescan_stage2 $fd_rf $after]
362 }
363}
364proc rescan_stage2 {fd after} {
366 global gitdir ui_status_value
367 global rescan_active buf_rdi buf_rdf buf_rlo
368 if {$fd ne {}} {
370 read $fd
371 if {![eof $fd]} return
372 close $fd
373 }
374 set ls_others [list | git ls-files --others -z \
376 --exclude-per-directory=.gitignore]
377 set info_exclude [file join $gitdir info exclude]
378 if {[file readable $info_exclude]} {
379 lappend ls_others "--exclude-from=$info_exclude"
380 }
381 set buf_rdi {}
383 set buf_rdf {}
384 set buf_rlo {}
385 set rescan_active 3
387 set ui_status_value {Scanning for modified files ...}
388 set fd_di [open "| git diff-index --cached -z [PARENT]" r]
389 set fd_df [open "| git diff-files -z" r]
390 set fd_lo [open $ls_others r]
391 fconfigure $fd_di -blocking 0 -translation binary
393 fconfigure $fd_df -blocking 0 -translation binary
394 fconfigure $fd_lo -blocking 0 -translation binary
395 fileevent $fd_di readable [list read_diff_index $fd_di $after]
396 fileevent $fd_df readable [list read_diff_files $fd_df $after]
397 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
398}
399proc load_message {file} {
401 global gitdir ui_comm
402 set f [file join $gitdir $file]
404 if {[file isfile $f]} {
405 if {[catch {set fd [open $f r]}]} {
406 return 0
407 }
408 set content [string trim [read $fd]]
409 close $fd
410 $ui_comm delete 0.0 end
411 $ui_comm insert end $content
412 return 1
413 }
414 return 0
415}
416proc read_diff_index {fd after} {
418 global buf_rdi
419 append buf_rdi [read $fd]
421 set c 0
422 set n [string length $buf_rdi]
423 while {$c < $n} {
424 set z1 [string first "\0" $buf_rdi $c]
425 if {$z1 == -1} break
426 incr z1
427 set z2 [string first "\0" $buf_rdi $z1]
428 if {$z2 == -1} break
429 incr c
431 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
432 merge_state \
433 [string range $buf_rdi $z1 [expr {$z2 - 1}]] \
434 [lindex $i 4]? \
435 [list [lindex $i 0] [lindex $i 2]] \
436 [list]
437 set c $z2
438 incr c
439 }
440 if {$c < $n} {
441 set buf_rdi [string range $buf_rdi $c end]
442 } else {
443 set buf_rdi {}
444 }
445 rescan_done $fd buf_rdi $after
447}
448proc read_diff_files {fd after} {
450 global buf_rdf
451 append buf_rdf [read $fd]
453 set c 0
454 set n [string length $buf_rdf]
455 while {$c < $n} {
456 set z1 [string first "\0" $buf_rdf $c]
457 if {$z1 == -1} break
458 incr z1
459 set z2 [string first "\0" $buf_rdf $z1]
460 if {$z2 == -1} break
461 incr c
463 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
464 merge_state \
465 [string range $buf_rdf $z1 [expr {$z2 - 1}]] \
466 ?[lindex $i 4] \
467 [list] \
468 [list [lindex $i 0] [lindex $i 2]]
469 set c $z2
470 incr c
471 }
472 if {$c < $n} {
473 set buf_rdf [string range $buf_rdf $c end]
474 } else {
475 set buf_rdf {}
476 }
477 rescan_done $fd buf_rdf $after
479}
480proc read_ls_others {fd after} {
482 global buf_rlo
483 append buf_rlo [read $fd]
485 set pck [split $buf_rlo "\0"]
486 set buf_rlo [lindex $pck end]
487 foreach p [lrange $pck 0 end-1] {
488 merge_state $p ?O
489 }
490 rescan_done $fd buf_rlo $after
491}
492proc rescan_done {fd buf after} {
494 global rescan_active
495 global file_states repo_config
496 upvar $buf to_clear
497 if {![eof $fd]} return
499 set to_clear {}
500 close $fd
501 if {[incr rescan_active -1] > 0} return
502 prune_selection
504 unlock_index
505 display_all_files
506 if {$repo_config(gui.partialinclude) ne {true}} {
508 set pathList [list]
509 foreach path [array names file_states] {
510 switch -- [lindex $file_states($path) 0] {
511 A? -
512 M? {lappend pathList $path}
513 }
514 }
515 if {$pathList ne {}} {
516 update_index \
517 "Updating included files" \
518 $pathList \
519 [concat {reshow_diff;} $after]
520 return
521 }
522 }
523 reshow_diff
525 uplevel #0 $after
526}
527proc prune_selection {} {
529 global file_states selected_paths
530 foreach path [array names selected_paths] {
532 if {[catch {set still_here $file_states($path)}]} {
533 unset selected_paths($path)
534 }
535 }
536}
537######################################################################
539##
540## diff
541proc clear_diff {} {
543 global ui_diff current_diff ui_index ui_other
544 $ui_diff conf -state normal
546 $ui_diff delete 0.0 end
547 $ui_diff conf -state disabled
548 set current_diff {}
550 $ui_index tag remove in_diff 0.0 end
552 $ui_other tag remove in_diff 0.0 end
553}
554proc reshow_diff {} {
556 global current_diff ui_status_value file_states
557 if {$current_diff eq {}
559 || [catch {set s $file_states($current_diff)}]} {
560 clear_diff
561 } else {
562 show_diff $current_diff
563 }
564}
565proc handle_empty_diff {} {
567 global current_diff file_states file_lists
568 set path $current_diff
570 set s $file_states($path)
571 if {[lindex $s 0] ne {_M}} return
572 info_popup "No differences detected.
574[short_path $path] has no changes.
576The modification date of this file was updated
578by another application and you currently have
579the Trust File Modification Timestamps option
580enabled, so Git did not automatically detect
581that there are no content differences in this
582file.
583This file will now be removed from the modified
585files list, to prevent possible confusion.
586"
587 if {[catch {exec git update-index -- $path} err]} {
588 error_popup "Failed to refresh index:\n\n$err"
589 }
590 clear_diff
592 set old_w [mapcol [lindex $file_states($path) 0] $path]
593 set lno [lsearch -sorted $file_lists($old_w) $path]
594 if {$lno >= 0} {
595 set file_lists($old_w) \
596 [lreplace $file_lists($old_w) $lno $lno]
597 incr lno
598 $old_w conf -state normal
599 $old_w delete $lno.0 [expr {$lno + 1}].0
600 $old_w conf -state disabled
601 }
602}
603proc show_diff {path {w {}} {lno {}}} {
605 global file_states file_lists
606 global is_3way_diff diff_active repo_config
607 global ui_diff current_diff ui_status_value
608 if {$diff_active || ![lock_index read]} return
610 clear_diff
612 if {$w eq {} || $lno == {}} {
613 foreach w [array names file_lists] {
614 set lno [lsearch -sorted $file_lists($w) $path]
615 if {$lno >= 0} {
616 incr lno
617 break
618 }
619 }
620 }
621 if {$w ne {} && $lno >= 1} {
622 $w tag add in_diff $lno.0 [expr {$lno + 1}].0
623 }
624 set s $file_states($path)
626 set m [lindex $s 0]
627 set is_3way_diff 0
628 set diff_active 1
629 set current_diff $path
630 set ui_status_value "Loading diff of [escape_path $path]..."
631 set cmd [list | git diff-index]
633 lappend cmd --no-color
634 if {$repo_config(gui.diffcontext) > 0} {
635 lappend cmd "-U$repo_config(gui.diffcontext)"
636 }
637 lappend cmd -p
638 switch $m {
640 MM {
641 lappend cmd -c
642 }
643 _O {
644 if {[catch {
645 set fd [open $path r]
646 set content [read $fd]
647 close $fd
648 } err ]} {
649 set diff_active 0
650 unlock_index
651 set ui_status_value "Unable to display [escape_path $path]"
652 error_popup "Error loading file:\n\n$err"
653 return
654 }
655 $ui_diff conf -state normal
656 $ui_diff insert end $content
657 $ui_diff conf -state disabled
658 set diff_active 0
659 unlock_index
660 set ui_status_value {Ready.}
661 return
662 }
663 }
664 lappend cmd [PARENT]
666 lappend cmd --
667 lappend cmd $path
668 if {[catch {set fd [open $cmd r]} err]} {
670 set diff_active 0
671 unlock_index
672 set ui_status_value "Unable to display [escape_path $path]"
673 error_popup "Error loading diff:\n\n$err"
674 return
675 }
676 fconfigure $fd -blocking 0 -translation auto
678 fileevent $fd readable [list read_diff $fd]
679}
680proc read_diff {fd} {
682 global ui_diff ui_status_value is_3way_diff diff_active
683 global repo_config
684 $ui_diff conf -state normal
686 while {[gets $fd line] >= 0} {
687 # -- Cleanup uninteresting diff header lines.
688 #
689 if {[string match {diff --git *} $line]} continue
690 if {[string match {diff --combined *} $line]} continue
691 if {[string match {--- *} $line]} continue
692 if {[string match {+++ *} $line]} continue
693 if {$line eq {deleted file mode 120000}} {
694 set line "deleted symlink"
695 }
696 # -- Automatically detect if this is a 3 way diff.
698 #
699 if {[string match {@@@ *} $line]} {set is_3way_diff 1}
700 # -- Reformat a 3 way diff, 'cause its too weird.
702 #
703 if {$is_3way_diff} {
704 set op [string range $line 0 1]
705 switch -- $op {
706 {@@} {set tags d_@}
707 {++} {set tags d_+ ; set op { +}}
708 {--} {set tags d_- ; set op { -}}
709 { +} {set tags d_++; set op {++}}
710 { -} {set tags d_--; set op {--}}
711 {+ } {set tags d_-+; set op {-+}}
712 {- } {set tags d_+-; set op {+-}}
713 default {set tags {}}
714 }
715 set line [string replace $line 0 1 $op]
716 } else {
717 switch -- [string index $line 0] {
718 @ {set tags d_@}
719 + {set tags d_+}
720 - {set tags d_-}
721 default {set tags {}}
722 }
723 }
724 $ui_diff insert end $line $tags
725 $ui_diff insert end "\n" $tags
726 }
727 $ui_diff conf -state disabled
728 if {[eof $fd]} {
730 close $fd
731 set diff_active 0
732 unlock_index
733 set ui_status_value {Ready.}
734 if {$repo_config(gui.trustmtime) eq {true}
736 && [$ui_diff index end] eq {2.0}} {
737 handle_empty_diff
738 }
739 }
740}
741######################################################################
743##
744## commit
745proc load_last_commit {} {
747 global HEAD PARENT MERGE_HEAD commit_type ui_comm
748 if {[llength $PARENT] == 0} {
750 error_popup {There is nothing to amend.
751You are about to create the initial commit.
753There is no commit before this to amend.
754}
755 return
756 }
757 repository_state curType curHEAD curMERGE_HEAD
759 if {$curType eq {merge}} {
760 error_popup {Cannot amend while merging.
761You are currently in the middle of a merge that
763has not been fully completed. You cannot amend
764the prior commit unless you first abort the
765current merge activity.
766}
767 return
768 }
769 set msg {}
771 set parents [list]
772 if {[catch {
773 set fd [open "| git cat-file commit $curHEAD" r]
774 while {[gets $fd line] > 0} {
775 if {[string match {parent *} $line]} {
776 lappend parents [string range $line 7 end]
777 }
778 }
779 set msg [string trim [read $fd]]
780 close $fd
781 } err]} {
782 error_popup "Error loading commit data for amend:\n\n$err"
783 return
784 }
785 set HEAD $curHEAD
787 set PARENT $parents
788 set MERGE_HEAD [list]
789 switch -- [llength $parents] {
790 0 {set commit_type amend-initial}
791 1 {set commit_type amend}
792 default {set commit_type amend-merge}
793 }
794 $ui_comm delete 0.0 end
796 $ui_comm insert end $msg
797 $ui_comm edit reset
798 $ui_comm edit modified false
799 rescan {set ui_status_value {Ready.}}
800}
801proc create_new_commit {} {
803 global commit_type ui_comm
804 set commit_type normal
806 $ui_comm delete 0.0 end
807 $ui_comm edit reset
808 $ui_comm edit modified false
809 rescan {set ui_status_value {Ready.}}
810}
811set GIT_COMMITTER_IDENT {}
813proc committer_ident {} {
815 global GIT_COMMITTER_IDENT
816 if {$GIT_COMMITTER_IDENT eq {}} {
818 if {[catch {set me [exec git var GIT_COMMITTER_IDENT]} err]} {
819 error_popup "Unable to obtain your identity:\n\n$err"
820 return {}
821 }
822 if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \
823 $me me GIT_COMMITTER_IDENT]} {
824 error_popup "Invalid GIT_COMMITTER_IDENT:\n\n$me"
825 return {}
826 }
827 }
828 return $GIT_COMMITTER_IDENT
830}
831proc commit_tree {} {
833 global HEAD commit_type file_states ui_comm repo_config
834 if {![lock_index update]} return
836 if {[committer_ident] eq {}} return
837 # -- Our in memory state should match the repository.
839 #
840 repository_state curType curHEAD curMERGE_HEAD
841 if {[string match amend* $commit_type]
842 && $curType eq {normal}
843 && $curHEAD eq $HEAD} {
844 } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
845 info_popup {Last scanned state does not match repository state.
846Another Git program has modified this repository
848since the last scan. A rescan must be performed
849before another commit can be created.
850The rescan will be automatically started now.
852}
853 unlock_index
854 rescan {set ui_status_value {Ready.}}
855 return
856 }
857 # -- At least one file should differ in the index.
859 #
860 set files_ready 0
861 foreach path [array names file_states] {
862 switch -glob -- [lindex $file_states($path) 0] {
863 _? {continue}
864 A? -
865 D? -
866 M? {set files_ready 1; break}
867 U? {
868 error_popup "Unmerged files cannot be committed.
869File [short_path $path] has merge conflicts.
871You must resolve them and include the file before committing.
872"
873 unlock_index
874 return
875 }
876 default {
877 error_popup "Unknown file state [lindex $s 0] detected.
878File [short_path $path] cannot be committed by this program.
880"
881 }
882 }
883 }
884 if {!$files_ready} {
885 error_popup {No included files to commit.
886You must include at least 1 file before you can commit.
888}
889 unlock_index
890 return
891 }
892 # -- A message is required.
894 #
895 set msg [string trim [$ui_comm get 1.0 end]]
896 if {$msg eq {}} {
897 error_popup {Please supply a commit message.
898A good commit message has the following format:
900- First line: Describe in one sentance what you did.
902- Second line: Blank
903- Remaining lines: Describe why this change is good.
904}
905 unlock_index
906 return
907 }
908 # -- Update included files if partialincludes are off.
910 #
911 if {$repo_config(gui.partialinclude) ne {true}} {
912 set pathList [list]
913 foreach path [array names file_states] {
914 switch -glob -- [lindex $file_states($path) 0] {
915 A? -
916 M? {lappend pathList $path}
917 }
918 }
919 if {$pathList ne {}} {
920 unlock_index
921 update_index \
922 "Updating included files" \
923 $pathList \
924 [concat {lock_index update;} \
925 [list commit_prehook $curHEAD $msg]]
926 return
927 }
928 }
929 commit_prehook $curHEAD $msg
931}
932proc commit_prehook {curHEAD msg} {
934 global gitdir ui_status_value pch_error
935 set pchook [file join $gitdir hooks pre-commit]
937 # On Cygwin [file executable] might lie so we need to ask
939 # the shell if the hook is executable. Yes that's annoying.
940 #
941 if {[is_Windows] && [file isfile $pchook]} {
942 set pchook [list sh -c [concat \
943 "if test -x \"$pchook\";" \
944 "then exec \"$pchook\" 2>&1;" \
945 "fi"]]
946 } elseif {[file executable $pchook]} {
947 set pchook [list $pchook |& cat]
948 } else {
949 commit_writetree $curHEAD $msg
950 return
951 }
952 set ui_status_value {Calling pre-commit hook...}
954 set pch_error {}
955 set fd_ph [open "| $pchook" r]
956 fconfigure $fd_ph -blocking 0 -translation binary
957 fileevent $fd_ph readable \
958 [list commit_prehook_wait $fd_ph $curHEAD $msg]
959}
960proc commit_prehook_wait {fd_ph curHEAD msg} {
962 global pch_error ui_status_value
963 append pch_error [read $fd_ph]
965 fconfigure $fd_ph -blocking 1
966 if {[eof $fd_ph]} {
967 if {[catch {close $fd_ph}]} {
968 set ui_status_value {Commit declined by pre-commit hook.}
969 hook_failed_popup pre-commit $pch_error
970 unlock_index
971 } else {
972 commit_writetree $curHEAD $msg
973 }
974 set pch_error {}
975 return
976 }
977 fconfigure $fd_ph -blocking 0
978}
979proc commit_writetree {curHEAD msg} {
981 global ui_status_value
982 set ui_status_value {Committing changes...}
984 set fd_wt [open "| git write-tree" r]
985 fileevent $fd_wt readable \
986 [list commit_committree $fd_wt $curHEAD $msg]
987}
988proc commit_committree {fd_wt curHEAD msg} {
990 global HEAD PARENT MERGE_HEAD commit_type
991 global single_commit gitdir
992 global ui_status_value ui_comm selected_commit_type
993 global file_states selected_paths rescan_active
994 gets $fd_wt tree_id
996 if {$tree_id eq {} || [catch {close $fd_wt} err]} {
997 error_popup "write-tree failed:\n\n$err"
998 set ui_status_value {Commit failed.}
999 unlock_index
1000 return
1001 }
1002 # -- Create the commit.
1004 #
1005 set cmd [list git commit-tree $tree_id]
1006 set parents [concat $PARENT $MERGE_HEAD]
1007 if {[llength $parents] > 0} {
1008 foreach p $parents {
1009 lappend cmd -p $p
1010 }
1011 } else {
1012 # git commit-tree writes to stderr during initial commit.
1013 lappend cmd 2>/dev/null
1014 }
1015 lappend cmd << $msg
1016 if {[catch {set cmt_id [eval exec $cmd]} err]} {
1017 error_popup "commit-tree failed:\n\n$err"
1018 set ui_status_value {Commit failed.}
1019 unlock_index
1020 return
1021 }
1022 # -- Update the HEAD ref.
1024 #
1025 set reflogm commit
1026 if {$commit_type ne {normal}} {
1027 append reflogm " ($commit_type)"
1028 }
1029 set i [string first "\n" $msg]
1030 if {$i >= 0} {
1031 append reflogm {: } [string range $msg 0 [expr {$i - 1}]]
1032 } else {
1033 append reflogm {: } $msg
1034 }
1035 set cmd [list git update-ref -m $reflogm HEAD $cmt_id $curHEAD]
1036 if {[catch {eval exec $cmd} err]} {
1037 error_popup "update-ref failed:\n\n$err"
1038 set ui_status_value {Commit failed.}
1039 unlock_index
1040 return
1041 }
1042 # -- Cleanup after ourselves.
1044 #
1045 catch {file delete [file join $gitdir MERGE_HEAD]}
1046 catch {file delete [file join $gitdir MERGE_MSG]}
1047 catch {file delete [file join $gitdir SQUASH_MSG]}
1048 catch {file delete [file join $gitdir GITGUI_MSG]}
1049 # -- Let rerere do its thing.
1051 #
1052 if {[file isdirectory [file join $gitdir rr-cache]]} {
1053 catch {exec git rerere}
1054 }
1055 # -- Run the post-commit hook.
1057 #
1058 set pchook [file join $gitdir hooks post-commit]
1059 if {[is_Windows] && [file isfile $pchook]} {
1060 set pchook [list sh -c [concat \
1061 "if test -x \"$pchook\";" \
1062 "then exec \"$pchook\";" \
1063 "fi"]]
1064 } elseif {![file executable $pchook]} {
1065 set pchook {}
1066 }
1067 if {$pchook ne {}} {
1068 catch {exec $pchook &}
1069 }
1070 $ui_comm delete 0.0 end
1072 $ui_comm edit reset
1073 $ui_comm edit modified false
1074 if {$single_commit} do_quit
1076 # -- Update in memory status
1078 #
1079 set selected_commit_type new
1080 set commit_type normal
1081 set HEAD $cmt_id
1082 set PARENT $cmt_id
1083 set MERGE_HEAD [list]
1084 foreach path [array names file_states] {
1086 set s $file_states($path)
1087 set m [lindex $s 0]
1088 switch -glob -- $m {
1089 _O -
1090 _M -
1091 _D {continue}
1092 __ -
1093 A_ -
1094 M_ -
1095 DD {
1096 unset file_states($path)
1097 catch {unset selected_paths($path)}
1098 }
1099 DO {
1100 set file_states($path) [list _O [lindex $s 1] {} {}]
1101 }
1102 AM -
1103 AD -
1104 MM -
1105 MD -
1106 DM {
1107 set file_states($path) [list \
1108 _[string index $m 1] \
1109 [lindex $s 1] \
1110 [lindex $s 3] \
1111 {}]
1112 }
1113 }
1114 }
1115 display_all_files
1117 unlock_index
1118 reshow_diff
1119 set ui_status_value \
1120 "Changes committed as [string range $cmt_id 0 7]."
1121}
1122######################################################################
1124##
1125## fetch pull push
1126proc fetch_from {remote} {
1128 set w [new_console "fetch $remote" \
1129 "Fetching new changes from $remote"]
1130 set cmd [list git fetch]
1131 lappend cmd $remote
1132 console_exec $w $cmd
1133}
1134proc pull_remote {remote branch} {
1136 global HEAD commit_type file_states repo_config
1137 if {![lock_index update]} return
1139 # -- Our in memory state should match the repository.
1141 #
1142 repository_state curType curHEAD curMERGE_HEAD
1143 if {$commit_type ne $curType || $HEAD ne $curHEAD} {
1144 info_popup {Last scanned state does not match repository state.
1145Another Git program has modified this repository
1147since the last scan. A rescan must be performed
1148before a pull operation can be started.
1149The rescan will be automatically started now.
1151}
1152 unlock_index
1153 rescan {set ui_status_value {Ready.}}
1154 return
1155 }
1156 # -- No differences should exist before a pull.
1158 #
1159 if {[array size file_states] != 0} {
1160 error_popup {Uncommitted but modified files are present.
1161You should not perform a pull with unmodified
1163files in your working directory as Git will be
1164unable to recover from an incorrect merge.
1165You should commit or revert all changes before
1167starting a pull operation.
1168}
1169 unlock_index
1170 return
1171 }
1172 set w [new_console "pull $remote $branch" \
1174 "Pulling new changes from branch $branch in $remote"]
1175 set cmd [list git pull]
1176 if {$repo_config(gui.pullsummary) eq {false}} {
1177 lappend cmd --no-summary
1178 }
1179 lappend cmd $remote
1180 lappend cmd $branch
1181 console_exec $w $cmd [list post_pull_remote $remote $branch]
1182}
1183proc post_pull_remote {remote branch success} {
1185 global HEAD PARENT MERGE_HEAD commit_type selected_commit_type
1186 global ui_status_value
1187 unlock_index
1189 if {$success} {
1190 repository_state commit_type HEAD MERGE_HEAD
1191 set PARENT $HEAD
1192 set selected_commit_type new
1193 set ui_status_value "Pulling $branch from $remote complete."
1194 } else {
1195 rescan [list set ui_status_value \
1196 "Conflicts detected while pulling $branch from $remote."]
1197 }
1198}
1199proc push_to {remote} {
1201 set w [new_console "push $remote" \
1202 "Pushing changes to $remote"]
1203 set cmd [list git push]
1204 lappend cmd $remote
1205 console_exec $w $cmd
1206}
1207######################################################################
1209##
1210## ui helpers
1211proc mapcol {state path} {
1213 global all_cols ui_other
1214 if {[catch {set r $all_cols($state)}]} {
1216 puts "error: no column for state={$state} $path"
1217 return $ui_other
1218 }
1219 return $r
1220}
1221proc mapicon {state path} {
1223 global all_icons
1224 if {[catch {set r $all_icons($state)}]} {
1226 puts "error: no icon for state={$state} $path"
1227 return file_plain
1228 }
1229 return $r
1230}
1231proc mapdesc {state path} {
1233 global all_descs
1234 if {[catch {set r $all_descs($state)}]} {
1236 puts "error: no desc for state={$state} $path"
1237 return $state
1238 }
1239 return $r
1240}
1241proc escape_path {path} {
1243 regsub -all "\n" $path "\\n" path
1244 return $path
1245}
1246proc short_path {path} {
1248 return [escape_path [lindex [file split $path] end]]
1249}
1250set next_icon_id 0
1252set null_sha1 [string repeat 0 40]
1253proc merge_state {path new_state {head_info {}} {index_info {}}} {
1255 global file_states next_icon_id null_sha1
1256 set s0 [string index $new_state 0]
1258 set s1 [string index $new_state 1]
1259 if {[catch {set info $file_states($path)}]} {
1261 set state __
1262 set icon n[incr next_icon_id]
1263 } else {
1264 set state [lindex $info 0]
1265 set icon [lindex $info 1]
1266 if {$head_info eq {}} {set head_info [lindex $info 2]}
1267 if {$index_info eq {}} {set index_info [lindex $info 3]}
1268 }
1269 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1271 elseif {$s0 eq {_}} {set s0 _}
1272 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1274 elseif {$s1 eq {_}} {set s1 _}
1275 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1277 set head_info [list 0 $null_sha1]
1278 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1279 && $head_info eq {}} {
1280 set head_info $index_info
1281 }
1282 set file_states($path) [list $s0$s1 $icon \
1284 $head_info $index_info \
1285 ]
1286 return $state
1287}
1288proc display_file {path state} {
1290 global file_states file_lists selected_paths
1291 set old_m [merge_state $path $state]
1293 set s $file_states($path)
1294 set new_m [lindex $s 0]
1295 set new_w [mapcol $new_m $path]
1296 set old_w [mapcol $old_m $path]
1297 set new_icon [mapicon $new_m $path]
1298 if {$new_m eq {__}} {
1300 set lno [lsearch -sorted $file_lists($old_w) $path]
1301 if {$lno >= 0} {
1302 set file_lists($old_w) \
1303 [lreplace $file_lists($old_w) $lno $lno]
1304 incr lno
1305 $old_w conf -state normal
1306 $old_w delete $lno.0 [expr {$lno + 1}].0
1307 $old_w conf -state disabled
1308 }
1309 unset file_states($path)
1310 catch {unset selected_paths($path)}
1311 return
1312 }
1313 if {$new_w ne $old_w} {
1315 set lno [lsearch -sorted $file_lists($old_w) $path]
1316 if {$lno >= 0} {
1317 set file_lists($old_w) \
1318 [lreplace $file_lists($old_w) $lno $lno]
1319 incr lno
1320 $old_w conf -state normal
1321 $old_w delete $lno.0 [expr {$lno + 1}].0
1322 $old_w conf -state disabled
1323 }
1324 lappend file_lists($new_w) $path
1326 set file_lists($new_w) [lsort $file_lists($new_w)]
1327 set lno [lsearch -sorted $file_lists($new_w) $path]
1328 incr lno
1329 $new_w conf -state normal
1330 $new_w image create $lno.0 \
1331 -align center -padx 5 -pady 1 \
1332 -name [lindex $s 1] \
1333 -image $new_icon
1334 $new_w insert $lno.1 "[escape_path $path]\n"
1335 if {[catch {set in_sel $selected_paths($path)}]} {
1336 set in_sel 0
1337 }
1338 if {$in_sel} {
1339 $new_w tag add in_sel $lno.0 [expr {$lno + 1}].0
1340 }
1341 $new_w conf -state disabled
1342 } elseif {$new_icon ne [mapicon $old_m $path]} {
1343 $new_w conf -state normal
1344 $new_w image conf [lindex $s 1] -image $new_icon
1345 $new_w conf -state disabled
1346 }
1347}
1348proc display_all_files {} {
1350 global ui_index ui_other
1351 global file_states file_lists
1352 global last_clicked selected_paths
1353 $ui_index conf -state normal
1355 $ui_other conf -state normal
1356 $ui_index delete 0.0 end
1358 $ui_other delete 0.0 end
1359 set last_clicked {}
1360 set file_lists($ui_index) [list]
1362 set file_lists($ui_other) [list]
1363 foreach path [lsort [array names file_states]] {
1365 set s $file_states($path)
1366 set m [lindex $s 0]
1367 set w [mapcol $m $path]
1368 lappend file_lists($w) $path
1369 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1370 $w image create end \
1371 -align center -padx 5 -pady 1 \
1372 -name [lindex $s 1] \
1373 -image [mapicon $m $path]
1374 $w insert end "[escape_path $path]\n"
1375 if {[catch {set in_sel $selected_paths($path)}]} {
1376 set in_sel 0
1377 }
1378 if {$in_sel} {
1379 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
1380 }
1381 }
1382 $ui_index conf -state disabled
1384 $ui_other conf -state disabled
1385}
1386proc update_indexinfo {msg pathList after} {
1388 global update_index_cp ui_status_value
1389 if {![lock_index update]} return
1391 set update_index_cp 0
1393 set pathList [lsort $pathList]
1394 set totalCnt [llength $pathList]
1395 set batch [expr {int($totalCnt * .01) + 1}]
1396 if {$batch > 25} {set batch 25}
1397 set ui_status_value [format \
1399 "$msg... %i/%i files (%.2f%%)" \
1400 $update_index_cp \
1401 $totalCnt \
1402 0.0]
1403 set fd [open "| git update-index -z --index-info" w]
1404 fconfigure $fd \
1405 -blocking 0 \
1406 -buffering full \
1407 -buffersize 512 \
1408 -translation binary
1409 fileevent $fd writable [list \
1410 write_update_indexinfo \
1411 $fd \
1412 $pathList \
1413 $totalCnt \
1414 $batch \
1415 $msg \
1416 $after \
1417 ]
1418}
1419proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
1421 global update_index_cp ui_status_value
1422 global file_states current_diff
1423 if {$update_index_cp >= $totalCnt} {
1425 close $fd
1426 unlock_index
1427 uplevel #0 $after
1428 return
1429 }
1430 for {set i $batch} \
1432 {$update_index_cp < $totalCnt && $i > 0} \
1433 {incr i -1} {
1434 set path [lindex $pathList $update_index_cp]
1435 incr update_index_cp
1436 set s $file_states($path)
1438 switch -glob -- [lindex $s 0] {
1439 A? {set new _O}
1440 M? {set new _M}
1441 D_ {set new _D}
1442 D? {set new _?}
1443 ?? {continue}
1444 }
1445 set info [lindex $s 2]
1446 if {$info eq {}} continue
1447 puts -nonewline $fd $info
1449 puts -nonewline $fd "\t"
1450 puts -nonewline $fd $path
1451 puts -nonewline $fd "\0"
1452 display_file $path $new
1453 }
1454 set ui_status_value [format \
1456 "$msg... %i/%i files (%.2f%%)" \
1457 $update_index_cp \
1458 $totalCnt \
1459 [expr {100.0 * $update_index_cp / $totalCnt}]]
1460}
1461proc update_index {msg pathList after} {
1463 global update_index_cp ui_status_value
1464 if {![lock_index update]} return
1466 set update_index_cp 0
1468 set pathList [lsort $pathList]
1469 set totalCnt [llength $pathList]
1470 set batch [expr {int($totalCnt * .01) + 1}]
1471 if {$batch > 25} {set batch 25}
1472 set ui_status_value [format \
1474 "$msg... %i/%i files (%.2f%%)" \
1475 $update_index_cp \
1476 $totalCnt \
1477 0.0]
1478 set fd [open "| git update-index --add --remove -z --stdin" w]
1479 fconfigure $fd \
1480 -blocking 0 \
1481 -buffering full \
1482 -buffersize 512 \
1483 -translation binary
1484 fileevent $fd writable [list \
1485 write_update_index \
1486 $fd \
1487 $pathList \
1488 $totalCnt \
1489 $batch \
1490 $msg \
1491 $after \
1492 ]
1493}
1494proc write_update_index {fd pathList totalCnt batch msg after} {
1496 global update_index_cp ui_status_value
1497 global file_states current_diff
1498 if {$update_index_cp >= $totalCnt} {
1500 close $fd
1501 unlock_index
1502 uplevel #0 $after
1503 return
1504 }
1505 for {set i $batch} \
1507 {$update_index_cp < $totalCnt && $i > 0} \
1508 {incr i -1} {
1509 set path [lindex $pathList $update_index_cp]
1510 incr update_index_cp
1511 switch -glob -- [lindex $file_states($path) 0] {
1513 AD -
1514 MD -
1515 UD -
1516 _D {set new DD}
1517 _M -
1519 MM -
1520 UM -
1521 U_ -
1522 M_ {set new M_}
1523 _O -
1525 AM -
1526 A_ {set new A_}
1527 ?? {continue}
1529 }
1530 puts -nonewline $fd $path
1532 puts -nonewline $fd "\0"
1533 display_file $path $new
1534 }
1535 set ui_status_value [format \
1537 "$msg... %i/%i files (%.2f%%)" \
1538 $update_index_cp \
1539 $totalCnt \
1540 [expr {100.0 * $update_index_cp / $totalCnt}]]
1541}
1542proc checkout_index {msg pathList after} {
1544 global update_index_cp ui_status_value
1545 if {![lock_index update]} return
1547 set update_index_cp 0
1549 set pathList [lsort $pathList]
1550 set totalCnt [llength $pathList]
1551 set batch [expr {int($totalCnt * .01) + 1}]
1552 if {$batch > 25} {set batch 25}
1553 set ui_status_value [format \
1555 "$msg... %i/%i files (%.2f%%)" \
1556 $update_index_cp \
1557 $totalCnt \
1558 0.0]
1559 set cmd [list git checkout-index]
1560 lappend cmd --index
1561 lappend cmd --quiet
1562 lappend cmd --force
1563 lappend cmd -z
1564 lappend cmd --stdin
1565 set fd [open "| $cmd " w]
1566 fconfigure $fd \
1567 -blocking 0 \
1568 -buffering full \
1569 -buffersize 512 \
1570 -translation binary
1571 fileevent $fd writable [list \
1572 write_checkout_index \
1573 $fd \
1574 $pathList \
1575 $totalCnt \
1576 $batch \
1577 $msg \
1578 $after \
1579 ]
1580}
1581proc write_checkout_index {fd pathList totalCnt batch msg after} {
1583 global update_index_cp ui_status_value
1584 global file_states current_diff
1585 if {$update_index_cp >= $totalCnt} {
1587 close $fd
1588 unlock_index
1589 uplevel #0 $after
1590 return
1591 }
1592 for {set i $batch} \
1594 {$update_index_cp < $totalCnt && $i > 0} \
1595 {incr i -1} {
1596 set path [lindex $pathList $update_index_cp]
1597 incr update_index_cp
1598 switch -glob -- [lindex $file_states($path) 0] {
1600 AM -
1601 AD {set new A_}
1602 MM -
1603 MD {set new M_}
1604 _M -
1605 _D {set new __}
1606 ?? {continue}
1607 }
1608 puts -nonewline $fd $path
1610 puts -nonewline $fd "\0"
1611 display_file $path $new
1612 }
1613 set ui_status_value [format \
1615 "$msg... %i/%i files (%.2f%%)" \
1616 $update_index_cp \
1617 $totalCnt \
1618 [expr {100.0 * $update_index_cp / $totalCnt}]]
1619}
1620######################################################################
1622##
1623## branch management
1624proc load_all_heads {} {
1626 global all_heads tracking_branches
1627 set all_heads [list]
1629 set cmd [list git for-each-ref]
1630 lappend cmd --format=%(refname)
1631 lappend cmd refs/heads
1632 set fd [open "| $cmd" r]
1633 while {[gets $fd line] > 0} {
1634 if {![catch {set info $tracking_branches($line)}]} continue
1635 if {![regsub ^refs/heads/ $line {} name]} continue
1636 lappend all_heads $name
1637 }
1638 close $fd
1639 set all_heads [lsort $all_heads]
1641}
1642proc populate_branch_menu {m} {
1644 global all_heads disable_on_lock
1645 $m add separator
1647 foreach b $all_heads {
1648 $m add radiobutton \
1649 -label $b \
1650 -command [list switch_branch $b] \
1651 -variable current_branch \
1652 -value $b \
1653 -font font_ui
1654 lappend disable_on_lock \
1655 [list $m entryconf [$m index last] -state]
1656 }
1657}
1658proc do_create_branch {} {
1660 error "NOT IMPLEMENTED"
1661}
1662proc do_delete_branch {} {
1664 error "NOT IMPLEMENTED"
1665}
1666proc switch_branch {b} {
1668 global HEAD commit_type file_states current_branch
1669 global selected_commit_type ui_comm
1670 if {![lock_index switch]} return
1672 # -- Backup the selected branch (repository_state resets it)
1674 #
1675 set new_branch $current_branch
1676 # -- Our in memory state should match the repository.
1678 #
1679 repository_state curType curHEAD curMERGE_HEAD
1680 if {[string match amend* $commit_type]
1681 && $curType eq {normal}
1682 && $curHEAD eq $HEAD} {
1683 } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
1684 info_popup {Last scanned state does not match repository state.
1685Another Git program has modified this repository
1687since the last scan. A rescan must be performed
1688before the current branch can be changed.
1689The rescan will be automatically started now.
1691}
1692 unlock_index
1693 rescan {set ui_status_value {Ready.}}
1694 return
1695 }
1696 # -- Toss the message buffer if we are in amend mode.
1698 #
1699 if {[string match amend* $curType]} {
1700 $ui_comm delete 0.0 end
1701 $ui_comm edit reset
1702 $ui_comm edit modified false
1703 }
1704 set selected_commit_type new
1706 set current_branch $new_branch
1707 unlock_index
1709 error "NOT FINISHED"
1710}
1711######################################################################
1713##
1714## remote management
1715proc load_all_remotes {} {
1717 global gitdir repo_config
1718 global all_remotes tracking_branches
1719 set all_remotes [list]
1721 array unset tracking_branches
1722 set rm_dir [file join $gitdir remotes]
1724 if {[file isdirectory $rm_dir]} {
1725 set all_remotes [glob \
1726 -types f \
1727 -tails \
1728 -nocomplain \
1729 -directory $rm_dir *]
1730 foreach name $all_remotes {
1732 catch {
1733 set fd [open [file join $rm_dir $name] r]
1734 while {[gets $fd line] >= 0} {
1735 if {![regexp {^Pull:[ ]*([^:]+):(.+)$} \
1736 $line line src dst]} continue
1737 if {![regexp ^refs/ $dst]} {
1738 set dst "refs/heads/$dst"
1739 }
1740 set tracking_branches($dst) [list $name $src]
1741 }
1742 close $fd
1743 }
1744 }
1745 }
1746 foreach line [array names repo_config remote.*.url] {
1748 if {![regexp ^remote\.(.*)\.url\$ $line line name]} continue
1749 lappend all_remotes $name
1750 if {[catch {set fl $repo_config(remote.$name.fetch)}]} {
1752 set fl {}
1753 }
1754 foreach line $fl {
1755 if {![regexp {^([^:]+):(.+)$} $line line src dst]} continue
1756 if {![regexp ^refs/ $dst]} {
1757 set dst "refs/heads/$dst"
1758 }
1759 set tracking_branches($dst) [list $name $src]
1760 }
1761 }
1762 set all_remotes [lsort -unique $all_remotes]
1764}
1765proc populate_fetch_menu {m} {
1767 global gitdir all_remotes repo_config
1768 foreach r $all_remotes {
1770 set enable 0
1771 if {![catch {set a $repo_config(remote.$r.url)}]} {
1772 if {![catch {set a $repo_config(remote.$r.fetch)}]} {
1773 set enable 1
1774 }
1775 } else {
1776 catch {
1777 set fd [open [file join $gitdir remotes $r] r]
1778 while {[gets $fd n] >= 0} {
1779 if {[regexp {^Pull:[ \t]*([^:]+):} $n]} {
1780 set enable 1
1781 break
1782 }
1783 }
1784 close $fd
1785 }
1786 }
1787 if {$enable} {
1789 $m add command \
1790 -label "Fetch from $r..." \
1791 -command [list fetch_from $r] \
1792 -font font_ui
1793 }
1794 }
1795}
1796proc populate_push_menu {m} {
1798 global gitdir all_remotes repo_config
1799 foreach r $all_remotes {
1801 set enable 0
1802 if {![catch {set a $repo_config(remote.$r.url)}]} {
1803 if {![catch {set a $repo_config(remote.$r.push)}]} {
1804 set enable 1
1805 }
1806 } else {
1807 catch {
1808 set fd [open [file join $gitdir remotes $r] r]
1809 while {[gets $fd n] >= 0} {
1810 if {[regexp {^Push:[ \t]*([^:]+):} $n]} {
1811 set enable 1
1812 break
1813 }
1814 }
1815 close $fd
1816 }
1817 }
1818 if {$enable} {
1820 $m add command \
1821 -label "Push to $r..." \
1822 -command [list push_to $r] \
1823 -font font_ui
1824 }
1825 }
1826}
1827proc populate_pull_menu {m} {
1829 global gitdir repo_config all_remotes disable_on_lock
1830 foreach remote $all_remotes {
1832 set rb_list [list]
1833 if {[array get repo_config remote.$remote.url] ne {}} {
1834 if {[array get repo_config remote.$remote.fetch] ne {}} {
1835 foreach line $repo_config(remote.$remote.fetch) {
1836 if {[regexp {^([^:]+):} $line line rb]} {
1837 lappend rb_list $rb
1838 }
1839 }
1840 }
1841 } else {
1842 catch {
1843 set fd [open [file join $gitdir remotes $remote] r]
1844 while {[gets $fd line] >= 0} {
1845 if {[regexp {^Pull:[ \t]*([^:]+):} $line line rb]} {
1846 lappend rb_list $rb
1847 }
1848 }
1849 close $fd
1850 }
1851 }
1852 foreach rb $rb_list {
1854 regsub ^refs/heads/ $rb {} rb_short
1855 $m add command \
1856 -label "Branch $rb_short from $remote..." \
1857 -command [list pull_remote $remote $rb] \
1858 -font font_ui
1859 lappend disable_on_lock \
1860 [list $m entryconf [$m index last] -state]
1861 }
1862 }
1863}
1864######################################################################
1866##
1867## icons
1868set filemask {
1870#define mask_width 14
1871#define mask_height 15
1872static unsigned char mask_bits[] = {
1873 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1874 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1875 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1876}
1877image create bitmap file_plain -background white -foreground black -data {
1879#define plain_width 14
1880#define plain_height 15
1881static unsigned char plain_bits[] = {
1882 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1883 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1884 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1885} -maskdata $filemask
1886image create bitmap file_mod -background white -foreground blue -data {
1888#define mod_width 14
1889#define mod_height 15
1890static unsigned char mod_bits[] = {
1891 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1892 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1893 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1894} -maskdata $filemask
1895image create bitmap file_fulltick -background white -foreground "#007000" -data {
1897#define file_fulltick_width 14
1898#define file_fulltick_height 15
1899static unsigned char file_fulltick_bits[] = {
1900 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1901 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1902 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1903} -maskdata $filemask
1904image create bitmap file_parttick -background white -foreground "#005050" -data {
1906#define parttick_width 14
1907#define parttick_height 15
1908static unsigned char parttick_bits[] = {
1909 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1910 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1911 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1912} -maskdata $filemask
1913image create bitmap file_question -background white -foreground black -data {
1915#define file_question_width 14
1916#define file_question_height 15
1917static unsigned char file_question_bits[] = {
1918 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1919 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1920 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1921} -maskdata $filemask
1922image create bitmap file_removed -background white -foreground red -data {
1924#define file_removed_width 14
1925#define file_removed_height 15
1926static unsigned char file_removed_bits[] = {
1927 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1928 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1929 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1930} -maskdata $filemask
1931image create bitmap file_merge -background white -foreground blue -data {
1933#define file_merge_width 14
1934#define file_merge_height 15
1935static unsigned char file_merge_bits[] = {
1936 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1937 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1938 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1939} -maskdata $filemask
1940set ui_index .vpane.files.index.list
1942set ui_other .vpane.files.other.list
1943set max_status_desc 0
1944foreach i {
1945 {__ i plain "Unmodified"}
1946 {_M i mod "Modified"}
1947 {M_ i fulltick "Added to commit"}
1948 {MM i parttick "Partially included"}
1949 {MD i question "Added (but gone)"}
1950 {_O o plain "Untracked"}
1952 {A_ o fulltick "Added by commit"}
1953 {AM o parttick "Partially added"}
1954 {AD o question "Added (but gone)"}
1955 {_D i question "Missing"}
1957 {DD i removed "Removed by commit"}
1958 {D_ i removed "Removed by commit"}
1959 {DO i removed "Removed (still exists)"}
1960 {DM i removed "Removed (but modified)"}
1961 {UD i merge "Merge conflicts"}
1963 {UM i merge "Merge conflicts"}
1964 {U_ i merge "Merge conflicts"}
1965 } {
1966 if {$max_status_desc < [string length [lindex $i 3]]} {
1967 set max_status_desc [string length [lindex $i 3]]
1968 }
1969 if {[lindex $i 1] eq {i}} {
1970 set all_cols([lindex $i 0]) $ui_index
1971 } else {
1972 set all_cols([lindex $i 0]) $ui_other
1973 }
1974 set all_icons([lindex $i 0]) file_[lindex $i 2]
1975 set all_descs([lindex $i 0]) [lindex $i 3]
1976}
1977unset filemask i
1978######################################################################
1980##
1981## util
1982proc is_MacOSX {} {
1984 global tcl_platform tk_library
1985 if {[tk windowingsystem] eq {aqua}} {
1986 return 1
1987 }
1988 return 0
1989}
1990proc is_Windows {} {
1992 global tcl_platform
1993 if {$tcl_platform(platform) eq {windows}} {
1994 return 1
1995 }
1996 return 0
1997}
1998proc bind_button3 {w cmd} {
2000 bind $w <Any-Button-3> $cmd
2001 if {[is_MacOSX]} {
2002 bind $w <Control-Button-1> $cmd
2003 }
2004}
2005proc incr_font_size {font {amt 1}} {
2007 set sz [font configure $font -size]
2008 incr sz $amt
2009 font configure $font -size $sz
2010 font configure ${font}bold -size $sz
2011}
2012proc hook_failed_popup {hook msg} {
2014 global gitdir appname
2015 set w .hookfail
2017 toplevel $w
2018 frame $w.m
2020 label $w.m.l1 -text "$hook hook failed:" \
2021 -anchor w \
2022 -justify left \
2023 -font font_uibold
2024 text $w.m.t \
2025 -background white -borderwidth 1 \
2026 -relief sunken \
2027 -width 80 -height 10 \
2028 -font font_diff \
2029 -yscrollcommand [list $w.m.sby set]
2030 label $w.m.l2 \
2031 -text {You must correct the above errors before committing.} \
2032 -anchor w \
2033 -justify left \
2034 -font font_uibold
2035 scrollbar $w.m.sby -command [list $w.m.t yview]
2036 pack $w.m.l1 -side top -fill x
2037 pack $w.m.l2 -side bottom -fill x
2038 pack $w.m.sby -side right -fill y
2039 pack $w.m.t -side left -fill both -expand 1
2040 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
2041 $w.m.t insert 1.0 $msg
2043 $w.m.t conf -state disabled
2044 button $w.ok -text OK \
2046 -width 15 \
2047 -font font_ui \
2048 -command "destroy $w"
2049 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
2050 bind $w <Visibility> "grab $w; focus $w"
2052 bind $w <Key-Return> "destroy $w"
2053 wm title $w "$appname ([lindex [file split \
2054 [file normalize [file dirname $gitdir]]] \
2055 end]): error"
2056 tkwait window $w
2057}
2058set next_console_id 0
2060proc new_console {short_title long_title} {
2062 global next_console_id console_data
2063 set w .console[incr next_console_id]
2064 set console_data($w) [list $short_title $long_title]
2065 return [console_init $w]
2066}
2067proc console_init {w} {
2069 global console_cr console_data
2070 global gitdir appname M1B
2071 set console_cr($w) 1.0
2073 toplevel $w
2074 frame $w.m
2075 label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
2076 -anchor w \
2077 -justify left \
2078 -font font_uibold
2079 text $w.m.t \
2080 -background white -borderwidth 1 \
2081 -relief sunken \
2082 -width 80 -height 10 \
2083 -font font_diff \
2084 -state disabled \
2085 -yscrollcommand [list $w.m.sby set]
2086 label $w.m.s -text {Working... please wait...} \
2087 -anchor w \
2088 -justify left \
2089 -font font_uibold
2090 scrollbar $w.m.sby -command [list $w.m.t yview]
2091 pack $w.m.l1 -side top -fill x
2092 pack $w.m.s -side bottom -fill x
2093 pack $w.m.sby -side right -fill y
2094 pack $w.m.t -side left -fill both -expand 1
2095 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
2096 menu $w.ctxm -tearoff 0
2098 $w.ctxm add command -label "Copy" \
2099 -font font_ui \
2100 -command "tk_textCopy $w.m.t"
2101 $w.ctxm add command -label "Select All" \
2102 -font font_ui \
2103 -command "$w.m.t tag add sel 0.0 end"
2104 $w.ctxm add command -label "Copy All" \
2105 -font font_ui \
2106 -command "
2107 $w.m.t tag add sel 0.0 end
2108 tk_textCopy $w.m.t
2109 $w.m.t tag remove sel 0.0 end
2110 "
2111 button $w.ok -text {Close} \
2113 -font font_ui \
2114 -state disabled \
2115 -command "destroy $w"
2116 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
2117 bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
2119 bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
2120 bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
2121 bind $w <Visibility> "focus $w"
2122 wm title $w "$appname ([lindex [file split \
2123 [file normalize [file dirname $gitdir]]] \
2124 end]): [lindex $console_data($w) 0]"
2125 return $w
2126}
2127proc console_exec {w cmd {after {}}} {
2129 # -- Windows tosses the enviroment when we exec our child.
2130 # But most users need that so we have to relogin. :-(
2131 #
2132 if {[is_Windows]} {
2133 set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
2134 }
2135 # -- Tcl won't let us redirect both stdout and stderr to
2137 # the same pipe. So pass it through cat...
2138 #
2139 set cmd [concat | $cmd |& cat]
2140 set fd_f [open $cmd r]
2142 fconfigure $fd_f -blocking 0 -translation binary
2143 fileevent $fd_f readable [list console_read $w $fd_f $after]
2144}
2145proc console_read {w fd after} {
2147 global console_cr console_data
2148 set buf [read $fd]
2150 if {$buf ne {}} {
2151 if {![winfo exists $w]} {console_init $w}
2152 $w.m.t conf -state normal
2153 set c 0
2154 set n [string length $buf]
2155 while {$c < $n} {
2156 set cr [string first "\r" $buf $c]
2157 set lf [string first "\n" $buf $c]
2158 if {$cr < 0} {set cr [expr {$n + 1}]}
2159 if {$lf < 0} {set lf [expr {$n + 1}]}
2160 if {$lf < $cr} {
2162 $w.m.t insert end [string range $buf $c $lf]
2163 set console_cr($w) [$w.m.t index {end -1c}]
2164 set c $lf
2165 incr c
2166 } else {
2167 $w.m.t delete $console_cr($w) end
2168 $w.m.t insert end "\n"
2169 $w.m.t insert end [string range $buf $c $cr]
2170 set c $cr
2171 incr c
2172 }
2173 }
2174 $w.m.t conf -state disabled
2175 $w.m.t see end
2176 }
2177 fconfigure $fd -blocking 1
2179 if {[eof $fd]} {
2180 if {[catch {close $fd}]} {
2181 if {![winfo exists $w]} {console_init $w}
2182 $w.m.s conf -background red -text {Error: Command Failed}
2183 $w.ok conf -state normal
2184 set ok 0
2185 } elseif {[winfo exists $w]} {
2186 $w.m.s conf -background green -text {Success}
2187 $w.ok conf -state normal
2188 set ok 1
2189 }
2190 array unset console_cr $w
2191 array unset console_data $w
2192 if {$after ne {}} {
2193 uplevel #0 $after $ok
2194 }
2195 return
2196 }
2197 fconfigure $fd -blocking 0
2198}
2199######################################################################
2201##
2202## ui commands
2203set starting_gitk_msg {Please wait... Starting gitk...}
2205proc do_gitk {revs} {
2207 global ui_status_value starting_gitk_msg
2208 set cmd gitk
2210 if {$revs ne {}} {
2211 append cmd { }
2212 append cmd $revs
2213 }
2214 if {[is_Windows]} {
2215 set cmd "sh -c \"exec $cmd\""
2216 }
2217 append cmd { &}
2218 if {[catch {eval exec $cmd} err]} {
2220 error_popup "Failed to start gitk:\n\n$err"
2221 } else {
2222 set ui_status_value $starting_gitk_msg
2223 after 10000 {
2224 if {$ui_status_value eq $starting_gitk_msg} {
2225 set ui_status_value {Ready.}
2226 }
2227 }
2228 }
2229}
2230proc do_gc {} {
2232 set w [new_console {gc} {Compressing the object database}]
2233 console_exec $w {git gc}
2234}
2235proc do_fsck_objects {} {
2237 set w [new_console {fsck-objects} \
2238 {Verifying the object database with fsck-objects}]
2239 set cmd [list git fsck-objects]
2240 lappend cmd --full
2241 lappend cmd --cache
2242 lappend cmd --strict
2243 console_exec $w $cmd
2244}
2245set is_quitting 0
2247proc do_quit {} {
2249 global gitdir ui_comm is_quitting repo_config commit_type
2250 if {$is_quitting} return
2252 set is_quitting 1
2253 # -- Stash our current commit buffer.
2255 #
2256 set save [file join $gitdir GITGUI_MSG]
2257 set msg [string trim [$ui_comm get 0.0 end]]
2258 if {![string match amend* $commit_type]
2259 && [$ui_comm edit modified]
2260 && $msg ne {}} {
2261 catch {
2262 set fd [open $save w]
2263 puts $fd [string trim [$ui_comm get 0.0 end]]
2264 close $fd
2265 }
2266 } else {
2267 catch {file delete $save}
2268 }
2269 # -- Stash our current window geometry into this repository.
2271 #
2272 set cfg_geometry [list]
2273 lappend cfg_geometry [wm geometry .]
2274 lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
2275 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
2276 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2277 set rc_geometry {}
2278 }
2279 if {$cfg_geometry ne $rc_geometry} {
2280 catch {exec git repo-config gui.geometry $cfg_geometry}
2281 }
2282 destroy .
2284}
2285proc do_rescan {} {
2287 rescan {set ui_status_value {Ready.}}
2288}
2289proc remove_helper {txt paths} {
2291 global file_states current_diff
2292 if {![lock_index begin-update]} return
2294 set pathList [list]
2296 set after {}
2297 foreach path $paths {
2298 switch -glob -- [lindex $file_states($path) 0] {
2299 A? -
2300 M? -
2301 D? {
2302 lappend pathList $path
2303 if {$path eq $current_diff} {
2304 set after {reshow_diff;}
2305 }
2306 }
2307 }
2308 }
2309 if {$pathList eq {}} {
2310 unlock_index
2311 } else {
2312 update_indexinfo \
2313 $txt \
2314 $pathList \
2315 [concat $after {set ui_status_value {Ready.}}]
2316 }
2317}
2318proc do_remove_selection {} {
2320 global current_diff selected_paths
2321 if {[array size selected_paths] > 0} {
2323 remove_helper \
2324 {Removing selected files from commit} \
2325 [array names selected_paths]
2326 } elseif {$current_diff ne {}} {
2327 remove_helper \
2328 "Removing [short_path $current_diff] from commit" \
2329 [list $current_diff]
2330 }
2331}
2332proc include_helper {txt paths} {
2334 global file_states current_diff
2335 if {![lock_index begin-update]} return
2337 set pathList [list]
2339 set after {}
2340 foreach path $paths {
2341 switch -glob -- [lindex $file_states($path) 0] {
2342 AM -
2343 AD -
2344 MM -
2345 MD -
2346 U? -
2347 _M -
2348 _D -
2349 _O {
2350 lappend pathList $path
2351 if {$path eq $current_diff} {
2352 set after {reshow_diff;}
2353 }
2354 }
2355 }
2356 }
2357 if {$pathList eq {}} {
2358 unlock_index
2359 } else {
2360 update_index \
2361 $txt \
2362 $pathList \
2363 [concat $after {set ui_status_value {Ready to commit.}}]
2364 }
2365}
2366proc do_include_selection {} {
2368 global current_diff selected_paths
2369 if {[array size selected_paths] > 0} {
2371 include_helper \
2372 {Adding selected files} \
2373 [array names selected_paths]
2374 } elseif {$current_diff ne {}} {
2375 include_helper \
2376 "Adding [short_path $current_diff]" \
2377 [list $current_diff]
2378 }
2379}
2380proc do_include_all {} {
2382 global file_states
2383 set paths [list]
2385 foreach path [array names file_states] {
2386 switch -- [lindex $file_states($path) 0] {
2387 AM -
2388 AD -
2389 MM -
2390 MD -
2391 _M -
2392 _D {lappend paths $path}
2393 }
2394 }
2395 include_helper \
2396 {Adding all modified files} \
2397 $paths
2398}
2399proc revert_helper {txt paths} {
2401 global gitdir appname
2402 global file_states current_diff
2403 if {![lock_index begin-update]} return
2405 set pathList [list]
2407 set after {}
2408 foreach path $paths {
2409 switch -glob -- [lindex $file_states($path) 0] {
2410 AM -
2411 AD -
2412 MM -
2413 MD -
2414 _M -
2415 _D {
2416 lappend pathList $path
2417 if {$path eq $current_diff} {
2418 set after {reshow_diff;}
2419 }
2420 }
2421 }
2422 }
2423 set n [llength $pathList]
2425 if {$n == 0} {
2426 unlock_index
2427 return
2428 } elseif {$n == 1} {
2429 set s "[short_path [lindex $pathList]]"
2430 } else {
2431 set s "these $n files"
2432 }
2433 set reponame [lindex [file split \
2435 [file normalize [file dirname $gitdir]]] \
2436 end]
2437 set reply [tk_dialog \
2439 .confirm_revert \
2440 "$appname ($reponame)" \
2441 "Revert changes in $s?
2442Any unadded changes will be permanently lost by the revert." \
2444 question \
2445 1 \
2446 {Do Nothing} \
2447 {Revert Changes} \
2448 ]
2449 if {$reply == 1} {
2450 checkout_index \
2451 $txt \
2452 $pathList \
2453 [concat $after {set ui_status_value {Ready.}}]
2454 } else {
2455 unlock_index
2456 }
2457}
2458proc do_revert_selection {} {
2460 global current_diff selected_paths
2461 if {[array size selected_paths] > 0} {
2463 revert_helper \
2464 {Reverting selected files} \
2465 [array names selected_paths]
2466 } elseif {$current_diff ne {}} {
2467 revert_helper \
2468 "Reverting [short_path $current_diff]" \
2469 [list $current_diff]
2470 }
2471}
2472proc do_signoff {} {
2474 global ui_comm
2475 set me [committer_ident]
2477 if {$me eq {}} return
2478 set sob "Signed-off-by: $me"
2480 set last [$ui_comm get {end -1c linestart} {end -1c}]
2481 if {$last ne $sob} {
2482 $ui_comm edit separator
2483 if {$last ne {}
2484 && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
2485 $ui_comm insert end "\n"
2486 }
2487 $ui_comm insert end "\n$sob"
2488 $ui_comm edit separator
2489 $ui_comm see end
2490 }
2491}
2492proc do_select_commit_type {} {
2494 global commit_type selected_commit_type
2495 if {$selected_commit_type eq {new}
2497 && [string match amend* $commit_type]} {
2498 create_new_commit
2499 } elseif {$selected_commit_type eq {amend}
2500 && ![string match amend* $commit_type]} {
2501 load_last_commit
2502 # The amend request was rejected...
2504 #
2505 if {![string match amend* $commit_type]} {
2506 set selected_commit_type new
2507 }
2508 }
2509}
2510proc do_commit {} {
2512 commit_tree
2513}
2514proc do_about {} {
2516 global appname appvers copyright
2517 global tcl_patchLevel tk_patchLevel
2518 set w .about_dialog
2520 toplevel $w
2521 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2522 label $w.header -text "About $appname" \
2524 -font font_uibold
2525 pack $w.header -side top -fill x
2526 frame $w.buttons
2528 button $w.buttons.close -text {Close} \
2529 -font font_ui \
2530 -command [list destroy $w]
2531 pack $w.buttons.close -side right
2532 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2533 label $w.desc \
2535 -text "$appname - a commit creation tool for Git.
2536$copyright" \
2537 -padx 5 -pady 5 \
2538 -justify left \
2539 -anchor w \
2540 -borderwidth 1 \
2541 -relief solid \
2542 -font font_ui
2543 pack $w.desc -side top -fill x -padx 5 -pady 5
2544 set v {}
2546 append v "$appname version $appvers\n"
2547 append v "[exec git version]\n"
2548 append v "\n"
2549 if {$tcl_patchLevel eq $tk_patchLevel} {
2550 append v "Tcl/Tk version $tcl_patchLevel"
2551 } else {
2552 append v "Tcl version $tcl_patchLevel"
2553 append v ", Tk version $tk_patchLevel"
2554 }
2555 label $w.vers \
2557 -text $v \
2558 -padx 5 -pady 5 \
2559 -justify left \
2560 -anchor w \
2561 -borderwidth 1 \
2562 -relief solid \
2563 -font font_ui
2564 pack $w.vers -side top -fill x -padx 5 -pady 5
2565 menu $w.ctxm -tearoff 0
2567 $w.ctxm add command \
2568 -label {Copy} \
2569 -font font_ui \
2570 -command "
2571 clipboard clear
2572 clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
2573 "
2574 bind $w <Visibility> "grab $w; focus $w"
2576 bind $w <Key-Escape> "destroy $w"
2577 bind_button3 $w.vers "tk_popup $w.ctxm %X %Y; grab $w; focus $w"
2578 wm title $w "About $appname"
2579 tkwait window $w
2580}
2581proc do_options {} {
2583 global appname gitdir font_descs
2584 global repo_config global_config
2585 global repo_config_new global_config_new
2586 array unset repo_config_new
2588 array unset global_config_new
2589 foreach name [array names repo_config] {
2590 set repo_config_new($name) $repo_config($name)
2591 }
2592 load_config 1
2593 foreach name [array names repo_config] {
2594 switch -- $name {
2595 gui.diffcontext {continue}
2596 }
2597 set repo_config_new($name) $repo_config($name)
2598 }
2599 foreach name [array names global_config] {
2600 set global_config_new($name) $global_config($name)
2601 }
2602 set reponame [lindex [file split \
2603 [file normalize [file dirname $gitdir]]] \
2604 end]
2605 set w .options_editor
2607 toplevel $w
2608 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2609 label $w.header -text "$appname Options" \
2611 -font font_uibold
2612 pack $w.header -side top -fill x
2613 frame $w.buttons
2615 button $w.buttons.restore -text {Restore Defaults} \
2616 -font font_ui \
2617 -command do_restore_defaults
2618 pack $w.buttons.restore -side left
2619 button $w.buttons.save -text Save \
2620 -font font_ui \
2621 -command [list do_save_config $w]
2622 pack $w.buttons.save -side right
2623 button $w.buttons.cancel -text {Cancel} \
2624 -font font_ui \
2625 -command [list destroy $w]
2626 pack $w.buttons.cancel -side right
2627 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2628 labelframe $w.repo -text "$reponame Repository" \
2630 -font font_ui \
2631 -relief raised -borderwidth 2
2632 labelframe $w.global -text {Global (All Repositories)} \
2633 -font font_ui \
2634 -relief raised -borderwidth 2
2635 pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
2636 pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
2637 foreach option {
2639 {b partialinclude {Allow Partially Added Files}}
2640 {b pullsummary {Show Pull Summary}}
2641 {b trustmtime {Trust File Modification Timestamps}}
2642 {i diffcontext {Number of Diff Context Lines}}
2643 } {
2644 set type [lindex $option 0]
2645 set name [lindex $option 1]
2646 set text [lindex $option 2]
2647 foreach f {repo global} {
2648 switch $type {
2649 b {
2650 checkbutton $w.$f.$name -text $text \
2651 -variable ${f}_config_new(gui.$name) \
2652 -onvalue true \
2653 -offvalue false \
2654 -font font_ui
2655 pack $w.$f.$name -side top -anchor w
2656 }
2657 i {
2658 frame $w.$f.$name
2659 label $w.$f.$name.l -text "$text:" -font font_ui
2660 pack $w.$f.$name.l -side left -anchor w -fill x
2661 spinbox $w.$f.$name.v \
2662 -textvariable ${f}_config_new(gui.$name) \
2663 -from 1 -to 99 -increment 1 \
2664 -width 3 \
2665 -font font_ui
2666 pack $w.$f.$name.v -side right -anchor e
2667 pack $w.$f.$name -side top -anchor w -fill x
2668 }
2669 }
2670 }
2671 }
2672 set all_fonts [lsort [font families]]
2674 foreach option $font_descs {
2675 set name [lindex $option 0]
2676 set font [lindex $option 1]
2677 set text [lindex $option 2]
2678 set global_config_new(gui.$font^^family) \
2680 [font configure $font -family]
2681 set global_config_new(gui.$font^^size) \
2682 [font configure $font -size]
2683 frame $w.global.$name
2685 label $w.global.$name.l -text "$text:" -font font_ui
2686 pack $w.global.$name.l -side left -anchor w -fill x
2687 eval tk_optionMenu $w.global.$name.family \
2688 global_config_new(gui.$font^^family) \
2689 $all_fonts
2690 spinbox $w.global.$name.size \
2691 -textvariable global_config_new(gui.$font^^size) \
2692 -from 2 -to 80 -increment 1 \
2693 -width 3 \
2694 -font font_ui
2695 pack $w.global.$name.size -side right -anchor e
2696 pack $w.global.$name.family -side right -anchor e
2697 pack $w.global.$name -side top -anchor w -fill x
2698 }
2699 bind $w <Visibility> "grab $w; focus $w"
2701 bind $w <Key-Escape> "destroy $w"
2702 wm title $w "$appname ($reponame): Options"
2703 tkwait window $w
2704}
2705proc do_restore_defaults {} {
2707 global font_descs default_config repo_config
2708 global repo_config_new global_config_new
2709 foreach name [array names default_config] {
2711 set repo_config_new($name) $default_config($name)
2712 set global_config_new($name) $default_config($name)
2713 }
2714 foreach option $font_descs {
2716 set name [lindex $option 0]
2717 set repo_config(gui.$name) $default_config(gui.$name)
2718 }
2719 apply_config
2720 foreach option $font_descs {
2722 set name [lindex $option 0]
2723 set font [lindex $option 1]
2724 set global_config_new(gui.$font^^family) \
2725 [font configure $font -family]
2726 set global_config_new(gui.$font^^size) \
2727 [font configure $font -size]
2728 }
2729}
2730proc do_save_config {w} {
2732 if {[catch {save_config} err]} {
2733 error_popup "Failed to completely save options:\n\n$err"
2734 }
2735 reshow_diff
2736 destroy $w
2737}
2738proc do_windows_shortcut {} {
2740 global gitdir appname argv0
2741 set reponame [lindex [file split \
2743 [file normalize [file dirname $gitdir]]] \
2744 end]
2745 if {[catch {
2747 set desktop [exec cygpath \
2748 --windows \
2749 --absolute \
2750 --long-name \
2751 --desktop]
2752 }]} {
2753 set desktop .
2754 }
2755 set fn [tk_getSaveFile \
2756 -parent . \
2757 -title "$appname ($reponame): Create Desktop Icon" \
2758 -initialdir $desktop \
2759 -initialfile "Git $reponame.bat"]
2760 if {$fn != {}} {
2761 if {[catch {
2762 set fd [open $fn w]
2763 set sh [exec cygpath \
2764 --windows \
2765 --absolute \
2766 /bin/sh]
2767 set me [exec cygpath \
2768 --unix \
2769 --absolute \
2770 $argv0]
2771 set gd [exec cygpath \
2772 --unix \
2773 --absolute \
2774 $gitdir]
2775 regsub -all ' $me "'\\''" me
2776 regsub -all ' $gd "'\\''" gd
2777 puts $fd "@ECHO Starting git-gui... Please wait..."
2778 puts -nonewline $fd "@\"$sh\" --login -c \""
2779 puts -nonewline $fd "GIT_DIR='$gd'"
2780 puts -nonewline $fd " '$me'"
2781 puts $fd "&\""
2782 close $fd
2783 } err]} {
2784 error_popup "Cannot write script:\n\n$err"
2785 }
2786 }
2787}
2788proc do_macosx_app {} {
2790 global gitdir appname argv0 env
2791 set reponame [lindex [file split \
2793 [file normalize [file dirname $gitdir]]] \
2794 end]
2795 set fn [tk_getSaveFile \
2797 -parent . \
2798 -title "$appname ($reponame): Create Desktop Icon" \
2799 -initialdir [file join $env(HOME) Desktop] \
2800 -initialfile "Git $reponame.app"]
2801 if {$fn != {}} {
2802 if {[catch {
2803 set Contents [file join $fn Contents]
2804 set MacOS [file join $Contents MacOS]
2805 set exe [file join $MacOS git-gui]
2806 file mkdir $MacOS
2808 set fd [open [file join $Contents Info.plist] w]
2810 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
2811<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
2812<plist version="1.0">
2813<dict>
2814 <key>CFBundleDevelopmentRegion</key>
2815 <string>English</string>
2816 <key>CFBundleExecutable</key>
2817 <string>git-gui</string>
2818 <key>CFBundleIdentifier</key>
2819 <string>org.spearce.git-gui</string>
2820 <key>CFBundleInfoDictionaryVersion</key>
2821 <string>6.0</string>
2822 <key>CFBundlePackageType</key>
2823 <string>APPL</string>
2824 <key>CFBundleSignature</key>
2825 <string>????</string>
2826 <key>CFBundleVersion</key>
2827 <string>1.0</string>
2828 <key>NSPrincipalClass</key>
2829 <string>NSApplication</string>
2830</dict>
2831</plist>}
2832 close $fd
2833 set fd [open $exe w]
2835 set gd [file normalize $gitdir]
2836 set ep [file normalize [exec git --exec-path]]
2837 regsub -all ' $gd "'\\''" gd
2838 regsub -all ' $ep "'\\''" ep
2839 puts $fd "#!/bin/sh"
2840 foreach name [array names env] {
2841 if {[string match GIT_* $name]} {
2842 regsub -all ' $env($name) "'\\''" v
2843 puts $fd "export $name='$v'"
2844 }
2845 }
2846 puts $fd "export PATH='$ep':\$PATH"
2847 puts $fd "export GIT_DIR='$gd'"
2848 puts $fd "exec [file normalize $argv0]"
2849 close $fd
2850 file attributes $exe -permissions u+x,g+x,o+x
2852 } err]} {
2853 error_popup "Cannot write icon:\n\n$err"
2854 }
2855 }
2856}
2857proc toggle_or_diff {w x y} {
2859 global file_states file_lists current_diff ui_index ui_other
2860 global last_clicked selected_paths
2861 set pos [split [$w index @$x,$y] .]
2863 set lno [lindex $pos 0]
2864 set col [lindex $pos 1]
2865 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2866 if {$path eq {}} {
2867 set last_clicked {}
2868 return
2869 }
2870 set last_clicked [list $w $lno]
2872 array unset selected_paths
2873 $ui_index tag remove in_sel 0.0 end
2874 $ui_other tag remove in_sel 0.0 end
2875 if {$col == 0} {
2877 if {$current_diff eq $path} {
2878 set after {reshow_diff;}
2879 } else {
2880 set after {}
2881 }
2882 switch -glob -- [lindex $file_states($path) 0] {
2883 A_ -
2884 M_ -
2885 DD -
2886 DO -
2887 DM {
2888 update_indexinfo \
2889 "Removing [short_path $path] from commit" \
2890 [list $path] \
2891 [concat $after {set ui_status_value {Ready.}}]
2892 }
2893 ?? {
2894 update_index \
2895 "Adding [short_path $path]" \
2896 [list $path] \
2897 [concat $after {set ui_status_value {Ready.}}]
2898 }
2899 }
2900 } else {
2901 show_diff $path $w $lno
2902 }
2903}
2904proc add_one_to_selection {w x y} {
2906 global file_lists
2907 global last_clicked selected_paths
2908 set pos [split [$w index @$x,$y] .]
2910 set lno [lindex $pos 0]
2911 set col [lindex $pos 1]
2912 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2913 if {$path eq {}} {
2914 set last_clicked {}
2915 return
2916 }
2917 set last_clicked [list $w $lno]
2919 if {[catch {set in_sel $selected_paths($path)}]} {
2920 set in_sel 0
2921 }
2922 if {$in_sel} {
2923 unset selected_paths($path)
2924 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2925 } else {
2926 set selected_paths($path) 1
2927 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2928 }
2929}
2930proc add_range_to_selection {w x y} {
2932 global file_lists
2933 global last_clicked selected_paths
2934 if {[lindex $last_clicked 0] ne $w} {
2936 toggle_or_diff $w $x $y
2937 return
2938 }
2939 set pos [split [$w index @$x,$y] .]
2941 set lno [lindex $pos 0]
2942 set lc [lindex $last_clicked 1]
2943 if {$lc < $lno} {
2944 set begin $lc
2945 set end $lno
2946 } else {
2947 set begin $lno
2948 set end $lc
2949 }
2950 foreach path [lrange $file_lists($w) \
2952 [expr {$begin - 1}] \
2953 [expr {$end - 1}]] {
2954 set selected_paths($path) 1
2955 }
2956 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2957}
2958######################################################################
2960##
2961## config defaults
2962set cursor_ptr arrow
2964font create font_diff -family Courier -size 10
2965font create font_ui
2966catch {
2967 label .dummy
2968 eval font configure font_ui [font actual [.dummy cget -font]]
2969 destroy .dummy
2970}
2971font create font_uibold
2973font create font_diffbold
2974if {[is_Windows]} {
2976 set M1B Control
2977 set M1T Ctrl
2978} elseif {[is_MacOSX]} {
2979 set M1B M1
2980 set M1T Cmd
2981} else {
2982 set M1B M1
2983 set M1T M1
2984}
2985proc apply_config {} {
2987 global repo_config font_descs
2988 foreach option $font_descs {
2990 set name [lindex $option 0]
2991 set font [lindex $option 1]
2992 if {[catch {
2993 foreach {cn cv} $repo_config(gui.$name) {
2994 font configure $font $cn $cv
2995 }
2996 } err]} {
2997 error_popup "Invalid font specified in gui.$name:\n\n$err"
2998 }
2999 foreach {cn cv} [font configure $font] {
3000 font configure ${font}bold $cn $cv
3001 }
3002 font configure ${font}bold -weight bold
3003 }
3004}
3005set default_config(gui.trustmtime) false
3007set default_config(gui.pullsummary) true
3008set default_config(gui.partialinclude) false
3009set default_config(gui.diffcontext) 5
3010set default_config(gui.fontui) [font configure font_ui]
3011set default_config(gui.fontdiff) [font configure font_diff]
3012set font_descs {
3013 {fontui font_ui {Main Font}}
3014 {fontdiff font_diff {Diff/Console Font}}
3015}
3016load_config 0
3017apply_config
3018######################################################################
3020##
3021## ui construction
3022# -- Menu Bar
3024#
3025menu .mbar -tearoff 0
3026.mbar add cascade -label Repository -menu .mbar.repository
3027.mbar add cascade -label Edit -menu .mbar.edit
3028if {!$single_commit} {
3029 .mbar add cascade -label Branch -menu .mbar.branch
3030}
3031.mbar add cascade -label Commit -menu .mbar.commit
3032if {!$single_commit} {
3033 .mbar add cascade -label Fetch -menu .mbar.fetch
3034 .mbar add cascade -label Pull -menu .mbar.pull
3035 .mbar add cascade -label Push -menu .mbar.push
3036}
3037. configure -menu .mbar
3038# -- Repository Menu
3040#
3041menu .mbar.repository
3042.mbar.repository add command \
3043 -label {Visualize Current Branch} \
3044 -command {do_gitk {}} \
3045 -font font_ui
3046if {![is_MacOSX]} {
3047 .mbar.repository add command \
3048 -label {Visualize All Branches} \
3049 -command {do_gitk {--all}} \
3050 -font font_ui
3051}
3052.mbar.repository add separator
3053if {!$single_commit} {
3055 .mbar.repository add command -label {Compress Database} \
3056 -command do_gc \
3057 -font font_ui
3058 .mbar.repository add command -label {Verify Database} \
3060 -command do_fsck_objects \
3061 -font font_ui
3062 .mbar.repository add separator
3064 if {[is_Windows]} {
3066 .mbar.repository add command \
3067 -label {Create Desktop Icon} \
3068 -command do_windows_shortcut \
3069 -font font_ui
3070 } elseif {[is_MacOSX]} {
3071 .mbar.repository add command \
3072 -label {Create Desktop Icon} \
3073 -command do_macosx_app \
3074 -font font_ui
3075 }
3076}
3077.mbar.repository add command -label Quit \
3079 -command do_quit \
3080 -accelerator $M1T-Q \
3081 -font font_ui
3082# -- Edit Menu
3084#
3085menu .mbar.edit
3086.mbar.edit add command -label Undo \
3087 -command {catch {[focus] edit undo}} \
3088 -accelerator $M1T-Z \
3089 -font font_ui
3090.mbar.edit add command -label Redo \
3091 -command {catch {[focus] edit redo}} \
3092 -accelerator $M1T-Y \
3093 -font font_ui
3094.mbar.edit add separator
3095.mbar.edit add command -label Cut \
3096 -command {catch {tk_textCut [focus]}} \
3097 -accelerator $M1T-X \
3098 -font font_ui
3099.mbar.edit add command -label Copy \
3100 -command {catch {tk_textCopy [focus]}} \
3101 -accelerator $M1T-C \
3102 -font font_ui
3103.mbar.edit add command -label Paste \
3104 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
3105 -accelerator $M1T-V \
3106 -font font_ui
3107.mbar.edit add command -label Delete \
3108 -command {catch {[focus] delete sel.first sel.last}} \
3109 -accelerator Del \
3110 -font font_ui
3111.mbar.edit add separator
3112.mbar.edit add command -label {Select All} \
3113 -command {catch {[focus] tag add sel 0.0 end}} \
3114 -accelerator $M1T-A \
3115 -font font_ui
3116# -- Branch Menu
3118#
3119if {!$single_commit} {
3120 menu .mbar.branch
3121 .mbar.branch add command -label {Create...} \
3123 -command do_create_branch \
3124 -font font_ui
3125 lappend disable_on_lock [list .mbar.branch entryconf \
3126 [.mbar.branch index last] -state]
3127 .mbar.branch add command -label {Delete...} \
3129 -command do_delete_branch \
3130 -font font_ui
3131 lappend disable_on_lock [list .mbar.branch entryconf \
3132 [.mbar.branch index last] -state]
3133}
3134# -- Commit Menu
3136#
3137menu .mbar.commit
3138.mbar.commit add radiobutton \
3140 -label {New Commit} \
3141 -command do_select_commit_type \
3142 -variable selected_commit_type \
3143 -value new \
3144 -font font_ui
3145lappend disable_on_lock \
3146 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3147.mbar.commit add radiobutton \
3149 -label {Amend Last Commit} \
3150 -command do_select_commit_type \
3151 -variable selected_commit_type \
3152 -value amend \
3153 -font font_ui
3154lappend disable_on_lock \
3155 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3156.mbar.commit add separator
3158.mbar.commit add command -label Rescan \
3160 -command do_rescan \
3161 -accelerator F5 \
3162 -font font_ui
3163lappend disable_on_lock \
3164 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3165.mbar.commit add command -label {Add To Commit} \
3167 -command do_include_selection \
3168 -font font_ui
3169lappend disable_on_lock \
3170 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3171.mbar.commit add command -label {Add All To Commit} \
3173 -command do_include_all \
3174 -accelerator $M1T-I \
3175 -font font_ui
3176lappend disable_on_lock \
3177 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3178.mbar.commit add command -label {Remove From Commit} \
3180 -command do_remove_selection \
3181 -font font_ui
3182lappend disable_on_lock \
3183 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3184.mbar.commit add command -label {Revert Changes} \
3186 -command do_revert_selection \
3187 -font font_ui
3188lappend disable_on_lock \
3189 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3190.mbar.commit add separator
3192.mbar.commit add command -label {Sign Off} \
3194 -command do_signoff \
3195 -accelerator $M1T-S \
3196 -font font_ui
3197.mbar.commit add command -label Commit \
3199 -command do_commit \
3200 -accelerator $M1T-Return \
3201 -font font_ui
3202lappend disable_on_lock \
3203 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3204# -- Transport menus
3206#
3207if {!$single_commit} {
3208 menu .mbar.fetch
3209 menu .mbar.pull
3210 menu .mbar.push
3211}
3212if {[is_MacOSX]} {
3214 # -- Apple Menu (Mac OS X only)
3215 #
3216 .mbar add cascade -label Apple -menu .mbar.apple
3217 menu .mbar.apple
3218 .mbar.apple add command -label "About $appname" \
3220 -command do_about \
3221 -font font_ui
3222 .mbar.apple add command -label "$appname Options..." \
3223 -command do_options \
3224 -font font_ui
3225} else {
3226 # -- Edit Menu
3227 #
3228 .mbar.edit add separator
3229 .mbar.edit add command -label {Options...} \
3230 -command do_options \
3231 -font font_ui
3232 # -- Tools Menu
3234 #
3235 if {[file exists /usr/local/miga/lib/gui-miga]
3236 && [file exists .pvcsrc]} {
3237 proc do_miga {} {
3238 global gitdir ui_status_value
3239 if {![lock_index update]} return
3240 set cmd [list sh --login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
3241 set miga_fd [open "|$cmd" r]
3242 fconfigure $miga_fd -blocking 0
3243 fileevent $miga_fd readable [list miga_done $miga_fd]
3244 set ui_status_value {Running miga...}
3245 }
3246 proc miga_done {fd} {
3247 read $fd 512
3248 if {[eof $fd]} {
3249 close $fd
3250 unlock_index
3251 rescan [list set ui_status_value {Ready.}]
3252 }
3253 }
3254 .mbar add cascade -label Tools -menu .mbar.tools
3255 menu .mbar.tools
3256 .mbar.tools add command -label "Migrate" \
3257 -command do_miga \
3258 -font font_ui
3259 lappend disable_on_lock \
3260 [list .mbar.tools entryconf [.mbar.tools index last] -state]
3261 }
3262 # -- Help Menu
3264 #
3265 .mbar add cascade -label Help -menu .mbar.help
3266 menu .mbar.help
3267 .mbar.help add command -label "About $appname" \
3269 -command do_about \
3270 -font font_ui
3271}
3272# -- Branch Control
3275#
3276frame .branch \
3277 -borderwidth 1 \
3278 -relief sunken
3279label .branch.l1 \
3280 -text {Current Branch:} \
3281 -anchor w \
3282 -justify left \
3283 -font font_ui
3284label .branch.cb \
3285 -textvariable current_branch \
3286 -anchor w \
3287 -justify left \
3288 -font font_ui
3289pack .branch.l1 -side left
3290pack .branch.cb -side left -fill x
3291pack .branch -side top -fill x
3292# -- Main Window Layout
3294#
3295panedwindow .vpane -orient vertical
3296panedwindow .vpane.files -orient horizontal
3297.vpane add .vpane.files -sticky nsew -height 100 -width 400
3298pack .vpane -anchor n -side top -fill both -expand 1
3299# -- Index File List
3301#
3302frame .vpane.files.index -height 100 -width 400
3303label .vpane.files.index.title -text {Modified Files} \
3304 -background green \
3305 -font font_ui
3306text $ui_index -background white -borderwidth 0 \
3307 -width 40 -height 10 \
3308 -font font_ui \
3309 -cursor $cursor_ptr \
3310 -yscrollcommand {.vpane.files.index.sb set} \
3311 -state disabled
3312scrollbar .vpane.files.index.sb -command [list $ui_index yview]
3313pack .vpane.files.index.title -side top -fill x
3314pack .vpane.files.index.sb -side right -fill y
3315pack $ui_index -side left -fill both -expand 1
3316.vpane.files add .vpane.files.index -sticky nsew
3317# -- Other (Add) File List
3319#
3320frame .vpane.files.other -height 100 -width 100
3321label .vpane.files.other.title -text {Untracked Files} \
3322 -background red \
3323 -font font_ui
3324text $ui_other -background white -borderwidth 0 \
3325 -width 40 -height 10 \
3326 -font font_ui \
3327 -cursor $cursor_ptr \
3328 -yscrollcommand {.vpane.files.other.sb set} \
3329 -state disabled
3330scrollbar .vpane.files.other.sb -command [list $ui_other yview]
3331pack .vpane.files.other.title -side top -fill x
3332pack .vpane.files.other.sb -side right -fill y
3333pack $ui_other -side left -fill both -expand 1
3334.vpane.files add .vpane.files.other -sticky nsew
3335foreach i [list $ui_index $ui_other] {
3337 $i tag conf in_diff -font font_uibold
3338 $i tag conf in_sel \
3339 -background [$i cget -foreground] \
3340 -foreground [$i cget -background]
3341}
3342unset i
3343# -- Diff and Commit Area
3345#
3346frame .vpane.lower -height 300 -width 400
3347frame .vpane.lower.commarea
3348frame .vpane.lower.diff -relief sunken -borderwidth 1
3349pack .vpane.lower.commarea -side top -fill x
3350pack .vpane.lower.diff -side bottom -fill both -expand 1
3351.vpane add .vpane.lower -stick nsew
3352# -- Commit Area Buttons
3354#
3355frame .vpane.lower.commarea.buttons
3356label .vpane.lower.commarea.buttons.l -text {} \
3357 -anchor w \
3358 -justify left \
3359 -font font_ui
3360pack .vpane.lower.commarea.buttons.l -side top -fill x
3361pack .vpane.lower.commarea.buttons -side left -fill y
3362button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
3364 -command do_rescan \
3365 -font font_ui
3366pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3367lappend disable_on_lock \
3368 {.vpane.lower.commarea.buttons.rescan conf -state}
3369button .vpane.lower.commarea.buttons.incall -text {Add All} \
3371 -command do_include_all \
3372 -font font_ui
3373pack .vpane.lower.commarea.buttons.incall -side top -fill x
3374lappend disable_on_lock \
3375 {.vpane.lower.commarea.buttons.incall conf -state}
3376button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
3378 -command do_signoff \
3379 -font font_ui
3380pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3381button .vpane.lower.commarea.buttons.commit -text {Commit} \
3383 -command do_commit \
3384 -font font_ui
3385pack .vpane.lower.commarea.buttons.commit -side top -fill x
3386lappend disable_on_lock \
3387 {.vpane.lower.commarea.buttons.commit conf -state}
3388# -- Commit Message Buffer
3390#
3391frame .vpane.lower.commarea.buffer
3392frame .vpane.lower.commarea.buffer.header
3393set ui_comm .vpane.lower.commarea.buffer.t
3394set ui_coml .vpane.lower.commarea.buffer.header.l
3395radiobutton .vpane.lower.commarea.buffer.header.new \
3396 -text {New Commit} \
3397 -command do_select_commit_type \
3398 -variable selected_commit_type \
3399 -value new \
3400 -font font_ui
3401lappend disable_on_lock \
3402 [list .vpane.lower.commarea.buffer.header.new conf -state]
3403radiobutton .vpane.lower.commarea.buffer.header.amend \
3404 -text {Amend Last Commit} \
3405 -command do_select_commit_type \
3406 -variable selected_commit_type \
3407 -value amend \
3408 -font font_ui
3409lappend disable_on_lock \
3410 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3411label $ui_coml \
3412 -anchor w \
3413 -justify left \
3414 -font font_ui
3415proc trace_commit_type {varname args} {
3416 global ui_coml commit_type
3417 switch -glob -- $commit_type {
3418 initial {set txt {Initial Commit Message:}}
3419 amend {set txt {Amended Commit Message:}}
3420 amend-initial {set txt {Amended Initial Commit Message:}}
3421 amend-merge {set txt {Amended Merge Commit Message:}}
3422 merge {set txt {Merge Commit Message:}}
3423 * {set txt {Commit Message:}}
3424 }
3425 $ui_coml conf -text $txt
3426}
3427trace add variable commit_type write trace_commit_type
3428pack $ui_coml -side left -fill x
3429pack .vpane.lower.commarea.buffer.header.amend -side right
3430pack .vpane.lower.commarea.buffer.header.new -side right
3431text $ui_comm -background white -borderwidth 1 \
3433 -undo true \
3434 -maxundo 20 \
3435 -autoseparators true \
3436 -relief sunken \
3437 -width 75 -height 9 -wrap none \
3438 -font font_diff \
3439 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3440scrollbar .vpane.lower.commarea.buffer.sby \
3441 -command [list $ui_comm yview]
3442pack .vpane.lower.commarea.buffer.header -side top -fill x
3443pack .vpane.lower.commarea.buffer.sby -side right -fill y
3444pack $ui_comm -side left -fill y
3445pack .vpane.lower.commarea.buffer -side left -fill y
3446# -- Commit Message Buffer Context Menu
3448#
3449set ctxm .vpane.lower.commarea.buffer.ctxm
3450menu $ctxm -tearoff 0
3451$ctxm add command \
3452 -label {Cut} \
3453 -font font_ui \
3454 -command {tk_textCut $ui_comm}
3455$ctxm add command \
3456 -label {Copy} \
3457 -font font_ui \
3458 -command {tk_textCopy $ui_comm}
3459$ctxm add command \
3460 -label {Paste} \
3461 -font font_ui \
3462 -command {tk_textPaste $ui_comm}
3463$ctxm add command \
3464 -label {Delete} \
3465 -font font_ui \
3466 -command {$ui_comm delete sel.first sel.last}
3467$ctxm add separator
3468$ctxm add command \
3469 -label {Select All} \
3470 -font font_ui \
3471 -command {$ui_comm tag add sel 0.0 end}
3472$ctxm add command \
3473 -label {Copy All} \
3474 -font font_ui \
3475 -command {
3476 $ui_comm tag add sel 0.0 end
3477 tk_textCopy $ui_comm
3478 $ui_comm tag remove sel 0.0 end
3479 }
3480$ctxm add separator
3481$ctxm add command \
3482 -label {Sign Off} \
3483 -font font_ui \
3484 -command do_signoff
3485bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
3486# -- Diff Header
3488#
3489set current_diff {}
3490set diff_actions [list]
3491proc trace_current_diff {varname args} {
3492 global current_diff diff_actions file_states
3493 if {$current_diff eq {}} {
3494 set s {}
3495 set f {}
3496 set p {}
3497 set o disabled
3498 } else {
3499 set p $current_diff
3500 set s [mapdesc [lindex $file_states($p) 0] $p]
3501 set f {File:}
3502 set p [escape_path $p]
3503 set o normal
3504 }
3505 .vpane.lower.diff.header.status configure -text $s
3507 .vpane.lower.diff.header.file configure -text $f
3508 .vpane.lower.diff.header.path configure -text $p
3509 foreach w $diff_actions {
3510 uplevel #0 $w $o
3511 }
3512}
3513trace add variable current_diff write trace_current_diff
3514frame .vpane.lower.diff.header -background orange
3516label .vpane.lower.diff.header.status \
3517 -background orange \
3518 -width $max_status_desc \
3519 -anchor w \
3520 -justify left \
3521 -font font_ui
3522label .vpane.lower.diff.header.file \
3523 -background orange \
3524 -anchor w \
3525 -justify left \
3526 -font font_ui
3527label .vpane.lower.diff.header.path \
3528 -background orange \
3529 -anchor w \
3530 -justify left \
3531 -font font_ui
3532pack .vpane.lower.diff.header.status -side left
3533pack .vpane.lower.diff.header.file -side left
3534pack .vpane.lower.diff.header.path -fill x
3535set ctxm .vpane.lower.diff.header.ctxm
3536menu $ctxm -tearoff 0
3537$ctxm add command \
3538 -label {Copy} \
3539 -font font_ui \
3540 -command {
3541 clipboard clear
3542 clipboard append \
3543 -format STRING \
3544 -type STRING \
3545 -- $current_diff
3546 }
3547lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3548bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3549# -- Diff Body
3551#
3552frame .vpane.lower.diff.body
3553set ui_diff .vpane.lower.diff.body.t
3554text $ui_diff -background white -borderwidth 0 \
3555 -width 80 -height 15 -wrap none \
3556 -font font_diff \
3557 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3558 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3559 -state disabled
3560scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3561 -command [list $ui_diff xview]
3562scrollbar .vpane.lower.diff.body.sby -orient vertical \
3563 -command [list $ui_diff yview]
3564pack .vpane.lower.diff.body.sbx -side bottom -fill x
3565pack .vpane.lower.diff.body.sby -side right -fill y
3566pack $ui_diff -side left -fill both -expand 1
3567pack .vpane.lower.diff.header -side top -fill x
3568pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3569$ui_diff tag conf d_@ -font font_diffbold
3571$ui_diff tag conf d_+ -foreground blue
3572$ui_diff tag conf d_- -foreground red
3573$ui_diff tag conf d_++ -foreground {#00a000}
3574$ui_diff tag conf d_-- -foreground {#a000a0}
3575$ui_diff tag conf d_+- \
3576 -foreground red \
3577 -background {light goldenrod yellow}
3578$ui_diff tag conf d_-+ \
3579 -foreground blue \
3580 -background azure2
3581# -- Diff Body Context Menu
3583#
3584set ctxm .vpane.lower.diff.body.ctxm
3585menu $ctxm -tearoff 0
3586$ctxm add command \
3587 -label {Copy} \
3588 -font font_ui \
3589 -command {tk_textCopy $ui_diff}
3590lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3591$ctxm add command \
3592 -label {Select All} \
3593 -font font_ui \
3594 -command {$ui_diff tag add sel 0.0 end}
3595lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3596$ctxm add command \
3597 -label {Copy All} \
3598 -font font_ui \
3599 -command {
3600 $ui_diff tag add sel 0.0 end
3601 tk_textCopy $ui_diff
3602 $ui_diff tag remove sel 0.0 end
3603 }
3604lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3605$ctxm add separator
3606$ctxm add command \
3607 -label {Decrease Font Size} \
3608 -font font_ui \
3609 -command {incr_font_size font_diff -1}
3610lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3611$ctxm add command \
3612 -label {Increase Font Size} \
3613 -font font_ui \
3614 -command {incr_font_size font_diff 1}
3615lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3616$ctxm add separator
3617$ctxm add command \
3618 -label {Show Less Context} \
3619 -font font_ui \
3620 -command {if {$repo_config(gui.diffcontext) >= 2} {
3621 incr repo_config(gui.diffcontext) -1
3622 reshow_diff
3623 }}
3624lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3625$ctxm add command \
3626 -label {Show More Context} \
3627 -font font_ui \
3628 -command {
3629 incr repo_config(gui.diffcontext)
3630 reshow_diff
3631 }
3632lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3633$ctxm add separator
3634$ctxm add command -label {Options...} \
3635 -font font_ui \
3636 -command do_options
3637bind_button3 $ui_diff "tk_popup $ctxm %X %Y"
3638# -- Status Bar
3640#
3641set ui_status_value {Initializing...}
3642label .status -textvariable ui_status_value \
3643 -anchor w \
3644 -justify left \
3645 -borderwidth 1 \
3646 -relief sunken \
3647 -font font_ui
3648pack .status -anchor w -side bottom -fill x
3649# -- Load geometry
3651#
3652catch {
3653set gm $repo_config(gui.geometry)
3654wm geometry . [lindex $gm 0]
3655.vpane sash place 0 \
3656 [lindex [.vpane sash coord 0] 0] \
3657 [lindex $gm 1]
3658.vpane.files sash place 0 \
3659 [lindex $gm 2] \
3660 [lindex [.vpane.files sash coord 0] 1]
3661unset gm
3662}
3663# -- Key Bindings
3665#
3666bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3667bind $ui_comm <$M1B-Key-i> {do_include_all;break}
3668bind $ui_comm <$M1B-Key-I> {do_include_all;break}
3669bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3670bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3671bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3672bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3673bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3674bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3675bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3676bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3677bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3679bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3680bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3681bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3682bind $ui_diff <$M1B-Key-v> {break}
3683bind $ui_diff <$M1B-Key-V> {break}
3684bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3685bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3686bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3687bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3688bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3689bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3690bind . <Destroy> do_quit
3692bind all <Key-F5> do_rescan
3693bind all <$M1B-Key-r> do_rescan
3694bind all <$M1B-Key-R> do_rescan
3695bind . <$M1B-Key-s> do_signoff
3696bind . <$M1B-Key-S> do_signoff
3697bind . <$M1B-Key-i> do_include_all
3698bind . <$M1B-Key-I> do_include_all
3699bind . <$M1B-Key-Return> do_commit
3700bind all <$M1B-Key-q> do_quit
3701bind all <$M1B-Key-Q> do_quit
3702bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
3703bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
3704foreach i [list $ui_index $ui_other] {
3705 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
3706 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3707 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
3708}
3709unset i
3710set file_lists($ui_index) [list]
3712set file_lists($ui_other) [list]
3713set HEAD {}
3715set PARENT {}
3716set MERGE_HEAD [list]
3717set commit_type {}
3718set empty_tree {}
3719set current_branch {}
3720set current_diff {}
3721set selected_commit_type new
3722wm title . "$appname ([file normalize [file dirname $gitdir]])"
3724focus -force $ui_comm
3725# -- Warn the user about environmental problems. Cygwin's Tcl
3727# does *not* pass its env array onto any processes it spawns.
3728# This means that git processes get none of our environment.
3729#
3730if {[is_Windows]} {
3731 set ignored_env 0
3732 set suggest_user {}
3733 set msg "Possible environment issues exist.
3734The following environment variables are probably
3736going to be ignored by any Git subprocess run
3737by $appname:
3738"
3740 foreach name [array names env] {
3741 switch -regexp -- $name {
3742 {^GIT_INDEX_FILE$} -
3743 {^GIT_OBJECT_DIRECTORY$} -
3744 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3745 {^GIT_DIFF_OPTS$} -
3746 {^GIT_EXTERNAL_DIFF$} -
3747 {^GIT_PAGER$} -
3748 {^GIT_TRACE$} -
3749 {^GIT_CONFIG$} -
3750 {^GIT_CONFIG_LOCAL$} -
3751 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3752 append msg " - $name\n"
3753 incr ignored_env
3754 }
3755 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3756 append msg " - $name\n"
3757 incr ignored_env
3758 set suggest_user $name
3759 }
3760 }
3761 }
3762 if {$ignored_env > 0} {
3763 append msg "
3764This is due to a known issue with the
3765Tcl binary distributed by Cygwin."
3766 if {$suggest_user ne {}} {
3768 append msg "
3769A good replacement for $suggest_user
3771is placing values for the user.name and
3772user.email settings into your personal
3773~/.gitconfig file.
3774"
3775 }
3776 warn_popup $msg
3777 }
3778 unset ignored_env msg suggest_user name
3779}
3780# -- Only initialize complex UI if we are going to stay running.
3782#
3783if {!$single_commit} {
3784 load_all_remotes
3785 load_all_heads
3786 populate_branch_menu .mbar.branch
3788 populate_fetch_menu .mbar.fetch
3789 populate_pull_menu .mbar.pull
3790 populate_push_menu .mbar.push
3791}
3792lock_index begin-read
3794after 1 do_rescan