1#!/bin/sh
2# Tcl ignores the next line -*- tcl -*- \
3exec wish "$0" -- "$@"
4set appvers {@@GIT_VERSION@@}
6set copyright {
7Copyright © 2006, 2007 Shawn Pearce, Paul Mackerras.
8This program is free software; you can redistribute it and/or modify
10it under the terms of the GNU General Public License as published by
11the Free Software Foundation; either version 2 of the License, or
12(at your option) any later version.
13This program is distributed in the hope that it will be useful,
15but WITHOUT ANY WARRANTY; without even the implied warranty of
16MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17GNU General Public License for more details.
18You should have received a copy of the GNU General Public License
20along with this program; if not, write to the Free Software
21Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA}
22######################################################################
24##
25## read only globals
26set _appname [lindex [file split $argv0] end]
28set _gitdir {}
29set _reponame {}
30proc appname {} {
32 global _appname
33 return $_appname
34}
35proc gitdir {args} {
37 global _gitdir
38 if {$args eq {}} {
39 return $_gitdir
40 }
41 return [eval [concat [list file join $_gitdir] $args]]
42}
43proc reponame {} {
45 global _reponame
46 return $_reponame
47}
48######################################################################
50##
51## config
52proc is_many_config {name} {
54 switch -glob -- $name {
55 remote.*.fetch -
56 remote.*.push
57 {return 1}
58 *
59 {return 0}
60 }
61}
62proc load_config {include_global} {
64 global repo_config global_config default_config
65 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 }
82 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 }
97 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}
107proc save_config {} {
109 global default_config font_descs
110 global repo_config global_config
111 global repo_config_new global_config_new
112 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 }
126 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 }
143 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}
157proc 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}
173proc 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}
189proc 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}
202proc 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}
215######################################################################
217##
218## repository setup
219if { [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}
226if {![file isdirectory $_gitdir]} {
227 catch {wm withdraw .}
228 error_popup "Git directory not found:\n\n$_gitdir"
229 exit 1
230}
231if {[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}
236if {[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}
241set _reponame [lindex [file split \
242 [file normalize [file dirname $_gitdir]]] \
243 end]
244set single_commit 0
246if {[appname] eq {git-citool}} {
247 set single_commit 1
248}
249######################################################################
251##
252## task management
253set rescan_active 0
255set diff_active 0
256set last_clicked {}
257set disable_on_lock [list]
259set index_lock_type none
260proc lock_index {type} {
262 global index_lock_type disable_on_lock
263 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}
276proc unlock_index {} {
278 global index_lock_type disable_on_lock
279 set index_lock_type none
281 foreach w $disable_on_lock {
282 uplevel #0 $w normal
283 }
284}
285######################################################################
287##
288## status
289proc repository_state {ctvar hdvar mhvar} {
291 global current_branch
292 upvar $ctvar ct $hdvar hd $mhvar mh
293 set mh [list]
295 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 }
304 if {[catch {set hd [exec git rev-parse --verify HEAD]}]} {
306 set hd {}
307 set ct initial
308 return
309 }
310 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 }
321 set ct normal
323}
324proc PARENT {} {
326 global PARENT empty_tree
327 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}
337proc rescan {after {honor_trustmtime 1}} {
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
343 if {$rescan_active > 0 || ![lock_index read]} return
345 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 }
356 array unset file_states
358 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 }
368 if {$honor_trustmtime && $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}
385proc rescan_stage2 {fd after} {
387 global ui_status_value
388 global rescan_active buf_rdi buf_rdf buf_rlo
389 if {$fd ne {}} {
391 read $fd
392 if {![eof $fd]} return
393 close $fd
394 }
395 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 }
402 set buf_rdi {}
404 set buf_rdf {}
405 set buf_rlo {}
406 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]
412 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}
420proc load_message {file} {
422 global ui_comm
423 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}
437proc read_diff_index {fd after} {
439 global buf_rdi
440 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
450 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 }
466 rescan_done $fd buf_rdi $after
468}
469proc read_diff_files {fd after} {
471 global buf_rdf
472 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
482 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 }
498 rescan_done $fd buf_rdf $after
500}
501proc read_ls_others {fd after} {
503 global buf_rlo
504 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}
513proc rescan_done {fd buf after} {
515 global rescan_active
516 global file_states repo_config
517 upvar $buf to_clear
518 if {![eof $fd]} return
520 set to_clear {}
521 close $fd
522 if {[incr rescan_active -1] > 0} return
523 prune_selection
525 unlock_index
526 display_all_files
527 reshow_diff
528 uplevel #0 $after
529}
530proc prune_selection {} {
532 global file_states selected_paths
533 foreach path [array names selected_paths] {
535 if {[catch {set still_here $file_states($path)}]} {
536 unset selected_paths($path)
537 }
538 }
539}
540######################################################################
542##
543## diff
544proc clear_diff {} {
546 global ui_diff current_diff_path ui_index ui_workdir
547 $ui_diff conf -state normal
549 $ui_diff delete 0.0 end
550 $ui_diff conf -state disabled
551 set current_diff_path {}
553 $ui_index tag remove in_diff 0.0 end
555 $ui_workdir tag remove in_diff 0.0 end
556}
557proc reshow_diff {} {
559 global ui_status_value file_states file_lists
560 global current_diff_path current_diff_side
561 set p $current_diff_path
563 if {$p eq {}
564 || $current_diff_side eq {}
565 || [catch {set s $file_states($p)}]
566 || [lsearch -sorted $file_lists($current_diff_side) $p] == -1} {
567 clear_diff
568 } else {
569 show_diff $p $current_diff_side
570 }
571}
572proc handle_empty_diff {} {
574 global current_diff_path file_states file_lists
575 set path $current_diff_path
577 set s $file_states($path)
578 if {[lindex $s 0] ne {_M}} return
579 info_popup "No differences detected.
581[short_path $path] has no changes.
583The modification date of this file was updated
585by another application and you currently have
586the Trust File Modification Timestamps option
587enabled, so Git did not automatically detect
588that there are no content differences in this
589file."
590 clear_diff
592 display_file $path __
593 rescan {set ui_status_value {Ready.}} 0
594}
595proc show_diff {path w {lno {}}} {
597 global file_states file_lists
598 global is_3way_diff diff_active repo_config
599 global ui_diff ui_status_value ui_index ui_workdir
600 global current_diff_path current_diff_side
601 if {$diff_active || ![lock_index read]} return
603 clear_diff
605 if {$w eq {} || $lno == {}} {
606 foreach w [array names file_lists] {
607 set lno [lsearch -sorted $file_lists($w) $path]
608 if {$lno >= 0} {
609 incr lno
610 break
611 }
612 }
613 }
614 if {$w ne {} && $lno >= 1} {
615 $w tag add in_diff $lno.0 [expr {$lno + 1}].0
616 }
617 set s $file_states($path)
619 set m [lindex $s 0]
620 set is_3way_diff 0
621 set diff_active 1
622 set current_diff_path $path
623 set current_diff_side $w
624 set ui_status_value "Loading diff of [escape_path $path]..."
625 # - Git won't give us the diff, there's nothing to compare to!
627 #
628 if {$m eq {_O}} {
629 if {[catch {
630 set fd [open $path r]
631 set content [read $fd]
632 close $fd
633 } err ]} {
634 set diff_active 0
635 unlock_index
636 set ui_status_value "Unable to display [escape_path $path]"
637 error_popup "Error loading file:\n\n$err"
638 return
639 }
640 $ui_diff conf -state normal
641 $ui_diff insert end $content
642 $ui_diff conf -state disabled
643 set diff_active 0
644 unlock_index
645 set ui_status_value {Ready.}
646 return
647 }
648 set cmd [list | git]
650 if {$w eq $ui_index} {
651 lappend cmd diff-index
652 lappend cmd --cached
653 } elseif {$w eq $ui_workdir} {
654 if {[string index $m 0] eq {U}} {
655 lappend cmd diff
656 } else {
657 lappend cmd diff-files
658 }
659 }
660 lappend cmd -p
662 lappend cmd --no-color
663 if {$repo_config(gui.diffcontext) > 0} {
664 lappend cmd "-U$repo_config(gui.diffcontext)"
665 }
666 if {$w eq $ui_index} {
667 lappend cmd [PARENT]
668 }
669 lappend cmd --
670 lappend cmd $path
671 if {[catch {set fd [open $cmd r]} err]} {
673 set diff_active 0
674 unlock_index
675 set ui_status_value "Unable to display [escape_path $path]"
676 error_popup "Error loading diff:\n\n$err"
677 return
678 }
679 fconfigure $fd -blocking 0 -translation auto
681 fileevent $fd readable [list read_diff $fd]
682}
683proc read_diff {fd} {
685 global ui_diff ui_status_value is_3way_diff diff_active
686 global repo_config
687 $ui_diff conf -state normal
689 while {[gets $fd line] >= 0} {
690 # -- Cleanup uninteresting diff header lines.
691 #
692 if {[string match {diff --git *} $line]} continue
693 if {[string match {diff --cc *} $line]} continue
694 if {[string match {diff --combined *} $line]} continue
695 if {[string match {--- *} $line]} continue
696 if {[string match {+++ *} $line]} continue
697 if {$line eq {deleted file mode 120000}} {
698 set line "deleted symlink"
699 }
700 # -- Automatically detect if this is a 3 way diff.
702 #
703 if {[string match {@@@ *} $line]} {set is_3way_diff 1}
704 if {[string match {index *} $line]
706 || [string match {mode *} $line]
707 || [regexp {^\* Unmerged path } $line]} {
708 set tags {}
709 } elseif {$is_3way_diff} {
710 set op [string range $line 0 1]
711 switch -- $op {
712 { } {set tags {}}
713 {@@} {set tags d_@}
714 { +} {set tags d_s+}
715 { -} {set tags d_s-}
716 {+ } {set tags d_+s}
717 {- } {set tags d_-s}
718 {--} {set tags d_--}
719 {++} {
720 if {[regexp {^\+\+([<>]{7} |={7})} $line _g op]} {
721 set line [string replace $line 0 1 { }]
722 set tags d$op
723 } else {
724 set tags d_++
725 }
726 }
727 default {
728 puts "error: Unhandled 3 way diff marker: {$op}"
729 set tags {}
730 }
731 }
732 } else {
733 set op [string index $line 0]
734 switch -- $op {
735 { } {set tags {}}
736 {@} {set tags d_@}
737 {-} {set tags d_-}
738 {+} {
739 if {[regexp {^\+([<>]{7} |={7})} $line _g op]} {
740 set line [string replace $line 0 0 { }]
741 set tags d$op
742 } else {
743 set tags d_+
744 }
745 }
746 default {
747 puts "error: Unhandled 2 way diff marker: {$op}"
748 set tags {}
749 }
750 }
751 }
752 $ui_diff insert end $line $tags
753 $ui_diff insert end "\n" $tags
754 }
755 $ui_diff conf -state disabled
756 if {[eof $fd]} {
758 close $fd
759 set diff_active 0
760 unlock_index
761 set ui_status_value {Ready.}
762 if {$repo_config(gui.trustmtime) eq {true}
764 && [$ui_diff index end] eq {2.0}} {
765 handle_empty_diff
766 }
767 }
768}
769######################################################################
771##
772## commit
773proc load_last_commit {} {
775 global HEAD PARENT MERGE_HEAD commit_type ui_comm
776 if {[llength $PARENT] == 0} {
778 error_popup {There is nothing to amend.
779You are about to create the initial commit.
781There is no commit before this to amend.
782}
783 return
784 }
785 repository_state curType curHEAD curMERGE_HEAD
787 if {$curType eq {merge}} {
788 error_popup {Cannot amend while merging.
789You are currently in the middle of a merge that
791has not been fully completed. You cannot amend
792the prior commit unless you first abort the
793current merge activity.
794}
795 return
796 }
797 set msg {}
799 set parents [list]
800 if {[catch {
801 set fd [open "| git cat-file commit $curHEAD" r]
802 while {[gets $fd line] > 0} {
803 if {[string match {parent *} $line]} {
804 lappend parents [string range $line 7 end]
805 }
806 }
807 set msg [string trim [read $fd]]
808 close $fd
809 } err]} {
810 error_popup "Error loading commit data for amend:\n\n$err"
811 return
812 }
813 set HEAD $curHEAD
815 set PARENT $parents
816 set MERGE_HEAD [list]
817 switch -- [llength $parents] {
818 0 {set commit_type amend-initial}
819 1 {set commit_type amend}
820 default {set commit_type amend-merge}
821 }
822 $ui_comm delete 0.0 end
824 $ui_comm insert end $msg
825 $ui_comm edit reset
826 $ui_comm edit modified false
827 rescan {set ui_status_value {Ready.}}
828}
829proc create_new_commit {} {
831 global commit_type ui_comm
832 set commit_type normal
834 $ui_comm delete 0.0 end
835 $ui_comm edit reset
836 $ui_comm edit modified false
837 rescan {set ui_status_value {Ready.}}
838}
839set GIT_COMMITTER_IDENT {}
841proc committer_ident {} {
843 global GIT_COMMITTER_IDENT
844 if {$GIT_COMMITTER_IDENT eq {}} {
846 if {[catch {set me [exec git var GIT_COMMITTER_IDENT]} err]} {
847 error_popup "Unable to obtain your identity:\n\n$err"
848 return {}
849 }
850 if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \
851 $me me GIT_COMMITTER_IDENT]} {
852 error_popup "Invalid GIT_COMMITTER_IDENT:\n\n$me"
853 return {}
854 }
855 }
856 return $GIT_COMMITTER_IDENT
858}
859proc commit_tree {} {
861 global HEAD commit_type file_states ui_comm repo_config
862 global ui_status_value pch_error
863 if {![lock_index update]} return
865 if {[committer_ident] eq {}} return
866 # -- Our in memory state should match the repository.
868 #
869 repository_state curType curHEAD curMERGE_HEAD
870 if {[string match amend* $commit_type]
871 && $curType eq {normal}
872 && $curHEAD eq $HEAD} {
873 } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
874 info_popup {Last scanned state does not match repository state.
875Another Git program has modified this repository
877since the last scan. A rescan must be performed
878before another commit can be created.
879The rescan will be automatically started now.
881}
882 unlock_index
883 rescan {set ui_status_value {Ready.}}
884 return
885 }
886 # -- At least one file should differ in the index.
888 #
889 set files_ready 0
890 foreach path [array names file_states] {
891 switch -glob -- [lindex $file_states($path) 0] {
892 _? {continue}
893 A? -
894 D? -
895 M? {set files_ready 1}
896 U? {
897 error_popup "Unmerged files cannot be committed.
898File [short_path $path] has merge conflicts.
900You must resolve them and add the file before committing.
901"
902 unlock_index
903 return
904 }
905 default {
906 error_popup "Unknown file state [lindex $s 0] detected.
907File [short_path $path] cannot be committed by this program.
909"
910 }
911 }
912 }
913 if {!$files_ready} {
914 info_popup {No changes to commit.
915You must add at least 1 file before you can commit.
917}
918 unlock_index
919 return
920 }
921 # -- A message is required.
923 #
924 set msg [string trim [$ui_comm get 1.0 end]]
925 if {$msg eq {}} {
926 error_popup {Please supply a commit message.
927A good commit message has the following format:
929- First line: Describe in one sentance what you did.
931- Second line: Blank
932- Remaining lines: Describe why this change is good.
933}
934 unlock_index
935 return
936 }
937 # -- Run the pre-commit hook.
939 #
940 set pchook [gitdir hooks pre-commit]
941 # On Cygwin [file executable] might lie so we need to ask
943 # the shell if the hook is executable. Yes that's annoying.
944 #
945 if {[is_Windows] && [file isfile $pchook]} {
946 set pchook [list sh -c [concat \
947 "if test -x \"$pchook\";" \
948 "then exec \"$pchook\" 2>&1;" \
949 "fi"]]
950 } elseif {[file executable $pchook]} {
951 set pchook [list $pchook |& cat]
952 } else {
953 commit_writetree $curHEAD $msg
954 return
955 }
956 set ui_status_value {Calling pre-commit hook...}
958 set pch_error {}
959 set fd_ph [open "| $pchook" r]
960 fconfigure $fd_ph -blocking 0 -translation binary
961 fileevent $fd_ph readable \
962 [list commit_prehook_wait $fd_ph $curHEAD $msg]
963}
964proc commit_prehook_wait {fd_ph curHEAD msg} {
966 global pch_error ui_status_value
967 append pch_error [read $fd_ph]
969 fconfigure $fd_ph -blocking 1
970 if {[eof $fd_ph]} {
971 if {[catch {close $fd_ph}]} {
972 set ui_status_value {Commit declined by pre-commit hook.}
973 hook_failed_popup pre-commit $pch_error
974 unlock_index
975 } else {
976 commit_writetree $curHEAD $msg
977 }
978 set pch_error {}
979 return
980 }
981 fconfigure $fd_ph -blocking 0
982}
983proc commit_writetree {curHEAD msg} {
985 global ui_status_value
986 set ui_status_value {Committing changes...}
988 set fd_wt [open "| git write-tree" r]
989 fileevent $fd_wt readable \
990 [list commit_committree $fd_wt $curHEAD $msg]
991}
992proc commit_committree {fd_wt curHEAD msg} {
994 global HEAD PARENT MERGE_HEAD commit_type
995 global single_commit all_heads current_branch
996 global ui_status_value ui_comm selected_commit_type
997 global file_states selected_paths rescan_active
998 gets $fd_wt tree_id
1000 if {$tree_id eq {} || [catch {close $fd_wt} err]} {
1001 error_popup "write-tree failed:\n\n$err"
1002 set ui_status_value {Commit failed.}
1003 unlock_index
1004 return
1005 }
1006 # -- Create the commit.
1008 #
1009 set cmd [list git commit-tree $tree_id]
1010 set parents [concat $PARENT $MERGE_HEAD]
1011 if {[llength $parents] > 0} {
1012 foreach p $parents {
1013 lappend cmd -p $p
1014 }
1015 } else {
1016 # git commit-tree writes to stderr during initial commit.
1017 lappend cmd 2>/dev/null
1018 }
1019 lappend cmd << $msg
1020 if {[catch {set cmt_id [eval exec $cmd]} err]} {
1021 error_popup "commit-tree failed:\n\n$err"
1022 set ui_status_value {Commit failed.}
1023 unlock_index
1024 return
1025 }
1026 # -- Update the HEAD ref.
1028 #
1029 set reflogm commit
1030 if {$commit_type ne {normal}} {
1031 append reflogm " ($commit_type)"
1032 }
1033 set i [string first "\n" $msg]
1034 if {$i >= 0} {
1035 append reflogm {: } [string range $msg 0 [expr {$i - 1}]]
1036 } else {
1037 append reflogm {: } $msg
1038 }
1039 set cmd [list git update-ref -m $reflogm HEAD $cmt_id $curHEAD]
1040 if {[catch {eval exec $cmd} err]} {
1041 error_popup "update-ref failed:\n\n$err"
1042 set ui_status_value {Commit failed.}
1043 unlock_index
1044 return
1045 }
1046 # -- Make sure our current branch exists.
1048 #
1049 if {$commit_type eq {initial}} {
1050 lappend all_heads $current_branch
1051 set all_heads [lsort -unique $all_heads]
1052 populate_branch_menu
1053 }
1054 # -- 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]}
1061 # -- Let rerere do its thing.
1063 #
1064 if {[file isdirectory [gitdir rr-cache]]} {
1065 catch {exec git rerere}
1066 }
1067 # -- 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 }
1082 $ui_comm delete 0.0 end
1084 $ui_comm edit reset
1085 $ui_comm edit modified false
1086 if {$single_commit} do_quit
1088 # -- 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]
1096 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 }
1126 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}
1133######################################################################
1135##
1136## fetch pull push
1137proc 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}
1145proc pull_remote {remote branch} {
1147 global HEAD commit_type file_states repo_config
1148 if {![lock_index update]} return
1150 # -- 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.
1156Another Git program has modified this repository
1158since the last scan. A rescan must be performed
1159before a pull operation can be started.
1160The rescan will be automatically started now.
1162}
1163 unlock_index
1164 rescan {set ui_status_value {Ready.}}
1165 return
1166 }
1167 # -- No differences should exist before a pull.
1169 #
1170 if {[array size file_states] != 0} {
1171 error_popup {Uncommitted but modified files are present.
1172You should not perform a pull with unmodified
1174files in your working directory as Git will be
1175unable to recover from an incorrect merge.
1176You should commit or revert all changes before
1178starting a pull operation.
1179}
1180 unlock_index
1181 return
1182 }
1183 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}
1194proc post_pull_remote {remote branch success} {
1196 global HEAD PARENT MERGE_HEAD commit_type selected_commit_type
1197 global ui_status_value
1198 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}
1210proc 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}
1218######################################################################
1220##
1221## ui helpers
1222proc mapicon {w state path} {
1224 global all_icons
1225 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}
1232proc mapdesc {state path} {
1234 global all_descs
1235 if {[catch {set r $all_descs($state)}]} {
1237 puts "error: no desc for state={$state} $path"
1238 return $state
1239 }
1240 return $r
1241}
1242proc escape_path {path} {
1244 regsub -all "\n" $path "\\n" path
1245 return $path
1246}
1247proc short_path {path} {
1249 return [escape_path [lindex [file split $path] end]]
1250}
1251set next_icon_id 0
1253set null_sha1 [string repeat 0 40]
1254proc merge_state {path new_state {head_info {}} {index_info {}}} {
1256 global file_states next_icon_id null_sha1
1257 set s0 [string index $new_state 0]
1259 set s1 [string index $new_state 1]
1260 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 }
1270 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1272 elseif {$s0 eq {_}} {set s0 _}
1273 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1275 elseif {$s1 eq {_}} {set s1 _}
1276 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 }
1283 set file_states($path) [list $s0$s1 $icon \
1285 $head_info $index_info \
1286 ]
1287 return $state
1288}
1289proc display_file_helper {w path icon_name old_m new_m} {
1291 global file_lists
1292 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}
1320proc display_file {path state} {
1322 global file_states selected_paths
1323 global ui_index ui_workdir
1324 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]
1329 set o [string index $old_m 0]
1331 set n [string index $new_m 0]
1332 if {$o eq {U}} {
1333 set o _
1334 }
1335 if {$n eq {U}} {
1336 set n _
1337 }
1338 display_file_helper $ui_index $path $icon_name $o $n
1339 if {[string index $old_m 0] eq {U}} {
1341 set o U
1342 } else {
1343 set o [string index $old_m 1]
1344 }
1345 if {[string index $new_m 0] eq {U}} {
1346 set n U
1347 } else {
1348 set n [string index $new_m 1]
1349 }
1350 display_file_helper $ui_workdir $path $icon_name $o $n
1351 if {$new_m eq {__}} {
1353 unset file_states($path)
1354 catch {unset selected_paths($path)}
1355 }
1356}
1357proc display_all_files_helper {w path icon_name m} {
1359 global file_lists
1360 lappend file_lists($w) $path
1362 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1363 $w image create end \
1364 -align center -padx 5 -pady 1 \
1365 -name $icon_name \
1366 -image [mapicon $w $m $path]
1367 $w insert end "[escape_path $path]\n"
1368}
1369proc display_all_files {} {
1371 global ui_index ui_workdir
1372 global file_states file_lists
1373 global last_clicked
1374 $ui_index conf -state normal
1376 $ui_workdir conf -state normal
1377 $ui_index delete 0.0 end
1379 $ui_workdir delete 0.0 end
1380 set last_clicked {}
1381 set file_lists($ui_index) [list]
1383 set file_lists($ui_workdir) [list]
1384 foreach path [lsort [array names file_states]] {
1386 set s $file_states($path)
1387 set m [lindex $s 0]
1388 set icon_name [lindex $s 1]
1389 set s [string index $m 0]
1391 if {$s ne {U} && $s ne {_}} {
1392 display_all_files_helper $ui_index $path \
1393 $icon_name $s
1394 }
1395 if {[string index $m 0] eq {U}} {
1397 set s U
1398 } else {
1399 set s [string index $m 1]
1400 }
1401 if {$s ne {_}} {
1402 display_all_files_helper $ui_workdir $path \
1403 $icon_name $s
1404 }
1405 }
1406 $ui_index conf -state disabled
1408 $ui_workdir conf -state disabled
1409}
1410proc update_indexinfo {msg pathList after} {
1412 global update_index_cp ui_status_value
1413 if {![lock_index update]} return
1415 set update_index_cp 0
1417 set pathList [lsort $pathList]
1418 set totalCnt [llength $pathList]
1419 set batch [expr {int($totalCnt * .01) + 1}]
1420 if {$batch > 25} {set batch 25}
1421 set ui_status_value [format \
1423 "$msg... %i/%i files (%.2f%%)" \
1424 $update_index_cp \
1425 $totalCnt \
1426 0.0]
1427 set fd [open "| git update-index -z --index-info" w]
1428 fconfigure $fd \
1429 -blocking 0 \
1430 -buffering full \
1431 -buffersize 512 \
1432 -translation binary
1433 fileevent $fd writable [list \
1434 write_update_indexinfo \
1435 $fd \
1436 $pathList \
1437 $totalCnt \
1438 $batch \
1439 $msg \
1440 $after \
1441 ]
1442}
1443proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
1445 global update_index_cp ui_status_value
1446 global file_states current_diff_path
1447 if {$update_index_cp >= $totalCnt} {
1449 close $fd
1450 unlock_index
1451 uplevel #0 $after
1452 return
1453 }
1454 for {set i $batch} \
1456 {$update_index_cp < $totalCnt && $i > 0} \
1457 {incr i -1} {
1458 set path [lindex $pathList $update_index_cp]
1459 incr update_index_cp
1460 set s $file_states($path)
1462 switch -glob -- [lindex $s 0] {
1463 A? {set new _O}
1464 M? {set new _M}
1465 D_ {set new _D}
1466 D? {set new _?}
1467 ?? {continue}
1468 }
1469 set info [lindex $s 2]
1470 if {$info eq {}} continue
1471 puts -nonewline $fd "$info\t$path\0"
1473 display_file $path $new
1474 }
1475 set ui_status_value [format \
1477 "$msg... %i/%i files (%.2f%%)" \
1478 $update_index_cp \
1479 $totalCnt \
1480 [expr {100.0 * $update_index_cp / $totalCnt}]]
1481}
1482proc update_index {msg pathList after} {
1484 global update_index_cp ui_status_value
1485 if {![lock_index update]} return
1487 set update_index_cp 0
1489 set pathList [lsort $pathList]
1490 set totalCnt [llength $pathList]
1491 set batch [expr {int($totalCnt * .01) + 1}]
1492 if {$batch > 25} {set batch 25}
1493 set ui_status_value [format \
1495 "$msg... %i/%i files (%.2f%%)" \
1496 $update_index_cp \
1497 $totalCnt \
1498 0.0]
1499 set fd [open "| git update-index --add --remove -z --stdin" w]
1500 fconfigure $fd \
1501 -blocking 0 \
1502 -buffering full \
1503 -buffersize 512 \
1504 -translation binary
1505 fileevent $fd writable [list \
1506 write_update_index \
1507 $fd \
1508 $pathList \
1509 $totalCnt \
1510 $batch \
1511 $msg \
1512 $after \
1513 ]
1514}
1515proc write_update_index {fd pathList totalCnt batch msg after} {
1517 global update_index_cp ui_status_value
1518 global file_states current_diff_path
1519 if {$update_index_cp >= $totalCnt} {
1521 close $fd
1522 unlock_index
1523 uplevel #0 $after
1524 return
1525 }
1526 for {set i $batch} \
1528 {$update_index_cp < $totalCnt && $i > 0} \
1529 {incr i -1} {
1530 set path [lindex $pathList $update_index_cp]
1531 incr update_index_cp
1532 switch -glob -- [lindex $file_states($path) 0] {
1534 AD {set new __}
1535 ?D {set new D_}
1536 _O -
1537 AM {set new A_}
1538 U? {
1539 if {[file exists $path]} {
1540 set new M_
1541 } else {
1542 set new D_
1543 }
1544 }
1545 ?M {set new M_}
1546 ?? {continue}
1547 }
1548 puts -nonewline $fd "$path\0"
1549 display_file $path $new
1550 }
1551 set ui_status_value [format \
1553 "$msg... %i/%i files (%.2f%%)" \
1554 $update_index_cp \
1555 $totalCnt \
1556 [expr {100.0 * $update_index_cp / $totalCnt}]]
1557}
1558proc checkout_index {msg pathList after} {
1560 global update_index_cp ui_status_value
1561 if {![lock_index update]} return
1563 set update_index_cp 0
1565 set pathList [lsort $pathList]
1566 set totalCnt [llength $pathList]
1567 set batch [expr {int($totalCnt * .01) + 1}]
1568 if {$batch > 25} {set batch 25}
1569 set ui_status_value [format \
1571 "$msg... %i/%i files (%.2f%%)" \
1572 $update_index_cp \
1573 $totalCnt \
1574 0.0]
1575 set cmd [list git checkout-index]
1576 lappend cmd --index
1577 lappend cmd --quiet
1578 lappend cmd --force
1579 lappend cmd -z
1580 lappend cmd --stdin
1581 set fd [open "| $cmd " w]
1582 fconfigure $fd \
1583 -blocking 0 \
1584 -buffering full \
1585 -buffersize 512 \
1586 -translation binary
1587 fileevent $fd writable [list \
1588 write_checkout_index \
1589 $fd \
1590 $pathList \
1591 $totalCnt \
1592 $batch \
1593 $msg \
1594 $after \
1595 ]
1596}
1597proc write_checkout_index {fd pathList totalCnt batch msg after} {
1599 global update_index_cp ui_status_value
1600 global file_states current_diff_path
1601 if {$update_index_cp >= $totalCnt} {
1603 close $fd
1604 unlock_index
1605 uplevel #0 $after
1606 return
1607 }
1608 for {set i $batch} \
1610 {$update_index_cp < $totalCnt && $i > 0} \
1611 {incr i -1} {
1612 set path [lindex $pathList $update_index_cp]
1613 incr update_index_cp
1614 switch -glob -- [lindex $file_states($path) 0] {
1615 U? {continue}
1616 ?M -
1617 ?D {
1618 puts -nonewline $fd "$path\0"
1619 display_file $path ?_
1620 }
1621 }
1622 }
1623 set ui_status_value [format \
1625 "$msg... %i/%i files (%.2f%%)" \
1626 $update_index_cp \
1627 $totalCnt \
1628 [expr {100.0 * $update_index_cp / $totalCnt}]]
1629}
1630######################################################################
1632##
1633## branch management
1634proc is_tracking_branch {name} {
1636 global tracking_branches
1637 if {![catch {set info $tracking_branches($name)}]} {
1639 return 1
1640 }
1641 foreach t [array names tracking_branches] {
1642 if {[string match {*/\*} $t] && [string match $t $name]} {
1643 return 1
1644 }
1645 }
1646 return 0
1647}
1648proc load_all_heads {} {
1650 global all_heads
1651 set all_heads [list]
1653 set fd [open "| git for-each-ref --format=%(refname) refs/heads" r]
1654 while {[gets $fd line] > 0} {
1655 if {[is_tracking_branch $line]} continue
1656 if {![regsub ^refs/heads/ $line {} name]} continue
1657 lappend all_heads $name
1658 }
1659 close $fd
1660 set all_heads [lsort $all_heads]
1662}
1663proc populate_branch_menu {} {
1665 global all_heads disable_on_lock
1666 set m .mbar.branch
1668 set last [$m index last]
1669 for {set i 0} {$i <= $last} {incr i} {
1670 if {[$m type $i] eq {separator}} {
1671 $m delete $i last
1672 set new_dol [list]
1673 foreach a $disable_on_lock {
1674 if {[lindex $a 0] ne $m || [lindex $a 2] < $i} {
1675 lappend new_dol $a
1676 }
1677 }
1678 set disable_on_lock $new_dol
1679 break
1680 }
1681 }
1682 $m add separator
1684 foreach b $all_heads {
1685 $m add radiobutton \
1686 -label $b \
1687 -command [list switch_branch $b] \
1688 -variable current_branch \
1689 -value $b \
1690 -font font_ui
1691 lappend disable_on_lock \
1692 [list $m entryconf [$m index last] -state]
1693 }
1694}
1695proc all_tracking_branches {} {
1697 global tracking_branches
1698 set all_trackings {}
1700 set cmd {}
1701 foreach name [array names tracking_branches] {
1702 if {[regsub {/\*$} $name {} name]} {
1703 lappend cmd $name
1704 } else {
1705 regsub ^refs/(heads|remotes)/ $name {} name
1706 lappend all_trackings $name
1707 }
1708 }
1709 if {$cmd ne {}} {
1711 set fd [open "| git for-each-ref --format=%(refname) $cmd" r]
1712 while {[gets $fd name] > 0} {
1713 regsub ^refs/(heads|remotes)/ $name {} name
1714 lappend all_trackings $name
1715 }
1716 close $fd
1717 }
1718 return [lsort -unique $all_trackings]
1720}
1721proc do_create_branch_action {w} {
1723 global all_heads null_sha1 repo_config
1724 global create_branch_checkout create_branch_revtype
1725 global create_branch_head create_branch_trackinghead
1726 set newbranch [string trim [$w.desc.name_t get 0.0 end]]
1728 if {$newbranch eq {}
1729 || $newbranch eq $repo_config(gui.newbranchtemplate)} {
1730 tk_messageBox \
1731 -icon error \
1732 -type ok \
1733 -title [wm title $w] \
1734 -parent $w \
1735 -message "Please supply a branch name."
1736 focus $w.desc.name_t
1737 return
1738 }
1739 if {![catch {exec git show-ref --verify -- "refs/heads/$newbranch"}]} {
1740 tk_messageBox \
1741 -icon error \
1742 -type ok \
1743 -title [wm title $w] \
1744 -parent $w \
1745 -message "Branch '$newbranch' already exists."
1746 focus $w.desc.name_t
1747 return
1748 }
1749 if {[catch {exec git check-ref-format "heads/$newbranch"}]} {
1750 tk_messageBox \
1751 -icon error \
1752 -type ok \
1753 -title [wm title $w] \
1754 -parent $w \
1755 -message "We do not like '$newbranch' as a branch name."
1756 focus $w.desc.name_t
1757 return
1758 }
1759 set rev {}
1761 switch -- $create_branch_revtype {
1762 head {set rev $create_branch_head}
1763 tracking {set rev $create_branch_trackinghead}
1764 expression {set rev [string trim [$w.from.exp_t get 0.0 end]]}
1765 }
1766 if {[catch {set cmt [exec git rev-parse --verify "${rev}^0"]}]} {
1767 tk_messageBox \
1768 -icon error \
1769 -type ok \
1770 -title [wm title $w] \
1771 -parent $w \
1772 -message "Invalid starting revision: $rev"
1773 return
1774 }
1775 set cmd [list git update-ref]
1776 lappend cmd -m
1777 lappend cmd "branch: Created from $rev"
1778 lappend cmd "refs/heads/$newbranch"
1779 lappend cmd $cmt
1780 lappend cmd $null_sha1
1781 if {[catch {eval exec $cmd} err]} {
1782 tk_messageBox \
1783 -icon error \
1784 -type ok \
1785 -title [wm title $w] \
1786 -parent $w \
1787 -message "Failed to create '$newbranch'.\n\n$err"
1788 return
1789 }
1790 lappend all_heads $newbranch
1792 set all_heads [lsort $all_heads]
1793 populate_branch_menu
1794 destroy $w
1795 if {$create_branch_checkout} {
1796 switch_branch $newbranch
1797 }
1798}
1799proc radio_selector {varname value args} {
1801 upvar #0 $varname var
1802 set var $value
1803}
1804trace add variable create_branch_head write \
1806 [list radio_selector create_branch_revtype head]
1807trace add variable create_branch_trackinghead write \
1808 [list radio_selector create_branch_revtype tracking]
1809trace add variable delete_branch_head write \
1811 [list radio_selector delete_branch_checktype head]
1812trace add variable delete_branch_trackinghead write \
1813 [list radio_selector delete_branch_checktype tracking]
1814proc do_create_branch {} {
1816 global all_heads current_branch repo_config
1817 global create_branch_checkout create_branch_revtype
1818 global create_branch_head create_branch_trackinghead
1819 set w .branch_editor
1821 toplevel $w
1822 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
1823 label $w.header -text {Create New Branch} \
1825 -font font_uibold
1826 pack $w.header -side top -fill x
1827 frame $w.buttons
1829 button $w.buttons.create -text Create \
1830 -font font_ui \
1831 -default active \
1832 -command [list do_create_branch_action $w]
1833 pack $w.buttons.create -side right
1834 button $w.buttons.cancel -text {Cancel} \
1835 -font font_ui \
1836 -command [list destroy $w]
1837 pack $w.buttons.cancel -side right -padx 5
1838 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
1839 labelframe $w.desc \
1841 -text {Branch Description} \
1842 -font font_ui
1843 label $w.desc.name_l -text {Name:} -font font_ui
1844 text $w.desc.name_t \
1845 -borderwidth 1 \
1846 -relief sunken \
1847 -height 1 \
1848 -width 40 \
1849 -font font_ui
1850 $w.desc.name_t insert 0.0 $repo_config(gui.newbranchtemplate)
1851 grid $w.desc.name_l $w.desc.name_t -stick we -padx {0 5}
1852 bind $w.desc.name_t <Shift-Key-Tab> {focus [tk_focusPrev %W];break}
1853 bind $w.desc.name_t <Key-Tab> {focus [tk_focusNext %W];break}
1854 bind $w.desc.name_t <Key-Return> "do_create_branch_action $w;break"
1855 bind $w.desc.name_t <Key> {
1856 if {{%K} ne {BackSpace}
1857 && {%K} ne {Tab}
1858 && {%K} ne {Escape}
1859 && {%K} ne {Return}} {
1860 if {%k <= 32} break
1861 if {[string first %A {~^:?*[}] >= 0} break
1862 }
1863 }
1864 grid columnconfigure $w.desc 1 -weight 1
1865 pack $w.desc -anchor nw -fill x -pady 5 -padx 5
1866 labelframe $w.from \
1868 -text {Starting Revision} \
1869 -font font_ui
1870 radiobutton $w.from.head_r \
1871 -text {Local Branch:} \
1872 -value head \
1873 -variable create_branch_revtype \
1874 -font font_ui
1875 eval tk_optionMenu $w.from.head_m create_branch_head $all_heads
1876 grid $w.from.head_r $w.from.head_m -sticky w
1877 set all_trackings [all_tracking_branches]
1878 if {$all_trackings ne {}} {
1879 set create_branch_trackinghead [lindex $all_trackings 0]
1880 radiobutton $w.from.tracking_r \
1881 -text {Tracking Branch:} \
1882 -value tracking \
1883 -variable create_branch_revtype \
1884 -font font_ui
1885 eval tk_optionMenu $w.from.tracking_m \
1886 create_branch_trackinghead \
1887 $all_trackings
1888 grid $w.from.tracking_r $w.from.tracking_m -sticky w
1889 }
1890 radiobutton $w.from.exp_r \
1891 -text {Revision Expression:} \
1892 -value expression \
1893 -variable create_branch_revtype \
1894 -font font_ui
1895 text $w.from.exp_t \
1896 -borderwidth 1 \
1897 -relief sunken \
1898 -height 1 \
1899 -width 50 \
1900 -font font_ui
1901 grid $w.from.exp_r $w.from.exp_t -stick we -padx {0 5}
1902 bind $w.from.exp_t <Shift-Key-Tab> {focus [tk_focusPrev %W];break}
1903 bind $w.from.exp_t <Key-Tab> {focus [tk_focusNext %W];break}
1904 bind $w.from.exp_t <Key-Return> "do_create_branch_action $w;break"
1905 bind $w.from.exp_t <Key-space> break
1906 bind $w.from.exp_t <Key> {set create_branch_revtype expression}
1907 grid columnconfigure $w.from 1 -weight 1
1908 pack $w.from -anchor nw -fill x -pady 5 -padx 5
1909 labelframe $w.postActions \
1911 -text {Post Creation Actions} \
1912 -font font_ui
1913 checkbutton $w.postActions.checkout \
1914 -text {Checkout after creation} \
1915 -variable create_branch_checkout \
1916 -font font_ui
1917 pack $w.postActions.checkout -anchor nw
1918 pack $w.postActions -anchor nw -fill x -pady 5 -padx 5
1919 set create_branch_checkout 1
1921 set create_branch_head $current_branch
1922 set create_branch_revtype head
1923 bind $w <Visibility> "grab $w; focus $w.desc.name_t"
1925 bind $w <Key-Escape> "destroy $w"
1926 bind $w <Key-Return> "do_create_branch_action $w;break"
1927 wm title $w "[appname] ([reponame]): Create Branch"
1928 tkwait window $w
1929}
1930proc do_delete_branch_action {w} {
1932 global all_heads
1933 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
1934 set check_rev {}
1936 switch -- $delete_branch_checktype {
1937 head {set check_rev $delete_branch_head}
1938 tracking {set check_rev $delete_branch_trackinghead}
1939 always {set check_rev {:none}}
1940 }
1941 if {$check_rev eq {:none}} {
1942 set check_cmt {}
1943 } elseif {[catch {set check_cmt [exec git rev-parse --verify "${check_rev}^0"]}]} {
1944 tk_messageBox \
1945 -icon error \
1946 -type ok \
1947 -title [wm title $w] \
1948 -parent $w \
1949 -message "Invalid check revision: $check_rev"
1950 return
1951 }
1952 set to_delete [list]
1954 set not_merged [list]
1955 foreach i [$w.list.l curselection] {
1956 set b [$w.list.l get $i]
1957 if {[catch {set o [exec git rev-parse --verify $b]}]} continue
1958 if {$check_cmt ne {}} {
1959 if {$b eq $check_rev} continue
1960 if {[catch {set m [exec git merge-base $o $check_cmt]}]} continue
1961 if {$o ne $m} {
1962 lappend not_merged $b
1963 continue
1964 }
1965 }
1966 lappend to_delete [list $b $o]
1967 }
1968 if {$not_merged ne {}} {
1969 set msg "The following branches are not completely merged into $check_rev:
1970 - [join $not_merged "\n - "]"
1972 tk_messageBox \
1973 -icon info \
1974 -type ok \
1975 -title [wm title $w] \
1976 -parent $w \
1977 -message $msg
1978 }
1979 if {$to_delete eq {}} return
1980 if {$delete_branch_checktype eq {always}} {
1981 set msg {Recovering deleted branches is difficult.
1982Delete the selected branches?}
1984 if {[tk_messageBox \
1985 -icon warning \
1986 -type yesno \
1987 -title [wm title $w] \
1988 -parent $w \
1989 -message $msg] ne yes} {
1990 return
1991 }
1992 }
1993 set failed {}
1995 foreach i $to_delete {
1996 set b [lindex $i 0]
1997 set o [lindex $i 1]
1998 if {[catch {exec git update-ref -d "refs/heads/$b" $o} err]} {
1999 append failed " - $b: $err\n"
2000 } else {
2001 set x [lsearch -sorted $all_heads $b]
2002 if {$x >= 0} {
2003 set all_heads [lreplace $all_heads $x $x]
2004 }
2005 }
2006 }
2007 if {$failed ne {}} {
2009 tk_messageBox \
2010 -icon error \
2011 -type ok \
2012 -title [wm title $w] \
2013 -parent $w \
2014 -message "Failed to delete branches:\n$failed"
2015 }
2016 set all_heads [lsort $all_heads]
2018 populate_branch_menu
2019 destroy $w
2020}
2021proc do_delete_branch {} {
2023 global all_heads tracking_branches current_branch
2024 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
2025 set w .branch_editor
2027 toplevel $w
2028 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2029 label $w.header -text {Delete Local Branch} \
2031 -font font_uibold
2032 pack $w.header -side top -fill x
2033 frame $w.buttons
2035 button $w.buttons.create -text Delete \
2036 -font font_ui \
2037 -command [list do_delete_branch_action $w]
2038 pack $w.buttons.create -side right
2039 button $w.buttons.cancel -text {Cancel} \
2040 -font font_ui \
2041 -command [list destroy $w]
2042 pack $w.buttons.cancel -side right -padx 5
2043 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2044 labelframe $w.list \
2046 -text {Local Branches} \
2047 -font font_ui
2048 listbox $w.list.l \
2049 -height 10 \
2050 -width 50 \
2051 -selectmode extended \
2052 -font font_ui
2053 foreach h $all_heads {
2054 if {$h ne $current_branch} {
2055 $w.list.l insert end $h
2056 }
2057 }
2058 pack $w.list.l -fill both -pady 5 -padx 5
2059 pack $w.list -fill both -pady 5 -padx 5
2060 labelframe $w.validate \
2062 -text {Delete Only If} \
2063 -font font_ui
2064 radiobutton $w.validate.head_r \
2065 -text {Merged Into Local Branch:} \
2066 -value head \
2067 -variable delete_branch_checktype \
2068 -font font_ui
2069 eval tk_optionMenu $w.validate.head_m delete_branch_head $all_heads
2070 grid $w.validate.head_r $w.validate.head_m -sticky w
2071 set all_trackings [all_tracking_branches]
2072 if {$all_trackings ne {}} {
2073 set delete_branch_trackinghead [lindex $all_trackings 0]
2074 radiobutton $w.validate.tracking_r \
2075 -text {Merged Into Tracking Branch:} \
2076 -value tracking \
2077 -variable delete_branch_checktype \
2078 -font font_ui
2079 eval tk_optionMenu $w.validate.tracking_m \
2080 delete_branch_trackinghead \
2081 $all_trackings
2082 grid $w.validate.tracking_r $w.validate.tracking_m -sticky w
2083 }
2084 radiobutton $w.validate.always_r \
2085 -text {Always (Do not perform merge checks)} \
2086 -value always \
2087 -variable delete_branch_checktype \
2088 -font font_ui
2089 grid $w.validate.always_r -columnspan 2 -sticky w
2090 grid columnconfigure $w.validate 1 -weight 1
2091 pack $w.validate -anchor nw -fill x -pady 5 -padx 5
2092 set delete_branch_head $current_branch
2094 set delete_branch_checktype head
2095 bind $w <Visibility> "grab $w; focus $w"
2097 bind $w <Key-Escape> "destroy $w"
2098 wm title $w "[appname] ([reponame]): Delete Branch"
2099 tkwait window $w
2100}
2101proc switch_branch {b} {
2103 global HEAD commit_type file_states current_branch
2104 global selected_commit_type ui_comm
2105 if {![lock_index switch]} return
2107 # -- Backup the selected branch (repository_state resets it)
2109 #
2110 set new_branch $current_branch
2111 # -- Our in memory state should match the repository.
2113 #
2114 repository_state curType curHEAD curMERGE_HEAD
2115 if {[string match amend* $commit_type]
2116 && $curType eq {normal}
2117 && $curHEAD eq $HEAD} {
2118 } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
2119 info_popup {Last scanned state does not match repository state.
2120Another Git program has modified this repository
2122since the last scan. A rescan must be performed
2123before the current branch can be changed.
2124The rescan will be automatically started now.
2126}
2127 unlock_index
2128 rescan {set ui_status_value {Ready.}}
2129 return
2130 }
2131 # -- Toss the message buffer if we are in amend mode.
2133 #
2134 if {[string match amend* $curType]} {
2135 $ui_comm delete 0.0 end
2136 $ui_comm edit reset
2137 $ui_comm edit modified false
2138 }
2139 set selected_commit_type new
2141 set current_branch $new_branch
2142 unlock_index
2144 error "NOT FINISHED"
2145}
2146######################################################################
2148##
2149## remote management
2150proc load_all_remotes {} {
2152 global repo_config
2153 global all_remotes tracking_branches
2154 set all_remotes [list]
2156 array unset tracking_branches
2157 set rm_dir [gitdir remotes]
2159 if {[file isdirectory $rm_dir]} {
2160 set all_remotes [glob \
2161 -types f \
2162 -tails \
2163 -nocomplain \
2164 -directory $rm_dir *]
2165 foreach name $all_remotes {
2167 catch {
2168 set fd [open [file join $rm_dir $name] r]
2169 while {[gets $fd line] >= 0} {
2170 if {![regexp {^Pull:[ ]*([^:]+):(.+)$} \
2171 $line line src dst]} continue
2172 if {![regexp ^refs/ $dst]} {
2173 set dst "refs/heads/$dst"
2174 }
2175 set tracking_branches($dst) [list $name $src]
2176 }
2177 close $fd
2178 }
2179 }
2180 }
2181 foreach line [array names repo_config remote.*.url] {
2183 if {![regexp ^remote\.(.*)\.url\$ $line line name]} continue
2184 lappend all_remotes $name
2185 if {[catch {set fl $repo_config(remote.$name.fetch)}]} {
2187 set fl {}
2188 }
2189 foreach line $fl {
2190 if {![regexp {^([^:]+):(.+)$} $line line src dst]} continue
2191 if {![regexp ^refs/ $dst]} {
2192 set dst "refs/heads/$dst"
2193 }
2194 set tracking_branches($dst) [list $name $src]
2195 }
2196 }
2197 set all_remotes [lsort -unique $all_remotes]
2199}
2200proc populate_fetch_menu {m} {
2202 global all_remotes repo_config
2203 foreach r $all_remotes {
2205 set enable 0
2206 if {![catch {set a $repo_config(remote.$r.url)}]} {
2207 if {![catch {set a $repo_config(remote.$r.fetch)}]} {
2208 set enable 1
2209 }
2210 } else {
2211 catch {
2212 set fd [open [gitdir remotes $r] r]
2213 while {[gets $fd n] >= 0} {
2214 if {[regexp {^Pull:[ \t]*([^:]+):} $n]} {
2215 set enable 1
2216 break
2217 }
2218 }
2219 close $fd
2220 }
2221 }
2222 if {$enable} {
2224 $m add command \
2225 -label "Fetch from $r..." \
2226 -command [list fetch_from $r] \
2227 -font font_ui
2228 }
2229 }
2230}
2231proc populate_push_menu {m} {
2233 global all_remotes repo_config
2234 foreach r $all_remotes {
2236 set enable 0
2237 if {![catch {set a $repo_config(remote.$r.url)}]} {
2238 if {![catch {set a $repo_config(remote.$r.push)}]} {
2239 set enable 1
2240 }
2241 } else {
2242 catch {
2243 set fd [open [gitdir remotes $r] r]
2244 while {[gets $fd n] >= 0} {
2245 if {[regexp {^Push:[ \t]*([^:]+):} $n]} {
2246 set enable 1
2247 break
2248 }
2249 }
2250 close $fd
2251 }
2252 }
2253 if {$enable} {
2255 $m add command \
2256 -label "Push to $r..." \
2257 -command [list push_to $r] \
2258 -font font_ui
2259 }
2260 }
2261}
2262proc populate_pull_menu {m} {
2264 global repo_config all_remotes disable_on_lock
2265 foreach remote $all_remotes {
2267 set rb_list [list]
2268 if {[array get repo_config remote.$remote.url] ne {}} {
2269 if {[array get repo_config remote.$remote.fetch] ne {}} {
2270 foreach line $repo_config(remote.$remote.fetch) {
2271 if {[regexp {^([^:]+):} $line line rb]} {
2272 lappend rb_list $rb
2273 }
2274 }
2275 }
2276 } else {
2277 catch {
2278 set fd [open [gitdir remotes $remote] r]
2279 while {[gets $fd line] >= 0} {
2280 if {[regexp {^Pull:[ \t]*([^:]+):} $line line rb]} {
2281 lappend rb_list $rb
2282 }
2283 }
2284 close $fd
2285 }
2286 }
2287 foreach rb $rb_list {
2289 regsub ^refs/heads/ $rb {} rb_short
2290 $m add command \
2291 -label "Branch $rb_short from $remote..." \
2292 -command [list pull_remote $remote $rb] \
2293 -font font_ui
2294 lappend disable_on_lock \
2295 [list $m entryconf [$m index last] -state]
2296 }
2297 }
2298}
2299######################################################################
2301##
2302## icons
2303set filemask {
2305#define mask_width 14
2306#define mask_height 15
2307static unsigned char mask_bits[] = {
2308 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2309 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2310 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2311}
2312image create bitmap file_plain -background white -foreground black -data {
2314#define plain_width 14
2315#define plain_height 15
2316static unsigned char plain_bits[] = {
2317 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2318 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2319 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2320} -maskdata $filemask
2321image create bitmap file_mod -background white -foreground blue -data {
2323#define mod_width 14
2324#define mod_height 15
2325static unsigned char mod_bits[] = {
2326 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2327 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2328 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2329} -maskdata $filemask
2330image create bitmap file_fulltick -background white -foreground "#007000" -data {
2332#define file_fulltick_width 14
2333#define file_fulltick_height 15
2334static unsigned char file_fulltick_bits[] = {
2335 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2336 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2337 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2338} -maskdata $filemask
2339image create bitmap file_parttick -background white -foreground "#005050" -data {
2341#define parttick_width 14
2342#define parttick_height 15
2343static unsigned char parttick_bits[] = {
2344 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2345 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
2346 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2347} -maskdata $filemask
2348image create bitmap file_question -background white -foreground black -data {
2350#define file_question_width 14
2351#define file_question_height 15
2352static unsigned char file_question_bits[] = {
2353 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2354 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2355 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2356} -maskdata $filemask
2357image create bitmap file_removed -background white -foreground red -data {
2359#define file_removed_width 14
2360#define file_removed_height 15
2361static unsigned char file_removed_bits[] = {
2362 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2363 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2364 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2365} -maskdata $filemask
2366image create bitmap file_merge -background white -foreground blue -data {
2368#define file_merge_width 14
2369#define file_merge_height 15
2370static unsigned char file_merge_bits[] = {
2371 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2372 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2373 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2374} -maskdata $filemask
2375set ui_index .vpane.files.index.list
2377set ui_workdir .vpane.files.workdir.list
2378set all_icons(_$ui_index) file_plain
2380set all_icons(A$ui_index) file_fulltick
2381set all_icons(M$ui_index) file_fulltick
2382set all_icons(D$ui_index) file_removed
2383set all_icons(U$ui_index) file_merge
2384set all_icons(_$ui_workdir) file_plain
2386set all_icons(M$ui_workdir) file_mod
2387set all_icons(D$ui_workdir) file_question
2388set all_icons(U$ui_workdir) file_merge
2389set all_icons(O$ui_workdir) file_plain
2390set max_status_desc 0
2392foreach i {
2393 {__ "Unmodified"}
2394 {_M "Modified, not staged"}
2396 {M_ "Staged for commit"}
2397 {MM "Portions staged for commit"}
2398 {MD "Staged for commit, missing"}
2399 {_O "Untracked, not staged"}
2401 {A_ "Staged for commit"}
2402 {AM "Portions staged for commit"}
2403 {AD "Staged for commit, missing"}
2404 {_D "Missing"}
2406 {D_ "Staged for removal"}
2407 {DO "Staged for removal, still present"}
2408 {U_ "Requires merge resolution"}
2410 {UU "Requires merge resolution"}
2411 {UM "Requires merge resolution"}
2412 {UD "Requires merge resolution"}
2413 } {
2414 if {$max_status_desc < [string length [lindex $i 1]]} {
2415 set max_status_desc [string length [lindex $i 1]]
2416 }
2417 set all_descs([lindex $i 0]) [lindex $i 1]
2418}
2419unset i
2420######################################################################
2422##
2423## util
2424proc is_MacOSX {} {
2426 global tcl_platform tk_library
2427 if {[tk windowingsystem] eq {aqua}} {
2428 return 1
2429 }
2430 return 0
2431}
2432proc is_Windows {} {
2434 global tcl_platform
2435 if {$tcl_platform(platform) eq {windows}} {
2436 return 1
2437 }
2438 return 0
2439}
2440proc bind_button3 {w cmd} {
2442 bind $w <Any-Button-3> $cmd
2443 if {[is_MacOSX]} {
2444 bind $w <Control-Button-1> $cmd
2445 }
2446}
2447proc incr_font_size {font {amt 1}} {
2449 set sz [font configure $font -size]
2450 incr sz $amt
2451 font configure $font -size $sz
2452 font configure ${font}bold -size $sz
2453}
2454proc hook_failed_popup {hook msg} {
2456 set w .hookfail
2457 toplevel $w
2458 frame $w.m
2460 label $w.m.l1 -text "$hook hook failed:" \
2461 -anchor w \
2462 -justify left \
2463 -font font_uibold
2464 text $w.m.t \
2465 -background white -borderwidth 1 \
2466 -relief sunken \
2467 -width 80 -height 10 \
2468 -font font_diff \
2469 -yscrollcommand [list $w.m.sby set]
2470 label $w.m.l2 \
2471 -text {You must correct the above errors before committing.} \
2472 -anchor w \
2473 -justify left \
2474 -font font_uibold
2475 scrollbar $w.m.sby -command [list $w.m.t yview]
2476 pack $w.m.l1 -side top -fill x
2477 pack $w.m.l2 -side bottom -fill x
2478 pack $w.m.sby -side right -fill y
2479 pack $w.m.t -side left -fill both -expand 1
2480 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
2481 $w.m.t insert 1.0 $msg
2483 $w.m.t conf -state disabled
2484 button $w.ok -text OK \
2486 -width 15 \
2487 -font font_ui \
2488 -command "destroy $w"
2489 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
2490 bind $w <Visibility> "grab $w; focus $w"
2492 bind $w <Key-Return> "destroy $w"
2493 wm title $w "[appname] ([reponame]): error"
2494 tkwait window $w
2495}
2496set next_console_id 0
2498proc new_console {short_title long_title} {
2500 global next_console_id console_data
2501 set w .console[incr next_console_id]
2502 set console_data($w) [list $short_title $long_title]
2503 return [console_init $w]
2504}
2505proc console_init {w} {
2507 global console_cr console_data M1B
2508 set console_cr($w) 1.0
2510 toplevel $w
2511 frame $w.m
2512 label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
2513 -anchor w \
2514 -justify left \
2515 -font font_uibold
2516 text $w.m.t \
2517 -background white -borderwidth 1 \
2518 -relief sunken \
2519 -width 80 -height 10 \
2520 -font font_diff \
2521 -state disabled \
2522 -yscrollcommand [list $w.m.sby set]
2523 label $w.m.s -text {Working... please wait...} \
2524 -anchor w \
2525 -justify left \
2526 -font font_uibold
2527 scrollbar $w.m.sby -command [list $w.m.t yview]
2528 pack $w.m.l1 -side top -fill x
2529 pack $w.m.s -side bottom -fill x
2530 pack $w.m.sby -side right -fill y
2531 pack $w.m.t -side left -fill both -expand 1
2532 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
2533 menu $w.ctxm -tearoff 0
2535 $w.ctxm add command -label "Copy" \
2536 -font font_ui \
2537 -command "tk_textCopy $w.m.t"
2538 $w.ctxm add command -label "Select All" \
2539 -font font_ui \
2540 -command "$w.m.t tag add sel 0.0 end"
2541 $w.ctxm add command -label "Copy All" \
2542 -font font_ui \
2543 -command "
2544 $w.m.t tag add sel 0.0 end
2545 tk_textCopy $w.m.t
2546 $w.m.t tag remove sel 0.0 end
2547 "
2548 button $w.ok -text {Close} \
2550 -font font_ui \
2551 -state disabled \
2552 -command "destroy $w"
2553 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
2554 bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
2556 bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
2557 bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
2558 bind $w <Visibility> "focus $w"
2559 wm title $w "[appname] ([reponame]): [lindex $console_data($w) 0]"
2560 return $w
2561}
2562proc console_exec {w cmd {after {}}} {
2564 # -- Windows tosses the enviroment when we exec our child.
2565 # But most users need that so we have to relogin. :-(
2566 #
2567 if {[is_Windows]} {
2568 set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
2569 }
2570 # -- Tcl won't let us redirect both stdout and stderr to
2572 # the same pipe. So pass it through cat...
2573 #
2574 set cmd [concat | $cmd |& cat]
2575 set fd_f [open $cmd r]
2577 fconfigure $fd_f -blocking 0 -translation binary
2578 fileevent $fd_f readable [list console_read $w $fd_f $after]
2579}
2580proc console_read {w fd after} {
2582 global console_cr console_data
2583 set buf [read $fd]
2585 if {$buf ne {}} {
2586 if {![winfo exists $w]} {console_init $w}
2587 $w.m.t conf -state normal
2588 set c 0
2589 set n [string length $buf]
2590 while {$c < $n} {
2591 set cr [string first "\r" $buf $c]
2592 set lf [string first "\n" $buf $c]
2593 if {$cr < 0} {set cr [expr {$n + 1}]}
2594 if {$lf < 0} {set lf [expr {$n + 1}]}
2595 if {$lf < $cr} {
2597 $w.m.t insert end [string range $buf $c $lf]
2598 set console_cr($w) [$w.m.t index {end -1c}]
2599 set c $lf
2600 incr c
2601 } else {
2602 $w.m.t delete $console_cr($w) end
2603 $w.m.t insert end "\n"
2604 $w.m.t insert end [string range $buf $c $cr]
2605 set c $cr
2606 incr c
2607 }
2608 }
2609 $w.m.t conf -state disabled
2610 $w.m.t see end
2611 }
2612 fconfigure $fd -blocking 1
2614 if {[eof $fd]} {
2615 if {[catch {close $fd}]} {
2616 if {![winfo exists $w]} {console_init $w}
2617 $w.m.s conf -background red -text {Error: Command Failed}
2618 $w.ok conf -state normal
2619 set ok 0
2620 } elseif {[winfo exists $w]} {
2621 $w.m.s conf -background green -text {Success}
2622 $w.ok conf -state normal
2623 set ok 1
2624 }
2625 array unset console_cr $w
2626 array unset console_data $w
2627 if {$after ne {}} {
2628 uplevel #0 $after $ok
2629 }
2630 return
2631 }
2632 fconfigure $fd -blocking 0
2633}
2634######################################################################
2636##
2637## ui commands
2638set starting_gitk_msg {Starting gitk... please wait...}
2640proc do_gitk {revs} {
2642 global ui_status_value starting_gitk_msg
2643 set cmd gitk
2645 if {$revs ne {}} {
2646 append cmd { }
2647 append cmd $revs
2648 }
2649 if {[is_Windows]} {
2650 set cmd "sh -c \"exec $cmd\""
2651 }
2652 append cmd { &}
2653 if {[catch {eval exec $cmd} err]} {
2655 error_popup "Failed to start gitk:\n\n$err"
2656 } else {
2657 set ui_status_value $starting_gitk_msg
2658 after 10000 {
2659 if {$ui_status_value eq $starting_gitk_msg} {
2660 set ui_status_value {Ready.}
2661 }
2662 }
2663 }
2664}
2665proc do_gc {} {
2667 set w [new_console {gc} {Compressing the object database}]
2668 console_exec $w {git gc}
2669}
2670proc do_fsck_objects {} {
2672 set w [new_console {fsck-objects} \
2673 {Verifying the object database with fsck-objects}]
2674 set cmd [list git fsck-objects]
2675 lappend cmd --full
2676 lappend cmd --cache
2677 lappend cmd --strict
2678 console_exec $w $cmd
2679}
2680set is_quitting 0
2682proc do_quit {} {
2684 global ui_comm is_quitting repo_config commit_type
2685 if {$is_quitting} return
2687 set is_quitting 1
2688 # -- Stash our current commit buffer.
2690 #
2691 set save [gitdir GITGUI_MSG]
2692 set msg [string trim [$ui_comm get 0.0 end]]
2693 if {![string match amend* $commit_type]
2694 && [$ui_comm edit modified]
2695 && $msg ne {}} {
2696 catch {
2697 set fd [open $save w]
2698 puts $fd [string trim [$ui_comm get 0.0 end]]
2699 close $fd
2700 }
2701 } else {
2702 catch {file delete $save}
2703 }
2704 # -- Stash our current window geometry into this repository.
2706 #
2707 set cfg_geometry [list]
2708 lappend cfg_geometry [wm geometry .]
2709 lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
2710 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
2711 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2712 set rc_geometry {}
2713 }
2714 if {$cfg_geometry ne $rc_geometry} {
2715 catch {exec git repo-config gui.geometry $cfg_geometry}
2716 }
2717 destroy .
2719}
2720proc do_rescan {} {
2722 rescan {set ui_status_value {Ready.}}
2723}
2724proc unstage_helper {txt paths} {
2726 global file_states current_diff_path
2727 if {![lock_index begin-update]} return
2729 set pathList [list]
2731 set after {}
2732 foreach path $paths {
2733 switch -glob -- [lindex $file_states($path) 0] {
2734 A? -
2735 M? -
2736 D? {
2737 lappend pathList $path
2738 if {$path eq $current_diff_path} {
2739 set after {reshow_diff;}
2740 }
2741 }
2742 }
2743 }
2744 if {$pathList eq {}} {
2745 unlock_index
2746 } else {
2747 update_indexinfo \
2748 $txt \
2749 $pathList \
2750 [concat $after {set ui_status_value {Ready.}}]
2751 }
2752}
2753proc do_unstage_selection {} {
2755 global current_diff_path selected_paths
2756 if {[array size selected_paths] > 0} {
2758 unstage_helper \
2759 {Unstaging selected files from commit} \
2760 [array names selected_paths]
2761 } elseif {$current_diff_path ne {}} {
2762 unstage_helper \
2763 "Unstaging [short_path $current_diff_path] from commit" \
2764 [list $current_diff_path]
2765 }
2766}
2767proc add_helper {txt paths} {
2769 global file_states current_diff_path
2770 if {![lock_index begin-update]} return
2772 set pathList [list]
2774 set after {}
2775 foreach path $paths {
2776 switch -glob -- [lindex $file_states($path) 0] {
2777 _O -
2778 ?M -
2779 ?D -
2780 U? {
2781 lappend pathList $path
2782 if {$path eq $current_diff_path} {
2783 set after {reshow_diff;}
2784 }
2785 }
2786 }
2787 }
2788 if {$pathList eq {}} {
2789 unlock_index
2790 } else {
2791 update_index \
2792 $txt \
2793 $pathList \
2794 [concat $after {set ui_status_value {Ready to commit.}}]
2795 }
2796}
2797proc do_add_selection {} {
2799 global current_diff_path selected_paths
2800 if {[array size selected_paths] > 0} {
2802 add_helper \
2803 {Adding selected files} \
2804 [array names selected_paths]
2805 } elseif {$current_diff_path ne {}} {
2806 add_helper \
2807 "Adding [short_path $current_diff_path]" \
2808 [list $current_diff_path]
2809 }
2810}
2811proc do_add_all {} {
2813 global file_states
2814 set paths [list]
2816 foreach path [array names file_states] {
2817 switch -glob -- [lindex $file_states($path) 0] {
2818 U? {continue}
2819 ?M -
2820 ?D {lappend paths $path}
2821 }
2822 }
2823 add_helper {Adding all changed files} $paths
2824}
2825proc revert_helper {txt paths} {
2827 global file_states current_diff_path
2828 if {![lock_index begin-update]} return
2830 set pathList [list]
2832 set after {}
2833 foreach path $paths {
2834 switch -glob -- [lindex $file_states($path) 0] {
2835 U? {continue}
2836 ?M -
2837 ?D {
2838 lappend pathList $path
2839 if {$path eq $current_diff_path} {
2840 set after {reshow_diff;}
2841 }
2842 }
2843 }
2844 }
2845 set n [llength $pathList]
2847 if {$n == 0} {
2848 unlock_index
2849 return
2850 } elseif {$n == 1} {
2851 set s "[short_path [lindex $pathList]]"
2852 } else {
2853 set s "these $n files"
2854 }
2855 set reply [tk_dialog \
2857 .confirm_revert \
2858 "[appname] ([reponame])" \
2859 "Revert changes in $s?
2860Any unadded changes will be permanently lost by the revert." \
2862 question \
2863 1 \
2864 {Do Nothing} \
2865 {Revert Changes} \
2866 ]
2867 if {$reply == 1} {
2868 checkout_index \
2869 $txt \
2870 $pathList \
2871 [concat $after {set ui_status_value {Ready.}}]
2872 } else {
2873 unlock_index
2874 }
2875}
2876proc do_revert_selection {} {
2878 global current_diff_path selected_paths
2879 if {[array size selected_paths] > 0} {
2881 revert_helper \
2882 {Reverting selected files} \
2883 [array names selected_paths]
2884 } elseif {$current_diff_path ne {}} {
2885 revert_helper \
2886 "Reverting [short_path $current_diff_path]" \
2887 [list $current_diff_path]
2888 }
2889}
2890proc do_signoff {} {
2892 global ui_comm
2893 set me [committer_ident]
2895 if {$me eq {}} return
2896 set sob "Signed-off-by: $me"
2898 set last [$ui_comm get {end -1c linestart} {end -1c}]
2899 if {$last ne $sob} {
2900 $ui_comm edit separator
2901 if {$last ne {}
2902 && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
2903 $ui_comm insert end "\n"
2904 }
2905 $ui_comm insert end "\n$sob"
2906 $ui_comm edit separator
2907 $ui_comm see end
2908 }
2909}
2910proc do_select_commit_type {} {
2912 global commit_type selected_commit_type
2913 if {$selected_commit_type eq {new}
2915 && [string match amend* $commit_type]} {
2916 create_new_commit
2917 } elseif {$selected_commit_type eq {amend}
2918 && ![string match amend* $commit_type]} {
2919 load_last_commit
2920 # The amend request was rejected...
2922 #
2923 if {![string match amend* $commit_type]} {
2924 set selected_commit_type new
2925 }
2926 }
2927}
2928proc do_commit {} {
2930 commit_tree
2931}
2932proc do_about {} {
2934 global appvers copyright
2935 global tcl_patchLevel tk_patchLevel
2936 set w .about_dialog
2938 toplevel $w
2939 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2940 label $w.header -text "About [appname]" \
2942 -font font_uibold
2943 pack $w.header -side top -fill x
2944 frame $w.buttons
2946 button $w.buttons.close -text {Close} \
2947 -font font_ui \
2948 -command [list destroy $w]
2949 pack $w.buttons.close -side right
2950 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2951 label $w.desc \
2953 -text "[appname] - a commit creation tool for Git.
2954$copyright" \
2955 -padx 5 -pady 5 \
2956 -justify left \
2957 -anchor w \
2958 -borderwidth 1 \
2959 -relief solid \
2960 -font font_ui
2961 pack $w.desc -side top -fill x -padx 5 -pady 5
2962 set v {}
2964 append v "[appname] version $appvers\n"
2965 append v "[exec git version]\n"
2966 append v "\n"
2967 if {$tcl_patchLevel eq $tk_patchLevel} {
2968 append v "Tcl/Tk version $tcl_patchLevel"
2969 } else {
2970 append v "Tcl version $tcl_patchLevel"
2971 append v ", Tk version $tk_patchLevel"
2972 }
2973 label $w.vers \
2975 -text $v \
2976 -padx 5 -pady 5 \
2977 -justify left \
2978 -anchor w \
2979 -borderwidth 1 \
2980 -relief solid \
2981 -font font_ui
2982 pack $w.vers -side top -fill x -padx 5 -pady 5
2983 menu $w.ctxm -tearoff 0
2985 $w.ctxm add command \
2986 -label {Copy} \
2987 -font font_ui \
2988 -command "
2989 clipboard clear
2990 clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
2991 "
2992 bind $w <Visibility> "grab $w; focus $w"
2994 bind $w <Key-Escape> "destroy $w"
2995 bind_button3 $w.vers "tk_popup $w.ctxm %X %Y; grab $w; focus $w"
2996 wm title $w "About [appname]"
2997 tkwait window $w
2998}
2999proc do_options {} {
3001 global repo_config global_config font_descs
3002 global repo_config_new global_config_new
3003 array unset repo_config_new
3005 array unset global_config_new
3006 foreach name [array names repo_config] {
3007 set repo_config_new($name) $repo_config($name)
3008 }
3009 load_config 1
3010 foreach name [array names repo_config] {
3011 switch -- $name {
3012 gui.diffcontext {continue}
3013 }
3014 set repo_config_new($name) $repo_config($name)
3015 }
3016 foreach name [array names global_config] {
3017 set global_config_new($name) $global_config($name)
3018 }
3019 set w .options_editor
3021 toplevel $w
3022 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
3023 label $w.header -text "[appname] Options" \
3025 -font font_uibold
3026 pack $w.header -side top -fill x
3027 frame $w.buttons
3029 button $w.buttons.restore -text {Restore Defaults} \
3030 -font font_ui \
3031 -command do_restore_defaults
3032 pack $w.buttons.restore -side left
3033 button $w.buttons.save -text Save \
3034 -font font_ui \
3035 -command "
3036 catch {eval \[bind \[focus -displayof $w\] <FocusOut>\]}
3037 do_save_config $w
3038 "
3039 pack $w.buttons.save -side right
3040 button $w.buttons.cancel -text {Cancel} \
3041 -font font_ui \
3042 -command [list destroy $w]
3043 pack $w.buttons.cancel -side right -padx 5
3044 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
3045 labelframe $w.repo -text "[reponame] Repository" \
3047 -font font_ui \
3048 -relief raised -borderwidth 2
3049 labelframe $w.global -text {Global (All Repositories)} \
3050 -font font_ui \
3051 -relief raised -borderwidth 2
3052 pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
3053 pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
3054 foreach option {
3056 {b pullsummary {Show Pull Summary}}
3057 {b trustmtime {Trust File Modification Timestamps}}
3058 {i diffcontext {Number of Diff Context Lines}}
3059 {t newbranchtemplate {New Branch Name Template}}
3060 } {
3061 set type [lindex $option 0]
3062 set name [lindex $option 1]
3063 set text [lindex $option 2]
3064 foreach f {repo global} {
3065 switch $type {
3066 b {
3067 checkbutton $w.$f.$name -text $text \
3068 -variable ${f}_config_new(gui.$name) \
3069 -onvalue true \
3070 -offvalue false \
3071 -font font_ui
3072 pack $w.$f.$name -side top -anchor w
3073 }
3074 i {
3075 frame $w.$f.$name
3076 label $w.$f.$name.l -text "$text:" -font font_ui
3077 pack $w.$f.$name.l -side left -anchor w -fill x
3078 spinbox $w.$f.$name.v \
3079 -textvariable ${f}_config_new(gui.$name) \
3080 -from 1 -to 99 -increment 1 \
3081 -width 3 \
3082 -font font_ui
3083 bind $w.$f.$name.v <FocusIn> {%W selection range 0 end}
3084 pack $w.$f.$name.v -side right -anchor e -padx 5
3085 pack $w.$f.$name -side top -anchor w -fill x
3086 }
3087 t {
3088 frame $w.$f.$name
3089 label $w.$f.$name.l -text "$text:" -font font_ui
3090 text $w.$f.$name.v \
3091 -borderwidth 1 \
3092 -relief sunken \
3093 -height 1 \
3094 -width 20 \
3095 -font font_ui
3096 $w.$f.$name.v insert 0.0 [set ${f}_config_new(gui.$name)]
3097 bind $w.$f.$name.v <Shift-Key-Tab> {focus [tk_focusPrev %W];break}
3098 bind $w.$f.$name.v <Key-Tab> {focus [tk_focusNext %W];break}
3099 bind $w.$f.$name.v <Key-Return> break
3100 bind $w.$f.$name.v <FocusIn> "$w.$f.$name.v tag add sel 0.0 end"
3101 bind $w.$f.$name.v <FocusOut> "
3102 set ${f}_config_new(gui.$name) \
3103 \[string trim \[$w.$f.$name.v get 0.0 end\]\]
3104 "
3105 pack $w.$f.$name.l -side left -anchor w
3106 pack $w.$f.$name.v -side left -anchor w \
3107 -fill x -expand 1 \
3108 -padx 5
3109 pack $w.$f.$name -side top -anchor w -fill x
3110 }
3111 }
3112 }
3113 }
3114 set all_fonts [lsort [font families]]
3116 foreach option $font_descs {
3117 set name [lindex $option 0]
3118 set font [lindex $option 1]
3119 set text [lindex $option 2]
3120 set global_config_new(gui.$font^^family) \
3122 [font configure $font -family]
3123 set global_config_new(gui.$font^^size) \
3124 [font configure $font -size]
3125 frame $w.global.$name
3127 label $w.global.$name.l -text "$text:" -font font_ui
3128 pack $w.global.$name.l -side left -anchor w -fill x
3129 eval tk_optionMenu $w.global.$name.family \
3130 global_config_new(gui.$font^^family) \
3131 $all_fonts
3132 spinbox $w.global.$name.size \
3133 -textvariable global_config_new(gui.$font^^size) \
3134 -from 2 -to 80 -increment 1 \
3135 -width 3 \
3136 -font font_ui
3137 bind $w.global.$name.size <FocusIn> {%W selection range 0 end}
3138 pack $w.global.$name.size -side right -anchor e
3139 pack $w.global.$name.family -side right -anchor e
3140 pack $w.global.$name -side top -anchor w -fill x
3141 }
3142 bind $w <Visibility> "grab $w; focus $w"
3144 bind $w <Key-Escape> "destroy $w"
3145 wm title $w "[appname] ([reponame]): Options"
3146 tkwait window $w
3147}
3148proc do_restore_defaults {} {
3150 global font_descs default_config repo_config
3151 global repo_config_new global_config_new
3152 foreach name [array names default_config] {
3154 set repo_config_new($name) $default_config($name)
3155 set global_config_new($name) $default_config($name)
3156 }
3157 foreach option $font_descs {
3159 set name [lindex $option 0]
3160 set repo_config(gui.$name) $default_config(gui.$name)
3161 }
3162 apply_config
3163 foreach option $font_descs {
3165 set name [lindex $option 0]
3166 set font [lindex $option 1]
3167 set global_config_new(gui.$font^^family) \
3168 [font configure $font -family]
3169 set global_config_new(gui.$font^^size) \
3170 [font configure $font -size]
3171 }
3172}
3173proc do_save_config {w} {
3175 if {[catch {save_config} err]} {
3176 error_popup "Failed to completely save options:\n\n$err"
3177 }
3178 reshow_diff
3179 destroy $w
3180}
3181proc do_windows_shortcut {} {
3183 global argv0
3184 if {[catch {
3186 set desktop [exec cygpath \
3187 --windows \
3188 --absolute \
3189 --long-name \
3190 --desktop]
3191 }]} {
3192 set desktop .
3193 }
3194 set fn [tk_getSaveFile \
3195 -parent . \
3196 -title "[appname] ([reponame]): Create Desktop Icon" \
3197 -initialdir $desktop \
3198 -initialfile "Git [reponame].bat"]
3199 if {$fn != {}} {
3200 if {[catch {
3201 set fd [open $fn w]
3202 set sh [exec cygpath \
3203 --windows \
3204 --absolute \
3205 /bin/sh]
3206 set me [exec cygpath \
3207 --unix \
3208 --absolute \
3209 $argv0]
3210 set gd [exec cygpath \
3211 --unix \
3212 --absolute \
3213 [gitdir]]
3214 set gw [exec cygpath \
3215 --windows \
3216 --absolute \
3217 [file dirname [gitdir]]]
3218 regsub -all ' $me "'\\''" me
3219 regsub -all ' $gd "'\\''" gd
3220 puts $fd "@ECHO Entering $gw"
3221 puts $fd "@ECHO Starting git-gui... please wait..."
3222 puts -nonewline $fd "@\"$sh\" --login -c \""
3223 puts -nonewline $fd "GIT_DIR='$gd'"
3224 puts -nonewline $fd " '$me'"
3225 puts $fd "&\""
3226 close $fd
3227 } err]} {
3228 error_popup "Cannot write script:\n\n$err"
3229 }
3230 }
3231}
3232proc do_macosx_app {} {
3234 global argv0 env
3235 set fn [tk_getSaveFile \
3237 -parent . \
3238 -title "[appname] ([reponame]): Create Desktop Icon" \
3239 -initialdir [file join $env(HOME) Desktop] \
3240 -initialfile "Git [reponame].app"]
3241 if {$fn != {}} {
3242 if {[catch {
3243 set Contents [file join $fn Contents]
3244 set MacOS [file join $Contents MacOS]
3245 set exe [file join $MacOS git-gui]
3246 file mkdir $MacOS
3248 set fd [open [file join $Contents Info.plist] w]
3250 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
3251<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3252<plist version="1.0">
3253<dict>
3254 <key>CFBundleDevelopmentRegion</key>
3255 <string>English</string>
3256 <key>CFBundleExecutable</key>
3257 <string>git-gui</string>
3258 <key>CFBundleIdentifier</key>
3259 <string>org.spearce.git-gui</string>
3260 <key>CFBundleInfoDictionaryVersion</key>
3261 <string>6.0</string>
3262 <key>CFBundlePackageType</key>
3263 <string>APPL</string>
3264 <key>CFBundleSignature</key>
3265 <string>????</string>
3266 <key>CFBundleVersion</key>
3267 <string>1.0</string>
3268 <key>NSPrincipalClass</key>
3269 <string>NSApplication</string>
3270</dict>
3271</plist>}
3272 close $fd
3273 set fd [open $exe w]
3275 set gd [file normalize [gitdir]]
3276 set ep [file normalize [exec git --exec-path]]
3277 regsub -all ' $gd "'\\''" gd
3278 regsub -all ' $ep "'\\''" ep
3279 puts $fd "#!/bin/sh"
3280 foreach name [array names env] {
3281 if {[string match GIT_* $name]} {
3282 regsub -all ' $env($name) "'\\''" v
3283 puts $fd "export $name='$v'"
3284 }
3285 }
3286 puts $fd "export PATH='$ep':\$PATH"
3287 puts $fd "export GIT_DIR='$gd'"
3288 puts $fd "exec [file normalize $argv0]"
3289 close $fd
3290 file attributes $exe -permissions u+x,g+x,o+x
3292 } err]} {
3293 error_popup "Cannot write icon:\n\n$err"
3294 }
3295 }
3296}
3297proc toggle_or_diff {w x y} {
3299 global file_states file_lists current_diff_path ui_index ui_workdir
3300 global last_clicked selected_paths
3301 set pos [split [$w index @$x,$y] .]
3303 set lno [lindex $pos 0]
3304 set col [lindex $pos 1]
3305 set path [lindex $file_lists($w) [expr {$lno - 1}]]
3306 if {$path eq {}} {
3307 set last_clicked {}
3308 return
3309 }
3310 set last_clicked [list $w $lno]
3312 array unset selected_paths
3313 $ui_index tag remove in_sel 0.0 end
3314 $ui_workdir tag remove in_sel 0.0 end
3315 if {$col == 0} {
3317 if {$current_diff_path eq $path} {
3318 set after {reshow_diff;}
3319 } else {
3320 set after {}
3321 }
3322 if {$w eq $ui_index} {
3323 update_indexinfo \
3324 "Unstaging [short_path $path] from commit" \
3325 [list $path] \
3326 [concat $after {set ui_status_value {Ready.}}]
3327 } elseif {$w eq $ui_workdir} {
3328 update_index \
3329 "Adding [short_path $path]" \
3330 [list $path] \
3331 [concat $after {set ui_status_value {Ready.}}]
3332 }
3333 } else {
3334 show_diff $path $w $lno
3335 }
3336}
3337proc add_one_to_selection {w x y} {
3339 global file_lists last_clicked selected_paths
3340 set lno [lindex [split [$w index @$x,$y] .] 0]
3342 set path [lindex $file_lists($w) [expr {$lno - 1}]]
3343 if {$path eq {}} {
3344 set last_clicked {}
3345 return
3346 }
3347 if {$last_clicked ne {}
3349 && [lindex $last_clicked 0] ne $w} {
3350 array unset selected_paths
3351 [lindex $last_clicked 0] tag remove in_sel 0.0 end
3352 }
3353 set last_clicked [list $w $lno]
3355 if {[catch {set in_sel $selected_paths($path)}]} {
3356 set in_sel 0
3357 }
3358 if {$in_sel} {
3359 unset selected_paths($path)
3360 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
3361 } else {
3362 set selected_paths($path) 1
3363 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
3364 }
3365}
3366proc add_range_to_selection {w x y} {
3368 global file_lists last_clicked selected_paths
3369 if {[lindex $last_clicked 0] ne $w} {
3371 toggle_or_diff $w $x $y
3372 return
3373 }
3374 set lno [lindex [split [$w index @$x,$y] .] 0]
3376 set lc [lindex $last_clicked 1]
3377 if {$lc < $lno} {
3378 set begin $lc
3379 set end $lno
3380 } else {
3381 set begin $lno
3382 set end $lc
3383 }
3384 foreach path [lrange $file_lists($w) \
3386 [expr {$begin - 1}] \
3387 [expr {$end - 1}]] {
3388 set selected_paths($path) 1
3389 }
3390 $w tag add in_sel $begin.0 [expr {$end + 1}].0
3391}
3392######################################################################
3394##
3395## config defaults
3396set cursor_ptr arrow
3398font create font_diff -family Courier -size 10
3399font create font_ui
3400catch {
3401 label .dummy
3402 eval font configure font_ui [font actual [.dummy cget -font]]
3403 destroy .dummy
3404}
3405font create font_uibold
3407font create font_diffbold
3408if {[is_Windows]} {
3410 set M1B Control
3411 set M1T Ctrl
3412} elseif {[is_MacOSX]} {
3413 set M1B M1
3414 set M1T Cmd
3415} else {
3416 set M1B M1
3417 set M1T M1
3418}
3419proc apply_config {} {
3421 global repo_config font_descs
3422 foreach option $font_descs {
3424 set name [lindex $option 0]
3425 set font [lindex $option 1]
3426 if {[catch {
3427 foreach {cn cv} $repo_config(gui.$name) {
3428 font configure $font $cn $cv
3429 }
3430 } err]} {
3431 error_popup "Invalid font specified in gui.$name:\n\n$err"
3432 }
3433 foreach {cn cv} [font configure $font] {
3434 font configure ${font}bold $cn $cv
3435 }
3436 font configure ${font}bold -weight bold
3437 }
3438}
3439set default_config(gui.trustmtime) false
3441set default_config(gui.pullsummary) true
3442set default_config(gui.diffcontext) 5
3443set default_config(gui.newbranchtemplate) {}
3444set default_config(gui.fontui) [font configure font_ui]
3445set default_config(gui.fontdiff) [font configure font_diff]
3446set font_descs {
3447 {fontui font_ui {Main Font}}
3448 {fontdiff font_diff {Diff/Console Font}}
3449}
3450load_config 0
3451apply_config
3452######################################################################
3454##
3455## ui construction
3456# -- Menu Bar
3458#
3459menu .mbar -tearoff 0
3460.mbar add cascade -label Repository -menu .mbar.repository
3461.mbar add cascade -label Edit -menu .mbar.edit
3462if {!$single_commit} {
3463 .mbar add cascade -label Branch -menu .mbar.branch
3464}
3465.mbar add cascade -label Commit -menu .mbar.commit
3466if {!$single_commit} {
3467 .mbar add cascade -label Fetch -menu .mbar.fetch
3468 .mbar add cascade -label Pull -menu .mbar.pull
3469 .mbar add cascade -label Push -menu .mbar.push
3470}
3471. configure -menu .mbar
3472# -- Repository Menu
3474#
3475menu .mbar.repository
3476.mbar.repository add command \
3477 -label {Visualize Current Branch} \
3478 -command {do_gitk {}} \
3479 -font font_ui
3480if {![is_MacOSX]} {
3481 .mbar.repository add command \
3482 -label {Visualize All Branches} \
3483 -command {do_gitk {--all}} \
3484 -font font_ui
3485}
3486.mbar.repository add separator
3487if {!$single_commit} {
3489 .mbar.repository add command -label {Compress Database} \
3490 -command do_gc \
3491 -font font_ui
3492 .mbar.repository add command -label {Verify Database} \
3494 -command do_fsck_objects \
3495 -font font_ui
3496 .mbar.repository add separator
3498 if {[is_Windows]} {
3500 .mbar.repository add command \
3501 -label {Create Desktop Icon} \
3502 -command do_windows_shortcut \
3503 -font font_ui
3504 } elseif {[is_MacOSX]} {
3505 .mbar.repository add command \
3506 -label {Create Desktop Icon} \
3507 -command do_macosx_app \
3508 -font font_ui
3509 }
3510}
3511.mbar.repository add command -label Quit \
3513 -command do_quit \
3514 -accelerator $M1T-Q \
3515 -font font_ui
3516# -- Edit Menu
3518#
3519menu .mbar.edit
3520.mbar.edit add command -label Undo \
3521 -command {catch {[focus] edit undo}} \
3522 -accelerator $M1T-Z \
3523 -font font_ui
3524.mbar.edit add command -label Redo \
3525 -command {catch {[focus] edit redo}} \
3526 -accelerator $M1T-Y \
3527 -font font_ui
3528.mbar.edit add separator
3529.mbar.edit add command -label Cut \
3530 -command {catch {tk_textCut [focus]}} \
3531 -accelerator $M1T-X \
3532 -font font_ui
3533.mbar.edit add command -label Copy \
3534 -command {catch {tk_textCopy [focus]}} \
3535 -accelerator $M1T-C \
3536 -font font_ui
3537.mbar.edit add command -label Paste \
3538 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
3539 -accelerator $M1T-V \
3540 -font font_ui
3541.mbar.edit add command -label Delete \
3542 -command {catch {[focus] delete sel.first sel.last}} \
3543 -accelerator Del \
3544 -font font_ui
3545.mbar.edit add separator
3546.mbar.edit add command -label {Select All} \
3547 -command {catch {[focus] tag add sel 0.0 end}} \
3548 -accelerator $M1T-A \
3549 -font font_ui
3550# -- Branch Menu
3552#
3553if {!$single_commit} {
3554 menu .mbar.branch
3555 .mbar.branch add command -label {Create...} \
3557 -command do_create_branch \
3558 -accelerator $M1T-N \
3559 -font font_ui
3560 lappend disable_on_lock [list .mbar.branch entryconf \
3561 [.mbar.branch index last] -state]
3562 .mbar.branch add command -label {Delete...} \
3564 -command do_delete_branch \
3565 -font font_ui
3566 lappend disable_on_lock [list .mbar.branch entryconf \
3567 [.mbar.branch index last] -state]
3568}
3569# -- Commit Menu
3571#
3572menu .mbar.commit
3573.mbar.commit add radiobutton \
3575 -label {New Commit} \
3576 -command do_select_commit_type \
3577 -variable selected_commit_type \
3578 -value new \
3579 -font font_ui
3580lappend disable_on_lock \
3581 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3582.mbar.commit add radiobutton \
3584 -label {Amend Last Commit} \
3585 -command do_select_commit_type \
3586 -variable selected_commit_type \
3587 -value amend \
3588 -font font_ui
3589lappend disable_on_lock \
3590 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3591.mbar.commit add separator
3593.mbar.commit add command -label Rescan \
3595 -command do_rescan \
3596 -accelerator F5 \
3597 -font font_ui
3598lappend disable_on_lock \
3599 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3600.mbar.commit add command -label {Add To Commit} \
3602 -command do_add_selection \
3603 -font font_ui
3604lappend disable_on_lock \
3605 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3606.mbar.commit add command -label {Add All To Commit} \
3608 -command do_add_all \
3609 -accelerator $M1T-I \
3610 -font font_ui
3611lappend disable_on_lock \
3612 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3613.mbar.commit add command -label {Unstage From Commit} \
3615 -command do_unstage_selection \
3616 -font font_ui
3617lappend disable_on_lock \
3618 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3619.mbar.commit add command -label {Revert Changes} \
3621 -command do_revert_selection \
3622 -font font_ui
3623lappend disable_on_lock \
3624 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3625.mbar.commit add separator
3627.mbar.commit add command -label {Sign Off} \
3629 -command do_signoff \
3630 -accelerator $M1T-S \
3631 -font font_ui
3632.mbar.commit add command -label Commit \
3634 -command do_commit \
3635 -accelerator $M1T-Return \
3636 -font font_ui
3637lappend disable_on_lock \
3638 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3639# -- Transport menus
3641#
3642if {!$single_commit} {
3643 menu .mbar.fetch
3644 menu .mbar.pull
3645 menu .mbar.push
3646}
3647if {[is_MacOSX]} {
3649 # -- Apple Menu (Mac OS X only)
3650 #
3651 .mbar add cascade -label Apple -menu .mbar.apple
3652 menu .mbar.apple
3653 .mbar.apple add command -label "About [appname]" \
3655 -command do_about \
3656 -font font_ui
3657 .mbar.apple add command -label "[appname] Options..." \
3658 -command do_options \
3659 -font font_ui
3660} else {
3661 # -- Edit Menu
3662 #
3663 .mbar.edit add separator
3664 .mbar.edit add command -label {Options...} \
3665 -command do_options \
3666 -font font_ui
3667 # -- Tools Menu
3669 #
3670 if {[file exists /usr/local/miga/lib/gui-miga]
3671 && [file exists .pvcsrc]} {
3672 proc do_miga {} {
3673 global ui_status_value
3674 if {![lock_index update]} return
3675 set cmd [list sh --login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
3676 set miga_fd [open "|$cmd" r]
3677 fconfigure $miga_fd -blocking 0
3678 fileevent $miga_fd readable [list miga_done $miga_fd]
3679 set ui_status_value {Running miga...}
3680 }
3681 proc miga_done {fd} {
3682 read $fd 512
3683 if {[eof $fd]} {
3684 close $fd
3685 unlock_index
3686 rescan [list set ui_status_value {Ready.}]
3687 }
3688 }
3689 .mbar add cascade -label Tools -menu .mbar.tools
3690 menu .mbar.tools
3691 .mbar.tools add command -label "Migrate" \
3692 -command do_miga \
3693 -font font_ui
3694 lappend disable_on_lock \
3695 [list .mbar.tools entryconf [.mbar.tools index last] -state]
3696 }
3697 # -- Help Menu
3699 #
3700 .mbar add cascade -label Help -menu .mbar.help
3701 menu .mbar.help
3702 .mbar.help add command -label "About [appname]" \
3704 -command do_about \
3705 -font font_ui
3706}
3707# -- Branch Control
3710#
3711frame .branch \
3712 -borderwidth 1 \
3713 -relief sunken
3714label .branch.l1 \
3715 -text {Current Branch:} \
3716 -anchor w \
3717 -justify left \
3718 -font font_ui
3719label .branch.cb \
3720 -textvariable current_branch \
3721 -anchor w \
3722 -justify left \
3723 -font font_ui
3724pack .branch.l1 -side left
3725pack .branch.cb -side left -fill x
3726pack .branch -side top -fill x
3727# -- Main Window Layout
3729#
3730panedwindow .vpane -orient vertical
3731panedwindow .vpane.files -orient horizontal
3732.vpane add .vpane.files -sticky nsew -height 100 -width 200
3733pack .vpane -anchor n -side top -fill both -expand 1
3734# -- Index File List
3736#
3737frame .vpane.files.index -height 100 -width 200
3738label .vpane.files.index.title -text {Changes To Be Committed} \
3739 -background green \
3740 -font font_ui
3741text $ui_index -background white -borderwidth 0 \
3742 -width 20 -height 10 \
3743 -wrap none \
3744 -font font_ui \
3745 -cursor $cursor_ptr \
3746 -xscrollcommand {.vpane.files.index.sx set} \
3747 -yscrollcommand {.vpane.files.index.sy set} \
3748 -state disabled
3749scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
3750scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
3751pack .vpane.files.index.title -side top -fill x
3752pack .vpane.files.index.sx -side bottom -fill x
3753pack .vpane.files.index.sy -side right -fill y
3754pack $ui_index -side left -fill both -expand 1
3755.vpane.files add .vpane.files.index -sticky nsew
3756# -- Working Directory File List
3758#
3759frame .vpane.files.workdir -height 100 -width 200
3760label .vpane.files.workdir.title -text {Changed But Not Updated} \
3761 -background red \
3762 -font font_ui
3763text $ui_workdir -background white -borderwidth 0 \
3764 -width 20 -height 10 \
3765 -wrap none \
3766 -font font_ui \
3767 -cursor $cursor_ptr \
3768 -xscrollcommand {.vpane.files.workdir.sx set} \
3769 -yscrollcommand {.vpane.files.workdir.sy set} \
3770 -state disabled
3771scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
3772scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
3773pack .vpane.files.workdir.title -side top -fill x
3774pack .vpane.files.workdir.sx -side bottom -fill x
3775pack .vpane.files.workdir.sy -side right -fill y
3776pack $ui_workdir -side left -fill both -expand 1
3777.vpane.files add .vpane.files.workdir -sticky nsew
3778foreach i [list $ui_index $ui_workdir] {
3780 $i tag conf in_diff -font font_uibold
3781 $i tag conf in_sel \
3782 -background [$i cget -foreground] \
3783 -foreground [$i cget -background]
3784}
3785unset i
3786# -- Diff and Commit Area
3788#
3789frame .vpane.lower -height 300 -width 400
3790frame .vpane.lower.commarea
3791frame .vpane.lower.diff -relief sunken -borderwidth 1
3792pack .vpane.lower.commarea -side top -fill x
3793pack .vpane.lower.diff -side bottom -fill both -expand 1
3794.vpane add .vpane.lower -stick nsew
3795# -- Commit Area Buttons
3797#
3798frame .vpane.lower.commarea.buttons
3799label .vpane.lower.commarea.buttons.l -text {} \
3800 -anchor w \
3801 -justify left \
3802 -font font_ui
3803pack .vpane.lower.commarea.buttons.l -side top -fill x
3804pack .vpane.lower.commarea.buttons -side left -fill y
3805button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
3807 -command do_rescan \
3808 -font font_ui
3809pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3810lappend disable_on_lock \
3811 {.vpane.lower.commarea.buttons.rescan conf -state}
3812button .vpane.lower.commarea.buttons.incall -text {Add All} \
3814 -command do_add_all \
3815 -font font_ui
3816pack .vpane.lower.commarea.buttons.incall -side top -fill x
3817lappend disable_on_lock \
3818 {.vpane.lower.commarea.buttons.incall conf -state}
3819button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
3821 -command do_signoff \
3822 -font font_ui
3823pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3824button .vpane.lower.commarea.buttons.commit -text {Commit} \
3826 -command do_commit \
3827 -font font_ui
3828pack .vpane.lower.commarea.buttons.commit -side top -fill x
3829lappend disable_on_lock \
3830 {.vpane.lower.commarea.buttons.commit conf -state}
3831# -- Commit Message Buffer
3833#
3834frame .vpane.lower.commarea.buffer
3835frame .vpane.lower.commarea.buffer.header
3836set ui_comm .vpane.lower.commarea.buffer.t
3837set ui_coml .vpane.lower.commarea.buffer.header.l
3838radiobutton .vpane.lower.commarea.buffer.header.new \
3839 -text {New Commit} \
3840 -command do_select_commit_type \
3841 -variable selected_commit_type \
3842 -value new \
3843 -font font_ui
3844lappend disable_on_lock \
3845 [list .vpane.lower.commarea.buffer.header.new conf -state]
3846radiobutton .vpane.lower.commarea.buffer.header.amend \
3847 -text {Amend Last Commit} \
3848 -command do_select_commit_type \
3849 -variable selected_commit_type \
3850 -value amend \
3851 -font font_ui
3852lappend disable_on_lock \
3853 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3854label $ui_coml \
3855 -anchor w \
3856 -justify left \
3857 -font font_ui
3858proc trace_commit_type {varname args} {
3859 global ui_coml commit_type
3860 switch -glob -- $commit_type {
3861 initial {set txt {Initial Commit Message:}}
3862 amend {set txt {Amended Commit Message:}}
3863 amend-initial {set txt {Amended Initial Commit Message:}}
3864 amend-merge {set txt {Amended Merge Commit Message:}}
3865 merge {set txt {Merge Commit Message:}}
3866 * {set txt {Commit Message:}}
3867 }
3868 $ui_coml conf -text $txt
3869}
3870trace add variable commit_type write trace_commit_type
3871pack $ui_coml -side left -fill x
3872pack .vpane.lower.commarea.buffer.header.amend -side right
3873pack .vpane.lower.commarea.buffer.header.new -side right
3874text $ui_comm -background white -borderwidth 1 \
3876 -undo true \
3877 -maxundo 20 \
3878 -autoseparators true \
3879 -relief sunken \
3880 -width 75 -height 9 -wrap none \
3881 -font font_diff \
3882 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3883scrollbar .vpane.lower.commarea.buffer.sby \
3884 -command [list $ui_comm yview]
3885pack .vpane.lower.commarea.buffer.header -side top -fill x
3886pack .vpane.lower.commarea.buffer.sby -side right -fill y
3887pack $ui_comm -side left -fill y
3888pack .vpane.lower.commarea.buffer -side left -fill y
3889# -- Commit Message Buffer Context Menu
3891#
3892set ctxm .vpane.lower.commarea.buffer.ctxm
3893menu $ctxm -tearoff 0
3894$ctxm add command \
3895 -label {Cut} \
3896 -font font_ui \
3897 -command {tk_textCut $ui_comm}
3898$ctxm add command \
3899 -label {Copy} \
3900 -font font_ui \
3901 -command {tk_textCopy $ui_comm}
3902$ctxm add command \
3903 -label {Paste} \
3904 -font font_ui \
3905 -command {tk_textPaste $ui_comm}
3906$ctxm add command \
3907 -label {Delete} \
3908 -font font_ui \
3909 -command {$ui_comm delete sel.first sel.last}
3910$ctxm add separator
3911$ctxm add command \
3912 -label {Select All} \
3913 -font font_ui \
3914 -command {$ui_comm tag add sel 0.0 end}
3915$ctxm add command \
3916 -label {Copy All} \
3917 -font font_ui \
3918 -command {
3919 $ui_comm tag add sel 0.0 end
3920 tk_textCopy $ui_comm
3921 $ui_comm tag remove sel 0.0 end
3922 }
3923$ctxm add separator
3924$ctxm add command \
3925 -label {Sign Off} \
3926 -font font_ui \
3927 -command do_signoff
3928bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
3929# -- Diff Header
3931#
3932set current_diff_path {}
3933set diff_actions [list]
3934proc trace_current_diff_path {varname args} {
3935 global current_diff_path diff_actions file_states
3936 if {$current_diff_path eq {}} {
3937 set s {}
3938 set f {}
3939 set p {}
3940 set o disabled
3941 } else {
3942 set p $current_diff_path
3943 set s [mapdesc [lindex $file_states($p) 0] $p]
3944 set f {File:}
3945 set p [escape_path $p]
3946 set o normal
3947 }
3948 .vpane.lower.diff.header.status configure -text $s
3950 .vpane.lower.diff.header.file configure -text $f
3951 .vpane.lower.diff.header.path configure -text $p
3952 foreach w $diff_actions {
3953 uplevel #0 $w $o
3954 }
3955}
3956trace add variable current_diff_path write trace_current_diff_path
3957frame .vpane.lower.diff.header -background orange
3959label .vpane.lower.diff.header.status \
3960 -background orange \
3961 -width $max_status_desc \
3962 -anchor w \
3963 -justify left \
3964 -font font_ui
3965label .vpane.lower.diff.header.file \
3966 -background orange \
3967 -anchor w \
3968 -justify left \
3969 -font font_ui
3970label .vpane.lower.diff.header.path \
3971 -background orange \
3972 -anchor w \
3973 -justify left \
3974 -font font_ui
3975pack .vpane.lower.diff.header.status -side left
3976pack .vpane.lower.diff.header.file -side left
3977pack .vpane.lower.diff.header.path -fill x
3978set ctxm .vpane.lower.diff.header.ctxm
3979menu $ctxm -tearoff 0
3980$ctxm add command \
3981 -label {Copy} \
3982 -font font_ui \
3983 -command {
3984 clipboard clear
3985 clipboard append \
3986 -format STRING \
3987 -type STRING \
3988 -- $current_diff_path
3989 }
3990lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3991bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3992# -- Diff Body
3994#
3995frame .vpane.lower.diff.body
3996set ui_diff .vpane.lower.diff.body.t
3997text $ui_diff -background white -borderwidth 0 \
3998 -width 80 -height 15 -wrap none \
3999 -font font_diff \
4000 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
4001 -yscrollcommand {.vpane.lower.diff.body.sby set} \
4002 -state disabled
4003scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
4004 -command [list $ui_diff xview]
4005scrollbar .vpane.lower.diff.body.sby -orient vertical \
4006 -command [list $ui_diff yview]
4007pack .vpane.lower.diff.body.sbx -side bottom -fill x
4008pack .vpane.lower.diff.body.sby -side right -fill y
4009pack $ui_diff -side left -fill both -expand 1
4010pack .vpane.lower.diff.header -side top -fill x
4011pack .vpane.lower.diff.body -side bottom -fill both -expand 1
4012$ui_diff tag conf d_@ -foreground blue -font font_diffbold
4014$ui_diff tag conf d_+ -foreground {#00a000}
4015$ui_diff tag conf d_- -foreground red
4016$ui_diff tag conf d_++ -foreground {#00a000}
4018$ui_diff tag conf d_-- -foreground red
4019$ui_diff tag conf d_+s \
4020 -foreground {#00a000} \
4021 -background {#e2effa}
4022$ui_diff tag conf d_-s \
4023 -foreground red \
4024 -background {#e2effa}
4025$ui_diff tag conf d_s+ \
4026 -foreground {#00a000} \
4027 -background ivory1
4028$ui_diff tag conf d_s- \
4029 -foreground red \
4030 -background ivory1
4031$ui_diff tag conf d<<<<<<< \
4033 -foreground orange \
4034 -font font_diffbold
4035$ui_diff tag conf d======= \
4036 -foreground orange \
4037 -font font_diffbold
4038$ui_diff tag conf d>>>>>>> \
4039 -foreground orange \
4040 -font font_diffbold
4041$ui_diff tag raise sel
4043# -- Diff Body Context Menu
4045#
4046set ctxm .vpane.lower.diff.body.ctxm
4047menu $ctxm -tearoff 0
4048$ctxm add command \
4049 -label {Refresh} \
4050 -font font_ui \
4051 -command reshow_diff
4052$ctxm add command \
4053 -label {Copy} \
4054 -font font_ui \
4055 -command {tk_textCopy $ui_diff}
4056lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4057$ctxm add command \
4058 -label {Select All} \
4059 -font font_ui \
4060 -command {$ui_diff tag add sel 0.0 end}
4061lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4062$ctxm add command \
4063 -label {Copy All} \
4064 -font font_ui \
4065 -command {
4066 $ui_diff tag add sel 0.0 end
4067 tk_textCopy $ui_diff
4068 $ui_diff tag remove sel 0.0 end
4069 }
4070lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4071$ctxm add separator
4072$ctxm add command \
4073 -label {Decrease Font Size} \
4074 -font font_ui \
4075 -command {incr_font_size font_diff -1}
4076lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4077$ctxm add command \
4078 -label {Increase Font Size} \
4079 -font font_ui \
4080 -command {incr_font_size font_diff 1}
4081lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4082$ctxm add separator
4083$ctxm add command \
4084 -label {Show Less Context} \
4085 -font font_ui \
4086 -command {if {$repo_config(gui.diffcontext) >= 2} {
4087 incr repo_config(gui.diffcontext) -1
4088 reshow_diff
4089 }}
4090lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4091$ctxm add command \
4092 -label {Show More Context} \
4093 -font font_ui \
4094 -command {
4095 incr repo_config(gui.diffcontext)
4096 reshow_diff
4097 }
4098lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4099$ctxm add separator
4100$ctxm add command -label {Options...} \
4101 -font font_ui \
4102 -command do_options
4103bind_button3 $ui_diff "tk_popup $ctxm %X %Y"
4104# -- Status Bar
4106#
4107set ui_status_value {Initializing...}
4108label .status -textvariable ui_status_value \
4109 -anchor w \
4110 -justify left \
4111 -borderwidth 1 \
4112 -relief sunken \
4113 -font font_ui
4114pack .status -anchor w -side bottom -fill x
4115# -- Load geometry
4117#
4118catch {
4119set gm $repo_config(gui.geometry)
4120wm geometry . [lindex $gm 0]
4121.vpane sash place 0 \
4122 [lindex [.vpane sash coord 0] 0] \
4123 [lindex $gm 1]
4124.vpane.files sash place 0 \
4125 [lindex $gm 2] \
4126 [lindex [.vpane.files sash coord 0] 1]
4127unset gm
4128}
4129# -- Key Bindings
4131#
4132bind $ui_comm <$M1B-Key-Return> {do_commit;break}
4133bind $ui_comm <$M1B-Key-i> {do_add_all;break}
4134bind $ui_comm <$M1B-Key-I> {do_add_all;break}
4135bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
4136bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
4137bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
4138bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
4139bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
4140bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
4141bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
4142bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
4143bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
4145bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
4146bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
4147bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
4148bind $ui_diff <$M1B-Key-v> {break}
4149bind $ui_diff <$M1B-Key-V> {break}
4150bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
4151bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
4152bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
4153bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
4154bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
4155bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
4156if {!$single_commit} {
4158 bind . <$M1B-Key-n> do_create_branch
4159 bind . <$M1B-Key-N> do_create_branch
4160}
4161bind . <Destroy> do_quit
4163bind all <Key-F5> do_rescan
4164bind all <$M1B-Key-r> do_rescan
4165bind all <$M1B-Key-R> do_rescan
4166bind . <$M1B-Key-s> do_signoff
4167bind . <$M1B-Key-S> do_signoff
4168bind . <$M1B-Key-i> do_add_all
4169bind . <$M1B-Key-I> do_add_all
4170bind . <$M1B-Key-Return> do_commit
4171bind all <$M1B-Key-q> do_quit
4172bind all <$M1B-Key-Q> do_quit
4173bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
4174bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
4175foreach i [list $ui_index $ui_workdir] {
4176 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
4177 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
4178 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
4179}
4180unset i
4181set file_lists($ui_index) [list]
4183set file_lists($ui_workdir) [list]
4184set HEAD {}
4186set PARENT {}
4187set MERGE_HEAD [list]
4188set commit_type {}
4189set empty_tree {}
4190set current_branch {}
4191set current_diff_path {}
4192set selected_commit_type new
4193wm title . "[appname] ([file normalize [file dirname [gitdir]]])"
4195focus -force $ui_comm
4196# -- Warn the user about environmental problems. Cygwin's Tcl
4198# does *not* pass its env array onto any processes it spawns.
4199# This means that git processes get none of our environment.
4200#
4201if {[is_Windows]} {
4202 set ignored_env 0
4203 set suggest_user {}
4204 set msg "Possible environment issues exist.
4205The following environment variables are probably
4207going to be ignored by any Git subprocess run
4208by [appname]:
4209"
4211 foreach name [array names env] {
4212 switch -regexp -- $name {
4213 {^GIT_INDEX_FILE$} -
4214 {^GIT_OBJECT_DIRECTORY$} -
4215 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
4216 {^GIT_DIFF_OPTS$} -
4217 {^GIT_EXTERNAL_DIFF$} -
4218 {^GIT_PAGER$} -
4219 {^GIT_TRACE$} -
4220 {^GIT_CONFIG$} -
4221 {^GIT_CONFIG_LOCAL$} -
4222 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
4223 append msg " - $name\n"
4224 incr ignored_env
4225 }
4226 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
4227 append msg " - $name\n"
4228 incr ignored_env
4229 set suggest_user $name
4230 }
4231 }
4232 }
4233 if {$ignored_env > 0} {
4234 append msg "
4235This is due to a known issue with the
4236Tcl binary distributed by Cygwin."
4237 if {$suggest_user ne {}} {
4239 append msg "
4240A good replacement for $suggest_user
4242is placing values for the user.name and
4243user.email settings into your personal
4244~/.gitconfig file.
4245"
4246 }
4247 warn_popup $msg
4248 }
4249 unset ignored_env msg suggest_user name
4250}
4251# -- Only initialize complex UI if we are going to stay running.
4253#
4254if {!$single_commit} {
4255 load_all_remotes
4256 load_all_heads
4257 populate_branch_menu
4259 populate_fetch_menu .mbar.fetch
4260 populate_pull_menu .mbar.pull
4261 populate_push_menu .mbar.push
4262}
4263# -- Only suggest a gc run if we are going to stay running.
4265#
4266if {!$single_commit} {
4267 set object_limit 2000
4268 if {[is_Windows]} {set object_limit 200}
4269 regexp {^([0-9]+) objects,} [exec git count-objects] _junk objects_current
4270 if {$objects_current >= $object_limit} {
4271 if {[ask_popup \
4272 "This repository currently has $objects_current loose objects.
4273To maintain optimal performance it is strongly
4275recommended that you compress the database
4276when more than $object_limit loose objects exist.
4277Compress the database now?"] eq yes} {
4279 do_gc
4280 }
4281 }
4282 unset object_limit _junk objects_current
4283}
4284lock_index begin-read
4286after 1 do_rescan