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