1#!/bin/sh
2# Tcl ignores the next line -*- tcl -*- \
3exec wish "$0" -- "$@"
4set appvers {@@GIT_VERSION@@}
6set copyright {
7Copyright © 2006, 2007 Shawn Pearce, Paul Mackerras.
8This program is free software; you can redistribute it and/or modify
10it under the terms of the GNU General Public License as published by
11the Free Software Foundation; either version 2 of the License, or
12(at your option) any later version.
13This program is distributed in the hope that it will be useful,
15but WITHOUT ANY WARRANTY; without even the implied warranty of
16MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17GNU General Public License for more details.
18You should have received a copy of the GNU General Public License
20along with this program; if not, write to the Free Software
21Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA}
22######################################################################
24##
25## read only globals
26set _appname [lindex [file split $argv0] end]
28set _gitdir {}
29set _gitexec {}
30set _reponame {}
31set _iscygwin {}
32proc appname {} {
34 global _appname
35 return $_appname
36}
37proc gitdir {args} {
39 global _gitdir
40 if {$args eq {}} {
41 return $_gitdir
42 }
43 return [eval [concat [list file join $_gitdir] $args]]
44}
45proc gitexec {args} {
47 global _gitexec
48 if {$_gitexec eq {}} {
49 if {[catch {set _gitexec [exec git --exec-path]} err]} {
50 error "Git not installed?\n\n$err"
51 }
52 }
53 if {$args eq {}} {
54 return $_gitexec
55 }
56 return [eval [concat [list file join $_gitexec] $args]]
57}
58proc reponame {} {
60 global _reponame
61 return $_reponame
62}
63proc is_MacOSX {} {
65 global tcl_platform tk_library
66 if {[tk windowingsystem] eq {aqua}} {
67 return 1
68 }
69 return 0
70}
71proc is_Windows {} {
73 global tcl_platform
74 if {$tcl_platform(platform) eq {windows}} {
75 return 1
76 }
77 return 0
78}
79proc is_Cygwin {} {
81 global tcl_platform _iscygwin
82 if {$_iscygwin eq {}} {
83 if {$tcl_platform(platform) eq {windows}} {
84 if {[catch {set p [exec cygpath --windir]} err]} {
85 set _iscygwin 0
86 } else {
87 set _iscygwin 1
88 }
89 } else {
90 set _iscygwin 0
91 }
92 }
93 return $_iscygwin
94}
95proc is_enabled {option} {
97 global enabled_options
98 if {[catch {set on $enabled_options($option)}]} {return 0}
99 return $on
100}
101proc enable_option {option} {
103 global enabled_options
104 set enabled_options($option) 1
105}
106proc disable_option {option} {
108 global enabled_options
109 set enabled_options($option) 0
110}
111######################################################################
113##
114## config
115proc is_many_config {name} {
117 switch -glob -- $name {
118 remote.*.fetch -
119 remote.*.push
120 {return 1}
121 *
122 {return 0}
123 }
124}
125proc is_config_true {name} {
127 global repo_config
128 if {[catch {set v $repo_config($name)}]} {
129 return 0
130 } elseif {$v eq {true} || $v eq {1} || $v eq {yes}} {
131 return 1
132 } else {
133 return 0
134 }
135}
136proc load_config {include_global} {
138 global repo_config global_config default_config
139 array unset global_config
141 if {$include_global} {
142 catch {
143 set fd_rc [open "| git config --global --list" r]
144 while {[gets $fd_rc line] >= 0} {
145 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
146 if {[is_many_config $name]} {
147 lappend global_config($name) $value
148 } else {
149 set global_config($name) $value
150 }
151 }
152 }
153 close $fd_rc
154 }
155 }
156 array unset repo_config
158 catch {
159 set fd_rc [open "| git config --list" r]
160 while {[gets $fd_rc line] >= 0} {
161 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
162 if {[is_many_config $name]} {
163 lappend repo_config($name) $value
164 } else {
165 set repo_config($name) $value
166 }
167 }
168 }
169 close $fd_rc
170 }
171 foreach name [array names default_config] {
173 if {[catch {set v $global_config($name)}]} {
174 set global_config($name) $default_config($name)
175 }
176 if {[catch {set v $repo_config($name)}]} {
177 set repo_config($name) $default_config($name)
178 }
179 }
180}
181proc save_config {} {
183 global default_config font_descs
184 global repo_config global_config
185 global repo_config_new global_config_new
186 foreach option $font_descs {
188 set name [lindex $option 0]
189 set font [lindex $option 1]
190 font configure $font \
191 -family $global_config_new(gui.$font^^family) \
192 -size $global_config_new(gui.$font^^size)
193 font configure ${font}bold \
194 -family $global_config_new(gui.$font^^family) \
195 -size $global_config_new(gui.$font^^size)
196 set global_config_new(gui.$name) [font configure $font]
197 unset global_config_new(gui.$font^^family)
198 unset global_config_new(gui.$font^^size)
199 }
200 foreach name [array names default_config] {
202 set value $global_config_new($name)
203 if {$value ne $global_config($name)} {
204 if {$value eq $default_config($name)} {
205 catch {exec git config --global --unset $name}
206 } else {
207 regsub -all "\[{}\]" $value {"} value
208 exec git config --global $name $value
209 }
210 set global_config($name) $value
211 if {$value eq $repo_config($name)} {
212 catch {exec git config --unset $name}
213 set repo_config($name) $value
214 }
215 }
216 }
217 foreach name [array names default_config] {
219 set value $repo_config_new($name)
220 if {$value ne $repo_config($name)} {
221 if {$value eq $global_config($name)} {
222 catch {exec git config --unset $name}
223 } else {
224 regsub -all "\[{}\]" $value {"} value
225 exec git config $name $value
226 }
227 set repo_config($name) $value
228 }
229 }
230}
231proc error_popup {msg} {
233 set title [appname]
234 if {[reponame] ne {}} {
235 append title " ([reponame])"
236 }
237 set cmd [list tk_messageBox \
238 -icon error \
239 -type ok \
240 -title "$title: error" \
241 -message $msg]
242 if {[winfo ismapped .]} {
243 lappend cmd -parent .
244 }
245 eval $cmd
246}
247proc warn_popup {msg} {
249 set title [appname]
250 if {[reponame] ne {}} {
251 append title " ([reponame])"
252 }
253 set cmd [list tk_messageBox \
254 -icon warning \
255 -type ok \
256 -title "$title: warning" \
257 -message $msg]
258 if {[winfo ismapped .]} {
259 lappend cmd -parent .
260 }
261 eval $cmd
262}
263proc info_popup {msg {parent .}} {
265 set title [appname]
266 if {[reponame] ne {}} {
267 append title " ([reponame])"
268 }
269 tk_messageBox \
270 -parent $parent \
271 -icon info \
272 -type ok \
273 -title $title \
274 -message $msg
275}
276proc ask_popup {msg} {
278 set title [appname]
279 if {[reponame] ne {}} {
280 append title " ([reponame])"
281 }
282 return [tk_messageBox \
283 -parent . \
284 -icon question \
285 -type yesno \
286 -title $title \
287 -message $msg]
288}
289######################################################################
291##
292## repository setup
293if { [catch {set _gitdir $env(GIT_DIR)}]
295 && [catch {set _gitdir [exec git rev-parse --git-dir]} err]} {
296 catch {wm withdraw .}
297 error_popup "Cannot find the git directory:\n\n$err"
298 exit 1
299}
300if {![file isdirectory $_gitdir] && [is_Cygwin]} {
301 catch {set _gitdir [exec cygpath --unix $_gitdir]}
302}
303if {![file isdirectory $_gitdir]} {
304 catch {wm withdraw .}
305 error_popup "Git directory not found:\n\n$_gitdir"
306 exit 1
307}
308if {[lindex [file split $_gitdir] end] ne {.git}} {
309 catch {wm withdraw .}
310 error_popup "Cannot use funny .git directory:\n\n$_gitdir"
311 exit 1
312}
313if {[catch {cd [file dirname $_gitdir]} err]} {
314 catch {wm withdraw .}
315 error_popup "No working directory [file dirname $_gitdir]:\n\n$err"
316 exit 1
317}
318set _reponame [lindex [file split \
319 [file normalize [file dirname $_gitdir]]] \
320 end]
321######################################################################
323##
324## task management
325set rescan_active 0
327set diff_active 0
328set last_clicked {}
329set disable_on_lock [list]
331set index_lock_type none
332proc lock_index {type} {
334 global index_lock_type disable_on_lock
335 if {$index_lock_type eq {none}} {
337 set index_lock_type $type
338 foreach w $disable_on_lock {
339 uplevel #0 $w disabled
340 }
341 return 1
342 } elseif {$index_lock_type eq "begin-$type"} {
343 set index_lock_type $type
344 return 1
345 }
346 return 0
347}
348proc unlock_index {} {
350 global index_lock_type disable_on_lock
351 set index_lock_type none
353 foreach w $disable_on_lock {
354 uplevel #0 $w normal
355 }
356}
357######################################################################
359##
360## status
361proc repository_state {ctvar hdvar mhvar} {
363 global current_branch
364 upvar $ctvar ct $hdvar hd $mhvar mh
365 set mh [list]
367 if {[catch {set current_branch [exec git symbolic-ref HEAD]}]} {
369 set current_branch {}
370 } else {
371 regsub ^refs/((heads|tags|remotes)/)? \
372 $current_branch \
373 {} \
374 current_branch
375 }
376 if {[catch {set hd [exec git rev-parse --verify HEAD]}]} {
378 set hd {}
379 set ct initial
380 return
381 }
382 set merge_head [gitdir MERGE_HEAD]
384 if {[file exists $merge_head]} {
385 set ct merge
386 set fd_mh [open $merge_head r]
387 while {[gets $fd_mh line] >= 0} {
388 lappend mh $line
389 }
390 close $fd_mh
391 return
392 }
393 set ct normal
395}
396proc PARENT {} {
398 global PARENT empty_tree
399 set p [lindex $PARENT 0]
401 if {$p ne {}} {
402 return $p
403 }
404 if {$empty_tree eq {}} {
405 set empty_tree [exec git mktree << {}]
406 }
407 return $empty_tree
408}
409proc rescan {after {honor_trustmtime 1}} {
411 global HEAD PARENT MERGE_HEAD commit_type
412 global ui_index ui_workdir ui_status_value ui_comm
413 global rescan_active file_states
414 global repo_config
415 if {$rescan_active > 0 || ![lock_index read]} return
417 repository_state newType newHEAD newMERGE_HEAD
419 if {[string match amend* $commit_type]
420 && $newType eq {normal}
421 && $newHEAD eq $HEAD} {
422 } else {
423 set HEAD $newHEAD
424 set PARENT $newHEAD
425 set MERGE_HEAD $newMERGE_HEAD
426 set commit_type $newType
427 }
428 array unset file_states
430 if {![$ui_comm edit modified]
432 || [string trim [$ui_comm get 0.0 end]] eq {}} {
433 if {[load_message GITGUI_MSG]} {
434 } elseif {[load_message MERGE_MSG]} {
435 } elseif {[load_message SQUASH_MSG]} {
436 }
437 $ui_comm edit reset
438 $ui_comm edit modified false
439 }
440 if {[is_enabled branch]} {
442 load_all_heads
443 populate_branch_menu
444 }
445 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
447 rescan_stage2 {} $after
448 } else {
449 set rescan_active 1
450 set ui_status_value {Refreshing file status...}
451 set cmd [list git update-index]
452 lappend cmd -q
453 lappend cmd --unmerged
454 lappend cmd --ignore-missing
455 lappend cmd --refresh
456 set fd_rf [open "| $cmd" r]
457 fconfigure $fd_rf -blocking 0 -translation binary
458 fileevent $fd_rf readable \
459 [list rescan_stage2 $fd_rf $after]
460 }
461}
462proc rescan_stage2 {fd after} {
464 global ui_status_value
465 global rescan_active buf_rdi buf_rdf buf_rlo
466 if {$fd ne {}} {
468 read $fd
469 if {![eof $fd]} return
470 close $fd
471 }
472 set ls_others [list | git ls-files --others -z \
474 --exclude-per-directory=.gitignore]
475 set info_exclude [gitdir info exclude]
476 if {[file readable $info_exclude]} {
477 lappend ls_others "--exclude-from=$info_exclude"
478 }
479 set buf_rdi {}
481 set buf_rdf {}
482 set buf_rlo {}
483 set rescan_active 3
485 set ui_status_value {Scanning for modified files ...}
486 set fd_di [open "| git diff-index --cached -z [PARENT]" r]
487 set fd_df [open "| git diff-files -z" r]
488 set fd_lo [open $ls_others r]
489 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
491 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
492 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
493 fileevent $fd_di readable [list read_diff_index $fd_di $after]
494 fileevent $fd_df readable [list read_diff_files $fd_df $after]
495 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
496}
497proc load_message {file} {
499 global ui_comm
500 set f [gitdir $file]
502 if {[file isfile $f]} {
503 if {[catch {set fd [open $f r]}]} {
504 return 0
505 }
506 set content [string trim [read $fd]]
507 close $fd
508 regsub -all -line {[ \r\t]+$} $content {} content
509 $ui_comm delete 0.0 end
510 $ui_comm insert end $content
511 return 1
512 }
513 return 0
514}
515proc read_diff_index {fd after} {
517 global buf_rdi
518 append buf_rdi [read $fd]
520 set c 0
521 set n [string length $buf_rdi]
522 while {$c < $n} {
523 set z1 [string first "\0" $buf_rdi $c]
524 if {$z1 == -1} break
525 incr z1
526 set z2 [string first "\0" $buf_rdi $z1]
527 if {$z2 == -1} break
528 incr c
530 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
531 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
532 merge_state \
533 [encoding convertfrom $p] \
534 [lindex $i 4]? \
535 [list [lindex $i 0] [lindex $i 2]] \
536 [list]
537 set c $z2
538 incr c
539 }
540 if {$c < $n} {
541 set buf_rdi [string range $buf_rdi $c end]
542 } else {
543 set buf_rdi {}
544 }
545 rescan_done $fd buf_rdi $after
547}
548proc read_diff_files {fd after} {
550 global buf_rdf
551 append buf_rdf [read $fd]
553 set c 0
554 set n [string length $buf_rdf]
555 while {$c < $n} {
556 set z1 [string first "\0" $buf_rdf $c]
557 if {$z1 == -1} break
558 incr z1
559 set z2 [string first "\0" $buf_rdf $z1]
560 if {$z2 == -1} break
561 incr c
563 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
564 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
565 merge_state \
566 [encoding convertfrom $p] \
567 ?[lindex $i 4] \
568 [list] \
569 [list [lindex $i 0] [lindex $i 2]]
570 set c $z2
571 incr c
572 }
573 if {$c < $n} {
574 set buf_rdf [string range $buf_rdf $c end]
575 } else {
576 set buf_rdf {}
577 }
578 rescan_done $fd buf_rdf $after
580}
581proc read_ls_others {fd after} {
583 global buf_rlo
584 append buf_rlo [read $fd]
586 set pck [split $buf_rlo "\0"]
587 set buf_rlo [lindex $pck end]
588 foreach p [lrange $pck 0 end-1] {
589 merge_state [encoding convertfrom $p] ?O
590 }
591 rescan_done $fd buf_rlo $after
592}
593proc rescan_done {fd buf after} {
595 global rescan_active
596 global file_states repo_config
597 upvar $buf to_clear
598 if {![eof $fd]} return
600 set to_clear {}
601 close $fd
602 if {[incr rescan_active -1] > 0} return
603 prune_selection
605 unlock_index
606 display_all_files
607 reshow_diff
608 uplevel #0 $after
609}
610proc prune_selection {} {
612 global file_states selected_paths
613 foreach path [array names selected_paths] {
615 if {[catch {set still_here $file_states($path)}]} {
616 unset selected_paths($path)
617 }
618 }
619}
620######################################################################
622##
623## diff
624proc clear_diff {} {
626 global ui_diff current_diff_path current_diff_header
627 global ui_index ui_workdir
628 $ui_diff conf -state normal
630 $ui_diff delete 0.0 end
631 $ui_diff conf -state disabled
632 set current_diff_path {}
634 set current_diff_header {}
635 $ui_index tag remove in_diff 0.0 end
637 $ui_workdir tag remove in_diff 0.0 end
638}
639proc reshow_diff {} {
641 global ui_status_value file_states file_lists
642 global current_diff_path current_diff_side
643 set p $current_diff_path
645 if {$p eq {}
646 || $current_diff_side eq {}
647 || [catch {set s $file_states($p)}]
648 || [lsearch -sorted -exact $file_lists($current_diff_side) $p] == -1} {
649 clear_diff
650 } else {
651 show_diff $p $current_diff_side
652 }
653}
654proc handle_empty_diff {} {
656 global current_diff_path file_states file_lists
657 set path $current_diff_path
659 set s $file_states($path)
660 if {[lindex $s 0] ne {_M}} return
661 info_popup "No differences detected.
663[short_path $path] has no changes.
665The modification date of this file was updated
667by another application, but the content within
668the file was not changed.
669A rescan will be automatically started to find
671other files which may have the same state."
672 clear_diff
674 display_file $path __
675 rescan {set ui_status_value {Ready.}} 0
676}
677proc show_diff {path w {lno {}}} {
679 global file_states file_lists
680 global is_3way_diff diff_active repo_config
681 global ui_diff ui_status_value ui_index ui_workdir
682 global current_diff_path current_diff_side current_diff_header
683 if {$diff_active || ![lock_index read]} return
685 clear_diff
687 if {$lno == {}} {
688 set lno [lsearch -sorted -exact $file_lists($w) $path]
689 if {$lno >= 0} {
690 incr lno
691 }
692 }
693 if {$lno >= 1} {
694 $w tag add in_diff $lno.0 [expr {$lno + 1}].0
695 }
696 set s $file_states($path)
698 set m [lindex $s 0]
699 set is_3way_diff 0
700 set diff_active 1
701 set current_diff_path $path
702 set current_diff_side $w
703 set current_diff_header {}
704 set ui_status_value "Loading diff of [escape_path $path]..."
705 # - Git won't give us the diff, there's nothing to compare to!
707 #
708 if {$m eq {_O}} {
709 set max_sz [expr {128 * 1024}]
710 if {[catch {
711 set fd [open $path r]
712 set content [read $fd $max_sz]
713 close $fd
714 set sz [file size $path]
715 } err ]} {
716 set diff_active 0
717 unlock_index
718 set ui_status_value "Unable to display [escape_path $path]"
719 error_popup "Error loading file:\n\n$err"
720 return
721 }
722 $ui_diff conf -state normal
723 if {![catch {set type [exec file $path]}]} {
724 set n [string length $path]
725 if {[string equal -length $n $path $type]} {
726 set type [string range $type $n end]
727 regsub {^:?\s*} $type {} type
728 }
729 $ui_diff insert end "* $type\n" d_@
730 }
731 if {[string first "\0" $content] != -1} {
732 $ui_diff insert end \
733 "* Binary file (not showing content)." \
734 d_@
735 } else {
736 if {$sz > $max_sz} {
737 $ui_diff insert end \
738"* Untracked file is $sz bytes.
739* Showing only first $max_sz bytes.
740" d_@
741 }
742 $ui_diff insert end $content
743 if {$sz > $max_sz} {
744 $ui_diff insert end "
745* Untracked file clipped here by [appname].
746* To see the entire file, use an external editor.
747" d_@
748 }
749 }
750 $ui_diff conf -state disabled
751 set diff_active 0
752 unlock_index
753 set ui_status_value {Ready.}
754 return
755 }
756 set cmd [list | git]
758 if {$w eq $ui_index} {
759 lappend cmd diff-index
760 lappend cmd --cached
761 } elseif {$w eq $ui_workdir} {
762 if {[string index $m 0] eq {U}} {
763 lappend cmd diff
764 } else {
765 lappend cmd diff-files
766 }
767 }
768 lappend cmd -p
770 lappend cmd --no-color
771 if {$repo_config(gui.diffcontext) > 0} {
772 lappend cmd "-U$repo_config(gui.diffcontext)"
773 }
774 if {$w eq $ui_index} {
775 lappend cmd [PARENT]
776 }
777 lappend cmd --
778 lappend cmd $path
779 if {[catch {set fd [open $cmd r]} err]} {
781 set diff_active 0
782 unlock_index
783 set ui_status_value "Unable to display [escape_path $path]"
784 error_popup "Error loading diff:\n\n$err"
785 return
786 }
787 fconfigure $fd \
789 -blocking 0 \
790 -encoding binary \
791 -translation binary
792 fileevent $fd readable [list read_diff $fd]
793}
794proc read_diff {fd} {
796 global ui_diff ui_status_value diff_active
797 global is_3way_diff current_diff_header
798 $ui_diff conf -state normal
800 while {[gets $fd line] >= 0} {
801 # -- Cleanup uninteresting diff header lines.
802 #
803 if { [string match {diff --git *} $line]
804 || [string match {diff --cc *} $line]
805 || [string match {diff --combined *} $line]
806 || [string match {--- *} $line]
807 || [string match {+++ *} $line]} {
808 append current_diff_header $line "\n"
809 continue
810 }
811 if {[string match {index *} $line]} continue
812 if {$line eq {deleted file mode 120000}} {
813 set line "deleted symlink"
814 }
815 # -- Automatically detect if this is a 3 way diff.
817 #
818 if {[string match {@@@ *} $line]} {set is_3way_diff 1}
819 if {[string match {mode *} $line]
821 || [string match {new file *} $line]
822 || [string match {deleted file *} $line]
823 || [string match {Binary files * and * differ} $line]
824 || $line eq {\ No newline at end of file}
825 || [regexp {^\* Unmerged path } $line]} {
826 set tags {}
827 } elseif {$is_3way_diff} {
828 set op [string range $line 0 1]
829 switch -- $op {
830 { } {set tags {}}
831 {@@} {set tags d_@}
832 { +} {set tags d_s+}
833 { -} {set tags d_s-}
834 {+ } {set tags d_+s}
835 {- } {set tags d_-s}
836 {--} {set tags d_--}
837 {++} {
838 if {[regexp {^\+\+([<>]{7} |={7})} $line _g op]} {
839 set line [string replace $line 0 1 { }]
840 set tags d$op
841 } else {
842 set tags d_++
843 }
844 }
845 default {
846 puts "error: Unhandled 3 way diff marker: {$op}"
847 set tags {}
848 }
849 }
850 } else {
851 set op [string index $line 0]
852 switch -- $op {
853 { } {set tags {}}
854 {@} {set tags d_@}
855 {-} {set tags d_-}
856 {+} {
857 if {[regexp {^\+([<>]{7} |={7})} $line _g op]} {
858 set line [string replace $line 0 0 { }]
859 set tags d$op
860 } else {
861 set tags d_+
862 }
863 }
864 default {
865 puts "error: Unhandled 2 way diff marker: {$op}"
866 set tags {}
867 }
868 }
869 }
870 $ui_diff insert end $line $tags
871 if {[string index $line end] eq "\r"} {
872 $ui_diff tag add d_cr {end - 2c}
873 }
874 $ui_diff insert end "\n" $tags
875 }
876 $ui_diff conf -state disabled
877 if {[eof $fd]} {
879 close $fd
880 set diff_active 0
881 unlock_index
882 set ui_status_value {Ready.}
883 if {[$ui_diff index end] eq {2.0}} {
885 handle_empty_diff
886 }
887 }
888}
889proc apply_hunk {x y} {
891 global current_diff_path current_diff_header current_diff_side
892 global ui_diff ui_index file_states
893 if {$current_diff_path eq {} || $current_diff_header eq {}} return
895 if {![lock_index apply_hunk]} return
896 set apply_cmd {git apply --cached --whitespace=nowarn}
898 set mi [lindex $file_states($current_diff_path) 0]
899 if {$current_diff_side eq $ui_index} {
900 set mode unstage
901 lappend apply_cmd --reverse
902 if {[string index $mi 0] ne {M}} {
903 unlock_index
904 return
905 }
906 } else {
907 set mode stage
908 if {[string index $mi 1] ne {M}} {
909 unlock_index
910 return
911 }
912 }
913 set s_lno [lindex [split [$ui_diff index @$x,$y] .] 0]
915 set s_lno [$ui_diff search -backwards -regexp ^@@ $s_lno.0 0.0]
916 if {$s_lno eq {}} {
917 unlock_index
918 return
919 }
920 set e_lno [$ui_diff search -forwards -regexp ^@@ "$s_lno + 1 lines" end]
922 if {$e_lno eq {}} {
923 set e_lno end
924 }
925 if {[catch {
927 set p [open "| $apply_cmd" w]
928 fconfigure $p -translation binary -encoding binary
929 puts -nonewline $p $current_diff_header
930 puts -nonewline $p [$ui_diff get $s_lno $e_lno]
931 close $p} err]} {
932 error_popup "Failed to $mode selected hunk.\n\n$err"
933 unlock_index
934 return
935 }
936 $ui_diff conf -state normal
938 $ui_diff delete $s_lno $e_lno
939 $ui_diff conf -state disabled
940 if {[$ui_diff get 1.0 end] eq "\n"} {
942 set o _
943 } else {
944 set o ?
945 }
946 if {$current_diff_side eq $ui_index} {
948 set mi ${o}M
949 } elseif {[string index $mi 0] eq {_}} {
950 set mi M$o
951 } else {
952 set mi ?$o
953 }
954 unlock_index
955 display_file $current_diff_path $mi
956 if {$o eq {_}} {
957 clear_diff
958 }
959}
960######################################################################
962##
963## commit
964proc load_last_commit {} {
966 global HEAD PARENT MERGE_HEAD commit_type ui_comm
967 global repo_config
968 if {[llength $PARENT] == 0} {
970 error_popup {There is nothing to amend.
971You are about to create the initial commit.
973There is no commit before this to amend.
974}
975 return
976 }
977 repository_state curType curHEAD curMERGE_HEAD
979 if {$curType eq {merge}} {
980 error_popup {Cannot amend while merging.
981You are currently in the middle of a merge that
983has not been fully completed. You cannot amend
984the prior commit unless you first abort the
985current merge activity.
986}
987 return
988 }
989 set msg {}
991 set parents [list]
992 if {[catch {
993 set fd [open "| git cat-file commit $curHEAD" r]
994 fconfigure $fd -encoding binary -translation lf
995 if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
996 set enc utf-8
997 }
998 while {[gets $fd line] > 0} {
999 if {[string match {parent *} $line]} {
1000 lappend parents [string range $line 7 end]
1001 } elseif {[string match {encoding *} $line]} {
1002 set enc [string tolower [string range $line 9 end]]
1003 }
1004 }
1005 fconfigure $fd -encoding $enc
1006 set msg [string trim [read $fd]]
1007 close $fd
1008 } err]} {
1009 error_popup "Error loading commit data for amend:\n\n$err"
1010 return
1011 }
1012 set HEAD $curHEAD
1014 set PARENT $parents
1015 set MERGE_HEAD [list]
1016 switch -- [llength $parents] {
1017 0 {set commit_type amend-initial}
1018 1 {set commit_type amend}
1019 default {set commit_type amend-merge}
1020 }
1021 $ui_comm delete 0.0 end
1023 $ui_comm insert end $msg
1024 $ui_comm edit reset
1025 $ui_comm edit modified false
1026 rescan {set ui_status_value {Ready.}}
1027}
1028proc create_new_commit {} {
1030 global commit_type ui_comm
1031 set commit_type normal
1033 $ui_comm delete 0.0 end
1034 $ui_comm edit reset
1035 $ui_comm edit modified false
1036 rescan {set ui_status_value {Ready.}}
1037}
1038set GIT_COMMITTER_IDENT {}
1040proc committer_ident {} {
1042 global GIT_COMMITTER_IDENT
1043 if {$GIT_COMMITTER_IDENT eq {}} {
1045 if {[catch {set me [exec git var GIT_COMMITTER_IDENT]} err]} {
1046 error_popup "Unable to obtain your identity:\n\n$err"
1047 return {}
1048 }
1049 if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \
1050 $me me GIT_COMMITTER_IDENT]} {
1051 error_popup "Invalid GIT_COMMITTER_IDENT:\n\n$me"
1052 return {}
1053 }
1054 }
1055 return $GIT_COMMITTER_IDENT
1057}
1058proc commit_tree {} {
1060 global HEAD commit_type file_states ui_comm repo_config
1061 global ui_status_value pch_error
1062 if {[committer_ident] eq {}} return
1064 if {![lock_index update]} return
1065 # -- Our in memory state should match the repository.
1067 #
1068 repository_state curType curHEAD curMERGE_HEAD
1069 if {[string match amend* $commit_type]
1070 && $curType eq {normal}
1071 && $curHEAD eq $HEAD} {
1072 } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
1073 info_popup {Last scanned state does not match repository state.
1074Another Git program has modified this repository
1076since the last scan. A rescan must be performed
1077before another commit can be created.
1078The rescan will be automatically started now.
1080}
1081 unlock_index
1082 rescan {set ui_status_value {Ready.}}
1083 return
1084 }
1085 # -- At least one file should differ in the index.
1087 #
1088 set files_ready 0
1089 foreach path [array names file_states] {
1090 switch -glob -- [lindex $file_states($path) 0] {
1091 _? {continue}
1092 A? -
1093 D? -
1094 M? {set files_ready 1}
1095 U? {
1096 error_popup "Unmerged files cannot be committed.
1097File [short_path $path] has merge conflicts.
1099You must resolve them and add the file before committing.
1100"
1101 unlock_index
1102 return
1103 }
1104 default {
1105 error_popup "Unknown file state [lindex $s 0] detected.
1106File [short_path $path] cannot be committed by this program.
1108"
1109 }
1110 }
1111 }
1112 if {!$files_ready} {
1113 info_popup {No changes to commit.
1114You must add at least 1 file before you can commit.
1116}
1117 unlock_index
1118 return
1119 }
1120 # -- A message is required.
1122 #
1123 set msg [string trim [$ui_comm get 1.0 end]]
1124 regsub -all -line {[ \t\r]+$} $msg {} msg
1125 if {$msg eq {}} {
1126 error_popup {Please supply a commit message.
1127A good commit message has the following format:
1129- First line: Describe in one sentance what you did.
1131- Second line: Blank
1132- Remaining lines: Describe why this change is good.
1133}
1134 unlock_index
1135 return
1136 }
1137 # -- Run the pre-commit hook.
1139 #
1140 set pchook [gitdir hooks pre-commit]
1141 # On Cygwin [file executable] might lie so we need to ask
1143 # the shell if the hook is executable. Yes that's annoying.
1144 #
1145 if {[is_Cygwin] && [file isfile $pchook]} {
1146 set pchook [list sh -c [concat \
1147 "if test -x \"$pchook\";" \
1148 "then exec \"$pchook\" 2>&1;" \
1149 "fi"]]
1150 } elseif {[file executable $pchook]} {
1151 set pchook [list $pchook |& cat]
1152 } else {
1153 commit_writetree $curHEAD $msg
1154 return
1155 }
1156 set ui_status_value {Calling pre-commit hook...}
1158 set pch_error {}
1159 set fd_ph [open "| $pchook" r]
1160 fconfigure $fd_ph -blocking 0 -translation binary
1161 fileevent $fd_ph readable \
1162 [list commit_prehook_wait $fd_ph $curHEAD $msg]
1163}
1164proc commit_prehook_wait {fd_ph curHEAD msg} {
1166 global pch_error ui_status_value
1167 append pch_error [read $fd_ph]
1169 fconfigure $fd_ph -blocking 1
1170 if {[eof $fd_ph]} {
1171 if {[catch {close $fd_ph}]} {
1172 set ui_status_value {Commit declined by pre-commit hook.}
1173 hook_failed_popup pre-commit $pch_error
1174 unlock_index
1175 } else {
1176 commit_writetree $curHEAD $msg
1177 }
1178 set pch_error {}
1179 return
1180 }
1181 fconfigure $fd_ph -blocking 0
1182}
1183proc commit_writetree {curHEAD msg} {
1185 global ui_status_value
1186 set ui_status_value {Committing changes...}
1188 set fd_wt [open "| git write-tree" r]
1189 fileevent $fd_wt readable \
1190 [list commit_committree $fd_wt $curHEAD $msg]
1191}
1192proc commit_committree {fd_wt curHEAD msg} {
1194 global HEAD PARENT MERGE_HEAD commit_type
1195 global all_heads current_branch
1196 global ui_status_value ui_comm selected_commit_type
1197 global file_states selected_paths rescan_active
1198 global repo_config
1199 gets $fd_wt tree_id
1201 if {$tree_id eq {} || [catch {close $fd_wt} err]} {
1202 error_popup "write-tree failed:\n\n$err"
1203 set ui_status_value {Commit failed.}
1204 unlock_index
1205 return
1206 }
1207 # -- Build the message.
1209 #
1210 set msg_p [gitdir COMMIT_EDITMSG]
1211 set msg_wt [open $msg_p w]
1212 if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
1213 set enc utf-8
1214 }
1215 fconfigure $msg_wt -encoding $enc -translation binary
1216 puts -nonewline $msg_wt $msg
1217 close $msg_wt
1218 # -- Create the commit.
1220 #
1221 set cmd [list git commit-tree $tree_id]
1222 set parents [concat $PARENT $MERGE_HEAD]
1223 if {[llength $parents] > 0} {
1224 foreach p $parents {
1225 lappend cmd -p $p
1226 }
1227 } else {
1228 # git commit-tree writes to stderr during initial commit.
1229 lappend cmd 2>/dev/null
1230 }
1231 lappend cmd <$msg_p
1232 if {[catch {set cmt_id [eval exec $cmd]} err]} {
1233 error_popup "commit-tree failed:\n\n$err"
1234 set ui_status_value {Commit failed.}
1235 unlock_index
1236 return
1237 }
1238 # -- Update the HEAD ref.
1240 #
1241 set reflogm commit
1242 if {$commit_type ne {normal}} {
1243 append reflogm " ($commit_type)"
1244 }
1245 set i [string first "\n" $msg]
1246 if {$i >= 0} {
1247 append reflogm {: } [string range $msg 0 [expr {$i - 1}]]
1248 } else {
1249 append reflogm {: } $msg
1250 }
1251 set cmd [list git update-ref -m $reflogm HEAD $cmt_id $curHEAD]
1252 if {[catch {eval exec $cmd} err]} {
1253 error_popup "update-ref failed:\n\n$err"
1254 set ui_status_value {Commit failed.}
1255 unlock_index
1256 return
1257 }
1258 # -- Make sure our current branch exists.
1260 #
1261 if {$commit_type eq {initial}} {
1262 lappend all_heads $current_branch
1263 set all_heads [lsort -unique $all_heads]
1264 populate_branch_menu
1265 }
1266 # -- Cleanup after ourselves.
1268 #
1269 catch {file delete $msg_p}
1270 catch {file delete [gitdir MERGE_HEAD]}
1271 catch {file delete [gitdir MERGE_MSG]}
1272 catch {file delete [gitdir SQUASH_MSG]}
1273 catch {file delete [gitdir GITGUI_MSG]}
1274 # -- Let rerere do its thing.
1276 #
1277 if {[file isdirectory [gitdir rr-cache]]} {
1278 catch {exec git rerere}
1279 }
1280 # -- Run the post-commit hook.
1282 #
1283 set pchook [gitdir hooks post-commit]
1284 if {[is_Cygwin] && [file isfile $pchook]} {
1285 set pchook [list sh -c [concat \
1286 "if test -x \"$pchook\";" \
1287 "then exec \"$pchook\";" \
1288 "fi"]]
1289 } elseif {![file executable $pchook]} {
1290 set pchook {}
1291 }
1292 if {$pchook ne {}} {
1293 catch {exec $pchook &}
1294 }
1295 $ui_comm delete 0.0 end
1297 $ui_comm edit reset
1298 $ui_comm edit modified false
1299 if {[is_enabled singlecommit]} do_quit
1301 # -- Update in memory status
1303 #
1304 set selected_commit_type new
1305 set commit_type normal
1306 set HEAD $cmt_id
1307 set PARENT $cmt_id
1308 set MERGE_HEAD [list]
1309 foreach path [array names file_states] {
1311 set s $file_states($path)
1312 set m [lindex $s 0]
1313 switch -glob -- $m {
1314 _O -
1315 _M -
1316 _D {continue}
1317 __ -
1318 A_ -
1319 M_ -
1320 D_ {
1321 unset file_states($path)
1322 catch {unset selected_paths($path)}
1323 }
1324 DO {
1325 set file_states($path) [list _O [lindex $s 1] {} {}]
1326 }
1327 AM -
1328 AD -
1329 MM -
1330 MD {
1331 set file_states($path) [list \
1332 _[string index $m 1] \
1333 [lindex $s 1] \
1334 [lindex $s 3] \
1335 {}]
1336 }
1337 }
1338 }
1339 display_all_files
1341 unlock_index
1342 reshow_diff
1343 set ui_status_value \
1344 "Changes committed as [string range $cmt_id 0 7]."
1345}
1346######################################################################
1348##
1349## fetch push
1350proc fetch_from {remote} {
1352 set w [new_console \
1353 "fetch $remote" \
1354 "Fetching new changes from $remote"]
1355 set cmd [list git fetch]
1356 lappend cmd $remote
1357 console_exec $w $cmd console_done
1358}
1359proc push_to {remote} {
1361 set w [new_console \
1362 "push $remote" \
1363 "Pushing changes to $remote"]
1364 set cmd [list git push]
1365 lappend cmd -v
1366 lappend cmd $remote
1367 console_exec $w $cmd console_done
1368}
1369######################################################################
1371##
1372## ui helpers
1373proc mapicon {w state path} {
1375 global all_icons
1376 if {[catch {set r $all_icons($state$w)}]} {
1378 puts "error: no icon for $w state={$state} $path"
1379 return file_plain
1380 }
1381 return $r
1382}
1383proc mapdesc {state path} {
1385 global all_descs
1386 if {[catch {set r $all_descs($state)}]} {
1388 puts "error: no desc for state={$state} $path"
1389 return $state
1390 }
1391 return $r
1392}
1393proc escape_path {path} {
1395 regsub -all {\\} $path "\\\\" path
1396 regsub -all "\n" $path "\\n" path
1397 return $path
1398}
1399proc short_path {path} {
1401 return [escape_path [lindex [file split $path] end]]
1402}
1403set next_icon_id 0
1405set null_sha1 [string repeat 0 40]
1406proc merge_state {path new_state {head_info {}} {index_info {}}} {
1408 global file_states next_icon_id null_sha1
1409 set s0 [string index $new_state 0]
1411 set s1 [string index $new_state 1]
1412 if {[catch {set info $file_states($path)}]} {
1414 set state __
1415 set icon n[incr next_icon_id]
1416 } else {
1417 set state [lindex $info 0]
1418 set icon [lindex $info 1]
1419 if {$head_info eq {}} {set head_info [lindex $info 2]}
1420 if {$index_info eq {}} {set index_info [lindex $info 3]}
1421 }
1422 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1424 elseif {$s0 eq {_}} {set s0 _}
1425 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1427 elseif {$s1 eq {_}} {set s1 _}
1428 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1430 set head_info [list 0 $null_sha1]
1431 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1432 && $head_info eq {}} {
1433 set head_info $index_info
1434 }
1435 set file_states($path) [list $s0$s1 $icon \
1437 $head_info $index_info \
1438 ]
1439 return $state
1440}
1441proc display_file_helper {w path icon_name old_m new_m} {
1443 global file_lists
1444 if {$new_m eq {_}} {
1446 set lno [lsearch -sorted -exact $file_lists($w) $path]
1447 if {$lno >= 0} {
1448 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1449 incr lno
1450 $w conf -state normal
1451 $w delete $lno.0 [expr {$lno + 1}].0
1452 $w conf -state disabled
1453 }
1454 } elseif {$old_m eq {_} && $new_m ne {_}} {
1455 lappend file_lists($w) $path
1456 set file_lists($w) [lsort -unique $file_lists($w)]
1457 set lno [lsearch -sorted -exact $file_lists($w) $path]
1458 incr lno
1459 $w conf -state normal
1460 $w image create $lno.0 \
1461 -align center -padx 5 -pady 1 \
1462 -name $icon_name \
1463 -image [mapicon $w $new_m $path]
1464 $w insert $lno.1 "[escape_path $path]\n"
1465 $w conf -state disabled
1466 } elseif {$old_m ne $new_m} {
1467 $w conf -state normal
1468 $w image conf $icon_name -image [mapicon $w $new_m $path]
1469 $w conf -state disabled
1470 }
1471}
1472proc display_file {path state} {
1474 global file_states selected_paths
1475 global ui_index ui_workdir
1476 set old_m [merge_state $path $state]
1478 set s $file_states($path)
1479 set new_m [lindex $s 0]
1480 set icon_name [lindex $s 1]
1481 set o [string index $old_m 0]
1483 set n [string index $new_m 0]
1484 if {$o eq {U}} {
1485 set o _
1486 }
1487 if {$n eq {U}} {
1488 set n _
1489 }
1490 display_file_helper $ui_index $path $icon_name $o $n
1491 if {[string index $old_m 0] eq {U}} {
1493 set o U
1494 } else {
1495 set o [string index $old_m 1]
1496 }
1497 if {[string index $new_m 0] eq {U}} {
1498 set n U
1499 } else {
1500 set n [string index $new_m 1]
1501 }
1502 display_file_helper $ui_workdir $path $icon_name $o $n
1503 if {$new_m eq {__}} {
1505 unset file_states($path)
1506 catch {unset selected_paths($path)}
1507 }
1508}
1509proc display_all_files_helper {w path icon_name m} {
1511 global file_lists
1512 lappend file_lists($w) $path
1514 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1515 $w image create end \
1516 -align center -padx 5 -pady 1 \
1517 -name $icon_name \
1518 -image [mapicon $w $m $path]
1519 $w insert end "[escape_path $path]\n"
1520}
1521proc display_all_files {} {
1523 global ui_index ui_workdir
1524 global file_states file_lists
1525 global last_clicked
1526 $ui_index conf -state normal
1528 $ui_workdir conf -state normal
1529 $ui_index delete 0.0 end
1531 $ui_workdir delete 0.0 end
1532 set last_clicked {}
1533 set file_lists($ui_index) [list]
1535 set file_lists($ui_workdir) [list]
1536 foreach path [lsort [array names file_states]] {
1538 set s $file_states($path)
1539 set m [lindex $s 0]
1540 set icon_name [lindex $s 1]
1541 set s [string index $m 0]
1543 if {$s ne {U} && $s ne {_}} {
1544 display_all_files_helper $ui_index $path \
1545 $icon_name $s
1546 }
1547 if {[string index $m 0] eq {U}} {
1549 set s U
1550 } else {
1551 set s [string index $m 1]
1552 }
1553 if {$s ne {_}} {
1554 display_all_files_helper $ui_workdir $path \
1555 $icon_name $s
1556 }
1557 }
1558 $ui_index conf -state disabled
1560 $ui_workdir conf -state disabled
1561}
1562proc update_indexinfo {msg pathList after} {
1564 global update_index_cp ui_status_value
1565 if {![lock_index update]} return
1567 set update_index_cp 0
1569 set pathList [lsort $pathList]
1570 set totalCnt [llength $pathList]
1571 set batch [expr {int($totalCnt * .01) + 1}]
1572 if {$batch > 25} {set batch 25}
1573 set ui_status_value [format \
1575 "$msg... %i/%i files (%.2f%%)" \
1576 $update_index_cp \
1577 $totalCnt \
1578 0.0]
1579 set fd [open "| git update-index -z --index-info" w]
1580 fconfigure $fd \
1581 -blocking 0 \
1582 -buffering full \
1583 -buffersize 512 \
1584 -encoding binary \
1585 -translation binary
1586 fileevent $fd writable [list \
1587 write_update_indexinfo \
1588 $fd \
1589 $pathList \
1590 $totalCnt \
1591 $batch \
1592 $msg \
1593 $after \
1594 ]
1595}
1596proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
1598 global update_index_cp ui_status_value
1599 global file_states current_diff_path
1600 if {$update_index_cp >= $totalCnt} {
1602 close $fd
1603 unlock_index
1604 uplevel #0 $after
1605 return
1606 }
1607 for {set i $batch} \
1609 {$update_index_cp < $totalCnt && $i > 0} \
1610 {incr i -1} {
1611 set path [lindex $pathList $update_index_cp]
1612 incr update_index_cp
1613 set s $file_states($path)
1615 switch -glob -- [lindex $s 0] {
1616 A? {set new _O}
1617 M? {set new _M}
1618 D_ {set new _D}
1619 D? {set new _?}
1620 ?? {continue}
1621 }
1622 set info [lindex $s 2]
1623 if {$info eq {}} continue
1624 puts -nonewline $fd "$info\t[encoding convertto $path]\0"
1626 display_file $path $new
1627 }
1628 set ui_status_value [format \
1630 "$msg... %i/%i files (%.2f%%)" \
1631 $update_index_cp \
1632 $totalCnt \
1633 [expr {100.0 * $update_index_cp / $totalCnt}]]
1634}
1635proc update_index {msg pathList after} {
1637 global update_index_cp ui_status_value
1638 if {![lock_index update]} return
1640 set update_index_cp 0
1642 set pathList [lsort $pathList]
1643 set totalCnt [llength $pathList]
1644 set batch [expr {int($totalCnt * .01) + 1}]
1645 if {$batch > 25} {set batch 25}
1646 set ui_status_value [format \
1648 "$msg... %i/%i files (%.2f%%)" \
1649 $update_index_cp \
1650 $totalCnt \
1651 0.0]
1652 set fd [open "| git update-index --add --remove -z --stdin" w]
1653 fconfigure $fd \
1654 -blocking 0 \
1655 -buffering full \
1656 -buffersize 512 \
1657 -encoding binary \
1658 -translation binary
1659 fileevent $fd writable [list \
1660 write_update_index \
1661 $fd \
1662 $pathList \
1663 $totalCnt \
1664 $batch \
1665 $msg \
1666 $after \
1667 ]
1668}
1669proc write_update_index {fd pathList totalCnt batch msg after} {
1671 global update_index_cp ui_status_value
1672 global file_states current_diff_path
1673 if {$update_index_cp >= $totalCnt} {
1675 close $fd
1676 unlock_index
1677 uplevel #0 $after
1678 return
1679 }
1680 for {set i $batch} \
1682 {$update_index_cp < $totalCnt && $i > 0} \
1683 {incr i -1} {
1684 set path [lindex $pathList $update_index_cp]
1685 incr update_index_cp
1686 switch -glob -- [lindex $file_states($path) 0] {
1688 AD {set new __}
1689 ?D {set new D_}
1690 _O -
1691 AM {set new A_}
1692 U? {
1693 if {[file exists $path]} {
1694 set new M_
1695 } else {
1696 set new D_
1697 }
1698 }
1699 ?M {set new M_}
1700 ?? {continue}
1701 }
1702 puts -nonewline $fd "[encoding convertto $path]\0"
1703 display_file $path $new
1704 }
1705 set ui_status_value [format \
1707 "$msg... %i/%i files (%.2f%%)" \
1708 $update_index_cp \
1709 $totalCnt \
1710 [expr {100.0 * $update_index_cp / $totalCnt}]]
1711}
1712proc checkout_index {msg pathList after} {
1714 global update_index_cp ui_status_value
1715 if {![lock_index update]} return
1717 set update_index_cp 0
1719 set pathList [lsort $pathList]
1720 set totalCnt [llength $pathList]
1721 set batch [expr {int($totalCnt * .01) + 1}]
1722 if {$batch > 25} {set batch 25}
1723 set ui_status_value [format \
1725 "$msg... %i/%i files (%.2f%%)" \
1726 $update_index_cp \
1727 $totalCnt \
1728 0.0]
1729 set cmd [list git checkout-index]
1730 lappend cmd --index
1731 lappend cmd --quiet
1732 lappend cmd --force
1733 lappend cmd -z
1734 lappend cmd --stdin
1735 set fd [open "| $cmd " w]
1736 fconfigure $fd \
1737 -blocking 0 \
1738 -buffering full \
1739 -buffersize 512 \
1740 -encoding binary \
1741 -translation binary
1742 fileevent $fd writable [list \
1743 write_checkout_index \
1744 $fd \
1745 $pathList \
1746 $totalCnt \
1747 $batch \
1748 $msg \
1749 $after \
1750 ]
1751}
1752proc write_checkout_index {fd pathList totalCnt batch msg after} {
1754 global update_index_cp ui_status_value
1755 global file_states current_diff_path
1756 if {$update_index_cp >= $totalCnt} {
1758 close $fd
1759 unlock_index
1760 uplevel #0 $after
1761 return
1762 }
1763 for {set i $batch} \
1765 {$update_index_cp < $totalCnt && $i > 0} \
1766 {incr i -1} {
1767 set path [lindex $pathList $update_index_cp]
1768 incr update_index_cp
1769 switch -glob -- [lindex $file_states($path) 0] {
1770 U? {continue}
1771 ?M -
1772 ?D {
1773 puts -nonewline $fd "[encoding convertto $path]\0"
1774 display_file $path ?_
1775 }
1776 }
1777 }
1778 set ui_status_value [format \
1780 "$msg... %i/%i files (%.2f%%)" \
1781 $update_index_cp \
1782 $totalCnt \
1783 [expr {100.0 * $update_index_cp / $totalCnt}]]
1784}
1785######################################################################
1787##
1788## branch management
1789proc is_tracking_branch {name} {
1791 global tracking_branches
1792 if {![catch {set info $tracking_branches($name)}]} {
1794 return 1
1795 }
1796 foreach t [array names tracking_branches] {
1797 if {[string match {*/\*} $t] && [string match $t $name]} {
1798 return 1
1799 }
1800 }
1801 return 0
1802}
1803proc load_all_heads {} {
1805 global all_heads
1806 set all_heads [list]
1808 set fd [open "| git for-each-ref --format=%(refname) refs/heads" r]
1809 while {[gets $fd line] > 0} {
1810 if {[is_tracking_branch $line]} continue
1811 if {![regsub ^refs/heads/ $line {} name]} continue
1812 lappend all_heads $name
1813 }
1814 close $fd
1815 set all_heads [lsort $all_heads]
1817}
1818proc populate_branch_menu {} {
1820 global all_heads disable_on_lock
1821 set m .mbar.branch
1823 set last [$m index last]
1824 for {set i 0} {$i <= $last} {incr i} {
1825 if {[$m type $i] eq {separator}} {
1826 $m delete $i last
1827 set new_dol [list]
1828 foreach a $disable_on_lock {
1829 if {[lindex $a 0] ne $m || [lindex $a 2] < $i} {
1830 lappend new_dol $a
1831 }
1832 }
1833 set disable_on_lock $new_dol
1834 break
1835 }
1836 }
1837 if {$all_heads ne {}} {
1839 $m add separator
1840 }
1841 foreach b $all_heads {
1842 $m add radiobutton \
1843 -label $b \
1844 -command [list switch_branch $b] \
1845 -variable current_branch \
1846 -value $b \
1847 -font font_ui
1848 lappend disable_on_lock \
1849 [list $m entryconf [$m index last] -state]
1850 }
1851}
1852proc all_tracking_branches {} {
1854 global tracking_branches
1855 set all_trackings {}
1857 set cmd {}
1858 foreach name [array names tracking_branches] {
1859 if {[regsub {/\*$} $name {} name]} {
1860 lappend cmd $name
1861 } else {
1862 regsub ^refs/(heads|remotes)/ $name {} name
1863 lappend all_trackings $name
1864 }
1865 }
1866 if {$cmd ne {}} {
1868 set fd [open "| git for-each-ref --format=%(refname) $cmd" r]
1869 while {[gets $fd name] > 0} {
1870 regsub ^refs/(heads|remotes)/ $name {} name
1871 lappend all_trackings $name
1872 }
1873 close $fd
1874 }
1875 return [lsort -unique $all_trackings]
1877}
1878proc do_create_branch_action {w} {
1880 global all_heads null_sha1 repo_config
1881 global create_branch_checkout create_branch_revtype
1882 global create_branch_head create_branch_trackinghead
1883 global create_branch_name create_branch_revexp
1884 set newbranch $create_branch_name
1886 if {$newbranch eq {}
1887 || $newbranch eq $repo_config(gui.newbranchtemplate)} {
1888 tk_messageBox \
1889 -icon error \
1890 -type ok \
1891 -title [wm title $w] \
1892 -parent $w \
1893 -message "Please supply a branch name."
1894 focus $w.desc.name_t
1895 return
1896 }
1897 if {![catch {exec git show-ref --verify -- "refs/heads/$newbranch"}]} {
1898 tk_messageBox \
1899 -icon error \
1900 -type ok \
1901 -title [wm title $w] \
1902 -parent $w \
1903 -message "Branch '$newbranch' already exists."
1904 focus $w.desc.name_t
1905 return
1906 }
1907 if {[catch {exec git check-ref-format "heads/$newbranch"}]} {
1908 tk_messageBox \
1909 -icon error \
1910 -type ok \
1911 -title [wm title $w] \
1912 -parent $w \
1913 -message "We do not like '$newbranch' as a branch name."
1914 focus $w.desc.name_t
1915 return
1916 }
1917 set rev {}
1919 switch -- $create_branch_revtype {
1920 head {set rev $create_branch_head}
1921 tracking {set rev $create_branch_trackinghead}
1922 expression {set rev $create_branch_revexp}
1923 }
1924 if {[catch {set cmt [exec git rev-parse --verify "${rev}^0"]}]} {
1925 tk_messageBox \
1926 -icon error \
1927 -type ok \
1928 -title [wm title $w] \
1929 -parent $w \
1930 -message "Invalid starting revision: $rev"
1931 return
1932 }
1933 set cmd [list git update-ref]
1934 lappend cmd -m
1935 lappend cmd "branch: Created from $rev"
1936 lappend cmd "refs/heads/$newbranch"
1937 lappend cmd $cmt
1938 lappend cmd $null_sha1
1939 if {[catch {eval exec $cmd} err]} {
1940 tk_messageBox \
1941 -icon error \
1942 -type ok \
1943 -title [wm title $w] \
1944 -parent $w \
1945 -message "Failed to create '$newbranch'.\n\n$err"
1946 return
1947 }
1948 lappend all_heads $newbranch
1950 set all_heads [lsort $all_heads]
1951 populate_branch_menu
1952 destroy $w
1953 if {$create_branch_checkout} {
1954 switch_branch $newbranch
1955 }
1956}
1957proc radio_selector {varname value args} {
1959 upvar #0 $varname var
1960 set var $value
1961}
1962trace add variable create_branch_head write \
1964 [list radio_selector create_branch_revtype head]
1965trace add variable create_branch_trackinghead write \
1966 [list radio_selector create_branch_revtype tracking]
1967trace add variable delete_branch_head write \
1969 [list radio_selector delete_branch_checktype head]
1970trace add variable delete_branch_trackinghead write \
1971 [list radio_selector delete_branch_checktype tracking]
1972proc do_create_branch {} {
1974 global all_heads current_branch repo_config
1975 global create_branch_checkout create_branch_revtype
1976 global create_branch_head create_branch_trackinghead
1977 global create_branch_name create_branch_revexp
1978 set w .branch_editor
1980 toplevel $w
1981 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
1982 label $w.header -text {Create New Branch} \
1984 -font font_uibold
1985 pack $w.header -side top -fill x
1986 frame $w.buttons
1988 button $w.buttons.create -text Create \
1989 -font font_ui \
1990 -default active \
1991 -command [list do_create_branch_action $w]
1992 pack $w.buttons.create -side right
1993 button $w.buttons.cancel -text {Cancel} \
1994 -font font_ui \
1995 -command [list destroy $w]
1996 pack $w.buttons.cancel -side right -padx 5
1997 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
1998 labelframe $w.desc \
2000 -text {Branch Description} \
2001 -font font_ui
2002 label $w.desc.name_l -text {Name:} -font font_ui
2003 entry $w.desc.name_t \
2004 -borderwidth 1 \
2005 -relief sunken \
2006 -width 40 \
2007 -textvariable create_branch_name \
2008 -font font_ui \
2009 -validate key \
2010 -validatecommand {
2011 if {%d == 1 && [regexp {[~^:?*\[\0- ]} %S]} {return 0}
2012 return 1
2013 }
2014 grid $w.desc.name_l $w.desc.name_t -sticky we -padx {0 5}
2015 grid columnconfigure $w.desc 1 -weight 1
2016 pack $w.desc -anchor nw -fill x -pady 5 -padx 5
2017 labelframe $w.from \
2019 -text {Starting Revision} \
2020 -font font_ui
2021 radiobutton $w.from.head_r \
2022 -text {Local Branch:} \
2023 -value head \
2024 -variable create_branch_revtype \
2025 -font font_ui
2026 eval tk_optionMenu $w.from.head_m create_branch_head $all_heads
2027 grid $w.from.head_r $w.from.head_m -sticky w
2028 set all_trackings [all_tracking_branches]
2029 if {$all_trackings ne {}} {
2030 set create_branch_trackinghead [lindex $all_trackings 0]
2031 radiobutton $w.from.tracking_r \
2032 -text {Tracking Branch:} \
2033 -value tracking \
2034 -variable create_branch_revtype \
2035 -font font_ui
2036 eval tk_optionMenu $w.from.tracking_m \
2037 create_branch_trackinghead \
2038 $all_trackings
2039 grid $w.from.tracking_r $w.from.tracking_m -sticky w
2040 }
2041 radiobutton $w.from.exp_r \
2042 -text {Revision Expression:} \
2043 -value expression \
2044 -variable create_branch_revtype \
2045 -font font_ui
2046 entry $w.from.exp_t \
2047 -borderwidth 1 \
2048 -relief sunken \
2049 -width 50 \
2050 -textvariable create_branch_revexp \
2051 -font font_ui \
2052 -validate key \
2053 -validatecommand {
2054 if {%d == 1 && [regexp {\s} %S]} {return 0}
2055 if {%d == 1 && [string length %S] > 0} {
2056 set create_branch_revtype expression
2057 }
2058 return 1
2059 }
2060 grid $w.from.exp_r $w.from.exp_t -sticky we -padx {0 5}
2061 grid columnconfigure $w.from 1 -weight 1
2062 pack $w.from -anchor nw -fill x -pady 5 -padx 5
2063 labelframe $w.postActions \
2065 -text {Post Creation Actions} \
2066 -font font_ui
2067 checkbutton $w.postActions.checkout \
2068 -text {Checkout after creation} \
2069 -variable create_branch_checkout \
2070 -font font_ui
2071 pack $w.postActions.checkout -anchor nw
2072 pack $w.postActions -anchor nw -fill x -pady 5 -padx 5
2073 set create_branch_checkout 1
2075 set create_branch_head $current_branch
2076 set create_branch_revtype head
2077 set create_branch_name $repo_config(gui.newbranchtemplate)
2078 set create_branch_revexp {}
2079 bind $w <Visibility> "
2081 grab $w
2082 $w.desc.name_t icursor end
2083 focus $w.desc.name_t
2084 "
2085 bind $w <Key-Escape> "destroy $w"
2086 bind $w <Key-Return> "do_create_branch_action $w;break"
2087 wm title $w "[appname] ([reponame]): Create Branch"
2088 tkwait window $w
2089}
2090proc do_delete_branch_action {w} {
2092 global all_heads
2093 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
2094 set check_rev {}
2096 switch -- $delete_branch_checktype {
2097 head {set check_rev $delete_branch_head}
2098 tracking {set check_rev $delete_branch_trackinghead}
2099 always {set check_rev {:none}}
2100 }
2101 if {$check_rev eq {:none}} {
2102 set check_cmt {}
2103 } elseif {[catch {set check_cmt [exec git rev-parse --verify "${check_rev}^0"]}]} {
2104 tk_messageBox \
2105 -icon error \
2106 -type ok \
2107 -title [wm title $w] \
2108 -parent $w \
2109 -message "Invalid check revision: $check_rev"
2110 return
2111 }
2112 set to_delete [list]
2114 set not_merged [list]
2115 foreach i [$w.list.l curselection] {
2116 set b [$w.list.l get $i]
2117 if {[catch {set o [exec git rev-parse --verify $b]}]} continue
2118 if {$check_cmt ne {}} {
2119 if {$b eq $check_rev} continue
2120 if {[catch {set m [exec git merge-base $o $check_cmt]}]} continue
2121 if {$o ne $m} {
2122 lappend not_merged $b
2123 continue
2124 }
2125 }
2126 lappend to_delete [list $b $o]
2127 }
2128 if {$not_merged ne {}} {
2129 set msg "The following branches are not completely merged into $check_rev:
2130 - [join $not_merged "\n - "]"
2132 tk_messageBox \
2133 -icon info \
2134 -type ok \
2135 -title [wm title $w] \
2136 -parent $w \
2137 -message $msg
2138 }
2139 if {$to_delete eq {}} return
2140 if {$delete_branch_checktype eq {always}} {
2141 set msg {Recovering deleted branches is difficult.
2142Delete the selected branches?}
2144 if {[tk_messageBox \
2145 -icon warning \
2146 -type yesno \
2147 -title [wm title $w] \
2148 -parent $w \
2149 -message $msg] ne yes} {
2150 return
2151 }
2152 }
2153 set failed {}
2155 foreach i $to_delete {
2156 set b [lindex $i 0]
2157 set o [lindex $i 1]
2158 if {[catch {exec git update-ref -d "refs/heads/$b" $o} err]} {
2159 append failed " - $b: $err\n"
2160 } else {
2161 set x [lsearch -sorted -exact $all_heads $b]
2162 if {$x >= 0} {
2163 set all_heads [lreplace $all_heads $x $x]
2164 }
2165 }
2166 }
2167 if {$failed ne {}} {
2169 tk_messageBox \
2170 -icon error \
2171 -type ok \
2172 -title [wm title $w] \
2173 -parent $w \
2174 -message "Failed to delete branches:\n$failed"
2175 }
2176 set all_heads [lsort $all_heads]
2178 populate_branch_menu
2179 destroy $w
2180}
2181proc do_delete_branch {} {
2183 global all_heads tracking_branches current_branch
2184 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
2185 set w .branch_editor
2187 toplevel $w
2188 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2189 label $w.header -text {Delete Local Branch} \
2191 -font font_uibold
2192 pack $w.header -side top -fill x
2193 frame $w.buttons
2195 button $w.buttons.create -text Delete \
2196 -font font_ui \
2197 -command [list do_delete_branch_action $w]
2198 pack $w.buttons.create -side right
2199 button $w.buttons.cancel -text {Cancel} \
2200 -font font_ui \
2201 -command [list destroy $w]
2202 pack $w.buttons.cancel -side right -padx 5
2203 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2204 labelframe $w.list \
2206 -text {Local Branches} \
2207 -font font_ui
2208 listbox $w.list.l \
2209 -height 10 \
2210 -width 70 \
2211 -selectmode extended \
2212 -yscrollcommand [list $w.list.sby set] \
2213 -font font_ui
2214 foreach h $all_heads {
2215 if {$h ne $current_branch} {
2216 $w.list.l insert end $h
2217 }
2218 }
2219 scrollbar $w.list.sby -command [list $w.list.l yview]
2220 pack $w.list.sby -side right -fill y
2221 pack $w.list.l -side left -fill both -expand 1
2222 pack $w.list -fill both -expand 1 -pady 5 -padx 5
2223 labelframe $w.validate \
2225 -text {Delete Only If} \
2226 -font font_ui
2227 radiobutton $w.validate.head_r \
2228 -text {Merged Into Local Branch:} \
2229 -value head \
2230 -variable delete_branch_checktype \
2231 -font font_ui
2232 eval tk_optionMenu $w.validate.head_m delete_branch_head $all_heads
2233 grid $w.validate.head_r $w.validate.head_m -sticky w
2234 set all_trackings [all_tracking_branches]
2235 if {$all_trackings ne {}} {
2236 set delete_branch_trackinghead [lindex $all_trackings 0]
2237 radiobutton $w.validate.tracking_r \
2238 -text {Merged Into Tracking Branch:} \
2239 -value tracking \
2240 -variable delete_branch_checktype \
2241 -font font_ui
2242 eval tk_optionMenu $w.validate.tracking_m \
2243 delete_branch_trackinghead \
2244 $all_trackings
2245 grid $w.validate.tracking_r $w.validate.tracking_m -sticky w
2246 }
2247 radiobutton $w.validate.always_r \
2248 -text {Always (Do not perform merge checks)} \
2249 -value always \
2250 -variable delete_branch_checktype \
2251 -font font_ui
2252 grid $w.validate.always_r -columnspan 2 -sticky w
2253 grid columnconfigure $w.validate 1 -weight 1
2254 pack $w.validate -anchor nw -fill x -pady 5 -padx 5
2255 set delete_branch_head $current_branch
2257 set delete_branch_checktype head
2258 bind $w <Visibility> "grab $w; focus $w"
2260 bind $w <Key-Escape> "destroy $w"
2261 wm title $w "[appname] ([reponame]): Delete Branch"
2262 tkwait window $w
2263}
2264proc switch_branch {new_branch} {
2266 global HEAD commit_type current_branch repo_config
2267 if {![lock_index switch]} return
2269 # -- Our in memory state should match the repository.
2271 #
2272 repository_state curType curHEAD curMERGE_HEAD
2273 if {[string match amend* $commit_type]
2274 && $curType eq {normal}
2275 && $curHEAD eq $HEAD} {
2276 } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
2277 info_popup {Last scanned state does not match repository state.
2278Another Git program has modified this repository
2280since the last scan. A rescan must be performed
2281before the current branch can be changed.
2282The rescan will be automatically started now.
2284}
2285 unlock_index
2286 rescan {set ui_status_value {Ready.}}
2287 return
2288 }
2289 # -- Don't do a pointless switch.
2291 #
2292 if {$current_branch eq $new_branch} {
2293 unlock_index
2294 return
2295 }
2296 if {$repo_config(gui.trustmtime) eq {true}} {
2298 switch_branch_stage2 {} $new_branch
2299 } else {
2300 set ui_status_value {Refreshing file status...}
2301 set cmd [list git update-index]
2302 lappend cmd -q
2303 lappend cmd --unmerged
2304 lappend cmd --ignore-missing
2305 lappend cmd --refresh
2306 set fd_rf [open "| $cmd" r]
2307 fconfigure $fd_rf -blocking 0 -translation binary
2308 fileevent $fd_rf readable \
2309 [list switch_branch_stage2 $fd_rf $new_branch]
2310 }
2311}
2312proc switch_branch_stage2 {fd_rf new_branch} {
2314 global ui_status_value HEAD
2315 if {$fd_rf ne {}} {
2317 read $fd_rf
2318 if {![eof $fd_rf]} return
2319 close $fd_rf
2320 }
2321 set ui_status_value "Updating working directory to '$new_branch'..."
2323 set cmd [list git read-tree]
2324 lappend cmd -m
2325 lappend cmd -u
2326 lappend cmd --exclude-per-directory=.gitignore
2327 lappend cmd $HEAD
2328 lappend cmd $new_branch
2329 set fd_rt [open "| $cmd" r]
2330 fconfigure $fd_rt -blocking 0 -translation binary
2331 fileevent $fd_rt readable \
2332 [list switch_branch_readtree_wait $fd_rt $new_branch]
2333}
2334proc switch_branch_readtree_wait {fd_rt new_branch} {
2336 global selected_commit_type commit_type HEAD MERGE_HEAD PARENT
2337 global current_branch
2338 global ui_comm ui_status_value
2339 # -- We never get interesting output on stdout; only stderr.
2341 #
2342 read $fd_rt
2343 fconfigure $fd_rt -blocking 1
2344 if {![eof $fd_rt]} {
2345 fconfigure $fd_rt -blocking 0
2346 return
2347 }
2348 # -- The working directory wasn't in sync with the index and
2350 # we'd have to overwrite something to make the switch. A
2351 # merge is required.
2352 #
2353 if {[catch {close $fd_rt} err]} {
2354 regsub {^fatal: } $err {} err
2355 warn_popup "File level merge required.
2356$err
2358Staying on branch '$current_branch'."
2360 set ui_status_value "Aborted checkout of '$new_branch' (file level merging is required)."
2361 unlock_index
2362 return
2363 }
2364 # -- Update the symbolic ref. Core git doesn't even check for failure
2366 # here, it Just Works(tm). If it doesn't we are in some really ugly
2367 # state that is difficult to recover from within git-gui.
2368 #
2369 if {[catch {exec git symbolic-ref HEAD "refs/heads/$new_branch"} err]} {
2370 error_popup "Failed to set current branch.
2371This working directory is only partially switched.
2373We successfully updated your files, but failed to
2374update an internal Git file.
2375This should not have occurred. [appname] will now
2377close and give up.
2378$err"
2380 do_quit
2381 return
2382 }
2383 # -- Update our repository state. If we were previously in amend mode
2385 # we need to toss the current buffer and do a full rescan to update
2386 # our file lists. If we weren't in amend mode our file lists are
2387 # accurate and we can avoid the rescan.
2388 #
2389 unlock_index
2390 set selected_commit_type new
2391 if {[string match amend* $commit_type]} {
2392 $ui_comm delete 0.0 end
2393 $ui_comm edit reset
2394 $ui_comm edit modified false
2395 rescan {set ui_status_value "Checked out branch '$current_branch'."}
2396 } else {
2397 repository_state commit_type HEAD MERGE_HEAD
2398 set PARENT $HEAD
2399 set ui_status_value "Checked out branch '$current_branch'."
2400 }
2401}
2402######################################################################
2404##
2405## remote management
2406proc load_all_remotes {} {
2408 global repo_config
2409 global all_remotes tracking_branches
2410 set all_remotes [list]
2412 array unset tracking_branches
2413 set rm_dir [gitdir remotes]
2415 if {[file isdirectory $rm_dir]} {
2416 set all_remotes [glob \
2417 -types f \
2418 -tails \
2419 -nocomplain \
2420 -directory $rm_dir *]
2421 foreach name $all_remotes {
2423 catch {
2424 set fd [open [file join $rm_dir $name] r]
2425 while {[gets $fd line] >= 0} {
2426 if {![regexp {^Pull:[ ]*([^:]+):(.+)$} \
2427 $line line src dst]} continue
2428 if {![regexp ^refs/ $dst]} {
2429 set dst "refs/heads/$dst"
2430 }
2431 set tracking_branches($dst) [list $name $src]
2432 }
2433 close $fd
2434 }
2435 }
2436 }
2437 foreach line [array names repo_config remote.*.url] {
2439 if {![regexp ^remote\.(.*)\.url\$ $line line name]} continue
2440 lappend all_remotes $name
2441 if {[catch {set fl $repo_config(remote.$name.fetch)}]} {
2443 set fl {}
2444 }
2445 foreach line $fl {
2446 if {![regexp {^([^:]+):(.+)$} $line line src dst]} continue
2447 if {![regexp ^refs/ $dst]} {
2448 set dst "refs/heads/$dst"
2449 }
2450 set tracking_branches($dst) [list $name $src]
2451 }
2452 }
2453 set all_remotes [lsort -unique $all_remotes]
2455}
2456proc populate_fetch_menu {} {
2458 global all_remotes repo_config
2459 set m .mbar.fetch
2461 foreach r $all_remotes {
2462 set enable 0
2463 if {![catch {set a $repo_config(remote.$r.url)}]} {
2464 if {![catch {set a $repo_config(remote.$r.fetch)}]} {
2465 set enable 1
2466 }
2467 } else {
2468 catch {
2469 set fd [open [gitdir remotes $r] r]
2470 while {[gets $fd n] >= 0} {
2471 if {[regexp {^Pull:[ \t]*([^:]+):} $n]} {
2472 set enable 1
2473 break
2474 }
2475 }
2476 close $fd
2477 }
2478 }
2479 if {$enable} {
2481 $m add command \
2482 -label "Fetch from $r..." \
2483 -command [list fetch_from $r] \
2484 -font font_ui
2485 }
2486 }
2487}
2488proc populate_push_menu {} {
2490 global all_remotes repo_config
2491 set m .mbar.push
2493 set fast_count 0
2494 foreach r $all_remotes {
2495 set enable 0
2496 if {![catch {set a $repo_config(remote.$r.url)}]} {
2497 if {![catch {set a $repo_config(remote.$r.push)}]} {
2498 set enable 1
2499 }
2500 } else {
2501 catch {
2502 set fd [open [gitdir remotes $r] r]
2503 while {[gets $fd n] >= 0} {
2504 if {[regexp {^Push:[ \t]*([^:]+):} $n]} {
2505 set enable 1
2506 break
2507 }
2508 }
2509 close $fd
2510 }
2511 }
2512 if {$enable} {
2514 if {!$fast_count} {
2515 $m add separator
2516 }
2517 $m add command \
2518 -label "Push to $r..." \
2519 -command [list push_to $r] \
2520 -font font_ui
2521 incr fast_count
2522 }
2523 }
2524}
2525proc start_push_anywhere_action {w} {
2527 global push_urltype push_remote push_url push_thin push_tags
2528 set r_url {}
2530 switch -- $push_urltype {
2531 remote {set r_url $push_remote}
2532 url {set r_url $push_url}
2533 }
2534 if {$r_url eq {}} return
2535 set cmd [list git push]
2537 lappend cmd -v
2538 if {$push_thin} {
2539 lappend cmd --thin
2540 }
2541 if {$push_tags} {
2542 lappend cmd --tags
2543 }
2544 lappend cmd $r_url
2545 set cnt 0
2546 foreach i [$w.source.l curselection] {
2547 set b [$w.source.l get $i]
2548 lappend cmd "refs/heads/$b:refs/heads/$b"
2549 incr cnt
2550 }
2551 if {$cnt == 0} {
2552 return
2553 } elseif {$cnt == 1} {
2554 set unit branch
2555 } else {
2556 set unit branches
2557 }
2558 set cons [new_console "push $r_url" "Pushing $cnt $unit to $r_url"]
2560 console_exec $cons $cmd console_done
2561 destroy $w
2562}
2563trace add variable push_remote write \
2565 [list radio_selector push_urltype remote]
2566proc do_push_anywhere {} {
2568 global all_heads all_remotes current_branch
2569 global push_urltype push_remote push_url push_thin push_tags
2570 set w .push_setup
2572 toplevel $w
2573 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2574 label $w.header -text {Push Branches} -font font_uibold
2576 pack $w.header -side top -fill x
2577 frame $w.buttons
2579 button $w.buttons.create -text Push \
2580 -font font_ui \
2581 -command [list start_push_anywhere_action $w]
2582 pack $w.buttons.create -side right
2583 button $w.buttons.cancel -text {Cancel} \
2584 -font font_ui \
2585 -command [list destroy $w]
2586 pack $w.buttons.cancel -side right -padx 5
2587 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2588 labelframe $w.source \
2590 -text {Source Branches} \
2591 -font font_ui
2592 listbox $w.source.l \
2593 -height 10 \
2594 -width 70 \
2595 -selectmode extended \
2596 -yscrollcommand [list $w.source.sby set] \
2597 -font font_ui
2598 foreach h $all_heads {
2599 $w.source.l insert end $h
2600 if {$h eq $current_branch} {
2601 $w.source.l select set end
2602 }
2603 }
2604 scrollbar $w.source.sby -command [list $w.source.l yview]
2605 pack $w.source.sby -side right -fill y
2606 pack $w.source.l -side left -fill both -expand 1
2607 pack $w.source -fill both -expand 1 -pady 5 -padx 5
2608 labelframe $w.dest \
2610 -text {Destination Repository} \
2611 -font font_ui
2612 if {$all_remotes ne {}} {
2613 radiobutton $w.dest.remote_r \
2614 -text {Remote:} \
2615 -value remote \
2616 -variable push_urltype \
2617 -font font_ui
2618 eval tk_optionMenu $w.dest.remote_m push_remote $all_remotes
2619 grid $w.dest.remote_r $w.dest.remote_m -sticky w
2620 if {[lsearch -sorted -exact $all_remotes origin] != -1} {
2621 set push_remote origin
2622 } else {
2623 set push_remote [lindex $all_remotes 0]
2624 }
2625 set push_urltype remote
2626 } else {
2627 set push_urltype url
2628 }
2629 radiobutton $w.dest.url_r \
2630 -text {Arbitrary URL:} \
2631 -value url \
2632 -variable push_urltype \
2633 -font font_ui
2634 entry $w.dest.url_t \
2635 -borderwidth 1 \
2636 -relief sunken \
2637 -width 50 \
2638 -textvariable push_url \
2639 -font font_ui \
2640 -validate key \
2641 -validatecommand {
2642 if {%d == 1 && [regexp {\s} %S]} {return 0}
2643 if {%d == 1 && [string length %S] > 0} {
2644 set push_urltype url
2645 }
2646 return 1
2647 }
2648 grid $w.dest.url_r $w.dest.url_t -sticky we -padx {0 5}
2649 grid columnconfigure $w.dest 1 -weight 1
2650 pack $w.dest -anchor nw -fill x -pady 5 -padx 5
2651 labelframe $w.options \
2653 -text {Transfer Options} \
2654 -font font_ui
2655 checkbutton $w.options.thin \
2656 -text {Use thin pack (for slow network connections)} \
2657 -variable push_thin \
2658 -font font_ui
2659 grid $w.options.thin -columnspan 2 -sticky w
2660 checkbutton $w.options.tags \
2661 -text {Include tags} \
2662 -variable push_tags \
2663 -font font_ui
2664 grid $w.options.tags -columnspan 2 -sticky w
2665 grid columnconfigure $w.options 1 -weight 1
2666 pack $w.options -anchor nw -fill x -pady 5 -padx 5
2667 set push_url {}
2669 set push_thin 0
2670 set push_tags 0
2671 bind $w <Visibility> "grab $w"
2673 bind $w <Key-Escape> "destroy $w"
2674 wm title $w "[appname] ([reponame]): Push"
2675 tkwait window $w
2676}
2677######################################################################
2679##
2680## merge
2681proc can_merge {} {
2683 global HEAD commit_type file_states
2684 if {[string match amend* $commit_type]} {
2686 info_popup {Cannot merge while amending.
2687You must finish amending this commit before
2689starting any type of merge.
2690}
2691 return 0
2692 }
2693 if {[committer_ident] eq {}} {return 0}
2695 if {![lock_index merge]} {return 0}
2696 # -- Our in memory state should match the repository.
2698 #
2699 repository_state curType curHEAD curMERGE_HEAD
2700 if {$commit_type ne $curType || $HEAD ne $curHEAD} {
2701 info_popup {Last scanned state does not match repository state.
2702Another Git program has modified this repository
2704since the last scan. A rescan must be performed
2705before a merge can be performed.
2706The rescan will be automatically started now.
2708}
2709 unlock_index
2710 rescan {set ui_status_value {Ready.}}
2711 return 0
2712 }
2713 foreach path [array names file_states] {
2715 switch -glob -- [lindex $file_states($path) 0] {
2716 _O {
2717 continue; # and pray it works!
2718 }
2719 U? {
2720 error_popup "You are in the middle of a conflicted merge.
2721File [short_path $path] has merge conflicts.
2723You must resolve them, add the file, and commit to
2725complete the current merge. Only then can you
2726begin another merge.
2727"
2728 unlock_index
2729 return 0
2730 }
2731 ?? {
2732 error_popup "You are in the middle of a change.
2733File [short_path $path] is modified.
2735You should complete the current commit before
2737starting a merge. Doing so will help you abort
2738a failed merge, should the need arise.
2739"
2740 unlock_index
2741 return 0
2742 }
2743 }
2744 }
2745 return 1
2747}
2748proc visualize_local_merge {w} {
2750 set revs {}
2751 foreach i [$w.source.l curselection] {
2752 lappend revs [$w.source.l get $i]
2753 }
2754 if {$revs eq {}} return
2755 lappend revs --not HEAD
2756 do_gitk $revs
2757}
2758proc start_local_merge_action {w} {
2760 global HEAD ui_status_value current_branch
2761 set cmd [list git merge]
2763 set names {}
2764 set revcnt 0
2765 foreach i [$w.source.l curselection] {
2766 set b [$w.source.l get $i]
2767 lappend cmd $b
2768 lappend names $b
2769 incr revcnt
2770 }
2771 if {$revcnt == 0} {
2773 return
2774 } elseif {$revcnt == 1} {
2775 set unit branch
2776 } elseif {$revcnt <= 15} {
2777 set unit branches
2778 } else {
2779 tk_messageBox \
2780 -icon error \
2781 -type ok \
2782 -title [wm title $w] \
2783 -parent $w \
2784 -message "Too many branches selected.
2785You have requested to merge $revcnt branches
2787in an octopus merge. This exceeds Git's
2788internal limit of 15 branches per merge.
2789Please select fewer branches. To merge more
2791than 15 branches, merge the branches in batches.
2792"
2793 return
2794 }
2795 set msg "Merging $current_branch, [join $names {, }]"
2797 set ui_status_value "$msg..."
2798 set cons [new_console "Merge" $msg]
2799 console_exec $cons $cmd [list finish_merge $revcnt]
2800 bind $w <Destroy> {}
2801 destroy $w
2802}
2803proc finish_merge {revcnt w ok} {
2805 console_done $w $ok
2806 if {$ok} {
2807 set msg {Merge completed successfully.}
2808 } else {
2809 if {$revcnt != 1} {
2810 info_popup "Octopus merge failed.
2811Your merge of $revcnt branches has failed.
2813There are file-level conflicts between the
2815branches which must be resolved manually.
2816The working directory will now be reset.
2818You can attempt this merge again
2820by merging only one branch at a time." $w
2821 set fd [open "| git read-tree --reset -u HEAD" r]
2823 fconfigure $fd -blocking 0 -translation binary
2824 fileevent $fd readable [list reset_hard_wait $fd]
2825 set ui_status_value {Aborting... please wait...}
2826 return
2827 }
2828 set msg {Merge failed. Conflict resolution is required.}
2830 }
2831 unlock_index
2832 rescan [list set ui_status_value $msg]
2833}
2834proc do_local_merge {} {
2836 global current_branch
2837 if {![can_merge]} return
2839 set w .merge_setup
2841 toplevel $w
2842 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2843 label $w.header \
2845 -text "Merge Into $current_branch" \
2846 -font font_uibold
2847 pack $w.header -side top -fill x
2848 frame $w.buttons
2850 button $w.buttons.visualize -text Visualize \
2851 -font font_ui \
2852 -command [list visualize_local_merge $w]
2853 pack $w.buttons.visualize -side left
2854 button $w.buttons.create -text Merge \
2855 -font font_ui \
2856 -command [list start_local_merge_action $w]
2857 pack $w.buttons.create -side right
2858 button $w.buttons.cancel -text {Cancel} \
2859 -font font_ui \
2860 -command [list destroy $w]
2861 pack $w.buttons.cancel -side right -padx 5
2862 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2863 labelframe $w.source \
2865 -text {Source Branches} \
2866 -font font_ui
2867 listbox $w.source.l \
2868 -height 10 \
2869 -width 70 \
2870 -selectmode extended \
2871 -yscrollcommand [list $w.source.sby set] \
2872 -font font_ui
2873 scrollbar $w.source.sby -command [list $w.source.l yview]
2874 pack $w.source.sby -side right -fill y
2875 pack $w.source.l -side left -fill both -expand 1
2876 pack $w.source -fill both -expand 1 -pady 5 -padx 5
2877 set cmd [list git for-each-ref]
2879 lappend cmd {--format=%(objectname) %(refname)}
2880 lappend cmd refs/heads
2881 lappend cmd refs/remotes
2882 set fr_fd [open "| $cmd" r]
2883 fconfigure $fr_fd -translation binary
2884 while {[gets $fr_fd line] > 0} {
2885 set line [split $line { }]
2886 set sha1([lindex $line 0]) [lindex $line 1]
2887 }
2888 close $fr_fd
2889 set to_show {}
2891 set fr_fd [open "| git rev-list --all --not HEAD"]
2892 while {[gets $fr_fd line] > 0} {
2893 if {[catch {set ref $sha1($line)}]} continue
2894 regsub ^refs/(heads|remotes)/ $ref {} ref
2895 lappend to_show $ref
2896 }
2897 close $fr_fd
2898 foreach ref [lsort -unique $to_show] {
2900 $w.source.l insert end $ref
2901 }
2902 bind $w <Visibility> "grab $w"
2904 bind $w <Key-Escape> "unlock_index;destroy $w"
2905 bind $w <Destroy> unlock_index
2906 wm title $w "[appname] ([reponame]): Merge"
2907 tkwait window $w
2908}
2909proc do_reset_hard {} {
2911 global HEAD commit_type file_states
2912 if {[string match amend* $commit_type]} {
2914 info_popup {Cannot abort while amending.
2915You must finish amending this commit.
2917}
2918 return
2919 }
2920 if {![lock_index abort]} return
2922 if {[string match *merge* $commit_type]} {
2924 set op merge
2925 } else {
2926 set op commit
2927 }
2928 if {[ask_popup "Abort $op?
2930Aborting the current $op will cause
2932*ALL* uncommitted changes to be lost.
2933Continue with aborting the current $op?"] eq {yes}} {
2935 set fd [open "| git read-tree --reset -u HEAD" r]
2936 fconfigure $fd -blocking 0 -translation binary
2937 fileevent $fd readable [list reset_hard_wait $fd]
2938 set ui_status_value {Aborting... please wait...}
2939 } else {
2940 unlock_index
2941 }
2942}
2943proc reset_hard_wait {fd} {
2945 global ui_comm
2946 read $fd
2948 if {[eof $fd]} {
2949 close $fd
2950 unlock_index
2951 $ui_comm delete 0.0 end
2953 $ui_comm edit modified false
2954 catch {file delete [gitdir MERGE_HEAD]}
2956 catch {file delete [gitdir rr-cache MERGE_RR]}
2957 catch {file delete [gitdir SQUASH_MSG]}
2958 catch {file delete [gitdir MERGE_MSG]}
2959 catch {file delete [gitdir GITGUI_MSG]}
2960 rescan {set ui_status_value {Abort completed. Ready.}}
2962 }
2963}
2964######################################################################
2966##
2967## browser
2968set next_browser_id 0
2970proc new_browser {commit} {
2972 global next_browser_id cursor_ptr M1B
2973 global browser_commit browser_status browser_stack browser_path browser_busy
2974 set w .browser[incr next_browser_id]
2976 set w_list $w.list.l
2977 set browser_commit($w_list) $commit
2978 set browser_status($w_list) {Starting...}
2979 set browser_stack($w_list) {}
2980 set browser_path($w_list) $browser_commit($w_list):
2981 set browser_busy($w_list) 1
2982 toplevel $w
2984 label $w.path -textvariable browser_path($w_list) \
2985 -anchor w \
2986 -justify left \
2987 -borderwidth 1 \
2988 -relief sunken \
2989 -font font_uibold
2990 pack $w.path -anchor w -side top -fill x
2991 frame $w.list
2993 text $w_list -background white -borderwidth 0 \
2994 -cursor $cursor_ptr \
2995 -state disabled \
2996 -wrap none \
2997 -height 20 \
2998 -width 70 \
2999 -xscrollcommand [list $w.list.sbx set] \
3000 -yscrollcommand [list $w.list.sby set] \
3001 -font font_ui
3002 $w_list tag conf in_sel \
3003 -background [$w_list cget -foreground] \
3004 -foreground [$w_list cget -background]
3005 scrollbar $w.list.sbx -orient h -command [list $w_list xview]
3006 scrollbar $w.list.sby -orient v -command [list $w_list yview]
3007 pack $w.list.sbx -side bottom -fill x
3008 pack $w.list.sby -side right -fill y
3009 pack $w_list -side left -fill both -expand 1
3010 pack $w.list -side top -fill both -expand 1
3011 label $w.status -textvariable browser_status($w_list) \
3013 -anchor w \
3014 -justify left \
3015 -borderwidth 1 \
3016 -relief sunken \
3017 -font font_ui
3018 pack $w.status -anchor w -side bottom -fill x
3019 bind $w_list <Button-1> "browser_click 0 $w_list @%x,%y;break"
3021 bind $w_list <Double-Button-1> "browser_click 1 $w_list @%x,%y;break"
3022 bind $w_list <$M1B-Up> "browser_parent $w_list;break"
3023 bind $w_list <$M1B-Left> "browser_parent $w_list;break"
3024 bind $w_list <Up> "browser_move -1 $w_list;break"
3025 bind $w_list <Down> "browser_move 1 $w_list;break"
3026 bind $w_list <$M1B-Right> "browser_enter $w_list;break"
3027 bind $w_list <Return> "browser_enter $w_list;break"
3028 bind $w_list <Prior> "browser_page -1 $w_list;break"
3029 bind $w_list <Next> "browser_page 1 $w_list;break"
3030 bind $w_list <Left> break
3031 bind $w_list <Right> break
3032 bind $w <Visibility> "focus $w"
3034 bind $w <Destroy> "
3035 array unset browser_buffer $w_list
3036 array unset browser_files $w_list
3037 array unset browser_status $w_list
3038 array unset browser_stack $w_list
3039 array unset browser_path $w_list
3040 array unset browser_commit $w_list
3041 array unset browser_busy $w_list
3042 "
3043 wm title $w "[appname] ([reponame]): File Browser"
3044 ls_tree $w_list $browser_commit($w_list) {}
3045}
3046proc browser_move {dir w} {
3048 global browser_files browser_busy
3049 if {$browser_busy($w)} return
3051 set lno [lindex [split [$w index in_sel.first] .] 0]
3052 incr lno $dir
3053 if {[lindex $browser_files($w) [expr {$lno - 1}]] ne {}} {
3054 $w tag remove in_sel 0.0 end
3055 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
3056 $w see $lno.0
3057 }
3058}
3059proc browser_page {dir w} {
3061 global browser_files browser_busy
3062 if {$browser_busy($w)} return
3064 $w yview scroll $dir pages
3065 set lno [expr {int(
3066 [lindex [$w yview] 0]
3067 * [llength $browser_files($w)]
3068 + 1)}]
3069 if {[lindex $browser_files($w) [expr {$lno - 1}]] ne {}} {
3070 $w tag remove in_sel 0.0 end
3071 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
3072 $w see $lno.0
3073 }
3074}
3075proc browser_parent {w} {
3077 global browser_files browser_status browser_path
3078 global browser_stack browser_busy
3079 if {$browser_busy($w)} return
3081 set info [lindex $browser_files($w) 0]
3082 if {[lindex $info 0] eq {parent}} {
3083 set parent [lindex $browser_stack($w) end-1]
3084 set browser_stack($w) [lrange $browser_stack($w) 0 end-2]
3085 if {$browser_stack($w) eq {}} {
3086 regsub {:.*$} $browser_path($w) {:} browser_path($w)
3087 } else {
3088 regsub {/[^/]+$} $browser_path($w) {} browser_path($w)
3089 }
3090 set browser_status($w) "Loading $browser_path($w)..."
3091 ls_tree $w [lindex $parent 0] [lindex $parent 1]
3092 }
3093}
3094proc browser_enter {w} {
3096 global browser_files browser_status browser_path
3097 global browser_commit browser_stack browser_busy
3098 if {$browser_busy($w)} return
3100 set lno [lindex [split [$w index in_sel.first] .] 0]
3101 set info [lindex $browser_files($w) [expr {$lno - 1}]]
3102 if {$info ne {}} {
3103 switch -- [lindex $info 0] {
3104 parent {
3105 browser_parent $w
3106 }
3107 tree {
3108 set name [lindex $info 2]
3109 set escn [escape_path $name]
3110 set browser_status($w) "Loading $escn..."
3111 append browser_path($w) $escn
3112 ls_tree $w [lindex $info 1] $name
3113 }
3114 blob {
3115 set name [lindex $info 2]
3116 set p {}
3117 foreach n $browser_stack($w) {
3118 append p [lindex $n 1]
3119 }
3120 append p $name
3121 show_blame $browser_commit($w) $p
3122 }
3123 }
3124 }
3125}
3126proc browser_click {was_double_click w pos} {
3128 global browser_files browser_busy
3129 if {$browser_busy($w)} return
3131 set lno [lindex [split [$w index $pos] .] 0]
3132 focus $w
3133 if {[lindex $browser_files($w) [expr {$lno - 1}]] ne {}} {
3135 $w tag remove in_sel 0.0 end
3136 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
3137 if {$was_double_click} {
3138 browser_enter $w
3139 }
3140 }
3141}
3142proc ls_tree {w tree_id name} {
3144 global browser_buffer browser_files browser_stack browser_busy
3145 set browser_buffer($w) {}
3147 set browser_files($w) {}
3148 set browser_busy($w) 1
3149 $w conf -state normal
3151 $w tag remove in_sel 0.0 end
3152 $w delete 0.0 end
3153 if {$browser_stack($w) ne {}} {
3154 $w image create end \
3155 -align center -padx 5 -pady 1 \
3156 -name icon0 \
3157 -image file_uplevel
3158 $w insert end {[Up To Parent]}
3159 lappend browser_files($w) parent
3160 }
3161 lappend browser_stack($w) [list $tree_id $name]
3162 $w conf -state disabled
3163 set cmd [list git ls-tree -z $tree_id]
3165 set fd [open "| $cmd" r]
3166 fconfigure $fd -blocking 0 -translation binary -encoding binary
3167 fileevent $fd readable [list read_ls_tree $fd $w]
3168}
3169proc read_ls_tree {fd w} {
3171 global browser_buffer browser_files browser_status browser_busy
3172 if {![winfo exists $w]} {
3174 catch {close $fd}
3175 return
3176 }
3177 append browser_buffer($w) [read $fd]
3179 set pck [split $browser_buffer($w) "\0"]
3180 set browser_buffer($w) [lindex $pck end]
3181 set n [llength $browser_files($w)]
3183 $w conf -state normal
3184 foreach p [lrange $pck 0 end-1] {
3185 set info [split $p "\t"]
3186 set path [lindex $info 1]
3187 set info [split [lindex $info 0] { }]
3188 set type [lindex $info 1]
3189 set object [lindex $info 2]
3190 switch -- $type {
3192 blob {
3193 set image file_mod
3194 }
3195 tree {
3196 set image file_dir
3197 append path /
3198 }
3199 default {
3200 set image file_question
3201 }
3202 }
3203 if {$n > 0} {$w insert end "\n"}
3205 $w image create end \
3206 -align center -padx 5 -pady 1 \
3207 -name icon[incr n] \
3208 -image $image
3209 $w insert end [escape_path $path]
3210 lappend browser_files($w) [list $type $object $path]
3211 }
3212 $w conf -state disabled
3213 if {[eof $fd]} {
3215 close $fd
3216 set browser_status($w) Ready.
3217 set browser_busy($w) 0
3218 array unset browser_buffer $w
3219 if {$n > 0} {
3220 $w tag add in_sel 1.0 2.0
3221 focus -force $w
3222 }
3223 }
3224}
3225proc show_blame {commit path} {
3227 global next_browser_id blame_status blame_data
3228 if {[winfo ismapped .]} {
3230 set w .browser[incr next_browser_id]
3231 set tl $w
3232 toplevel $w
3233 } else {
3234 set w {}
3235 set tl .
3236 }
3237 set blame_status($w) {Loading current file content...}
3238 label $w.path -text "$commit:$path" \
3240 -anchor w \
3241 -justify left \
3242 -borderwidth 1 \
3243 -relief sunken \
3244 -font font_uibold
3245 pack $w.path -side top -fill x
3246 frame $w.out
3248 text $w.out.loaded_t \
3249 -background white -borderwidth 0 \
3250 -state disabled \
3251 -wrap none \
3252 -height 40 \
3253 -width 1 \
3254 -font font_diff
3255 $w.out.loaded_t tag conf annotated -background grey
3256 text $w.out.linenumber_t \
3258 -background white -borderwidth 0 \
3259 -state disabled \
3260 -wrap none \
3261 -height 40 \
3262 -width 5 \
3263 -font font_diff
3264 $w.out.linenumber_t tag conf linenumber -justify right
3265 text $w.out.file_t \
3267 -background white -borderwidth 0 \
3268 -state disabled \
3269 -wrap none \
3270 -height 40 \
3271 -width 80 \
3272 -xscrollcommand [list $w.out.sbx set] \
3273 -font font_diff
3274 scrollbar $w.out.sbx -orient h -command [list $w.out.file_t xview]
3276 scrollbar $w.out.sby -orient v \
3277 -command [list scrollbar2many [list \
3278 $w.out.loaded_t \
3279 $w.out.linenumber_t \
3280 $w.out.file_t \
3281 ] yview]
3282 grid \
3283 $w.out.linenumber_t \
3284 $w.out.loaded_t \
3285 $w.out.file_t \
3286 $w.out.sby \
3287 -sticky nsew
3288 grid conf $w.out.sbx -column 2 -sticky we
3289 grid columnconfigure $w.out 2 -weight 1
3290 grid rowconfigure $w.out 0 -weight 1
3291 pack $w.out -fill both -expand 1
3292 label $w.status -textvariable blame_status($w) \
3294 -anchor w \
3295 -justify left \
3296 -borderwidth 1 \
3297 -relief sunken \
3298 -font font_ui
3299 pack $w.status -side bottom -fill x
3300 frame $w.cm
3302 text $w.cm.t \
3303 -background white -borderwidth 0 \
3304 -state disabled \
3305 -wrap none \
3306 -height 10 \
3307 -width 80 \
3308 -xscrollcommand [list $w.cm.sbx set] \
3309 -yscrollcommand [list $w.cm.sby set] \
3310 -font font_diff
3311 scrollbar $w.cm.sbx -orient h -command [list $w.cm.t xview]
3312 scrollbar $w.cm.sby -orient v -command [list $w.cm.t yview]
3313 pack $w.cm.sby -side right -fill y
3314 pack $w.cm.sbx -side bottom -fill x
3315 pack $w.cm.t -expand 1 -fill both
3316 pack $w.cm -side bottom -fill x
3317 menu $w.ctxm -tearoff 0
3319 $w.ctxm add command -label "Copy Commit" \
3320 -font font_ui \
3321 -command "blame_copycommit $w \$cursorW @\$cursorX,\$cursorY"
3322 foreach i [list \
3324 $w.out.loaded_t \
3325 $w.out.linenumber_t \
3326 $w.out.file_t] {
3327 $i tag conf in_sel \
3328 -background [$i cget -foreground] \
3329 -foreground [$i cget -background]
3330 $i conf -yscrollcommand \
3331 [list many2scrollbar [list \
3332 $w.out.loaded_t \
3333 $w.out.linenumber_t \
3334 $w.out.file_t \
3335 ] yview $w.out.sby]
3336 bind $i <Button-1> "
3337 blame_click {$w} \\
3338 $w.cm.t \\
3339 $w.out.linenumber_t \\
3340 $w.out.file_t \\
3341 $i @%x,%y
3342 break
3343 "
3344 bind_button3 $i "
3345 set cursorX %x
3346 set cursorY %y
3347 set cursorW %W
3348 tk_popup $w.ctxm %X %Y
3349 "
3350 }
3351 bind $tl <Visibility> "focus $tl"
3353 bind $tl <Destroy> "
3354 array unset blame_status {$w}
3355 array unset blame_data $w,*
3356 "
3357 wm title $tl "[appname] ([reponame]): File Viewer"
3358 set blame_data($w,commit_count) 0
3360 set blame_data($w,commit_list) {}
3361 set blame_data($w,total_lines) 0
3362 set blame_data($w,blame_lines) 0
3363 set blame_data($w,highlight_commit) {}
3364 set blame_data($w,highlight_line) -1
3365 set cmd [list git cat-file blob "$commit:$path"]
3367 set fd [open "| $cmd" r]
3368 fconfigure $fd -blocking 0 -translation lf -encoding binary
3369 fileevent $fd readable [list read_blame_catfile \
3370 $fd $w $commit $path \
3371 $w.cm.t $w.out.loaded_t $w.out.linenumber_t $w.out.file_t]
3372}
3373proc read_blame_catfile {fd w commit path w_cmit w_load w_line w_file} {
3375 global blame_status blame_data
3376 if {![winfo exists $w_file]} {
3378 catch {close $fd}
3379 return
3380 }
3381 set n $blame_data($w,total_lines)
3383 $w_load conf -state normal
3384 $w_line conf -state normal
3385 $w_file conf -state normal
3386 while {[gets $fd line] >= 0} {
3387 regsub "\r\$" $line {} line
3388 incr n
3389 $w_load insert end "\n"
3390 $w_line insert end "$n\n" linenumber
3391 $w_file insert end "$line\n"
3392 }
3393 $w_load conf -state disabled
3394 $w_line conf -state disabled
3395 $w_file conf -state disabled
3396 set blame_data($w,total_lines) $n
3397 if {[eof $fd]} {
3399 close $fd
3400 blame_incremental_status $w
3401 set cmd [list git blame -M -C --incremental]
3402 lappend cmd $commit -- $path
3403 set fd [open "| $cmd" r]
3404 fconfigure $fd -blocking 0 -translation lf -encoding binary
3405 fileevent $fd readable [list read_blame_incremental $fd $w \
3406 $w_load $w_cmit $w_line $w_file]
3407 }
3408}
3409proc read_blame_incremental {fd w w_load w_cmit w_line w_file} {
3411 global blame_status blame_data
3412 if {![winfo exists $w_file]} {
3414 catch {close $fd}
3415 return
3416 }
3417 while {[gets $fd line] >= 0} {
3419 if {[regexp {^([a-z0-9]{40}) (\d+) (\d+) (\d+)$} $line line \
3420 cmit original_line final_line line_count]} {
3421 set blame_data($w,commit) $cmit
3422 set blame_data($w,original_line) $original_line
3423 set blame_data($w,final_line) $final_line
3424 set blame_data($w,line_count) $line_count
3425 if {[catch {set g $blame_data($w,$cmit,order)}]} {
3427 $w_line tag conf g$cmit
3428 $w_file tag conf g$cmit
3429 $w_line tag raise in_sel
3430 $w_file tag raise in_sel
3431 set blame_data($w,$cmit,order) $blame_data($w,commit_count)
3432 incr blame_data($w,commit_count)
3433 lappend blame_data($w,commit_list) $cmit
3434 }
3435 } elseif {[string match {filename *} $line]} {
3436 set file [string range $line 9 end]
3437 set n $blame_data($w,line_count)
3438 set lno $blame_data($w,final_line)
3439 set cmit $blame_data($w,commit)
3440 while {$n > 0} {
3442 if {[catch {set g g$blame_data($w,line$lno,commit)}]} {
3443 $w_load tag add annotated $lno.0 "$lno.0 lineend + 1c"
3444 } else {
3445 $w_line tag remove g$g $lno.0 "$lno.0 lineend + 1c"
3446 $w_file tag remove g$g $lno.0 "$lno.0 lineend + 1c"
3447 }
3448 set blame_data($w,line$lno,commit) $cmit
3450 set blame_data($w,line$lno,file) $file
3451 $w_line tag add g$cmit $lno.0 "$lno.0 lineend + 1c"
3452 $w_file tag add g$cmit $lno.0 "$lno.0 lineend + 1c"
3453 if {$blame_data($w,highlight_line) == -1} {
3455 if {[lindex [$w_file yview] 0] == 0} {
3456 $w_file see $lno.0
3457 blame_showcommit $w $w_cmit $w_line $w_file $lno
3458 }
3459 } elseif {$blame_data($w,highlight_line) == $lno} {
3460 blame_showcommit $w $w_cmit $w_line $w_file $lno
3461 }
3462 incr n -1
3464 incr lno
3465 incr blame_data($w,blame_lines)
3466 }
3467 set hc $blame_data($w,highlight_commit)
3469 if {$hc ne {}
3470 && [expr {$blame_data($w,$hc,order) + 1}]
3471 == $blame_data($w,$cmit,order)} {
3472 blame_showcommit $w $w_cmit $w_line $w_file \
3473 $blame_data($w,highlight_line)
3474 }
3475 } elseif {[regexp {^([a-z-]+) (.*)$} $line line header data]} {
3476 set blame_data($w,$blame_data($w,commit),$header) $data
3477 }
3478 }
3479 if {[eof $fd]} {
3481 close $fd
3482 set blame_status($w) {Annotation complete.}
3483 } else {
3484 blame_incremental_status $w
3485 }
3486}
3487proc blame_incremental_status {w} {
3489 global blame_status blame_data
3490 set blame_status($w) [format \
3492 "Loading annotations... %i of %i lines annotated (%2i%%)" \
3493 $blame_data($w,blame_lines) \
3494 $blame_data($w,total_lines) \
3495 [expr {100 * $blame_data($w,blame_lines)
3496 / $blame_data($w,total_lines)}]]
3497}
3498proc blame_click {w w_cmit w_line w_file cur_w pos} {
3500 set lno [lindex [split [$cur_w index $pos] .] 0]
3501 if {$lno eq {}} return
3502 $w_line tag remove in_sel 0.0 end
3504 $w_file tag remove in_sel 0.0 end
3505 $w_line tag add in_sel $lno.0 "$lno.0 + 1 line"
3506 $w_file tag add in_sel $lno.0 "$lno.0 + 1 line"
3507 blame_showcommit $w $w_cmit $w_line $w_file $lno
3509}
3510set blame_colors {
3512 #ff4040
3513 #ff40ff
3514 #4040ff
3515}
3516proc blame_showcommit {w w_cmit w_line w_file lno} {
3518 global blame_colors blame_data repo_config
3519 set cmit $blame_data($w,highlight_commit)
3521 if {$cmit ne {}} {
3522 set idx $blame_data($w,$cmit,order)
3523 set i 0
3524 foreach c $blame_colors {
3525 set h [lindex $blame_data($w,commit_list) [expr {$idx - 1 + $i}]]
3526 $w_line tag conf g$h -background white
3527 $w_file tag conf g$h -background white
3528 incr i
3529 }
3530 }
3531 $w_cmit conf -state normal
3533 $w_cmit delete 0.0 end
3534 if {[catch {set cmit $blame_data($w,line$lno,commit)}]} {
3535 set cmit {}
3536 $w_cmit insert end "Loading annotation..."
3537 } else {
3538 set idx $blame_data($w,$cmit,order)
3539 set i 0
3540 foreach c $blame_colors {
3541 set h [lindex $blame_data($w,commit_list) [expr {$idx - 1 + $i}]]
3542 $w_line tag conf g$h -background $c
3543 $w_file tag conf g$h -background $c
3544 incr i
3545 }
3546 if {[catch {set msg $blame_data($w,$cmit,message)}]} {
3548 set msg {}
3549 catch {
3550 set fd [open "| git cat-file commit $cmit" r]
3551 fconfigure $fd -encoding binary -translation lf
3552 if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
3553 set enc utf-8
3554 }
3555 while {[gets $fd line] > 0} {
3556 if {[string match {encoding *} $line]} {
3557 set enc [string tolower [string range $line 9 end]]
3558 }
3559 }
3560 fconfigure $fd -encoding $enc
3561 set msg [string trim [read $fd]]
3562 close $fd
3563 }
3564 set blame_data($w,$cmit,message) $msg
3565 }
3566 set author_name {}
3568 set author_email {}
3569 set author_time {}
3570 catch {set author_name $blame_data($w,$cmit,author)}
3571 catch {set author_email $blame_data($w,$cmit,author-mail)}
3572 catch {set author_time [clock format $blame_data($w,$cmit,author-time)]}
3573 set committer_name {}
3575 set committer_email {}
3576 set committer_time {}
3577 catch {set committer_name $blame_data($w,$cmit,committer)}
3578 catch {set committer_email $blame_data($w,$cmit,committer-mail)}
3579 catch {set committer_time [clock format $blame_data($w,$cmit,committer-time)]}
3580 $w_cmit insert end "commit $cmit\n"
3582 $w_cmit insert end "Author: $author_name $author_email $author_time\n"
3583 $w_cmit insert end "Committer: $committer_name $committer_email $committer_time\n"
3584 $w_cmit insert end "Original File: [escape_path $blame_data($w,line$lno,file)]\n"
3585 $w_cmit insert end "\n"
3586 $w_cmit insert end $msg
3587 }
3588 $w_cmit conf -state disabled
3589 set blame_data($w,highlight_line) $lno
3591 set blame_data($w,highlight_commit) $cmit
3592}
3593proc blame_copycommit {w i pos} {
3595 global blame_data
3596 set lno [lindex [split [$i index $pos] .] 0]
3597 if {![catch {set commit $blame_data($w,line$lno,commit)}]} {
3598 clipboard clear
3599 clipboard append \
3600 -format STRING \
3601 -type STRING \
3602 -- $commit
3603 }
3604}
3605######################################################################
3607##
3608## icons
3609set filemask {
3611#define mask_width 14
3612#define mask_height 15
3613static unsigned char mask_bits[] = {
3614 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
3615 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
3616 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
3617}
3618image create bitmap file_plain -background white -foreground black -data {
3620#define plain_width 14
3621#define plain_height 15
3622static unsigned char plain_bits[] = {
3623 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
3624 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
3625 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
3626} -maskdata $filemask
3627image create bitmap file_mod -background white -foreground blue -data {
3629#define mod_width 14
3630#define mod_height 15
3631static unsigned char mod_bits[] = {
3632 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
3633 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
3634 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
3635} -maskdata $filemask
3636image create bitmap file_fulltick -background white -foreground "#007000" -data {
3638#define file_fulltick_width 14
3639#define file_fulltick_height 15
3640static unsigned char file_fulltick_bits[] = {
3641 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
3642 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
3643 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
3644} -maskdata $filemask
3645image create bitmap file_parttick -background white -foreground "#005050" -data {
3647#define parttick_width 14
3648#define parttick_height 15
3649static unsigned char parttick_bits[] = {
3650 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
3651 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
3652 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
3653} -maskdata $filemask
3654image create bitmap file_question -background white -foreground black -data {
3656#define file_question_width 14
3657#define file_question_height 15
3658static unsigned char file_question_bits[] = {
3659 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
3660 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
3661 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
3662} -maskdata $filemask
3663image create bitmap file_removed -background white -foreground red -data {
3665#define file_removed_width 14
3666#define file_removed_height 15
3667static unsigned char file_removed_bits[] = {
3668 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
3669 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
3670 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
3671} -maskdata $filemask
3672image create bitmap file_merge -background white -foreground blue -data {
3674#define file_merge_width 14
3675#define file_merge_height 15
3676static unsigned char file_merge_bits[] = {
3677 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
3678 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
3679 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
3680} -maskdata $filemask
3681set file_dir_data {
3683#define file_width 18
3684#define file_height 18
3685static unsigned char file_bits[] = {
3686 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x03, 0x00,
3687 0x0c, 0x03, 0x00, 0x04, 0xfe, 0x00, 0x06, 0x80, 0x00, 0xff, 0x9f, 0x00,
3688 0x03, 0x98, 0x00, 0x02, 0x90, 0x00, 0x06, 0xb0, 0x00, 0x04, 0xa0, 0x00,
3689 0x0c, 0xe0, 0x00, 0x08, 0xc0, 0x00, 0xf8, 0xff, 0x00, 0x00, 0x00, 0x00,
3690 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
3691}
3692image create bitmap file_dir -background white -foreground blue \
3693 -data $file_dir_data -maskdata $file_dir_data
3694unset file_dir_data
3695set file_uplevel_data {
3697#define up_width 15
3698#define up_height 15
3699static unsigned char up_bits[] = {
3700 0x80, 0x00, 0xc0, 0x01, 0xe0, 0x03, 0xf0, 0x07, 0xf8, 0x0f, 0xfc, 0x1f,
3701 0xfe, 0x3f, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01,
3702 0xc0, 0x01, 0xc0, 0x01, 0x00, 0x00};
3703}
3704image create bitmap file_uplevel -background white -foreground red \
3705 -data $file_uplevel_data -maskdata $file_uplevel_data
3706unset file_uplevel_data
3707set ui_index .vpane.files.index.list
3709set ui_workdir .vpane.files.workdir.list
3710set all_icons(_$ui_index) file_plain
3712set all_icons(A$ui_index) file_fulltick
3713set all_icons(M$ui_index) file_fulltick
3714set all_icons(D$ui_index) file_removed
3715set all_icons(U$ui_index) file_merge
3716set all_icons(_$ui_workdir) file_plain
3718set all_icons(M$ui_workdir) file_mod
3719set all_icons(D$ui_workdir) file_question
3720set all_icons(U$ui_workdir) file_merge
3721set all_icons(O$ui_workdir) file_plain
3722set max_status_desc 0
3724foreach i {
3725 {__ "Unmodified"}
3726 {_M "Modified, not staged"}
3728 {M_ "Staged for commit"}
3729 {MM "Portions staged for commit"}
3730 {MD "Staged for commit, missing"}
3731 {_O "Untracked, not staged"}
3733 {A_ "Staged for commit"}
3734 {AM "Portions staged for commit"}
3735 {AD "Staged for commit, missing"}
3736 {_D "Missing"}
3738 {D_ "Staged for removal"}
3739 {DO "Staged for removal, still present"}
3740 {U_ "Requires merge resolution"}
3742 {UU "Requires merge resolution"}
3743 {UM "Requires merge resolution"}
3744 {UD "Requires merge resolution"}
3745 } {
3746 if {$max_status_desc < [string length [lindex $i 1]]} {
3747 set max_status_desc [string length [lindex $i 1]]
3748 }
3749 set all_descs([lindex $i 0]) [lindex $i 1]
3750}
3751unset i
3752######################################################################
3754##
3755## util
3756proc bind_button3 {w cmd} {
3758 bind $w <Any-Button-3> $cmd
3759 if {[is_MacOSX]} {
3760 bind $w <Control-Button-1> $cmd
3761 }
3762}
3763proc scrollbar2many {list mode args} {
3765 foreach w $list {eval $w $mode $args}
3766}
3767proc many2scrollbar {list mode sb top bottom} {
3769 $sb set $top $bottom
3770 foreach w $list {$w $mode moveto $top}
3771}
3772proc incr_font_size {font {amt 1}} {
3774 set sz [font configure $font -size]
3775 incr sz $amt
3776 font configure $font -size $sz
3777 font configure ${font}bold -size $sz
3778}
3779proc hook_failed_popup {hook msg} {
3781 set w .hookfail
3782 toplevel $w
3783 frame $w.m
3785 label $w.m.l1 -text "$hook hook failed:" \
3786 -anchor w \
3787 -justify left \
3788 -font font_uibold
3789 text $w.m.t \
3790 -background white -borderwidth 1 \
3791 -relief sunken \
3792 -width 80 -height 10 \
3793 -font font_diff \
3794 -yscrollcommand [list $w.m.sby set]
3795 label $w.m.l2 \
3796 -text {You must correct the above errors before committing.} \
3797 -anchor w \
3798 -justify left \
3799 -font font_uibold
3800 scrollbar $w.m.sby -command [list $w.m.t yview]
3801 pack $w.m.l1 -side top -fill x
3802 pack $w.m.l2 -side bottom -fill x
3803 pack $w.m.sby -side right -fill y
3804 pack $w.m.t -side left -fill both -expand 1
3805 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
3806 $w.m.t insert 1.0 $msg
3808 $w.m.t conf -state disabled
3809 button $w.ok -text OK \
3811 -width 15 \
3812 -font font_ui \
3813 -command "destroy $w"
3814 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
3815 bind $w <Visibility> "grab $w; focus $w"
3817 bind $w <Key-Return> "destroy $w"
3818 wm title $w "[appname] ([reponame]): error"
3819 tkwait window $w
3820}
3821set next_console_id 0
3823proc new_console {short_title long_title} {
3825 global next_console_id console_data
3826 set w .console[incr next_console_id]
3827 set console_data($w) [list $short_title $long_title]
3828 return [console_init $w]
3829}
3830proc console_init {w} {
3832 global console_cr console_data M1B
3833 set console_cr($w) 1.0
3835 toplevel $w
3836 frame $w.m
3837 label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
3838 -anchor w \
3839 -justify left \
3840 -font font_uibold
3841 text $w.m.t \
3842 -background white -borderwidth 1 \
3843 -relief sunken \
3844 -width 80 -height 10 \
3845 -font font_diff \
3846 -state disabled \
3847 -yscrollcommand [list $w.m.sby set]
3848 label $w.m.s -text {Working... please wait...} \
3849 -anchor w \
3850 -justify left \
3851 -font font_uibold
3852 scrollbar $w.m.sby -command [list $w.m.t yview]
3853 pack $w.m.l1 -side top -fill x
3854 pack $w.m.s -side bottom -fill x
3855 pack $w.m.sby -side right -fill y
3856 pack $w.m.t -side left -fill both -expand 1
3857 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
3858 menu $w.ctxm -tearoff 0
3860 $w.ctxm add command -label "Copy" \
3861 -font font_ui \
3862 -command "tk_textCopy $w.m.t"
3863 $w.ctxm add command -label "Select All" \
3864 -font font_ui \
3865 -command "focus $w.m.t;$w.m.t tag add sel 0.0 end"
3866 $w.ctxm add command -label "Copy All" \
3867 -font font_ui \
3868 -command "
3869 $w.m.t tag add sel 0.0 end
3870 tk_textCopy $w.m.t
3871 $w.m.t tag remove sel 0.0 end
3872 "
3873 button $w.ok -text {Close} \
3875 -font font_ui \
3876 -state disabled \
3877 -command "destroy $w"
3878 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
3879 bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
3881 bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
3882 bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
3883 bind $w <Visibility> "focus $w"
3884 wm title $w "[appname] ([reponame]): [lindex $console_data($w) 0]"
3885 return $w
3886}
3887proc console_exec {w cmd after} {
3889 # -- Cygwin's Tcl tosses the enviroment when we exec our child.
3890 # But most users need that so we have to relogin. :-(
3891 #
3892 if {[is_Cygwin]} {
3893 set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
3894 }
3895 # -- Tcl won't let us redirect both stdout and stderr to
3897 # the same pipe. So pass it through cat...
3898 #
3899 set cmd [concat | $cmd |& cat]
3900 set fd_f [open $cmd r]
3902 fconfigure $fd_f -blocking 0 -translation binary
3903 fileevent $fd_f readable [list console_read $w $fd_f $after]
3904}
3905proc console_read {w fd after} {
3907 global console_cr
3908 set buf [read $fd]
3910 if {$buf ne {}} {
3911 if {![winfo exists $w]} {console_init $w}
3912 $w.m.t conf -state normal
3913 set c 0
3914 set n [string length $buf]
3915 while {$c < $n} {
3916 set cr [string first "\r" $buf $c]
3917 set lf [string first "\n" $buf $c]
3918 if {$cr < 0} {set cr [expr {$n + 1}]}
3919 if {$lf < 0} {set lf [expr {$n + 1}]}
3920 if {$lf < $cr} {
3922 $w.m.t insert end [string range $buf $c $lf]
3923 set console_cr($w) [$w.m.t index {end -1c}]
3924 set c $lf
3925 incr c
3926 } else {
3927 $w.m.t delete $console_cr($w) end
3928 $w.m.t insert end "\n"
3929 $w.m.t insert end [string range $buf $c $cr]
3930 set c $cr
3931 incr c
3932 }
3933 }
3934 $w.m.t conf -state disabled
3935 $w.m.t see end
3936 }
3937 fconfigure $fd -blocking 1
3939 if {[eof $fd]} {
3940 if {[catch {close $fd}]} {
3941 set ok 0
3942 } else {
3943 set ok 1
3944 }
3945 uplevel #0 $after $w $ok
3946 return
3947 }
3948 fconfigure $fd -blocking 0
3949}
3950proc console_chain {cmdlist w {ok 1}} {
3952 if {$ok} {
3953 if {[llength $cmdlist] == 0} {
3954 console_done $w $ok
3955 return
3956 }
3957 set cmd [lindex $cmdlist 0]
3959 set cmdlist [lrange $cmdlist 1 end]
3960 if {[lindex $cmd 0] eq {console_exec}} {
3962 console_exec $w \
3963 [lindex $cmd 1] \
3964 [list console_chain $cmdlist]
3965 } else {
3966 uplevel #0 $cmd $cmdlist $w $ok
3967 }
3968 } else {
3969 console_done $w $ok
3970 }
3971}
3972proc console_done {args} {
3974 global console_cr console_data
3975 switch -- [llength $args] {
3977 2 {
3978 set w [lindex $args 0]
3979 set ok [lindex $args 1]
3980 }
3981 3 {
3982 set w [lindex $args 1]
3983 set ok [lindex $args 2]
3984 }
3985 default {
3986 error "wrong number of args: console_done ?ignored? w ok"
3987 }
3988 }
3989 if {$ok} {
3991 if {[winfo exists $w]} {
3992 $w.m.s conf -background green -text {Success}
3993 $w.ok conf -state normal
3994 }
3995 } else {
3996 if {![winfo exists $w]} {
3997 console_init $w
3998 }
3999 $w.m.s conf -background red -text {Error: Command Failed}
4000 $w.ok conf -state normal
4001 }
4002 array unset console_cr $w
4004 array unset console_data $w
4005}
4006######################################################################
4008##
4009## ui commands
4010set starting_gitk_msg {Starting gitk... please wait...}
4012proc do_gitk {revs} {
4014 global env ui_status_value starting_gitk_msg
4015 # -- On Windows gitk is severly broken, and right now it seems like
4017 # nobody cares about fixing it. The only known workaround is to
4018 # always delete ~/.gitk before starting the program.
4019 #
4020 if {[is_Windows]} {
4021 catch {file delete [file join $env(HOME) .gitk]}
4022 }
4023 # -- Always start gitk through whatever we were loaded with. This
4025 # lets us bypass using shell process on Windows systems.
4026 #
4027 set cmd [info nameofexecutable]
4028 lappend cmd [gitexec gitk]
4029 if {$revs ne {}} {
4030 append cmd { }
4031 append cmd $revs
4032 }
4033 if {[catch {eval exec $cmd &} err]} {
4035 error_popup "Failed to start gitk:\n\n$err"
4036 } else {
4037 set ui_status_value $starting_gitk_msg
4038 after 10000 {
4039 if {$ui_status_value eq $starting_gitk_msg} {
4040 set ui_status_value {Ready.}
4041 }
4042 }
4043 }
4044}
4045proc do_stats {} {
4047 set fd [open "| git count-objects -v" r]
4048 while {[gets $fd line] > 0} {
4049 if {[regexp {^([^:]+): (\d+)$} $line _ name value]} {
4050 set stats($name) $value
4051 }
4052 }
4053 close $fd
4054 set packed_sz 0
4056 foreach p [glob -directory [gitdir objects pack] \
4057 -type f \
4058 -nocomplain -- *] {
4059 incr packed_sz [file size $p]
4060 }
4061 if {$packed_sz > 0} {
4062 set stats(size-pack) [expr {$packed_sz / 1024}]
4063 }
4064 set w .stats_view
4066 toplevel $w
4067 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
4068 label $w.header -text {Database Statistics} \
4070 -font font_uibold
4071 pack $w.header -side top -fill x
4072 frame $w.buttons -border 1
4074 button $w.buttons.close -text Close \
4075 -font font_ui \
4076 -command [list destroy $w]
4077 button $w.buttons.gc -text {Compress Database} \
4078 -font font_ui \
4079 -command "destroy $w;do_gc"
4080 pack $w.buttons.close -side right
4081 pack $w.buttons.gc -side left
4082 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
4083 frame $w.stat -borderwidth 1 -relief solid
4085 foreach s {
4086 {count {Number of loose objects}}
4087 {size {Disk space used by loose objects} { KiB}}
4088 {in-pack {Number of packed objects}}
4089 {packs {Number of packs}}
4090 {size-pack {Disk space used by packed objects} { KiB}}
4091 {prune-packable {Packed objects waiting for pruning}}
4092 {garbage {Garbage files}}
4093 } {
4094 set name [lindex $s 0]
4095 set label [lindex $s 1]
4096 if {[catch {set value $stats($name)}]} continue
4097 if {[llength $s] > 2} {
4098 set value "$value[lindex $s 2]"
4099 }
4100 label $w.stat.l_$name -text "$label:" -anchor w -font font_ui
4102 label $w.stat.v_$name -text $value -anchor w -font font_ui
4103 grid $w.stat.l_$name $w.stat.v_$name -sticky we -padx {0 5}
4104 }
4105 pack $w.stat -pady 10 -padx 10
4106 bind $w <Visibility> "grab $w; focus $w"
4108 bind $w <Key-Escape> [list destroy $w]
4109 bind $w <Key-Return> [list destroy $w]
4110 wm title $w "[appname] ([reponame]): Database Statistics"
4111 tkwait window $w
4112}
4113proc do_gc {} {
4115 set w [new_console {gc} {Compressing the object database}]
4116 console_chain {
4117 {console_exec {git pack-refs --prune}}
4118 {console_exec {git reflog expire --all}}
4119 {console_exec {git repack -a -d -l}}
4120 {console_exec {git rerere gc}}
4121 } $w
4122}
4123proc do_fsck_objects {} {
4125 set w [new_console {fsck-objects} \
4126 {Verifying the object database with fsck-objects}]
4127 set cmd [list git fsck-objects]
4128 lappend cmd --full
4129 lappend cmd --cache
4130 lappend cmd --strict
4131 console_exec $w $cmd console_done
4132}
4133set is_quitting 0
4135proc do_quit {} {
4137 global ui_comm is_quitting repo_config commit_type
4138 if {$is_quitting} return
4140 set is_quitting 1
4141 if {[winfo exists $ui_comm]} {
4143 # -- Stash our current commit buffer.
4144 #
4145 set save [gitdir GITGUI_MSG]
4146 set msg [string trim [$ui_comm get 0.0 end]]
4147 regsub -all -line {[ \r\t]+$} $msg {} msg
4148 if {(![string match amend* $commit_type]
4149 || [$ui_comm edit modified])
4150 && $msg ne {}} {
4151 catch {
4152 set fd [open $save w]
4153 puts -nonewline $fd $msg
4154 close $fd
4155 }
4156 } else {
4157 catch {file delete $save}
4158 }
4159 # -- Stash our current window geometry into this repository.
4161 #
4162 set cfg_geometry [list]
4163 lappend cfg_geometry [wm geometry .]
4164 lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
4165 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
4166 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
4167 set rc_geometry {}
4168 }
4169 if {$cfg_geometry ne $rc_geometry} {
4170 catch {exec git config gui.geometry $cfg_geometry}
4171 }
4172 }
4173 destroy .
4175}
4176proc do_rescan {} {
4178 rescan {set ui_status_value {Ready.}}
4179}
4180proc unstage_helper {txt paths} {
4182 global file_states current_diff_path
4183 if {![lock_index begin-update]} return
4185 set pathList [list]
4187 set after {}
4188 foreach path $paths {
4189 switch -glob -- [lindex $file_states($path) 0] {
4190 A? -
4191 M? -
4192 D? {
4193 lappend pathList $path
4194 if {$path eq $current_diff_path} {
4195 set after {reshow_diff;}
4196 }
4197 }
4198 }
4199 }
4200 if {$pathList eq {}} {
4201 unlock_index
4202 } else {
4203 update_indexinfo \
4204 $txt \
4205 $pathList \
4206 [concat $after {set ui_status_value {Ready.}}]
4207 }
4208}
4209proc do_unstage_selection {} {
4211 global current_diff_path selected_paths
4212 if {[array size selected_paths] > 0} {
4214 unstage_helper \
4215 {Unstaging selected files from commit} \
4216 [array names selected_paths]
4217 } elseif {$current_diff_path ne {}} {
4218 unstage_helper \
4219 "Unstaging [short_path $current_diff_path] from commit" \
4220 [list $current_diff_path]
4221 }
4222}
4223proc add_helper {txt paths} {
4225 global file_states current_diff_path
4226 if {![lock_index begin-update]} return
4228 set pathList [list]
4230 set after {}
4231 foreach path $paths {
4232 switch -glob -- [lindex $file_states($path) 0] {
4233 _O -
4234 ?M -
4235 ?D -
4236 U? {
4237 lappend pathList $path
4238 if {$path eq $current_diff_path} {
4239 set after {reshow_diff;}
4240 }
4241 }
4242 }
4243 }
4244 if {$pathList eq {}} {
4245 unlock_index
4246 } else {
4247 update_index \
4248 $txt \
4249 $pathList \
4250 [concat $after {set ui_status_value {Ready to commit.}}]
4251 }
4252}
4253proc do_add_selection {} {
4255 global current_diff_path selected_paths
4256 if {[array size selected_paths] > 0} {
4258 add_helper \
4259 {Adding selected files} \
4260 [array names selected_paths]
4261 } elseif {$current_diff_path ne {}} {
4262 add_helper \
4263 "Adding [short_path $current_diff_path]" \
4264 [list $current_diff_path]
4265 }
4266}
4267proc do_add_all {} {
4269 global file_states
4270 set paths [list]
4272 foreach path [array names file_states] {
4273 switch -glob -- [lindex $file_states($path) 0] {
4274 U? {continue}
4275 ?M -
4276 ?D {lappend paths $path}
4277 }
4278 }
4279 add_helper {Adding all changed files} $paths
4280}
4281proc revert_helper {txt paths} {
4283 global file_states current_diff_path
4284 if {![lock_index begin-update]} return
4286 set pathList [list]
4288 set after {}
4289 foreach path $paths {
4290 switch -glob -- [lindex $file_states($path) 0] {
4291 U? {continue}
4292 ?M -
4293 ?D {
4294 lappend pathList $path
4295 if {$path eq $current_diff_path} {
4296 set after {reshow_diff;}
4297 }
4298 }
4299 }
4300 }
4301 set n [llength $pathList]
4303 if {$n == 0} {
4304 unlock_index
4305 return
4306 } elseif {$n == 1} {
4307 set s "[short_path [lindex $pathList]]"
4308 } else {
4309 set s "these $n files"
4310 }
4311 set reply [tk_dialog \
4313 .confirm_revert \
4314 "[appname] ([reponame])" \
4315 "Revert changes in $s?
4316Any unadded changes will be permanently lost by the revert." \
4318 question \
4319 1 \
4320 {Do Nothing} \
4321 {Revert Changes} \
4322 ]
4323 if {$reply == 1} {
4324 checkout_index \
4325 $txt \
4326 $pathList \
4327 [concat $after {set ui_status_value {Ready.}}]
4328 } else {
4329 unlock_index
4330 }
4331}
4332proc do_revert_selection {} {
4334 global current_diff_path selected_paths
4335 if {[array size selected_paths] > 0} {
4337 revert_helper \
4338 {Reverting selected files} \
4339 [array names selected_paths]
4340 } elseif {$current_diff_path ne {}} {
4341 revert_helper \
4342 "Reverting [short_path $current_diff_path]" \
4343 [list $current_diff_path]
4344 }
4345}
4346proc do_signoff {} {
4348 global ui_comm
4349 set me [committer_ident]
4351 if {$me eq {}} return
4352 set sob "Signed-off-by: $me"
4354 set last [$ui_comm get {end -1c linestart} {end -1c}]
4355 if {$last ne $sob} {
4356 $ui_comm edit separator
4357 if {$last ne {}
4358 && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
4359 $ui_comm insert end "\n"
4360 }
4361 $ui_comm insert end "\n$sob"
4362 $ui_comm edit separator
4363 $ui_comm see end
4364 }
4365}
4366proc do_select_commit_type {} {
4368 global commit_type selected_commit_type
4369 if {$selected_commit_type eq {new}
4371 && [string match amend* $commit_type]} {
4372 create_new_commit
4373 } elseif {$selected_commit_type eq {amend}
4374 && ![string match amend* $commit_type]} {
4375 load_last_commit
4376 # The amend request was rejected...
4378 #
4379 if {![string match amend* $commit_type]} {
4380 set selected_commit_type new
4381 }
4382 }
4383}
4384proc do_commit {} {
4386 commit_tree
4387}
4388proc do_about {} {
4390 global appvers copyright
4391 global tcl_patchLevel tk_patchLevel
4392 set w .about_dialog
4394 toplevel $w
4395 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
4396 label $w.header -text "About [appname]" \
4398 -font font_uibold
4399 pack $w.header -side top -fill x
4400 frame $w.buttons
4402 button $w.buttons.close -text {Close} \
4403 -font font_ui \
4404 -command [list destroy $w]
4405 pack $w.buttons.close -side right
4406 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
4407 label $w.desc \
4409 -text "[appname] - a commit creation tool for Git.
4410$copyright" \
4411 -padx 5 -pady 5 \
4412 -justify left \
4413 -anchor w \
4414 -borderwidth 1 \
4415 -relief solid \
4416 -font font_ui
4417 pack $w.desc -side top -fill x -padx 5 -pady 5
4418 set v {}
4420 append v "[appname] version $appvers\n"
4421 append v "[exec git version]\n"
4422 append v "\n"
4423 if {$tcl_patchLevel eq $tk_patchLevel} {
4424 append v "Tcl/Tk version $tcl_patchLevel"
4425 } else {
4426 append v "Tcl version $tcl_patchLevel"
4427 append v ", Tk version $tk_patchLevel"
4428 }
4429 label $w.vers \
4431 -text $v \
4432 -padx 5 -pady 5 \
4433 -justify left \
4434 -anchor w \
4435 -borderwidth 1 \
4436 -relief solid \
4437 -font font_ui
4438 pack $w.vers -side top -fill x -padx 5 -pady 5
4439 menu $w.ctxm -tearoff 0
4441 $w.ctxm add command \
4442 -label {Copy} \
4443 -font font_ui \
4444 -command "
4445 clipboard clear
4446 clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
4447 "
4448 bind $w <Visibility> "grab $w; focus $w"
4450 bind $w <Key-Escape> "destroy $w"
4451 bind_button3 $w.vers "tk_popup $w.ctxm %X %Y; grab $w; focus $w"
4452 wm title $w "About [appname]"
4453 tkwait window $w
4454}
4455proc do_options {} {
4457 global repo_config global_config font_descs
4458 global repo_config_new global_config_new
4459 array unset repo_config_new
4461 array unset global_config_new
4462 foreach name [array names repo_config] {
4463 set repo_config_new($name) $repo_config($name)
4464 }
4465 load_config 1
4466 foreach name [array names repo_config] {
4467 switch -- $name {
4468 gui.diffcontext {continue}
4469 }
4470 set repo_config_new($name) $repo_config($name)
4471 }
4472 foreach name [array names global_config] {
4473 set global_config_new($name) $global_config($name)
4474 }
4475 set w .options_editor
4477 toplevel $w
4478 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
4479 label $w.header -text "[appname] Options" \
4481 -font font_uibold
4482 pack $w.header -side top -fill x
4483 frame $w.buttons
4485 button $w.buttons.restore -text {Restore Defaults} \
4486 -font font_ui \
4487 -command do_restore_defaults
4488 pack $w.buttons.restore -side left
4489 button $w.buttons.save -text Save \
4490 -font font_ui \
4491 -command [list do_save_config $w]
4492 pack $w.buttons.save -side right
4493 button $w.buttons.cancel -text {Cancel} \
4494 -font font_ui \
4495 -command [list destroy $w]
4496 pack $w.buttons.cancel -side right -padx 5
4497 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
4498 labelframe $w.repo -text "[reponame] Repository" \
4500 -font font_ui
4501 labelframe $w.global -text {Global (All Repositories)} \
4502 -font font_ui
4503 pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
4504 pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
4505 set optid 0
4507 foreach option {
4508 {t user.name {User Name}}
4509 {t user.email {Email Address}}
4510 {b merge.summary {Summarize Merge Commits}}
4512 {i-1..5 merge.verbosity {Merge Verbosity}}
4513 {b gui.trustmtime {Trust File Modification Timestamps}}
4515 {i-1..99 gui.diffcontext {Number of Diff Context Lines}}
4516 {t gui.newbranchtemplate {New Branch Name Template}}
4517 } {
4518 set type [lindex $option 0]
4519 set name [lindex $option 1]
4520 set text [lindex $option 2]
4521 incr optid
4522 foreach f {repo global} {
4523 switch -glob -- $type {
4524 b {
4525 checkbutton $w.$f.$optid -text $text \
4526 -variable ${f}_config_new($name) \
4527 -onvalue true \
4528 -offvalue false \
4529 -font font_ui
4530 pack $w.$f.$optid -side top -anchor w
4531 }
4532 i-* {
4533 regexp -- {-(\d+)\.\.(\d+)$} $type _junk min max
4534 frame $w.$f.$optid
4535 label $w.$f.$optid.l -text "$text:" -font font_ui
4536 pack $w.$f.$optid.l -side left -anchor w -fill x
4537 spinbox $w.$f.$optid.v \
4538 -textvariable ${f}_config_new($name) \
4539 -from $min \
4540 -to $max \
4541 -increment 1 \
4542 -width [expr {1 + [string length $max]}] \
4543 -font font_ui
4544 bind $w.$f.$optid.v <FocusIn> {%W selection range 0 end}
4545 pack $w.$f.$optid.v -side right -anchor e -padx 5
4546 pack $w.$f.$optid -side top -anchor w -fill x
4547 }
4548 t {
4549 frame $w.$f.$optid
4550 label $w.$f.$optid.l -text "$text:" -font font_ui
4551 entry $w.$f.$optid.v \
4552 -borderwidth 1 \
4553 -relief sunken \
4554 -width 20 \
4555 -textvariable ${f}_config_new($name) \
4556 -font font_ui
4557 pack $w.$f.$optid.l -side left -anchor w
4558 pack $w.$f.$optid.v -side left -anchor w \
4559 -fill x -expand 1 \
4560 -padx 5
4561 pack $w.$f.$optid -side top -anchor w -fill x
4562 }
4563 }
4564 }
4565 }
4566 set all_fonts [lsort [font families]]
4568 foreach option $font_descs {
4569 set name [lindex $option 0]
4570 set font [lindex $option 1]
4571 set text [lindex $option 2]
4572 set global_config_new(gui.$font^^family) \
4574 [font configure $font -family]
4575 set global_config_new(gui.$font^^size) \
4576 [font configure $font -size]
4577 frame $w.global.$name
4579 label $w.global.$name.l -text "$text:" -font font_ui
4580 pack $w.global.$name.l -side left -anchor w -fill x
4581 eval tk_optionMenu $w.global.$name.family \
4582 global_config_new(gui.$font^^family) \
4583 $all_fonts
4584 spinbox $w.global.$name.size \
4585 -textvariable global_config_new(gui.$font^^size) \
4586 -from 2 -to 80 -increment 1 \
4587 -width 3 \
4588 -font font_ui
4589 bind $w.global.$name.size <FocusIn> {%W selection range 0 end}
4590 pack $w.global.$name.size -side right -anchor e
4591 pack $w.global.$name.family -side right -anchor e
4592 pack $w.global.$name -side top -anchor w -fill x
4593 }
4594 bind $w <Visibility> "grab $w; focus $w"
4596 bind $w <Key-Escape> "destroy $w"
4597 wm title $w "[appname] ([reponame]): Options"
4598 tkwait window $w
4599}
4600proc do_restore_defaults {} {
4602 global font_descs default_config repo_config
4603 global repo_config_new global_config_new
4604 foreach name [array names default_config] {
4606 set repo_config_new($name) $default_config($name)
4607 set global_config_new($name) $default_config($name)
4608 }
4609 foreach option $font_descs {
4611 set name [lindex $option 0]
4612 set repo_config(gui.$name) $default_config(gui.$name)
4613 }
4614 apply_config
4615 foreach option $font_descs {
4617 set name [lindex $option 0]
4618 set font [lindex $option 1]
4619 set global_config_new(gui.$font^^family) \
4620 [font configure $font -family]
4621 set global_config_new(gui.$font^^size) \
4622 [font configure $font -size]
4623 }
4624}
4625proc do_save_config {w} {
4627 if {[catch {save_config} err]} {
4628 error_popup "Failed to completely save options:\n\n$err"
4629 }
4630 reshow_diff
4631 destroy $w
4632}
4633proc do_windows_shortcut {} {
4635 global argv0
4636 set fn [tk_getSaveFile \
4638 -parent . \
4639 -title "[appname] ([reponame]): Create Desktop Icon" \
4640 -initialfile "Git [reponame].bat"]
4641 if {$fn != {}} {
4642 if {[catch {
4643 set fd [open $fn w]
4644 puts $fd "@ECHO Entering [reponame]"
4645 puts $fd "@ECHO Starting git-gui... please wait..."
4646 puts $fd "@SET PATH=[file normalize [gitexec]];%PATH%"
4647 puts $fd "@SET GIT_DIR=[file normalize [gitdir]]"
4648 puts -nonewline $fd "@\"[info nameofexecutable]\""
4649 puts $fd " \"[file normalize $argv0]\""
4650 close $fd
4651 } err]} {
4652 error_popup "Cannot write script:\n\n$err"
4653 }
4654 }
4655}
4656proc do_cygwin_shortcut {} {
4658 global argv0
4659 if {[catch {
4661 set desktop [exec cygpath \
4662 --windows \
4663 --absolute \
4664 --long-name \
4665 --desktop]
4666 }]} {
4667 set desktop .
4668 }
4669 set fn [tk_getSaveFile \
4670 -parent . \
4671 -title "[appname] ([reponame]): Create Desktop Icon" \
4672 -initialdir $desktop \
4673 -initialfile "Git [reponame].bat"]
4674 if {$fn != {}} {
4675 if {[catch {
4676 set fd [open $fn w]
4677 set sh [exec cygpath \
4678 --windows \
4679 --absolute \
4680 /bin/sh]
4681 set me [exec cygpath \
4682 --unix \
4683 --absolute \
4684 $argv0]
4685 set gd [exec cygpath \
4686 --unix \
4687 --absolute \
4688 [gitdir]]
4689 set gw [exec cygpath \
4690 --windows \
4691 --absolute \
4692 [file dirname [gitdir]]]
4693 regsub -all ' $me "'\\''" me
4694 regsub -all ' $gd "'\\''" gd
4695 puts $fd "@ECHO Entering $gw"
4696 puts $fd "@ECHO Starting git-gui... please wait..."
4697 puts -nonewline $fd "@\"$sh\" --login -c \""
4698 puts -nonewline $fd "GIT_DIR='$gd'"
4699 puts -nonewline $fd " '$me'"
4700 puts $fd "&\""
4701 close $fd
4702 } err]} {
4703 error_popup "Cannot write script:\n\n$err"
4704 }
4705 }
4706}
4707proc do_macosx_app {} {
4709 global argv0 env
4710 set fn [tk_getSaveFile \
4712 -parent . \
4713 -title "[appname] ([reponame]): Create Desktop Icon" \
4714 -initialdir [file join $env(HOME) Desktop] \
4715 -initialfile "Git [reponame].app"]
4716 if {$fn != {}} {
4717 if {[catch {
4718 set Contents [file join $fn Contents]
4719 set MacOS [file join $Contents MacOS]
4720 set exe [file join $MacOS git-gui]
4721 file mkdir $MacOS
4723 set fd [open [file join $Contents Info.plist] w]
4725 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
4726<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
4727<plist version="1.0">
4728<dict>
4729 <key>CFBundleDevelopmentRegion</key>
4730 <string>English</string>
4731 <key>CFBundleExecutable</key>
4732 <string>git-gui</string>
4733 <key>CFBundleIdentifier</key>
4734 <string>org.spearce.git-gui</string>
4735 <key>CFBundleInfoDictionaryVersion</key>
4736 <string>6.0</string>
4737 <key>CFBundlePackageType</key>
4738 <string>APPL</string>
4739 <key>CFBundleSignature</key>
4740 <string>????</string>
4741 <key>CFBundleVersion</key>
4742 <string>1.0</string>
4743 <key>NSPrincipalClass</key>
4744 <string>NSApplication</string>
4745</dict>
4746</plist>}
4747 close $fd
4748 set fd [open $exe w]
4750 set gd [file normalize [gitdir]]
4751 set ep [file normalize [gitexec]]
4752 regsub -all ' $gd "'\\''" gd
4753 regsub -all ' $ep "'\\''" ep
4754 puts $fd "#!/bin/sh"
4755 foreach name [array names env] {
4756 if {[string match GIT_* $name]} {
4757 regsub -all ' $env($name) "'\\''" v
4758 puts $fd "export $name='$v'"
4759 }
4760 }
4761 puts $fd "export PATH='$ep':\$PATH"
4762 puts $fd "export GIT_DIR='$gd'"
4763 puts $fd "exec [file normalize $argv0]"
4764 close $fd
4765 file attributes $exe -permissions u+x,g+x,o+x
4767 } err]} {
4768 error_popup "Cannot write icon:\n\n$err"
4769 }
4770 }
4771}
4772proc toggle_or_diff {w x y} {
4774 global file_states file_lists current_diff_path ui_index ui_workdir
4775 global last_clicked selected_paths
4776 set pos [split [$w index @$x,$y] .]
4778 set lno [lindex $pos 0]
4779 set col [lindex $pos 1]
4780 set path [lindex $file_lists($w) [expr {$lno - 1}]]
4781 if {$path eq {}} {
4782 set last_clicked {}
4783 return
4784 }
4785 set last_clicked [list $w $lno]
4787 array unset selected_paths
4788 $ui_index tag remove in_sel 0.0 end
4789 $ui_workdir tag remove in_sel 0.0 end
4790 if {$col == 0} {
4792 if {$current_diff_path eq $path} {
4793 set after {reshow_diff;}
4794 } else {
4795 set after {}
4796 }
4797 if {$w eq $ui_index} {
4798 update_indexinfo \
4799 "Unstaging [short_path $path] from commit" \
4800 [list $path] \
4801 [concat $after {set ui_status_value {Ready.}}]
4802 } elseif {$w eq $ui_workdir} {
4803 update_index \
4804 "Adding [short_path $path]" \
4805 [list $path] \
4806 [concat $after {set ui_status_value {Ready.}}]
4807 }
4808 } else {
4809 show_diff $path $w $lno
4810 }
4811}
4812proc add_one_to_selection {w x y} {
4814 global file_lists last_clicked selected_paths
4815 set lno [lindex [split [$w index @$x,$y] .] 0]
4817 set path [lindex $file_lists($w) [expr {$lno - 1}]]
4818 if {$path eq {}} {
4819 set last_clicked {}
4820 return
4821 }
4822 if {$last_clicked ne {}
4824 && [lindex $last_clicked 0] ne $w} {
4825 array unset selected_paths
4826 [lindex $last_clicked 0] tag remove in_sel 0.0 end
4827 }
4828 set last_clicked [list $w $lno]
4830 if {[catch {set in_sel $selected_paths($path)}]} {
4831 set in_sel 0
4832 }
4833 if {$in_sel} {
4834 unset selected_paths($path)
4835 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
4836 } else {
4837 set selected_paths($path) 1
4838 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
4839 }
4840}
4841proc add_range_to_selection {w x y} {
4843 global file_lists last_clicked selected_paths
4844 if {[lindex $last_clicked 0] ne $w} {
4846 toggle_or_diff $w $x $y
4847 return
4848 }
4849 set lno [lindex [split [$w index @$x,$y] .] 0]
4851 set lc [lindex $last_clicked 1]
4852 if {$lc < $lno} {
4853 set begin $lc
4854 set end $lno
4855 } else {
4856 set begin $lno
4857 set end $lc
4858 }
4859 foreach path [lrange $file_lists($w) \
4861 [expr {$begin - 1}] \
4862 [expr {$end - 1}]] {
4863 set selected_paths($path) 1
4864 }
4865 $w tag add in_sel $begin.0 [expr {$end + 1}].0
4866}
4867######################################################################
4869##
4870## config defaults
4871set cursor_ptr arrow
4873font create font_diff -family Courier -size 10
4874font create font_ui
4875catch {
4876 label .dummy
4877 eval font configure font_ui [font actual [.dummy cget -font]]
4878 destroy .dummy
4879}
4880font create font_uibold
4882font create font_diffbold
4883if {[is_Windows]} {
4885 set M1B Control
4886 set M1T Ctrl
4887} elseif {[is_MacOSX]} {
4888 set M1B M1
4889 set M1T Cmd
4890} else {
4891 set M1B M1
4892 set M1T M1
4893}
4894proc apply_config {} {
4896 global repo_config font_descs
4897 foreach option $font_descs {
4899 set name [lindex $option 0]
4900 set font [lindex $option 1]
4901 if {[catch {
4902 foreach {cn cv} $repo_config(gui.$name) {
4903 font configure $font $cn $cv
4904 }
4905 } err]} {
4906 error_popup "Invalid font specified in gui.$name:\n\n$err"
4907 }
4908 foreach {cn cv} [font configure $font] {
4909 font configure ${font}bold $cn $cv
4910 }
4911 font configure ${font}bold -weight bold
4912 }
4913}
4914set default_config(merge.summary) false
4916set default_config(merge.verbosity) 2
4917set default_config(user.name) {}
4918set default_config(user.email) {}
4919set default_config(gui.trustmtime) false
4921set default_config(gui.diffcontext) 5
4922set default_config(gui.newbranchtemplate) {}
4923set default_config(gui.fontui) [font configure font_ui]
4924set default_config(gui.fontdiff) [font configure font_diff]
4925set font_descs {
4926 {fontui font_ui {Main Font}}
4927 {fontdiff font_diff {Diff/Console Font}}
4928}
4929load_config 0
4930apply_config
4931######################################################################
4933##
4934## feature option selection
4935if {[regexp {^git-(.+)$} [appname] _junk subcommand]} {
4937 unset _junk
4938} else {
4939 set subcommand gui
4940}
4941if {$subcommand eq {gui.sh}} {
4942 set subcommand gui
4943}
4944if {$subcommand eq {gui} && [llength $argv] > 0} {
4945 set subcommand [lindex $argv 0]
4946 set argv [lrange $argv 1 end]
4947}
4948enable_option multicommit
4950enable_option branch
4951enable_option transport
4952switch -- $subcommand {
4954blame {
4955 disable_option multicommit
4956 disable_option branch
4957 disable_option transport
4958}
4959citool {
4960 enable_option singlecommit
4961 disable_option multicommit
4963 disable_option branch
4964 disable_option transport
4965}
4966}
4967######################################################################
4969##
4970## ui construction
4971set ui_comm {}
4973# -- Menu Bar
4975#
4976menu .mbar -tearoff 0
4977.mbar add cascade -label Repository -menu .mbar.repository
4978.mbar add cascade -label Edit -menu .mbar.edit
4979if {[is_enabled branch]} {
4980 .mbar add cascade -label Branch -menu .mbar.branch
4981}
4982if {[is_enabled multicommit] || [is_enabled singlecommit]} {
4983 .mbar add cascade -label Commit -menu .mbar.commit
4984}
4985if {[is_enabled transport]} {
4986 .mbar add cascade -label Merge -menu .mbar.merge
4987 .mbar add cascade -label Fetch -menu .mbar.fetch
4988 .mbar add cascade -label Push -menu .mbar.push
4989}
4990. configure -menu .mbar
4991# -- Repository Menu
4993#
4994menu .mbar.repository
4995.mbar.repository add command \
4997 -label {Browse Current Branch} \
4998 -command {new_browser $current_branch} \
4999 -font font_ui
5000trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Browse \$current_branch\" ;#"
5001.mbar.repository add separator
5002.mbar.repository add command \
5004 -label {Visualize Current Branch} \
5005 -command {do_gitk $current_branch} \
5006 -font font_ui
5007trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Visualize \$current_branch\" ;#"
5008.mbar.repository add command \
5009 -label {Visualize All Branches} \
5010 -command {do_gitk --all} \
5011 -font font_ui
5012.mbar.repository add separator
5013if {[is_enabled multicommit]} {
5015 .mbar.repository add command -label {Database Statistics} \
5016 -command do_stats \
5017 -font font_ui
5018 .mbar.repository add command -label {Compress Database} \
5020 -command do_gc \
5021 -font font_ui
5022 .mbar.repository add command -label {Verify Database} \
5024 -command do_fsck_objects \
5025 -font font_ui
5026 .mbar.repository add separator
5028 if {[is_Cygwin]} {
5030 .mbar.repository add command \
5031 -label {Create Desktop Icon} \
5032 -command do_cygwin_shortcut \
5033 -font font_ui
5034 } elseif {[is_Windows]} {
5035 .mbar.repository add command \
5036 -label {Create Desktop Icon} \
5037 -command do_windows_shortcut \
5038 -font font_ui
5039 } elseif {[is_MacOSX]} {
5040 .mbar.repository add command \
5041 -label {Create Desktop Icon} \
5042 -command do_macosx_app \
5043 -font font_ui
5044 }
5045}
5046.mbar.repository add command -label Quit \
5048 -command do_quit \
5049 -accelerator $M1T-Q \
5050 -font font_ui
5051# -- Edit Menu
5053#
5054menu .mbar.edit
5055.mbar.edit add command -label Undo \
5056 -command {catch {[focus] edit undo}} \
5057 -accelerator $M1T-Z \
5058 -font font_ui
5059.mbar.edit add command -label Redo \
5060 -command {catch {[focus] edit redo}} \
5061 -accelerator $M1T-Y \
5062 -font font_ui
5063.mbar.edit add separator
5064.mbar.edit add command -label Cut \
5065 -command {catch {tk_textCut [focus]}} \
5066 -accelerator $M1T-X \
5067 -font font_ui
5068.mbar.edit add command -label Copy \
5069 -command {catch {tk_textCopy [focus]}} \
5070 -accelerator $M1T-C \
5071 -font font_ui
5072.mbar.edit add command -label Paste \
5073 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
5074 -accelerator $M1T-V \
5075 -font font_ui
5076.mbar.edit add command -label Delete \
5077 -command {catch {[focus] delete sel.first sel.last}} \
5078 -accelerator Del \
5079 -font font_ui
5080.mbar.edit add separator
5081.mbar.edit add command -label {Select All} \
5082 -command {catch {[focus] tag add sel 0.0 end}} \
5083 -accelerator $M1T-A \
5084 -font font_ui
5085# -- Branch Menu
5087#
5088if {[is_enabled branch]} {
5089 menu .mbar.branch
5090 .mbar.branch add command -label {Create...} \
5092 -command do_create_branch \
5093 -accelerator $M1T-N \
5094 -font font_ui
5095 lappend disable_on_lock [list .mbar.branch entryconf \
5096 [.mbar.branch index last] -state]
5097 .mbar.branch add command -label {Delete...} \
5099 -command do_delete_branch \
5100 -font font_ui
5101 lappend disable_on_lock [list .mbar.branch entryconf \
5102 [.mbar.branch index last] -state]
5103}
5104# -- Commit Menu
5106#
5107if {[is_enabled multicommit] || [is_enabled singlecommit]} {
5108 menu .mbar.commit
5109 .mbar.commit add radiobutton \
5111 -label {New Commit} \
5112 -command do_select_commit_type \
5113 -variable selected_commit_type \
5114 -value new \
5115 -font font_ui
5116 lappend disable_on_lock \
5117 [list .mbar.commit entryconf [.mbar.commit index last] -state]
5118 .mbar.commit add radiobutton \
5120 -label {Amend Last Commit} \
5121 -command do_select_commit_type \
5122 -variable selected_commit_type \
5123 -value amend \
5124 -font font_ui
5125 lappend disable_on_lock \
5126 [list .mbar.commit entryconf [.mbar.commit index last] -state]
5127 .mbar.commit add separator
5129 .mbar.commit add command -label Rescan \
5131 -command do_rescan \
5132 -accelerator F5 \
5133 -font font_ui
5134 lappend disable_on_lock \
5135 [list .mbar.commit entryconf [.mbar.commit index last] -state]
5136 .mbar.commit add command -label {Add To Commit} \
5138 -command do_add_selection \
5139 -font font_ui
5140 lappend disable_on_lock \
5141 [list .mbar.commit entryconf [.mbar.commit index last] -state]
5142 .mbar.commit add command -label {Add Existing To Commit} \
5144 -command do_add_all \
5145 -accelerator $M1T-I \
5146 -font font_ui
5147 lappend disable_on_lock \
5148 [list .mbar.commit entryconf [.mbar.commit index last] -state]
5149 .mbar.commit add command -label {Unstage From Commit} \
5151 -command do_unstage_selection \
5152 -font font_ui
5153 lappend disable_on_lock \
5154 [list .mbar.commit entryconf [.mbar.commit index last] -state]
5155 .mbar.commit add command -label {Revert Changes} \
5157 -command do_revert_selection \
5158 -font font_ui
5159 lappend disable_on_lock \
5160 [list .mbar.commit entryconf [.mbar.commit index last] -state]
5161 .mbar.commit add separator
5163 .mbar.commit add command -label {Sign Off} \
5165 -command do_signoff \
5166 -accelerator $M1T-S \
5167 -font font_ui
5168 .mbar.commit add command -label Commit \
5170 -command do_commit \
5171 -accelerator $M1T-Return \
5172 -font font_ui
5173 lappend disable_on_lock \
5174 [list .mbar.commit entryconf [.mbar.commit index last] -state]
5175}
5176if {[is_MacOSX]} {
5178 # -- Apple Menu (Mac OS X only)
5179 #
5180 .mbar add cascade -label Apple -menu .mbar.apple
5181 menu .mbar.apple
5182 .mbar.apple add command -label "About [appname]" \
5184 -command do_about \
5185 -font font_ui
5186 .mbar.apple add command -label "[appname] Options..." \
5187 -command do_options \
5188 -font font_ui
5189} else {
5190 # -- Edit Menu
5191 #
5192 .mbar.edit add separator
5193 .mbar.edit add command -label {Options...} \
5194 -command do_options \
5195 -font font_ui
5196 # -- Tools Menu
5198 #
5199 if {[file exists /usr/local/miga/lib/gui-miga]
5200 && [file exists .pvcsrc]} {
5201 proc do_miga {} {
5202 global ui_status_value
5203 if {![lock_index update]} return
5204 set cmd [list sh --login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
5205 set miga_fd [open "|$cmd" r]
5206 fconfigure $miga_fd -blocking 0
5207 fileevent $miga_fd readable [list miga_done $miga_fd]
5208 set ui_status_value {Running miga...}
5209 }
5210 proc miga_done {fd} {
5211 read $fd 512
5212 if {[eof $fd]} {
5213 close $fd
5214 unlock_index
5215 rescan [list set ui_status_value {Ready.}]
5216 }
5217 }
5218 .mbar add cascade -label Tools -menu .mbar.tools
5219 menu .mbar.tools
5220 .mbar.tools add command -label "Migrate" \
5221 -command do_miga \
5222 -font font_ui
5223 lappend disable_on_lock \
5224 [list .mbar.tools entryconf [.mbar.tools index last] -state]
5225 }
5226}
5227# -- Help Menu
5229#
5230.mbar add cascade -label Help -menu .mbar.help
5231menu .mbar.help
5232if {![is_MacOSX]} {
5234 .mbar.help add command -label "About [appname]" \
5235 -command do_about \
5236 -font font_ui
5237}
5238set browser {}
5240catch {set browser $repo_config(instaweb.browser)}
5241set doc_path [file dirname [gitexec]]
5242set doc_path [file join $doc_path Documentation index.html]
5243if {[is_Cygwin]} {
5245 set doc_path [exec cygpath --windows $doc_path]
5246}
5247if {$browser eq {}} {
5249 if {[is_MacOSX]} {
5250 set browser open
5251 } elseif {[is_Cygwin]} {
5252 set program_files [file dirname [exec cygpath --windir]]
5253 set program_files [file join $program_files {Program Files}]
5254 set firefox [file join $program_files {Mozilla Firefox} firefox.exe]
5255 set ie [file join $program_files {Internet Explorer} IEXPLORE.EXE]
5256 if {[file exists $firefox]} {
5257 set browser $firefox
5258 } elseif {[file exists $ie]} {
5259 set browser $ie
5260 }
5261 unset program_files firefox ie
5262 }
5263}
5264if {[file isfile $doc_path]} {
5266 set doc_url "file:$doc_path"
5267} else {
5268 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
5269}
5270if {$browser ne {}} {
5272 .mbar.help add command -label {Online Documentation} \
5273 -command [list exec $browser $doc_url &] \
5274 -font font_ui
5275}
5276unset browser doc_path doc_url
5277# -- Standard bindings
5279#
5280bind . <Destroy> do_quit
5281bind all <$M1B-Key-q> do_quit
5282bind all <$M1B-Key-Q> do_quit
5283bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
5284bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
5285# -- Not a normal commit type invocation? Do that instead!
5287#
5288switch -- $subcommand {
5289blame {
5290 if {[llength $argv] != 2} {
5291 puts stderr "usage: $argv0 blame commit path"
5292 exit 1
5293 }
5294 set current_branch [lindex $argv 0]
5295 show_blame $current_branch [lindex $argv 1]
5296 return
5297}
5298citool -
5299gui {
5300 if {[llength $argv] != 0} {
5301 puts -nonewline stderr "usage: $argv0"
5302 if {$subcommand ne {gui} && [appname] ne "git-$subcommand"} {
5303 puts -nonewline stderr " $subcommand"
5304 }
5305 puts stderr {}
5306 exit 1
5307 }
5308 # fall through to setup UI for commits
5309}
5310default {
5311 puts stderr "usage: $argv0 \[{blame|citool}\]"
5312 exit 1
5313}
5314}
5315# -- Branch Control
5317#
5318frame .branch \
5319 -borderwidth 1 \
5320 -relief sunken
5321label .branch.l1 \
5322 -text {Current Branch:} \
5323 -anchor w \
5324 -justify left \
5325 -font font_ui
5326label .branch.cb \
5327 -textvariable current_branch \
5328 -anchor w \
5329 -justify left \
5330 -font font_ui
5331pack .branch.l1 -side left
5332pack .branch.cb -side left -fill x
5333pack .branch -side top -fill x
5334if {[is_enabled branch]} {
5336 menu .mbar.merge
5337 .mbar.merge add command -label {Local Merge...} \
5338 -command do_local_merge \
5339 -font font_ui
5340 lappend disable_on_lock \
5341 [list .mbar.merge entryconf [.mbar.merge index last] -state]
5342 .mbar.merge add command -label {Abort Merge...} \
5343 -command do_reset_hard \
5344 -font font_ui
5345 lappend disable_on_lock \
5346 [list .mbar.merge entryconf [.mbar.merge index last] -state]
5347 menu .mbar.fetch
5350 menu .mbar.push
5352 .mbar.push add command -label {Push...} \
5353 -command do_push_anywhere \
5354 -font font_ui
5355}
5356# -- Main Window Layout
5358#
5359panedwindow .vpane -orient vertical
5360panedwindow .vpane.files -orient horizontal
5361.vpane add .vpane.files -sticky nsew -height 100 -width 200
5362pack .vpane -anchor n -side top -fill both -expand 1
5363# -- Index File List
5365#
5366frame .vpane.files.index -height 100 -width 200
5367label .vpane.files.index.title -text {Changes To Be Committed} \
5368 -background green \
5369 -font font_ui
5370text $ui_index -background white -borderwidth 0 \
5371 -width 20 -height 10 \
5372 -wrap none \
5373 -font font_ui \
5374 -cursor $cursor_ptr \
5375 -xscrollcommand {.vpane.files.index.sx set} \
5376 -yscrollcommand {.vpane.files.index.sy set} \
5377 -state disabled
5378scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
5379scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
5380pack .vpane.files.index.title -side top -fill x
5381pack .vpane.files.index.sx -side bottom -fill x
5382pack .vpane.files.index.sy -side right -fill y
5383pack $ui_index -side left -fill both -expand 1
5384.vpane.files add .vpane.files.index -sticky nsew
5385# -- Working Directory File List
5387#
5388frame .vpane.files.workdir -height 100 -width 200
5389label .vpane.files.workdir.title -text {Changed But Not Updated} \
5390 -background red \
5391 -font font_ui
5392text $ui_workdir -background white -borderwidth 0 \
5393 -width 20 -height 10 \
5394 -wrap none \
5395 -font font_ui \
5396 -cursor $cursor_ptr \
5397 -xscrollcommand {.vpane.files.workdir.sx set} \
5398 -yscrollcommand {.vpane.files.workdir.sy set} \
5399 -state disabled
5400scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
5401scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
5402pack .vpane.files.workdir.title -side top -fill x
5403pack .vpane.files.workdir.sx -side bottom -fill x
5404pack .vpane.files.workdir.sy -side right -fill y
5405pack $ui_workdir -side left -fill both -expand 1
5406.vpane.files add .vpane.files.workdir -sticky nsew
5407foreach i [list $ui_index $ui_workdir] {
5409 $i tag conf in_diff -font font_uibold
5410 $i tag conf in_sel \
5411 -background [$i cget -foreground] \
5412 -foreground [$i cget -background]
5413}
5414unset i
5415# -- Diff and Commit Area
5417#
5418frame .vpane.lower -height 300 -width 400
5419frame .vpane.lower.commarea
5420frame .vpane.lower.diff -relief sunken -borderwidth 1
5421pack .vpane.lower.commarea -side top -fill x
5422pack .vpane.lower.diff -side bottom -fill both -expand 1
5423.vpane add .vpane.lower -sticky nsew
5424# -- Commit Area Buttons
5426#
5427frame .vpane.lower.commarea.buttons
5428label .vpane.lower.commarea.buttons.l -text {} \
5429 -anchor w \
5430 -justify left \
5431 -font font_ui
5432pack .vpane.lower.commarea.buttons.l -side top -fill x
5433pack .vpane.lower.commarea.buttons -side left -fill y
5434button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
5436 -command do_rescan \
5437 -font font_ui
5438pack .vpane.lower.commarea.buttons.rescan -side top -fill x
5439lappend disable_on_lock \
5440 {.vpane.lower.commarea.buttons.rescan conf -state}
5441button .vpane.lower.commarea.buttons.incall -text {Add Existing} \
5443 -command do_add_all \
5444 -font font_ui
5445pack .vpane.lower.commarea.buttons.incall -side top -fill x
5446lappend disable_on_lock \
5447 {.vpane.lower.commarea.buttons.incall conf -state}
5448button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
5450 -command do_signoff \
5451 -font font_ui
5452pack .vpane.lower.commarea.buttons.signoff -side top -fill x
5453button .vpane.lower.commarea.buttons.commit -text {Commit} \
5455 -command do_commit \
5456 -font font_ui
5457pack .vpane.lower.commarea.buttons.commit -side top -fill x
5458lappend disable_on_lock \
5459 {.vpane.lower.commarea.buttons.commit conf -state}
5460# -- Commit Message Buffer
5462#
5463frame .vpane.lower.commarea.buffer
5464frame .vpane.lower.commarea.buffer.header
5465set ui_comm .vpane.lower.commarea.buffer.t
5466set ui_coml .vpane.lower.commarea.buffer.header.l
5467radiobutton .vpane.lower.commarea.buffer.header.new \
5468 -text {New Commit} \
5469 -command do_select_commit_type \
5470 -variable selected_commit_type \
5471 -value new \
5472 -font font_ui
5473lappend disable_on_lock \
5474 [list .vpane.lower.commarea.buffer.header.new conf -state]
5475radiobutton .vpane.lower.commarea.buffer.header.amend \
5476 -text {Amend Last Commit} \
5477 -command do_select_commit_type \
5478 -variable selected_commit_type \
5479 -value amend \
5480 -font font_ui
5481lappend disable_on_lock \
5482 [list .vpane.lower.commarea.buffer.header.amend conf -state]
5483label $ui_coml \
5484 -anchor w \
5485 -justify left \
5486 -font font_ui
5487proc trace_commit_type {varname args} {
5488 global ui_coml commit_type
5489 switch -glob -- $commit_type {
5490 initial {set txt {Initial Commit Message:}}
5491 amend {set txt {Amended Commit Message:}}
5492 amend-initial {set txt {Amended Initial Commit Message:}}
5493 amend-merge {set txt {Amended Merge Commit Message:}}
5494 merge {set txt {Merge Commit Message:}}
5495 * {set txt {Commit Message:}}
5496 }
5497 $ui_coml conf -text $txt
5498}
5499trace add variable commit_type write trace_commit_type
5500pack $ui_coml -side left -fill x
5501pack .vpane.lower.commarea.buffer.header.amend -side right
5502pack .vpane.lower.commarea.buffer.header.new -side right
5503text $ui_comm -background white -borderwidth 1 \
5505 -undo true \
5506 -maxundo 20 \
5507 -autoseparators true \
5508 -relief sunken \
5509 -width 75 -height 9 -wrap none \
5510 -font font_diff \
5511 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
5512scrollbar .vpane.lower.commarea.buffer.sby \
5513 -command [list $ui_comm yview]
5514pack .vpane.lower.commarea.buffer.header -side top -fill x
5515pack .vpane.lower.commarea.buffer.sby -side right -fill y
5516pack $ui_comm -side left -fill y
5517pack .vpane.lower.commarea.buffer -side left -fill y
5518# -- Commit Message Buffer Context Menu
5520#
5521set ctxm .vpane.lower.commarea.buffer.ctxm
5522menu $ctxm -tearoff 0
5523$ctxm add command \
5524 -label {Cut} \
5525 -font font_ui \
5526 -command {tk_textCut $ui_comm}
5527$ctxm add command \
5528 -label {Copy} \
5529 -font font_ui \
5530 -command {tk_textCopy $ui_comm}
5531$ctxm add command \
5532 -label {Paste} \
5533 -font font_ui \
5534 -command {tk_textPaste $ui_comm}
5535$ctxm add command \
5536 -label {Delete} \
5537 -font font_ui \
5538 -command {$ui_comm delete sel.first sel.last}
5539$ctxm add separator
5540$ctxm add command \
5541 -label {Select All} \
5542 -font font_ui \
5543 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
5544$ctxm add command \
5545 -label {Copy All} \
5546 -font font_ui \
5547 -command {
5548 $ui_comm tag add sel 0.0 end
5549 tk_textCopy $ui_comm
5550 $ui_comm tag remove sel 0.0 end
5551 }
5552$ctxm add separator
5553$ctxm add command \
5554 -label {Sign Off} \
5555 -font font_ui \
5556 -command do_signoff
5557bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
5558# -- Diff Header
5560#
5561set current_diff_path {}
5562set current_diff_side {}
5563set diff_actions [list]
5564proc trace_current_diff_path {varname args} {
5565 global current_diff_path diff_actions file_states
5566 if {$current_diff_path eq {}} {
5567 set s {}
5568 set f {}
5569 set p {}
5570 set o disabled
5571 } else {
5572 set p $current_diff_path
5573 set s [mapdesc [lindex $file_states($p) 0] $p]
5574 set f {File:}
5575 set p [escape_path $p]
5576 set o normal
5577 }
5578 .vpane.lower.diff.header.status configure -text $s
5580 .vpane.lower.diff.header.file configure -text $f
5581 .vpane.lower.diff.header.path configure -text $p
5582 foreach w $diff_actions {
5583 uplevel #0 $w $o
5584 }
5585}
5586trace add variable current_diff_path write trace_current_diff_path
5587frame .vpane.lower.diff.header -background orange
5589label .vpane.lower.diff.header.status \
5590 -background orange \
5591 -width $max_status_desc \
5592 -anchor w \
5593 -justify left \
5594 -font font_ui
5595label .vpane.lower.diff.header.file \
5596 -background orange \
5597 -anchor w \
5598 -justify left \
5599 -font font_ui
5600label .vpane.lower.diff.header.path \
5601 -background orange \
5602 -anchor w \
5603 -justify left \
5604 -font font_ui
5605pack .vpane.lower.diff.header.status -side left
5606pack .vpane.lower.diff.header.file -side left
5607pack .vpane.lower.diff.header.path -fill x
5608set ctxm .vpane.lower.diff.header.ctxm
5609menu $ctxm -tearoff 0
5610$ctxm add command \
5611 -label {Copy} \
5612 -font font_ui \
5613 -command {
5614 clipboard clear
5615 clipboard append \
5616 -format STRING \
5617 -type STRING \
5618 -- $current_diff_path
5619 }
5620lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5621bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
5622# -- Diff Body
5624#
5625frame .vpane.lower.diff.body
5626set ui_diff .vpane.lower.diff.body.t
5627text $ui_diff -background white -borderwidth 0 \
5628 -width 80 -height 15 -wrap none \
5629 -font font_diff \
5630 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
5631 -yscrollcommand {.vpane.lower.diff.body.sby set} \
5632 -state disabled
5633scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
5634 -command [list $ui_diff xview]
5635scrollbar .vpane.lower.diff.body.sby -orient vertical \
5636 -command [list $ui_diff yview]
5637pack .vpane.lower.diff.body.sbx -side bottom -fill x
5638pack .vpane.lower.diff.body.sby -side right -fill y
5639pack $ui_diff -side left -fill both -expand 1
5640pack .vpane.lower.diff.header -side top -fill x
5641pack .vpane.lower.diff.body -side bottom -fill both -expand 1
5642$ui_diff tag conf d_cr -elide true
5644$ui_diff tag conf d_@ -foreground blue -font font_diffbold
5645$ui_diff tag conf d_+ -foreground {#00a000}
5646$ui_diff tag conf d_- -foreground red
5647$ui_diff tag conf d_++ -foreground {#00a000}
5649$ui_diff tag conf d_-- -foreground red
5650$ui_diff tag conf d_+s \
5651 -foreground {#00a000} \
5652 -background {#e2effa}
5653$ui_diff tag conf d_-s \
5654 -foreground red \
5655 -background {#e2effa}
5656$ui_diff tag conf d_s+ \
5657 -foreground {#00a000} \
5658 -background ivory1
5659$ui_diff tag conf d_s- \
5660 -foreground red \
5661 -background ivory1
5662$ui_diff tag conf d<<<<<<< \
5664 -foreground orange \
5665 -font font_diffbold
5666$ui_diff tag conf d======= \
5667 -foreground orange \
5668 -font font_diffbold
5669$ui_diff tag conf d>>>>>>> \
5670 -foreground orange \
5671 -font font_diffbold
5672$ui_diff tag raise sel
5674# -- Diff Body Context Menu
5676#
5677set ctxm .vpane.lower.diff.body.ctxm
5678menu $ctxm -tearoff 0
5679$ctxm add command \
5680 -label {Refresh} \
5681 -font font_ui \
5682 -command reshow_diff
5683lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5684$ctxm add command \
5685 -label {Copy} \
5686 -font font_ui \
5687 -command {tk_textCopy $ui_diff}
5688lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5689$ctxm add command \
5690 -label {Select All} \
5691 -font font_ui \
5692 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
5693lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5694$ctxm add command \
5695 -label {Copy All} \
5696 -font font_ui \
5697 -command {
5698 $ui_diff tag add sel 0.0 end
5699 tk_textCopy $ui_diff
5700 $ui_diff tag remove sel 0.0 end
5701 }
5702lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5703$ctxm add separator
5704$ctxm add command \
5705 -label {Apply/Reverse Hunk} \
5706 -font font_ui \
5707 -command {apply_hunk $cursorX $cursorY}
5708set ui_diff_applyhunk [$ctxm index last]
5709lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
5710$ctxm add separator
5711$ctxm add command \
5712 -label {Decrease Font Size} \
5713 -font font_ui \
5714 -command {incr_font_size font_diff -1}
5715lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5716$ctxm add command \
5717 -label {Increase Font Size} \
5718 -font font_ui \
5719 -command {incr_font_size font_diff 1}
5720lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5721$ctxm add separator
5722$ctxm add command \
5723 -label {Show Less Context} \
5724 -font font_ui \
5725 -command {if {$repo_config(gui.diffcontext) >= 2} {
5726 incr repo_config(gui.diffcontext) -1
5727 reshow_diff
5728 }}
5729lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5730$ctxm add command \
5731 -label {Show More Context} \
5732 -font font_ui \
5733 -command {
5734 incr repo_config(gui.diffcontext)
5735 reshow_diff
5736 }
5737lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5738$ctxm add separator
5739$ctxm add command -label {Options...} \
5740 -font font_ui \
5741 -command do_options
5742bind_button3 $ui_diff "
5743 set cursorX %x
5744 set cursorY %y
5745 if {\$ui_index eq \$current_diff_side} {
5746 $ctxm entryconf $ui_diff_applyhunk -label {Unstage Hunk From Commit}
5747 } else {
5748 $ctxm entryconf $ui_diff_applyhunk -label {Stage Hunk For Commit}
5749 }
5750 tk_popup $ctxm %X %Y
5751"
5752unset ui_diff_applyhunk
5753# -- Status Bar
5755#
5756set ui_status_value {Initializing...}
5757label .status -textvariable ui_status_value \
5758 -anchor w \
5759 -justify left \
5760 -borderwidth 1 \
5761 -relief sunken \
5762 -font font_ui
5763pack .status -anchor w -side bottom -fill x
5764# -- Load geometry
5766#
5767catch {
5768set gm $repo_config(gui.geometry)
5769wm geometry . [lindex $gm 0]
5770.vpane sash place 0 \
5771 [lindex [.vpane sash coord 0] 0] \
5772 [lindex $gm 1]
5773.vpane.files sash place 0 \
5774 [lindex $gm 2] \
5775 [lindex [.vpane.files sash coord 0] 1]
5776unset gm
5777}
5778# -- Key Bindings
5780#
5781bind $ui_comm <$M1B-Key-Return> {do_commit;break}
5782bind $ui_comm <$M1B-Key-i> {do_add_all;break}
5783bind $ui_comm <$M1B-Key-I> {do_add_all;break}
5784bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
5785bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
5786bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
5787bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
5788bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
5789bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
5790bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
5791bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
5792bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
5794bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
5795bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
5796bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
5797bind $ui_diff <$M1B-Key-v> {break}
5798bind $ui_diff <$M1B-Key-V> {break}
5799bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
5800bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
5801bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
5802bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
5803bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
5804bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
5805bind $ui_diff <Button-1> {focus %W}
5806if {[is_enabled branch]} {
5808 bind . <$M1B-Key-n> do_create_branch
5809 bind . <$M1B-Key-N> do_create_branch
5810}
5811bind all <Key-F5> do_rescan
5813bind all <$M1B-Key-r> do_rescan
5814bind all <$M1B-Key-R> do_rescan
5815bind . <$M1B-Key-s> do_signoff
5816bind . <$M1B-Key-S> do_signoff
5817bind . <$M1B-Key-i> do_add_all
5818bind . <$M1B-Key-I> do_add_all
5819bind . <$M1B-Key-Return> do_commit
5820foreach i [list $ui_index $ui_workdir] {
5821 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
5822 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
5823 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
5824}
5825unset i
5826set file_lists($ui_index) [list]
5828set file_lists($ui_workdir) [list]
5829set HEAD {}
5831set PARENT {}
5832set MERGE_HEAD [list]
5833set commit_type {}
5834set empty_tree {}
5835set current_branch {}
5836set current_diff_path {}
5837set selected_commit_type new
5838wm title . "[appname] ([file normalize [file dirname [gitdir]]])"
5840focus -force $ui_comm
5841# -- Warn the user about environmental problems. Cygwin's Tcl
5843# does *not* pass its env array onto any processes it spawns.
5844# This means that git processes get none of our environment.
5845#
5846if {[is_Cygwin]} {
5847 set ignored_env 0
5848 set suggest_user {}
5849 set msg "Possible environment issues exist.
5850The following environment variables are probably
5852going to be ignored by any Git subprocess run
5853by [appname]:
5854"
5856 foreach name [array names env] {
5857 switch -regexp -- $name {
5858 {^GIT_INDEX_FILE$} -
5859 {^GIT_OBJECT_DIRECTORY$} -
5860 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
5861 {^GIT_DIFF_OPTS$} -
5862 {^GIT_EXTERNAL_DIFF$} -
5863 {^GIT_PAGER$} -
5864 {^GIT_TRACE$} -
5865 {^GIT_CONFIG$} -
5866 {^GIT_CONFIG_LOCAL$} -
5867 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
5868 append msg " - $name\n"
5869 incr ignored_env
5870 }
5871 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
5872 append msg " - $name\n"
5873 incr ignored_env
5874 set suggest_user $name
5875 }
5876 }
5877 }
5878 if {$ignored_env > 0} {
5879 append msg "
5880This is due to a known issue with the
5881Tcl binary distributed by Cygwin."
5882 if {$suggest_user ne {}} {
5884 append msg "
5885A good replacement for $suggest_user
5887is placing values for the user.name and
5888user.email settings into your personal
5889~/.gitconfig file.
5890"
5891 }
5892 warn_popup $msg
5893 }
5894 unset ignored_env msg suggest_user name
5895}
5896# -- Only initialize complex UI if we are going to stay running.
5898#
5899if {[is_enabled transport]} {
5900 load_all_remotes
5901 load_all_heads
5902 populate_branch_menu
5904 populate_fetch_menu
5905 populate_push_menu
5906}
5907# -- Only suggest a gc run if we are going to stay running.
5909#
5910if {[is_enabled multicommit]} {
5911 set object_limit 2000
5912 if {[is_Windows]} {set object_limit 200}
5913 regexp {^([0-9]+) objects,} [exec git count-objects] _junk objects_current
5914 if {$objects_current >= $object_limit} {
5915 if {[ask_popup \
5916 "This repository currently has $objects_current loose objects.
5917To maintain optimal performance it is strongly
5919recommended that you compress the database
5920when more than $object_limit loose objects exist.
5921Compress the database now?"] eq yes} {
5923 do_gc
5924 }
5925 }
5926 unset object_limit _junk objects_current
5927}
5928lock_index begin-read
5930after 1 do_rescan