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