1 #!/bin/sh
2 # Tcl ignores the next line -*- tcl -*- \
3 exec wish "$0" -- "$@"
5 # Copyright (C) 2006 Shawn Pearce, Paul Mackerras. All rights reserved.
6 # This program is free software; it may be used, copied, modified
7 # and distributed under the terms of the GNU General Public Licence,
8 # either version 2, or (at your option) any later version.
10 set appname [lindex [file split $argv0] end]
11 set gitdir {}
13 ######################################################################
14 ##
15 ## config
17 proc is_many_config {name} {
18 switch -glob -- $name {
19 remote.*.fetch -
20 remote.*.push
21 {return 1}
22 *
23 {return 0}
24 }
25 }
27 proc load_config {include_global} {
28 global repo_config global_config default_config
30 array unset global_config
31 if {$include_global} {
32 catch {
33 set fd_rc [open "| git repo-config --global --list" r]
34 while {[gets $fd_rc line] >= 0} {
35 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
36 if {[is_many_config $name]} {
37 lappend global_config($name) $value
38 } else {
39 set global_config($name) $value
40 }
41 }
42 }
43 close $fd_rc
44 }
45 }
47 array unset repo_config
48 catch {
49 set fd_rc [open "| git repo-config --list" r]
50 while {[gets $fd_rc line] >= 0} {
51 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
52 if {[is_many_config $name]} {
53 lappend repo_config($name) $value
54 } else {
55 set repo_config($name) $value
56 }
57 }
58 }
59 close $fd_rc
60 }
62 foreach name [array names default_config] {
63 if {[catch {set v $global_config($name)}]} {
64 set global_config($name) $default_config($name)
65 }
66 if {[catch {set v $repo_config($name)}]} {
67 set repo_config($name) $default_config($name)
68 }
69 }
70 }
72 proc save_config {} {
73 global default_config font_descs
74 global repo_config global_config
75 global repo_config_new global_config_new
77 foreach option $font_descs {
78 set name [lindex $option 0]
79 set font [lindex $option 1]
80 font configure $font \
81 -family $global_config_new(gui.$font^^family) \
82 -size $global_config_new(gui.$font^^size)
83 font configure ${font}bold \
84 -family $global_config_new(gui.$font^^family) \
85 -size $global_config_new(gui.$font^^size)
86 set global_config_new(gui.$name) [font configure $font]
87 unset global_config_new(gui.$font^^family)
88 unset global_config_new(gui.$font^^size)
89 }
91 foreach name [array names default_config] {
92 set value $global_config_new($name)
93 if {$value ne $global_config($name)} {
94 if {$value eq $default_config($name)} {
95 catch {exec git repo-config --global --unset $name}
96 } else {
97 regsub -all "\[{}\]" $value {"} value
98 exec git repo-config --global $name $value
99 }
100 set global_config($name) $value
101 if {$value eq $repo_config($name)} {
102 catch {exec git repo-config --unset $name}
103 set repo_config($name) $value
104 }
105 }
106 }
108 foreach name [array names default_config] {
109 set value $repo_config_new($name)
110 if {$value ne $repo_config($name)} {
111 if {$value eq $global_config($name)} {
112 catch {exec git repo-config --unset $name}
113 } else {
114 regsub -all "\[{}\]" $value {"} value
115 exec git repo-config $name $value
116 }
117 set repo_config($name) $value
118 }
119 }
120 }
122 proc error_popup {msg} {
123 global gitdir appname
125 set title $appname
126 if {$gitdir ne {}} {
127 append title { (}
128 append title [lindex \
129 [file split [file normalize [file dirname $gitdir]]] \
130 end]
131 append title {)}
132 }
133 tk_messageBox \
134 -parent . \
135 -icon error \
136 -type ok \
137 -title "$title: error" \
138 -message $msg
139 }
141 proc info_popup {msg} {
142 global gitdir appname
144 set title $appname
145 if {$gitdir ne {}} {
146 append title { (}
147 append title [lindex \
148 [file split [file normalize [file dirname $gitdir]]] \
149 end]
150 append title {)}
151 }
152 tk_messageBox \
153 -parent . \
154 -icon error \
155 -type ok \
156 -title $title \
157 -message $msg
158 }
160 ######################################################################
161 ##
162 ## repository setup
164 if { [catch {set cdup [exec git rev-parse --show-cdup]} err]
165 || [catch {set gitdir [exec git rev-parse --git-dir]} err]} {
166 catch {wm withdraw .}
167 error_popup "Cannot find the git directory:\n\n$err"
168 exit 1
169 }
170 if {$cdup ne ""} {
171 cd $cdup
172 }
173 unset cdup
175 set single_commit 0
176 if {$appname eq {git-citool}} {
177 set single_commit 1
178 }
180 ######################################################################
181 ##
182 ## task management
184 set status_active 0
185 set diff_active 0
187 set disable_on_lock [list]
188 set index_lock_type none
190 set HEAD {}
191 set PARENT {}
192 set commit_type {}
194 proc lock_index {type} {
195 global index_lock_type disable_on_lock
197 if {$index_lock_type eq {none}} {
198 set index_lock_type $type
199 foreach w $disable_on_lock {
200 uplevel #0 $w disabled
201 }
202 return 1
203 } elseif {$index_lock_type eq {begin-update} && $type eq {update}} {
204 set index_lock_type $type
205 return 1
206 }
207 return 0
208 }
210 proc unlock_index {} {
211 global index_lock_type disable_on_lock
213 set index_lock_type none
214 foreach w $disable_on_lock {
215 uplevel #0 $w normal
216 }
217 }
219 ######################################################################
220 ##
221 ## status
223 proc repository_state {hdvar ctvar} {
224 global gitdir
225 upvar $hdvar hd $ctvar ct
227 if {[catch {set hd [exec git rev-parse --verify HEAD]}]} {
228 set ct initial
229 } elseif {[file exists [file join $gitdir MERGE_HEAD]]} {
230 set ct merge
231 } else {
232 set ct normal
233 }
234 }
236 proc update_status {{final Ready.}} {
237 global HEAD PARENT commit_type
238 global ui_index ui_other ui_status_value ui_comm
239 global status_active file_states
240 global repo_config
242 if {$status_active || ![lock_index read]} return
244 repository_state new_HEAD new_type
245 if {$commit_type eq {amend}
246 && $new_type eq {normal}
247 && $new_HEAD eq $HEAD} {
248 } else {
249 set HEAD $new_HEAD
250 set PARENT $new_HEAD
251 set commit_type $new_type
252 }
254 array unset file_states
256 if {![$ui_comm edit modified]
257 || [string trim [$ui_comm get 0.0 end]] eq {}} {
258 if {[load_message GITGUI_MSG]} {
259 } elseif {[load_message MERGE_MSG]} {
260 } elseif {[load_message SQUASH_MSG]} {
261 }
262 $ui_comm edit modified false
263 $ui_comm edit reset
264 }
266 if {$repo_config(gui.trustmtime) eq {true}} {
267 update_status_stage2 {} $final
268 } else {
269 set status_active 1
270 set ui_status_value {Refreshing file status...}
271 set cmd [list git update-index]
272 lappend cmd -q
273 lappend cmd --unmerged
274 lappend cmd --ignore-missing
275 lappend cmd --refresh
276 set fd_rf [open "| $cmd" r]
277 fconfigure $fd_rf -blocking 0 -translation binary
278 fileevent $fd_rf readable \
279 [list update_status_stage2 $fd_rf $final]
280 }
281 }
283 proc update_status_stage2 {fd final} {
284 global gitdir PARENT commit_type
285 global ui_index ui_other ui_status_value ui_comm
286 global status_active
287 global buf_rdi buf_rdf buf_rlo
289 if {$fd ne {}} {
290 read $fd
291 if {![eof $fd]} return
292 close $fd
293 }
295 set ls_others [list | git ls-files --others -z \
296 --exclude-per-directory=.gitignore]
297 set info_exclude [file join $gitdir info exclude]
298 if {[file readable $info_exclude]} {
299 lappend ls_others "--exclude-from=$info_exclude"
300 }
302 set buf_rdi {}
303 set buf_rdf {}
304 set buf_rlo {}
306 set status_active 3
307 set ui_status_value {Scanning for modified files ...}
308 set fd_di [open "| git diff-index --cached -z $PARENT" r]
309 set fd_df [open "| git diff-files -z" r]
310 set fd_lo [open $ls_others r]
312 fconfigure $fd_di -blocking 0 -translation binary
313 fconfigure $fd_df -blocking 0 -translation binary
314 fconfigure $fd_lo -blocking 0 -translation binary
315 fileevent $fd_di readable [list read_diff_index $fd_di $final]
316 fileevent $fd_df readable [list read_diff_files $fd_df $final]
317 fileevent $fd_lo readable [list read_ls_others $fd_lo $final]
318 }
320 proc load_message {file} {
321 global gitdir ui_comm
323 set f [file join $gitdir $file]
324 if {[file isfile $f]} {
325 if {[catch {set fd [open $f r]}]} {
326 return 0
327 }
328 set content [string trim [read $fd]]
329 close $fd
330 $ui_comm delete 0.0 end
331 $ui_comm insert end $content
332 return 1
333 }
334 return 0
335 }
337 proc read_diff_index {fd final} {
338 global buf_rdi
340 append buf_rdi [read $fd]
341 set c 0
342 set n [string length $buf_rdi]
343 while {$c < $n} {
344 set z1 [string first "\0" $buf_rdi $c]
345 if {$z1 == -1} break
346 incr z1
347 set z2 [string first "\0" $buf_rdi $z1]
348 if {$z2 == -1} break
350 set c $z2
351 incr z2 -1
352 display_file \
353 [string range $buf_rdi $z1 $z2] \
354 [string index $buf_rdi [expr $z1 - 2]]_
355 incr c
356 }
357 if {$c < $n} {
358 set buf_rdi [string range $buf_rdi $c end]
359 } else {
360 set buf_rdi {}
361 }
363 status_eof $fd buf_rdi $final
364 }
366 proc read_diff_files {fd final} {
367 global buf_rdf
369 append buf_rdf [read $fd]
370 set c 0
371 set n [string length $buf_rdf]
372 while {$c < $n} {
373 set z1 [string first "\0" $buf_rdf $c]
374 if {$z1 == -1} break
375 incr z1
376 set z2 [string first "\0" $buf_rdf $z1]
377 if {$z2 == -1} break
379 set c $z2
380 incr z2 -1
381 display_file \
382 [string range $buf_rdf $z1 $z2] \
383 _[string index $buf_rdf [expr $z1 - 2]]
384 incr c
385 }
386 if {$c < $n} {
387 set buf_rdf [string range $buf_rdf $c end]
388 } else {
389 set buf_rdf {}
390 }
392 status_eof $fd buf_rdf $final
393 }
395 proc read_ls_others {fd final} {
396 global buf_rlo
398 append buf_rlo [read $fd]
399 set pck [split $buf_rlo "\0"]
400 set buf_rlo [lindex $pck end]
401 foreach p [lrange $pck 0 end-1] {
402 display_file $p _O
403 }
404 status_eof $fd buf_rlo $final
405 }
407 proc status_eof {fd buf final} {
408 global status_active ui_status_value
409 upvar $buf to_clear
411 if {[eof $fd]} {
412 set to_clear {}
413 close $fd
415 if {[incr status_active -1] == 0} {
416 display_all_files
417 unlock_index
418 reshow_diff
419 set ui_status_value $final
420 }
421 }
422 }
424 ######################################################################
425 ##
426 ## diff
428 proc clear_diff {} {
429 global ui_diff ui_fname_value ui_fstatus_value ui_index ui_other
431 $ui_diff conf -state normal
432 $ui_diff delete 0.0 end
433 $ui_diff conf -state disabled
435 set ui_fname_value {}
436 set ui_fstatus_value {}
438 $ui_index tag remove in_diff 0.0 end
439 $ui_other tag remove in_diff 0.0 end
440 }
442 proc reshow_diff {} {
443 global ui_fname_value ui_status_value file_states
445 if {$ui_fname_value eq {}
446 || [catch {set s $file_states($ui_fname_value)}]} {
447 clear_diff
448 } else {
449 show_diff $ui_fname_value
450 }
451 }
453 proc handle_empty_diff {} {
454 global ui_fname_value file_states file_lists
456 set path $ui_fname_value
457 set s $file_states($path)
458 if {[lindex $s 0] ne {_M}} return
460 info_popup "No differences detected.
462 [short_path $path] has no changes.
464 The modification date of this file was updated by another
465 application and you currently have the Trust File Modification
466 Timestamps option enabled, so Git did not automatically detect
467 that there are no content differences in this file.
469 This file will now be removed from the modified files list, to
470 prevent possible confusion.
471 "
472 if {[catch {exec git update-index -- $path} err]} {
473 error_popup "Failed to refresh index:\n\n$err"
474 }
476 clear_diff
477 set old_w [mapcol [lindex $file_states($path) 0] $path]
478 set lno [lsearch -sorted $file_lists($old_w) $path]
479 if {$lno >= 0} {
480 set file_lists($old_w) \
481 [lreplace $file_lists($old_w) $lno $lno]
482 incr lno
483 $old_w conf -state normal
484 $old_w delete $lno.0 [expr $lno + 1].0
485 $old_w conf -state disabled
486 }
487 }
489 proc show_diff {path {w {}} {lno {}}} {
490 global file_states file_lists
491 global PARENT diff_3way diff_active repo_config
492 global ui_diff ui_fname_value ui_fstatus_value ui_status_value
494 if {$diff_active || ![lock_index read]} return
496 clear_diff
497 if {$w eq {} || $lno == {}} {
498 foreach w [array names file_lists] {
499 set lno [lsearch -sorted $file_lists($w) $path]
500 if {$lno >= 0} {
501 incr lno
502 break
503 }
504 }
505 }
506 if {$w ne {} && $lno >= 1} {
507 $w tag add in_diff $lno.0 [expr $lno + 1].0
508 }
510 set s $file_states($path)
511 set m [lindex $s 0]
512 set diff_3way 0
513 set diff_active 1
514 set ui_fname_value [escape_path $path]
515 set ui_fstatus_value [mapdesc $m $path]
516 set ui_status_value "Loading diff of [escape_path $path]..."
518 set cmd [list | git diff-index]
519 lappend cmd --no-color
520 if {$repo_config(gui.diffcontext) > 0} {
521 lappend cmd "-U$repo_config(gui.diffcontext)"
522 }
523 lappend cmd -p
525 switch $m {
526 MM {
527 lappend cmd -c
528 }
529 _O {
530 if {[catch {
531 set fd [open $path r]
532 set content [read $fd]
533 close $fd
534 } err ]} {
535 set diff_active 0
536 unlock_index
537 set ui_status_value "Unable to display [escape_path $path]"
538 error_popup "Error loading file:\n\n$err"
539 return
540 }
541 $ui_diff conf -state normal
542 $ui_diff insert end $content
543 $ui_diff conf -state disabled
544 set diff_active 0
545 unlock_index
546 set ui_status_value {Ready.}
547 return
548 }
549 }
551 lappend cmd $PARENT
552 lappend cmd --
553 lappend cmd $path
555 if {[catch {set fd [open $cmd r]} err]} {
556 set diff_active 0
557 unlock_index
558 set ui_status_value "Unable to display [escape_path $path]"
559 error_popup "Error loading diff:\n\n$err"
560 return
561 }
563 fconfigure $fd -blocking 0 -translation auto
564 fileevent $fd readable [list read_diff $fd]
565 }
567 proc read_diff {fd} {
568 global ui_diff ui_status_value diff_3way diff_active
569 global repo_config
571 while {[gets $fd line] >= 0} {
572 if {[string match {diff --git *} $line]} continue
573 if {[string match {diff --combined *} $line]} continue
574 if {[string match {--- *} $line]} continue
575 if {[string match {+++ *} $line]} continue
576 if {[string match index* $line]} {
577 if {[string first , $line] >= 0} {
578 set diff_3way 1
579 }
580 }
582 $ui_diff conf -state normal
583 if {!$diff_3way} {
584 set x [string index $line 0]
585 switch -- $x {
586 "@" {set tags da}
587 "+" {set tags dp}
588 "-" {set tags dm}
589 default {set tags {}}
590 }
591 } else {
592 set x [string range $line 0 1]
593 switch -- $x {
594 default {set tags {}}
595 "@@" {set tags da}
596 "++" {set tags dp; set x " +"}
597 " +" {set tags {di bold}; set x "++"}
598 "+ " {set tags dni; set x "-+"}
599 "--" {set tags dm; set x " -"}
600 " -" {set tags {dm bold}; set x "--"}
601 "- " {set tags di; set x "+-"}
602 default {set tags {}}
603 }
604 set line [string replace $line 0 1 $x]
605 }
606 $ui_diff insert end $line $tags
607 $ui_diff insert end "\n"
608 $ui_diff conf -state disabled
609 }
611 if {[eof $fd]} {
612 close $fd
613 set diff_active 0
614 unlock_index
615 set ui_status_value {Ready.}
617 if {$repo_config(gui.trustmtime) eq {true}
618 && [$ui_diff index end] eq {2.0}} {
619 handle_empty_diff
620 }
621 }
622 }
624 ######################################################################
625 ##
626 ## commit
628 proc load_last_commit {} {
629 global HEAD PARENT commit_type ui_comm
631 if {$commit_type eq {amend}} return
632 if {$commit_type ne {normal}} {
633 error_popup "Can't amend a $commit_type commit."
634 return
635 }
637 set msg {}
638 set parent {}
639 set parent_count 0
640 if {[catch {
641 set fd [open "| git cat-file commit $HEAD" r]
642 while {[gets $fd line] > 0} {
643 if {[string match {parent *} $line]} {
644 set parent [string range $line 7 end]
645 incr parent_count
646 }
647 }
648 set msg [string trim [read $fd]]
649 close $fd
650 } err]} {
651 error_popup "Error loading commit data for amend:\n\n$err"
652 return
653 }
655 if {$parent_count == 0} {
656 set commit_type amend
657 set HEAD {}
658 set PARENT {}
659 update_status
660 } elseif {$parent_count == 1} {
661 set commit_type amend
662 set PARENT $parent
663 $ui_comm delete 0.0 end
664 $ui_comm insert end $msg
665 $ui_comm edit modified false
666 $ui_comm edit reset
667 update_status
668 } else {
669 error_popup {You can't amend a merge commit.}
670 return
671 }
672 }
674 proc commit_tree {} {
675 global tcl_platform HEAD gitdir commit_type file_states
676 global pch_error
677 global ui_status_value ui_comm
679 if {![lock_index update]} return
681 # -- Our in memory state should match the repository.
682 #
683 repository_state curHEAD cur_type
684 if {$commit_type eq {amend}
685 && $cur_type eq {normal}
686 && $curHEAD eq $HEAD} {
687 } elseif {$commit_type ne $cur_type || $HEAD ne $curHEAD} {
688 error_popup {Last scanned state does not match repository state.
690 Its highly likely that another Git program modified the
691 repository since our last scan. A rescan is required
692 before committing.
693 }
694 unlock_index
695 update_status
696 return
697 }
699 # -- At least one file should differ in the index.
700 #
701 set files_ready 0
702 foreach path [array names file_states] {
703 set s $file_states($path)
704 switch -glob -- [lindex $s 0] {
705 _? {continue}
706 A? -
707 D? -
708 M? {set files_ready 1; break}
709 U? {
710 error_popup "Unmerged files cannot be committed.
712 File [short_path $path] has merge conflicts.
713 You must resolve them and include the file before committing.
714 "
715 unlock_index
716 return
717 }
718 default {
719 error_popup "Unknown file state [lindex $s 0] detected.
721 File [short_path $path] cannot be committed by this program.
722 "
723 }
724 }
725 }
726 if {!$files_ready} {
727 error_popup {No included files to commit.
729 You must include at least 1 file before you can commit.
730 }
731 unlock_index
732 return
733 }
735 # -- A message is required.
736 #
737 set msg [string trim [$ui_comm get 1.0 end]]
738 if {$msg eq {}} {
739 error_popup {Please supply a commit message.
741 A good commit message has the following format:
743 - First line: Describe in one sentance what you did.
744 - Second line: Blank
745 - Remaining lines: Describe why this change is good.
746 }
747 unlock_index
748 return
749 }
751 # -- Ask the pre-commit hook for the go-ahead.
752 #
753 set pchook [file join $gitdir hooks pre-commit]
754 if {$tcl_platform(platform) eq {windows} && [file isfile $pchook]} {
755 set pchook [list sh -c [concat \
756 "if test -x \"$pchook\";" \
757 "then exec \"$pchook\" 2>&1;" \
758 "fi"]]
759 } elseif {[file executable $pchook]} {
760 set pchook [list $pchook |& cat]
761 } else {
762 set pchook {}
763 }
764 if {$pchook ne {}} {
765 set ui_status_value {Calling pre-commit hook...}
766 set pch_error {}
767 set fd_ph [open "| $pchook" r]
768 fconfigure $fd_ph -blocking 0 -translation binary
769 fileevent $fd_ph readable \
770 [list commit_stage1 $fd_ph $curHEAD $msg]
771 } else {
772 commit_stage2 $curHEAD $msg
773 }
774 }
776 proc commit_stage1 {fd_ph curHEAD msg} {
777 global pch_error ui_status_value
779 append pch_error [read $fd_ph]
780 fconfigure $fd_ph -blocking 1
781 if {[eof $fd_ph]} {
782 if {[catch {close $fd_ph}]} {
783 set ui_status_value {Commit declined by pre-commit hook.}
784 hook_failed_popup pre-commit $pch_error
785 unlock_index
786 } else {
787 commit_stage2 $curHEAD $msg
788 }
789 set pch_error {}
790 } else {
791 fconfigure $fd_ph -blocking 0
792 }
793 }
795 proc commit_stage2 {curHEAD msg} {
796 global ui_status_value
798 # -- Write the tree in the background.
799 #
800 set ui_status_value {Committing changes...}
801 set fd_wt [open "| git write-tree" r]
802 fileevent $fd_wt readable [list commit_stage3 $fd_wt $curHEAD $msg]
803 }
805 proc commit_stage3 {fd_wt curHEAD msg} {
806 global single_commit gitdir HEAD PARENT commit_type tcl_platform
807 global ui_status_value ui_comm
808 global file_states
810 gets $fd_wt tree_id
811 if {$tree_id eq {} || [catch {close $fd_wt} err]} {
812 error_popup "write-tree failed:\n\n$err"
813 set ui_status_value {Commit failed.}
814 unlock_index
815 return
816 }
818 # -- Create the commit.
819 #
820 set cmd [list git commit-tree $tree_id]
821 if {$PARENT ne {}} {
822 lappend cmd -p $PARENT
823 }
824 if {$commit_type eq {merge}} {
825 if {[catch {
826 set fd_mh [open [file join $gitdir MERGE_HEAD] r]
827 while {[gets $fd_mh merge_head] >= 0} {
828 lappend cmd -p $merge_head
829 }
830 close $fd_mh
831 } err]} {
832 error_popup "Loading MERGE_HEAD failed:\n\n$err"
833 set ui_status_value {Commit failed.}
834 unlock_index
835 return
836 }
837 }
838 if {$PARENT eq {}} {
839 # git commit-tree writes to stderr during initial commit.
840 lappend cmd 2>/dev/null
841 }
842 lappend cmd << $msg
843 if {[catch {set cmt_id [eval exec $cmd]} err]} {
844 error_popup "commit-tree failed:\n\n$err"
845 set ui_status_value {Commit failed.}
846 unlock_index
847 return
848 }
850 # -- Update the HEAD ref.
851 #
852 set reflogm commit
853 if {$commit_type ne {normal}} {
854 append reflogm " ($commit_type)"
855 }
856 set i [string first "\n" $msg]
857 if {$i >= 0} {
858 append reflogm {: } [string range $msg 0 [expr $i - 1]]
859 } else {
860 append reflogm {: } $msg
861 }
862 set cmd [list git update-ref -m $reflogm HEAD $cmt_id $curHEAD]
863 if {[catch {eval exec $cmd} err]} {
864 error_popup "update-ref failed:\n\n$err"
865 set ui_status_value {Commit failed.}
866 unlock_index
867 return
868 }
870 # -- Cleanup after ourselves.
871 #
872 catch {file delete [file join $gitdir MERGE_HEAD]}
873 catch {file delete [file join $gitdir MERGE_MSG]}
874 catch {file delete [file join $gitdir SQUASH_MSG]}
875 catch {file delete [file join $gitdir GITGUI_MSG]}
877 # -- Let rerere do its thing.
878 #
879 if {[file isdirectory [file join $gitdir rr-cache]]} {
880 catch {exec git rerere}
881 }
883 # -- Run the post-commit hook.
884 #
885 set pchook [file join $gitdir hooks post-commit]
886 if {$tcl_platform(platform) eq {windows} && [file isfile $pchook]} {
887 set pchook [list sh -c [concat \
888 "if test -x \"$pchook\";" \
889 "then exec \"$pchook\";" \
890 "fi"]]
891 } elseif {![file executable $pchook]} {
892 set pchook {}
893 }
894 if {$pchook ne {}} {
895 catch {exec $pchook &}
896 }
898 $ui_comm delete 0.0 end
899 $ui_comm edit modified false
900 $ui_comm edit reset
902 if {$single_commit} do_quit
904 # -- Update status without invoking any git commands.
905 #
906 set commit_type normal
907 set HEAD $cmt_id
908 set PARENT $cmt_id
910 foreach path [array names file_states] {
911 set s $file_states($path)
912 set m [lindex $s 0]
913 switch -glob -- $m {
914 A? -
915 M? -
916 D? {set m _[string index $m 1]}
917 }
919 if {$m eq {__}} {
920 unset file_states($path)
921 } else {
922 lset file_states($path) 0 $m
923 }
924 }
926 display_all_files
927 unlock_index
928 reshow_diff
929 set ui_status_value \
930 "Changes committed as [string range $cmt_id 0 7]."
931 }
933 ######################################################################
934 ##
935 ## fetch pull push
937 proc fetch_from {remote} {
938 set w [new_console "fetch $remote" \
939 "Fetching new changes from $remote"]
940 set cmd [list git fetch]
941 lappend cmd $remote
942 console_exec $w $cmd
943 }
945 proc pull_remote {remote branch} {
946 global HEAD commit_type file_states repo_config
948 if {![lock_index update]} return
950 # -- Our in memory state should match the repository.
951 #
952 repository_state curHEAD cur_type
953 if {$commit_type ne $cur_type || $HEAD ne $curHEAD} {
954 error_popup {Last scanned state does not match repository state.
956 Its highly likely that another Git program modified the
957 repository since our last scan. A rescan is required
958 before a pull can be started.
959 }
960 unlock_index
961 update_status
962 return
963 }
965 # -- No differences should exist before a pull.
966 #
967 if {[array size file_states] != 0} {
968 error_popup {Uncommitted but modified files are present.
970 You should not perform a pull with unmodified files in your working
971 directory as Git would be unable to recover from an incorrect merge.
973 Commit or throw away all changes before starting a pull operation.
974 }
975 unlock_index
976 return
977 }
979 set w [new_console "pull $remote $branch" \
980 "Pulling new changes from branch $branch in $remote"]
981 set cmd [list git pull]
982 if {$repo_config(gui.pullsummary) eq {false}} {
983 lappend cmd --no-summary
984 }
985 lappend cmd $remote
986 lappend cmd $branch
987 console_exec $w $cmd [list post_pull_remote $remote $branch]
988 }
990 proc post_pull_remote {remote branch success} {
991 global HEAD PARENT commit_type
992 global ui_status_value
994 unlock_index
995 if {$success} {
996 repository_state HEAD commit_type
997 set PARENT $HEAD
998 set $ui_status_value {Ready.}
999 } else {
1000 update_status \
1001 "Conflicts detected while pulling $branch from $remote."
1002 }
1003 }
1005 proc push_to {remote} {
1006 set w [new_console "push $remote" \
1007 "Pushing changes to $remote"]
1008 set cmd [list git push]
1009 lappend cmd $remote
1010 console_exec $w $cmd
1011 }
1013 ######################################################################
1014 ##
1015 ## ui helpers
1017 proc mapcol {state path} {
1018 global all_cols ui_other
1020 if {[catch {set r $all_cols($state)}]} {
1021 puts "error: no column for state={$state} $path"
1022 return $ui_other
1023 }
1024 return $r
1025 }
1027 proc mapicon {state path} {
1028 global all_icons
1030 if {[catch {set r $all_icons($state)}]} {
1031 puts "error: no icon for state={$state} $path"
1032 return file_plain
1033 }
1034 return $r
1035 }
1037 proc mapdesc {state path} {
1038 global all_descs
1040 if {[catch {set r $all_descs($state)}]} {
1041 puts "error: no desc for state={$state} $path"
1042 return $state
1043 }
1044 return $r
1045 }
1047 proc escape_path {path} {
1048 regsub -all "\n" $path "\\n" path
1049 return $path
1050 }
1052 proc short_path {path} {
1053 return [escape_path [lindex [file split $path] end]]
1054 }
1056 set next_icon_id 0
1058 proc merge_state {path new_state} {
1059 global file_states next_icon_id
1061 set s0 [string index $new_state 0]
1062 set s1 [string index $new_state 1]
1064 if {[catch {set info $file_states($path)}]} {
1065 set state __
1066 set icon n[incr next_icon_id]
1067 } else {
1068 set state [lindex $info 0]
1069 set icon [lindex $info 1]
1070 }
1072 if {$s0 eq {_}} {
1073 set s0 [string index $state 0]
1074 } elseif {$s0 eq {*}} {
1075 set s0 _
1076 }
1078 if {$s1 eq {_}} {
1079 set s1 [string index $state 1]
1080 } elseif {$s1 eq {*}} {
1081 set s1 _
1082 }
1084 set file_states($path) [list $s0$s1 $icon]
1085 return $state
1086 }
1088 proc display_file {path state} {
1089 global file_states file_lists status_active
1091 set old_m [merge_state $path $state]
1092 if {$status_active} return
1094 set s $file_states($path)
1095 set new_m [lindex $s 0]
1096 set new_w [mapcol $new_m $path]
1097 set old_w [mapcol $old_m $path]
1098 set new_icon [mapicon $new_m $path]
1100 if {$new_w ne $old_w} {
1101 set lno [lsearch -sorted $file_lists($old_w) $path]
1102 if {$lno >= 0} {
1103 incr lno
1104 $old_w conf -state normal
1105 $old_w delete $lno.0 [expr $lno + 1].0
1106 $old_w conf -state disabled
1107 }
1109 lappend file_lists($new_w) $path
1110 set file_lists($new_w) [lsort $file_lists($new_w)]
1111 set lno [lsearch -sorted $file_lists($new_w) $path]
1112 incr lno
1113 $new_w conf -state normal
1114 $new_w image create $lno.0 \
1115 -align center -padx 5 -pady 1 \
1116 -name [lindex $s 1] \
1117 -image $new_icon
1118 $new_w insert $lno.1 "[escape_path $path]\n"
1119 $new_w conf -state disabled
1120 } elseif {$new_icon ne [mapicon $old_m $path]} {
1121 $new_w conf -state normal
1122 $new_w image conf [lindex $s 1] -image $new_icon
1123 $new_w conf -state disabled
1124 }
1125 }
1127 proc display_all_files {} {
1128 global ui_index ui_other file_states file_lists
1130 $ui_index conf -state normal
1131 $ui_other conf -state normal
1133 $ui_index delete 0.0 end
1134 $ui_other delete 0.0 end
1136 set file_lists($ui_index) [list]
1137 set file_lists($ui_other) [list]
1139 foreach path [lsort [array names file_states]] {
1140 set s $file_states($path)
1141 set m [lindex $s 0]
1142 set w [mapcol $m $path]
1143 lappend file_lists($w) $path
1144 $w image create end \
1145 -align center -padx 5 -pady 1 \
1146 -name [lindex $s 1] \
1147 -image [mapicon $m $path]
1148 $w insert end "[escape_path $path]\n"
1149 }
1151 $ui_index conf -state disabled
1152 $ui_other conf -state disabled
1153 }
1155 proc update_index {pathList} {
1156 global update_index_cp update_index_rsd ui_status_value
1158 if {![lock_index update]} return
1160 set update_index_cp 0
1161 set update_index_rsd 0
1162 set pathList [lsort $pathList]
1163 set totalCnt [llength $pathList]
1164 set batch [expr {int($totalCnt * .01) + 1}]
1165 if {$batch > 25} {set batch 25}
1167 set ui_status_value "Including files ... 0/$totalCnt 0%"
1168 set ui_status_value [format \
1169 "Including files ... %i/%i files (%.2f%%)" \
1170 $update_index_cp \
1171 $totalCnt \
1172 0.0]
1173 set fd [open "| git update-index --add --remove -z --stdin" w]
1174 fconfigure $fd -blocking 0 -translation binary
1175 fileevent $fd writable [list \
1176 write_update_index \
1177 $fd \
1178 $pathList \
1179 $totalCnt \
1180 $batch \
1181 ]
1182 }
1184 proc write_update_index {fd pathList totalCnt batch} {
1185 global update_index_cp update_index_rsd ui_status_value
1186 global file_states ui_fname_value
1188 if {$update_index_cp >= $totalCnt} {
1189 close $fd
1190 unlock_index
1191 if {$update_index_rsd} {
1192 reshow_diff
1193 } else {
1194 set ui_status_value {Ready.}
1195 }
1196 return
1197 }
1199 for {set i $batch} \
1200 {$update_index_cp < $totalCnt && $i > 0} \
1201 {incr i -1} {
1202 set path [lindex $pathList $update_index_cp]
1203 incr update_index_cp
1205 switch -- [lindex $file_states($path) 0] {
1206 AM -
1207 _O {set new A*}
1208 _M -
1209 MM {set new M*}
1210 AD -
1211 _D {set new D*}
1212 default {continue}
1213 }
1215 puts -nonewline $fd $path
1216 puts -nonewline $fd "\0"
1217 display_file $path $new
1218 if {$ui_fname_value eq $path} {
1219 set update_index_rsd 1
1220 }
1221 }
1223 set ui_status_value [format \
1224 "Including files ... %i/%i files (%.2f%%)" \
1225 $update_index_cp \
1226 $totalCnt \
1227 [expr {100.0 * $update_index_cp / $totalCnt}]]
1228 }
1230 ######################################################################
1231 ##
1232 ## remote management
1234 proc load_all_remotes {} {
1235 global gitdir all_remotes repo_config
1237 set all_remotes [list]
1238 set rm_dir [file join $gitdir remotes]
1239 if {[file isdirectory $rm_dir]} {
1240 set all_remotes [concat $all_remotes [glob \
1241 -types f \
1242 -tails \
1243 -nocomplain \
1244 -directory $rm_dir *]]
1245 }
1247 foreach line [array names repo_config remote.*.url] {
1248 if {[regexp ^remote\.(.*)\.url\$ $line line name]} {
1249 lappend all_remotes $name
1250 }
1251 }
1253 set all_remotes [lsort -unique $all_remotes]
1254 }
1256 proc populate_remote_menu {m pfx op} {
1257 global all_remotes
1259 foreach remote $all_remotes {
1260 $m add command -label "$pfx $remote..." \
1261 -command [list $op $remote] \
1262 -font font_ui
1263 }
1264 }
1266 proc populate_pull_menu {m} {
1267 global gitdir repo_config all_remotes disable_on_lock
1269 foreach remote $all_remotes {
1270 set rb {}
1271 if {[array get repo_config remote.$remote.url] ne {}} {
1272 if {[array get repo_config remote.$remote.fetch] ne {}} {
1273 regexp {^([^:]+):} \
1274 [lindex $repo_config(remote.$remote.fetch) 0] \
1275 line rb
1276 }
1277 } else {
1278 catch {
1279 set fd [open [file join $gitdir remotes $remote] r]
1280 while {[gets $fd line] >= 0} {
1281 if {[regexp {^Pull:[ \t]*([^:]+):} $line line rb]} {
1282 break
1283 }
1284 }
1285 close $fd
1286 }
1287 }
1289 set rb_short $rb
1290 regsub ^refs/heads/ $rb {} rb_short
1291 if {$rb_short ne {}} {
1292 $m add command \
1293 -label "Branch $rb_short from $remote..." \
1294 -command [list pull_remote $remote $rb] \
1295 -font font_ui
1296 lappend disable_on_lock \
1297 [list $m entryconf [$m index last] -state]
1298 }
1299 }
1300 }
1302 ######################################################################
1303 ##
1304 ## icons
1306 set filemask {
1307 #define mask_width 14
1308 #define mask_height 15
1309 static unsigned char mask_bits[] = {
1310 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1311 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1312 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1313 }
1315 image create bitmap file_plain -background white -foreground black -data {
1316 #define plain_width 14
1317 #define plain_height 15
1318 static unsigned char plain_bits[] = {
1319 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1320 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1321 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1322 } -maskdata $filemask
1324 image create bitmap file_mod -background white -foreground blue -data {
1325 #define mod_width 14
1326 #define mod_height 15
1327 static unsigned char mod_bits[] = {
1328 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1329 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1330 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1331 } -maskdata $filemask
1333 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1334 #define file_fulltick_width 14
1335 #define file_fulltick_height 15
1336 static unsigned char file_fulltick_bits[] = {
1337 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1338 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1339 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1340 } -maskdata $filemask
1342 image create bitmap file_parttick -background white -foreground "#005050" -data {
1343 #define parttick_width 14
1344 #define parttick_height 15
1345 static unsigned char parttick_bits[] = {
1346 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1347 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1348 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1349 } -maskdata $filemask
1351 image create bitmap file_question -background white -foreground black -data {
1352 #define file_question_width 14
1353 #define file_question_height 15
1354 static unsigned char file_question_bits[] = {
1355 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1356 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1357 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1358 } -maskdata $filemask
1360 image create bitmap file_removed -background white -foreground red -data {
1361 #define file_removed_width 14
1362 #define file_removed_height 15
1363 static unsigned char file_removed_bits[] = {
1364 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1365 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1366 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1367 } -maskdata $filemask
1369 image create bitmap file_merge -background white -foreground blue -data {
1370 #define file_merge_width 14
1371 #define file_merge_height 15
1372 static unsigned char file_merge_bits[] = {
1373 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1374 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1375 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1376 } -maskdata $filemask
1378 set ui_index .vpane.files.index.list
1379 set ui_other .vpane.files.other.list
1380 set max_status_desc 0
1381 foreach i {
1382 {__ i plain "Unmodified"}
1383 {_M i mod "Modified"}
1384 {M_ i fulltick "Checked in"}
1385 {MM i parttick "Partially included"}
1387 {_O o plain "Untracked"}
1388 {A_ o fulltick "Added"}
1389 {AM o parttick "Partially added"}
1390 {AD o question "Added (but now gone)"}
1392 {_D i question "Missing"}
1393 {D_ i removed "Removed"}
1394 {DD i removed "Removed"}
1395 {DO i removed "Removed (still exists)"}
1397 {UM i merge "Merge conflicts"}
1398 {U_ i merge "Merge conflicts"}
1399 } {
1400 if {$max_status_desc < [string length [lindex $i 3]]} {
1401 set max_status_desc [string length [lindex $i 3]]
1402 }
1403 if {[lindex $i 1] eq {i}} {
1404 set all_cols([lindex $i 0]) $ui_index
1405 } else {
1406 set all_cols([lindex $i 0]) $ui_other
1407 }
1408 set all_icons([lindex $i 0]) file_[lindex $i 2]
1409 set all_descs([lindex $i 0]) [lindex $i 3]
1410 }
1411 unset filemask i
1413 ######################################################################
1414 ##
1415 ## util
1417 proc is_MacOSX {} {
1418 global tcl_platform tk_library
1419 if {$tcl_platform(platform) eq {unix}
1420 && $tcl_platform(os) eq {Darwin}
1421 && [string match /Library/Frameworks/* $tk_library]} {
1422 return 1
1423 }
1424 return 0
1425 }
1427 proc bind_button3 {w cmd} {
1428 bind $w <Any-Button-3> $cmd
1429 if {[is_MacOSX]} {
1430 bind $w <Control-Button-1> $cmd
1431 }
1432 }
1434 proc incr_font_size {font {amt 1}} {
1435 set sz [font configure $font -size]
1436 incr sz $amt
1437 font configure $font -size $sz
1438 font configure ${font}bold -size $sz
1439 }
1441 proc hook_failed_popup {hook msg} {
1442 global gitdir appname
1444 set w .hookfail
1445 toplevel $w
1447 frame $w.m
1448 label $w.m.l1 -text "$hook hook failed:" \
1449 -anchor w \
1450 -justify left \
1451 -font font_uibold
1452 text $w.m.t \
1453 -background white -borderwidth 1 \
1454 -relief sunken \
1455 -width 80 -height 10 \
1456 -font font_diff \
1457 -yscrollcommand [list $w.m.sby set]
1458 label $w.m.l2 \
1459 -text {You must correct the above errors before committing.} \
1460 -anchor w \
1461 -justify left \
1462 -font font_uibold
1463 scrollbar $w.m.sby -command [list $w.m.t yview]
1464 pack $w.m.l1 -side top -fill x
1465 pack $w.m.l2 -side bottom -fill x
1466 pack $w.m.sby -side right -fill y
1467 pack $w.m.t -side left -fill both -expand 1
1468 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
1470 $w.m.t insert 1.0 $msg
1471 $w.m.t conf -state disabled
1473 button $w.ok -text OK \
1474 -width 15 \
1475 -font font_ui \
1476 -command "destroy $w"
1477 pack $w.ok -side bottom
1479 bind $w <Visibility> "grab $w; focus $w"
1480 bind $w <Key-Return> "destroy $w"
1481 wm title $w "$appname ([lindex [file split \
1482 [file normalize [file dirname $gitdir]]] \
1483 end]): error"
1484 tkwait window $w
1485 }
1487 set next_console_id 0
1489 proc new_console {short_title long_title} {
1490 global next_console_id console_data
1491 set w .console[incr next_console_id]
1492 set console_data($w) [list $short_title $long_title]
1493 return [console_init $w]
1494 }
1496 proc console_init {w} {
1497 global console_cr console_data
1498 global gitdir appname M1B
1500 set console_cr($w) 1.0
1501 toplevel $w
1502 frame $w.m
1503 label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
1504 -anchor w \
1505 -justify left \
1506 -font font_uibold
1507 text $w.m.t \
1508 -background white -borderwidth 1 \
1509 -relief sunken \
1510 -width 80 -height 10 \
1511 -font font_diff \
1512 -state disabled \
1513 -yscrollcommand [list $w.m.sby set]
1514 label $w.m.s -anchor w \
1515 -justify left \
1516 -font font_uibold
1517 scrollbar $w.m.sby -command [list $w.m.t yview]
1518 pack $w.m.l1 -side top -fill x
1519 pack $w.m.s -side bottom -fill x
1520 pack $w.m.sby -side right -fill y
1521 pack $w.m.t -side left -fill both -expand 1
1522 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
1524 menu $w.ctxm -tearoff 0
1525 $w.ctxm add command -label "Copy" \
1526 -font font_ui \
1527 -command "tk_textCopy $w.m.t"
1528 $w.ctxm add command -label "Select All" \
1529 -font font_ui \
1530 -command "$w.m.t tag add sel 0.0 end"
1531 $w.ctxm add command -label "Copy All" \
1532 -font font_ui \
1533 -command "
1534 $w.m.t tag add sel 0.0 end
1535 tk_textCopy $w.m.t
1536 $w.m.t tag remove sel 0.0 end
1537 "
1539 button $w.ok -text {Running...} \
1540 -width 15 \
1541 -font font_ui \
1542 -state disabled \
1543 -command "destroy $w"
1544 pack $w.ok -side bottom
1546 bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
1547 bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
1548 bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
1549 bind $w <Visibility> "focus $w"
1550 wm title $w "$appname ([lindex [file split \
1551 [file normalize [file dirname $gitdir]]] \
1552 end]): [lindex $console_data($w) 0]"
1553 return $w
1554 }
1556 proc console_exec {w cmd {after {}}} {
1557 global tcl_platform
1559 # -- Windows tosses the enviroment when we exec our child.
1560 # But most users need that so we have to relogin. :-(
1561 #
1562 if {$tcl_platform(platform) eq {windows}} {
1563 set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
1564 }
1566 # -- Tcl won't let us redirect both stdout and stderr to
1567 # the same pipe. So pass it through cat...
1568 #
1569 set cmd [concat | $cmd |& cat]
1571 set fd_f [open $cmd r]
1572 fconfigure $fd_f -blocking 0 -translation binary
1573 fileevent $fd_f readable [list console_read $w $fd_f $after]
1574 }
1576 proc console_read {w fd after} {
1577 global console_cr console_data
1579 set buf [read $fd]
1580 if {$buf ne {}} {
1581 if {![winfo exists $w]} {console_init $w}
1582 $w.m.t conf -state normal
1583 set c 0
1584 set n [string length $buf]
1585 while {$c < $n} {
1586 set cr [string first "\r" $buf $c]
1587 set lf [string first "\n" $buf $c]
1588 if {$cr < 0} {set cr [expr $n + 1]}
1589 if {$lf < 0} {set lf [expr $n + 1]}
1591 if {$lf < $cr} {
1592 $w.m.t insert end [string range $buf $c $lf]
1593 set console_cr($w) [$w.m.t index {end -1c}]
1594 set c $lf
1595 incr c
1596 } else {
1597 $w.m.t delete $console_cr($w) end
1598 $w.m.t insert end "\n"
1599 $w.m.t insert end [string range $buf $c $cr]
1600 set c $cr
1601 incr c
1602 }
1603 }
1604 $w.m.t conf -state disabled
1605 $w.m.t see end
1606 }
1608 fconfigure $fd -blocking 1
1609 if {[eof $fd]} {
1610 if {[catch {close $fd}]} {
1611 if {![winfo exists $w]} {console_init $w}
1612 $w.m.s conf -background red -text {Error: Command Failed}
1613 $w.ok conf -text Close
1614 $w.ok conf -state normal
1615 set ok 0
1616 } elseif {[winfo exists $w]} {
1617 $w.m.s conf -background green -text {Success}
1618 $w.ok conf -text Close
1619 $w.ok conf -state normal
1620 set ok 1
1621 }
1622 array unset console_cr $w
1623 array unset console_data $w
1624 if {$after ne {}} {
1625 uplevel #0 $after $ok
1626 }
1627 return
1628 }
1629 fconfigure $fd -blocking 0
1630 }
1632 ######################################################################
1633 ##
1634 ## ui commands
1636 set starting_gitk_msg {Please wait... Starting gitk...}
1638 proc do_gitk {} {
1639 global tcl_platform ui_status_value starting_gitk_msg
1641 set ui_status_value $starting_gitk_msg
1642 after 10000 {
1643 if {$ui_status_value eq $starting_gitk_msg} {
1644 set ui_status_value {Ready.}
1645 }
1646 }
1648 if {$tcl_platform(platform) eq {windows}} {
1649 exec sh -c gitk &
1650 } else {
1651 exec gitk &
1652 }
1653 }
1655 proc do_repack {} {
1656 set w [new_console "repack" "Repacking the object database"]
1657 set cmd [list git repack]
1658 lappend cmd -a
1659 lappend cmd -d
1660 console_exec $w $cmd
1661 }
1663 set is_quitting 0
1665 proc do_quit {} {
1666 global gitdir ui_comm is_quitting repo_config
1668 if {$is_quitting} return
1669 set is_quitting 1
1671 # -- Stash our current commit buffer.
1672 #
1673 set save [file join $gitdir GITGUI_MSG]
1674 set msg [string trim [$ui_comm get 0.0 end]]
1675 if {[$ui_comm edit modified] && $msg ne {}} {
1676 catch {
1677 set fd [open $save w]
1678 puts $fd [string trim [$ui_comm get 0.0 end]]
1679 close $fd
1680 }
1681 } elseif {$msg eq {} && [file exists $save]} {
1682 file delete $save
1683 }
1685 # -- Stash our current window geometry into this repository.
1686 #
1687 set cfg_geometry [list]
1688 lappend cfg_geometry [wm geometry .]
1689 lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
1690 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
1691 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
1692 set rc_geometry {}
1693 }
1694 if {$cfg_geometry ne $rc_geometry} {
1695 catch {exec git repo-config gui.geometry $cfg_geometry}
1696 }
1698 destroy .
1699 }
1701 proc do_rescan {} {
1702 update_status
1703 }
1705 proc do_include_all {} {
1706 global file_states
1708 if {![lock_index begin-update]} return
1710 set pathList [list]
1711 foreach path [array names file_states] {
1712 set s $file_states($path)
1713 set m [lindex $s 0]
1714 switch -- $m {
1715 AM -
1716 MM -
1717 _M -
1718 _D {lappend pathList $path}
1719 }
1720 }
1721 if {$pathList eq {}} {
1722 unlock_index
1723 } else {
1724 update_index $pathList
1725 }
1726 }
1728 set GIT_COMMITTER_IDENT {}
1730 proc do_signoff {} {
1731 global ui_comm GIT_COMMITTER_IDENT
1733 if {$GIT_COMMITTER_IDENT eq {}} {
1734 if {[catch {set me [exec git var GIT_COMMITTER_IDENT]} err]} {
1735 error_popup "Unable to obtain your identity:\n\n$err"
1736 return
1737 }
1738 if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \
1739 $me me GIT_COMMITTER_IDENT]} {
1740 error_popup "Invalid GIT_COMMITTER_IDENT:\n\n$me"
1741 return
1742 }
1743 }
1745 set sob "Signed-off-by: $GIT_COMMITTER_IDENT"
1746 set last [$ui_comm get {end -1c linestart} {end -1c}]
1747 if {$last ne $sob} {
1748 $ui_comm edit separator
1749 if {$last ne {}
1750 && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
1751 $ui_comm insert end "\n"
1752 }
1753 $ui_comm insert end "\n$sob"
1754 $ui_comm edit separator
1755 $ui_comm see end
1756 }
1757 }
1759 proc do_amend_last {} {
1760 load_last_commit
1761 }
1763 proc do_commit {} {
1764 commit_tree
1765 }
1767 proc do_options {} {
1768 global appname gitdir font_descs
1769 global repo_config global_config
1770 global repo_config_new global_config_new
1772 array unset repo_config_new
1773 array unset global_config_new
1774 foreach name [array names repo_config] {
1775 set repo_config_new($name) $repo_config($name)
1776 }
1777 load_config 1
1778 foreach name [array names repo_config] {
1779 switch -- $name {
1780 gui.diffcontext {continue}
1781 }
1782 set repo_config_new($name) $repo_config($name)
1783 }
1784 foreach name [array names global_config] {
1785 set global_config_new($name) $global_config($name)
1786 }
1787 set reponame [lindex [file split \
1788 [file normalize [file dirname $gitdir]]] \
1789 end]
1791 set w .options_editor
1792 toplevel $w
1793 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
1795 label $w.header -text "$appname Options" \
1796 -font font_uibold
1797 pack $w.header -side top -fill x
1799 frame $w.buttons
1800 button $w.buttons.restore -text {Restore Defaults} \
1801 -font font_ui \
1802 -command do_restore_defaults
1803 pack $w.buttons.restore -side left
1804 button $w.buttons.save -text Save \
1805 -font font_ui \
1806 -command [list do_save_config $w]
1807 pack $w.buttons.save -side right
1808 button $w.buttons.cancel -text {Cancel} \
1809 -font font_ui \
1810 -command [list destroy $w]
1811 pack $w.buttons.cancel -side right
1812 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
1814 labelframe $w.repo -text "$reponame Repository" \
1815 -font font_ui \
1816 -relief raised -borderwidth 2
1817 labelframe $w.global -text {Global (All Repositories)} \
1818 -font font_ui \
1819 -relief raised -borderwidth 2
1820 pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
1821 pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
1823 foreach option {
1824 {b pullsummary {Show Pull Summary}}
1825 {b trustmtime {Trust File Modification Timestamps}}
1826 {i diffcontext {Number of Diff Context Lines}}
1827 } {
1828 set type [lindex $option 0]
1829 set name [lindex $option 1]
1830 set text [lindex $option 2]
1831 foreach f {repo global} {
1832 switch $type {
1833 b {
1834 checkbutton $w.$f.$name -text $text \
1835 -variable ${f}_config_new(gui.$name) \
1836 -onvalue true \
1837 -offvalue false \
1838 -font font_ui
1839 pack $w.$f.$name -side top -anchor w
1840 }
1841 i {
1842 frame $w.$f.$name
1843 label $w.$f.$name.l -text "$text:" -font font_ui
1844 pack $w.$f.$name.l -side left -anchor w -fill x
1845 spinbox $w.$f.$name.v \
1846 -textvariable ${f}_config_new(gui.$name) \
1847 -from 1 -to 99 -increment 1 \
1848 -width 3 \
1849 -font font_ui
1850 pack $w.$f.$name.v -side right -anchor e
1851 pack $w.$f.$name -side top -anchor w -fill x
1852 }
1853 }
1854 }
1855 }
1857 set all_fonts [lsort [font families]]
1858 foreach option $font_descs {
1859 set name [lindex $option 0]
1860 set font [lindex $option 1]
1861 set text [lindex $option 2]
1863 set global_config_new(gui.$font^^family) \
1864 [font configure $font -family]
1865 set global_config_new(gui.$font^^size) \
1866 [font configure $font -size]
1868 frame $w.global.$name
1869 label $w.global.$name.l -text "$text:" -font font_ui
1870 pack $w.global.$name.l -side left -anchor w -fill x
1871 eval tk_optionMenu $w.global.$name.family \
1872 global_config_new(gui.$font^^family) \
1873 $all_fonts
1874 spinbox $w.global.$name.size \
1875 -textvariable global_config_new(gui.$font^^size) \
1876 -from 2 -to 80 -increment 1 \
1877 -width 3 \
1878 -font font_ui
1879 pack $w.global.$name.size -side right -anchor e
1880 pack $w.global.$name.family -side right -anchor e
1881 pack $w.global.$name -side top -anchor w -fill x
1882 }
1884 bind $w <Visibility> "grab $w; focus $w"
1885 bind $w <Key-Escape> "destroy $w"
1886 wm title $w "$appname ($reponame): Options"
1887 tkwait window $w
1888 }
1890 proc do_restore_defaults {} {
1891 global font_descs default_config repo_config
1892 global repo_config_new global_config_new
1894 foreach name [array names default_config] {
1895 set repo_config_new($name) $default_config($name)
1896 set global_config_new($name) $default_config($name)
1897 }
1899 foreach option $font_descs {
1900 set name [lindex $option 0]
1901 set repo_config(gui.$name) $default_config(gui.$name)
1902 }
1903 apply_config
1905 foreach option $font_descs {
1906 set name [lindex $option 0]
1907 set font [lindex $option 1]
1908 set global_config_new(gui.$font^^family) \
1909 [font configure $font -family]
1910 set global_config_new(gui.$font^^size) \
1911 [font configure $font -size]
1912 }
1913 }
1915 proc do_save_config {w} {
1916 if {[catch {save_config} err]} {
1917 error_popup "Failed to completely save options:\n\n$err"
1918 }
1919 reshow_diff
1920 destroy $w
1921 }
1923 # shift == 1: left click
1924 # 3: right click
1925 proc click {w x y shift wx wy} {
1926 global ui_index ui_other file_lists
1928 set pos [split [$w index @$x,$y] .]
1929 set lno [lindex $pos 0]
1930 set col [lindex $pos 1]
1931 set path [lindex $file_lists($w) [expr $lno - 1]]
1932 if {$path eq {}} return
1934 if {$col > 0 && $shift == 1} {
1935 show_diff $path $w $lno
1936 }
1937 }
1939 proc unclick {w x y} {
1940 global file_lists
1942 set pos [split [$w index @$x,$y] .]
1943 set lno [lindex $pos 0]
1944 set col [lindex $pos 1]
1945 set path [lindex $file_lists($w) [expr $lno - 1]]
1946 if {$path eq {}} return
1948 if {$col == 0} {
1949 update_index [list $path]
1950 }
1951 }
1953 ######################################################################
1954 ##
1955 ## config defaults
1957 set cursor_ptr arrow
1958 font create font_diff -family Courier -size 10
1959 font create font_ui
1960 catch {
1961 label .dummy
1962 eval font configure font_ui [font actual [.dummy cget -font]]
1963 destroy .dummy
1964 }
1966 font create font_uibold
1967 font create font_diffbold
1969 set M1B M1
1970 set M1T M1
1971 if {$tcl_platform(platform) eq {windows}} {
1972 set M1B Control
1973 set M1T Ctrl
1974 } elseif {[is_MacOSX]} {
1975 set M1B M1
1976 set M1T Cmd
1977 }
1979 proc apply_config {} {
1980 global repo_config font_descs
1982 foreach option $font_descs {
1983 set name [lindex $option 0]
1984 set font [lindex $option 1]
1985 if {[catch {
1986 foreach {cn cv} $repo_config(gui.$name) {
1987 font configure $font $cn $cv
1988 }
1989 } err]} {
1990 error_popup "Invalid font specified in gui.$name:\n\n$err"
1991 }
1992 foreach {cn cv} [font configure $font] {
1993 font configure ${font}bold $cn $cv
1994 }
1995 font configure ${font}bold -weight bold
1996 }
1997 }
1999 set default_config(gui.trustmtime) false
2000 set default_config(gui.pullsummary) true
2001 set default_config(gui.diffcontext) 5
2002 set default_config(gui.fontui) [font configure font_ui]
2003 set default_config(gui.fontdiff) [font configure font_diff]
2004 set font_descs {
2005 {fontui font_ui {Main Font}}
2006 {fontdiff font_diff {Diff/Console Font}}
2007 }
2008 load_config 0
2009 apply_config
2011 ######################################################################
2012 ##
2013 ## ui construction
2015 # -- Menu Bar
2016 menu .mbar -tearoff 0
2017 .mbar add cascade -label Project -menu .mbar.project
2018 .mbar add cascade -label Edit -menu .mbar.edit
2019 .mbar add cascade -label Commit -menu .mbar.commit
2020 if {!$single_commit} {
2021 .mbar add cascade -label Fetch -menu .mbar.fetch
2022 .mbar add cascade -label Pull -menu .mbar.pull
2023 .mbar add cascade -label Push -menu .mbar.push
2024 }
2025 . configure -menu .mbar
2027 # -- Project Menu
2028 menu .mbar.project
2029 .mbar.project add command -label Visualize \
2030 -command do_gitk \
2031 -font font_ui
2032 if {!$single_commit} {
2033 .mbar.project add command -label {Repack Database} \
2034 -command do_repack \
2035 -font font_ui
2036 }
2037 .mbar.project add command -label Quit \
2038 -command do_quit \
2039 -accelerator $M1T-Q \
2040 -font font_ui
2042 # -- Edit Menu
2043 #
2044 menu .mbar.edit
2045 .mbar.edit add command -label Undo \
2046 -command {catch {[focus] edit undo}} \
2047 -accelerator $M1T-Z \
2048 -font font_ui
2049 .mbar.edit add command -label Redo \
2050 -command {catch {[focus] edit redo}} \
2051 -accelerator $M1T-Y \
2052 -font font_ui
2053 .mbar.edit add separator
2054 .mbar.edit add command -label Cut \
2055 -command {catch {tk_textCut [focus]}} \
2056 -accelerator $M1T-X \
2057 -font font_ui
2058 .mbar.edit add command -label Copy \
2059 -command {catch {tk_textCopy [focus]}} \
2060 -accelerator $M1T-C \
2061 -font font_ui
2062 .mbar.edit add command -label Paste \
2063 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
2064 -accelerator $M1T-V \
2065 -font font_ui
2066 .mbar.edit add command -label Delete \
2067 -command {catch {[focus] delete sel.first sel.last}} \
2068 -accelerator Del \
2069 -font font_ui
2070 .mbar.edit add separator
2071 .mbar.edit add command -label {Select All} \
2072 -command {catch {[focus] tag add sel 0.0 end}} \
2073 -accelerator $M1T-A \
2074 -font font_ui
2075 .mbar.edit add separator
2076 .mbar.edit add command -label {Options...} \
2077 -command do_options \
2078 -font font_ui
2080 # -- Commit Menu
2081 menu .mbar.commit
2082 .mbar.commit add command -label Rescan \
2083 -command do_rescan \
2084 -accelerator F5 \
2085 -font font_ui
2086 lappend disable_on_lock \
2087 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2088 .mbar.commit add command -label {Amend Last Commit} \
2089 -command do_amend_last \
2090 -font font_ui
2091 lappend disable_on_lock \
2092 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2093 .mbar.commit add command -label {Include All Files} \
2094 -command do_include_all \
2095 -accelerator $M1T-I \
2096 -font font_ui
2097 lappend disable_on_lock \
2098 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2099 .mbar.commit add command -label {Sign Off} \
2100 -command do_signoff \
2101 -accelerator $M1T-S \
2102 -font font_ui
2103 .mbar.commit add command -label Commit \
2104 -command do_commit \
2105 -accelerator $M1T-Return \
2106 -font font_ui
2107 lappend disable_on_lock \
2108 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2110 if {!$single_commit} {
2111 # -- Fetch Menu
2112 menu .mbar.fetch
2114 # -- Pull Menu
2115 menu .mbar.pull
2117 # -- Push Menu
2118 menu .mbar.push
2119 }
2121 # -- Main Window Layout
2122 panedwindow .vpane -orient vertical
2123 panedwindow .vpane.files -orient horizontal
2124 .vpane add .vpane.files -sticky nsew -height 100 -width 400
2125 pack .vpane -anchor n -side top -fill both -expand 1
2127 # -- Index File List
2128 frame .vpane.files.index -height 100 -width 400
2129 label .vpane.files.index.title -text {Modified Files} \
2130 -background green \
2131 -font font_ui
2132 text $ui_index -background white -borderwidth 0 \
2133 -width 40 -height 10 \
2134 -font font_ui \
2135 -cursor $cursor_ptr \
2136 -yscrollcommand {.vpane.files.index.sb set} \
2137 -state disabled
2138 scrollbar .vpane.files.index.sb -command [list $ui_index yview]
2139 pack .vpane.files.index.title -side top -fill x
2140 pack .vpane.files.index.sb -side right -fill y
2141 pack $ui_index -side left -fill both -expand 1
2142 .vpane.files add .vpane.files.index -sticky nsew
2144 # -- Other (Add) File List
2145 frame .vpane.files.other -height 100 -width 100
2146 label .vpane.files.other.title -text {Untracked Files} \
2147 -background red \
2148 -font font_ui
2149 text $ui_other -background white -borderwidth 0 \
2150 -width 40 -height 10 \
2151 -font font_ui \
2152 -cursor $cursor_ptr \
2153 -yscrollcommand {.vpane.files.other.sb set} \
2154 -state disabled
2155 scrollbar .vpane.files.other.sb -command [list $ui_other yview]
2156 pack .vpane.files.other.title -side top -fill x
2157 pack .vpane.files.other.sb -side right -fill y
2158 pack $ui_other -side left -fill both -expand 1
2159 .vpane.files add .vpane.files.other -sticky nsew
2161 $ui_index tag conf in_diff -font font_uibold
2162 $ui_other tag conf in_diff -font font_uibold
2164 # -- Diff and Commit Area
2165 frame .vpane.lower -height 300 -width 400
2166 frame .vpane.lower.commarea
2167 frame .vpane.lower.diff -relief sunken -borderwidth 1
2168 pack .vpane.lower.commarea -side top -fill x
2169 pack .vpane.lower.diff -side bottom -fill both -expand 1
2170 .vpane add .vpane.lower -stick nsew
2172 # -- Commit Area Buttons
2173 frame .vpane.lower.commarea.buttons
2174 label .vpane.lower.commarea.buttons.l -text {} \
2175 -anchor w \
2176 -justify left \
2177 -font font_ui
2178 pack .vpane.lower.commarea.buttons.l -side top -fill x
2179 pack .vpane.lower.commarea.buttons -side left -fill y
2181 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
2182 -command do_rescan \
2183 -font font_ui
2184 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
2185 lappend disable_on_lock \
2186 {.vpane.lower.commarea.buttons.rescan conf -state}
2188 button .vpane.lower.commarea.buttons.amend -text {Amend Last} \
2189 -command do_amend_last \
2190 -font font_ui
2191 pack .vpane.lower.commarea.buttons.amend -side top -fill x
2192 lappend disable_on_lock \
2193 {.vpane.lower.commarea.buttons.amend conf -state}
2195 button .vpane.lower.commarea.buttons.incall -text {Include All} \
2196 -command do_include_all \
2197 -font font_ui
2198 pack .vpane.lower.commarea.buttons.incall -side top -fill x
2199 lappend disable_on_lock \
2200 {.vpane.lower.commarea.buttons.incall conf -state}
2202 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
2203 -command do_signoff \
2204 -font font_ui
2205 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
2207 button .vpane.lower.commarea.buttons.commit -text {Commit} \
2208 -command do_commit \
2209 -font font_ui
2210 pack .vpane.lower.commarea.buttons.commit -side top -fill x
2211 lappend disable_on_lock \
2212 {.vpane.lower.commarea.buttons.commit conf -state}
2214 # -- Commit Message Buffer
2215 frame .vpane.lower.commarea.buffer
2216 set ui_comm .vpane.lower.commarea.buffer.t
2217 set ui_coml .vpane.lower.commarea.buffer.l
2218 label $ui_coml -text {Commit Message:} \
2219 -anchor w \
2220 -justify left \
2221 -font font_ui
2222 trace add variable commit_type write {uplevel #0 {
2223 switch -glob $commit_type \
2224 initial {$ui_coml conf -text {Initial Commit Message:}} \
2225 amend {$ui_coml conf -text {Amended Commit Message:}} \
2226 merge {$ui_coml conf -text {Merge Commit Message:}} \
2227 * {$ui_coml conf -text {Commit Message:}}
2228 }}
2229 text $ui_comm -background white -borderwidth 1 \
2230 -undo true \
2231 -maxundo 20 \
2232 -autoseparators true \
2233 -relief sunken \
2234 -width 75 -height 9 -wrap none \
2235 -font font_diff \
2236 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
2237 scrollbar .vpane.lower.commarea.buffer.sby \
2238 -command [list $ui_comm yview]
2239 pack $ui_coml -side top -fill x
2240 pack .vpane.lower.commarea.buffer.sby -side right -fill y
2241 pack $ui_comm -side left -fill y
2242 pack .vpane.lower.commarea.buffer -side left -fill y
2244 # -- Commit Message Buffer Context Menu
2245 #
2246 menu $ui_comm.ctxm -tearoff 0
2247 $ui_comm.ctxm add command -label "Cut" \
2248 -font font_ui \
2249 -command "tk_textCut $ui_comm"
2250 $ui_comm.ctxm add command -label "Copy" \
2251 -font font_ui \
2252 -command "tk_textCopy $ui_comm"
2253 $ui_comm.ctxm add command -label "Paste" \
2254 -font font_ui \
2255 -command "tk_textPaste $ui_comm"
2256 $ui_comm.ctxm add command -label "Delete" \
2257 -font font_ui \
2258 -command "$ui_comm delete sel.first sel.last"
2259 $ui_comm.ctxm add separator
2260 $ui_comm.ctxm add command -label "Select All" \
2261 -font font_ui \
2262 -command "$ui_comm tag add sel 0.0 end"
2263 $ui_comm.ctxm add command -label "Copy All" \
2264 -font font_ui \
2265 -command "
2266 $ui_comm tag add sel 0.0 end
2267 tk_textCopy $ui_comm
2268 $ui_comm tag remove sel 0.0 end
2269 "
2270 $ui_comm.ctxm add separator
2271 $ui_comm.ctxm add command -label "Sign Off" \
2272 -font font_ui \
2273 -command do_signoff
2274 bind_button3 $ui_comm "tk_popup $ui_comm.ctxm %X %Y"
2276 # -- Diff Header
2277 set ui_fname_value {}
2278 set ui_fstatus_value {}
2279 frame .vpane.lower.diff.header -background orange
2280 label .vpane.lower.diff.header.l1 -text {File:} \
2281 -background orange \
2282 -font font_ui
2283 label .vpane.lower.diff.header.l2 -textvariable ui_fname_value \
2284 -background orange \
2285 -anchor w \
2286 -justify left \
2287 -font font_ui
2288 label .vpane.lower.diff.header.l3 -text {Status:} \
2289 -background orange \
2290 -font font_ui
2291 label .vpane.lower.diff.header.l4 -textvariable ui_fstatus_value \
2292 -background orange \
2293 -width $max_status_desc \
2294 -anchor w \
2295 -justify left \
2296 -font font_ui
2297 pack .vpane.lower.diff.header.l1 -side left
2298 pack .vpane.lower.diff.header.l2 -side left -fill x
2299 pack .vpane.lower.diff.header.l4 -side right
2300 pack .vpane.lower.diff.header.l3 -side right
2302 # -- Diff Body
2303 frame .vpane.lower.diff.body
2304 set ui_diff .vpane.lower.diff.body.t
2305 text $ui_diff -background white -borderwidth 0 \
2306 -width 80 -height 15 -wrap none \
2307 -font font_diff \
2308 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
2309 -yscrollcommand {.vpane.lower.diff.body.sby set} \
2310 -state disabled
2311 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
2312 -command [list $ui_diff xview]
2313 scrollbar .vpane.lower.diff.body.sby -orient vertical \
2314 -command [list $ui_diff yview]
2315 pack .vpane.lower.diff.body.sbx -side bottom -fill x
2316 pack .vpane.lower.diff.body.sby -side right -fill y
2317 pack $ui_diff -side left -fill both -expand 1
2318 pack .vpane.lower.diff.header -side top -fill x
2319 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
2321 $ui_diff tag conf dm -foreground red
2322 $ui_diff tag conf dp -foreground blue
2323 $ui_diff tag conf di -foreground {#00a000}
2324 $ui_diff tag conf dni -foreground {#a000a0}
2325 $ui_diff tag conf da -font font_diffbold
2326 $ui_diff tag conf bold -font font_diffbold
2328 # -- Diff Body Context Menu
2329 #
2330 menu $ui_diff.ctxm -tearoff 0
2331 $ui_diff.ctxm add command -label "Copy" \
2332 -font font_ui \
2333 -command "tk_textCopy $ui_diff"
2334 $ui_diff.ctxm add command -label "Select All" \
2335 -font font_ui \
2336 -command "$ui_diff tag add sel 0.0 end"
2337 $ui_diff.ctxm add command -label "Copy All" \
2338 -font font_ui \
2339 -command "
2340 $ui_diff tag add sel 0.0 end
2341 tk_textCopy $ui_diff
2342 $ui_diff tag remove sel 0.0 end
2343 "
2344 $ui_diff.ctxm add separator
2345 $ui_diff.ctxm add command -label "Decrease Font Size" \
2346 -font font_ui \
2347 -command {incr_font_size font_diff -1}
2348 $ui_diff.ctxm add command -label "Increase Font Size" \
2349 -font font_ui \
2350 -command {incr_font_size font_diff 1}
2351 $ui_diff.ctxm add separator
2352 $ui_diff.ctxm add command -label "Show Less Context" \
2353 -font font_ui \
2354 -command {if {$ui_fname_value ne {}
2355 && $repo_config(gui.diffcontext) >= 2} {
2356 incr repo_config(gui.diffcontext) -1
2357 reshow_diff
2358 }}
2359 $ui_diff.ctxm add command -label "Show More Context" \
2360 -font font_ui \
2361 -command {if {$ui_fname_value ne {}} {
2362 incr repo_config(gui.diffcontext)
2363 reshow_diff
2364 }}
2365 $ui_diff.ctxm add separator
2366 $ui_diff.ctxm add command -label {Options...} \
2367 -font font_ui \
2368 -command do_options
2369 bind_button3 $ui_diff "tk_popup $ui_diff.ctxm %X %Y"
2371 # -- Status Bar
2372 set ui_status_value {Initializing...}
2373 label .status -textvariable ui_status_value \
2374 -anchor w \
2375 -justify left \
2376 -borderwidth 1 \
2377 -relief sunken \
2378 -font font_ui
2379 pack .status -anchor w -side bottom -fill x
2381 # -- Load geometry
2382 catch {
2383 set gm $repo_config(gui.geometry)
2384 wm geometry . [lindex $gm 0]
2385 .vpane sash place 0 \
2386 [lindex [.vpane sash coord 0] 0] \
2387 [lindex $gm 1]
2388 .vpane.files sash place 0 \
2389 [lindex $gm 2] \
2390 [lindex [.vpane.files sash coord 0] 1]
2391 unset gm
2392 }
2394 # -- Key Bindings
2395 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
2396 bind $ui_comm <$M1B-Key-i> {do_include_all;break}
2397 bind $ui_comm <$M1B-Key-I> {do_include_all;break}
2398 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
2399 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
2400 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
2401 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
2402 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
2403 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
2404 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2405 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
2407 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
2408 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
2409 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
2410 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
2411 bind $ui_diff <$M1B-Key-v> {break}
2412 bind $ui_diff <$M1B-Key-V> {break}
2413 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
2414 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
2415 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
2416 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
2417 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
2418 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
2420 bind . <Destroy> do_quit
2421 bind all <Key-F5> do_rescan
2422 bind all <$M1B-Key-r> do_rescan
2423 bind all <$M1B-Key-R> do_rescan
2424 bind . <$M1B-Key-s> do_signoff
2425 bind . <$M1B-Key-S> do_signoff
2426 bind . <$M1B-Key-i> do_include_all
2427 bind . <$M1B-Key-I> do_include_all
2428 bind . <$M1B-Key-Return> do_commit
2429 bind all <$M1B-Key-q> do_quit
2430 bind all <$M1B-Key-Q> do_quit
2431 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
2432 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
2433 foreach i [list $ui_index $ui_other] {
2434 bind $i <Button-1> {click %W %x %y 1 %X %Y; break}
2435 bind $i <ButtonRelease-1> {unclick %W %x %y; break}
2436 bind_button3 $i {click %W %x %y 3 %X %Y; break}
2437 }
2438 unset i
2440 set file_lists($ui_index) [list]
2441 set file_lists($ui_other) [list]
2443 wm title . "$appname ([file normalize [file dirname $gitdir]])"
2444 focus -force $ui_comm
2445 if {!$single_commit} {
2446 load_all_remotes
2447 populate_remote_menu .mbar.fetch From fetch_from
2448 populate_remote_menu .mbar.push To push_to
2449 populate_pull_menu .mbar.pull
2450 }
2451 after 1 update_status