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