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