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)/ \
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 AM -
503 MM {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 _D {set new DD}
1506
1507 _M -
1508 MM -
1509 M_ {set new M_}
1510
1511 _O -
1512 AM -
1513 A_ {set new A_}
1514
1515 ?? {continue}
1516 }
1517
1518 puts -nonewline $fd $path
1519 puts -nonewline $fd "\0"
1520 display_file $path $new
1521 }
1522
1523 set ui_status_value [format \
1524 "$msg... %i/%i files (%.2f%%)" \
1525 $update_index_cp \
1526 $totalCnt \
1527 [expr {100.0 * $update_index_cp / $totalCnt}]]
1528}
1529
1530proc checkout_index {msg pathList after} {
1531 global update_index_cp ui_status_value
1532
1533 if {![lock_index update]} return
1534
1535 set update_index_cp 0
1536 set pathList [lsort $pathList]
1537 set totalCnt [llength $pathList]
1538 set batch [expr {int($totalCnt * .01) + 1}]
1539 if {$batch > 25} {set batch 25}
1540
1541 set ui_status_value [format \
1542 "$msg... %i/%i files (%.2f%%)" \
1543 $update_index_cp \
1544 $totalCnt \
1545 0.0]
1546 set cmd [list git checkout-index]
1547 lappend cmd --index
1548 lappend cmd --quiet
1549 lappend cmd --force
1550 lappend cmd -z
1551 lappend cmd --stdin
1552 set fd [open "| $cmd " w]
1553 fconfigure $fd \
1554 -blocking 0 \
1555 -buffering full \
1556 -buffersize 512 \
1557 -translation binary
1558 fileevent $fd writable [list \
1559 write_checkout_index \
1560 $fd \
1561 $pathList \
1562 $totalCnt \
1563 $batch \
1564 $msg \
1565 $after \
1566 ]
1567}
1568
1569proc write_checkout_index {fd pathList totalCnt batch msg after} {
1570 global update_index_cp ui_status_value
1571 global file_states current_diff
1572
1573 if {$update_index_cp >= $totalCnt} {
1574 close $fd
1575 unlock_index
1576 uplevel #0 $after
1577 return
1578 }
1579
1580 for {set i $batch} \
1581 {$update_index_cp < $totalCnt && $i > 0} \
1582 {incr i -1} {
1583 set path [lindex $pathList $update_index_cp]
1584 incr update_index_cp
1585
1586 switch -glob -- [lindex $file_states($path) 0] {
1587 AM -
1588 AD {set new A_}
1589 MM -
1590 MD {set new M_}
1591 _M -
1592 _D {set new __}
1593 ?? {continue}
1594 }
1595
1596 puts -nonewline $fd $path
1597 puts -nonewline $fd "\0"
1598 display_file $path $new
1599 }
1600
1601 set ui_status_value [format \
1602 "$msg... %i/%i files (%.2f%%)" \
1603 $update_index_cp \
1604 $totalCnt \
1605 [expr {100.0 * $update_index_cp / $totalCnt}]]
1606}
1607
1608######################################################################
1609##
1610## remote management
1611
1612proc load_all_remotes {} {
1613 global gitdir all_remotes repo_config
1614
1615 set all_remotes [list]
1616 set rm_dir [file join $gitdir remotes]
1617 if {[file isdirectory $rm_dir]} {
1618 set all_remotes [concat $all_remotes [glob \
1619 -types f \
1620 -tails \
1621 -nocomplain \
1622 -directory $rm_dir *]]
1623 }
1624
1625 foreach line [array names repo_config remote.*.url] {
1626 if {[regexp ^remote\.(.*)\.url\$ $line line name]} {
1627 lappend all_remotes $name
1628 }
1629 }
1630
1631 set all_remotes [lsort -unique $all_remotes]
1632}
1633
1634proc populate_fetch_menu {m} {
1635 global gitdir all_remotes repo_config
1636
1637 foreach r $all_remotes {
1638 set enable 0
1639 if {![catch {set a $repo_config(remote.$r.url)}]} {
1640 if {![catch {set a $repo_config(remote.$r.fetch)}]} {
1641 set enable 1
1642 }
1643 } else {
1644 catch {
1645 set fd [open [file join $gitdir remotes $r] r]
1646 while {[gets $fd n] >= 0} {
1647 if {[regexp {^Pull:[ \t]*([^:]+):} $n]} {
1648 set enable 1
1649 break
1650 }
1651 }
1652 close $fd
1653 }
1654 }
1655
1656 if {$enable} {
1657 $m add command \
1658 -label "Fetch from $r..." \
1659 -command [list fetch_from $r] \
1660 -font font_ui
1661 }
1662 }
1663}
1664
1665proc populate_push_menu {m} {
1666 global gitdir all_remotes repo_config
1667
1668 foreach r $all_remotes {
1669 set enable 0
1670 if {![catch {set a $repo_config(remote.$r.url)}]} {
1671 if {![catch {set a $repo_config(remote.$r.push)}]} {
1672 set enable 1
1673 }
1674 } else {
1675 catch {
1676 set fd [open [file join $gitdir remotes $r] r]
1677 while {[gets $fd n] >= 0} {
1678 if {[regexp {^Push:[ \t]*([^:]+):} $n]} {
1679 set enable 1
1680 break
1681 }
1682 }
1683 close $fd
1684 }
1685 }
1686
1687 if {$enable} {
1688 $m add command \
1689 -label "Push to $r..." \
1690 -command [list push_to $r] \
1691 -font font_ui
1692 }
1693 }
1694}
1695
1696proc populate_pull_menu {m} {
1697 global gitdir repo_config all_remotes disable_on_lock
1698
1699 foreach remote $all_remotes {
1700 set rb {}
1701 if {[array get repo_config remote.$remote.url] ne {}} {
1702 if {[array get repo_config remote.$remote.fetch] ne {}} {
1703 regexp {^([^:]+):} \
1704 [lindex $repo_config(remote.$remote.fetch) 0] \
1705 line rb
1706 }
1707 } else {
1708 catch {
1709 set fd [open [file join $gitdir remotes $remote] r]
1710 while {[gets $fd line] >= 0} {
1711 if {[regexp {^Pull:[ \t]*([^:]+):} $line line rb]} {
1712 break
1713 }
1714 }
1715 close $fd
1716 }
1717 }
1718
1719 set rb_short $rb
1720 regsub ^refs/heads/ $rb {} rb_short
1721 if {$rb_short ne {}} {
1722 $m add command \
1723 -label "Branch $rb_short from $remote..." \
1724 -command [list pull_remote $remote $rb] \
1725 -font font_ui
1726 lappend disable_on_lock \
1727 [list $m entryconf [$m index last] -state]
1728 }
1729 }
1730}
1731
1732######################################################################
1733##
1734## icons
1735
1736set filemask {
1737#define mask_width 14
1738#define mask_height 15
1739static unsigned char mask_bits[] = {
1740 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1741 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1742 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1743}
1744
1745image create bitmap file_plain -background white -foreground black -data {
1746#define plain_width 14
1747#define plain_height 15
1748static unsigned char plain_bits[] = {
1749 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1750 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1751 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1752} -maskdata $filemask
1753
1754image create bitmap file_mod -background white -foreground blue -data {
1755#define mod_width 14
1756#define mod_height 15
1757static unsigned char mod_bits[] = {
1758 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1759 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1760 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1761} -maskdata $filemask
1762
1763image create bitmap file_fulltick -background white -foreground "#007000" -data {
1764#define file_fulltick_width 14
1765#define file_fulltick_height 15
1766static unsigned char file_fulltick_bits[] = {
1767 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1768 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1769 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1770} -maskdata $filemask
1771
1772image create bitmap file_parttick -background white -foreground "#005050" -data {
1773#define parttick_width 14
1774#define parttick_height 15
1775static unsigned char parttick_bits[] = {
1776 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1777 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1778 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1779} -maskdata $filemask
1780
1781image create bitmap file_question -background white -foreground black -data {
1782#define file_question_width 14
1783#define file_question_height 15
1784static unsigned char file_question_bits[] = {
1785 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1786 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1787 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1788} -maskdata $filemask
1789
1790image create bitmap file_removed -background white -foreground red -data {
1791#define file_removed_width 14
1792#define file_removed_height 15
1793static unsigned char file_removed_bits[] = {
1794 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1795 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1796 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1797} -maskdata $filemask
1798
1799image create bitmap file_merge -background white -foreground blue -data {
1800#define file_merge_width 14
1801#define file_merge_height 15
1802static unsigned char file_merge_bits[] = {
1803 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1804 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1805 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1806} -maskdata $filemask
1807
1808set ui_index .vpane.files.index.list
1809set ui_other .vpane.files.other.list
1810set max_status_desc 0
1811foreach i {
1812 {__ i plain "Unmodified"}
1813 {_M i mod "Modified"}
1814 {M_ i fulltick "Included in commit"}
1815 {MM i parttick "Partially included"}
1816 {MD i question "Included (but gone)"}
1817
1818 {_O o plain "Untracked"}
1819 {A_ o fulltick "Added by commit"}
1820 {AM o parttick "Partially added"}
1821 {AD o question "Added (but gone)"}
1822
1823 {_D i question "Missing"}
1824 {DD i removed "Removed by commit"}
1825 {DO i removed "Removed (still exists)"}
1826 {DM i removed "Removed (but modified)"}
1827
1828 {UD i merge "Merge conflicts"}
1829 {UM i merge "Merge conflicts"}
1830 {U_ i merge "Merge conflicts"}
1831 } {
1832 if {$max_status_desc < [string length [lindex $i 3]]} {
1833 set max_status_desc [string length [lindex $i 3]]
1834 }
1835 if {[lindex $i 1] eq {i}} {
1836 set all_cols([lindex $i 0]) $ui_index
1837 } else {
1838 set all_cols([lindex $i 0]) $ui_other
1839 }
1840 set all_icons([lindex $i 0]) file_[lindex $i 2]
1841 set all_descs([lindex $i 0]) [lindex $i 3]
1842}
1843unset filemask i
1844
1845######################################################################
1846##
1847## util
1848
1849proc is_MacOSX {} {
1850 global tcl_platform tk_library
1851 if {[tk windowingsystem] eq {aqua}} {
1852 return 1
1853 }
1854 return 0
1855}
1856
1857proc is_Windows {} {
1858 global tcl_platform
1859 if {$tcl_platform(platform) eq {windows}} {
1860 return 1
1861 }
1862 return 0
1863}
1864
1865proc bind_button3 {w cmd} {
1866 bind $w <Any-Button-3> $cmd
1867 if {[is_MacOSX]} {
1868 bind $w <Control-Button-1> $cmd
1869 }
1870}
1871
1872proc incr_font_size {font {amt 1}} {
1873 set sz [font configure $font -size]
1874 incr sz $amt
1875 font configure $font -size $sz
1876 font configure ${font}bold -size $sz
1877}
1878
1879proc hook_failed_popup {hook msg} {
1880 global gitdir appname
1881
1882 set w .hookfail
1883 toplevel $w
1884
1885 frame $w.m
1886 label $w.m.l1 -text "$hook hook failed:" \
1887 -anchor w \
1888 -justify left \
1889 -font font_uibold
1890 text $w.m.t \
1891 -background white -borderwidth 1 \
1892 -relief sunken \
1893 -width 80 -height 10 \
1894 -font font_diff \
1895 -yscrollcommand [list $w.m.sby set]
1896 label $w.m.l2 \
1897 -text {You must correct the above errors before committing.} \
1898 -anchor w \
1899 -justify left \
1900 -font font_uibold
1901 scrollbar $w.m.sby -command [list $w.m.t yview]
1902 pack $w.m.l1 -side top -fill x
1903 pack $w.m.l2 -side bottom -fill x
1904 pack $w.m.sby -side right -fill y
1905 pack $w.m.t -side left -fill both -expand 1
1906 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
1907
1908 $w.m.t insert 1.0 $msg
1909 $w.m.t conf -state disabled
1910
1911 button $w.ok -text OK \
1912 -width 15 \
1913 -font font_ui \
1914 -command "destroy $w"
1915 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
1916
1917 bind $w <Visibility> "grab $w; focus $w"
1918 bind $w <Key-Return> "destroy $w"
1919 wm title $w "$appname ([lindex [file split \
1920 [file normalize [file dirname $gitdir]]] \
1921 end]): error"
1922 tkwait window $w
1923}
1924
1925set next_console_id 0
1926
1927proc new_console {short_title long_title} {
1928 global next_console_id console_data
1929 set w .console[incr next_console_id]
1930 set console_data($w) [list $short_title $long_title]
1931 return [console_init $w]
1932}
1933
1934proc console_init {w} {
1935 global console_cr console_data
1936 global gitdir appname M1B
1937
1938 set console_cr($w) 1.0
1939 toplevel $w
1940 frame $w.m
1941 label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
1942 -anchor w \
1943 -justify left \
1944 -font font_uibold
1945 text $w.m.t \
1946 -background white -borderwidth 1 \
1947 -relief sunken \
1948 -width 80 -height 10 \
1949 -font font_diff \
1950 -state disabled \
1951 -yscrollcommand [list $w.m.sby set]
1952 label $w.m.s -text {Working... please wait...} \
1953 -anchor w \
1954 -justify left \
1955 -font font_uibold
1956 scrollbar $w.m.sby -command [list $w.m.t yview]
1957 pack $w.m.l1 -side top -fill x
1958 pack $w.m.s -side bottom -fill x
1959 pack $w.m.sby -side right -fill y
1960 pack $w.m.t -side left -fill both -expand 1
1961 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
1962
1963 menu $w.ctxm -tearoff 0
1964 $w.ctxm add command -label "Copy" \
1965 -font font_ui \
1966 -command "tk_textCopy $w.m.t"
1967 $w.ctxm add command -label "Select All" \
1968 -font font_ui \
1969 -command "$w.m.t tag add sel 0.0 end"
1970 $w.ctxm add command -label "Copy All" \
1971 -font font_ui \
1972 -command "
1973 $w.m.t tag add sel 0.0 end
1974 tk_textCopy $w.m.t
1975 $w.m.t tag remove sel 0.0 end
1976 "
1977
1978 button $w.ok -text {Close} \
1979 -font font_ui \
1980 -state disabled \
1981 -command "destroy $w"
1982 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
1983
1984 bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
1985 bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
1986 bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
1987 bind $w <Visibility> "focus $w"
1988 wm title $w "$appname ([lindex [file split \
1989 [file normalize [file dirname $gitdir]]] \
1990 end]): [lindex $console_data($w) 0]"
1991 return $w
1992}
1993
1994proc console_exec {w cmd {after {}}} {
1995 # -- Windows tosses the enviroment when we exec our child.
1996 # But most users need that so we have to relogin. :-(
1997 #
1998 if {[is_Windows]} {
1999 set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
2000 }
2001
2002 # -- Tcl won't let us redirect both stdout and stderr to
2003 # the same pipe. So pass it through cat...
2004 #
2005 set cmd [concat | $cmd |& cat]
2006
2007 set fd_f [open $cmd r]
2008 fconfigure $fd_f -blocking 0 -translation binary
2009 fileevent $fd_f readable [list console_read $w $fd_f $after]
2010}
2011
2012proc console_read {w fd after} {
2013 global console_cr console_data
2014
2015 set buf [read $fd]
2016 if {$buf ne {}} {
2017 if {![winfo exists $w]} {console_init $w}
2018 $w.m.t conf -state normal
2019 set c 0
2020 set n [string length $buf]
2021 while {$c < $n} {
2022 set cr [string first "\r" $buf $c]
2023 set lf [string first "\n" $buf $c]
2024 if {$cr < 0} {set cr [expr {$n + 1}]}
2025 if {$lf < 0} {set lf [expr {$n + 1}]}
2026
2027 if {$lf < $cr} {
2028 $w.m.t insert end [string range $buf $c $lf]
2029 set console_cr($w) [$w.m.t index {end -1c}]
2030 set c $lf
2031 incr c
2032 } else {
2033 $w.m.t delete $console_cr($w) end
2034 $w.m.t insert end "\n"
2035 $w.m.t insert end [string range $buf $c $cr]
2036 set c $cr
2037 incr c
2038 }
2039 }
2040 $w.m.t conf -state disabled
2041 $w.m.t see end
2042 }
2043
2044 fconfigure $fd -blocking 1
2045 if {[eof $fd]} {
2046 if {[catch {close $fd}]} {
2047 if {![winfo exists $w]} {console_init $w}
2048 $w.m.s conf -background red -text {Error: Command Failed}
2049 $w.ok conf -state normal
2050 set ok 0
2051 } elseif {[winfo exists $w]} {
2052 $w.m.s conf -background green -text {Success}
2053 $w.ok conf -state normal
2054 set ok 1
2055 }
2056 array unset console_cr $w
2057 array unset console_data $w
2058 if {$after ne {}} {
2059 uplevel #0 $after $ok
2060 }
2061 return
2062 }
2063 fconfigure $fd -blocking 0
2064}
2065
2066######################################################################
2067##
2068## ui commands
2069
2070set starting_gitk_msg {Please wait... Starting gitk...}
2071
2072proc do_gitk {revs} {
2073 global ui_status_value starting_gitk_msg
2074
2075 set cmd gitk
2076 if {$revs ne {}} {
2077 append cmd { }
2078 append cmd $revs
2079 }
2080 if {[is_Windows]} {
2081 set cmd "sh -c \"exec $cmd\""
2082 }
2083 append cmd { &}
2084
2085 if {[catch {eval exec $cmd} err]} {
2086 error_popup "Failed to start gitk:\n\n$err"
2087 } else {
2088 set ui_status_value $starting_gitk_msg
2089 after 10000 {
2090 if {$ui_status_value eq $starting_gitk_msg} {
2091 set ui_status_value {Ready.}
2092 }
2093 }
2094 }
2095}
2096
2097proc do_repack {} {
2098 set w [new_console {repack} \
2099 {Repacking the object database}]
2100 set cmd [list git repack]
2101 lappend cmd -a
2102 lappend cmd -d
2103 console_exec $w $cmd
2104}
2105
2106proc do_fsck_objects {} {
2107 set w [new_console {fsck-objects} \
2108 {Verifying the object database with fsck-objects}]
2109 set cmd [list git fsck-objects]
2110 lappend cmd --full
2111 lappend cmd --cache
2112 lappend cmd --strict
2113 console_exec $w $cmd
2114}
2115
2116set is_quitting 0
2117
2118proc do_quit {} {
2119 global gitdir ui_comm is_quitting repo_config commit_type
2120
2121 if {$is_quitting} return
2122 set is_quitting 1
2123
2124 # -- Stash our current commit buffer.
2125 #
2126 set save [file join $gitdir GITGUI_MSG]
2127 set msg [string trim [$ui_comm get 0.0 end]]
2128 if {![string match amend* $commit_type]
2129 && [$ui_comm edit modified]
2130 && $msg ne {}} {
2131 catch {
2132 set fd [open $save w]
2133 puts $fd [string trim [$ui_comm get 0.0 end]]
2134 close $fd
2135 }
2136 } else {
2137 catch {file delete $save}
2138 }
2139
2140 # -- Stash our current window geometry into this repository.
2141 #
2142 set cfg_geometry [list]
2143 lappend cfg_geometry [wm geometry .]
2144 lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
2145 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
2146 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2147 set rc_geometry {}
2148 }
2149 if {$cfg_geometry ne $rc_geometry} {
2150 catch {exec git repo-config gui.geometry $cfg_geometry}
2151 }
2152
2153 destroy .
2154}
2155
2156proc do_rescan {} {
2157 rescan {set ui_status_value {Ready.}}
2158}
2159
2160proc remove_helper {txt paths} {
2161 global file_states current_diff
2162
2163 if {![lock_index begin-update]} return
2164
2165 set pathList [list]
2166 set after {}
2167 foreach path $paths {
2168 switch -glob -- [lindex $file_states($path) 0] {
2169 A? -
2170 M? -
2171 D? {
2172 lappend pathList $path
2173 if {$path eq $current_diff} {
2174 set after {reshow_diff;}
2175 }
2176 }
2177 }
2178 }
2179 if {$pathList eq {}} {
2180 unlock_index
2181 } else {
2182 update_indexinfo \
2183 $txt \
2184 $pathList \
2185 [concat $after {set ui_status_value {Ready.}}]
2186 }
2187}
2188
2189proc do_remove_selection {} {
2190 global current_diff selected_paths
2191
2192 if {[array size selected_paths] > 0} {
2193 remove_helper \
2194 {Removing selected files from commit} \
2195 [array names selected_paths]
2196 } elseif {$current_diff ne {}} {
2197 remove_helper \
2198 "Removing [short_path $current_diff] from commit" \
2199 [list $current_diff]
2200 }
2201}
2202
2203proc include_helper {txt paths} {
2204 global file_states current_diff
2205
2206 if {![lock_index begin-update]} return
2207
2208 set pathList [list]
2209 set after {}
2210 foreach path $paths {
2211 switch -glob -- [lindex $file_states($path) 0] {
2212 AM -
2213 AD -
2214 MM -
2215 MD -
2216 U? -
2217 _M -
2218 _D -
2219 _O {
2220 lappend pathList $path
2221 if {$path eq $current_diff} {
2222 set after {reshow_diff;}
2223 }
2224 }
2225 }
2226 }
2227 if {$pathList eq {}} {
2228 unlock_index
2229 } else {
2230 update_index \
2231 $txt \
2232 $pathList \
2233 [concat $after {set ui_status_value {Ready to commit.}}]
2234 }
2235}
2236
2237proc do_include_selection {} {
2238 global current_diff selected_paths
2239
2240 if {[array size selected_paths] > 0} {
2241 include_helper \
2242 {Including selected files} \
2243 [array names selected_paths]
2244 } elseif {$current_diff ne {}} {
2245 include_helper \
2246 "Including [short_path $current_diff]" \
2247 [list $current_diff]
2248 }
2249}
2250
2251proc do_include_all {} {
2252 global file_states
2253
2254 set paths [list]
2255 foreach path [array names file_states] {
2256 switch -- [lindex $file_states($path) 0] {
2257 AM -
2258 AD -
2259 MM -
2260 MD -
2261 _M -
2262 _D {lappend paths $path}
2263 }
2264 }
2265 include_helper \
2266 {Including all modified files} \
2267 $paths
2268}
2269
2270proc revert_helper {txt paths} {
2271 global file_states current_diff
2272
2273 if {![lock_index begin-update]} return
2274
2275 set pathList [list]
2276 set after {}
2277 foreach path $paths {
2278 switch -glob -- [lindex $file_states($path) 0] {
2279 AM -
2280 AD -
2281 MM -
2282 MD -
2283 _M -
2284 _D {
2285 lappend pathList $path
2286 if {$path eq $current_diff} {
2287 set after {reshow_diff;}
2288 }
2289 }
2290 }
2291 }
2292
2293 set n [llength $pathList]
2294 if {$n == 0} {
2295 unlock_index
2296 return
2297 } elseif {$n == 1} {
2298 set s "[short_path [lindex $pathList]]"
2299 } else {
2300 set s "these $n files"
2301 }
2302
2303 set reply [tk_dialog \
2304 .confirm_revert \
2305 "title" \
2306 "Revert unincluded changes in $s?
2307
2308Any unincluded changes will be permanently lost by the revert." \
2309 questhead \
2310 1 \
2311 {Do Nothing} \
2312 {Revert Changes} \
2313 ]
2314 if {$reply == 1} {
2315 checkout_index \
2316 $txt \
2317 $pathList \
2318 [concat $after {set ui_status_value {Ready.}}]
2319 } else {
2320 unlock_index
2321 }
2322}
2323
2324proc do_revert_selection {} {
2325 global current_diff selected_paths
2326
2327 if {[array size selected_paths] > 0} {
2328 revert_helper \
2329 {Reverting selected files} \
2330 [array names selected_paths]
2331 } elseif {$current_diff ne {}} {
2332 revert_helper \
2333 "Reverting [short_path $current_diff]" \
2334 [list $current_diff]
2335 }
2336}
2337
2338proc do_signoff {} {
2339 global ui_comm
2340
2341 set me [committer_ident]
2342 if {$me eq {}} return
2343
2344 set sob "Signed-off-by: $me"
2345 set last [$ui_comm get {end -1c linestart} {end -1c}]
2346 if {$last ne $sob} {
2347 $ui_comm edit separator
2348 if {$last ne {}
2349 && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
2350 $ui_comm insert end "\n"
2351 }
2352 $ui_comm insert end "\n$sob"
2353 $ui_comm edit separator
2354 $ui_comm see end
2355 }
2356}
2357
2358proc do_select_commit_type {} {
2359 global commit_type selected_commit_type
2360
2361 if {$selected_commit_type eq {new}
2362 && [string match amend* $commit_type]} {
2363 create_new_commit
2364 } elseif {$selected_commit_type eq {amend}
2365 && ![string match amend* $commit_type]} {
2366 load_last_commit
2367
2368 # The amend request was rejected...
2369 #
2370 if {![string match amend* $commit_type]} {
2371 set selected_commit_type new
2372 }
2373 }
2374}
2375
2376proc do_commit {} {
2377 commit_tree
2378}
2379
2380proc do_about {} {
2381 global appname copyright
2382 global tcl_patchLevel tk_patchLevel
2383
2384 set w .about_dialog
2385 toplevel $w
2386 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2387
2388 label $w.header -text "About $appname" \
2389 -font font_uibold
2390 pack $w.header -side top -fill x
2391
2392 frame $w.buttons
2393 button $w.buttons.close -text {Close} \
2394 -font font_ui \
2395 -command [list destroy $w]
2396 pack $w.buttons.close -side right
2397 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2398
2399 label $w.desc \
2400 -text "$appname - a commit creation tool for Git.
2401$copyright" \
2402 -padx 5 -pady 5 \
2403 -justify left \
2404 -anchor w \
2405 -borderwidth 1 \
2406 -relief solid \
2407 -font font_ui
2408 pack $w.desc -side top -fill x -padx 5 -pady 5
2409
2410 set v [exec git --version]
2411 append v "\n\n"
2412 if {$tcl_patchLevel eq $tk_patchLevel} {
2413 append v "Tcl/Tk version $tcl_patchLevel"
2414 } else {
2415 append v "Tcl version $tcl_patchLevel"
2416 append v ", Tk version $tk_patchLevel"
2417 }
2418
2419 label $w.vers \
2420 -text $v \
2421 -padx 5 -pady 5 \
2422 -justify left \
2423 -anchor w \
2424 -borderwidth 1 \
2425 -relief solid \
2426 -font font_ui
2427 pack $w.vers -side top -fill x -padx 5 -pady 5
2428
2429 bind $w <Visibility> "grab $w; focus $w"
2430 bind $w <Key-Escape> "destroy $w"
2431 wm title $w "About $appname"
2432 tkwait window $w
2433}
2434
2435proc do_options {} {
2436 global appname gitdir font_descs
2437 global repo_config global_config
2438 global repo_config_new global_config_new
2439
2440 array unset repo_config_new
2441 array unset global_config_new
2442 foreach name [array names repo_config] {
2443 set repo_config_new($name) $repo_config($name)
2444 }
2445 load_config 1
2446 foreach name [array names repo_config] {
2447 switch -- $name {
2448 gui.diffcontext {continue}
2449 }
2450 set repo_config_new($name) $repo_config($name)
2451 }
2452 foreach name [array names global_config] {
2453 set global_config_new($name) $global_config($name)
2454 }
2455 set reponame [lindex [file split \
2456 [file normalize [file dirname $gitdir]]] \
2457 end]
2458
2459 set w .options_editor
2460 toplevel $w
2461 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2462
2463 label $w.header -text "$appname Options" \
2464 -font font_uibold
2465 pack $w.header -side top -fill x
2466
2467 frame $w.buttons
2468 button $w.buttons.restore -text {Restore Defaults} \
2469 -font font_ui \
2470 -command do_restore_defaults
2471 pack $w.buttons.restore -side left
2472 button $w.buttons.save -text Save \
2473 -font font_ui \
2474 -command [list do_save_config $w]
2475 pack $w.buttons.save -side right
2476 button $w.buttons.cancel -text {Cancel} \
2477 -font font_ui \
2478 -command [list destroy $w]
2479 pack $w.buttons.cancel -side right
2480 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2481
2482 labelframe $w.repo -text "$reponame Repository" \
2483 -font font_ui \
2484 -relief raised -borderwidth 2
2485 labelframe $w.global -text {Global (All Repositories)} \
2486 -font font_ui \
2487 -relief raised -borderwidth 2
2488 pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
2489 pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
2490
2491 foreach option {
2492 {b partialinclude {Allow Partially Included Files}}
2493 {b pullsummary {Show Pull Summary}}
2494 {b trustmtime {Trust File Modification Timestamps}}
2495 {i diffcontext {Number of Diff Context Lines}}
2496 } {
2497 set type [lindex $option 0]
2498 set name [lindex $option 1]
2499 set text [lindex $option 2]
2500 foreach f {repo global} {
2501 switch $type {
2502 b {
2503 checkbutton $w.$f.$name -text $text \
2504 -variable ${f}_config_new(gui.$name) \
2505 -onvalue true \
2506 -offvalue false \
2507 -font font_ui
2508 pack $w.$f.$name -side top -anchor w
2509 }
2510 i {
2511 frame $w.$f.$name
2512 label $w.$f.$name.l -text "$text:" -font font_ui
2513 pack $w.$f.$name.l -side left -anchor w -fill x
2514 spinbox $w.$f.$name.v \
2515 -textvariable ${f}_config_new(gui.$name) \
2516 -from 1 -to 99 -increment 1 \
2517 -width 3 \
2518 -font font_ui
2519 pack $w.$f.$name.v -side right -anchor e
2520 pack $w.$f.$name -side top -anchor w -fill x
2521 }
2522 }
2523 }
2524 }
2525
2526 set all_fonts [lsort [font families]]
2527 foreach option $font_descs {
2528 set name [lindex $option 0]
2529 set font [lindex $option 1]
2530 set text [lindex $option 2]
2531
2532 set global_config_new(gui.$font^^family) \
2533 [font configure $font -family]
2534 set global_config_new(gui.$font^^size) \
2535 [font configure $font -size]
2536
2537 frame $w.global.$name
2538 label $w.global.$name.l -text "$text:" -font font_ui
2539 pack $w.global.$name.l -side left -anchor w -fill x
2540 eval tk_optionMenu $w.global.$name.family \
2541 global_config_new(gui.$font^^family) \
2542 $all_fonts
2543 spinbox $w.global.$name.size \
2544 -textvariable global_config_new(gui.$font^^size) \
2545 -from 2 -to 80 -increment 1 \
2546 -width 3 \
2547 -font font_ui
2548 pack $w.global.$name.size -side right -anchor e
2549 pack $w.global.$name.family -side right -anchor e
2550 pack $w.global.$name -side top -anchor w -fill x
2551 }
2552
2553 bind $w <Visibility> "grab $w; focus $w"
2554 bind $w <Key-Escape> "destroy $w"
2555 wm title $w "$appname ($reponame): Options"
2556 tkwait window $w
2557}
2558
2559proc do_restore_defaults {} {
2560 global font_descs default_config repo_config
2561 global repo_config_new global_config_new
2562
2563 foreach name [array names default_config] {
2564 set repo_config_new($name) $default_config($name)
2565 set global_config_new($name) $default_config($name)
2566 }
2567
2568 foreach option $font_descs {
2569 set name [lindex $option 0]
2570 set repo_config(gui.$name) $default_config(gui.$name)
2571 }
2572 apply_config
2573
2574 foreach option $font_descs {
2575 set name [lindex $option 0]
2576 set font [lindex $option 1]
2577 set global_config_new(gui.$font^^family) \
2578 [font configure $font -family]
2579 set global_config_new(gui.$font^^size) \
2580 [font configure $font -size]
2581 }
2582}
2583
2584proc do_save_config {w} {
2585 if {[catch {save_config} err]} {
2586 error_popup "Failed to completely save options:\n\n$err"
2587 }
2588 reshow_diff
2589 destroy $w
2590}
2591
2592proc do_windows_shortcut {} {
2593 global gitdir appname argv0
2594
2595 set reponame [lindex [file split \
2596 [file normalize [file dirname $gitdir]]] \
2597 end]
2598
2599 if {[catch {
2600 set desktop [exec cygpath \
2601 --windows \
2602 --absolute \
2603 --long-name \
2604 --desktop]
2605 }]} {
2606 set desktop .
2607 }
2608 set fn [tk_getSaveFile \
2609 -parent . \
2610 -title "$appname ($reponame): Create Desktop Icon" \
2611 -initialdir $desktop \
2612 -initialfile "Git $reponame.bat"]
2613 if {$fn != {}} {
2614 if {[catch {
2615 set fd [open $fn w]
2616 set sh [exec cygpath \
2617 --windows \
2618 --absolute \
2619 --long-name \
2620 /bin/sh]
2621 set me [exec cygpath \
2622 --unix \
2623 --absolute \
2624 $argv0]
2625 set gd [exec cygpath \
2626 --unix \
2627 --absolute \
2628 $gitdir]
2629 regsub -all ' $me "'\\''" me
2630 regsub -all ' $gd "'\\''" gd
2631 puts -nonewline $fd "\"$sh\" --login -c \""
2632 puts -nonewline $fd "GIT_DIR='$gd'"
2633 puts -nonewline $fd " '$me'"
2634 puts $fd "&\""
2635 close $fd
2636 } err]} {
2637 error_popup "Cannot write script:\n\n$err"
2638 }
2639 }
2640}
2641
2642proc do_macosx_app {} {
2643 global gitdir appname argv0 env
2644
2645 set reponame [lindex [file split \
2646 [file normalize [file dirname $gitdir]]] \
2647 end]
2648
2649 set fn [tk_getSaveFile \
2650 -parent . \
2651 -title "$appname ($reponame): Create Desktop Icon" \
2652 -initialdir [file join $env(HOME) Desktop] \
2653 -initialfile "Git $reponame.app"]
2654 if {$fn != {}} {
2655 if {[catch {
2656 set Contents [file join $fn Contents]
2657 set MacOS [file join $Contents MacOS]
2658 set exe [file join $MacOS git-gui]
2659
2660 file mkdir $MacOS
2661
2662 set fd [open [file join $Contents Info.plist] w]
2663 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
2664<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
2665<plist version="1.0">
2666<dict>
2667 <key>CFBundleDevelopmentRegion</key>
2668 <string>English</string>
2669 <key>CFBundleExecutable</key>
2670 <string>git-gui</string>
2671 <key>CFBundleIdentifier</key>
2672 <string>org.spearce.git-gui</string>
2673 <key>CFBundleInfoDictionaryVersion</key>
2674 <string>6.0</string>
2675 <key>CFBundlePackageType</key>
2676 <string>APPL</string>
2677 <key>CFBundleSignature</key>
2678 <string>????</string>
2679 <key>CFBundleVersion</key>
2680 <string>1.0</string>
2681 <key>NSPrincipalClass</key>
2682 <string>NSApplication</string>
2683</dict>
2684</plist>}
2685 close $fd
2686
2687 set fd [open $exe w]
2688 set gd [file normalize $gitdir]
2689 set ep [file normalize [exec git --exec-path]]
2690 regsub -all ' $gd "'\\''" gd
2691 regsub -all ' $ep "'\\''" ep
2692 puts $fd "#!/bin/sh"
2693 foreach name [array names env] {
2694 if {[string match GIT_* $name]} {
2695 regsub -all ' $env($name) "'\\''" v
2696 puts $fd "export $name='$v'"
2697 }
2698 }
2699 puts $fd "export PATH='$ep':\$PATH"
2700 puts $fd "export GIT_DIR='$gd'"
2701 puts $fd "exec [file normalize $argv0]"
2702 close $fd
2703
2704 file attributes $exe -permissions u+x,g+x,o+x
2705 } err]} {
2706 error_popup "Cannot write icon:\n\n$err"
2707 }
2708 }
2709}
2710
2711proc toggle_or_diff {w x y} {
2712 global file_states file_lists current_diff ui_index ui_other
2713 global last_clicked selected_paths
2714
2715 set pos [split [$w index @$x,$y] .]
2716 set lno [lindex $pos 0]
2717 set col [lindex $pos 1]
2718 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2719 if {$path eq {}} {
2720 set last_clicked {}
2721 return
2722 }
2723
2724 set last_clicked [list $w $lno]
2725 array unset selected_paths
2726 $ui_index tag remove in_sel 0.0 end
2727 $ui_other tag remove in_sel 0.0 end
2728
2729 if {$col == 0} {
2730 if {$current_diff eq $path} {
2731 set after {reshow_diff;}
2732 } else {
2733 set after {}
2734 }
2735 switch -glob -- [lindex $file_states($path) 0] {
2736 A_ -
2737 M_ -
2738 DD -
2739 DO -
2740 DM {
2741 update_indexinfo \
2742 "Removing [short_path $path] from commit" \
2743 [list $path] \
2744 [concat $after {set ui_status_value {Ready.}}]
2745 }
2746 ?? {
2747 update_index \
2748 "Including [short_path $path]" \
2749 [list $path] \
2750 [concat $after {set ui_status_value {Ready.}}]
2751 }
2752 }
2753 } else {
2754 show_diff $path $w $lno
2755 }
2756}
2757
2758proc add_one_to_selection {w x y} {
2759 global file_lists
2760 global last_clicked selected_paths
2761
2762 set pos [split [$w index @$x,$y] .]
2763 set lno [lindex $pos 0]
2764 set col [lindex $pos 1]
2765 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2766 if {$path eq {}} {
2767 set last_clicked {}
2768 return
2769 }
2770
2771 set last_clicked [list $w $lno]
2772 if {[catch {set in_sel $selected_paths($path)}]} {
2773 set in_sel 0
2774 }
2775 if {$in_sel} {
2776 unset selected_paths($path)
2777 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2778 } else {
2779 set selected_paths($path) 1
2780 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2781 }
2782}
2783
2784proc add_range_to_selection {w x y} {
2785 global file_lists
2786 global last_clicked selected_paths
2787
2788 if {[lindex $last_clicked 0] ne $w} {
2789 toggle_or_diff $w $x $y
2790 return
2791 }
2792
2793 set pos [split [$w index @$x,$y] .]
2794 set lno [lindex $pos 0]
2795 set lc [lindex $last_clicked 1]
2796 if {$lc < $lno} {
2797 set begin $lc
2798 set end $lno
2799 } else {
2800 set begin $lno
2801 set end $lc
2802 }
2803
2804 foreach path [lrange $file_lists($w) \
2805 [expr {$begin - 1}] \
2806 [expr {$end - 1}]] {
2807 set selected_paths($path) 1
2808 }
2809 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2810}
2811
2812######################################################################
2813##
2814## config defaults
2815
2816set cursor_ptr arrow
2817font create font_diff -family Courier -size 10
2818font create font_ui
2819catch {
2820 label .dummy
2821 eval font configure font_ui [font actual [.dummy cget -font]]
2822 destroy .dummy
2823}
2824
2825font create font_uibold
2826font create font_diffbold
2827
2828if {[is_Windows]} {
2829 set M1B Control
2830 set M1T Ctrl
2831} elseif {[is_MacOSX]} {
2832 set M1B M1
2833 set M1T Cmd
2834} else {
2835 set M1B M1
2836 set M1T M1
2837}
2838
2839proc apply_config {} {
2840 global repo_config font_descs
2841
2842 foreach option $font_descs {
2843 set name [lindex $option 0]
2844 set font [lindex $option 1]
2845 if {[catch {
2846 foreach {cn cv} $repo_config(gui.$name) {
2847 font configure $font $cn $cv
2848 }
2849 } err]} {
2850 error_popup "Invalid font specified in gui.$name:\n\n$err"
2851 }
2852 foreach {cn cv} [font configure $font] {
2853 font configure ${font}bold $cn $cv
2854 }
2855 font configure ${font}bold -weight bold
2856 }
2857}
2858
2859set default_config(gui.trustmtime) false
2860set default_config(gui.pullsummary) true
2861set default_config(gui.partialinclude) false
2862set default_config(gui.diffcontext) 5
2863set default_config(gui.fontui) [font configure font_ui]
2864set default_config(gui.fontdiff) [font configure font_diff]
2865set font_descs {
2866 {fontui font_ui {Main Font}}
2867 {fontdiff font_diff {Diff/Console Font}}
2868}
2869load_config 0
2870apply_config
2871
2872######################################################################
2873##
2874## ui construction
2875
2876# -- Menu Bar
2877#
2878menu .mbar -tearoff 0
2879.mbar add cascade -label Repository -menu .mbar.repository
2880.mbar add cascade -label Edit -menu .mbar.edit
2881.mbar add cascade -label Commit -menu .mbar.commit
2882if {!$single_commit} {
2883 .mbar add cascade -label Fetch -menu .mbar.fetch
2884 .mbar add cascade -label Pull -menu .mbar.pull
2885 .mbar add cascade -label Push -menu .mbar.push
2886}
2887. configure -menu .mbar
2888
2889# -- Repository Menu
2890#
2891menu .mbar.repository
2892.mbar.repository add command \
2893 -label {Visualize Current Branch} \
2894 -command {do_gitk {}} \
2895 -font font_ui
2896if {![is_MacOSX]} {
2897 .mbar.repository add command \
2898 -label {Visualize All Branches} \
2899 -command {do_gitk {--all}} \
2900 -font font_ui
2901}
2902.mbar.repository add separator
2903
2904if {!$single_commit} {
2905 .mbar.repository add command -label {Repack Database} \
2906 -command do_repack \
2907 -font font_ui
2908
2909 .mbar.repository add command -label {Verify Database} \
2910 -command do_fsck_objects \
2911 -font font_ui
2912
2913 .mbar.repository add separator
2914
2915 if {[is_Windows]} {
2916 .mbar.repository add command \
2917 -label {Create Desktop Icon} \
2918 -command do_windows_shortcut \
2919 -font font_ui
2920 } elseif {[is_MacOSX]} {
2921 .mbar.repository add command \
2922 -label {Create Desktop Icon} \
2923 -command do_macosx_app \
2924 -font font_ui
2925 }
2926}
2927.mbar.repository add command -label Quit \
2928 -command do_quit \
2929 -accelerator $M1T-Q \
2930 -font font_ui
2931
2932# -- Edit Menu
2933#
2934menu .mbar.edit
2935.mbar.edit add command -label Undo \
2936 -command {catch {[focus] edit undo}} \
2937 -accelerator $M1T-Z \
2938 -font font_ui
2939.mbar.edit add command -label Redo \
2940 -command {catch {[focus] edit redo}} \
2941 -accelerator $M1T-Y \
2942 -font font_ui
2943.mbar.edit add separator
2944.mbar.edit add command -label Cut \
2945 -command {catch {tk_textCut [focus]}} \
2946 -accelerator $M1T-X \
2947 -font font_ui
2948.mbar.edit add command -label Copy \
2949 -command {catch {tk_textCopy [focus]}} \
2950 -accelerator $M1T-C \
2951 -font font_ui
2952.mbar.edit add command -label Paste \
2953 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
2954 -accelerator $M1T-V \
2955 -font font_ui
2956.mbar.edit add command -label Delete \
2957 -command {catch {[focus] delete sel.first sel.last}} \
2958 -accelerator Del \
2959 -font font_ui
2960.mbar.edit add separator
2961.mbar.edit add command -label {Select All} \
2962 -command {catch {[focus] tag add sel 0.0 end}} \
2963 -accelerator $M1T-A \
2964 -font font_ui
2965
2966# -- Commit Menu
2967#
2968menu .mbar.commit
2969
2970.mbar.commit add radiobutton \
2971 -label {New Commit} \
2972 -command do_select_commit_type \
2973 -variable selected_commit_type \
2974 -value new \
2975 -font font_ui
2976lappend disable_on_lock \
2977 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2978
2979.mbar.commit add radiobutton \
2980 -label {Amend Last Commit} \
2981 -command do_select_commit_type \
2982 -variable selected_commit_type \
2983 -value amend \
2984 -font font_ui
2985lappend disable_on_lock \
2986 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2987
2988.mbar.commit add separator
2989
2990.mbar.commit add command -label Rescan \
2991 -command do_rescan \
2992 -accelerator F5 \
2993 -font font_ui
2994lappend disable_on_lock \
2995 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2996
2997.mbar.commit add command -label {Include In Commit} \
2998 -command do_include_selection \
2999 -font font_ui
3000lappend disable_on_lock \
3001 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3002
3003.mbar.commit add command -label {Include All In Commit} \
3004 -command do_include_all \
3005 -accelerator $M1T-I \
3006 -font font_ui
3007lappend disable_on_lock \
3008 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3009
3010.mbar.commit add command -label {Remove From Commit} \
3011 -command do_remove_selection \
3012 -font font_ui
3013lappend disable_on_lock \
3014 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3015
3016.mbar.commit add command -label {Revert Changes} \
3017 -command do_revert_selection \
3018 -font font_ui
3019lappend disable_on_lock \
3020 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3021
3022.mbar.commit add separator
3023
3024.mbar.commit add command -label {Sign Off} \
3025 -command do_signoff \
3026 -accelerator $M1T-S \
3027 -font font_ui
3028
3029.mbar.commit add command -label Commit \
3030 -command do_commit \
3031 -accelerator $M1T-Return \
3032 -font font_ui
3033lappend disable_on_lock \
3034 [list .mbar.commit entryconf [.mbar.commit index last] -state]
3035
3036# -- Transport menus
3037#
3038if {!$single_commit} {
3039 menu .mbar.fetch
3040 menu .mbar.pull
3041 menu .mbar.push
3042}
3043
3044if {[is_MacOSX]} {
3045 # -- Apple Menu (Mac OS X only)
3046 #
3047 .mbar add cascade -label Apple -menu .mbar.apple
3048 menu .mbar.apple
3049
3050 .mbar.apple add command -label "About $appname" \
3051 -command do_about \
3052 -font font_ui
3053 .mbar.apple add command -label "$appname Options..." \
3054 -command do_options \
3055 -font font_ui
3056} else {
3057 # -- Edit Menu
3058 #
3059 .mbar.edit add separator
3060 .mbar.edit add command -label {Options...} \
3061 -command do_options \
3062 -font font_ui
3063
3064 # -- Help Menu
3065 #
3066 .mbar add cascade -label Help -menu .mbar.help
3067 menu .mbar.help
3068
3069 .mbar.help add command -label "About $appname" \
3070 -command do_about \
3071 -font font_ui
3072}
3073
3074
3075# -- Branch Control
3076#
3077frame .branch \
3078 -borderwidth 1 \
3079 -relief sunken
3080label .branch.l1 \
3081 -text {Current Branch:} \
3082 -anchor w \
3083 -justify left \
3084 -font font_ui
3085label .branch.cb \
3086 -textvariable current_branch \
3087 -anchor w \
3088 -justify left \
3089 -font font_ui
3090pack .branch.l1 -side left
3091pack .branch.cb -side left -fill x
3092pack .branch -side top -fill x
3093
3094# -- Main Window Layout
3095#
3096panedwindow .vpane -orient vertical
3097panedwindow .vpane.files -orient horizontal
3098.vpane add .vpane.files -sticky nsew -height 100 -width 400
3099pack .vpane -anchor n -side top -fill both -expand 1
3100
3101# -- Index File List
3102#
3103frame .vpane.files.index -height 100 -width 400
3104label .vpane.files.index.title -text {Modified Files} \
3105 -background green \
3106 -font font_ui
3107text $ui_index -background white -borderwidth 0 \
3108 -width 40 -height 10 \
3109 -font font_ui \
3110 -cursor $cursor_ptr \
3111 -yscrollcommand {.vpane.files.index.sb set} \
3112 -state disabled
3113scrollbar .vpane.files.index.sb -command [list $ui_index yview]
3114pack .vpane.files.index.title -side top -fill x
3115pack .vpane.files.index.sb -side right -fill y
3116pack $ui_index -side left -fill both -expand 1
3117.vpane.files add .vpane.files.index -sticky nsew
3118
3119# -- Other (Add) File List
3120#
3121frame .vpane.files.other -height 100 -width 100
3122label .vpane.files.other.title -text {Untracked Files} \
3123 -background red \
3124 -font font_ui
3125text $ui_other -background white -borderwidth 0 \
3126 -width 40 -height 10 \
3127 -font font_ui \
3128 -cursor $cursor_ptr \
3129 -yscrollcommand {.vpane.files.other.sb set} \
3130 -state disabled
3131scrollbar .vpane.files.other.sb -command [list $ui_other yview]
3132pack .vpane.files.other.title -side top -fill x
3133pack .vpane.files.other.sb -side right -fill y
3134pack $ui_other -side left -fill both -expand 1
3135.vpane.files add .vpane.files.other -sticky nsew
3136
3137foreach i [list $ui_index $ui_other] {
3138 $i tag conf in_diff -font font_uibold
3139 $i tag conf in_sel \
3140 -background [$i cget -foreground] \
3141 -foreground [$i cget -background]
3142}
3143unset i
3144
3145# -- Diff and Commit Area
3146#
3147frame .vpane.lower -height 300 -width 400
3148frame .vpane.lower.commarea
3149frame .vpane.lower.diff -relief sunken -borderwidth 1
3150pack .vpane.lower.commarea -side top -fill x
3151pack .vpane.lower.diff -side bottom -fill both -expand 1
3152.vpane add .vpane.lower -stick nsew
3153
3154# -- Commit Area Buttons
3155#
3156frame .vpane.lower.commarea.buttons
3157label .vpane.lower.commarea.buttons.l -text {} \
3158 -anchor w \
3159 -justify left \
3160 -font font_ui
3161pack .vpane.lower.commarea.buttons.l -side top -fill x
3162pack .vpane.lower.commarea.buttons -side left -fill y
3163
3164button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
3165 -command do_rescan \
3166 -font font_ui
3167pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3168lappend disable_on_lock \
3169 {.vpane.lower.commarea.buttons.rescan conf -state}
3170
3171button .vpane.lower.commarea.buttons.incall -text {Include All} \
3172 -command do_include_all \
3173 -font font_ui
3174pack .vpane.lower.commarea.buttons.incall -side top -fill x
3175lappend disable_on_lock \
3176 {.vpane.lower.commarea.buttons.incall conf -state}
3177
3178button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
3179 -command do_signoff \
3180 -font font_ui
3181pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3182
3183button .vpane.lower.commarea.buttons.commit -text {Commit} \
3184 -command do_commit \
3185 -font font_ui
3186pack .vpane.lower.commarea.buttons.commit -side top -fill x
3187lappend disable_on_lock \
3188 {.vpane.lower.commarea.buttons.commit conf -state}
3189
3190# -- Commit Message Buffer
3191#
3192frame .vpane.lower.commarea.buffer
3193frame .vpane.lower.commarea.buffer.header
3194set ui_comm .vpane.lower.commarea.buffer.t
3195set ui_coml .vpane.lower.commarea.buffer.header.l
3196radiobutton .vpane.lower.commarea.buffer.header.new \
3197 -text {New Commit} \
3198 -command do_select_commit_type \
3199 -variable selected_commit_type \
3200 -value new \
3201 -font font_ui
3202lappend disable_on_lock \
3203 [list .vpane.lower.commarea.buffer.header.new conf -state]
3204radiobutton .vpane.lower.commarea.buffer.header.amend \
3205 -text {Amend Last Commit} \
3206 -command do_select_commit_type \
3207 -variable selected_commit_type \
3208 -value amend \
3209 -font font_ui
3210lappend disable_on_lock \
3211 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3212label $ui_coml \
3213 -anchor w \
3214 -justify left \
3215 -font font_ui
3216proc trace_commit_type {varname args} {
3217 global ui_coml commit_type
3218 switch -glob -- $commit_type {
3219 initial {set txt {Initial Commit Message:}}
3220 amend {set txt {Amended Commit Message:}}
3221 amend-initial {set txt {Amended Initial Commit Message:}}
3222 amend-merge {set txt {Amended Merge Commit Message:}}
3223 merge {set txt {Merge Commit Message:}}
3224 * {set txt {Commit Message:}}
3225 }
3226 $ui_coml conf -text $txt
3227}
3228trace add variable commit_type write trace_commit_type
3229pack $ui_coml -side left -fill x
3230pack .vpane.lower.commarea.buffer.header.amend -side right
3231pack .vpane.lower.commarea.buffer.header.new -side right
3232
3233text $ui_comm -background white -borderwidth 1 \
3234 -undo true \
3235 -maxundo 20 \
3236 -autoseparators true \
3237 -relief sunken \
3238 -width 75 -height 9 -wrap none \
3239 -font font_diff \
3240 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3241scrollbar .vpane.lower.commarea.buffer.sby \
3242 -command [list $ui_comm yview]
3243pack .vpane.lower.commarea.buffer.header -side top -fill x
3244pack .vpane.lower.commarea.buffer.sby -side right -fill y
3245pack $ui_comm -side left -fill y
3246pack .vpane.lower.commarea.buffer -side left -fill y
3247
3248# -- Commit Message Buffer Context Menu
3249#
3250set ctxm .vpane.lower.commarea.buffer.ctxm
3251menu $ctxm -tearoff 0
3252$ctxm add command \
3253 -label {Cut} \
3254 -font font_ui \
3255 -command {tk_textCut $ui_comm}
3256$ctxm add command \
3257 -label {Copy} \
3258 -font font_ui \
3259 -command {tk_textCopy $ui_comm}
3260$ctxm add command \
3261 -label {Paste} \
3262 -font font_ui \
3263 -command {tk_textPaste $ui_comm}
3264$ctxm add command \
3265 -label {Delete} \
3266 -font font_ui \
3267 -command {$ui_comm delete sel.first sel.last}
3268$ctxm add separator
3269$ctxm add command \
3270 -label {Select All} \
3271 -font font_ui \
3272 -command {$ui_comm tag add sel 0.0 end}
3273$ctxm add command \
3274 -label {Copy All} \
3275 -font font_ui \
3276 -command {
3277 $ui_comm tag add sel 0.0 end
3278 tk_textCopy $ui_comm
3279 $ui_comm tag remove sel 0.0 end
3280 }
3281$ctxm add separator
3282$ctxm add command \
3283 -label {Sign Off} \
3284 -font font_ui \
3285 -command do_signoff
3286bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
3287
3288# -- Diff Header
3289#
3290set current_diff {}
3291set diff_actions [list]
3292proc trace_current_diff {varname args} {
3293 global current_diff diff_actions file_states
3294 if {$current_diff eq {}} {
3295 set s {}
3296 set f {}
3297 set p {}
3298 set o disabled
3299 } else {
3300 set p $current_diff
3301 set s [mapdesc [lindex $file_states($p) 0] $p]
3302 set f {File:}
3303 set p [escape_path $p]
3304 set o normal
3305 }
3306
3307 .vpane.lower.diff.header.status configure -text $s
3308 .vpane.lower.diff.header.file configure -text $f
3309 .vpane.lower.diff.header.path configure -text $p
3310 foreach w $diff_actions {
3311 uplevel #0 $w $o
3312 }
3313}
3314trace add variable current_diff write trace_current_diff
3315
3316frame .vpane.lower.diff.header -background orange
3317label .vpane.lower.diff.header.status \
3318 -background orange \
3319 -width $max_status_desc \
3320 -anchor w \
3321 -justify left \
3322 -font font_ui
3323label .vpane.lower.diff.header.file \
3324 -background orange \
3325 -anchor w \
3326 -justify left \
3327 -font font_ui
3328label .vpane.lower.diff.header.path \
3329 -background orange \
3330 -anchor w \
3331 -justify left \
3332 -font font_ui
3333pack .vpane.lower.diff.header.status -side left
3334pack .vpane.lower.diff.header.file -side left
3335pack .vpane.lower.diff.header.path -fill x
3336set ctxm .vpane.lower.diff.header.ctxm
3337menu $ctxm -tearoff 0
3338$ctxm add command \
3339 -label {Copy} \
3340 -font font_ui \
3341 -command {
3342 clipboard clear
3343 clipboard append \
3344 -format STRING \
3345 -type STRING \
3346 -- $current_diff
3347 }
3348lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3349bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3350
3351# -- Diff Body
3352#
3353frame .vpane.lower.diff.body
3354set ui_diff .vpane.lower.diff.body.t
3355text $ui_diff -background white -borderwidth 0 \
3356 -width 80 -height 15 -wrap none \
3357 -font font_diff \
3358 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3359 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3360 -state disabled
3361scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3362 -command [list $ui_diff xview]
3363scrollbar .vpane.lower.diff.body.sby -orient vertical \
3364 -command [list $ui_diff yview]
3365pack .vpane.lower.diff.body.sbx -side bottom -fill x
3366pack .vpane.lower.diff.body.sby -side right -fill y
3367pack $ui_diff -side left -fill both -expand 1
3368pack .vpane.lower.diff.header -side top -fill x
3369pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3370
3371$ui_diff tag conf d_@ -font font_diffbold
3372$ui_diff tag conf d_+ -foreground blue
3373$ui_diff tag conf d_- -foreground red
3374$ui_diff tag conf d_++ -foreground {#00a000}
3375$ui_diff tag conf d_-- -foreground {#a000a0}
3376$ui_diff tag conf d_+- \
3377 -foreground red \
3378 -background {light goldenrod yellow}
3379$ui_diff tag conf d_-+ \
3380 -foreground blue \
3381 -background azure2
3382
3383# -- Diff Body Context Menu
3384#
3385set ctxm .vpane.lower.diff.body.ctxm
3386menu $ctxm -tearoff 0
3387$ctxm add command \
3388 -label {Copy} \
3389 -font font_ui \
3390 -command {tk_textCopy $ui_diff}
3391lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3392$ctxm add command \
3393 -label {Select All} \
3394 -font font_ui \
3395 -command {$ui_diff tag add sel 0.0 end}
3396lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3397$ctxm add command \
3398 -label {Copy All} \
3399 -font font_ui \
3400 -command {
3401 $ui_diff tag add sel 0.0 end
3402 tk_textCopy $ui_diff
3403 $ui_diff tag remove sel 0.0 end
3404 }
3405lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3406$ctxm add separator
3407$ctxm add command \
3408 -label {Decrease Font Size} \
3409 -font font_ui \
3410 -command {incr_font_size font_diff -1}
3411lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3412$ctxm add command \
3413 -label {Increase Font Size} \
3414 -font font_ui \
3415 -command {incr_font_size font_diff 1}
3416lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3417$ctxm add separator
3418$ctxm add command \
3419 -label {Show Less Context} \
3420 -font font_ui \
3421 -command {if {$repo_config(gui.diffcontext) >= 2} {
3422 incr repo_config(gui.diffcontext) -1
3423 reshow_diff
3424 }}
3425lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3426$ctxm add command \
3427 -label {Show More Context} \
3428 -font font_ui \
3429 -command {
3430 incr repo_config(gui.diffcontext)
3431 reshow_diff
3432 }
3433lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3434$ctxm add separator
3435$ctxm add command -label {Options...} \
3436 -font font_ui \
3437 -command do_options
3438bind_button3 $ui_diff "tk_popup $ctxm %X %Y"
3439
3440# -- Status Bar
3441#
3442set ui_status_value {Initializing...}
3443label .status -textvariable ui_status_value \
3444 -anchor w \
3445 -justify left \
3446 -borderwidth 1 \
3447 -relief sunken \
3448 -font font_ui
3449pack .status -anchor w -side bottom -fill x
3450
3451# -- Load geometry
3452#
3453catch {
3454set gm $repo_config(gui.geometry)
3455wm geometry . [lindex $gm 0]
3456.vpane sash place 0 \
3457 [lindex [.vpane sash coord 0] 0] \
3458 [lindex $gm 1]
3459.vpane.files sash place 0 \
3460 [lindex $gm 2] \
3461 [lindex [.vpane.files sash coord 0] 1]
3462unset gm
3463}
3464
3465# -- Key Bindings
3466#
3467bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3468bind $ui_comm <$M1B-Key-i> {do_include_all;break}
3469bind $ui_comm <$M1B-Key-I> {do_include_all;break}
3470bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3471bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3472bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3473bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3474bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3475bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3476bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3477bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3478
3479bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3480bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3481bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3482bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3483bind $ui_diff <$M1B-Key-v> {break}
3484bind $ui_diff <$M1B-Key-V> {break}
3485bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3486bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3487bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3488bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3489bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3490bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3491
3492bind . <Destroy> do_quit
3493bind all <Key-F5> do_rescan
3494bind all <$M1B-Key-r> do_rescan
3495bind all <$M1B-Key-R> do_rescan
3496bind . <$M1B-Key-s> do_signoff
3497bind . <$M1B-Key-S> do_signoff
3498bind . <$M1B-Key-i> do_include_all
3499bind . <$M1B-Key-I> do_include_all
3500bind . <$M1B-Key-Return> do_commit
3501bind all <$M1B-Key-q> do_quit
3502bind all <$M1B-Key-Q> do_quit
3503bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
3504bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
3505foreach i [list $ui_index $ui_other] {
3506 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
3507 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3508 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
3509}
3510unset i
3511
3512set file_lists($ui_index) [list]
3513set file_lists($ui_other) [list]
3514
3515set HEAD {}
3516set PARENT {}
3517set MERGE_HEAD [list]
3518set commit_type {}
3519set empty_tree {}
3520set current_branch {}
3521set current_diff {}
3522set selected_commit_type new
3523
3524wm title . "$appname ([file normalize [file dirname $gitdir]])"
3525focus -force $ui_comm
3526
3527# -- Warn the user about environmental problems.
3528# Cygwin's Tcl does *not* pass its env array
3529# onto any processes it spawns. This means
3530# that the git processes get none of our
3531# environment. That may not work...
3532#
3533if {[is_Windows]} {
3534 set ignored_env 0
3535 set suggest_user {}
3536 set msg "Possible environment issues exist.
3537
3538The following environment variables are probably
3539going to be ignored by any Git subprocess run
3540by $appname:
3541
3542"
3543 foreach name [array names env] {
3544 switch -regexp -- $name {
3545 {^GIT_INDEX_FILE$} -
3546 {^GIT_OBJECT_DIRECTORY$} -
3547 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3548 {^GIT_DIFF_OPTS$} -
3549 {^GIT_EXTERNAL_DIFF$} -
3550 {^GIT_PAGER$} -
3551 {^GIT_TRACE$} -
3552 {^GIT_CONFIG$} -
3553 {^GIT_CONFIG_LOCAL$} -
3554 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3555 append msg " - $name\n"
3556 incr ignored_env
3557 }
3558 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3559 append msg " - $name\n"
3560 incr ignored_env
3561 set suggest_user $name
3562 }
3563 }
3564 }
3565 if {$ignored_env > 0} {
3566 append msg "
3567This is due to a known issue with the
3568Tcl binary distributed by Cygwin."
3569
3570 if {$suggest_user ne {}} {
3571 append msg "
3572
3573A good replacement for $suggest_user
3574is placing values for the user.name and
3575user.email settings into your personal
3576~/.gitconfig file.
3577"
3578 }
3579 warn_popup $msg
3580 }
3581 unset ignored_env msg suggest_user name
3582}
3583
3584if {!$single_commit} {
3585 load_all_remotes
3586 populate_fetch_menu .mbar.fetch
3587 populate_pull_menu .mbar.pull
3588 populate_push_menu .mbar.push
3589}
3590lock_index begin-read
3591after 1 do_rescan