d59e720408645d275c20c91e0d88063e0063edd6
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} {
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 {$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.
590This file will now be removed from the modified
592files list, to prevent possible confusion.
593"
594 if {[catch {exec git update-index -- $path} err]} {
595 error_popup "Failed to refresh index:\n\n$err"
596 }
597 clear_diff
599 display_file $path __
600}
601proc show_diff {path w {lno {}}} {
603 global file_states file_lists
604 global is_3way_diff diff_active repo_config
605 global ui_diff ui_status_value ui_index ui_workdir
606 global current_diff_path current_diff_side
607 if {$diff_active || ![lock_index read]} return
609 clear_diff
611 if {$w eq {} || $lno == {}} {
612 foreach w [array names file_lists] {
613 set lno [lsearch -sorted $file_lists($w) $path]
614 if {$lno >= 0} {
615 incr lno
616 break
617 }
618 }
619 }
620 if {$w ne {} && $lno >= 1} {
621 $w tag add in_diff $lno.0 [expr {$lno + 1}].0
622 }
623 set s $file_states($path)
625 set m [lindex $s 0]
626 set is_3way_diff 0
627 set diff_active 1
628 set current_diff_path $path
629 set current_diff_side $w
630 set ui_status_value "Loading diff of [escape_path $path]..."
631 # - Git won't give us the diff, there's nothing to compare to!
633 #
634 if {$m eq {_O}} {
635 if {[catch {
636 set fd [open $path r]
637 set content [read $fd]
638 close $fd
639 } err ]} {
640 set diff_active 0
641 unlock_index
642 set ui_status_value "Unable to display [escape_path $path]"
643 error_popup "Error loading file:\n\n$err"
644 return
645 }
646 $ui_diff conf -state normal
647 $ui_diff insert end $content
648 $ui_diff conf -state disabled
649 set diff_active 0
650 unlock_index
651 set ui_status_value {Ready.}
652 return
653 }
654 set cmd [list | git]
656 if {$w eq $ui_index} {
657 lappend cmd diff-index
658 lappend cmd --cached
659 } elseif {$w eq $ui_workdir} {
660 if {[string index $m 0] eq {U}} {
661 lappend cmd diff
662 } else {
663 lappend cmd diff-files
664 }
665 }
666 lappend cmd -p
668 lappend cmd --no-color
669 if {$repo_config(gui.diffcontext) > 0} {
670 lappend cmd "-U$repo_config(gui.diffcontext)"
671 }
672 if {$w eq $ui_index} {
673 lappend cmd [PARENT]
674 }
675 lappend cmd --
676 lappend cmd $path
677 if {[catch {set fd [open $cmd r]} err]} {
679 set diff_active 0
680 unlock_index
681 set ui_status_value "Unable to display [escape_path $path]"
682 error_popup "Error loading diff:\n\n$err"
683 return
684 }
685 fconfigure $fd -blocking 0 -translation auto
687 fileevent $fd readable [list read_diff $fd]
688}
689proc read_diff {fd} {
691 global ui_diff ui_status_value is_3way_diff diff_active
692 global repo_config
693 $ui_diff conf -state normal
695 while {[gets $fd line] >= 0} {
696 # -- Cleanup uninteresting diff header lines.
697 #
698 if {[string match {diff --git *} $line]} continue
699 if {[string match {diff --cc *} $line]} continue
700 if {[string match {diff --combined *} $line]} continue
701 if {[string match {--- *} $line]} continue
702 if {[string match {+++ *} $line]} continue
703 if {$line eq {deleted file mode 120000}} {
704 set line "deleted symlink"
705 }
706 # -- Automatically detect if this is a 3 way diff.
708 #
709 if {[string match {@@@ *} $line]} {set is_3way_diff 1}
710 if {[string match {index *} $line]
712 || [regexp {^\* Unmerged path } $line]} {
713 set tags {}
714 } elseif {$is_3way_diff} {
715 set op [string range $line 0 1]
716 switch -- $op {
717 { } {set tags {}}
718 {@@} {set tags d_@}
719 { +} {set tags d_s+}
720 { -} {set tags d_s-}
721 {+ } {set tags d_+s}
722 {- } {set tags d_-s}
723 {--} {set tags d_--}
724 {++} {
725 if {[regexp {^\+\+([<>]{7} |={7})} $line _g op]} {
726 set line [string replace $line 0 1 { }]
727 set tags d$op
728 } else {
729 set tags d_++
730 }
731 }
732 default {
733 puts "error: Unhandled 3 way diff marker: {$op}"
734 set tags {}
735 }
736 }
737 } else {
738 set op [string index $line 0]
739 switch -- $op {
740 { } {set tags {}}
741 {@} {set tags d_@}
742 {-} {set tags d_-}
743 {+} {
744 if {[regexp {^\+([<>]{7} |={7})} $line _g op]} {
745 set line [string replace $line 0 0 { }]
746 set tags d$op
747 } else {
748 set tags d_+
749 }
750 }
751 default {
752 puts "error: Unhandled 2 way diff marker: {$op}"
753 set tags {}
754 }
755 }
756 }
757 $ui_diff insert end $line $tags
758 $ui_diff insert end "\n" $tags
759 }
760 $ui_diff conf -state disabled
761 if {[eof $fd]} {
763 close $fd
764 set diff_active 0
765 unlock_index
766 set ui_status_value {Ready.}
767 if {$repo_config(gui.trustmtime) eq {true}
769 && [$ui_diff index end] eq {2.0}} {
770 handle_empty_diff
771 }
772 }
773}
774######################################################################
776##
777## commit
778proc load_last_commit {} {
780 global HEAD PARENT MERGE_HEAD commit_type ui_comm
781 if {[llength $PARENT] == 0} {
783 error_popup {There is nothing to amend.
784You are about to create the initial commit.
786There is no commit before this to amend.
787}
788 return
789 }
790 repository_state curType curHEAD curMERGE_HEAD
792 if {$curType eq {merge}} {
793 error_popup {Cannot amend while merging.
794You are currently in the middle of a merge that
796has not been fully completed. You cannot amend
797the prior commit unless you first abort the
798current merge activity.
799}
800 return
801 }
802 set msg {}
804 set parents [list]
805 if {[catch {
806 set fd [open "| git cat-file commit $curHEAD" r]
807 while {[gets $fd line] > 0} {
808 if {[string match {parent *} $line]} {
809 lappend parents [string range $line 7 end]
810 }
811 }
812 set msg [string trim [read $fd]]
813 close $fd
814 } err]} {
815 error_popup "Error loading commit data for amend:\n\n$err"
816 return
817 }
818 set HEAD $curHEAD
820 set PARENT $parents
821 set MERGE_HEAD [list]
822 switch -- [llength $parents] {
823 0 {set commit_type amend-initial}
824 1 {set commit_type amend}
825 default {set commit_type amend-merge}
826 }
827 $ui_comm delete 0.0 end
829 $ui_comm insert end $msg
830 $ui_comm edit reset
831 $ui_comm edit modified false
832 rescan {set ui_status_value {Ready.}}
833}
834proc create_new_commit {} {
836 global commit_type ui_comm
837 set commit_type normal
839 $ui_comm delete 0.0 end
840 $ui_comm edit reset
841 $ui_comm edit modified false
842 rescan {set ui_status_value {Ready.}}
843}
844set GIT_COMMITTER_IDENT {}
846proc committer_ident {} {
848 global GIT_COMMITTER_IDENT
849 if {$GIT_COMMITTER_IDENT eq {}} {
851 if {[catch {set me [exec git var GIT_COMMITTER_IDENT]} err]} {
852 error_popup "Unable to obtain your identity:\n\n$err"
853 return {}
854 }
855 if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \
856 $me me GIT_COMMITTER_IDENT]} {
857 error_popup "Invalid GIT_COMMITTER_IDENT:\n\n$me"
858 return {}
859 }
860 }
861 return $GIT_COMMITTER_IDENT
863}
864proc commit_tree {} {
866 global HEAD commit_type file_states ui_comm repo_config
867 global ui_status_value pch_error
868 if {![lock_index update]} return
870 if {[committer_ident] eq {}} return
871 # -- Our in memory state should match the repository.
873 #
874 repository_state curType curHEAD curMERGE_HEAD
875 if {[string match amend* $commit_type]
876 && $curType eq {normal}
877 && $curHEAD eq $HEAD} {
878 } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
879 info_popup {Last scanned state does not match repository state.
880Another Git program has modified this repository
882since the last scan. A rescan must be performed
883before another commit can be created.
884The rescan will be automatically started now.
886}
887 unlock_index
888 rescan {set ui_status_value {Ready.}}
889 return
890 }
891 # -- At least one file should differ in the index.
893 #
894 set files_ready 0
895 foreach path [array names file_states] {
896 switch -glob -- [lindex $file_states($path) 0] {
897 _? {continue}
898 A? -
899 D? -
900 M? {set files_ready 1}
901 U? {
902 error_popup "Unmerged files cannot be committed.
903File [short_path $path] has merge conflicts.
905You must resolve them and add the file before committing.
906"
907 unlock_index
908 return
909 }
910 default {
911 error_popup "Unknown file state [lindex $s 0] detected.
912File [short_path $path] cannot be committed by this program.
914"
915 }
916 }
917 }
918 if {!$files_ready} {
919 info_popup {No changes to commit.
920You must add at least 1 file before you can commit.
922}
923 unlock_index
924 return
925 }
926 # -- A message is required.
928 #
929 set msg [string trim [$ui_comm get 1.0 end]]
930 if {$msg eq {}} {
931 error_popup {Please supply a commit message.
932A good commit message has the following format:
934- First line: Describe in one sentance what you did.
936- Second line: Blank
937- Remaining lines: Describe why this change is good.
938}
939 unlock_index
940 return
941 }
942 # -- Run the pre-commit hook.
944 #
945 set pchook [gitdir hooks pre-commit]
946 # On Cygwin [file executable] might lie so we need to ask
948 # the shell if the hook is executable. Yes that's annoying.
949 #
950 if {[is_Windows] && [file isfile $pchook]} {
951 set pchook [list sh -c [concat \
952 "if test -x \"$pchook\";" \
953 "then exec \"$pchook\" 2>&1;" \
954 "fi"]]
955 } elseif {[file executable $pchook]} {
956 set pchook [list $pchook |& cat]
957 } else {
958 commit_writetree $curHEAD $msg
959 return
960 }
961 set ui_status_value {Calling pre-commit hook...}
963 set pch_error {}
964 set fd_ph [open "| $pchook" r]
965 fconfigure $fd_ph -blocking 0 -translation binary
966 fileevent $fd_ph readable \
967 [list commit_prehook_wait $fd_ph $curHEAD $msg]
968}
969proc commit_prehook_wait {fd_ph curHEAD msg} {
971 global pch_error ui_status_value
972 append pch_error [read $fd_ph]
974 fconfigure $fd_ph -blocking 1
975 if {[eof $fd_ph]} {
976 if {[catch {close $fd_ph}]} {
977 set ui_status_value {Commit declined by pre-commit hook.}
978 hook_failed_popup pre-commit $pch_error
979 unlock_index
980 } else {
981 commit_writetree $curHEAD $msg
982 }
983 set pch_error {}
984 return
985 }
986 fconfigure $fd_ph -blocking 0
987}
988proc commit_writetree {curHEAD msg} {
990 global ui_status_value
991 set ui_status_value {Committing changes...}
993 set fd_wt [open "| git write-tree" r]
994 fileevent $fd_wt readable \
995 [list commit_committree $fd_wt $curHEAD $msg]
996}
997proc commit_committree {fd_wt curHEAD msg} {
999 global HEAD PARENT MERGE_HEAD commit_type
1000 global single_commit
1001 global ui_status_value ui_comm selected_commit_type
1002 global file_states selected_paths rescan_active
1003 gets $fd_wt tree_id
1005 if {$tree_id eq {} || [catch {close $fd_wt} err]} {
1006 error_popup "write-tree failed:\n\n$err"
1007 set ui_status_value {Commit failed.}
1008 unlock_index
1009 return
1010 }
1011 # -- Create the commit.
1013 #
1014 set cmd [list git commit-tree $tree_id]
1015 set parents [concat $PARENT $MERGE_HEAD]
1016 if {[llength $parents] > 0} {
1017 foreach p $parents {
1018 lappend cmd -p $p
1019 }
1020 } else {
1021 # git commit-tree writes to stderr during initial commit.
1022 lappend cmd 2>/dev/null
1023 }
1024 lappend cmd << $msg
1025 if {[catch {set cmt_id [eval exec $cmd]} err]} {
1026 error_popup "commit-tree failed:\n\n$err"
1027 set ui_status_value {Commit failed.}
1028 unlock_index
1029 return
1030 }
1031 # -- Update the HEAD ref.
1033 #
1034 set reflogm commit
1035 if {$commit_type ne {normal}} {
1036 append reflogm " ($commit_type)"
1037 }
1038 set i [string first "\n" $msg]
1039 if {$i >= 0} {
1040 append reflogm {: } [string range $msg 0 [expr {$i - 1}]]
1041 } else {
1042 append reflogm {: } $msg
1043 }
1044 set cmd [list git update-ref -m $reflogm HEAD $cmt_id $curHEAD]
1045 if {[catch {eval exec $cmd} err]} {
1046 error_popup "update-ref failed:\n\n$err"
1047 set ui_status_value {Commit failed.}
1048 unlock_index
1049 return
1050 }
1051 # -- Cleanup after ourselves.
1053 #
1054 catch {file delete [gitdir MERGE_HEAD]}
1055 catch {file delete [gitdir MERGE_MSG]}
1056 catch {file delete [gitdir SQUASH_MSG]}
1057 catch {file delete [gitdir GITGUI_MSG]}
1058 # -- Let rerere do its thing.
1060 #
1061 if {[file isdirectory [gitdir rr-cache]]} {
1062 catch {exec git rerere}
1063 }
1064 # -- Run the post-commit hook.
1066 #
1067 set pchook [gitdir hooks post-commit]
1068 if {[is_Windows] && [file isfile $pchook]} {
1069 set pchook [list sh -c [concat \
1070 "if test -x \"$pchook\";" \
1071 "then exec \"$pchook\";" \
1072 "fi"]]
1073 } elseif {![file executable $pchook]} {
1074 set pchook {}
1075 }
1076 if {$pchook ne {}} {
1077 catch {exec $pchook &}
1078 }
1079 $ui_comm delete 0.0 end
1081 $ui_comm edit reset
1082 $ui_comm edit modified false
1083 if {$single_commit} do_quit
1085 # -- Update in memory status
1087 #
1088 set selected_commit_type new
1089 set commit_type normal
1090 set HEAD $cmt_id
1091 set PARENT $cmt_id
1092 set MERGE_HEAD [list]
1093 foreach path [array names file_states] {
1095 set s $file_states($path)
1096 set m [lindex $s 0]
1097 switch -glob -- $m {
1098 _O -
1099 _M -
1100 _D {continue}
1101 __ -
1102 A_ -
1103 M_ -
1104 D_ {
1105 unset file_states($path)
1106 catch {unset selected_paths($path)}
1107 }
1108 DO {
1109 set file_states($path) [list _O [lindex $s 1] {} {}]
1110 }
1111 AM -
1112 AD -
1113 MM -
1114 MD {
1115 set file_states($path) [list \
1116 _[string index $m 1] \
1117 [lindex $s 1] \
1118 [lindex $s 3] \
1119 {}]
1120 }
1121 }
1122 }
1123 display_all_files
1125 unlock_index
1126 reshow_diff
1127 set ui_status_value \
1128 "Changes committed as [string range $cmt_id 0 7]."
1129}
1130######################################################################
1132##
1133## fetch pull push
1134proc fetch_from {remote} {
1136 set w [new_console "fetch $remote" \
1137 "Fetching new changes from $remote"]
1138 set cmd [list git fetch]
1139 lappend cmd $remote
1140 console_exec $w $cmd
1141}
1142proc pull_remote {remote branch} {
1144 global HEAD commit_type file_states repo_config
1145 if {![lock_index update]} return
1147 # -- Our in memory state should match the repository.
1149 #
1150 repository_state curType curHEAD curMERGE_HEAD
1151 if {$commit_type ne $curType || $HEAD ne $curHEAD} {
1152 info_popup {Last scanned state does not match repository state.
1153Another Git program has modified this repository
1155since the last scan. A rescan must be performed
1156before a pull operation can be started.
1157The rescan will be automatically started now.
1159}
1160 unlock_index
1161 rescan {set ui_status_value {Ready.}}
1162 return
1163 }
1164 # -- No differences should exist before a pull.
1166 #
1167 if {[array size file_states] != 0} {
1168 error_popup {Uncommitted but modified files are present.
1169You should not perform a pull with unmodified
1171files in your working directory as Git will be
1172unable to recover from an incorrect merge.
1173You should commit or revert all changes before
1175starting a pull operation.
1176}
1177 unlock_index
1178 return
1179 }
1180 set w [new_console "pull $remote $branch" \
1182 "Pulling new changes from branch $branch in $remote"]
1183 set cmd [list git pull]
1184 if {$repo_config(gui.pullsummary) eq {false}} {
1185 lappend cmd --no-summary
1186 }
1187 lappend cmd $remote
1188 lappend cmd $branch
1189 console_exec $w $cmd [list post_pull_remote $remote $branch]
1190}
1191proc post_pull_remote {remote branch success} {
1193 global HEAD PARENT MERGE_HEAD commit_type selected_commit_type
1194 global ui_status_value
1195 unlock_index
1197 if {$success} {
1198 repository_state commit_type HEAD MERGE_HEAD
1199 set PARENT $HEAD
1200 set selected_commit_type new
1201 set ui_status_value "Pulling $branch from $remote complete."
1202 } else {
1203 rescan [list set ui_status_value \
1204 "Conflicts detected while pulling $branch from $remote."]
1205 }
1206}
1207proc push_to {remote} {
1209 set w [new_console "push $remote" \
1210 "Pushing changes to $remote"]
1211 set cmd [list git push]
1212 lappend cmd $remote
1213 console_exec $w $cmd
1214}
1215######################################################################
1217##
1218## ui helpers
1219proc mapicon {w state path} {
1221 global all_icons
1222 if {[catch {set r $all_icons($state$w)}]} {
1224 puts "error: no icon for $w state={$state} $path"
1225 return file_plain
1226 }
1227 return $r
1228}
1229proc mapdesc {state path} {
1231 global all_descs
1232 if {[catch {set r $all_descs($state)}]} {
1234 puts "error: no desc for state={$state} $path"
1235 return $state
1236 }
1237 return $r
1238}
1239proc escape_path {path} {
1241 regsub -all "\n" $path "\\n" path
1242 return $path
1243}
1244proc short_path {path} {
1246 return [escape_path [lindex [file split $path] end]]
1247}
1248set next_icon_id 0
1250set null_sha1 [string repeat 0 40]
1251proc merge_state {path new_state {head_info {}} {index_info {}}} {
1253 global file_states next_icon_id null_sha1
1254 set s0 [string index $new_state 0]
1256 set s1 [string index $new_state 1]
1257 if {[catch {set info $file_states($path)}]} {
1259 set state __
1260 set icon n[incr next_icon_id]
1261 } else {
1262 set state [lindex $info 0]
1263 set icon [lindex $info 1]
1264 if {$head_info eq {}} {set head_info [lindex $info 2]}
1265 if {$index_info eq {}} {set index_info [lindex $info 3]}
1266 }
1267 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1269 elseif {$s0 eq {_}} {set s0 _}
1270 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1272 elseif {$s1 eq {_}} {set s1 _}
1273 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1275 set head_info [list 0 $null_sha1]
1276 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1277 && $head_info eq {}} {
1278 set head_info $index_info
1279 }
1280 set file_states($path) [list $s0$s1 $icon \
1282 $head_info $index_info \
1283 ]
1284 return $state
1285}
1286proc display_file_helper {w path icon_name old_m new_m} {
1288 global file_lists
1289 if {$new_m eq {_}} {
1291 set lno [lsearch -sorted $file_lists($w) $path]
1292 if {$lno >= 0} {
1293 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1294 incr lno
1295 $w conf -state normal
1296 $w delete $lno.0 [expr {$lno + 1}].0
1297 $w conf -state disabled
1298 }
1299 } elseif {$old_m eq {_} && $new_m ne {_}} {
1300 lappend file_lists($w) $path
1301 set file_lists($w) [lsort -unique $file_lists($w)]
1302 set lno [lsearch -sorted $file_lists($w) $path]
1303 incr lno
1304 $w conf -state normal
1305 $w image create $lno.0 \
1306 -align center -padx 5 -pady 1 \
1307 -name $icon_name \
1308 -image [mapicon $w $new_m $path]
1309 $w insert $lno.1 "[escape_path $path]\n"
1310 $w conf -state disabled
1311 } elseif {$old_m ne $new_m} {
1312 $w conf -state normal
1313 $w image conf $icon_name -image [mapicon $w $new_m $path]
1314 $w conf -state disabled
1315 }
1316}
1317proc display_file {path state} {
1319 global file_states selected_paths
1320 global ui_index ui_workdir
1321 set old_m [merge_state $path $state]
1323 set s $file_states($path)
1324 set new_m [lindex $s 0]
1325 set icon_name [lindex $s 1]
1326 set o [string index $old_m 0]
1328 set n [string index $new_m 0]
1329 if {$o eq {U}} {
1330 set o _
1331 }
1332 if {$n eq {U}} {
1333 set n _
1334 }
1335 display_file_helper $ui_index $path $icon_name $o $n
1336 if {[string index $old_m 0] eq {U}} {
1338 set o U
1339 } else {
1340 set o [string index $old_m 1]
1341 }
1342 if {[string index $new_m 0] eq {U}} {
1343 set n U
1344 } else {
1345 set n [string index $new_m 1]
1346 }
1347 display_file_helper $ui_workdir $path $icon_name $o $n
1348 if {$new_m eq {__}} {
1350 unset file_states($path)
1351 catch {unset selected_paths($path)}
1352 }
1353}
1354proc display_all_files_helper {w path icon_name m} {
1356 global file_lists
1357 lappend file_lists($w) $path
1359 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1360 $w image create end \
1361 -align center -padx 5 -pady 1 \
1362 -name $icon_name \
1363 -image [mapicon $w $m $path]
1364 $w insert end "[escape_path $path]\n"
1365}
1366proc display_all_files {} {
1368 global ui_index ui_workdir
1369 global file_states file_lists
1370 global last_clicked
1371 $ui_index conf -state normal
1373 $ui_workdir conf -state normal
1374 $ui_index delete 0.0 end
1376 $ui_workdir delete 0.0 end
1377 set last_clicked {}
1378 set file_lists($ui_index) [list]
1380 set file_lists($ui_workdir) [list]
1381 foreach path [lsort [array names file_states]] {
1383 set s $file_states($path)
1384 set m [lindex $s 0]
1385 set icon_name [lindex $s 1]
1386 set s [string index $m 0]
1388 if {$s ne {U} && $s ne {_}} {
1389 display_all_files_helper $ui_index $path \
1390 $icon_name $s
1391 }
1392 if {[string index $m 0] eq {U}} {
1394 set s U
1395 } else {
1396 set s [string index $m 1]
1397 }
1398 if {$s ne {_}} {
1399 display_all_files_helper $ui_workdir $path \
1400 $icon_name $s
1401 }
1402 }
1403 $ui_index conf -state disabled
1405 $ui_workdir conf -state disabled
1406}
1407proc update_indexinfo {msg pathList after} {
1409 global update_index_cp ui_status_value
1410 if {![lock_index update]} return
1412 set update_index_cp 0
1414 set pathList [lsort $pathList]
1415 set totalCnt [llength $pathList]
1416 set batch [expr {int($totalCnt * .01) + 1}]
1417 if {$batch > 25} {set batch 25}
1418 set ui_status_value [format \
1420 "$msg... %i/%i files (%.2f%%)" \
1421 $update_index_cp \
1422 $totalCnt \
1423 0.0]
1424 set fd [open "| git update-index -z --index-info" w]
1425 fconfigure $fd \
1426 -blocking 0 \
1427 -buffering full \
1428 -buffersize 512 \
1429 -translation binary
1430 fileevent $fd writable [list \
1431 write_update_indexinfo \
1432 $fd \
1433 $pathList \
1434 $totalCnt \
1435 $batch \
1436 $msg \
1437 $after \
1438 ]
1439}
1440proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
1442 global update_index_cp ui_status_value
1443 global file_states current_diff_path
1444 if {$update_index_cp >= $totalCnt} {
1446 close $fd
1447 unlock_index
1448 uplevel #0 $after
1449 return
1450 }
1451 for {set i $batch} \
1453 {$update_index_cp < $totalCnt && $i > 0} \
1454 {incr i -1} {
1455 set path [lindex $pathList $update_index_cp]
1456 incr update_index_cp
1457 set s $file_states($path)
1459 switch -glob -- [lindex $s 0] {
1460 A? {set new _O}
1461 M? {set new _M}
1462 D_ {set new _D}
1463 D? {set new _?}
1464 ?? {continue}
1465 }
1466 set info [lindex $s 2]
1467 if {$info eq {}} continue
1468 puts -nonewline $fd "$info\t$path\0"
1470 display_file $path $new
1471 }
1472 set ui_status_value [format \
1474 "$msg... %i/%i files (%.2f%%)" \
1475 $update_index_cp \
1476 $totalCnt \
1477 [expr {100.0 * $update_index_cp / $totalCnt}]]
1478}
1479proc update_index {msg pathList after} {
1481 global update_index_cp ui_status_value
1482 if {![lock_index update]} return
1484 set update_index_cp 0
1486 set pathList [lsort $pathList]
1487 set totalCnt [llength $pathList]
1488 set batch [expr {int($totalCnt * .01) + 1}]
1489 if {$batch > 25} {set batch 25}
1490 set ui_status_value [format \
1492 "$msg... %i/%i files (%.2f%%)" \
1493 $update_index_cp \
1494 $totalCnt \
1495 0.0]
1496 set fd [open "| git update-index --add --remove -z --stdin" w]
1497 fconfigure $fd \
1498 -blocking 0 \
1499 -buffering full \
1500 -buffersize 512 \
1501 -translation binary
1502 fileevent $fd writable [list \
1503 write_update_index \
1504 $fd \
1505 $pathList \
1506 $totalCnt \
1507 $batch \
1508 $msg \
1509 $after \
1510 ]
1511}
1512proc write_update_index {fd pathList totalCnt batch msg after} {
1514 global update_index_cp ui_status_value
1515 global file_states current_diff_path
1516 if {$update_index_cp >= $totalCnt} {
1518 close $fd
1519 unlock_index
1520 uplevel #0 $after
1521 return
1522 }
1523 for {set i $batch} \
1525 {$update_index_cp < $totalCnt && $i > 0} \
1526 {incr i -1} {
1527 set path [lindex $pathList $update_index_cp]
1528 incr update_index_cp
1529 switch -glob -- [lindex $file_states($path) 0] {
1531 AD {set new __}
1532 ?D {set new D_}
1533 _O -
1534 AM {set new A_}
1535 U? {
1536 if {[file exists $path]} {
1537 set new M_
1538 } else {
1539 set new D_
1540 }
1541 }
1542 ?M {set new M_}
1543 ?? {continue}
1544 }
1545 puts -nonewline $fd "$path\0"
1546 display_file $path $new
1547 }
1548 set ui_status_value [format \
1550 "$msg... %i/%i files (%.2f%%)" \
1551 $update_index_cp \
1552 $totalCnt \
1553 [expr {100.0 * $update_index_cp / $totalCnt}]]
1554}
1555proc checkout_index {msg pathList after} {
1557 global update_index_cp ui_status_value
1558 if {![lock_index update]} return
1560 set update_index_cp 0
1562 set pathList [lsort $pathList]
1563 set totalCnt [llength $pathList]
1564 set batch [expr {int($totalCnt * .01) + 1}]
1565 if {$batch > 25} {set batch 25}
1566 set ui_status_value [format \
1568 "$msg... %i/%i files (%.2f%%)" \
1569 $update_index_cp \
1570 $totalCnt \
1571 0.0]
1572 set cmd [list git checkout-index]
1573 lappend cmd --index
1574 lappend cmd --quiet
1575 lappend cmd --force
1576 lappend cmd -z
1577 lappend cmd --stdin
1578 set fd [open "| $cmd " w]
1579 fconfigure $fd \
1580 -blocking 0 \
1581 -buffering full \
1582 -buffersize 512 \
1583 -translation binary
1584 fileevent $fd writable [list \
1585 write_checkout_index \
1586 $fd \
1587 $pathList \
1588 $totalCnt \
1589 $batch \
1590 $msg \
1591 $after \
1592 ]
1593}
1594proc write_checkout_index {fd pathList totalCnt batch msg after} {
1596 global update_index_cp ui_status_value
1597 global file_states current_diff_path
1598 if {$update_index_cp >= $totalCnt} {
1600 close $fd
1601 unlock_index
1602 uplevel #0 $after
1603 return
1604 }
1605 for {set i $batch} \
1607 {$update_index_cp < $totalCnt && $i > 0} \
1608 {incr i -1} {
1609 set path [lindex $pathList $update_index_cp]
1610 incr update_index_cp
1611 switch -glob -- [lindex $file_states($path) 0] {
1612 U? {continue}
1613 ?M -
1614 ?D {
1615 puts -nonewline $fd "$path\0"
1616 display_file $path ?_
1617 }
1618 }
1619 }
1620 set ui_status_value [format \
1622 "$msg... %i/%i files (%.2f%%)" \
1623 $update_index_cp \
1624 $totalCnt \
1625 [expr {100.0 * $update_index_cp / $totalCnt}]]
1626}
1627######################################################################
1629##
1630## branch management
1631proc load_all_heads {} {
1633 global all_heads tracking_branches
1634 set all_heads [list]
1636 set cmd [list git for-each-ref]
1637 lappend cmd --format=%(refname)
1638 lappend cmd refs/heads
1639 set fd [open "| $cmd" r]
1640 while {[gets $fd line] > 0} {
1641 if {![catch {set info $tracking_branches($line)}]} continue
1642 if {![regsub ^refs/heads/ $line {} name]} continue
1643 lappend all_heads $name
1644 }
1645 close $fd
1646 set all_heads [lsort $all_heads]
1648}
1649proc populate_branch_menu {} {
1651 global all_heads disable_on_lock
1652 set m .mbar.branch
1654 set last [$m index last]
1655 for {set i 0} {$i <= $last} {incr i} {
1656 if {[$m type $i] eq {separator}} {
1657 $m delete $i last
1658 set new_dol [list]
1659 foreach a $disable_on_lock {
1660 if {[lindex $a 0] ne $m || [lindex $a 2] < $i} {
1661 lappend new_dol $a
1662 }
1663 }
1664 set disable_on_lock $new_dol
1665 break
1666 }
1667 }
1668 $m add separator
1670 foreach b $all_heads {
1671 $m add radiobutton \
1672 -label $b \
1673 -command [list switch_branch $b] \
1674 -variable current_branch \
1675 -value $b \
1676 -font font_ui
1677 lappend disable_on_lock \
1678 [list $m entryconf [$m index last] -state]
1679 }
1680}
1681proc all_tracking_branches {} {
1683 global tracking_branches
1684 set all_trackings [list]
1686 foreach b [array names tracking_branches] {
1687 regsub ^refs/(heads|remotes)/ $b {} b
1688 lappend all_trackings $b
1689 }
1690 return [lsort -unique $all_trackings]
1691}
1692proc do_create_branch_action {w} {
1694 global all_heads null_sha1 repo_config
1695 global create_branch_checkout create_branch_revtype
1696 global create_branch_head create_branch_trackinghead
1697 set newbranch [string trim [$w.desc.name_t get 0.0 end]]
1699 if {$newbranch eq {}
1700 || $newbranch eq $repo_config(gui.newbranchtemplate)} {
1701 tk_messageBox \
1702 -icon error \
1703 -type ok \
1704 -title [wm title $w] \
1705 -parent $w \
1706 -message "Please supply a branch name."
1707 focus $w.desc.name_t
1708 return
1709 }
1710 if {![catch {exec git show-ref --verify -- "refs/heads/$newbranch"}]} {
1711 tk_messageBox \
1712 -icon error \
1713 -type ok \
1714 -title [wm title $w] \
1715 -parent $w \
1716 -message "Branch '$newbranch' already exists."
1717 focus $w.desc.name_t
1718 return
1719 }
1720 if {[catch {exec git check-ref-format "heads/$newbranch"}]} {
1721 tk_messageBox \
1722 -icon error \
1723 -type ok \
1724 -title [wm title $w] \
1725 -parent $w \
1726 -message "We do not like '$newbranch' as a branch name."
1727 focus $w.desc.name_t
1728 return
1729 }
1730 set rev {}
1732 switch -- $create_branch_revtype {
1733 head {set rev $create_branch_head}
1734 tracking {set rev $create_branch_trackinghead}
1735 expression {set rev [string trim [$w.from.exp_t get 0.0 end]]}
1736 }
1737 if {[catch {set cmt [exec git rev-parse --verify "${rev}^0"]}]} {
1738 tk_messageBox \
1739 -icon error \
1740 -type ok \
1741 -title [wm title $w] \
1742 -parent $w \
1743 -message "Invalid starting revision: $rev"
1744 return
1745 }
1746 set cmd [list git update-ref]
1747 lappend cmd -m
1748 lappend cmd "branch: Created from $rev"
1749 lappend cmd "refs/heads/$newbranch"
1750 lappend cmd $cmt
1751 lappend cmd $null_sha1
1752 if {[catch {eval exec $cmd} err]} {
1753 tk_messageBox \
1754 -icon error \
1755 -type ok \
1756 -title [wm title $w] \
1757 -parent $w \
1758 -message "Failed to create '$newbranch'.\n\n$err"
1759 return
1760 }
1761 lappend all_heads $newbranch
1763 set all_heads [lsort $all_heads]
1764 populate_branch_menu
1765 destroy $w
1766 if {$create_branch_checkout} {
1767 switch_branch $newbranch
1768 }
1769}
1770proc do_create_branch {} {
1772 global all_heads current_branch repo_config
1773 global create_branch_checkout create_branch_revtype
1774 global create_branch_head create_branch_trackinghead
1775 set create_branch_checkout 1
1777 set create_branch_revtype head
1778 set create_branch_head $current_branch
1779 set create_branch_trackinghead {}
1780 set w .branch_editor
1782 toplevel $w
1783 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
1784 label $w.header -text {Create New Branch} \
1786 -font font_uibold
1787 pack $w.header -side top -fill x
1788 frame $w.buttons
1790 button $w.buttons.create -text Create \
1791 -font font_ui \
1792 -default active \
1793 -command [list do_create_branch_action $w]
1794 pack $w.buttons.create -side right
1795 button $w.buttons.cancel -text {Cancel} \
1796 -font font_ui \
1797 -command [list destroy $w]
1798 pack $w.buttons.cancel -side right -padx 5
1799 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
1800 labelframe $w.desc \
1802 -text {Branch Description} \
1803 -font font_ui
1804 label $w.desc.name_l -text {Name:} -font font_ui
1805 text $w.desc.name_t \
1806 -borderwidth 1 \
1807 -relief sunken \
1808 -height 1 \
1809 -width 40 \
1810 -font font_ui
1811 $w.desc.name_t insert 0.0 $repo_config(gui.newbranchtemplate)
1812 grid $w.desc.name_l $w.desc.name_t -stick we -padx {0 5}
1813 bind $w.desc.name_t <Shift-Key-Tab> {focus [tk_focusPrev %W];break}
1814 bind $w.desc.name_t <Key-Tab> {focus [tk_focusNext %W];break}
1815 bind $w.desc.name_t <Key-Return> "do_create_branch_action $w;break"
1816 bind $w.desc.name_t <Key> {
1817 if {{%K} ne {BackSpace}
1818 && {%K} ne {Tab}
1819 && {%K} ne {Escape}
1820 && {%K} ne {Return}} {
1821 if {%k <= 32} break
1822 if {[string first %A {~^:?*[}] >= 0} break
1823 }
1824 }
1825 grid columnconfigure $w.desc 1 -weight 1
1826 pack $w.desc -anchor nw -fill x -pady 5 -padx 5
1827 labelframe $w.from \
1829 -text {Starting Revision} \
1830 -font font_ui
1831 radiobutton $w.from.head_r \
1832 -text {Local Branch:} \
1833 -value head \
1834 -variable create_branch_revtype \
1835 -font font_ui
1836 eval tk_optionMenu $w.from.head_m create_branch_head $all_heads
1837 grid $w.from.head_r $w.from.head_m -sticky w
1838 set all_trackings [all_tracking_branches]
1839 if {$all_trackings ne {}} {
1840 set create_branch_trackinghead [lindex $all_trackings 0]
1841 radiobutton $w.from.tracking_r \
1842 -text {Tracking Branch:} \
1843 -value tracking \
1844 -variable create_branch_revtype \
1845 -font font_ui
1846 eval tk_optionMenu $w.from.tracking_m \
1847 create_branch_trackinghead \
1848 $all_trackings
1849 grid $w.from.tracking_r $w.from.tracking_m -sticky w
1850 }
1851 radiobutton $w.from.exp_r \
1852 -text {Revision Expression:} \
1853 -value expression \
1854 -variable create_branch_revtype \
1855 -font font_ui
1856 text $w.from.exp_t \
1857 -borderwidth 1 \
1858 -relief sunken \
1859 -height 1 \
1860 -width 50 \
1861 -font font_ui
1862 grid $w.from.exp_r $w.from.exp_t -stick we -padx {0 5}
1863 bind $w.from.exp_t <Shift-Key-Tab> {focus [tk_focusPrev %W];break}
1864 bind $w.from.exp_t <Key-Tab> {focus [tk_focusNext %W];break}
1865 bind $w.from.exp_t <Key-Return> "do_create_branch_action $w;break"
1866 grid columnconfigure $w.from 1 -weight 1
1867 pack $w.from -anchor nw -fill x -pady 5 -padx 5
1868 labelframe $w.postActions \
1870 -text {Post Creation Actions} \
1871 -font font_ui
1872 checkbutton $w.postActions.checkout \
1873 -text {Checkout after creation} \
1874 -variable create_branch_checkout \
1875 -font font_ui
1876 pack $w.postActions.checkout -anchor nw
1877 pack $w.postActions -anchor nw -fill x -pady 5 -padx 5
1878 bind $w <Visibility> "grab $w; focus $w.desc.name_t"
1880 bind $w <Key-Escape> "destroy $w"
1881 bind $w <Key-Return> "do_create_branch_action $w;break"
1882 wm title $w "[appname] ([reponame]): Create Branch"
1883 tkwait window $w
1884}
1885proc do_delete_branch_action {w} {
1887 global all_heads
1888 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
1889 set check_rev {}
1891 switch -- $delete_branch_checktype {
1892 head {set check_rev $delete_branch_head}
1893 tracking {set check_rev $delete_branch_trackinghead}
1894 always {set check_rev {:none}}
1895 }
1896 if {$check_rev eq {:none}} {
1897 set check_cmt {}
1898 } elseif {[catch {set check_cmt [exec git rev-parse --verify "${check_rev}^0"]}]} {
1899 tk_messageBox \
1900 -icon error \
1901 -type ok \
1902 -title [wm title $w] \
1903 -parent $w \
1904 -message "Invalid check revision: $check_rev"
1905 return
1906 }
1907 set to_delete [list]
1909 set not_merged [list]
1910 foreach i [$w.list.l curselection] {
1911 set b [$w.list.l get $i]
1912 if {[catch {set o [exec git rev-parse --verify $b]}]} continue
1913 if {$check_cmt ne {}} {
1914 if {$b eq $check_rev} continue
1915 if {[catch {set m [exec git merge-base $o $check_cmt]}]} continue
1916 if {$o ne $m} {
1917 lappend not_merged $b
1918 continue
1919 }
1920 }
1921 lappend to_delete [list $b $o]
1922 }
1923 if {$not_merged ne {}} {
1924 set msg "The following branches are not completely merged into $check_rev:
1925 - [join $not_merged "\n - "]"
1927 tk_messageBox \
1928 -icon info \
1929 -type ok \
1930 -title [wm title $w] \
1931 -parent $w \
1932 -message $msg
1933 }
1934 if {$to_delete eq {}} return
1935 if {$delete_branch_checktype eq {always}} {
1936 set msg {Recovering deleted branches is difficult.
1937Delete the selected branches?}
1939 if {[tk_messageBox \
1940 -icon warning \
1941 -type yesno \
1942 -title [wm title $w] \
1943 -parent $w \
1944 -message $msg] ne yes} {
1945 return
1946 }
1947 }
1948 set failed {}
1950 foreach i $to_delete {
1951 set b [lindex $i 0]
1952 set o [lindex $i 1]
1953 if {[catch {exec git update-ref -d "refs/heads/$b" $o} err]} {
1954 append failed " - $b: $err\n"
1955 } else {
1956 set x [lsearch -sorted $all_heads $b]
1957 if {$x >= 0} {
1958 set all_heads [lreplace $all_heads $x $x]
1959 }
1960 }
1961 }
1962 if {$failed ne {}} {
1964 tk_messageBox \
1965 -icon error \
1966 -type ok \
1967 -title [wm title $w] \
1968 -parent $w \
1969 -message "Failed to delete branches:\n$failed"
1970 }
1971 set all_heads [lsort $all_heads]
1973 populate_branch_menu
1974 destroy $w
1975}
1976proc do_delete_branch {} {
1978 global all_heads tracking_branches current_branch
1979 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
1980 set delete_branch_checktype head
1982 set delete_branch_head $current_branch
1983 set delete_branch_trackinghead {}
1984 set w .branch_editor
1986 toplevel $w
1987 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
1988 label $w.header -text {Delete Local Branch} \
1990 -font font_uibold
1991 pack $w.header -side top -fill x
1992 frame $w.buttons
1994 button $w.buttons.create -text Delete \
1995 -font font_ui \
1996 -command [list do_delete_branch_action $w]
1997 pack $w.buttons.create -side right
1998 button $w.buttons.cancel -text {Cancel} \
1999 -font font_ui \
2000 -command [list destroy $w]
2001 pack $w.buttons.cancel -side right -padx 5
2002 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2003 labelframe $w.list \
2005 -text {Local Branches} \
2006 -font font_ui
2007 listbox $w.list.l \
2008 -height 10 \
2009 -width 50 \
2010 -selectmode extended \
2011 -font font_ui
2012 foreach h $all_heads {
2013 if {$h ne $current_branch} {
2014 $w.list.l insert end $h
2015 }
2016 }
2017 pack $w.list.l -fill both -pady 5 -padx 5
2018 pack $w.list -fill both -pady 5 -padx 5
2019 labelframe $w.validate \
2021 -text {Delete Only If} \
2022 -font font_ui
2023 radiobutton $w.validate.head_r \
2024 -text {Merged Into Local Branch:} \
2025 -value head \
2026 -variable delete_branch_checktype \
2027 -font font_ui
2028 eval tk_optionMenu $w.validate.head_m delete_branch_head $all_heads
2029 grid $w.validate.head_r $w.validate.head_m -sticky w
2030 set all_trackings [all_tracking_branches]
2031 if {$all_trackings ne {}} {
2032 set delete_branch_trackinghead [lindex $all_trackings 0]
2033 radiobutton $w.validate.tracking_r \
2034 -text {Merged Into Tracking Branch:} \
2035 -value tracking \
2036 -variable delete_branch_checktype \
2037 -font font_ui
2038 eval tk_optionMenu $w.validate.tracking_m \
2039 delete_branch_trackinghead \
2040 $all_trackings
2041 grid $w.validate.tracking_r $w.validate.tracking_m -sticky w
2042 }
2043 radiobutton $w.validate.always_r \
2044 -text {Always (Do not perform merge checks)} \
2045 -value always \
2046 -variable delete_branch_checktype \
2047 -font font_ui
2048 grid $w.validate.always_r -columnspan 2 -sticky w
2049 grid columnconfigure $w.validate 1 -weight 1
2050 pack $w.validate -anchor nw -fill x -pady 5 -padx 5
2051 bind $w <Visibility> "grab $w; focus $w"
2053 bind $w <Key-Escape> "destroy $w"
2054 wm title $w "[appname] ([reponame]): Delete Branch"
2055 tkwait window $w
2056}
2057proc switch_branch {b} {
2059 global HEAD commit_type file_states current_branch
2060 global selected_commit_type ui_comm
2061 if {![lock_index switch]} return
2063 # -- Backup the selected branch (repository_state resets it)
2065 #
2066 set new_branch $current_branch
2067 # -- Our in memory state should match the repository.
2069 #
2070 repository_state curType curHEAD curMERGE_HEAD
2071 if {[string match amend* $commit_type]
2072 && $curType eq {normal}
2073 && $curHEAD eq $HEAD} {
2074 } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
2075 info_popup {Last scanned state does not match repository state.
2076Another Git program has modified this repository
2078since the last scan. A rescan must be performed
2079before the current branch can be changed.
2080The rescan will be automatically started now.
2082}
2083 unlock_index
2084 rescan {set ui_status_value {Ready.}}
2085 return
2086 }
2087 # -- Toss the message buffer if we are in amend mode.
2089 #
2090 if {[string match amend* $curType]} {
2091 $ui_comm delete 0.0 end
2092 $ui_comm edit reset
2093 $ui_comm edit modified false
2094 }
2095 set selected_commit_type new
2097 set current_branch $new_branch
2098 unlock_index
2100 error "NOT FINISHED"
2101}
2102######################################################################
2104##
2105## remote management
2106proc load_all_remotes {} {
2108 global repo_config
2109 global all_remotes tracking_branches
2110 set all_remotes [list]
2112 array unset tracking_branches
2113 set rm_dir [gitdir remotes]
2115 if {[file isdirectory $rm_dir]} {
2116 set all_remotes [glob \
2117 -types f \
2118 -tails \
2119 -nocomplain \
2120 -directory $rm_dir *]
2121 foreach name $all_remotes {
2123 catch {
2124 set fd [open [file join $rm_dir $name] r]
2125 while {[gets $fd line] >= 0} {
2126 if {![regexp {^Pull:[ ]*([^:]+):(.+)$} \
2127 $line line src dst]} continue
2128 if {![regexp ^refs/ $dst]} {
2129 set dst "refs/heads/$dst"
2130 }
2131 set tracking_branches($dst) [list $name $src]
2132 }
2133 close $fd
2134 }
2135 }
2136 }
2137 foreach line [array names repo_config remote.*.url] {
2139 if {![regexp ^remote\.(.*)\.url\$ $line line name]} continue
2140 lappend all_remotes $name
2141 if {[catch {set fl $repo_config(remote.$name.fetch)}]} {
2143 set fl {}
2144 }
2145 foreach line $fl {
2146 if {![regexp {^([^:]+):(.+)$} $line line src dst]} continue
2147 if {![regexp ^refs/ $dst]} {
2148 set dst "refs/heads/$dst"
2149 }
2150 set tracking_branches($dst) [list $name $src]
2151 }
2152 }
2153 set all_remotes [lsort -unique $all_remotes]
2155}
2156proc populate_fetch_menu {m} {
2158 global all_remotes repo_config
2159 foreach r $all_remotes {
2161 set enable 0
2162 if {![catch {set a $repo_config(remote.$r.url)}]} {
2163 if {![catch {set a $repo_config(remote.$r.fetch)}]} {
2164 set enable 1
2165 }
2166 } else {
2167 catch {
2168 set fd [open [gitdir remotes $r] r]
2169 while {[gets $fd n] >= 0} {
2170 if {[regexp {^Pull:[ \t]*([^:]+):} $n]} {
2171 set enable 1
2172 break
2173 }
2174 }
2175 close $fd
2176 }
2177 }
2178 if {$enable} {
2180 $m add command \
2181 -label "Fetch from $r..." \
2182 -command [list fetch_from $r] \
2183 -font font_ui
2184 }
2185 }
2186}
2187proc populate_push_menu {m} {
2189 global all_remotes repo_config
2190 foreach r $all_remotes {
2192 set enable 0
2193 if {![catch {set a $repo_config(remote.$r.url)}]} {
2194 if {![catch {set a $repo_config(remote.$r.push)}]} {
2195 set enable 1
2196 }
2197 } else {
2198 catch {
2199 set fd [open [gitdir remotes $r] r]
2200 while {[gets $fd n] >= 0} {
2201 if {[regexp {^Push:[ \t]*([^:]+):} $n]} {
2202 set enable 1
2203 break
2204 }
2205 }
2206 close $fd
2207 }
2208 }
2209 if {$enable} {
2211 $m add command \
2212 -label "Push to $r..." \
2213 -command [list push_to $r] \
2214 -font font_ui
2215 }
2216 }
2217}
2218proc populate_pull_menu {m} {
2220 global repo_config all_remotes disable_on_lock
2221 foreach remote $all_remotes {
2223 set rb_list [list]
2224 if {[array get repo_config remote.$remote.url] ne {}} {
2225 if {[array get repo_config remote.$remote.fetch] ne {}} {
2226 foreach line $repo_config(remote.$remote.fetch) {
2227 if {[regexp {^([^:]+):} $line line rb]} {
2228 lappend rb_list $rb
2229 }
2230 }
2231 }
2232 } else {
2233 catch {
2234 set fd [open [gitdir remotes $remote] r]
2235 while {[gets $fd line] >= 0} {
2236 if {[regexp {^Pull:[ \t]*([^:]+):} $line line rb]} {
2237 lappend rb_list $rb
2238 }
2239 }
2240 close $fd
2241 }
2242 }
2243 foreach rb $rb_list {
2245 regsub ^refs/heads/ $rb {} rb_short
2246 $m add command \
2247 -label "Branch $rb_short from $remote..." \
2248 -command [list pull_remote $remote $rb] \
2249 -font font_ui
2250 lappend disable_on_lock \
2251 [list $m entryconf [$m index last] -state]
2252 }
2253 }
2254}
2255######################################################################
2257##
2258## icons
2259set filemask {
2261#define mask_width 14
2262#define mask_height 15
2263static unsigned char mask_bits[] = {
2264 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2265 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2266 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2267}
2268image create bitmap file_plain -background white -foreground black -data {
2270#define plain_width 14
2271#define plain_height 15
2272static unsigned char plain_bits[] = {
2273 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2274 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2275 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2276} -maskdata $filemask
2277image create bitmap file_mod -background white -foreground blue -data {
2279#define mod_width 14
2280#define mod_height 15
2281static unsigned char mod_bits[] = {
2282 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2283 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2284 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2285} -maskdata $filemask
2286image create bitmap file_fulltick -background white -foreground "#007000" -data {
2288#define file_fulltick_width 14
2289#define file_fulltick_height 15
2290static unsigned char file_fulltick_bits[] = {
2291 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2292 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2293 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2294} -maskdata $filemask
2295image create bitmap file_parttick -background white -foreground "#005050" -data {
2297#define parttick_width 14
2298#define parttick_height 15
2299static unsigned char parttick_bits[] = {
2300 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2301 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
2302 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2303} -maskdata $filemask
2304image create bitmap file_question -background white -foreground black -data {
2306#define file_question_width 14
2307#define file_question_height 15
2308static unsigned char file_question_bits[] = {
2309 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2310 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2311 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2312} -maskdata $filemask
2313image create bitmap file_removed -background white -foreground red -data {
2315#define file_removed_width 14
2316#define file_removed_height 15
2317static unsigned char file_removed_bits[] = {
2318 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2319 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2320 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2321} -maskdata $filemask
2322image create bitmap file_merge -background white -foreground blue -data {
2324#define file_merge_width 14
2325#define file_merge_height 15
2326static unsigned char file_merge_bits[] = {
2327 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2328 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2329 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2330} -maskdata $filemask
2331set ui_index .vpane.files.index.list
2333set ui_workdir .vpane.files.workdir.list
2334set all_icons(_$ui_index) file_plain
2336set all_icons(A$ui_index) file_fulltick
2337set all_icons(M$ui_index) file_fulltick
2338set all_icons(D$ui_index) file_removed
2339set all_icons(U$ui_index) file_merge
2340set all_icons(_$ui_workdir) file_plain
2342set all_icons(M$ui_workdir) file_mod
2343set all_icons(D$ui_workdir) file_question
2344set all_icons(U$ui_workdir) file_merge
2345set all_icons(O$ui_workdir) file_plain
2346set max_status_desc 0
2348foreach i {
2349 {__ "Unmodified"}
2350 {_M "Modified, not staged"}
2352 {M_ "Staged for commit"}
2353 {MM "Portions staged for commit"}
2354 {MD "Staged for commit, missing"}
2355 {_O "Untracked, not staged"}
2357 {A_ "Staged for commit"}
2358 {AM "Portions staged for commit"}
2359 {AD "Staged for commit, missing"}
2360 {_D "Missing"}
2362 {D_ "Staged for removal"}
2363 {DO "Staged for removal, still present"}
2364 {U_ "Requires merge resolution"}
2366 {UU "Requires merge resolution"}
2367 {UM "Requires merge resolution"}
2368 {UD "Requires merge resolution"}
2369 } {
2370 if {$max_status_desc < [string length [lindex $i 1]]} {
2371 set max_status_desc [string length [lindex $i 1]]
2372 }
2373 set all_descs([lindex $i 0]) [lindex $i 1]
2374}
2375unset i
2376######################################################################
2378##
2379## util
2380proc is_MacOSX {} {
2382 global tcl_platform tk_library
2383 if {[tk windowingsystem] eq {aqua}} {
2384 return 1
2385 }
2386 return 0
2387}
2388proc is_Windows {} {
2390 global tcl_platform
2391 if {$tcl_platform(platform) eq {windows}} {
2392 return 1
2393 }
2394 return 0
2395}
2396proc bind_button3 {w cmd} {
2398 bind $w <Any-Button-3> $cmd
2399 if {[is_MacOSX]} {
2400 bind $w <Control-Button-1> $cmd
2401 }
2402}
2403proc incr_font_size {font {amt 1}} {
2405 set sz [font configure $font -size]
2406 incr sz $amt
2407 font configure $font -size $sz
2408 font configure ${font}bold -size $sz
2409}
2410proc hook_failed_popup {hook msg} {
2412 set w .hookfail
2413 toplevel $w
2414 frame $w.m
2416 label $w.m.l1 -text "$hook hook failed:" \
2417 -anchor w \
2418 -justify left \
2419 -font font_uibold
2420 text $w.m.t \
2421 -background white -borderwidth 1 \
2422 -relief sunken \
2423 -width 80 -height 10 \
2424 -font font_diff \
2425 -yscrollcommand [list $w.m.sby set]
2426 label $w.m.l2 \
2427 -text {You must correct the above errors before committing.} \
2428 -anchor w \
2429 -justify left \
2430 -font font_uibold
2431 scrollbar $w.m.sby -command [list $w.m.t yview]
2432 pack $w.m.l1 -side top -fill x
2433 pack $w.m.l2 -side bottom -fill x
2434 pack $w.m.sby -side right -fill y
2435 pack $w.m.t -side left -fill both -expand 1
2436 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
2437 $w.m.t insert 1.0 $msg
2439 $w.m.t conf -state disabled
2440 button $w.ok -text OK \
2442 -width 15 \
2443 -font font_ui \
2444 -command "destroy $w"
2445 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
2446 bind $w <Visibility> "grab $w; focus $w"
2448 bind $w <Key-Return> "destroy $w"
2449 wm title $w "[appname] ([reponame]): error"
2450 tkwait window $w
2451}
2452set next_console_id 0
2454proc new_console {short_title long_title} {
2456 global next_console_id console_data
2457 set w .console[incr next_console_id]
2458 set console_data($w) [list $short_title $long_title]
2459 return [console_init $w]
2460}
2461proc console_init {w} {
2463 global console_cr console_data M1B
2464 set console_cr($w) 1.0
2466 toplevel $w
2467 frame $w.m
2468 label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
2469 -anchor w \
2470 -justify left \
2471 -font font_uibold
2472 text $w.m.t \
2473 -background white -borderwidth 1 \
2474 -relief sunken \
2475 -width 80 -height 10 \
2476 -font font_diff \
2477 -state disabled \
2478 -yscrollcommand [list $w.m.sby set]
2479 label $w.m.s -text {Working... please wait...} \
2480 -anchor w \
2481 -justify left \
2482 -font font_uibold
2483 scrollbar $w.m.sby -command [list $w.m.t yview]
2484 pack $w.m.l1 -side top -fill x
2485 pack $w.m.s -side bottom -fill x
2486 pack $w.m.sby -side right -fill y
2487 pack $w.m.t -side left -fill both -expand 1
2488 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
2489 menu $w.ctxm -tearoff 0
2491 $w.ctxm add command -label "Copy" \
2492 -font font_ui \
2493 -command "tk_textCopy $w.m.t"
2494 $w.ctxm add command -label "Select All" \
2495 -font font_ui \
2496 -command "$w.m.t tag add sel 0.0 end"
2497 $w.ctxm add command -label "Copy All" \
2498 -font font_ui \
2499 -command "
2500 $w.m.t tag add sel 0.0 end
2501 tk_textCopy $w.m.t
2502 $w.m.t tag remove sel 0.0 end
2503 "
2504 button $w.ok -text {Close} \
2506 -font font_ui \
2507 -state disabled \
2508 -command "destroy $w"
2509 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
2510 bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
2512 bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
2513 bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
2514 bind $w <Visibility> "focus $w"
2515 wm title $w "[appname] ([reponame]): [lindex $console_data($w) 0]"
2516 return $w
2517}
2518proc console_exec {w cmd {after {}}} {
2520 # -- Windows tosses the enviroment when we exec our child.
2521 # But most users need that so we have to relogin. :-(
2522 #
2523 if {[is_Windows]} {
2524 set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
2525 }
2526 # -- Tcl won't let us redirect both stdout and stderr to
2528 # the same pipe. So pass it through cat...
2529 #
2530 set cmd [concat | $cmd |& cat]
2531 set fd_f [open $cmd r]
2533 fconfigure $fd_f -blocking 0 -translation binary
2534 fileevent $fd_f readable [list console_read $w $fd_f $after]
2535}
2536proc console_read {w fd after} {
2538 global console_cr console_data
2539 set buf [read $fd]
2541 if {$buf ne {}} {
2542 if {![winfo exists $w]} {console_init $w}
2543 $w.m.t conf -state normal
2544 set c 0
2545 set n [string length $buf]
2546 while {$c < $n} {
2547 set cr [string first "\r" $buf $c]
2548 set lf [string first "\n" $buf $c]
2549 if {$cr < 0} {set cr [expr {$n + 1}]}
2550 if {$lf < 0} {set lf [expr {$n + 1}]}
2551 if {$lf < $cr} {
2553 $w.m.t insert end [string range $buf $c $lf]
2554 set console_cr($w) [$w.m.t index {end -1c}]
2555 set c $lf
2556 incr c
2557 } else {
2558 $w.m.t delete $console_cr($w) end
2559 $w.m.t insert end "\n"
2560 $w.m.t insert end [string range $buf $c $cr]
2561 set c $cr
2562 incr c
2563 }
2564 }
2565 $w.m.t conf -state disabled
2566 $w.m.t see end
2567 }
2568 fconfigure $fd -blocking 1
2570 if {[eof $fd]} {
2571 if {[catch {close $fd}]} {
2572 if {![winfo exists $w]} {console_init $w}
2573 $w.m.s conf -background red -text {Error: Command Failed}
2574 $w.ok conf -state normal
2575 set ok 0
2576 } elseif {[winfo exists $w]} {
2577 $w.m.s conf -background green -text {Success}
2578 $w.ok conf -state normal
2579 set ok 1
2580 }
2581 array unset console_cr $w
2582 array unset console_data $w
2583 if {$after ne {}} {
2584 uplevel #0 $after $ok
2585 }
2586 return
2587 }
2588 fconfigure $fd -blocking 0
2589}
2590######################################################################
2592##
2593## ui commands
2594set starting_gitk_msg {Starting gitk... please wait...}
2596proc do_gitk {revs} {
2598 global ui_status_value starting_gitk_msg
2599 set cmd gitk
2601 if {$revs ne {}} {
2602 append cmd { }
2603 append cmd $revs
2604 }
2605 if {[is_Windows]} {
2606 set cmd "sh -c \"exec $cmd\""
2607 }
2608 append cmd { &}
2609 if {[catch {eval exec $cmd} err]} {
2611 error_popup "Failed to start gitk:\n\n$err"
2612 } else {
2613 set ui_status_value $starting_gitk_msg
2614 after 10000 {
2615 if {$ui_status_value eq $starting_gitk_msg} {
2616 set ui_status_value {Ready.}
2617 }
2618 }
2619 }
2620}
2621proc do_gc {} {
2623 set w [new_console {gc} {Compressing the object database}]
2624 console_exec $w {git gc}
2625}
2626proc do_fsck_objects {} {
2628 set w [new_console {fsck-objects} \
2629 {Verifying the object database with fsck-objects}]
2630 set cmd [list git fsck-objects]
2631 lappend cmd --full
2632 lappend cmd --cache
2633 lappend cmd --strict
2634 console_exec $w $cmd
2635}
2636set is_quitting 0
2638proc do_quit {} {
2640 global ui_comm is_quitting repo_config commit_type
2641 if {$is_quitting} return
2643 set is_quitting 1
2644 # -- Stash our current commit buffer.
2646 #
2647 set save [gitdir GITGUI_MSG]
2648 set msg [string trim [$ui_comm get 0.0 end]]
2649 if {![string match amend* $commit_type]
2650 && [$ui_comm edit modified]
2651 && $msg ne {}} {
2652 catch {
2653 set fd [open $save w]
2654 puts $fd [string trim [$ui_comm get 0.0 end]]
2655 close $fd
2656 }
2657 } else {
2658 catch {file delete $save}
2659 }
2660 # -- Stash our current window geometry into this repository.
2662 #
2663 set cfg_geometry [list]
2664 lappend cfg_geometry [wm geometry .]
2665 lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
2666 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
2667 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2668 set rc_geometry {}
2669 }
2670 if {$cfg_geometry ne $rc_geometry} {
2671 catch {exec git repo-config gui.geometry $cfg_geometry}
2672 }
2673 destroy .
2675}
2676proc do_rescan {} {
2678 rescan {set ui_status_value {Ready.}}
2679}
2680proc unstage_helper {txt paths} {
2682 global file_states current_diff_path
2683 if {![lock_index begin-update]} return
2685 set pathList [list]
2687 set after {}
2688 foreach path $paths {
2689 switch -glob -- [lindex $file_states($path) 0] {
2690 A? -
2691 M? -
2692 D? {
2693 lappend pathList $path
2694 if {$path eq $current_diff_path} {
2695 set after {reshow_diff;}
2696 }
2697 }
2698 }
2699 }
2700 if {$pathList eq {}} {
2701 unlock_index
2702 } else {
2703 update_indexinfo \
2704 $txt \
2705 $pathList \
2706 [concat $after {set ui_status_value {Ready.}}]
2707 }
2708}
2709proc do_unstage_selection {} {
2711 global current_diff_path selected_paths
2712 if {[array size selected_paths] > 0} {
2714 unstage_helper \
2715 {Unstaging selected files from commit} \
2716 [array names selected_paths]
2717 } elseif {$current_diff_path ne {}} {
2718 unstage_helper \
2719 "Unstaging [short_path $current_diff_path] from commit" \
2720 [list $current_diff_path]
2721 }
2722}
2723proc add_helper {txt paths} {
2725 global file_states current_diff_path
2726 if {![lock_index begin-update]} return
2728 set pathList [list]
2730 set after {}
2731 foreach path $paths {
2732 switch -glob -- [lindex $file_states($path) 0] {
2733 _O -
2734 ?M -
2735 ?D -
2736 U? {
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_index \
2748 $txt \
2749 $pathList \
2750 [concat $after {set ui_status_value {Ready to commit.}}]
2751 }
2752}
2753proc do_add_selection {} {
2755 global current_diff_path selected_paths
2756 if {[array size selected_paths] > 0} {
2758 add_helper \
2759 {Adding selected files} \
2760 [array names selected_paths]
2761 } elseif {$current_diff_path ne {}} {
2762 add_helper \
2763 "Adding [short_path $current_diff_path]" \
2764 [list $current_diff_path]
2765 }
2766}
2767proc do_add_all {} {
2769 global file_states
2770 set paths [list]
2772 foreach path [array names file_states] {
2773 switch -glob -- [lindex $file_states($path) 0] {
2774 U? {continue}
2775 ?M -
2776 ?D {lappend paths $path}
2777 }
2778 }
2779 add_helper {Adding all changed files} $paths
2780}
2781proc revert_helper {txt paths} {
2783 global file_states current_diff_path
2784 if {![lock_index begin-update]} return
2786 set pathList [list]
2788 set after {}
2789 foreach path $paths {
2790 switch -glob -- [lindex $file_states($path) 0] {
2791 U? {continue}
2792 ?M -
2793 ?D {
2794 lappend pathList $path
2795 if {$path eq $current_diff_path} {
2796 set after {reshow_diff;}
2797 }
2798 }
2799 }
2800 }
2801 set n [llength $pathList]
2803 if {$n == 0} {
2804 unlock_index
2805 return
2806 } elseif {$n == 1} {
2807 set s "[short_path [lindex $pathList]]"
2808 } else {
2809 set s "these $n files"
2810 }
2811 set reply [tk_dialog \
2813 .confirm_revert \
2814 "[appname] ([reponame])" \
2815 "Revert changes in $s?
2816Any unadded changes will be permanently lost by the revert." \
2818 question \
2819 1 \
2820 {Do Nothing} \
2821 {Revert Changes} \
2822 ]
2823 if {$reply == 1} {
2824 checkout_index \
2825 $txt \
2826 $pathList \
2827 [concat $after {set ui_status_value {Ready.}}]
2828 } else {
2829 unlock_index
2830 }
2831}
2832proc do_revert_selection {} {
2834 global current_diff_path selected_paths
2835 if {[array size selected_paths] > 0} {
2837 revert_helper \
2838 {Reverting selected files} \
2839 [array names selected_paths]
2840 } elseif {$current_diff_path ne {}} {
2841 revert_helper \
2842 "Reverting [short_path $current_diff_path]" \
2843 [list $current_diff_path]
2844 }
2845}
2846proc do_signoff {} {
2848 global ui_comm
2849 set me [committer_ident]
2851 if {$me eq {}} return
2852 set sob "Signed-off-by: $me"
2854 set last [$ui_comm get {end -1c linestart} {end -1c}]
2855 if {$last ne $sob} {
2856 $ui_comm edit separator
2857 if {$last ne {}
2858 && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
2859 $ui_comm insert end "\n"
2860 }
2861 $ui_comm insert end "\n$sob"
2862 $ui_comm edit separator
2863 $ui_comm see end
2864 }
2865}
2866proc do_select_commit_type {} {
2868 global commit_type selected_commit_type
2869 if {$selected_commit_type eq {new}
2871 && [string match amend* $commit_type]} {
2872 create_new_commit
2873 } elseif {$selected_commit_type eq {amend}
2874 && ![string match amend* $commit_type]} {
2875 load_last_commit
2876 # The amend request was rejected...
2878 #
2879 if {![string match amend* $commit_type]} {
2880 set selected_commit_type new
2881 }
2882 }
2883}
2884proc do_commit {} {
2886 commit_tree
2887}
2888proc do_about {} {
2890 global appvers copyright
2891 global tcl_patchLevel tk_patchLevel
2892 set w .about_dialog
2894 toplevel $w
2895 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2896 label $w.header -text "About [appname]" \
2898 -font font_uibold
2899 pack $w.header -side top -fill x
2900 frame $w.buttons
2902 button $w.buttons.close -text {Close} \
2903 -font font_ui \
2904 -command [list destroy $w]
2905 pack $w.buttons.close -side right
2906 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2907 label $w.desc \
2909 -text "[appname] - a commit creation tool for Git.
2910$copyright" \
2911 -padx 5 -pady 5 \
2912 -justify left \
2913 -anchor w \
2914 -borderwidth 1 \
2915 -relief solid \
2916 -font font_ui
2917 pack $w.desc -side top -fill x -padx 5 -pady 5
2918 set v {}
2920 append v "[appname] version $appvers\n"
2921 append v "[exec git version]\n"
2922 append v "\n"
2923 if {$tcl_patchLevel eq $tk_patchLevel} {
2924 append v "Tcl/Tk version $tcl_patchLevel"
2925 } else {
2926 append v "Tcl version $tcl_patchLevel"
2927 append v ", Tk version $tk_patchLevel"
2928 }
2929 label $w.vers \
2931 -text $v \
2932 -padx 5 -pady 5 \
2933 -justify left \
2934 -anchor w \
2935 -borderwidth 1 \
2936 -relief solid \
2937 -font font_ui
2938 pack $w.vers -side top -fill x -padx 5 -pady 5
2939 menu $w.ctxm -tearoff 0
2941 $w.ctxm add command \
2942 -label {Copy} \
2943 -font font_ui \
2944 -command "
2945 clipboard clear
2946 clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
2947 "
2948 bind $w <Visibility> "grab $w; focus $w"
2950 bind $w <Key-Escape> "destroy $w"
2951 bind_button3 $w.vers "tk_popup $w.ctxm %X %Y; grab $w; focus $w"
2952 wm title $w "About [appname]"
2953 tkwait window $w
2954}
2955proc do_options {} {
2957 global repo_config global_config font_descs
2958 global repo_config_new global_config_new
2959 array unset repo_config_new
2961 array unset global_config_new
2962 foreach name [array names repo_config] {
2963 set repo_config_new($name) $repo_config($name)
2964 }
2965 load_config 1
2966 foreach name [array names repo_config] {
2967 switch -- $name {
2968 gui.diffcontext {continue}
2969 }
2970 set repo_config_new($name) $repo_config($name)
2971 }
2972 foreach name [array names global_config] {
2973 set global_config_new($name) $global_config($name)
2974 }
2975 set w .options_editor
2977 toplevel $w
2978 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2979 label $w.header -text "[appname] Options" \
2981 -font font_uibold
2982 pack $w.header -side top -fill x
2983 frame $w.buttons
2985 button $w.buttons.restore -text {Restore Defaults} \
2986 -font font_ui \
2987 -command do_restore_defaults
2988 pack $w.buttons.restore -side left
2989 button $w.buttons.save -text Save \
2990 -font font_ui \
2991 -command "
2992 catch {eval \[bind \[focus -displayof $w\] <FocusOut>\]}
2993 do_save_config $w
2994 "
2995 pack $w.buttons.save -side right
2996 button $w.buttons.cancel -text {Cancel} \
2997 -font font_ui \
2998 -command [list destroy $w]
2999 pack $w.buttons.cancel -side right -padx 5
3000 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
3001 labelframe $w.repo -text "[reponame] Repository" \
3003 -font font_ui \
3004 -relief raised -borderwidth 2
3005 labelframe $w.global -text {Global (All Repositories)} \
3006 -font font_ui \
3007 -relief raised -borderwidth 2
3008 pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
3009 pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
3010 foreach option {
3012 {b pullsummary {Show Pull Summary}}
3013 {b trustmtime {Trust File Modification Timestamps}}
3014 {i diffcontext {Number of Diff Context Lines}}
3015 {t newbranchtemplate {New Branch Name Template}}
3016 } {
3017 set type [lindex $option 0]
3018 set name [lindex $option 1]
3019 set text [lindex $option 2]
3020 foreach f {repo global} {
3021 switch $type {
3022 b {
3023 checkbutton $w.$f.$name -text $text \
3024 -variable ${f}_config_new(gui.$name) \
3025 -onvalue true \
3026 -offvalue false \
3027 -font font_ui
3028 pack $w.$f.$name -side top -anchor w
3029 }
3030 i {
3031 frame $w.$f.$name
3032 label $w.$f.$name.l -text "$text:" -font font_ui
3033 pack $w.$f.$name.l -side left -anchor w -fill x
3034 spinbox $w.$f.$name.v \
3035 -textvariable ${f}_config_new(gui.$name) \
3036 -from 1 -to 99 -increment 1 \
3037 -width 3 \
3038 -font font_ui
3039 pack $w.$f.$name.v -side right -anchor e -padx 5
3040 pack $w.$f.$name -side top -anchor w -fill x
3041 }
3042 t {
3043 frame $w.$f.$name
3044 label $w.$f.$name.l -text "$text:" -font font_ui
3045 text $w.$f.$name.v \
3046 -borderwidth 1 \
3047 -relief sunken \
3048 -height 1 \
3049 -width 20 \
3050 -font font_ui
3051 $w.$f.$name.v insert 0.0 [set ${f}_config_new(gui.$name)]
3052 bind $w.$f.$name.v <Shift-Key-Tab> {focus [tk_focusPrev %W];break}
3053 bind $w.$f.$name.v <Key-Tab> {focus [tk_focusNext %W];break}
3054 bind $w.$f.$name.v <Key-Return> break
3055 bind $w.$f.$name.v <FocusOut> "
3056 set ${f}_config_new(gui.$name) \
3057 \[string trim \[$w.$f.$name.v get 0.0 end\]\]
3058 "
3059 pack $w.$f.$name.l -side left -anchor w
3060 pack $w.$f.$name.v -side left -anchor w \
3061 -fill x -expand 1 \
3062 -padx 5
3063 pack $w.$f.$name -side top -anchor w -fill x
3064 }
3065 }
3066 }
3067 }
3068 set all_fonts [lsort [font families]]
3070 foreach option $font_descs {
3071 set name [lindex $option 0]
3072 set font [lindex $option 1]
3073 set text [lindex $option 2]
3074 set global_config_new(gui.$font^^family) \
3076 [font configure $font -family]
3077 set global_config_new(gui.$font^^size) \
3078 [font configure $font -size]
3079 frame $w.global.$name
3081 label $w.global.$name.l -text "$text:" -font font_ui
3082 pack $w.global.$name.l -side left -anchor w -fill x
3083 eval tk_optionMenu $w.global.$name.family \
3084 global_config_new(gui.$font^^family) \
3085 $all_fonts
3086 spinbox $w.global.$name.size \
3087 -textvariable global_config_new(gui.$font^^size) \
3088 -from 2 -to 80 -increment 1 \
3089 -width 3 \
3090 -font font_ui
3091 pack $w.global.$name.size -side right -anchor e
3092 pack $w.global.$name.family -side right -anchor e
3093 pack $w.global.$name -side top -anchor w -fill x
3094 }
3095 bind $w <Visibility> "grab $w; focus $w"
3097 bind $w <Key-Escape> "destroy $w"
3098 wm title $w "[appname] ([reponame]): Options"
3099 tkwait window $w
3100}
3101proc do_restore_defaults {} {
3103 global font_descs default_config repo_config
3104 global repo_config_new global_config_new
3105 foreach name [array names default_config] {
3107 set repo_config_new($name) $default_config($name)
3108 set global_config_new($name) $default_config($name)
3109 }
3110 foreach option $font_descs {
3112 set name [lindex $option 0]
3113 set repo_config(gui.$name) $default_config(gui.$name)
3114 }
3115 apply_config
3116 foreach option $font_descs {
3118 set name [lindex $option 0]
3119 set font [lindex $option 1]
3120 set global_config_new(gui.$font^^family) \
3121 [font configure $font -family]
3122 set global_config_new(gui.$font^^size) \
3123 [font configure $font -size]
3124 }
3125}
3126proc do_save_config {w} {
3128 if {[catch {save_config} err]} {
3129 error_popup "Failed to completely save options:\n\n$err"
3130 }
3131 reshow_diff
3132 destroy $w
3133}
3134proc do_windows_shortcut {} {
3136 global argv0
3137 if {[catch {
3139 set desktop [exec cygpath \
3140 --windows \
3141 --absolute \
3142 --long-name \
3143 --desktop]
3144 }]} {
3145 set desktop .
3146 }
3147 set fn [tk_getSaveFile \
3148 -parent . \
3149 -title "[appname] ([reponame]): Create Desktop Icon" \
3150 -initialdir $desktop \
3151 -initialfile "Git [reponame].bat"]
3152 if {$fn != {}} {
3153 if {[catch {
3154 set fd [open $fn w]
3155 set sh [exec cygpath \
3156 --windows \
3157 --absolute \
3158 /bin/sh]
3159 set me [exec cygpath \
3160 --unix \
3161 --absolute \
3162 $argv0]
3163 set gd [exec cygpath \
3164 --unix \
3165 --absolute \
3166 [gitdir]]
3167 set gw [exec cygpath \
3168 --windows \
3169 --absolute \
3170 [file dirname [gitdir]]]
3171 regsub -all ' $me "'\\''" me
3172 regsub -all ' $gd "'\\''" gd
3173 puts $fd "@ECHO Entering $gw"
3174 puts $fd "@ECHO Starting git-gui... please wait..."
3175 puts -nonewline $fd "@\"$sh\" --login -c \""
3176 puts -nonewline $fd "GIT_DIR='$gd'"
3177 puts -nonewline $fd " '$me'"
3178 puts $fd "&\""
3179 close $fd
3180 } err]} {
3181 error_popup "Cannot write script:\n\n$err"
3182 }
3183 }
3184}
3185proc do_macosx_app {} {
3187 global argv0 env
3188 set fn [tk_getSaveFile \
3190 -parent . \
3191 -title "[appname] ([reponame]): Create Desktop Icon" \
3192 -initialdir [file join $env(HOME) Desktop] \
3193 -initialfile "Git [reponame].app"]
3194 if {$fn != {}} {
3195 if {[catch {
3196 set Contents [file join $fn Contents]
3197 set MacOS [file join $Contents MacOS]
3198 set exe [file join $MacOS git-gui]
3199 file mkdir $MacOS
3201 set fd [open [file join $Contents Info.plist] w]
3203 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
3204<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3205<plist version="1.0">
3206<dict>
3207 <key>CFBundleDevelopmentRegion</key>
3208 <string>English</string>
3209 <key>CFBundleExecutable</key>
3210 <string>git-gui</string>
3211 <key>CFBundleIdentifier</key>
3212 <string>org.spearce.git-gui</string>
3213 <key>CFBundleInfoDictionaryVersion</key>
3214 <string>6.0</string>
3215 <key>CFBundlePackageType</key>
3216 <string>APPL</string>
3217 <key>CFBundleSignature</key>
3218 <string>????</string>
3219 <key>CFBundleVersion</key>
3220 <string>1.0</string>
3221 <key>NSPrincipalClass</key>
3222 <string>NSApplication</string>
3223</dict>
3224</plist>}
3225 close $fd
3226 set fd [open $exe w]
3228 set gd [file normalize [gitdir]]
3229 set ep [file normalize [exec git --exec-path]]
3230 regsub -all ' $gd "'\\''" gd
3231 regsub -all ' $ep "'\\''" ep
3232 puts $fd "#!/bin/sh"
3233 foreach name [array names env] {
3234 if {[string match GIT_* $name]} {
3235 regsub -all ' $env($name) "'\\''" v
3236 puts $fd "export $name='$v'"
3237 }
3238 }
3239 puts $fd "export PATH='$ep':\$PATH"
3240 puts $fd "export GIT_DIR='$gd'"
3241 puts $fd "exec [file normalize $argv0]"
3242 close $fd
3243 file attributes $exe -permissions u+x,g+x,o+x
3245 } err]} {
3246 error_popup "Cannot write icon:\n\n$err"
3247 }
3248 }
3249}
3250proc toggle_or_diff {w x y} {
3252 global file_states file_lists current_diff_path ui_index ui_workdir
3253 global last_clicked selected_paths
3254 set pos [split [$w index @$x,$y] .]
3256 set lno [lindex $pos 0]
3257 set col [lindex $pos 1]
3258 set path [lindex $file_lists($w) [expr {$lno - 1}]]
3259 if {$path eq {}} {
3260 set last_clicked {}
3261 return
3262 }
3263 set last_clicked [list $w $lno]
3265 array unset selected_paths
3266 $ui_index tag remove in_sel 0.0 end
3267 $ui_workdir tag remove in_sel 0.0 end
3268 if {$col == 0} {
3270 if {$current_diff_path eq $path} {
3271 set after {reshow_diff;}
3272 } else {
3273 set after {}
3274 }
3275 if {$w eq $ui_index} {
3276 update_indexinfo \
3277 "Unstaging [short_path $path] from commit" \
3278 [list $path] \
3279 [concat $after {set ui_status_value {Ready.}}]
3280 } elseif {$w eq $ui_workdir} {
3281 update_index \
3282 "Adding [short_path $path]" \
3283 [list $path] \
3284 [concat $after {set ui_status_value {Ready.}}]
3285 }
3286 } else {
3287 show_diff $path $w $lno
3288 }
3289}
3290proc add_one_to_selection {w x y} {
3292 global file_lists last_clicked selected_paths
3293 set lno [lindex [split [$w index @$x,$y] .] 0]
3295 set path [lindex $file_lists($w) [expr {$lno - 1}]]
3296 if {$path eq {}} {
3297 set last_clicked {}
3298 return
3299 }
3300 if {$last_clicked ne {}
3302 && [lindex $last_clicked 0] ne $w} {
3303 array unset selected_paths
3304 [lindex $last_clicked 0] tag remove in_sel 0.0 end
3305 }
3306 set last_clicked [list $w $lno]
3308 if {[catch {set in_sel $selected_paths($path)}]} {
3309 set in_sel 0
3310 }
3311 if {$in_sel} {
3312 unset selected_paths($path)
3313 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
3314 } else {
3315 set selected_paths($path) 1
3316 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
3317 }
3318}
3319proc add_range_to_selection {w x y} {
3321 global file_lists last_clicked selected_paths
3322 if {[lindex $last_clicked 0] ne $w} {
3324 toggle_or_diff $w $x $y
3325 return
3326 }
3327 set lno [lindex [split [$w index @$x,$y] .] 0]
3329 set lc [lindex $last_clicked 1]
3330 if {$lc < $lno} {
3331 set begin $lc
3332 set end $lno
3333 } else {
3334 set begin $lno
3335 set end $lc
3336 }
3337 foreach path [lrange $file_lists($w) \
3339 [expr {$begin - 1}] \
3340 [expr {$end - 1}]] {
3341 set selected_paths($path) 1
3342 }
3343 $w tag add in_sel $begin.0 [expr {$end + 1}].0
3344}
3345######################################################################
3347##
3348## config defaults
3349set cursor_ptr arrow
3351font create font_diff -family Courier -size 10
3352font create font_ui
3353catch {
3354 label .dummy
3355 eval font configure font_ui [font actual [.dummy cget -font]]
3356 destroy .dummy
3357}
3358font create font_uibold
3360font create font_diffbold
3361if {[is_Windows]} {
3363 set M1B Control
3364 set M1T Ctrl
3365} elseif {[is_MacOSX]} {
3366 set M1B M1
3367 set M1T Cmd
3368} else {
3369 set M1B M1
3370 set M1T M1
3371}
3372proc apply_config {} {
3374 global repo_config font_descs
3375 foreach option $font_descs {
3377 set name [lindex $option 0]
3378 set font [lindex $option 1]
3379 if {[catch {
3380 foreach {cn cv} $repo_config(gui.$name) {
3381 font configure $font $cn $cv
3382 }
3383 } err]} {
3384 error_popup "Invalid font specified in gui.$name:\n\n$err"
3385 }
3386 foreach {cn cv} [font configure $font] {
3387 font configure ${font}bold $cn $cv
3388 }
3389 font configure ${font}bold -weight bold
3390 }
3391}
3392set default_config(gui.trustmtime) false
3394set default_config(gui.pullsummary) true
3395set default_config(gui.diffcontext) 5
3396set default_config(gui.newbranchtemplate) {}
3397set default_config(gui.fontui) [font configure font_ui]
3398set default_config(gui.fontdiff) [font configure font_diff]
3399set font_descs {
3400 {fontui font_ui {Main Font}}
3401 {fontdiff font_diff {Diff/Console Font}}
3402}
3403load_config 0
3404apply_config
3405######################################################################
3407##
3408## ui construction
3409# -- Menu Bar
3411#
3412menu .mbar -tearoff 0
3413.mbar add cascade -label Repository -menu .mbar.repository
3414.mbar add cascade -label Edit -menu .mbar.edit
3415if {!$single_commit} {
3416 .mbar add cascade -label Branch -menu .mbar.branch
3417}
3418.mbar add cascade -label Commit -menu .mbar.commit
3419if {!$single_commit} {
3420 .mbar add cascade -label Fetch -menu .mbar.fetch
3421 .mbar add cascade -label Pull -menu .mbar.pull
3422 .mbar add cascade -label Push -menu .mbar.push
3423}
3424. configure -menu .mbar
3425# -- Repository Menu
3427#
3428menu .mbar.repository
3429.mbar.repository add command \
3430 -label {Visualize Current Branch} \
3431 -command {do_gitk {}} \
3432 -font font_ui
3433if {![is_MacOSX]} {
3434 .mbar.repository add command \
3435 -label {Visualize All Branches} \
3436 -command {do_gitk {--all}} \
3437 -font font_ui
3438}
3439.mbar.repository add separator
3440if {!$single_commit} {
3442 .mbar.repository add command -label {Compress Database} \
3443 -command do_gc \
3444 -font font_ui
3445 .mbar.repository add command -label {Verify Database} \
3447 -command do_fsck_objects \
3448 -font font_ui
3449 .mbar.repository add separator
3451 if {[is_Windows]} {
3453 .mbar.repository add command \
3454 -label {Create Desktop Icon} \
3455 -command do_windows_shortcut \
3456 -font font_ui
3457 } elseif {[is_MacOSX]} {
3458 .mbar.repository add command \
3459 -label {Create Desktop Icon} \
3460 -command do_macosx_app \
3461 -font font_ui
3462 }
3463}
3464.mbar.repository add command -label Quit \
3466 -command do_quit \
3467 -accelerator $M1T-Q \
3468 -font font_ui
3469# -- Edit Menu
3471#
3472menu .mbar.edit
3473.mbar.edit add command -label Undo \
3474 -command {catch {[focus] edit undo}} \
3475 -accelerator $M1T-Z \
3476 -font font_ui
3477.mbar.edit add command -label Redo \
3478 -command {catch {[focus] edit redo}} \
3479 -accelerator $M1T-Y \
3480 -font font_ui
3481.mbar.edit add separator
3482.mbar.edit add command -label Cut \
3483 -command {catch {tk_textCut [focus]}} \
3484 -accelerator $M1T-X \
3485 -font font_ui
3486.mbar.edit add command -label Copy \
3487 -command {catch {tk_textCopy [focus]}} \
3488 -accelerator $M1T-C \
3489 -font font_ui
3490.mbar.edit add command -label Paste \
3491 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
3492 -accelerator $M1T-V \
3493 -font font_ui
3494.mbar.edit add command -label Delete \
3495 -command {catch {[focus] delete sel.first sel.last}} \
3496 -accelerator Del \
3497 -font font_ui
3498.mbar.edit add separator
3499.mbar.edit add command -label {Select All} \
3500 -command {catch {[focus] tag add sel 0.0 end}} \
3501 -accelerator $M1T-A \
3502 -font font_ui
3503# -- Branch Menu
3505#
3506if {!$single_commit} {
3507 menu .mbar.branch
3508 .mbar.branch add command -label {Create...} \
3510 -command do_create_branch \
3511 -accelerator $M1T-N \
3512 -font font_ui
3513 lappend disable_on_lock [list .mbar.branch entryconf \
3514 [.mbar.branch index last] -state]
3515 .mbar.branch add command -label {Delete...} \
3517 -command do_delete_branch \
3518 -font font_ui
3519 lappend disable_on_lock [list .mbar.branch entryconf \
3520 [.mbar.branch index last] -state]
3521}
3522# -- Commit Menu
3524#
3525menu .mbar.commit
3526.mbar.commit add radiobutton \
3528 -label {New Commit} \
3529 -command do_select_commit_type \
3530 -variable selected_commit_type \
3531 -value new \
3532 -font font_ui
3533lappend disable_on_lock \
3534 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3535.mbar.commit add radiobutton \
3537 -label {Amend Last Commit} \
3538 -command do_select_commit_type \
3539 -variable selected_commit_type \
3540 -value amend \
3541 -font font_ui
3542lappend disable_on_lock \
3543 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3544.mbar.commit add separator
3546.mbar.commit add command -label Rescan \
3548 -command do_rescan \
3549 -accelerator F5 \
3550 -font font_ui
3551lappend disable_on_lock \
3552 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3553.mbar.commit add command -label {Add To Commit} \
3555 -command do_add_selection \
3556 -font font_ui
3557lappend disable_on_lock \
3558 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3559.mbar.commit add command -label {Add All To Commit} \
3561 -command do_add_all \
3562 -accelerator $M1T-I \
3563 -font font_ui
3564lappend disable_on_lock \
3565 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3566.mbar.commit add command -label {Unstage From Commit} \
3568 -command do_unstage_selection \
3569 -font font_ui
3570lappend disable_on_lock \
3571 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3572.mbar.commit add command -label {Revert Changes} \
3574 -command do_revert_selection \
3575 -font font_ui
3576lappend disable_on_lock \
3577 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3578.mbar.commit add separator
3580.mbar.commit add command -label {Sign Off} \
3582 -command do_signoff \
3583 -accelerator $M1T-S \
3584 -font font_ui
3585.mbar.commit add command -label Commit \
3587 -command do_commit \
3588 -accelerator $M1T-Return \
3589 -font font_ui
3590lappend disable_on_lock \
3591 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3592# -- Transport menus
3594#
3595if {!$single_commit} {
3596 menu .mbar.fetch
3597 menu .mbar.pull
3598 menu .mbar.push
3599}
3600if {[is_MacOSX]} {
3602 # -- Apple Menu (Mac OS X only)
3603 #
3604 .mbar add cascade -label Apple -menu .mbar.apple
3605 menu .mbar.apple
3606 .mbar.apple add command -label "About [appname]" \
3608 -command do_about \
3609 -font font_ui
3610 .mbar.apple add command -label "[appname] Options..." \
3611 -command do_options \
3612 -font font_ui
3613} else {
3614 # -- Edit Menu
3615 #
3616 .mbar.edit add separator
3617 .mbar.edit add command -label {Options...} \
3618 -command do_options \
3619 -font font_ui
3620 # -- Tools Menu
3622 #
3623 if {[file exists /usr/local/miga/lib/gui-miga]
3624 && [file exists .pvcsrc]} {
3625 proc do_miga {} {
3626 global ui_status_value
3627 if {![lock_index update]} return
3628 set cmd [list sh --login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
3629 set miga_fd [open "|$cmd" r]
3630 fconfigure $miga_fd -blocking 0
3631 fileevent $miga_fd readable [list miga_done $miga_fd]
3632 set ui_status_value {Running miga...}
3633 }
3634 proc miga_done {fd} {
3635 read $fd 512
3636 if {[eof $fd]} {
3637 close $fd
3638 unlock_index
3639 rescan [list set ui_status_value {Ready.}]
3640 }
3641 }
3642 .mbar add cascade -label Tools -menu .mbar.tools
3643 menu .mbar.tools
3644 .mbar.tools add command -label "Migrate" \
3645 -command do_miga \
3646 -font font_ui
3647 lappend disable_on_lock \
3648 [list .mbar.tools entryconf [.mbar.tools index last] -state]
3649 }
3650 # -- Help Menu
3652 #
3653 .mbar add cascade -label Help -menu .mbar.help
3654 menu .mbar.help
3655 .mbar.help add command -label "About [appname]" \
3657 -command do_about \
3658 -font font_ui
3659}
3660# -- Branch Control
3663#
3664frame .branch \
3665 -borderwidth 1 \
3666 -relief sunken
3667label .branch.l1 \
3668 -text {Current Branch:} \
3669 -anchor w \
3670 -justify left \
3671 -font font_ui
3672label .branch.cb \
3673 -textvariable current_branch \
3674 -anchor w \
3675 -justify left \
3676 -font font_ui
3677pack .branch.l1 -side left
3678pack .branch.cb -side left -fill x
3679pack .branch -side top -fill x
3680# -- Main Window Layout
3682#
3683panedwindow .vpane -orient vertical
3684panedwindow .vpane.files -orient horizontal
3685.vpane add .vpane.files -sticky nsew -height 100 -width 400
3686pack .vpane -anchor n -side top -fill both -expand 1
3687# -- Index File List
3689#
3690frame .vpane.files.index -height 100 -width 400
3691label .vpane.files.index.title -text {Changes To Be Committed} \
3692 -background green \
3693 -font font_ui
3694text $ui_index -background white -borderwidth 0 \
3695 -width 40 -height 10 \
3696 -wrap none \
3697 -font font_ui \
3698 -cursor $cursor_ptr \
3699 -xscrollcommand {.vpane.files.index.sx set} \
3700 -yscrollcommand {.vpane.files.index.sy set} \
3701 -state disabled
3702scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
3703scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
3704pack .vpane.files.index.title -side top -fill x
3705pack .vpane.files.index.sx -side bottom -fill x
3706pack .vpane.files.index.sy -side right -fill y
3707pack $ui_index -side left -fill both -expand 1
3708.vpane.files add .vpane.files.index -sticky nsew
3709# -- Working Directory File List
3711#
3712frame .vpane.files.workdir -height 100 -width 100
3713label .vpane.files.workdir.title -text {Changed But Not Updated} \
3714 -background red \
3715 -font font_ui
3716text $ui_workdir -background white -borderwidth 0 \
3717 -width 40 -height 10 \
3718 -wrap none \
3719 -font font_ui \
3720 -cursor $cursor_ptr \
3721 -xscrollcommand {.vpane.files.workdir.sx set} \
3722 -yscrollcommand {.vpane.files.workdir.sy set} \
3723 -state disabled
3724scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
3725scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
3726pack .vpane.files.workdir.title -side top -fill x
3727pack .vpane.files.workdir.sx -side bottom -fill x
3728pack .vpane.files.workdir.sy -side right -fill y
3729pack $ui_workdir -side left -fill both -expand 1
3730.vpane.files add .vpane.files.workdir -sticky nsew
3731foreach i [list $ui_index $ui_workdir] {
3733 $i tag conf in_diff -font font_uibold
3734 $i tag conf in_sel \
3735 -background [$i cget -foreground] \
3736 -foreground [$i cget -background]
3737}
3738unset i
3739# -- Diff and Commit Area
3741#
3742frame .vpane.lower -height 300 -width 400
3743frame .vpane.lower.commarea
3744frame .vpane.lower.diff -relief sunken -borderwidth 1
3745pack .vpane.lower.commarea -side top -fill x
3746pack .vpane.lower.diff -side bottom -fill both -expand 1
3747.vpane add .vpane.lower -stick nsew
3748# -- Commit Area Buttons
3750#
3751frame .vpane.lower.commarea.buttons
3752label .vpane.lower.commarea.buttons.l -text {} \
3753 -anchor w \
3754 -justify left \
3755 -font font_ui
3756pack .vpane.lower.commarea.buttons.l -side top -fill x
3757pack .vpane.lower.commarea.buttons -side left -fill y
3758button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
3760 -command do_rescan \
3761 -font font_ui
3762pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3763lappend disable_on_lock \
3764 {.vpane.lower.commarea.buttons.rescan conf -state}
3765button .vpane.lower.commarea.buttons.incall -text {Add All} \
3767 -command do_add_all \
3768 -font font_ui
3769pack .vpane.lower.commarea.buttons.incall -side top -fill x
3770lappend disable_on_lock \
3771 {.vpane.lower.commarea.buttons.incall conf -state}
3772button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
3774 -command do_signoff \
3775 -font font_ui
3776pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3777button .vpane.lower.commarea.buttons.commit -text {Commit} \
3779 -command do_commit \
3780 -font font_ui
3781pack .vpane.lower.commarea.buttons.commit -side top -fill x
3782lappend disable_on_lock \
3783 {.vpane.lower.commarea.buttons.commit conf -state}
3784# -- Commit Message Buffer
3786#
3787frame .vpane.lower.commarea.buffer
3788frame .vpane.lower.commarea.buffer.header
3789set ui_comm .vpane.lower.commarea.buffer.t
3790set ui_coml .vpane.lower.commarea.buffer.header.l
3791radiobutton .vpane.lower.commarea.buffer.header.new \
3792 -text {New Commit} \
3793 -command do_select_commit_type \
3794 -variable selected_commit_type \
3795 -value new \
3796 -font font_ui
3797lappend disable_on_lock \
3798 [list .vpane.lower.commarea.buffer.header.new conf -state]
3799radiobutton .vpane.lower.commarea.buffer.header.amend \
3800 -text {Amend Last Commit} \
3801 -command do_select_commit_type \
3802 -variable selected_commit_type \
3803 -value amend \
3804 -font font_ui
3805lappend disable_on_lock \
3806 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3807label $ui_coml \
3808 -anchor w \
3809 -justify left \
3810 -font font_ui
3811proc trace_commit_type {varname args} {
3812 global ui_coml commit_type
3813 switch -glob -- $commit_type {
3814 initial {set txt {Initial Commit Message:}}
3815 amend {set txt {Amended Commit Message:}}
3816 amend-initial {set txt {Amended Initial Commit Message:}}
3817 amend-merge {set txt {Amended Merge Commit Message:}}
3818 merge {set txt {Merge Commit Message:}}
3819 * {set txt {Commit Message:}}
3820 }
3821 $ui_coml conf -text $txt
3822}
3823trace add variable commit_type write trace_commit_type
3824pack $ui_coml -side left -fill x
3825pack .vpane.lower.commarea.buffer.header.amend -side right
3826pack .vpane.lower.commarea.buffer.header.new -side right
3827text $ui_comm -background white -borderwidth 1 \
3829 -undo true \
3830 -maxundo 20 \
3831 -autoseparators true \
3832 -relief sunken \
3833 -width 75 -height 9 -wrap none \
3834 -font font_diff \
3835 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3836scrollbar .vpane.lower.commarea.buffer.sby \
3837 -command [list $ui_comm yview]
3838pack .vpane.lower.commarea.buffer.header -side top -fill x
3839pack .vpane.lower.commarea.buffer.sby -side right -fill y
3840pack $ui_comm -side left -fill y
3841pack .vpane.lower.commarea.buffer -side left -fill y
3842# -- Commit Message Buffer Context Menu
3844#
3845set ctxm .vpane.lower.commarea.buffer.ctxm
3846menu $ctxm -tearoff 0
3847$ctxm add command \
3848 -label {Cut} \
3849 -font font_ui \
3850 -command {tk_textCut $ui_comm}
3851$ctxm add command \
3852 -label {Copy} \
3853 -font font_ui \
3854 -command {tk_textCopy $ui_comm}
3855$ctxm add command \
3856 -label {Paste} \
3857 -font font_ui \
3858 -command {tk_textPaste $ui_comm}
3859$ctxm add command \
3860 -label {Delete} \
3861 -font font_ui \
3862 -command {$ui_comm delete sel.first sel.last}
3863$ctxm add separator
3864$ctxm add command \
3865 -label {Select All} \
3866 -font font_ui \
3867 -command {$ui_comm tag add sel 0.0 end}
3868$ctxm add command \
3869 -label {Copy All} \
3870 -font font_ui \
3871 -command {
3872 $ui_comm tag add sel 0.0 end
3873 tk_textCopy $ui_comm
3874 $ui_comm tag remove sel 0.0 end
3875 }
3876$ctxm add separator
3877$ctxm add command \
3878 -label {Sign Off} \
3879 -font font_ui \
3880 -command do_signoff
3881bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
3882# -- Diff Header
3884#
3885set current_diff_path {}
3886set diff_actions [list]
3887proc trace_current_diff_path {varname args} {
3888 global current_diff_path diff_actions file_states
3889 if {$current_diff_path eq {}} {
3890 set s {}
3891 set f {}
3892 set p {}
3893 set o disabled
3894 } else {
3895 set p $current_diff_path
3896 set s [mapdesc [lindex $file_states($p) 0] $p]
3897 set f {File:}
3898 set p [escape_path $p]
3899 set o normal
3900 }
3901 .vpane.lower.diff.header.status configure -text $s
3903 .vpane.lower.diff.header.file configure -text $f
3904 .vpane.lower.diff.header.path configure -text $p
3905 foreach w $diff_actions {
3906 uplevel #0 $w $o
3907 }
3908}
3909trace add variable current_diff_path write trace_current_diff_path
3910frame .vpane.lower.diff.header -background orange
3912label .vpane.lower.diff.header.status \
3913 -background orange \
3914 -width $max_status_desc \
3915 -anchor w \
3916 -justify left \
3917 -font font_ui
3918label .vpane.lower.diff.header.file \
3919 -background orange \
3920 -anchor w \
3921 -justify left \
3922 -font font_ui
3923label .vpane.lower.diff.header.path \
3924 -background orange \
3925 -anchor w \
3926 -justify left \
3927 -font font_ui
3928pack .vpane.lower.diff.header.status -side left
3929pack .vpane.lower.diff.header.file -side left
3930pack .vpane.lower.diff.header.path -fill x
3931set ctxm .vpane.lower.diff.header.ctxm
3932menu $ctxm -tearoff 0
3933$ctxm add command \
3934 -label {Copy} \
3935 -font font_ui \
3936 -command {
3937 clipboard clear
3938 clipboard append \
3939 -format STRING \
3940 -type STRING \
3941 -- $current_diff_path
3942 }
3943lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3944bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3945# -- Diff Body
3947#
3948frame .vpane.lower.diff.body
3949set ui_diff .vpane.lower.diff.body.t
3950text $ui_diff -background white -borderwidth 0 \
3951 -width 80 -height 15 -wrap none \
3952 -font font_diff \
3953 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3954 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3955 -state disabled
3956scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3957 -command [list $ui_diff xview]
3958scrollbar .vpane.lower.diff.body.sby -orient vertical \
3959 -command [list $ui_diff yview]
3960pack .vpane.lower.diff.body.sbx -side bottom -fill x
3961pack .vpane.lower.diff.body.sby -side right -fill y
3962pack $ui_diff -side left -fill both -expand 1
3963pack .vpane.lower.diff.header -side top -fill x
3964pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3965$ui_diff tag conf d_@ -foreground blue -font font_diffbold
3967$ui_diff tag conf d_+ -foreground {#00a000}
3968$ui_diff tag conf d_- -foreground red
3969$ui_diff tag conf d_++ -foreground {#00a000}
3971$ui_diff tag conf d_-- -foreground red
3972$ui_diff tag conf d_+s \
3973 -foreground {#00a000} \
3974 -background {#e2effa}
3975$ui_diff tag conf d_-s \
3976 -foreground red \
3977 -background {#e2effa}
3978$ui_diff tag conf d_s+ \
3979 -foreground {#00a000} \
3980 -background ivory1
3981$ui_diff tag conf d_s- \
3982 -foreground red \
3983 -background ivory1
3984$ui_diff tag conf d<<<<<<< \
3986 -foreground orange \
3987 -font font_diffbold
3988$ui_diff tag conf d======= \
3989 -foreground orange \
3990 -font font_diffbold
3991$ui_diff tag conf d>>>>>>> \
3992 -foreground orange \
3993 -font font_diffbold
3994$ui_diff tag raise sel
3996# -- Diff Body Context Menu
3998#
3999set ctxm .vpane.lower.diff.body.ctxm
4000menu $ctxm -tearoff 0
4001$ctxm add command \
4002 -label {Refresh} \
4003 -font font_ui \
4004 -command reshow_diff
4005$ctxm add command \
4006 -label {Copy} \
4007 -font font_ui \
4008 -command {tk_textCopy $ui_diff}
4009lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4010$ctxm add command \
4011 -label {Select All} \
4012 -font font_ui \
4013 -command {$ui_diff tag add sel 0.0 end}
4014lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4015$ctxm add command \
4016 -label {Copy All} \
4017 -font font_ui \
4018 -command {
4019 $ui_diff tag add sel 0.0 end
4020 tk_textCopy $ui_diff
4021 $ui_diff tag remove sel 0.0 end
4022 }
4023lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4024$ctxm add separator
4025$ctxm add command \
4026 -label {Decrease Font Size} \
4027 -font font_ui \
4028 -command {incr_font_size font_diff -1}
4029lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4030$ctxm add command \
4031 -label {Increase Font Size} \
4032 -font font_ui \
4033 -command {incr_font_size font_diff 1}
4034lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4035$ctxm add separator
4036$ctxm add command \
4037 -label {Show Less Context} \
4038 -font font_ui \
4039 -command {if {$repo_config(gui.diffcontext) >= 2} {
4040 incr repo_config(gui.diffcontext) -1
4041 reshow_diff
4042 }}
4043lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4044$ctxm add command \
4045 -label {Show More Context} \
4046 -font font_ui \
4047 -command {
4048 incr repo_config(gui.diffcontext)
4049 reshow_diff
4050 }
4051lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
4052$ctxm add separator
4053$ctxm add command -label {Options...} \
4054 -font font_ui \
4055 -command do_options
4056bind_button3 $ui_diff "tk_popup $ctxm %X %Y"
4057# -- Status Bar
4059#
4060set ui_status_value {Initializing...}
4061label .status -textvariable ui_status_value \
4062 -anchor w \
4063 -justify left \
4064 -borderwidth 1 \
4065 -relief sunken \
4066 -font font_ui
4067pack .status -anchor w -side bottom -fill x
4068# -- Load geometry
4070#
4071catch {
4072set gm $repo_config(gui.geometry)
4073wm geometry . [lindex $gm 0]
4074.vpane sash place 0 \
4075 [lindex [.vpane sash coord 0] 0] \
4076 [lindex $gm 1]
4077.vpane.files sash place 0 \
4078 [lindex $gm 2] \
4079 [lindex [.vpane.files sash coord 0] 1]
4080unset gm
4081}
4082# -- Key Bindings
4084#
4085bind $ui_comm <$M1B-Key-Return> {do_commit;break}
4086bind $ui_comm <$M1B-Key-i> {do_add_all;break}
4087bind $ui_comm <$M1B-Key-I> {do_add_all;break}
4088bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
4089bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
4090bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
4091bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
4092bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
4093bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
4094bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
4095bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
4096bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
4098bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
4099bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
4100bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
4101bind $ui_diff <$M1B-Key-v> {break}
4102bind $ui_diff <$M1B-Key-V> {break}
4103bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
4104bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
4105bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
4106bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
4107bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
4108bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
4109if {!$single_commit} {
4111 bind . <$M1B-Key-n> do_create_branch
4112 bind . <$M1B-Key-N> do_create_branch
4113}
4114bind . <Destroy> do_quit
4116bind all <Key-F5> do_rescan
4117bind all <$M1B-Key-r> do_rescan
4118bind all <$M1B-Key-R> do_rescan
4119bind . <$M1B-Key-s> do_signoff
4120bind . <$M1B-Key-S> do_signoff
4121bind . <$M1B-Key-i> do_add_all
4122bind . <$M1B-Key-I> do_add_all
4123bind . <$M1B-Key-Return> do_commit
4124bind all <$M1B-Key-q> do_quit
4125bind all <$M1B-Key-Q> do_quit
4126bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
4127bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
4128foreach i [list $ui_index $ui_workdir] {
4129 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
4130 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
4131 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
4132}
4133unset i
4134set file_lists($ui_index) [list]
4136set file_lists($ui_workdir) [list]
4137set HEAD {}
4139set PARENT {}
4140set MERGE_HEAD [list]
4141set commit_type {}
4142set empty_tree {}
4143set current_branch {}
4144set current_diff_path {}
4145set selected_commit_type new
4146wm title . "[appname] ([file normalize [file dirname [gitdir]]])"
4148focus -force $ui_comm
4149# -- Warn the user about environmental problems. Cygwin's Tcl
4151# does *not* pass its env array onto any processes it spawns.
4152# This means that git processes get none of our environment.
4153#
4154if {[is_Windows]} {
4155 set ignored_env 0
4156 set suggest_user {}
4157 set msg "Possible environment issues exist.
4158The following environment variables are probably
4160going to be ignored by any Git subprocess run
4161by [appname]:
4162"
4164 foreach name [array names env] {
4165 switch -regexp -- $name {
4166 {^GIT_INDEX_FILE$} -
4167 {^GIT_OBJECT_DIRECTORY$} -
4168 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
4169 {^GIT_DIFF_OPTS$} -
4170 {^GIT_EXTERNAL_DIFF$} -
4171 {^GIT_PAGER$} -
4172 {^GIT_TRACE$} -
4173 {^GIT_CONFIG$} -
4174 {^GIT_CONFIG_LOCAL$} -
4175 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
4176 append msg " - $name\n"
4177 incr ignored_env
4178 }
4179 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
4180 append msg " - $name\n"
4181 incr ignored_env
4182 set suggest_user $name
4183 }
4184 }
4185 }
4186 if {$ignored_env > 0} {
4187 append msg "
4188This is due to a known issue with the
4189Tcl binary distributed by Cygwin."
4190 if {$suggest_user ne {}} {
4192 append msg "
4193A good replacement for $suggest_user
4195is placing values for the user.name and
4196user.email settings into your personal
4197~/.gitconfig file.
4198"
4199 }
4200 warn_popup $msg
4201 }
4202 unset ignored_env msg suggest_user name
4203}
4204# -- Only initialize complex UI if we are going to stay running.
4206#
4207if {!$single_commit} {
4208 load_all_remotes
4209 load_all_heads
4210 populate_branch_menu
4212 populate_fetch_menu .mbar.fetch
4213 populate_pull_menu .mbar.pull
4214 populate_push_menu .mbar.push
4215}
4216# -- Only suggest a gc run if we are going to stay running.
4218#
4219if {!$single_commit} {
4220 set object_limit 2000
4221 if {[is_Windows]} {set object_limit 200}
4222 regexp {^([0-9]+) objects,} [exec git count-objects] _junk objects_current
4223 if {$objects_current >= $object_limit} {
4224 if {[ask_popup \
4225 "This repository currently has $objects_current loose objects.
4226To maintain optimal performance it is strongly
4228recommended that you compress the database
4229when more than $object_limit loose objects exist.
4230Compress the database now?"] eq yes} {
4232 do_gc
4233 }
4234 }
4235 unset object_limit _junk objects_current
4236}
4237lock_index begin-read
4239after 1 do_rescan