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}
95######################################################################
97##
98## config
99proc is_many_config {name} {
101 switch -glob -- $name {
102 remote.*.fetch -
103 remote.*.push
104 {return 1}
105 *
106 {return 0}
107 }
108}
109proc is_config_true {name} {
111 global repo_config
112 if {[catch {set v $repo_config($name)}]} {
113 return 0
114 } elseif {$v eq {true} || $v eq {1} || $v eq {yes}} {
115 return 1
116 } else {
117 return 0
118 }
119}
120proc load_config {include_global} {
122 global repo_config global_config default_config
123 array unset global_config
125 if {$include_global} {
126 catch {
127 set fd_rc [open "| git repo-config --global --list" r]
128 while {[gets $fd_rc line] >= 0} {
129 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
130 if {[is_many_config $name]} {
131 lappend global_config($name) $value
132 } else {
133 set global_config($name) $value
134 }
135 }
136 }
137 close $fd_rc
138 }
139 }
140 array unset repo_config
142 catch {
143 set fd_rc [open "| git repo-config --list" r]
144 while {[gets $fd_rc line] >= 0} {
145 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
146 if {[is_many_config $name]} {
147 lappend repo_config($name) $value
148 } else {
149 set repo_config($name) $value
150 }
151 }
152 }
153 close $fd_rc
154 }
155 foreach name [array names default_config] {
157 if {[catch {set v $global_config($name)}]} {
158 set global_config($name) $default_config($name)
159 }
160 if {[catch {set v $repo_config($name)}]} {
161 set repo_config($name) $default_config($name)
162 }
163 }
164}
165proc save_config {} {
167 global default_config font_descs
168 global repo_config global_config
169 global repo_config_new global_config_new
170 foreach option $font_descs {
172 set name [lindex $option 0]
173 set font [lindex $option 1]
174 font configure $font \
175 -family $global_config_new(gui.$font^^family) \
176 -size $global_config_new(gui.$font^^size)
177 font configure ${font}bold \
178 -family $global_config_new(gui.$font^^family) \
179 -size $global_config_new(gui.$font^^size)
180 set global_config_new(gui.$name) [font configure $font]
181 unset global_config_new(gui.$font^^family)
182 unset global_config_new(gui.$font^^size)
183 }
184 foreach name [array names default_config] {
186 set value $global_config_new($name)
187 if {$value ne $global_config($name)} {
188 if {$value eq $default_config($name)} {
189 catch {exec git repo-config --global --unset $name}
190 } else {
191 regsub -all "\[{}\]" $value {"} value
192 exec git repo-config --global $name $value
193 }
194 set global_config($name) $value
195 if {$value eq $repo_config($name)} {
196 catch {exec git repo-config --unset $name}
197 set repo_config($name) $value
198 }
199 }
200 }
201 foreach name [array names default_config] {
203 set value $repo_config_new($name)
204 if {$value ne $repo_config($name)} {
205 if {$value eq $global_config($name)} {
206 catch {exec git repo-config --unset $name}
207 } else {
208 regsub -all "\[{}\]" $value {"} value
209 exec git repo-config $name $value
210 }
211 set repo_config($name) $value
212 }
213 }
214}
215proc error_popup {msg} {
217 set title [appname]
218 if {[reponame] ne {}} {
219 append title " ([reponame])"
220 }
221 set cmd [list tk_messageBox \
222 -icon error \
223 -type ok \
224 -title "$title: error" \
225 -message $msg]
226 if {[winfo ismapped .]} {
227 lappend cmd -parent .
228 }
229 eval $cmd
230}
231proc warn_popup {msg} {
233 set title [appname]
234 if {[reponame] ne {}} {
235 append title " ([reponame])"
236 }
237 set cmd [list tk_messageBox \
238 -icon warning \
239 -type ok \
240 -title "$title: warning" \
241 -message $msg]
242 if {[winfo ismapped .]} {
243 lappend cmd -parent .
244 }
245 eval $cmd
246}
247proc info_popup {msg {parent .}} {
249 set title [appname]
250 if {[reponame] ne {}} {
251 append title " ([reponame])"
252 }
253 tk_messageBox \
254 -parent $parent \
255 -icon info \
256 -type ok \
257 -title $title \
258 -message $msg
259}
260proc ask_popup {msg} {
262 set title [appname]
263 if {[reponame] ne {}} {
264 append title " ([reponame])"
265 }
266 return [tk_messageBox \
267 -parent . \
268 -icon question \
269 -type yesno \
270 -title $title \
271 -message $msg]
272}
273######################################################################
275##
276## repository setup
277if { [catch {set _gitdir $env(GIT_DIR)}]
279 && [catch {set _gitdir [exec git rev-parse --git-dir]} err]} {
280 catch {wm withdraw .}
281 error_popup "Cannot find the git directory:\n\n$err"
282 exit 1
283}
284if {![file isdirectory $_gitdir] && [is_Cygwin]} {
285 catch {set _gitdir [exec cygpath --unix $_gitdir]}
286}
287if {![file isdirectory $_gitdir]} {
288 catch {wm withdraw .}
289 error_popup "Git directory not found:\n\n$_gitdir"
290 exit 1
291}
292if {[lindex [file split $_gitdir] end] ne {.git}} {
293 catch {wm withdraw .}
294 error_popup "Cannot use funny .git directory:\n\n$_gitdir"
295 exit 1
296}
297if {[catch {cd [file dirname $_gitdir]} err]} {
298 catch {wm withdraw .}
299 error_popup "No working directory [file dirname $_gitdir]:\n\n$err"
300 exit 1
301}
302set _reponame [lindex [file split \
303 [file normalize [file dirname $_gitdir]]] \
304 end]
305set single_commit 0
307if {[appname] eq {git-citool}} {
308 set single_commit 1
309}
310######################################################################
312##
313## task management
314set rescan_active 0
316set diff_active 0
317set last_clicked {}
318set disable_on_lock [list]
320set index_lock_type none
321proc lock_index {type} {
323 global index_lock_type disable_on_lock
324 if {$index_lock_type eq {none}} {
326 set index_lock_type $type
327 foreach w $disable_on_lock {
328 uplevel #0 $w disabled
329 }
330 return 1
331 } elseif {$index_lock_type eq "begin-$type"} {
332 set index_lock_type $type
333 return 1
334 }
335 return 0
336}
337proc unlock_index {} {
339 global index_lock_type disable_on_lock
340 set index_lock_type none
342 foreach w $disable_on_lock {
343 uplevel #0 $w normal
344 }
345}
346######################################################################
348##
349## status
350proc repository_state {ctvar hdvar mhvar} {
352 global current_branch
353 upvar $ctvar ct $hdvar hd $mhvar mh
354 set mh [list]
356 if {[catch {set current_branch [exec git symbolic-ref HEAD]}]} {
358 set current_branch {}
359 } else {
360 regsub ^refs/((heads|tags|remotes)/)? \
361 $current_branch \
362 {} \
363 current_branch
364 }
365 if {[catch {set hd [exec git rev-parse --verify HEAD]}]} {
367 set hd {}
368 set ct initial
369 return
370 }
371 set merge_head [gitdir MERGE_HEAD]
373 if {[file exists $merge_head]} {
374 set ct merge
375 set fd_mh [open $merge_head r]
376 while {[gets $fd_mh line] >= 0} {
377 lappend mh $line
378 }
379 close $fd_mh
380 return
381 }
382 set ct normal
384}
385proc PARENT {} {
387 global PARENT empty_tree
388 set p [lindex $PARENT 0]
390 if {$p ne {}} {
391 return $p
392 }
393 if {$empty_tree eq {}} {
394 set empty_tree [exec git mktree << {}]
395 }
396 return $empty_tree
397}
398proc rescan {after {honor_trustmtime 1}} {
400 global HEAD PARENT MERGE_HEAD commit_type
401 global ui_index ui_workdir ui_status_value ui_comm
402 global rescan_active file_states
403 global repo_config
404 if {$rescan_active > 0 || ![lock_index read]} return
406 repository_state newType newHEAD newMERGE_HEAD
408 if {[string match amend* $commit_type]
409 && $newType eq {normal}
410 && $newHEAD eq $HEAD} {
411 } else {
412 set HEAD $newHEAD
413 set PARENT $newHEAD
414 set MERGE_HEAD $newMERGE_HEAD
415 set commit_type $newType
416 }
417 array unset file_states
419 if {![$ui_comm edit modified]
421 || [string trim [$ui_comm get 0.0 end]] eq {}} {
422 if {[load_message GITGUI_MSG]} {
423 } elseif {[load_message MERGE_MSG]} {
424 } elseif {[load_message SQUASH_MSG]} {
425 }
426 $ui_comm edit reset
427 $ui_comm edit modified false
428 }
429 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
431 rescan_stage2 {} $after
432 } else {
433 set rescan_active 1
434 set ui_status_value {Refreshing file status...}
435 set cmd [list git update-index]
436 lappend cmd -q
437 lappend cmd --unmerged
438 lappend cmd --ignore-missing
439 lappend cmd --refresh
440 set fd_rf [open "| $cmd" r]
441 fconfigure $fd_rf -blocking 0 -translation binary
442 fileevent $fd_rf readable \
443 [list rescan_stage2 $fd_rf $after]
444 }
445}
446proc rescan_stage2 {fd after} {
448 global ui_status_value
449 global rescan_active buf_rdi buf_rdf buf_rlo
450 if {$fd ne {}} {
452 read $fd
453 if {![eof $fd]} return
454 close $fd
455 }
456 set ls_others [list | git ls-files --others -z \
458 --exclude-per-directory=.gitignore]
459 set info_exclude [gitdir info exclude]
460 if {[file readable $info_exclude]} {
461 lappend ls_others "--exclude-from=$info_exclude"
462 }
463 set buf_rdi {}
465 set buf_rdf {}
466 set buf_rlo {}
467 set rescan_active 3
469 set ui_status_value {Scanning for modified files ...}
470 set fd_di [open "| git diff-index --cached -z [PARENT]" r]
471 set fd_df [open "| git diff-files -z" r]
472 set fd_lo [open $ls_others r]
473 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
475 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
476 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
477 fileevent $fd_di readable [list read_diff_index $fd_di $after]
478 fileevent $fd_df readable [list read_diff_files $fd_df $after]
479 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
480}
481proc load_message {file} {
483 global ui_comm
484 set f [gitdir $file]
486 if {[file isfile $f]} {
487 if {[catch {set fd [open $f r]}]} {
488 return 0
489 }
490 set content [string trim [read $fd]]
491 close $fd
492 regsub -all -line {[ \r\t]+$} $content {} content
493 $ui_comm delete 0.0 end
494 $ui_comm insert end $content
495 return 1
496 }
497 return 0
498}
499proc read_diff_index {fd after} {
501 global buf_rdi
502 append buf_rdi [read $fd]
504 set c 0
505 set n [string length $buf_rdi]
506 while {$c < $n} {
507 set z1 [string first "\0" $buf_rdi $c]
508 if {$z1 == -1} break
509 incr z1
510 set z2 [string first "\0" $buf_rdi $z1]
511 if {$z2 == -1} break
512 incr c
514 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
515 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
516 merge_state \
517 [encoding convertfrom $p] \
518 [lindex $i 4]? \
519 [list [lindex $i 0] [lindex $i 2]] \
520 [list]
521 set c $z2
522 incr c
523 }
524 if {$c < $n} {
525 set buf_rdi [string range $buf_rdi $c end]
526 } else {
527 set buf_rdi {}
528 }
529 rescan_done $fd buf_rdi $after
531}
532proc read_diff_files {fd after} {
534 global buf_rdf
535 append buf_rdf [read $fd]
537 set c 0
538 set n [string length $buf_rdf]
539 while {$c < $n} {
540 set z1 [string first "\0" $buf_rdf $c]
541 if {$z1 == -1} break
542 incr z1
543 set z2 [string first "\0" $buf_rdf $z1]
544 if {$z2 == -1} break
545 incr c
547 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
548 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
549 merge_state \
550 [encoding convertfrom $p] \
551 ?[lindex $i 4] \
552 [list] \
553 [list [lindex $i 0] [lindex $i 2]]
554 set c $z2
555 incr c
556 }
557 if {$c < $n} {
558 set buf_rdf [string range $buf_rdf $c end]
559 } else {
560 set buf_rdf {}
561 }
562 rescan_done $fd buf_rdf $after
564}
565proc read_ls_others {fd after} {
567 global buf_rlo
568 append buf_rlo [read $fd]
570 set pck [split $buf_rlo "\0"]
571 set buf_rlo [lindex $pck end]
572 foreach p [lrange $pck 0 end-1] {
573 merge_state [encoding convertfrom $p] ?O
574 }
575 rescan_done $fd buf_rlo $after
576}
577proc rescan_done {fd buf after} {
579 global rescan_active
580 global file_states repo_config
581 upvar $buf to_clear
582 if {![eof $fd]} return
584 set to_clear {}
585 close $fd
586 if {[incr rescan_active -1] > 0} return
587 prune_selection
589 unlock_index
590 display_all_files
591 reshow_diff
592 uplevel #0 $after
593}
594proc prune_selection {} {
596 global file_states selected_paths
597 foreach path [array names selected_paths] {
599 if {[catch {set still_here $file_states($path)}]} {
600 unset selected_paths($path)
601 }
602 }
603}
604######################################################################
606##
607## diff
608proc clear_diff {} {
610 global ui_diff current_diff_path current_diff_header
611 global ui_index ui_workdir
612 $ui_diff conf -state normal
614 $ui_diff delete 0.0 end
615 $ui_diff conf -state disabled
616 set current_diff_path {}
618 set current_diff_header {}
619 $ui_index tag remove in_diff 0.0 end
621 $ui_workdir tag remove in_diff 0.0 end
622}
623proc reshow_diff {} {
625 global ui_status_value file_states file_lists
626 global current_diff_path current_diff_side
627 set p $current_diff_path
629 if {$p eq {}
630 || $current_diff_side eq {}
631 || [catch {set s $file_states($p)}]
632 || [lsearch -sorted -exact $file_lists($current_diff_side) $p] == -1} {
633 clear_diff
634 } else {
635 show_diff $p $current_diff_side
636 }
637}
638proc handle_empty_diff {} {
640 global current_diff_path file_states file_lists
641 set path $current_diff_path
643 set s $file_states($path)
644 if {[lindex $s 0] ne {_M}} return
645 info_popup "No differences detected.
647[short_path $path] has no changes.
649The modification date of this file was updated
651by another application, but the content within
652the file was not changed.
653A rescan will be automatically started to find
655other files which may have the same state."
656 clear_diff
658 display_file $path __
659 rescan {set ui_status_value {Ready.}} 0
660}
661proc show_diff {path w {lno {}}} {
663 global file_states file_lists
664 global is_3way_diff diff_active repo_config
665 global ui_diff ui_status_value ui_index ui_workdir
666 global current_diff_path current_diff_side current_diff_header
667 if {$diff_active || ![lock_index read]} return
669 clear_diff
671 if {$lno == {}} {
672 set lno [lsearch -sorted -exact $file_lists($w) $path]
673 if {$lno >= 0} {
674 incr lno
675 }
676 }
677 if {$lno >= 1} {
678 $w tag add in_diff $lno.0 [expr {$lno + 1}].0
679 }
680 set s $file_states($path)
682 set m [lindex $s 0]
683 set is_3way_diff 0
684 set diff_active 1
685 set current_diff_path $path
686 set current_diff_side $w
687 set current_diff_header {}
688 set ui_status_value "Loading diff of [escape_path $path]..."
689 # - Git won't give us the diff, there's nothing to compare to!
691 #
692 if {$m eq {_O}} {
693 set max_sz [expr {128 * 1024}]
694 if {[catch {
695 set fd [open $path r]
696 set content [read $fd $max_sz]
697 close $fd
698 set sz [file size $path]
699 } err ]} {
700 set diff_active 0
701 unlock_index
702 set ui_status_value "Unable to display [escape_path $path]"
703 error_popup "Error loading file:\n\n$err"
704 return
705 }
706 $ui_diff conf -state normal
707 if {![catch {set type [exec file $path]}]} {
708 set n [string length $path]
709 if {[string equal -length $n $path $type]} {
710 set type [string range $type $n end]
711 regsub {^:?\s*} $type {} type
712 }
713 $ui_diff insert end "* $type\n" d_@
714 }
715 if {[string first "\0" $content] != -1} {
716 $ui_diff insert end \
717 "* Binary file (not showing content)." \
718 d_@
719 } else {
720 if {$sz > $max_sz} {
721 $ui_diff insert end \
722"* Untracked file is $sz bytes.
723* Showing only first $max_sz bytes.
724" d_@
725 }
726 $ui_diff insert end $content
727 if {$sz > $max_sz} {
728 $ui_diff insert end "
729* Untracked file clipped here by [appname].
730* To see the entire file, use an external editor.
731" d_@
732 }
733 }
734 $ui_diff conf -state disabled
735 set diff_active 0
736 unlock_index
737 set ui_status_value {Ready.}
738 return
739 }
740 set cmd [list | git]
742 if {$w eq $ui_index} {
743 lappend cmd diff-index
744 lappend cmd --cached
745 } elseif {$w eq $ui_workdir} {
746 if {[string index $m 0] eq {U}} {
747 lappend cmd diff
748 } else {
749 lappend cmd diff-files
750 }
751 }
752 lappend cmd -p
754 lappend cmd --no-color
755 if {$repo_config(gui.diffcontext) > 0} {
756 lappend cmd "-U$repo_config(gui.diffcontext)"
757 }
758 if {$w eq $ui_index} {
759 lappend cmd [PARENT]
760 }
761 lappend cmd --
762 lappend cmd $path
763 if {[catch {set fd [open $cmd r]} err]} {
765 set diff_active 0
766 unlock_index
767 set ui_status_value "Unable to display [escape_path $path]"
768 error_popup "Error loading diff:\n\n$err"
769 return
770 }
771 fconfigure $fd \
773 -blocking 0 \
774 -encoding binary \
775 -translation binary
776 fileevent $fd readable [list read_diff $fd]
777}
778proc read_diff {fd} {
780 global ui_diff ui_status_value diff_active
781 global is_3way_diff current_diff_header
782 $ui_diff conf -state normal
784 while {[gets $fd line] >= 0} {
785 # -- Cleanup uninteresting diff header lines.
786 #
787 if { [string match {diff --git *} $line]
788 || [string match {diff --cc *} $line]
789 || [string match {diff --combined *} $line]
790 || [string match {--- *} $line]
791 || [string match {+++ *} $line]} {
792 append current_diff_header $line "\n"
793 continue
794 }
795 if {[string match {index *} $line]} continue
796 if {$line eq {deleted file mode 120000}} {
797 set line "deleted symlink"
798 }
799 # -- Automatically detect if this is a 3 way diff.
801 #
802 if {[string match {@@@ *} $line]} {set is_3way_diff 1}
803 if {[string match {mode *} $line]
805 || [string match {new file *} $line]
806 || [string match {deleted file *} $line]
807 || [string match {Binary files * and * differ} $line]
808 || $line eq {\ No newline at end of file}
809 || [regexp {^\* Unmerged path } $line]} {
810 set tags {}
811 } elseif {$is_3way_diff} {
812 set op [string range $line 0 1]
813 switch -- $op {
814 { } {set tags {}}
815 {@@} {set tags d_@}
816 { +} {set tags d_s+}
817 { -} {set tags d_s-}
818 {+ } {set tags d_+s}
819 {- } {set tags d_-s}
820 {--} {set tags d_--}
821 {++} {
822 if {[regexp {^\+\+([<>]{7} |={7})} $line _g op]} {
823 set line [string replace $line 0 1 { }]
824 set tags d$op
825 } else {
826 set tags d_++
827 }
828 }
829 default {
830 puts "error: Unhandled 3 way diff marker: {$op}"
831 set tags {}
832 }
833 }
834 } else {
835 set op [string index $line 0]
836 switch -- $op {
837 { } {set tags {}}
838 {@} {set tags d_@}
839 {-} {set tags d_-}
840 {+} {
841 if {[regexp {^\+([<>]{7} |={7})} $line _g op]} {
842 set line [string replace $line 0 0 { }]
843 set tags d$op
844 } else {
845 set tags d_+
846 }
847 }
848 default {
849 puts "error: Unhandled 2 way diff marker: {$op}"
850 set tags {}
851 }
852 }
853 }
854 $ui_diff insert end $line $tags
855 if {[string index $line end] eq "\r"} {
856 $ui_diff tag add d_cr {end - 2c}
857 }
858 $ui_diff insert end "\n" $tags
859 }
860 $ui_diff conf -state disabled
861 if {[eof $fd]} {
863 close $fd
864 set diff_active 0
865 unlock_index
866 set ui_status_value {Ready.}
867 if {[$ui_diff index end] eq {2.0}} {
869 handle_empty_diff
870 }
871 }
872}
873proc apply_hunk {x y} {
875 global current_diff_path current_diff_header current_diff_side
876 global ui_diff ui_index file_states
877 if {$current_diff_path eq {} || $current_diff_header eq {}} return
879 if {![lock_index apply_hunk]} return
880 set apply_cmd {git apply --cached --whitespace=nowarn}
882 set mi [lindex $file_states($current_diff_path) 0]
883 if {$current_diff_side eq $ui_index} {
884 set mode unstage
885 lappend apply_cmd --reverse
886 if {[string index $mi 0] ne {M}} {
887 unlock_index
888 return
889 }
890 } else {
891 set mode stage
892 if {[string index $mi 1] ne {M}} {
893 unlock_index
894 return
895 }
896 }
897 set s_lno [lindex [split [$ui_diff index @$x,$y] .] 0]
899 set s_lno [$ui_diff search -backwards -regexp ^@@ $s_lno.0 0.0]
900 if {$s_lno eq {}} {
901 unlock_index
902 return
903 }
904 set e_lno [$ui_diff search -forwards -regexp ^@@ "$s_lno + 1 lines" end]
906 if {$e_lno eq {}} {
907 set e_lno end
908 }
909 if {[catch {
911 set p [open "| $apply_cmd" w]
912 fconfigure $p -translation binary -encoding binary
913 puts -nonewline $p $current_diff_header
914 puts -nonewline $p [$ui_diff get $s_lno $e_lno]
915 close $p} err]} {
916 error_popup "Failed to $mode selected hunk.\n\n$err"
917 unlock_index
918 return
919 }
920 $ui_diff conf -state normal
922 $ui_diff delete $s_lno $e_lno
923 $ui_diff conf -state disabled
924 if {[$ui_diff get 1.0 end] eq "\n"} {
926 set o _
927 } else {
928 set o ?
929 }
930 if {$current_diff_side eq $ui_index} {
932 set mi ${o}M
933 } elseif {[string index $mi 0] eq {_}} {
934 set mi M$o
935 } else {
936 set mi ?$o
937 }
938 unlock_index
939 display_file $current_diff_path $mi
940 if {$o eq {_}} {
941 clear_diff
942 }
943}
944######################################################################
946##
947## commit
948proc load_last_commit {} {
950 global HEAD PARENT MERGE_HEAD commit_type ui_comm
951 global repo_config
952 if {[llength $PARENT] == 0} {
954 error_popup {There is nothing to amend.
955You are about to create the initial commit.
957There is no commit before this to amend.
958}
959 return
960 }
961 repository_state curType curHEAD curMERGE_HEAD
963 if {$curType eq {merge}} {
964 error_popup {Cannot amend while merging.
965You are currently in the middle of a merge that
967has not been fully completed. You cannot amend
968the prior commit unless you first abort the
969current merge activity.
970}
971 return
972 }
973 set msg {}
975 set parents [list]
976 if {[catch {
977 set fd [open "| git cat-file commit $curHEAD" r]
978 fconfigure $fd -encoding binary -translation lf
979 if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
980 set enc utf-8
981 }
982 while {[gets $fd line] > 0} {
983 if {[string match {parent *} $line]} {
984 lappend parents [string range $line 7 end]
985 } elseif {[string match {encoding *} $line]} {
986 set enc [string tolower [string range $line 9 end]]
987 }
988 }
989 fconfigure $fd -encoding $enc
990 set msg [string trim [read $fd]]
991 close $fd
992 } err]} {
993 error_popup "Error loading commit data for amend:\n\n$err"
994 return
995 }
996 set HEAD $curHEAD
998 set PARENT $parents
999 set MERGE_HEAD [list]
1000 switch -- [llength $parents] {
1001 0 {set commit_type amend-initial}
1002 1 {set commit_type amend}
1003 default {set commit_type amend-merge}
1004 }
1005 $ui_comm delete 0.0 end
1007 $ui_comm insert end $msg
1008 $ui_comm edit reset
1009 $ui_comm edit modified false
1010 rescan {set ui_status_value {Ready.}}
1011}
1012proc create_new_commit {} {
1014 global commit_type ui_comm
1015 set commit_type normal
1017 $ui_comm delete 0.0 end
1018 $ui_comm edit reset
1019 $ui_comm edit modified false
1020 rescan {set ui_status_value {Ready.}}
1021}
1022set GIT_COMMITTER_IDENT {}
1024proc committer_ident {} {
1026 global GIT_COMMITTER_IDENT
1027 if {$GIT_COMMITTER_IDENT eq {}} {
1029 if {[catch {set me [exec git var GIT_COMMITTER_IDENT]} err]} {
1030 error_popup "Unable to obtain your identity:\n\n$err"
1031 return {}
1032 }
1033 if {![regexp {^(.*) [0-9]+ [-+0-9]+$} \
1034 $me me GIT_COMMITTER_IDENT]} {
1035 error_popup "Invalid GIT_COMMITTER_IDENT:\n\n$me"
1036 return {}
1037 }
1038 }
1039 return $GIT_COMMITTER_IDENT
1041}
1042proc commit_tree {} {
1044 global HEAD commit_type file_states ui_comm repo_config
1045 global ui_status_value pch_error
1046 if {[committer_ident] eq {}} return
1048 if {![lock_index update]} return
1049 # -- Our in memory state should match the repository.
1051 #
1052 repository_state curType curHEAD curMERGE_HEAD
1053 if {[string match amend* $commit_type]
1054 && $curType eq {normal}
1055 && $curHEAD eq $HEAD} {
1056 } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
1057 info_popup {Last scanned state does not match repository state.
1058Another Git program has modified this repository
1060since the last scan. A rescan must be performed
1061before another commit can be created.
1062The rescan will be automatically started now.
1064}
1065 unlock_index
1066 rescan {set ui_status_value {Ready.}}
1067 return
1068 }
1069 # -- At least one file should differ in the index.
1071 #
1072 set files_ready 0
1073 foreach path [array names file_states] {
1074 switch -glob -- [lindex $file_states($path) 0] {
1075 _? {continue}
1076 A? -
1077 D? -
1078 M? {set files_ready 1}
1079 U? {
1080 error_popup "Unmerged files cannot be committed.
1081File [short_path $path] has merge conflicts.
1083You must resolve them and add the file before committing.
1084"
1085 unlock_index
1086 return
1087 }
1088 default {
1089 error_popup "Unknown file state [lindex $s 0] detected.
1090File [short_path $path] cannot be committed by this program.
1092"
1093 }
1094 }
1095 }
1096 if {!$files_ready} {
1097 info_popup {No changes to commit.
1098You must add at least 1 file before you can commit.
1100}
1101 unlock_index
1102 return
1103 }
1104 # -- A message is required.
1106 #
1107 set msg [string trim [$ui_comm get 1.0 end]]
1108 regsub -all -line {[ \t\r]+$} $msg {} msg
1109 if {$msg eq {}} {
1110 error_popup {Please supply a commit message.
1111A good commit message has the following format:
1113- First line: Describe in one sentance what you did.
1115- Second line: Blank
1116- Remaining lines: Describe why this change is good.
1117}
1118 unlock_index
1119 return
1120 }
1121 # -- Run the pre-commit hook.
1123 #
1124 set pchook [gitdir hooks pre-commit]
1125 # On Cygwin [file executable] might lie so we need to ask
1127 # the shell if the hook is executable. Yes that's annoying.
1128 #
1129 if {[is_Cygwin] && [file isfile $pchook]} {
1130 set pchook [list sh -c [concat \
1131 "if test -x \"$pchook\";" \
1132 "then exec \"$pchook\" 2>&1;" \
1133 "fi"]]
1134 } elseif {[file executable $pchook]} {
1135 set pchook [list $pchook |& cat]
1136 } else {
1137 commit_writetree $curHEAD $msg
1138 return
1139 }
1140 set ui_status_value {Calling pre-commit hook...}
1142 set pch_error {}
1143 set fd_ph [open "| $pchook" r]
1144 fconfigure $fd_ph -blocking 0 -translation binary
1145 fileevent $fd_ph readable \
1146 [list commit_prehook_wait $fd_ph $curHEAD $msg]
1147}
1148proc commit_prehook_wait {fd_ph curHEAD msg} {
1150 global pch_error ui_status_value
1151 append pch_error [read $fd_ph]
1153 fconfigure $fd_ph -blocking 1
1154 if {[eof $fd_ph]} {
1155 if {[catch {close $fd_ph}]} {
1156 set ui_status_value {Commit declined by pre-commit hook.}
1157 hook_failed_popup pre-commit $pch_error
1158 unlock_index
1159 } else {
1160 commit_writetree $curHEAD $msg
1161 }
1162 set pch_error {}
1163 return
1164 }
1165 fconfigure $fd_ph -blocking 0
1166}
1167proc commit_writetree {curHEAD msg} {
1169 global ui_status_value
1170 set ui_status_value {Committing changes...}
1172 set fd_wt [open "| git write-tree" r]
1173 fileevent $fd_wt readable \
1174 [list commit_committree $fd_wt $curHEAD $msg]
1175}
1176proc commit_committree {fd_wt curHEAD msg} {
1178 global HEAD PARENT MERGE_HEAD commit_type
1179 global single_commit all_heads current_branch
1180 global ui_status_value ui_comm selected_commit_type
1181 global file_states selected_paths rescan_active
1182 global repo_config
1183 gets $fd_wt tree_id
1185 if {$tree_id eq {} || [catch {close $fd_wt} err]} {
1186 error_popup "write-tree failed:\n\n$err"
1187 set ui_status_value {Commit failed.}
1188 unlock_index
1189 return
1190 }
1191 # -- Build the message.
1193 #
1194 set msg_p [gitdir COMMIT_EDITMSG]
1195 set msg_wt [open $msg_p w]
1196 if {[catch {set enc $repo_config(i18n.commitencoding)}]} {
1197 set enc utf-8
1198 }
1199 fconfigure $msg_wt -encoding $enc -translation binary
1200 puts -nonewline $msg_wt $msg
1201 close $msg_wt
1202 # -- Create the commit.
1204 #
1205 set cmd [list git commit-tree $tree_id]
1206 set parents [concat $PARENT $MERGE_HEAD]
1207 if {[llength $parents] > 0} {
1208 foreach p $parents {
1209 lappend cmd -p $p
1210 }
1211 } else {
1212 # git commit-tree writes to stderr during initial commit.
1213 lappend cmd 2>/dev/null
1214 }
1215 lappend cmd <$msg_p
1216 if {[catch {set cmt_id [eval exec $cmd]} err]} {
1217 error_popup "commit-tree failed:\n\n$err"
1218 set ui_status_value {Commit failed.}
1219 unlock_index
1220 return
1221 }
1222 # -- Update the HEAD ref.
1224 #
1225 set reflogm commit
1226 if {$commit_type ne {normal}} {
1227 append reflogm " ($commit_type)"
1228 }
1229 set i [string first "\n" $msg]
1230 if {$i >= 0} {
1231 append reflogm {: } [string range $msg 0 [expr {$i - 1}]]
1232 } else {
1233 append reflogm {: } $msg
1234 }
1235 set cmd [list git update-ref -m $reflogm HEAD $cmt_id $curHEAD]
1236 if {[catch {eval exec $cmd} err]} {
1237 error_popup "update-ref failed:\n\n$err"
1238 set ui_status_value {Commit failed.}
1239 unlock_index
1240 return
1241 }
1242 # -- Make sure our current branch exists.
1244 #
1245 if {$commit_type eq {initial}} {
1246 lappend all_heads $current_branch
1247 set all_heads [lsort -unique $all_heads]
1248 populate_branch_menu
1249 }
1250 # -- Cleanup after ourselves.
1252 #
1253 catch {file delete $msg_p}
1254 catch {file delete [gitdir MERGE_HEAD]}
1255 catch {file delete [gitdir MERGE_MSG]}
1256 catch {file delete [gitdir SQUASH_MSG]}
1257 catch {file delete [gitdir GITGUI_MSG]}
1258 # -- Let rerere do its thing.
1260 #
1261 if {[file isdirectory [gitdir rr-cache]]} {
1262 catch {exec git rerere}
1263 }
1264 # -- Run the post-commit hook.
1266 #
1267 set pchook [gitdir hooks post-commit]
1268 if {[is_Cygwin] && [file isfile $pchook]} {
1269 set pchook [list sh -c [concat \
1270 "if test -x \"$pchook\";" \
1271 "then exec \"$pchook\";" \
1272 "fi"]]
1273 } elseif {![file executable $pchook]} {
1274 set pchook {}
1275 }
1276 if {$pchook ne {}} {
1277 catch {exec $pchook &}
1278 }
1279 $ui_comm delete 0.0 end
1281 $ui_comm edit reset
1282 $ui_comm edit modified false
1283 if {$single_commit} do_quit
1285 # -- Update in memory status
1287 #
1288 set selected_commit_type new
1289 set commit_type normal
1290 set HEAD $cmt_id
1291 set PARENT $cmt_id
1292 set MERGE_HEAD [list]
1293 foreach path [array names file_states] {
1295 set s $file_states($path)
1296 set m [lindex $s 0]
1297 switch -glob -- $m {
1298 _O -
1299 _M -
1300 _D {continue}
1301 __ -
1302 A_ -
1303 M_ -
1304 D_ {
1305 unset file_states($path)
1306 catch {unset selected_paths($path)}
1307 }
1308 DO {
1309 set file_states($path) [list _O [lindex $s 1] {} {}]
1310 }
1311 AM -
1312 AD -
1313 MM -
1314 MD {
1315 set file_states($path) [list \
1316 _[string index $m 1] \
1317 [lindex $s 1] \
1318 [lindex $s 3] \
1319 {}]
1320 }
1321 }
1322 }
1323 display_all_files
1325 unlock_index
1326 reshow_diff
1327 set ui_status_value \
1328 "Changes committed as [string range $cmt_id 0 7]."
1329}
1330######################################################################
1332##
1333## fetch push
1334proc fetch_from {remote} {
1336 set w [new_console \
1337 "fetch $remote" \
1338 "Fetching new changes from $remote"]
1339 set cmd [list git fetch]
1340 lappend cmd $remote
1341 console_exec $w $cmd console_done
1342}
1343proc push_to {remote} {
1345 set w [new_console \
1346 "push $remote" \
1347 "Pushing changes to $remote"]
1348 set cmd [list git push]
1349 lappend cmd -v
1350 lappend cmd $remote
1351 console_exec $w $cmd console_done
1352}
1353######################################################################
1355##
1356## ui helpers
1357proc mapicon {w state path} {
1359 global all_icons
1360 if {[catch {set r $all_icons($state$w)}]} {
1362 puts "error: no icon for $w state={$state} $path"
1363 return file_plain
1364 }
1365 return $r
1366}
1367proc mapdesc {state path} {
1369 global all_descs
1370 if {[catch {set r $all_descs($state)}]} {
1372 puts "error: no desc for state={$state} $path"
1373 return $state
1374 }
1375 return $r
1376}
1377proc escape_path {path} {
1379 regsub -all "\n" $path "\\n" path
1380 return $path
1381}
1382proc short_path {path} {
1384 return [escape_path [lindex [file split $path] end]]
1385}
1386set next_icon_id 0
1388set null_sha1 [string repeat 0 40]
1389proc merge_state {path new_state {head_info {}} {index_info {}}} {
1391 global file_states next_icon_id null_sha1
1392 set s0 [string index $new_state 0]
1394 set s1 [string index $new_state 1]
1395 if {[catch {set info $file_states($path)}]} {
1397 set state __
1398 set icon n[incr next_icon_id]
1399 } else {
1400 set state [lindex $info 0]
1401 set icon [lindex $info 1]
1402 if {$head_info eq {}} {set head_info [lindex $info 2]}
1403 if {$index_info eq {}} {set index_info [lindex $info 3]}
1404 }
1405 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1407 elseif {$s0 eq {_}} {set s0 _}
1408 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1410 elseif {$s1 eq {_}} {set s1 _}
1411 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1413 set head_info [list 0 $null_sha1]
1414 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1415 && $head_info eq {}} {
1416 set head_info $index_info
1417 }
1418 set file_states($path) [list $s0$s1 $icon \
1420 $head_info $index_info \
1421 ]
1422 return $state
1423}
1424proc display_file_helper {w path icon_name old_m new_m} {
1426 global file_lists
1427 if {$new_m eq {_}} {
1429 set lno [lsearch -sorted -exact $file_lists($w) $path]
1430 if {$lno >= 0} {
1431 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1432 incr lno
1433 $w conf -state normal
1434 $w delete $lno.0 [expr {$lno + 1}].0
1435 $w conf -state disabled
1436 }
1437 } elseif {$old_m eq {_} && $new_m ne {_}} {
1438 lappend file_lists($w) $path
1439 set file_lists($w) [lsort -unique $file_lists($w)]
1440 set lno [lsearch -sorted -exact $file_lists($w) $path]
1441 incr lno
1442 $w conf -state normal
1443 $w image create $lno.0 \
1444 -align center -padx 5 -pady 1 \
1445 -name $icon_name \
1446 -image [mapicon $w $new_m $path]
1447 $w insert $lno.1 "[escape_path $path]\n"
1448 $w conf -state disabled
1449 } elseif {$old_m ne $new_m} {
1450 $w conf -state normal
1451 $w image conf $icon_name -image [mapicon $w $new_m $path]
1452 $w conf -state disabled
1453 }
1454}
1455proc display_file {path state} {
1457 global file_states selected_paths
1458 global ui_index ui_workdir
1459 set old_m [merge_state $path $state]
1461 set s $file_states($path)
1462 set new_m [lindex $s 0]
1463 set icon_name [lindex $s 1]
1464 set o [string index $old_m 0]
1466 set n [string index $new_m 0]
1467 if {$o eq {U}} {
1468 set o _
1469 }
1470 if {$n eq {U}} {
1471 set n _
1472 }
1473 display_file_helper $ui_index $path $icon_name $o $n
1474 if {[string index $old_m 0] eq {U}} {
1476 set o U
1477 } else {
1478 set o [string index $old_m 1]
1479 }
1480 if {[string index $new_m 0] eq {U}} {
1481 set n U
1482 } else {
1483 set n [string index $new_m 1]
1484 }
1485 display_file_helper $ui_workdir $path $icon_name $o $n
1486 if {$new_m eq {__}} {
1488 unset file_states($path)
1489 catch {unset selected_paths($path)}
1490 }
1491}
1492proc display_all_files_helper {w path icon_name m} {
1494 global file_lists
1495 lappend file_lists($w) $path
1497 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1498 $w image create end \
1499 -align center -padx 5 -pady 1 \
1500 -name $icon_name \
1501 -image [mapicon $w $m $path]
1502 $w insert end "[escape_path $path]\n"
1503}
1504proc display_all_files {} {
1506 global ui_index ui_workdir
1507 global file_states file_lists
1508 global last_clicked
1509 $ui_index conf -state normal
1511 $ui_workdir conf -state normal
1512 $ui_index delete 0.0 end
1514 $ui_workdir delete 0.0 end
1515 set last_clicked {}
1516 set file_lists($ui_index) [list]
1518 set file_lists($ui_workdir) [list]
1519 foreach path [lsort [array names file_states]] {
1521 set s $file_states($path)
1522 set m [lindex $s 0]
1523 set icon_name [lindex $s 1]
1524 set s [string index $m 0]
1526 if {$s ne {U} && $s ne {_}} {
1527 display_all_files_helper $ui_index $path \
1528 $icon_name $s
1529 }
1530 if {[string index $m 0] eq {U}} {
1532 set s U
1533 } else {
1534 set s [string index $m 1]
1535 }
1536 if {$s ne {_}} {
1537 display_all_files_helper $ui_workdir $path \
1538 $icon_name $s
1539 }
1540 }
1541 $ui_index conf -state disabled
1543 $ui_workdir conf -state disabled
1544}
1545proc update_indexinfo {msg pathList after} {
1547 global update_index_cp ui_status_value
1548 if {![lock_index update]} return
1550 set update_index_cp 0
1552 set pathList [lsort $pathList]
1553 set totalCnt [llength $pathList]
1554 set batch [expr {int($totalCnt * .01) + 1}]
1555 if {$batch > 25} {set batch 25}
1556 set ui_status_value [format \
1558 "$msg... %i/%i files (%.2f%%)" \
1559 $update_index_cp \
1560 $totalCnt \
1561 0.0]
1562 set fd [open "| git update-index -z --index-info" w]
1563 fconfigure $fd \
1564 -blocking 0 \
1565 -buffering full \
1566 -buffersize 512 \
1567 -encoding binary \
1568 -translation binary
1569 fileevent $fd writable [list \
1570 write_update_indexinfo \
1571 $fd \
1572 $pathList \
1573 $totalCnt \
1574 $batch \
1575 $msg \
1576 $after \
1577 ]
1578}
1579proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
1581 global update_index_cp ui_status_value
1582 global file_states current_diff_path
1583 if {$update_index_cp >= $totalCnt} {
1585 close $fd
1586 unlock_index
1587 uplevel #0 $after
1588 return
1589 }
1590 for {set i $batch} \
1592 {$update_index_cp < $totalCnt && $i > 0} \
1593 {incr i -1} {
1594 set path [lindex $pathList $update_index_cp]
1595 incr update_index_cp
1596 set s $file_states($path)
1598 switch -glob -- [lindex $s 0] {
1599 A? {set new _O}
1600 M? {set new _M}
1601 D_ {set new _D}
1602 D? {set new _?}
1603 ?? {continue}
1604 }
1605 set info [lindex $s 2]
1606 if {$info eq {}} continue
1607 puts -nonewline $fd "$info\t[encoding convertto $path]\0"
1609 display_file $path $new
1610 }
1611 set ui_status_value [format \
1613 "$msg... %i/%i files (%.2f%%)" \
1614 $update_index_cp \
1615 $totalCnt \
1616 [expr {100.0 * $update_index_cp / $totalCnt}]]
1617}
1618proc update_index {msg pathList after} {
1620 global update_index_cp ui_status_value
1621 if {![lock_index update]} return
1623 set update_index_cp 0
1625 set pathList [lsort $pathList]
1626 set totalCnt [llength $pathList]
1627 set batch [expr {int($totalCnt * .01) + 1}]
1628 if {$batch > 25} {set batch 25}
1629 set ui_status_value [format \
1631 "$msg... %i/%i files (%.2f%%)" \
1632 $update_index_cp \
1633 $totalCnt \
1634 0.0]
1635 set fd [open "| git update-index --add --remove -z --stdin" w]
1636 fconfigure $fd \
1637 -blocking 0 \
1638 -buffering full \
1639 -buffersize 512 \
1640 -encoding binary \
1641 -translation binary
1642 fileevent $fd writable [list \
1643 write_update_index \
1644 $fd \
1645 $pathList \
1646 $totalCnt \
1647 $batch \
1648 $msg \
1649 $after \
1650 ]
1651}
1652proc write_update_index {fd pathList totalCnt batch msg after} {
1654 global update_index_cp ui_status_value
1655 global file_states current_diff_path
1656 if {$update_index_cp >= $totalCnt} {
1658 close $fd
1659 unlock_index
1660 uplevel #0 $after
1661 return
1662 }
1663 for {set i $batch} \
1665 {$update_index_cp < $totalCnt && $i > 0} \
1666 {incr i -1} {
1667 set path [lindex $pathList $update_index_cp]
1668 incr update_index_cp
1669 switch -glob -- [lindex $file_states($path) 0] {
1671 AD {set new __}
1672 ?D {set new D_}
1673 _O -
1674 AM {set new A_}
1675 U? {
1676 if {[file exists $path]} {
1677 set new M_
1678 } else {
1679 set new D_
1680 }
1681 }
1682 ?M {set new M_}
1683 ?? {continue}
1684 }
1685 puts -nonewline $fd "[encoding convertto $path]\0"
1686 display_file $path $new
1687 }
1688 set ui_status_value [format \
1690 "$msg... %i/%i files (%.2f%%)" \
1691 $update_index_cp \
1692 $totalCnt \
1693 [expr {100.0 * $update_index_cp / $totalCnt}]]
1694}
1695proc checkout_index {msg pathList after} {
1697 global update_index_cp ui_status_value
1698 if {![lock_index update]} return
1700 set update_index_cp 0
1702 set pathList [lsort $pathList]
1703 set totalCnt [llength $pathList]
1704 set batch [expr {int($totalCnt * .01) + 1}]
1705 if {$batch > 25} {set batch 25}
1706 set ui_status_value [format \
1708 "$msg... %i/%i files (%.2f%%)" \
1709 $update_index_cp \
1710 $totalCnt \
1711 0.0]
1712 set cmd [list git checkout-index]
1713 lappend cmd --index
1714 lappend cmd --quiet
1715 lappend cmd --force
1716 lappend cmd -z
1717 lappend cmd --stdin
1718 set fd [open "| $cmd " w]
1719 fconfigure $fd \
1720 -blocking 0 \
1721 -buffering full \
1722 -buffersize 512 \
1723 -encoding binary \
1724 -translation binary
1725 fileevent $fd writable [list \
1726 write_checkout_index \
1727 $fd \
1728 $pathList \
1729 $totalCnt \
1730 $batch \
1731 $msg \
1732 $after \
1733 ]
1734}
1735proc write_checkout_index {fd pathList totalCnt batch msg after} {
1737 global update_index_cp ui_status_value
1738 global file_states current_diff_path
1739 if {$update_index_cp >= $totalCnt} {
1741 close $fd
1742 unlock_index
1743 uplevel #0 $after
1744 return
1745 }
1746 for {set i $batch} \
1748 {$update_index_cp < $totalCnt && $i > 0} \
1749 {incr i -1} {
1750 set path [lindex $pathList $update_index_cp]
1751 incr update_index_cp
1752 switch -glob -- [lindex $file_states($path) 0] {
1753 U? {continue}
1754 ?M -
1755 ?D {
1756 puts -nonewline $fd "[encoding convertto $path]\0"
1757 display_file $path ?_
1758 }
1759 }
1760 }
1761 set ui_status_value [format \
1763 "$msg... %i/%i files (%.2f%%)" \
1764 $update_index_cp \
1765 $totalCnt \
1766 [expr {100.0 * $update_index_cp / $totalCnt}]]
1767}
1768######################################################################
1770##
1771## branch management
1772proc is_tracking_branch {name} {
1774 global tracking_branches
1775 if {![catch {set info $tracking_branches($name)}]} {
1777 return 1
1778 }
1779 foreach t [array names tracking_branches] {
1780 if {[string match {*/\*} $t] && [string match $t $name]} {
1781 return 1
1782 }
1783 }
1784 return 0
1785}
1786proc load_all_heads {} {
1788 global all_heads
1789 set all_heads [list]
1791 set fd [open "| git for-each-ref --format=%(refname) refs/heads" r]
1792 while {[gets $fd line] > 0} {
1793 if {[is_tracking_branch $line]} continue
1794 if {![regsub ^refs/heads/ $line {} name]} continue
1795 lappend all_heads $name
1796 }
1797 close $fd
1798 set all_heads [lsort $all_heads]
1800}
1801proc populate_branch_menu {} {
1803 global all_heads disable_on_lock
1804 set m .mbar.branch
1806 set last [$m index last]
1807 for {set i 0} {$i <= $last} {incr i} {
1808 if {[$m type $i] eq {separator}} {
1809 $m delete $i last
1810 set new_dol [list]
1811 foreach a $disable_on_lock {
1812 if {[lindex $a 0] ne $m || [lindex $a 2] < $i} {
1813 lappend new_dol $a
1814 }
1815 }
1816 set disable_on_lock $new_dol
1817 break
1818 }
1819 }
1820 if {$all_heads ne {}} {
1822 $m add separator
1823 }
1824 foreach b $all_heads {
1825 $m add radiobutton \
1826 -label $b \
1827 -command [list switch_branch $b] \
1828 -variable current_branch \
1829 -value $b \
1830 -font font_ui
1831 lappend disable_on_lock \
1832 [list $m entryconf [$m index last] -state]
1833 }
1834}
1835proc all_tracking_branches {} {
1837 global tracking_branches
1838 set all_trackings {}
1840 set cmd {}
1841 foreach name [array names tracking_branches] {
1842 if {[regsub {/\*$} $name {} name]} {
1843 lappend cmd $name
1844 } else {
1845 regsub ^refs/(heads|remotes)/ $name {} name
1846 lappend all_trackings $name
1847 }
1848 }
1849 if {$cmd ne {}} {
1851 set fd [open "| git for-each-ref --format=%(refname) $cmd" r]
1852 while {[gets $fd name] > 0} {
1853 regsub ^refs/(heads|remotes)/ $name {} name
1854 lappend all_trackings $name
1855 }
1856 close $fd
1857 }
1858 return [lsort -unique $all_trackings]
1860}
1861proc do_create_branch_action {w} {
1863 global all_heads null_sha1 repo_config
1864 global create_branch_checkout create_branch_revtype
1865 global create_branch_head create_branch_trackinghead
1866 global create_branch_name create_branch_revexp
1867 set newbranch $create_branch_name
1869 if {$newbranch eq {}
1870 || $newbranch eq $repo_config(gui.newbranchtemplate)} {
1871 tk_messageBox \
1872 -icon error \
1873 -type ok \
1874 -title [wm title $w] \
1875 -parent $w \
1876 -message "Please supply a branch name."
1877 focus $w.desc.name_t
1878 return
1879 }
1880 if {![catch {exec git show-ref --verify -- "refs/heads/$newbranch"}]} {
1881 tk_messageBox \
1882 -icon error \
1883 -type ok \
1884 -title [wm title $w] \
1885 -parent $w \
1886 -message "Branch '$newbranch' already exists."
1887 focus $w.desc.name_t
1888 return
1889 }
1890 if {[catch {exec git check-ref-format "heads/$newbranch"}]} {
1891 tk_messageBox \
1892 -icon error \
1893 -type ok \
1894 -title [wm title $w] \
1895 -parent $w \
1896 -message "We do not like '$newbranch' as a branch name."
1897 focus $w.desc.name_t
1898 return
1899 }
1900 set rev {}
1902 switch -- $create_branch_revtype {
1903 head {set rev $create_branch_head}
1904 tracking {set rev $create_branch_trackinghead}
1905 expression {set rev $create_branch_revexp}
1906 }
1907 if {[catch {set cmt [exec git rev-parse --verify "${rev}^0"]}]} {
1908 tk_messageBox \
1909 -icon error \
1910 -type ok \
1911 -title [wm title $w] \
1912 -parent $w \
1913 -message "Invalid starting revision: $rev"
1914 return
1915 }
1916 set cmd [list git update-ref]
1917 lappend cmd -m
1918 lappend cmd "branch: Created from $rev"
1919 lappend cmd "refs/heads/$newbranch"
1920 lappend cmd $cmt
1921 lappend cmd $null_sha1
1922 if {[catch {eval exec $cmd} err]} {
1923 tk_messageBox \
1924 -icon error \
1925 -type ok \
1926 -title [wm title $w] \
1927 -parent $w \
1928 -message "Failed to create '$newbranch'.\n\n$err"
1929 return
1930 }
1931 lappend all_heads $newbranch
1933 set all_heads [lsort $all_heads]
1934 populate_branch_menu
1935 destroy $w
1936 if {$create_branch_checkout} {
1937 switch_branch $newbranch
1938 }
1939}
1940proc radio_selector {varname value args} {
1942 upvar #0 $varname var
1943 set var $value
1944}
1945trace add variable create_branch_head write \
1947 [list radio_selector create_branch_revtype head]
1948trace add variable create_branch_trackinghead write \
1949 [list radio_selector create_branch_revtype tracking]
1950trace add variable delete_branch_head write \
1952 [list radio_selector delete_branch_checktype head]
1953trace add variable delete_branch_trackinghead write \
1954 [list radio_selector delete_branch_checktype tracking]
1955proc do_create_branch {} {
1957 global all_heads current_branch repo_config
1958 global create_branch_checkout create_branch_revtype
1959 global create_branch_head create_branch_trackinghead
1960 global create_branch_name create_branch_revexp
1961 set w .branch_editor
1963 toplevel $w
1964 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
1965 label $w.header -text {Create New Branch} \
1967 -font font_uibold
1968 pack $w.header -side top -fill x
1969 frame $w.buttons
1971 button $w.buttons.create -text Create \
1972 -font font_ui \
1973 -default active \
1974 -command [list do_create_branch_action $w]
1975 pack $w.buttons.create -side right
1976 button $w.buttons.cancel -text {Cancel} \
1977 -font font_ui \
1978 -command [list destroy $w]
1979 pack $w.buttons.cancel -side right -padx 5
1980 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
1981 labelframe $w.desc \
1983 -text {Branch Description} \
1984 -font font_ui
1985 label $w.desc.name_l -text {Name:} -font font_ui
1986 entry $w.desc.name_t \
1987 -borderwidth 1 \
1988 -relief sunken \
1989 -width 40 \
1990 -textvariable create_branch_name \
1991 -font font_ui \
1992 -validate key \
1993 -validatecommand {
1994 if {%d == 1 && [regexp {[~^:?*\[\0- ]} %S]} {return 0}
1995 return 1
1996 }
1997 grid $w.desc.name_l $w.desc.name_t -sticky we -padx {0 5}
1998 grid columnconfigure $w.desc 1 -weight 1
1999 pack $w.desc -anchor nw -fill x -pady 5 -padx 5
2000 labelframe $w.from \
2002 -text {Starting Revision} \
2003 -font font_ui
2004 radiobutton $w.from.head_r \
2005 -text {Local Branch:} \
2006 -value head \
2007 -variable create_branch_revtype \
2008 -font font_ui
2009 eval tk_optionMenu $w.from.head_m create_branch_head $all_heads
2010 grid $w.from.head_r $w.from.head_m -sticky w
2011 set all_trackings [all_tracking_branches]
2012 if {$all_trackings ne {}} {
2013 set create_branch_trackinghead [lindex $all_trackings 0]
2014 radiobutton $w.from.tracking_r \
2015 -text {Tracking Branch:} \
2016 -value tracking \
2017 -variable create_branch_revtype \
2018 -font font_ui
2019 eval tk_optionMenu $w.from.tracking_m \
2020 create_branch_trackinghead \
2021 $all_trackings
2022 grid $w.from.tracking_r $w.from.tracking_m -sticky w
2023 }
2024 radiobutton $w.from.exp_r \
2025 -text {Revision Expression:} \
2026 -value expression \
2027 -variable create_branch_revtype \
2028 -font font_ui
2029 entry $w.from.exp_t \
2030 -borderwidth 1 \
2031 -relief sunken \
2032 -width 50 \
2033 -textvariable create_branch_revexp \
2034 -font font_ui \
2035 -validate key \
2036 -validatecommand {
2037 if {%d == 1 && [regexp {\s} %S]} {return 0}
2038 if {%d == 1 && [string length %S] > 0} {
2039 set create_branch_revtype expression
2040 }
2041 return 1
2042 }
2043 grid $w.from.exp_r $w.from.exp_t -sticky we -padx {0 5}
2044 grid columnconfigure $w.from 1 -weight 1
2045 pack $w.from -anchor nw -fill x -pady 5 -padx 5
2046 labelframe $w.postActions \
2048 -text {Post Creation Actions} \
2049 -font font_ui
2050 checkbutton $w.postActions.checkout \
2051 -text {Checkout after creation} \
2052 -variable create_branch_checkout \
2053 -font font_ui
2054 pack $w.postActions.checkout -anchor nw
2055 pack $w.postActions -anchor nw -fill x -pady 5 -padx 5
2056 set create_branch_checkout 1
2058 set create_branch_head $current_branch
2059 set create_branch_revtype head
2060 set create_branch_name $repo_config(gui.newbranchtemplate)
2061 set create_branch_revexp {}
2062 bind $w <Visibility> "
2064 grab $w
2065 $w.desc.name_t icursor end
2066 focus $w.desc.name_t
2067 "
2068 bind $w <Key-Escape> "destroy $w"
2069 bind $w <Key-Return> "do_create_branch_action $w;break"
2070 wm title $w "[appname] ([reponame]): Create Branch"
2071 tkwait window $w
2072}
2073proc do_delete_branch_action {w} {
2075 global all_heads
2076 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
2077 set check_rev {}
2079 switch -- $delete_branch_checktype {
2080 head {set check_rev $delete_branch_head}
2081 tracking {set check_rev $delete_branch_trackinghead}
2082 always {set check_rev {:none}}
2083 }
2084 if {$check_rev eq {:none}} {
2085 set check_cmt {}
2086 } elseif {[catch {set check_cmt [exec git rev-parse --verify "${check_rev}^0"]}]} {
2087 tk_messageBox \
2088 -icon error \
2089 -type ok \
2090 -title [wm title $w] \
2091 -parent $w \
2092 -message "Invalid check revision: $check_rev"
2093 return
2094 }
2095 set to_delete [list]
2097 set not_merged [list]
2098 foreach i [$w.list.l curselection] {
2099 set b [$w.list.l get $i]
2100 if {[catch {set o [exec git rev-parse --verify $b]}]} continue
2101 if {$check_cmt ne {}} {
2102 if {$b eq $check_rev} continue
2103 if {[catch {set m [exec git merge-base $o $check_cmt]}]} continue
2104 if {$o ne $m} {
2105 lappend not_merged $b
2106 continue
2107 }
2108 }
2109 lappend to_delete [list $b $o]
2110 }
2111 if {$not_merged ne {}} {
2112 set msg "The following branches are not completely merged into $check_rev:
2113 - [join $not_merged "\n - "]"
2115 tk_messageBox \
2116 -icon info \
2117 -type ok \
2118 -title [wm title $w] \
2119 -parent $w \
2120 -message $msg
2121 }
2122 if {$to_delete eq {}} return
2123 if {$delete_branch_checktype eq {always}} {
2124 set msg {Recovering deleted branches is difficult.
2125Delete the selected branches?}
2127 if {[tk_messageBox \
2128 -icon warning \
2129 -type yesno \
2130 -title [wm title $w] \
2131 -parent $w \
2132 -message $msg] ne yes} {
2133 return
2134 }
2135 }
2136 set failed {}
2138 foreach i $to_delete {
2139 set b [lindex $i 0]
2140 set o [lindex $i 1]
2141 if {[catch {exec git update-ref -d "refs/heads/$b" $o} err]} {
2142 append failed " - $b: $err\n"
2143 } else {
2144 set x [lsearch -sorted -exact $all_heads $b]
2145 if {$x >= 0} {
2146 set all_heads [lreplace $all_heads $x $x]
2147 }
2148 }
2149 }
2150 if {$failed ne {}} {
2152 tk_messageBox \
2153 -icon error \
2154 -type ok \
2155 -title [wm title $w] \
2156 -parent $w \
2157 -message "Failed to delete branches:\n$failed"
2158 }
2159 set all_heads [lsort $all_heads]
2161 populate_branch_menu
2162 destroy $w
2163}
2164proc do_delete_branch {} {
2166 global all_heads tracking_branches current_branch
2167 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
2168 set w .branch_editor
2170 toplevel $w
2171 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2172 label $w.header -text {Delete Local Branch} \
2174 -font font_uibold
2175 pack $w.header -side top -fill x
2176 frame $w.buttons
2178 button $w.buttons.create -text Delete \
2179 -font font_ui \
2180 -command [list do_delete_branch_action $w]
2181 pack $w.buttons.create -side right
2182 button $w.buttons.cancel -text {Cancel} \
2183 -font font_ui \
2184 -command [list destroy $w]
2185 pack $w.buttons.cancel -side right -padx 5
2186 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2187 labelframe $w.list \
2189 -text {Local Branches} \
2190 -font font_ui
2191 listbox $w.list.l \
2192 -height 10 \
2193 -width 70 \
2194 -selectmode extended \
2195 -yscrollcommand [list $w.list.sby set] \
2196 -font font_ui
2197 foreach h $all_heads {
2198 if {$h ne $current_branch} {
2199 $w.list.l insert end $h
2200 }
2201 }
2202 scrollbar $w.list.sby -command [list $w.list.l yview]
2203 pack $w.list.sby -side right -fill y
2204 pack $w.list.l -side left -fill both -expand 1
2205 pack $w.list -fill both -expand 1 -pady 5 -padx 5
2206 labelframe $w.validate \
2208 -text {Delete Only If} \
2209 -font font_ui
2210 radiobutton $w.validate.head_r \
2211 -text {Merged Into Local Branch:} \
2212 -value head \
2213 -variable delete_branch_checktype \
2214 -font font_ui
2215 eval tk_optionMenu $w.validate.head_m delete_branch_head $all_heads
2216 grid $w.validate.head_r $w.validate.head_m -sticky w
2217 set all_trackings [all_tracking_branches]
2218 if {$all_trackings ne {}} {
2219 set delete_branch_trackinghead [lindex $all_trackings 0]
2220 radiobutton $w.validate.tracking_r \
2221 -text {Merged Into Tracking Branch:} \
2222 -value tracking \
2223 -variable delete_branch_checktype \
2224 -font font_ui
2225 eval tk_optionMenu $w.validate.tracking_m \
2226 delete_branch_trackinghead \
2227 $all_trackings
2228 grid $w.validate.tracking_r $w.validate.tracking_m -sticky w
2229 }
2230 radiobutton $w.validate.always_r \
2231 -text {Always (Do not perform merge checks)} \
2232 -value always \
2233 -variable delete_branch_checktype \
2234 -font font_ui
2235 grid $w.validate.always_r -columnspan 2 -sticky w
2236 grid columnconfigure $w.validate 1 -weight 1
2237 pack $w.validate -anchor nw -fill x -pady 5 -padx 5
2238 set delete_branch_head $current_branch
2240 set delete_branch_checktype head
2241 bind $w <Visibility> "grab $w; focus $w"
2243 bind $w <Key-Escape> "destroy $w"
2244 wm title $w "[appname] ([reponame]): Delete Branch"
2245 tkwait window $w
2246}
2247proc switch_branch {new_branch} {
2249 global HEAD commit_type current_branch repo_config
2250 if {![lock_index switch]} return
2252 # -- Our in memory state should match the repository.
2254 #
2255 repository_state curType curHEAD curMERGE_HEAD
2256 if {[string match amend* $commit_type]
2257 && $curType eq {normal}
2258 && $curHEAD eq $HEAD} {
2259 } elseif {$commit_type ne $curType || $HEAD ne $curHEAD} {
2260 info_popup {Last scanned state does not match repository state.
2261Another Git program has modified this repository
2263since the last scan. A rescan must be performed
2264before the current branch can be changed.
2265The rescan will be automatically started now.
2267}
2268 unlock_index
2269 rescan {set ui_status_value {Ready.}}
2270 return
2271 }
2272 # -- Don't do a pointless switch.
2274 #
2275 if {$current_branch eq $new_branch} {
2276 unlock_index
2277 return
2278 }
2279 if {$repo_config(gui.trustmtime) eq {true}} {
2281 switch_branch_stage2 {} $new_branch
2282 } else {
2283 set ui_status_value {Refreshing file status...}
2284 set cmd [list git update-index]
2285 lappend cmd -q
2286 lappend cmd --unmerged
2287 lappend cmd --ignore-missing
2288 lappend cmd --refresh
2289 set fd_rf [open "| $cmd" r]
2290 fconfigure $fd_rf -blocking 0 -translation binary
2291 fileevent $fd_rf readable \
2292 [list switch_branch_stage2 $fd_rf $new_branch]
2293 }
2294}
2295proc switch_branch_stage2 {fd_rf new_branch} {
2297 global ui_status_value HEAD
2298 if {$fd_rf ne {}} {
2300 read $fd_rf
2301 if {![eof $fd_rf]} return
2302 close $fd_rf
2303 }
2304 set ui_status_value "Updating working directory to '$new_branch'..."
2306 set cmd [list git read-tree]
2307 lappend cmd -m
2308 lappend cmd -u
2309 lappend cmd --exclude-per-directory=.gitignore
2310 lappend cmd $HEAD
2311 lappend cmd $new_branch
2312 set fd_rt [open "| $cmd" r]
2313 fconfigure $fd_rt -blocking 0 -translation binary
2314 fileevent $fd_rt readable \
2315 [list switch_branch_readtree_wait $fd_rt $new_branch]
2316}
2317proc switch_branch_readtree_wait {fd_rt new_branch} {
2319 global selected_commit_type commit_type HEAD MERGE_HEAD PARENT
2320 global current_branch
2321 global ui_comm ui_status_value
2322 # -- We never get interesting output on stdout; only stderr.
2324 #
2325 read $fd_rt
2326 fconfigure $fd_rt -blocking 1
2327 if {![eof $fd_rt]} {
2328 fconfigure $fd_rt -blocking 0
2329 return
2330 }
2331 # -- The working directory wasn't in sync with the index and
2333 # we'd have to overwrite something to make the switch. A
2334 # merge is required.
2335 #
2336 if {[catch {close $fd_rt} err]} {
2337 regsub {^fatal: } $err {} err
2338 warn_popup "File level merge required.
2339$err
2341Staying on branch '$current_branch'."
2343 set ui_status_value "Aborted checkout of '$new_branch' (file level merging is required)."
2344 unlock_index
2345 return
2346 }
2347 # -- Update the symbolic ref. Core git doesn't even check for failure
2349 # here, it Just Works(tm). If it doesn't we are in some really ugly
2350 # state that is difficult to recover from within git-gui.
2351 #
2352 if {[catch {exec git symbolic-ref HEAD "refs/heads/$new_branch"} err]} {
2353 error_popup "Failed to set current branch.
2354This working directory is only partially switched.
2356We successfully updated your files, but failed to
2357update an internal Git file.
2358This should not have occurred. [appname] will now
2360close and give up.
2361$err"
2363 do_quit
2364 return
2365 }
2366 # -- Update our repository state. If we were previously in amend mode
2368 # we need to toss the current buffer and do a full rescan to update
2369 # our file lists. If we weren't in amend mode our file lists are
2370 # accurate and we can avoid the rescan.
2371 #
2372 unlock_index
2373 set selected_commit_type new
2374 if {[string match amend* $commit_type]} {
2375 $ui_comm delete 0.0 end
2376 $ui_comm edit reset
2377 $ui_comm edit modified false
2378 rescan {set ui_status_value "Checked out branch '$current_branch'."}
2379 } else {
2380 repository_state commit_type HEAD MERGE_HEAD
2381 set PARENT $HEAD
2382 set ui_status_value "Checked out branch '$current_branch'."
2383 }
2384}
2385######################################################################
2387##
2388## remote management
2389proc load_all_remotes {} {
2391 global repo_config
2392 global all_remotes tracking_branches
2393 set all_remotes [list]
2395 array unset tracking_branches
2396 set rm_dir [gitdir remotes]
2398 if {[file isdirectory $rm_dir]} {
2399 set all_remotes [glob \
2400 -types f \
2401 -tails \
2402 -nocomplain \
2403 -directory $rm_dir *]
2404 foreach name $all_remotes {
2406 catch {
2407 set fd [open [file join $rm_dir $name] r]
2408 while {[gets $fd line] >= 0} {
2409 if {![regexp {^Pull:[ ]*([^:]+):(.+)$} \
2410 $line line src dst]} continue
2411 if {![regexp ^refs/ $dst]} {
2412 set dst "refs/heads/$dst"
2413 }
2414 set tracking_branches($dst) [list $name $src]
2415 }
2416 close $fd
2417 }
2418 }
2419 }
2420 foreach line [array names repo_config remote.*.url] {
2422 if {![regexp ^remote\.(.*)\.url\$ $line line name]} continue
2423 lappend all_remotes $name
2424 if {[catch {set fl $repo_config(remote.$name.fetch)}]} {
2426 set fl {}
2427 }
2428 foreach line $fl {
2429 if {![regexp {^([^:]+):(.+)$} $line line src dst]} continue
2430 if {![regexp ^refs/ $dst]} {
2431 set dst "refs/heads/$dst"
2432 }
2433 set tracking_branches($dst) [list $name $src]
2434 }
2435 }
2436 set all_remotes [lsort -unique $all_remotes]
2438}
2439proc populate_fetch_menu {} {
2441 global all_remotes repo_config
2442 set m .mbar.fetch
2444 foreach r $all_remotes {
2445 set enable 0
2446 if {![catch {set a $repo_config(remote.$r.url)}]} {
2447 if {![catch {set a $repo_config(remote.$r.fetch)}]} {
2448 set enable 1
2449 }
2450 } else {
2451 catch {
2452 set fd [open [gitdir remotes $r] r]
2453 while {[gets $fd n] >= 0} {
2454 if {[regexp {^Pull:[ \t]*([^:]+):} $n]} {
2455 set enable 1
2456 break
2457 }
2458 }
2459 close $fd
2460 }
2461 }
2462 if {$enable} {
2464 $m add command \
2465 -label "Fetch from $r..." \
2466 -command [list fetch_from $r] \
2467 -font font_ui
2468 }
2469 }
2470}
2471proc populate_push_menu {} {
2473 global all_remotes repo_config
2474 set m .mbar.push
2476 set fast_count 0
2477 foreach r $all_remotes {
2478 set enable 0
2479 if {![catch {set a $repo_config(remote.$r.url)}]} {
2480 if {![catch {set a $repo_config(remote.$r.push)}]} {
2481 set enable 1
2482 }
2483 } else {
2484 catch {
2485 set fd [open [gitdir remotes $r] r]
2486 while {[gets $fd n] >= 0} {
2487 if {[regexp {^Push:[ \t]*([^:]+):} $n]} {
2488 set enable 1
2489 break
2490 }
2491 }
2492 close $fd
2493 }
2494 }
2495 if {$enable} {
2497 if {!$fast_count} {
2498 $m add separator
2499 }
2500 $m add command \
2501 -label "Push to $r..." \
2502 -command [list push_to $r] \
2503 -font font_ui
2504 incr fast_count
2505 }
2506 }
2507}
2508proc start_push_anywhere_action {w} {
2510 global push_urltype push_remote push_url push_thin push_tags
2511 set r_url {}
2513 switch -- $push_urltype {
2514 remote {set r_url $push_remote}
2515 url {set r_url $push_url}
2516 }
2517 if {$r_url eq {}} return
2518 set cmd [list git push]
2520 lappend cmd -v
2521 if {$push_thin} {
2522 lappend cmd --thin
2523 }
2524 if {$push_tags} {
2525 lappend cmd --tags
2526 }
2527 lappend cmd $r_url
2528 set cnt 0
2529 foreach i [$w.source.l curselection] {
2530 set b [$w.source.l get $i]
2531 lappend cmd "refs/heads/$b:refs/heads/$b"
2532 incr cnt
2533 }
2534 if {$cnt == 0} {
2535 return
2536 } elseif {$cnt == 1} {
2537 set unit branch
2538 } else {
2539 set unit branches
2540 }
2541 set cons [new_console "push $r_url" "Pushing $cnt $unit to $r_url"]
2543 console_exec $cons $cmd console_done
2544 destroy $w
2545}
2546trace add variable push_remote write \
2548 [list radio_selector push_urltype remote]
2549proc do_push_anywhere {} {
2551 global all_heads all_remotes current_branch
2552 global push_urltype push_remote push_url push_thin push_tags
2553 set w .push_setup
2555 toplevel $w
2556 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2557 label $w.header -text {Push Branches} -font font_uibold
2559 pack $w.header -side top -fill x
2560 frame $w.buttons
2562 button $w.buttons.create -text Push \
2563 -font font_ui \
2564 -command [list start_push_anywhere_action $w]
2565 pack $w.buttons.create -side right
2566 button $w.buttons.cancel -text {Cancel} \
2567 -font font_ui \
2568 -command [list destroy $w]
2569 pack $w.buttons.cancel -side right -padx 5
2570 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2571 labelframe $w.source \
2573 -text {Source Branches} \
2574 -font font_ui
2575 listbox $w.source.l \
2576 -height 10 \
2577 -width 70 \
2578 -selectmode extended \
2579 -yscrollcommand [list $w.source.sby set] \
2580 -font font_ui
2581 foreach h $all_heads {
2582 $w.source.l insert end $h
2583 if {$h eq $current_branch} {
2584 $w.source.l select set end
2585 }
2586 }
2587 scrollbar $w.source.sby -command [list $w.source.l yview]
2588 pack $w.source.sby -side right -fill y
2589 pack $w.source.l -side left -fill both -expand 1
2590 pack $w.source -fill both -expand 1 -pady 5 -padx 5
2591 labelframe $w.dest \
2593 -text {Destination Repository} \
2594 -font font_ui
2595 if {$all_remotes ne {}} {
2596 radiobutton $w.dest.remote_r \
2597 -text {Remote:} \
2598 -value remote \
2599 -variable push_urltype \
2600 -font font_ui
2601 eval tk_optionMenu $w.dest.remote_m push_remote $all_remotes
2602 grid $w.dest.remote_r $w.dest.remote_m -sticky w
2603 if {[lsearch -sorted -exact $all_remotes origin] != -1} {
2604 set push_remote origin
2605 } else {
2606 set push_remote [lindex $all_remotes 0]
2607 }
2608 set push_urltype remote
2609 } else {
2610 set push_urltype url
2611 }
2612 radiobutton $w.dest.url_r \
2613 -text {Arbitrary URL:} \
2614 -value url \
2615 -variable push_urltype \
2616 -font font_ui
2617 entry $w.dest.url_t \
2618 -borderwidth 1 \
2619 -relief sunken \
2620 -width 50 \
2621 -textvariable push_url \
2622 -font font_ui \
2623 -validate key \
2624 -validatecommand {
2625 if {%d == 1 && [regexp {\s} %S]} {return 0}
2626 if {%d == 1 && [string length %S] > 0} {
2627 set push_urltype url
2628 }
2629 return 1
2630 }
2631 grid $w.dest.url_r $w.dest.url_t -sticky we -padx {0 5}
2632 grid columnconfigure $w.dest 1 -weight 1
2633 pack $w.dest -anchor nw -fill x -pady 5 -padx 5
2634 labelframe $w.options \
2636 -text {Transfer Options} \
2637 -font font_ui
2638 checkbutton $w.options.thin \
2639 -text {Use thin pack (for slow network connections)} \
2640 -variable push_thin \
2641 -font font_ui
2642 grid $w.options.thin -columnspan 2 -sticky w
2643 checkbutton $w.options.tags \
2644 -text {Include tags} \
2645 -variable push_tags \
2646 -font font_ui
2647 grid $w.options.tags -columnspan 2 -sticky w
2648 grid columnconfigure $w.options 1 -weight 1
2649 pack $w.options -anchor nw -fill x -pady 5 -padx 5
2650 set push_url {}
2652 set push_thin 0
2653 set push_tags 0
2654 bind $w <Visibility> "grab $w"
2656 bind $w <Key-Escape> "destroy $w"
2657 wm title $w "[appname] ([reponame]): Push"
2658 tkwait window $w
2659}
2660######################################################################
2662##
2663## merge
2664proc can_merge {} {
2666 global HEAD commit_type file_states
2667 if {[string match amend* $commit_type]} {
2669 info_popup {Cannot merge while amending.
2670You must finish amending this commit before
2672starting any type of merge.
2673}
2674 return 0
2675 }
2676 if {[committer_ident] eq {}} {return 0}
2678 if {![lock_index merge]} {return 0}
2679 # -- Our in memory state should match the repository.
2681 #
2682 repository_state curType curHEAD curMERGE_HEAD
2683 if {$commit_type ne $curType || $HEAD ne $curHEAD} {
2684 info_popup {Last scanned state does not match repository state.
2685Another Git program has modified this repository
2687since the last scan. A rescan must be performed
2688before a merge can be performed.
2689The rescan will be automatically started now.
2691}
2692 unlock_index
2693 rescan {set ui_status_value {Ready.}}
2694 return 0
2695 }
2696 foreach path [array names file_states] {
2698 switch -glob -- [lindex $file_states($path) 0] {
2699 _O {
2700 continue; # and pray it works!
2701 }
2702 U? {
2703 error_popup "You are in the middle of a conflicted merge.
2704File [short_path $path] has merge conflicts.
2706You must resolve them, add the file, and commit to
2708complete the current merge. Only then can you
2709begin another merge.
2710"
2711 unlock_index
2712 return 0
2713 }
2714 ?? {
2715 error_popup "You are in the middle of a change.
2716File [short_path $path] is modified.
2718You should complete the current commit before
2720starting a merge. Doing so will help you abort
2721a failed merge, should the need arise.
2722"
2723 unlock_index
2724 return 0
2725 }
2726 }
2727 }
2728 return 1
2730}
2731proc visualize_local_merge {w} {
2733 set revs {}
2734 foreach i [$w.source.l curselection] {
2735 lappend revs [$w.source.l get $i]
2736 }
2737 if {$revs eq {}} return
2738 lappend revs --not HEAD
2739 do_gitk $revs
2740}
2741proc start_local_merge_action {w} {
2743 global HEAD ui_status_value current_branch
2744 set cmd [list git merge]
2746 set names {}
2747 set revcnt 0
2748 foreach i [$w.source.l curselection] {
2749 set b [$w.source.l get $i]
2750 lappend cmd $b
2751 lappend names $b
2752 incr revcnt
2753 }
2754 if {$revcnt == 0} {
2756 return
2757 } elseif {$revcnt == 1} {
2758 set unit branch
2759 } elseif {$revcnt <= 15} {
2760 set unit branches
2761 } else {
2762 tk_messageBox \
2763 -icon error \
2764 -type ok \
2765 -title [wm title $w] \
2766 -parent $w \
2767 -message "Too many branches selected.
2768You have requested to merge $revcnt branches
2770in an octopus merge. This exceeds Git's
2771internal limit of 15 branches per merge.
2772Please select fewer branches. To merge more
2774than 15 branches, merge the branches in batches.
2775"
2776 return
2777 }
2778 set msg "Merging $current_branch, [join $names {, }]"
2780 set ui_status_value "$msg..."
2781 set cons [new_console "Merge" $msg]
2782 console_exec $cons $cmd [list finish_merge $revcnt]
2783 bind $w <Destroy> {}
2784 destroy $w
2785}
2786proc finish_merge {revcnt w ok} {
2788 console_done $w $ok
2789 if {$ok} {
2790 set msg {Merge completed successfully.}
2791 } else {
2792 if {$revcnt != 1} {
2793 info_popup "Octopus merge failed.
2794Your merge of $revcnt branches has failed.
2796There are file-level conflicts between the
2798branches which must be resolved manually.
2799The working directory will now be reset.
2801You can attempt this merge again
2803by merging only one branch at a time." $w
2804 set fd [open "| git read-tree --reset -u HEAD" r]
2806 fconfigure $fd -blocking 0 -translation binary
2807 fileevent $fd readable [list reset_hard_wait $fd]
2808 set ui_status_value {Aborting... please wait...}
2809 return
2810 }
2811 set msg {Merge failed. Conflict resolution is required.}
2813 }
2814 unlock_index
2815 rescan [list set ui_status_value $msg]
2816}
2817proc do_local_merge {} {
2819 global current_branch
2820 if {![can_merge]} return
2822 set w .merge_setup
2824 toplevel $w
2825 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2826 label $w.header \
2828 -text "Merge Into $current_branch" \
2829 -font font_uibold
2830 pack $w.header -side top -fill x
2831 frame $w.buttons
2833 button $w.buttons.visualize -text Visualize \
2834 -font font_ui \
2835 -command [list visualize_local_merge $w]
2836 pack $w.buttons.visualize -side left
2837 button $w.buttons.create -text Merge \
2838 -font font_ui \
2839 -command [list start_local_merge_action $w]
2840 pack $w.buttons.create -side right
2841 button $w.buttons.cancel -text {Cancel} \
2842 -font font_ui \
2843 -command [list destroy $w]
2844 pack $w.buttons.cancel -side right -padx 5
2845 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
2846 labelframe $w.source \
2848 -text {Source Branches} \
2849 -font font_ui
2850 listbox $w.source.l \
2851 -height 10 \
2852 -width 70 \
2853 -selectmode extended \
2854 -yscrollcommand [list $w.source.sby set] \
2855 -font font_ui
2856 scrollbar $w.source.sby -command [list $w.source.l yview]
2857 pack $w.source.sby -side right -fill y
2858 pack $w.source.l -side left -fill both -expand 1
2859 pack $w.source -fill both -expand 1 -pady 5 -padx 5
2860 set cmd [list git for-each-ref]
2862 lappend cmd {--format=%(objectname) %(refname)}
2863 lappend cmd refs/heads
2864 lappend cmd refs/remotes
2865 set fr_fd [open "| $cmd" r]
2866 fconfigure $fr_fd -translation binary
2867 while {[gets $fr_fd line] > 0} {
2868 set line [split $line { }]
2869 set sha1([lindex $line 0]) [lindex $line 1]
2870 }
2871 close $fr_fd
2872 set to_show {}
2874 set fr_fd [open "| git rev-list --all --not HEAD"]
2875 while {[gets $fr_fd line] > 0} {
2876 if {[catch {set ref $sha1($line)}]} continue
2877 regsub ^refs/(heads|remotes)/ $ref {} ref
2878 lappend to_show $ref
2879 }
2880 close $fr_fd
2881 foreach ref [lsort -unique $to_show] {
2883 $w.source.l insert end $ref
2884 }
2885 bind $w <Visibility> "grab $w"
2887 bind $w <Key-Escape> "unlock_index;destroy $w"
2888 bind $w <Destroy> unlock_index
2889 wm title $w "[appname] ([reponame]): Merge"
2890 tkwait window $w
2891}
2892proc do_reset_hard {} {
2894 global HEAD commit_type file_states
2895 if {[string match amend* $commit_type]} {
2897 info_popup {Cannot abort while amending.
2898You must finish amending this commit.
2900}
2901 return
2902 }
2903 if {![lock_index abort]} return
2905 if {[string match *merge* $commit_type]} {
2907 set op merge
2908 } else {
2909 set op commit
2910 }
2911 if {[ask_popup "Abort $op?
2913Aborting the current $op will cause
2915*ALL* uncommitted changes to be lost.
2916Continue with aborting the current $op?"] eq {yes}} {
2918 set fd [open "| git read-tree --reset -u HEAD" r]
2919 fconfigure $fd -blocking 0 -translation binary
2920 fileevent $fd readable [list reset_hard_wait $fd]
2921 set ui_status_value {Aborting... please wait...}
2922 } else {
2923 unlock_index
2924 }
2925}
2926proc reset_hard_wait {fd} {
2928 global ui_comm
2929 read $fd
2931 if {[eof $fd]} {
2932 close $fd
2933 unlock_index
2934 $ui_comm delete 0.0 end
2936 $ui_comm edit modified false
2937 catch {file delete [gitdir MERGE_HEAD]}
2939 catch {file delete [gitdir rr-cache MERGE_RR]}
2940 catch {file delete [gitdir SQUASH_MSG]}
2941 catch {file delete [gitdir MERGE_MSG]}
2942 catch {file delete [gitdir GITGUI_MSG]}
2943 rescan {set ui_status_value {Abort completed. Ready.}}
2945 }
2946}
2947######################################################################
2949##
2950## browser
2951set next_browser_id 0
2953proc new_browser {commit} {
2955 global next_browser_id cursor_ptr
2956 global browser_commit browser_status browser_stack browser_path browser_busy
2957 set w .browser[incr next_browser_id]
2959 set w_list $w.list.l
2960 set browser_commit($w_list) $commit
2961 set browser_status($w_list) {Starting...}
2962 set browser_stack($w_list) {}
2963 set browser_path($w_list) $browser_commit($w_list):
2964 set browser_busy($w_list) 1
2965 toplevel $w
2967 label $w.path -textvariable browser_path($w_list) \
2968 -anchor w \
2969 -justify left \
2970 -borderwidth 1 \
2971 -relief sunken \
2972 -font font_uibold
2973 pack $w.path -anchor w -side top -fill x
2974 frame $w.list
2976 text $w_list -background white -borderwidth 0 \
2977 -cursor $cursor_ptr \
2978 -state disabled \
2979 -wrap none \
2980 -height 20 \
2981 -width 70 \
2982 -xscrollcommand [list $w.list.sbx set] \
2983 -yscrollcommand [list $w.list.sby set] \
2984 -font font_ui
2985 $w_list tag conf in_sel \
2986 -background [$w_list cget -foreground] \
2987 -foreground [$w_list cget -background]
2988 scrollbar $w.list.sbx -orient h -command [list $w_list xview]
2989 scrollbar $w.list.sby -orient v -command [list $w_list yview]
2990 pack $w.list.sbx -side bottom -fill x
2991 pack $w.list.sby -side right -fill y
2992 pack $w_list -side left -fill both -expand 1
2993 pack $w.list -side top -fill both -expand 1
2994 label $w.status -textvariable browser_status($w_list) \
2996 -anchor w \
2997 -justify left \
2998 -borderwidth 1 \
2999 -relief sunken \
3000 -font font_ui
3001 pack $w.status -anchor w -side bottom -fill x
3002 bind $w_list <Button-1> "browser_click 0 $w_list @%x,%y;break"
3004 bind $w_list <Double-Button-1> "browser_click 1 $w_list @%x,%y;break"
3005 bind $w <Visibility> "focus $w"
3007 bind $w <Destroy> "
3008 array unset browser_buffer $w_list
3009 array unset browser_files $w_list
3010 array unset browser_status $w_list
3011 array unset browser_stack $w_list
3012 array unset browser_path $w_list
3013 array unset browser_commit $w_list
3014 array unset browser_busy $w_list
3015 "
3016 wm title $w "[appname] ([reponame]): File Browser"
3017 ls_tree $w_list $browser_commit($w_list) {}
3018}
3019proc browser_click {was_double_click w pos} {
3021 global browser_files browser_status browser_path
3022 global browser_commit browser_stack browser_busy
3023 if {$browser_busy($w)} return
3025 set lno [lindex [split [$w index $pos] .] 0]
3026 set info [lindex $browser_files($w) [expr {$lno - 1}]]
3027 $w conf -state normal
3029 $w tag remove sel 0.0 end
3030 $w tag remove in_sel 0.0 end
3031 if {$info ne {}} {
3032 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
3033 if {$was_double_click} {
3034 switch -- [lindex $info 0] {
3035 parent {
3036 set parent [lindex $browser_stack($w) end-1]
3037 set browser_stack($w) [lrange $browser_stack($w) 0 end-2]
3038 if {$browser_stack($w) eq {}} {
3039 regsub {:.*$} $browser_path($w) {:} browser_path($w)
3040 } else {
3041 regsub {/[^/]+$} $browser_path($w) {} browser_path($w)
3042 }
3043 set browser_status($w) "Loading $browser_path($w)..."
3044 ls_tree $w [lindex $parent 0] [lindex $parent 1]
3045 }
3046 tree {
3047 set name [lindex $info 2]
3048 set escn [escape_path $name]
3049 set browser_status($w) "Loading $escn..."
3050 append browser_path($w) $escn
3051 ls_tree $w [lindex $info 1] $name
3052 }
3053 blob {
3054 set name [lindex $info 2]
3055 set p {}
3056 foreach n $browser_stack($w) {
3057 append p [lindex $n 1]
3058 }
3059 append p $name
3060 show_blame $browser_commit($w) $p
3061 }
3062 }
3063 }
3064 }
3065 $w conf -state disabled
3066}
3067proc ls_tree {w tree_id name} {
3069 global browser_buffer browser_files browser_stack browser_busy
3070 set browser_buffer($w) {}
3072 set browser_files($w) {}
3073 set browser_busy($w) 1
3074 $w conf -state normal
3076 $w tag remove in_sel 0.0 end
3077 $w tag remove sel 0.0 end
3078 $w delete 0.0 end
3079 if {$browser_stack($w) ne {}} {
3080 $w image create end \
3081 -align center -padx 5 -pady 1 \
3082 -name icon0 \
3083 -image file_uplevel
3084 $w insert end {[Up To Parent]}
3085 lappend browser_files($w) parent
3086 }
3087 lappend browser_stack($w) [list $tree_id $name]
3088 $w conf -state disabled
3089 set cmd [list git ls-tree -z $tree_id]
3091 set fd [open "| $cmd" r]
3092 fconfigure $fd -blocking 0 -translation binary -encoding binary
3093 fileevent $fd readable [list read_ls_tree $fd $w]
3094}
3095proc read_ls_tree {fd w} {
3097 global browser_buffer browser_files browser_status browser_busy
3098 if {![winfo exists $w]} {
3100 catch {close $fd}
3101 return
3102 }
3103 append browser_buffer($w) [read $fd]
3105 set pck [split $browser_buffer($w) "\0"]
3106 set browser_buffer($w) [lindex $pck end]
3107 set n [llength $browser_files($w)]
3109 $w conf -state normal
3110 foreach p [lrange $pck 0 end-1] {
3111 set info [split $p "\t"]
3112 set path [lindex $info 1]
3113 set info [split [lindex $info 0] { }]
3114 set type [lindex $info 1]
3115 set object [lindex $info 2]
3116 switch -- $type {
3118 blob {
3119 set image file_mod
3120 }
3121 tree {
3122 set image file_dir
3123 append path /
3124 }
3125 default {
3126 set image file_question
3127 }
3128 }
3129 if {$n > 0} {$w insert end "\n"}
3131 $w image create end \
3132 -align center -padx 5 -pady 1 \
3133 -name icon[incr n] \
3134 -image $image
3135 $w insert end [escape_path $path]
3136 lappend browser_files($w) [list $type $object $path]
3137 }
3138 $w conf -state disabled
3139 if {[eof $fd]} {
3141 close $fd
3142 set browser_status($w) Ready.
3143 set browser_busy($w) 0
3144 array unset browser_buffer $w
3145 }
3146}
3147proc show_blame {commit path} {
3149 global next_browser_id blame_status blame_data
3150 set w .browser[incr next_browser_id]
3152 set blame_status($w) {Loading current file content...}
3153 set texts [list]
3154 toplevel $w
3156 panedwindow $w.out -orient horizontal
3157 label $w.path -text "$commit:$path" \
3159 -anchor w \
3160 -justify left \
3161 -borderwidth 1 \
3162 -relief sunken \
3163 -font font_uibold
3164 pack $w.path -anchor w -side top -fill x
3165 text $w.out.commit -background white -borderwidth 0 \
3167 -state disabled \
3168 -wrap none \
3169 -height 40 \
3170 -width 8 \
3171 -font font_diff
3172 $w.out add $w.out.commit
3173 lappend texts $w.out.commit
3174 text $w.out.author -background white -borderwidth 0 \
3176 -state disabled \
3177 -wrap none \
3178 -height 40 \
3179 -width 20 \
3180 -font font_diff
3181 $w.out add $w.out.author
3182 lappend texts $w.out.author
3183 text $w.out.date -background white -borderwidth 0 \
3185 -state disabled \
3186 -wrap none \
3187 -height 40 \
3188 -width [string length "yyyy-mm-dd hh:mm:ss"] \
3189 -font font_diff
3190 $w.out add $w.out.date
3191 lappend texts $w.out.date
3192 text $w.out.filename -background white -borderwidth 0 \
3194 -state disabled \
3195 -wrap none \
3196 -height 40 \
3197 -width 20 \
3198 -font font_diff
3199 $w.out add $w.out.filename
3200 lappend texts $w.out.filename
3201 text $w.out.origlinenumber -background white -borderwidth 0 \
3203 -state disabled \
3204 -wrap none \
3205 -height 40 \
3206 -width 5 \
3207 -font font_diff
3208 $w.out.origlinenumber tag conf linenumber -justify right
3209 $w.out add $w.out.origlinenumber
3210 lappend texts $w.out.origlinenumber
3211 text $w.out.linenumber -background white -borderwidth 0 \
3213 -state disabled \
3214 -wrap none \
3215 -height 40 \
3216 -width 5 \
3217 -font font_diff
3218 $w.out.linenumber tag conf linenumber -justify right
3219 $w.out add $w.out.linenumber
3220 lappend texts $w.out.linenumber
3221 text $w.out.file -background white -borderwidth 0 \
3223 -state disabled \
3224 -wrap none \
3225 -height 40 \
3226 -width 80 \
3227 -font font_diff
3228 $w.out add $w.out.file
3229 lappend texts $w.out.file
3230 label $w.status -textvariable blame_status($w) \
3232 -anchor w \
3233 -justify left \
3234 -borderwidth 1 \
3235 -relief sunken \
3236 -font font_ui
3237 pack $w.status -anchor w -side bottom -fill x
3238 scrollbar $w.sby -orient v -command [list scrollbar2many $texts yview]
3240 pack $w.sby -side right -fill y
3241 pack $w.out -side left -fill both -expand 1
3242 menu $w.ctxm -tearoff 0
3244 $w.ctxm add command -label "Copy Commit" \
3245 -font font_ui \
3246 -command "blame_copycommit $w \$cursorW @\$cursorX,\$cursorY"
3247 foreach i $texts {
3249 $i tag conf in_sel \
3250 -background [$i cget -foreground] \
3251 -foreground [$i cget -background]
3252 $i conf -yscrollcommand [list many2scrollbar $texts yview $w.sby]
3253 bind $i <Button-1> "blame_highlight $i @%x,%y $texts;break"
3254 bind_button3 $i "
3255 set cursorX %x
3256 set cursorY %y
3257 set cursorW %W
3258 tk_popup $w.ctxm %X %Y
3259 "
3260 }
3261 bind $w <Visibility> "focus $w"
3263 bind $w <Destroy> "
3264 array unset blame_status $w
3265 array unset blame_data $w,*
3266 "
3267 wm title $w "[appname] ([reponame]): File Viewer"
3268 set blame_data($w,total_lines) 0
3270 set cmd [list git cat-file blob "$commit:$path"]
3271 set fd [open "| $cmd" r]
3272 fconfigure $fd -blocking 0 -translation lf -encoding binary
3273 fileevent $fd readable [list read_blame_catfile $fd $w $commit $path \
3274 $texts $w.out.linenumber $w.out.file]
3275}
3276proc read_blame_catfile {fd w commit path texts w_lno w_file} {
3278 global blame_status blame_data
3279 if {![winfo exists $w_file]} {
3281 catch {close $fd}
3282 return
3283 }
3284 set n $blame_data($w,total_lines)
3286 foreach i $texts {$i conf -state normal}
3287 while {[gets $fd line] >= 0} {
3288 regsub "\r\$" $line {} line
3289 incr n
3290 $w_lno insert end $n linenumber
3291 $w_file insert end $line
3292 foreach i $texts {$i insert end "\n"}
3293 }
3294 foreach i $texts {$i conf -state disabled}
3295 set blame_data($w,total_lines) $n
3296 if {[eof $fd]} {
3298 close $fd
3299 set blame_status($w) {Loading annotations...}
3300 set cmd [list git blame -M -C --incremental]
3301 lappend cmd $commit -- $path
3302 set fd [open "| $cmd" r]
3303 fconfigure $fd -blocking 0 -translation lf -encoding binary
3304 fileevent $fd readable "read_blame_incremental $fd $w $texts"
3305 }
3306}
3307proc read_blame_incremental {fd w
3309 w_commit w_author w_date w_filename w_olno
3310 w_lno w_file} {
3311 global blame_status blame_data
3312 if {![winfo exists $w_commit]} {
3314 catch {close $fd}
3315 return
3316 }
3317 $w_commit conf -state normal
3319 $w_author conf -state normal
3320 $w_date conf -state normal
3321 $w_filename conf -state normal
3322 $w_olno conf -state normal
3323 while {[gets $fd line] >= 0} {
3325 if {[regexp {^([a-z0-9]{40}) (\d+) (\d+) (\d+)$} $line line \
3326 commit original_line final_line line_count]} {
3327 set blame_data($w,commit) $commit
3328 set blame_data($w,original_line) $original_line
3329 set blame_data($w,final_line) $final_line
3330 set blame_data($w,line_count) $line_count
3331 } elseif {[string match {filename *} $line]} {
3332 set n $blame_data($w,line_count)
3333 set lno $blame_data($w,final_line)
3334 set ol $blame_data($w,original_line)
3335 set file [string range $line 9 end]
3336 set commit $blame_data($w,commit)
3337 set abbrev [string range $commit 0 8]
3338 if {[catch {set author $blame_data($w,$commit,author)} err]} {
3340 puts $err
3341 set author {}
3342 }
3343 if {[catch {set atime $blame_data($w,$commit,author-time)}]} {
3345 set atime {}
3346 } else {
3347 set atime [clock format $atime -format {%Y-%m-%d %T}]
3348 }
3349 while {$n > 0} {
3351 $w_commit delete $lno.0 "$lno.0 lineend"
3352 $w_author delete $lno.0 "$lno.0 lineend"
3353 $w_date delete $lno.0 "$lno.0 lineend"
3354 $w_filename delete $lno.0 "$lno.0 lineend"
3355 $w_olno delete $lno.0 "$lno.0 lineend"
3356 $w_commit insert $lno.0 $abbrev
3358 $w_author insert $lno.0 $author
3359 $w_date insert $lno.0 $atime
3360 $w_filename insert $lno.0 $file
3361 $w_olno insert $lno.0 $ol linenumber
3362 set blame_data($w,line$lno,commit) $commit
3364 incr n -1
3366 incr lno
3367 incr ol
3368 }
3369 } elseif {[regexp {^([a-z-]+) (.*)$} $line line header data]} {
3370 set blame_data($w,$blame_data($w,commit),$header) $data
3371 }
3372 }
3373 $w_commit conf -state disabled
3375 $w_author conf -state disabled
3376 $w_date conf -state disabled
3377 $w_filename conf -state disabled
3378 $w_olno conf -state disabled
3379 if {[eof $fd]} {
3381 close $fd
3382 set blame_status($w) {Annotation complete.}
3383 }
3384}
3385proc blame_highlight {w pos args} {
3387 set lno [lindex [split [$w index $pos] .] 0]
3388 foreach i $args {
3389 $i tag remove in_sel 0.0 end
3390 }
3391 if {$lno eq {}} return
3392 foreach i $args {
3393 $i tag add in_sel $lno.0 "$lno.0 + 1 line"
3394 }
3395}
3396proc blame_copycommit {w i pos} {
3398 global blame_data
3399 set lno [lindex [split [$i index $pos] .] 0]
3400 if {![catch {set commit $blame_data($w,line$lno,commit)}]} {
3401 clipboard clear
3402 clipboard append \
3403 -format STRING \
3404 -type STRING \
3405 -- $commit
3406 }
3407}
3408######################################################################
3410##
3411## icons
3412set filemask {
3414#define mask_width 14
3415#define mask_height 15
3416static unsigned char mask_bits[] = {
3417 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
3418 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
3419 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
3420}
3421image create bitmap file_plain -background white -foreground black -data {
3423#define plain_width 14
3424#define plain_height 15
3425static unsigned char plain_bits[] = {
3426 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
3427 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
3428 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
3429} -maskdata $filemask
3430image create bitmap file_mod -background white -foreground blue -data {
3432#define mod_width 14
3433#define mod_height 15
3434static unsigned char mod_bits[] = {
3435 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
3436 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
3437 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
3438} -maskdata $filemask
3439image create bitmap file_fulltick -background white -foreground "#007000" -data {
3441#define file_fulltick_width 14
3442#define file_fulltick_height 15
3443static unsigned char file_fulltick_bits[] = {
3444 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
3445 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
3446 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
3447} -maskdata $filemask
3448image create bitmap file_parttick -background white -foreground "#005050" -data {
3450#define parttick_width 14
3451#define parttick_height 15
3452static unsigned char parttick_bits[] = {
3453 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
3454 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
3455 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
3456} -maskdata $filemask
3457image create bitmap file_question -background white -foreground black -data {
3459#define file_question_width 14
3460#define file_question_height 15
3461static unsigned char file_question_bits[] = {
3462 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
3463 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
3464 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
3465} -maskdata $filemask
3466image create bitmap file_removed -background white -foreground red -data {
3468#define file_removed_width 14
3469#define file_removed_height 15
3470static unsigned char file_removed_bits[] = {
3471 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
3472 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
3473 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
3474} -maskdata $filemask
3475image create bitmap file_merge -background white -foreground blue -data {
3477#define file_merge_width 14
3478#define file_merge_height 15
3479static unsigned char file_merge_bits[] = {
3480 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
3481 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
3482 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
3483} -maskdata $filemask
3484set file_dir_data {
3486#define file_width 18
3487#define file_height 18
3488static unsigned char file_bits[] = {
3489 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x03, 0x00,
3490 0x0c, 0x03, 0x00, 0x04, 0xfe, 0x00, 0x06, 0x80, 0x00, 0xff, 0x9f, 0x00,
3491 0x03, 0x98, 0x00, 0x02, 0x90, 0x00, 0x06, 0xb0, 0x00, 0x04, 0xa0, 0x00,
3492 0x0c, 0xe0, 0x00, 0x08, 0xc0, 0x00, 0xf8, 0xff, 0x00, 0x00, 0x00, 0x00,
3493 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
3494}
3495image create bitmap file_dir -background white -foreground blue \
3496 -data $file_dir_data -maskdata $file_dir_data
3497unset file_dir_data
3498set file_uplevel_data {
3500#define up_width 15
3501#define up_height 15
3502static unsigned char up_bits[] = {
3503 0x80, 0x00, 0xc0, 0x01, 0xe0, 0x03, 0xf0, 0x07, 0xf8, 0x0f, 0xfc, 0x1f,
3504 0xfe, 0x3f, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01,
3505 0xc0, 0x01, 0xc0, 0x01, 0x00, 0x00};
3506}
3507image create bitmap file_uplevel -background white -foreground red \
3508 -data $file_uplevel_data -maskdata $file_uplevel_data
3509unset file_uplevel_data
3510set ui_index .vpane.files.index.list
3512set ui_workdir .vpane.files.workdir.list
3513set all_icons(_$ui_index) file_plain
3515set all_icons(A$ui_index) file_fulltick
3516set all_icons(M$ui_index) file_fulltick
3517set all_icons(D$ui_index) file_removed
3518set all_icons(U$ui_index) file_merge
3519set all_icons(_$ui_workdir) file_plain
3521set all_icons(M$ui_workdir) file_mod
3522set all_icons(D$ui_workdir) file_question
3523set all_icons(U$ui_workdir) file_merge
3524set all_icons(O$ui_workdir) file_plain
3525set max_status_desc 0
3527foreach i {
3528 {__ "Unmodified"}
3529 {_M "Modified, not staged"}
3531 {M_ "Staged for commit"}
3532 {MM "Portions staged for commit"}
3533 {MD "Staged for commit, missing"}
3534 {_O "Untracked, not staged"}
3536 {A_ "Staged for commit"}
3537 {AM "Portions staged for commit"}
3538 {AD "Staged for commit, missing"}
3539 {_D "Missing"}
3541 {D_ "Staged for removal"}
3542 {DO "Staged for removal, still present"}
3543 {U_ "Requires merge resolution"}
3545 {UU "Requires merge resolution"}
3546 {UM "Requires merge resolution"}
3547 {UD "Requires merge resolution"}
3548 } {
3549 if {$max_status_desc < [string length [lindex $i 1]]} {
3550 set max_status_desc [string length [lindex $i 1]]
3551 }
3552 set all_descs([lindex $i 0]) [lindex $i 1]
3553}
3554unset i
3555######################################################################
3557##
3558## util
3559proc bind_button3 {w cmd} {
3561 bind $w <Any-Button-3> $cmd
3562 if {[is_MacOSX]} {
3563 bind $w <Control-Button-1> $cmd
3564 }
3565}
3566proc scrollbar2many {list mode args} {
3568 foreach w $list {eval $w $mode $args}
3569}
3570proc many2scrollbar {list mode sb top bottom} {
3572 $sb set $top $bottom
3573 foreach w $list {$w $mode moveto $top}
3574}
3575proc incr_font_size {font {amt 1}} {
3577 set sz [font configure $font -size]
3578 incr sz $amt
3579 font configure $font -size $sz
3580 font configure ${font}bold -size $sz
3581}
3582proc hook_failed_popup {hook msg} {
3584 set w .hookfail
3585 toplevel $w
3586 frame $w.m
3588 label $w.m.l1 -text "$hook hook failed:" \
3589 -anchor w \
3590 -justify left \
3591 -font font_uibold
3592 text $w.m.t \
3593 -background white -borderwidth 1 \
3594 -relief sunken \
3595 -width 80 -height 10 \
3596 -font font_diff \
3597 -yscrollcommand [list $w.m.sby set]
3598 label $w.m.l2 \
3599 -text {You must correct the above errors before committing.} \
3600 -anchor w \
3601 -justify left \
3602 -font font_uibold
3603 scrollbar $w.m.sby -command [list $w.m.t yview]
3604 pack $w.m.l1 -side top -fill x
3605 pack $w.m.l2 -side bottom -fill x
3606 pack $w.m.sby -side right -fill y
3607 pack $w.m.t -side left -fill both -expand 1
3608 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
3609 $w.m.t insert 1.0 $msg
3611 $w.m.t conf -state disabled
3612 button $w.ok -text OK \
3614 -width 15 \
3615 -font font_ui \
3616 -command "destroy $w"
3617 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
3618 bind $w <Visibility> "grab $w; focus $w"
3620 bind $w <Key-Return> "destroy $w"
3621 wm title $w "[appname] ([reponame]): error"
3622 tkwait window $w
3623}
3624set next_console_id 0
3626proc new_console {short_title long_title} {
3628 global next_console_id console_data
3629 set w .console[incr next_console_id]
3630 set console_data($w) [list $short_title $long_title]
3631 return [console_init $w]
3632}
3633proc console_init {w} {
3635 global console_cr console_data M1B
3636 set console_cr($w) 1.0
3638 toplevel $w
3639 frame $w.m
3640 label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
3641 -anchor w \
3642 -justify left \
3643 -font font_uibold
3644 text $w.m.t \
3645 -background white -borderwidth 1 \
3646 -relief sunken \
3647 -width 80 -height 10 \
3648 -font font_diff \
3649 -state disabled \
3650 -yscrollcommand [list $w.m.sby set]
3651 label $w.m.s -text {Working... please wait...} \
3652 -anchor w \
3653 -justify left \
3654 -font font_uibold
3655 scrollbar $w.m.sby -command [list $w.m.t yview]
3656 pack $w.m.l1 -side top -fill x
3657 pack $w.m.s -side bottom -fill x
3658 pack $w.m.sby -side right -fill y
3659 pack $w.m.t -side left -fill both -expand 1
3660 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
3661 menu $w.ctxm -tearoff 0
3663 $w.ctxm add command -label "Copy" \
3664 -font font_ui \
3665 -command "tk_textCopy $w.m.t"
3666 $w.ctxm add command -label "Select All" \
3667 -font font_ui \
3668 -command "focus $w.m.t;$w.m.t tag add sel 0.0 end"
3669 $w.ctxm add command -label "Copy All" \
3670 -font font_ui \
3671 -command "
3672 $w.m.t tag add sel 0.0 end
3673 tk_textCopy $w.m.t
3674 $w.m.t tag remove sel 0.0 end
3675 "
3676 button $w.ok -text {Close} \
3678 -font font_ui \
3679 -state disabled \
3680 -command "destroy $w"
3681 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
3682 bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
3684 bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
3685 bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
3686 bind $w <Visibility> "focus $w"
3687 wm title $w "[appname] ([reponame]): [lindex $console_data($w) 0]"
3688 return $w
3689}
3690proc console_exec {w cmd after} {
3692 # -- Cygwin's Tcl tosses the enviroment when we exec our child.
3693 # But most users need that so we have to relogin. :-(
3694 #
3695 if {[is_Cygwin]} {
3696 set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
3697 }
3698 # -- Tcl won't let us redirect both stdout and stderr to
3700 # the same pipe. So pass it through cat...
3701 #
3702 set cmd [concat | $cmd |& cat]
3703 set fd_f [open $cmd r]
3705 fconfigure $fd_f -blocking 0 -translation binary
3706 fileevent $fd_f readable [list console_read $w $fd_f $after]
3707}
3708proc console_read {w fd after} {
3710 global console_cr
3711 set buf [read $fd]
3713 if {$buf ne {}} {
3714 if {![winfo exists $w]} {console_init $w}
3715 $w.m.t conf -state normal
3716 set c 0
3717 set n [string length $buf]
3718 while {$c < $n} {
3719 set cr [string first "\r" $buf $c]
3720 set lf [string first "\n" $buf $c]
3721 if {$cr < 0} {set cr [expr {$n + 1}]}
3722 if {$lf < 0} {set lf [expr {$n + 1}]}
3723 if {$lf < $cr} {
3725 $w.m.t insert end [string range $buf $c $lf]
3726 set console_cr($w) [$w.m.t index {end -1c}]
3727 set c $lf
3728 incr c
3729 } else {
3730 $w.m.t delete $console_cr($w) end
3731 $w.m.t insert end "\n"
3732 $w.m.t insert end [string range $buf $c $cr]
3733 set c $cr
3734 incr c
3735 }
3736 }
3737 $w.m.t conf -state disabled
3738 $w.m.t see end
3739 }
3740 fconfigure $fd -blocking 1
3742 if {[eof $fd]} {
3743 if {[catch {close $fd}]} {
3744 set ok 0
3745 } else {
3746 set ok 1
3747 }
3748 uplevel #0 $after $w $ok
3749 return
3750 }
3751 fconfigure $fd -blocking 0
3752}
3753proc console_chain {cmdlist w {ok 1}} {
3755 if {$ok} {
3756 if {[llength $cmdlist] == 0} {
3757 console_done $w $ok
3758 return
3759 }
3760 set cmd [lindex $cmdlist 0]
3762 set cmdlist [lrange $cmdlist 1 end]
3763 if {[lindex $cmd 0] eq {console_exec}} {
3765 console_exec $w \
3766 [lindex $cmd 1] \
3767 [list console_chain $cmdlist]
3768 } else {
3769 uplevel #0 $cmd $cmdlist $w $ok
3770 }
3771 } else {
3772 console_done $w $ok
3773 }
3774}
3775proc console_done {args} {
3777 global console_cr console_data
3778 switch -- [llength $args] {
3780 2 {
3781 set w [lindex $args 0]
3782 set ok [lindex $args 1]
3783 }
3784 3 {
3785 set w [lindex $args 1]
3786 set ok [lindex $args 2]
3787 }
3788 default {
3789 error "wrong number of args: console_done ?ignored? w ok"
3790 }
3791 }
3792 if {$ok} {
3794 if {[winfo exists $w]} {
3795 $w.m.s conf -background green -text {Success}
3796 $w.ok conf -state normal
3797 }
3798 } else {
3799 if {![winfo exists $w]} {
3800 console_init $w
3801 }
3802 $w.m.s conf -background red -text {Error: Command Failed}
3803 $w.ok conf -state normal
3804 }
3805 array unset console_cr $w
3807 array unset console_data $w
3808}
3809######################################################################
3811##
3812## ui commands
3813set starting_gitk_msg {Starting gitk... please wait...}
3815proc do_gitk {revs} {
3817 global env ui_status_value starting_gitk_msg
3818 # -- On Windows gitk is severly broken, and right now it seems like
3820 # nobody cares about fixing it. The only known workaround is to
3821 # always delete ~/.gitk before starting the program.
3822 #
3823 if {[is_Windows]} {
3824 catch {file delete [file join $env(HOME) .gitk]}
3825 }
3826 # -- Always start gitk through whatever we were loaded with. This
3828 # lets us bypass using shell process on Windows systems.
3829 #
3830 set cmd [info nameofexecutable]
3831 lappend cmd [gitexec gitk]
3832 if {$revs ne {}} {
3833 append cmd { }
3834 append cmd $revs
3835 }
3836 if {[catch {eval exec $cmd &} err]} {
3838 error_popup "Failed to start gitk:\n\n$err"
3839 } else {
3840 set ui_status_value $starting_gitk_msg
3841 after 10000 {
3842 if {$ui_status_value eq $starting_gitk_msg} {
3843 set ui_status_value {Ready.}
3844 }
3845 }
3846 }
3847}
3848proc do_stats {} {
3850 set fd [open "| git count-objects -v" r]
3851 while {[gets $fd line] > 0} {
3852 if {[regexp {^([^:]+): (\d+)$} $line _ name value]} {
3853 set stats($name) $value
3854 }
3855 }
3856 close $fd
3857 set packed_sz 0
3859 foreach p [glob -directory [gitdir objects pack] \
3860 -type f \
3861 -nocomplain -- *] {
3862 incr packed_sz [file size $p]
3863 }
3864 if {$packed_sz > 0} {
3865 set stats(size-pack) [expr {$packed_sz / 1024}]
3866 }
3867 set w .stats_view
3869 toplevel $w
3870 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
3871 label $w.header -text {Database Statistics} \
3873 -font font_uibold
3874 pack $w.header -side top -fill x
3875 frame $w.buttons -border 1
3877 button $w.buttons.close -text Close \
3878 -font font_ui \
3879 -command [list destroy $w]
3880 button $w.buttons.gc -text {Compress Database} \
3881 -font font_ui \
3882 -command "destroy $w;do_gc"
3883 pack $w.buttons.close -side right
3884 pack $w.buttons.gc -side left
3885 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
3886 frame $w.stat -borderwidth 1 -relief solid
3888 foreach s {
3889 {count {Number of loose objects}}
3890 {size {Disk space used by loose objects} { KiB}}
3891 {in-pack {Number of packed objects}}
3892 {packs {Number of packs}}
3893 {size-pack {Disk space used by packed objects} { KiB}}
3894 {prune-packable {Packed objects waiting for pruning}}
3895 {garbage {Garbage files}}
3896 } {
3897 set name [lindex $s 0]
3898 set label [lindex $s 1]
3899 if {[catch {set value $stats($name)}]} continue
3900 if {[llength $s] > 2} {
3901 set value "$value[lindex $s 2]"
3902 }
3903 label $w.stat.l_$name -text "$label:" -anchor w -font font_ui
3905 label $w.stat.v_$name -text $value -anchor w -font font_ui
3906 grid $w.stat.l_$name $w.stat.v_$name -sticky we -padx {0 5}
3907 }
3908 pack $w.stat -pady 10 -padx 10
3909 bind $w <Visibility> "grab $w; focus $w"
3911 bind $w <Key-Escape> [list destroy $w]
3912 bind $w <Key-Return> [list destroy $w]
3913 wm title $w "[appname] ([reponame]): Database Statistics"
3914 tkwait window $w
3915}
3916proc do_gc {} {
3918 set w [new_console {gc} {Compressing the object database}]
3919 console_chain {
3920 {console_exec {git pack-refs --prune}}
3921 {console_exec {git reflog expire --all}}
3922 {console_exec {git repack -a -d -l}}
3923 {console_exec {git rerere gc}}
3924 } $w
3925}
3926proc do_fsck_objects {} {
3928 set w [new_console {fsck-objects} \
3929 {Verifying the object database with fsck-objects}]
3930 set cmd [list git fsck-objects]
3931 lappend cmd --full
3932 lappend cmd --cache
3933 lappend cmd --strict
3934 console_exec $w $cmd console_done
3935}
3936set is_quitting 0
3938proc do_quit {} {
3940 global ui_comm is_quitting repo_config commit_type
3941 if {$is_quitting} return
3943 set is_quitting 1
3944 # -- Stash our current commit buffer.
3946 #
3947 set save [gitdir GITGUI_MSG]
3948 set msg [string trim [$ui_comm get 0.0 end]]
3949 regsub -all -line {[ \r\t]+$} $msg {} msg
3950 if {(![string match amend* $commit_type]
3951 || [$ui_comm edit modified])
3952 && $msg ne {}} {
3953 catch {
3954 set fd [open $save w]
3955 puts -nonewline $fd $msg
3956 close $fd
3957 }
3958 } else {
3959 catch {file delete $save}
3960 }
3961 # -- Stash our current window geometry into this repository.
3963 #
3964 set cfg_geometry [list]
3965 lappend cfg_geometry [wm geometry .]
3966 lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
3967 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
3968 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
3969 set rc_geometry {}
3970 }
3971 if {$cfg_geometry ne $rc_geometry} {
3972 catch {exec git repo-config gui.geometry $cfg_geometry}
3973 }
3974 destroy .
3976}
3977proc do_rescan {} {
3979 rescan {set ui_status_value {Ready.}}
3980}
3981proc unstage_helper {txt paths} {
3983 global file_states current_diff_path
3984 if {![lock_index begin-update]} return
3986 set pathList [list]
3988 set after {}
3989 foreach path $paths {
3990 switch -glob -- [lindex $file_states($path) 0] {
3991 A? -
3992 M? -
3993 D? {
3994 lappend pathList $path
3995 if {$path eq $current_diff_path} {
3996 set after {reshow_diff;}
3997 }
3998 }
3999 }
4000 }
4001 if {$pathList eq {}} {
4002 unlock_index
4003 } else {
4004 update_indexinfo \
4005 $txt \
4006 $pathList \
4007 [concat $after {set ui_status_value {Ready.}}]
4008 }
4009}
4010proc do_unstage_selection {} {
4012 global current_diff_path selected_paths
4013 if {[array size selected_paths] > 0} {
4015 unstage_helper \
4016 {Unstaging selected files from commit} \
4017 [array names selected_paths]
4018 } elseif {$current_diff_path ne {}} {
4019 unstage_helper \
4020 "Unstaging [short_path $current_diff_path] from commit" \
4021 [list $current_diff_path]
4022 }
4023}
4024proc add_helper {txt paths} {
4026 global file_states current_diff_path
4027 if {![lock_index begin-update]} return
4029 set pathList [list]
4031 set after {}
4032 foreach path $paths {
4033 switch -glob -- [lindex $file_states($path) 0] {
4034 _O -
4035 ?M -
4036 ?D -
4037 U? {
4038 lappend pathList $path
4039 if {$path eq $current_diff_path} {
4040 set after {reshow_diff;}
4041 }
4042 }
4043 }
4044 }
4045 if {$pathList eq {}} {
4046 unlock_index
4047 } else {
4048 update_index \
4049 $txt \
4050 $pathList \
4051 [concat $after {set ui_status_value {Ready to commit.}}]
4052 }
4053}
4054proc do_add_selection {} {
4056 global current_diff_path selected_paths
4057 if {[array size selected_paths] > 0} {
4059 add_helper \
4060 {Adding selected files} \
4061 [array names selected_paths]
4062 } elseif {$current_diff_path ne {}} {
4063 add_helper \
4064 "Adding [short_path $current_diff_path]" \
4065 [list $current_diff_path]
4066 }
4067}
4068proc do_add_all {} {
4070 global file_states
4071 set paths [list]
4073 foreach path [array names file_states] {
4074 switch -glob -- [lindex $file_states($path) 0] {
4075 U? {continue}
4076 ?M -
4077 ?D {lappend paths $path}
4078 }
4079 }
4080 add_helper {Adding all changed files} $paths
4081}
4082proc revert_helper {txt paths} {
4084 global file_states current_diff_path
4085 if {![lock_index begin-update]} return
4087 set pathList [list]
4089 set after {}
4090 foreach path $paths {
4091 switch -glob -- [lindex $file_states($path) 0] {
4092 U? {continue}
4093 ?M -
4094 ?D {
4095 lappend pathList $path
4096 if {$path eq $current_diff_path} {
4097 set after {reshow_diff;}
4098 }
4099 }
4100 }
4101 }
4102 set n [llength $pathList]
4104 if {$n == 0} {
4105 unlock_index
4106 return
4107 } elseif {$n == 1} {
4108 set s "[short_path [lindex $pathList]]"
4109 } else {
4110 set s "these $n files"
4111 }
4112 set reply [tk_dialog \
4114 .confirm_revert \
4115 "[appname] ([reponame])" \
4116 "Revert changes in $s?
4117Any unadded changes will be permanently lost by the revert." \
4119 question \
4120 1 \
4121 {Do Nothing} \
4122 {Revert Changes} \
4123 ]
4124 if {$reply == 1} {
4125 checkout_index \
4126 $txt \
4127 $pathList \
4128 [concat $after {set ui_status_value {Ready.}}]
4129 } else {
4130 unlock_index
4131 }
4132}
4133proc do_revert_selection {} {
4135 global current_diff_path selected_paths
4136 if {[array size selected_paths] > 0} {
4138 revert_helper \
4139 {Reverting selected files} \
4140 [array names selected_paths]
4141 } elseif {$current_diff_path ne {}} {
4142 revert_helper \
4143 "Reverting [short_path $current_diff_path]" \
4144 [list $current_diff_path]
4145 }
4146}
4147proc do_signoff {} {
4149 global ui_comm
4150 set me [committer_ident]
4152 if {$me eq {}} return
4153 set sob "Signed-off-by: $me"
4155 set last [$ui_comm get {end -1c linestart} {end -1c}]
4156 if {$last ne $sob} {
4157 $ui_comm edit separator
4158 if {$last ne {}
4159 && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
4160 $ui_comm insert end "\n"
4161 }
4162 $ui_comm insert end "\n$sob"
4163 $ui_comm edit separator
4164 $ui_comm see end
4165 }
4166}
4167proc do_select_commit_type {} {
4169 global commit_type selected_commit_type
4170 if {$selected_commit_type eq {new}
4172 && [string match amend* $commit_type]} {
4173 create_new_commit
4174 } elseif {$selected_commit_type eq {amend}
4175 && ![string match amend* $commit_type]} {
4176 load_last_commit
4177 # The amend request was rejected...
4179 #
4180 if {![string match amend* $commit_type]} {
4181 set selected_commit_type new
4182 }
4183 }
4184}
4185proc do_commit {} {
4187 commit_tree
4188}
4189proc do_about {} {
4191 global appvers copyright
4192 global tcl_patchLevel tk_patchLevel
4193 set w .about_dialog
4195 toplevel $w
4196 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
4197 label $w.header -text "About [appname]" \
4199 -font font_uibold
4200 pack $w.header -side top -fill x
4201 frame $w.buttons
4203 button $w.buttons.close -text {Close} \
4204 -font font_ui \
4205 -command [list destroy $w]
4206 pack $w.buttons.close -side right
4207 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
4208 label $w.desc \
4210 -text "[appname] - a commit creation tool for Git.
4211$copyright" \
4212 -padx 5 -pady 5 \
4213 -justify left \
4214 -anchor w \
4215 -borderwidth 1 \
4216 -relief solid \
4217 -font font_ui
4218 pack $w.desc -side top -fill x -padx 5 -pady 5
4219 set v {}
4221 append v "[appname] version $appvers\n"
4222 append v "[exec git version]\n"
4223 append v "\n"
4224 if {$tcl_patchLevel eq $tk_patchLevel} {
4225 append v "Tcl/Tk version $tcl_patchLevel"
4226 } else {
4227 append v "Tcl version $tcl_patchLevel"
4228 append v ", Tk version $tk_patchLevel"
4229 }
4230 label $w.vers \
4232 -text $v \
4233 -padx 5 -pady 5 \
4234 -justify left \
4235 -anchor w \
4236 -borderwidth 1 \
4237 -relief solid \
4238 -font font_ui
4239 pack $w.vers -side top -fill x -padx 5 -pady 5
4240 menu $w.ctxm -tearoff 0
4242 $w.ctxm add command \
4243 -label {Copy} \
4244 -font font_ui \
4245 -command "
4246 clipboard clear
4247 clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
4248 "
4249 bind $w <Visibility> "grab $w; focus $w"
4251 bind $w <Key-Escape> "destroy $w"
4252 bind_button3 $w.vers "tk_popup $w.ctxm %X %Y; grab $w; focus $w"
4253 wm title $w "About [appname]"
4254 tkwait window $w
4255}
4256proc do_options {} {
4258 global repo_config global_config font_descs
4259 global repo_config_new global_config_new
4260 array unset repo_config_new
4262 array unset global_config_new
4263 foreach name [array names repo_config] {
4264 set repo_config_new($name) $repo_config($name)
4265 }
4266 load_config 1
4267 foreach name [array names repo_config] {
4268 switch -- $name {
4269 gui.diffcontext {continue}
4270 }
4271 set repo_config_new($name) $repo_config($name)
4272 }
4273 foreach name [array names global_config] {
4274 set global_config_new($name) $global_config($name)
4275 }
4276 set w .options_editor
4278 toplevel $w
4279 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
4280 label $w.header -text "[appname] Options" \
4282 -font font_uibold
4283 pack $w.header -side top -fill x
4284 frame $w.buttons
4286 button $w.buttons.restore -text {Restore Defaults} \
4287 -font font_ui \
4288 -command do_restore_defaults
4289 pack $w.buttons.restore -side left
4290 button $w.buttons.save -text Save \
4291 -font font_ui \
4292 -command [list do_save_config $w]
4293 pack $w.buttons.save -side right
4294 button $w.buttons.cancel -text {Cancel} \
4295 -font font_ui \
4296 -command [list destroy $w]
4297 pack $w.buttons.cancel -side right -padx 5
4298 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
4299 labelframe $w.repo -text "[reponame] Repository" \
4301 -font font_ui
4302 labelframe $w.global -text {Global (All Repositories)} \
4303 -font font_ui
4304 pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
4305 pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
4306 set optid 0
4308 foreach option {
4309 {t user.name {User Name}}
4310 {t user.email {Email Address}}
4311 {b merge.summary {Summarize Merge Commits}}
4313 {i-1..5 merge.verbosity {Merge Verbosity}}
4314 {b gui.trustmtime {Trust File Modification Timestamps}}
4316 {i-1..99 gui.diffcontext {Number of Diff Context Lines}}
4317 {t gui.newbranchtemplate {New Branch Name Template}}
4318 } {
4319 set type [lindex $option 0]
4320 set name [lindex $option 1]
4321 set text [lindex $option 2]
4322 incr optid
4323 foreach f {repo global} {
4324 switch -glob -- $type {
4325 b {
4326 checkbutton $w.$f.$optid -text $text \
4327 -variable ${f}_config_new($name) \
4328 -onvalue true \
4329 -offvalue false \
4330 -font font_ui
4331 pack $w.$f.$optid -side top -anchor w
4332 }
4333 i-* {
4334 regexp -- {-(\d+)\.\.(\d+)$} $type _junk min max
4335 frame $w.$f.$optid
4336 label $w.$f.$optid.l -text "$text:" -font font_ui
4337 pack $w.$f.$optid.l -side left -anchor w -fill x
4338 spinbox $w.$f.$optid.v \
4339 -textvariable ${f}_config_new($name) \
4340 -from $min \
4341 -to $max \
4342 -increment 1 \
4343 -width [expr {1 + [string length $max]}] \
4344 -font font_ui
4345 bind $w.$f.$optid.v <FocusIn> {%W selection range 0 end}
4346 pack $w.$f.$optid.v -side right -anchor e -padx 5
4347 pack $w.$f.$optid -side top -anchor w -fill x
4348 }
4349 t {
4350 frame $w.$f.$optid
4351 label $w.$f.$optid.l -text "$text:" -font font_ui
4352 entry $w.$f.$optid.v \
4353 -borderwidth 1 \
4354 -relief sunken \
4355 -width 20 \
4356 -textvariable ${f}_config_new($name) \
4357 -font font_ui
4358 pack $w.$f.$optid.l -side left -anchor w
4359 pack $w.$f.$optid.v -side left -anchor w \
4360 -fill x -expand 1 \
4361 -padx 5
4362 pack $w.$f.$optid -side top -anchor w -fill x
4363 }
4364 }
4365 }
4366 }
4367 set all_fonts [lsort [font families]]
4369 foreach option $font_descs {
4370 set name [lindex $option 0]
4371 set font [lindex $option 1]
4372 set text [lindex $option 2]
4373 set global_config_new(gui.$font^^family) \
4375 [font configure $font -family]
4376 set global_config_new(gui.$font^^size) \
4377 [font configure $font -size]
4378 frame $w.global.$name
4380 label $w.global.$name.l -text "$text:" -font font_ui
4381 pack $w.global.$name.l -side left -anchor w -fill x
4382 eval tk_optionMenu $w.global.$name.family \
4383 global_config_new(gui.$font^^family) \
4384 $all_fonts
4385 spinbox $w.global.$name.size \
4386 -textvariable global_config_new(gui.$font^^size) \
4387 -from 2 -to 80 -increment 1 \
4388 -width 3 \
4389 -font font_ui
4390 bind $w.global.$name.size <FocusIn> {%W selection range 0 end}
4391 pack $w.global.$name.size -side right -anchor e
4392 pack $w.global.$name.family -side right -anchor e
4393 pack $w.global.$name -side top -anchor w -fill x
4394 }
4395 bind $w <Visibility> "grab $w; focus $w"
4397 bind $w <Key-Escape> "destroy $w"
4398 wm title $w "[appname] ([reponame]): Options"
4399 tkwait window $w
4400}
4401proc do_restore_defaults {} {
4403 global font_descs default_config repo_config
4404 global repo_config_new global_config_new
4405 foreach name [array names default_config] {
4407 set repo_config_new($name) $default_config($name)
4408 set global_config_new($name) $default_config($name)
4409 }
4410 foreach option $font_descs {
4412 set name [lindex $option 0]
4413 set repo_config(gui.$name) $default_config(gui.$name)
4414 }
4415 apply_config
4416 foreach option $font_descs {
4418 set name [lindex $option 0]
4419 set font [lindex $option 1]
4420 set global_config_new(gui.$font^^family) \
4421 [font configure $font -family]
4422 set global_config_new(gui.$font^^size) \
4423 [font configure $font -size]
4424 }
4425}
4426proc do_save_config {w} {
4428 if {[catch {save_config} err]} {
4429 error_popup "Failed to completely save options:\n\n$err"
4430 }
4431 reshow_diff
4432 destroy $w
4433}
4434proc do_windows_shortcut {} {
4436 global argv0
4437 set fn [tk_getSaveFile \
4439 -parent . \
4440 -title "[appname] ([reponame]): Create Desktop Icon" \
4441 -initialfile "Git [reponame].bat"]
4442 if {$fn != {}} {
4443 if {[catch {
4444 set fd [open $fn w]
4445 puts $fd "@ECHO Entering [reponame]"
4446 puts $fd "@ECHO Starting git-gui... please wait..."
4447 puts $fd "@SET PATH=[file normalize [gitexec]];%PATH%"
4448 puts $fd "@SET GIT_DIR=[file normalize [gitdir]]"
4449 puts -nonewline $fd "@\"[info nameofexecutable]\""
4450 puts $fd " \"[file normalize $argv0]\""
4451 close $fd
4452 } err]} {
4453 error_popup "Cannot write script:\n\n$err"
4454 }
4455 }
4456}
4457proc do_cygwin_shortcut {} {
4459 global argv0
4460 if {[catch {
4462 set desktop [exec cygpath \
4463 --windows \
4464 --absolute \
4465 --long-name \
4466 --desktop]
4467 }]} {
4468 set desktop .
4469 }
4470 set fn [tk_getSaveFile \
4471 -parent . \
4472 -title "[appname] ([reponame]): Create Desktop Icon" \
4473 -initialdir $desktop \
4474 -initialfile "Git [reponame].bat"]
4475 if {$fn != {}} {
4476 if {[catch {
4477 set fd [open $fn w]
4478 set sh [exec cygpath \
4479 --windows \
4480 --absolute \
4481 /bin/sh]
4482 set me [exec cygpath \
4483 --unix \
4484 --absolute \
4485 $argv0]
4486 set gd [exec cygpath \
4487 --unix \
4488 --absolute \
4489 [gitdir]]
4490 set gw [exec cygpath \
4491 --windows \
4492 --absolute \
4493 [file dirname [gitdir]]]
4494 regsub -all ' $me "'\\''" me
4495 regsub -all ' $gd "'\\''" gd
4496 puts $fd "@ECHO Entering $gw"
4497 puts $fd "@ECHO Starting git-gui... please wait..."
4498 puts -nonewline $fd "@\"$sh\" --login -c \""
4499 puts -nonewline $fd "GIT_DIR='$gd'"
4500 puts -nonewline $fd " '$me'"
4501 puts $fd "&\""
4502 close $fd
4503 } err]} {
4504 error_popup "Cannot write script:\n\n$err"
4505 }
4506 }
4507}
4508proc do_macosx_app {} {
4510 global argv0 env
4511 set fn [tk_getSaveFile \
4513 -parent . \
4514 -title "[appname] ([reponame]): Create Desktop Icon" \
4515 -initialdir [file join $env(HOME) Desktop] \
4516 -initialfile "Git [reponame].app"]
4517 if {$fn != {}} {
4518 if {[catch {
4519 set Contents [file join $fn Contents]
4520 set MacOS [file join $Contents MacOS]
4521 set exe [file join $MacOS git-gui]
4522 file mkdir $MacOS
4524 set fd [open [file join $Contents Info.plist] w]
4526 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
4527<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
4528<plist version="1.0">
4529<dict>
4530 <key>CFBundleDevelopmentRegion</key>
4531 <string>English</string>
4532 <key>CFBundleExecutable</key>
4533 <string>git-gui</string>
4534 <key>CFBundleIdentifier</key>
4535 <string>org.spearce.git-gui</string>
4536 <key>CFBundleInfoDictionaryVersion</key>
4537 <string>6.0</string>
4538 <key>CFBundlePackageType</key>
4539 <string>APPL</string>
4540 <key>CFBundleSignature</key>
4541 <string>????</string>
4542 <key>CFBundleVersion</key>
4543 <string>1.0</string>
4544 <key>NSPrincipalClass</key>
4545 <string>NSApplication</string>
4546</dict>
4547</plist>}
4548 close $fd
4549 set fd [open $exe w]
4551 set gd [file normalize [gitdir]]
4552 set ep [file normalize [gitexec]]
4553 regsub -all ' $gd "'\\''" gd
4554 regsub -all ' $ep "'\\''" ep
4555 puts $fd "#!/bin/sh"
4556 foreach name [array names env] {
4557 if {[string match GIT_* $name]} {
4558 regsub -all ' $env($name) "'\\''" v
4559 puts $fd "export $name='$v'"
4560 }
4561 }
4562 puts $fd "export PATH='$ep':\$PATH"
4563 puts $fd "export GIT_DIR='$gd'"
4564 puts $fd "exec [file normalize $argv0]"
4565 close $fd
4566 file attributes $exe -permissions u+x,g+x,o+x
4568 } err]} {
4569 error_popup "Cannot write icon:\n\n$err"
4570 }
4571 }
4572}
4573proc toggle_or_diff {w x y} {
4575 global file_states file_lists current_diff_path ui_index ui_workdir
4576 global last_clicked selected_paths
4577 set pos [split [$w index @$x,$y] .]
4579 set lno [lindex $pos 0]
4580 set col [lindex $pos 1]
4581 set path [lindex $file_lists($w) [expr {$lno - 1}]]
4582 if {$path eq {}} {
4583 set last_clicked {}
4584 return
4585 }
4586 set last_clicked [list $w $lno]
4588 array unset selected_paths
4589 $ui_index tag remove in_sel 0.0 end
4590 $ui_workdir tag remove in_sel 0.0 end
4591 if {$col == 0} {
4593 if {$current_diff_path eq $path} {
4594 set after {reshow_diff;}
4595 } else {
4596 set after {}
4597 }
4598 if {$w eq $ui_index} {
4599 update_indexinfo \
4600 "Unstaging [short_path $path] from commit" \
4601 [list $path] \
4602 [concat $after {set ui_status_value {Ready.}}]
4603 } elseif {$w eq $ui_workdir} {
4604 update_index \
4605 "Adding [short_path $path]" \
4606 [list $path] \
4607 [concat $after {set ui_status_value {Ready.}}]
4608 }
4609 } else {
4610 show_diff $path $w $lno
4611 }
4612}
4613proc add_one_to_selection {w x y} {
4615 global file_lists last_clicked selected_paths
4616 set lno [lindex [split [$w index @$x,$y] .] 0]
4618 set path [lindex $file_lists($w) [expr {$lno - 1}]]
4619 if {$path eq {}} {
4620 set last_clicked {}
4621 return
4622 }
4623 if {$last_clicked ne {}
4625 && [lindex $last_clicked 0] ne $w} {
4626 array unset selected_paths
4627 [lindex $last_clicked 0] tag remove in_sel 0.0 end
4628 }
4629 set last_clicked [list $w $lno]
4631 if {[catch {set in_sel $selected_paths($path)}]} {
4632 set in_sel 0
4633 }
4634 if {$in_sel} {
4635 unset selected_paths($path)
4636 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
4637 } else {
4638 set selected_paths($path) 1
4639 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
4640 }
4641}
4642proc add_range_to_selection {w x y} {
4644 global file_lists last_clicked selected_paths
4645 if {[lindex $last_clicked 0] ne $w} {
4647 toggle_or_diff $w $x $y
4648 return
4649 }
4650 set lno [lindex [split [$w index @$x,$y] .] 0]
4652 set lc [lindex $last_clicked 1]
4653 if {$lc < $lno} {
4654 set begin $lc
4655 set end $lno
4656 } else {
4657 set begin $lno
4658 set end $lc
4659 }
4660 foreach path [lrange $file_lists($w) \
4662 [expr {$begin - 1}] \
4663 [expr {$end - 1}]] {
4664 set selected_paths($path) 1
4665 }
4666 $w tag add in_sel $begin.0 [expr {$end + 1}].0
4667}
4668######################################################################
4670##
4671## config defaults
4672set cursor_ptr arrow
4674font create font_diff -family Courier -size 10
4675font create font_ui
4676catch {
4677 label .dummy
4678 eval font configure font_ui [font actual [.dummy cget -font]]
4679 destroy .dummy
4680}
4681font create font_uibold
4683font create font_diffbold
4684if {[is_Windows]} {
4686 set M1B Control
4687 set M1T Ctrl
4688} elseif {[is_MacOSX]} {
4689 set M1B M1
4690 set M1T Cmd
4691} else {
4692 set M1B M1
4693 set M1T M1
4694}
4695proc apply_config {} {
4697 global repo_config font_descs
4698 foreach option $font_descs {
4700 set name [lindex $option 0]
4701 set font [lindex $option 1]
4702 if {[catch {
4703 foreach {cn cv} $repo_config(gui.$name) {
4704 font configure $font $cn $cv
4705 }
4706 } err]} {
4707 error_popup "Invalid font specified in gui.$name:\n\n$err"
4708 }
4709 foreach {cn cv} [font configure $font] {
4710 font configure ${font}bold $cn $cv
4711 }
4712 font configure ${font}bold -weight bold
4713 }
4714}
4715set default_config(merge.summary) false
4717set default_config(merge.verbosity) 2
4718set default_config(user.name) {}
4719set default_config(user.email) {}
4720set default_config(gui.trustmtime) false
4722set default_config(gui.diffcontext) 5
4723set default_config(gui.newbranchtemplate) {}
4724set default_config(gui.fontui) [font configure font_ui]
4725set default_config(gui.fontdiff) [font configure font_diff]
4726set font_descs {
4727 {fontui font_ui {Main Font}}
4728 {fontdiff font_diff {Diff/Console Font}}
4729}
4730load_config 0
4731apply_config
4732######################################################################
4734##
4735## ui construction
4736# -- Menu Bar
4738#
4739menu .mbar -tearoff 0
4740.mbar add cascade -label Repository -menu .mbar.repository
4741.mbar add cascade -label Edit -menu .mbar.edit
4742if {!$single_commit} {
4743 .mbar add cascade -label Branch -menu .mbar.branch
4744}
4745.mbar add cascade -label Commit -menu .mbar.commit
4746if {!$single_commit} {
4747 .mbar add cascade -label Merge -menu .mbar.merge
4748 .mbar add cascade -label Fetch -menu .mbar.fetch
4749 .mbar add cascade -label Push -menu .mbar.push
4750}
4751. configure -menu .mbar
4752# -- Repository Menu
4754#
4755menu .mbar.repository
4756.mbar.repository add command \
4758 -label {Browse Current Branch} \
4759 -command {new_browser $current_branch} \
4760 -font font_ui
4761.mbar.repository add separator
4762.mbar.repository add command \
4764 -label {Visualize Current Branch} \
4765 -command {do_gitk {}} \
4766 -font font_ui
4767.mbar.repository add command \
4768 -label {Visualize All Branches} \
4769 -command {do_gitk {--all}} \
4770 -font font_ui
4771.mbar.repository add separator
4772if {!$single_commit} {
4774 .mbar.repository add command -label {Database Statistics} \
4775 -command do_stats \
4776 -font font_ui
4777 .mbar.repository add command -label {Compress Database} \
4779 -command do_gc \
4780 -font font_ui
4781 .mbar.repository add command -label {Verify Database} \
4783 -command do_fsck_objects \
4784 -font font_ui
4785 .mbar.repository add separator
4787 if {[is_Cygwin]} {
4789 .mbar.repository add command \
4790 -label {Create Desktop Icon} \
4791 -command do_cygwin_shortcut \
4792 -font font_ui
4793 } elseif {[is_Windows]} {
4794 .mbar.repository add command \
4795 -label {Create Desktop Icon} \
4796 -command do_windows_shortcut \
4797 -font font_ui
4798 } elseif {[is_MacOSX]} {
4799 .mbar.repository add command \
4800 -label {Create Desktop Icon} \
4801 -command do_macosx_app \
4802 -font font_ui
4803 }
4804}
4805.mbar.repository add command -label Quit \
4807 -command do_quit \
4808 -accelerator $M1T-Q \
4809 -font font_ui
4810# -- Edit Menu
4812#
4813menu .mbar.edit
4814.mbar.edit add command -label Undo \
4815 -command {catch {[focus] edit undo}} \
4816 -accelerator $M1T-Z \
4817 -font font_ui
4818.mbar.edit add command -label Redo \
4819 -command {catch {[focus] edit redo}} \
4820 -accelerator $M1T-Y \
4821 -font font_ui
4822.mbar.edit add separator
4823.mbar.edit add command -label Cut \
4824 -command {catch {tk_textCut [focus]}} \
4825 -accelerator $M1T-X \
4826 -font font_ui
4827.mbar.edit add command -label Copy \
4828 -command {catch {tk_textCopy [focus]}} \
4829 -accelerator $M1T-C \
4830 -font font_ui
4831.mbar.edit add command -label Paste \
4832 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
4833 -accelerator $M1T-V \
4834 -font font_ui
4835.mbar.edit add command -label Delete \
4836 -command {catch {[focus] delete sel.first sel.last}} \
4837 -accelerator Del \
4838 -font font_ui
4839.mbar.edit add separator
4840.mbar.edit add command -label {Select All} \
4841 -command {catch {[focus] tag add sel 0.0 end}} \
4842 -accelerator $M1T-A \
4843 -font font_ui
4844# -- Branch Menu
4846#
4847if {!$single_commit} {
4848 menu .mbar.branch
4849 .mbar.branch add command -label {Create...} \
4851 -command do_create_branch \
4852 -accelerator $M1T-N \
4853 -font font_ui
4854 lappend disable_on_lock [list .mbar.branch entryconf \
4855 [.mbar.branch index last] -state]
4856 .mbar.branch add command -label {Delete...} \
4858 -command do_delete_branch \
4859 -font font_ui
4860 lappend disable_on_lock [list .mbar.branch entryconf \
4861 [.mbar.branch index last] -state]
4862}
4863# -- Commit Menu
4865#
4866menu .mbar.commit
4867.mbar.commit add radiobutton \
4869 -label {New Commit} \
4870 -command do_select_commit_type \
4871 -variable selected_commit_type \
4872 -value new \
4873 -font font_ui
4874lappend disable_on_lock \
4875 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4876.mbar.commit add radiobutton \
4878 -label {Amend Last Commit} \
4879 -command do_select_commit_type \
4880 -variable selected_commit_type \
4881 -value amend \
4882 -font font_ui
4883lappend disable_on_lock \
4884 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4885.mbar.commit add separator
4887.mbar.commit add command -label Rescan \
4889 -command do_rescan \
4890 -accelerator F5 \
4891 -font font_ui
4892lappend disable_on_lock \
4893 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4894.mbar.commit add command -label {Add To Commit} \
4896 -command do_add_selection \
4897 -font font_ui
4898lappend disable_on_lock \
4899 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4900.mbar.commit add command -label {Add All To Commit} \
4902 -command do_add_all \
4903 -accelerator $M1T-I \
4904 -font font_ui
4905lappend disable_on_lock \
4906 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4907.mbar.commit add command -label {Unstage From Commit} \
4909 -command do_unstage_selection \
4910 -font font_ui
4911lappend disable_on_lock \
4912 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4913.mbar.commit add command -label {Revert Changes} \
4915 -command do_revert_selection \
4916 -font font_ui
4917lappend disable_on_lock \
4918 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4919.mbar.commit add separator
4921.mbar.commit add command -label {Sign Off} \
4923 -command do_signoff \
4924 -accelerator $M1T-S \
4925 -font font_ui
4926.mbar.commit add command -label Commit \
4928 -command do_commit \
4929 -accelerator $M1T-Return \
4930 -font font_ui
4931lappend disable_on_lock \
4932 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4933if {[is_MacOSX]} {
4935 # -- Apple Menu (Mac OS X only)
4936 #
4937 .mbar add cascade -label Apple -menu .mbar.apple
4938 menu .mbar.apple
4939 .mbar.apple add command -label "About [appname]" \
4941 -command do_about \
4942 -font font_ui
4943 .mbar.apple add command -label "[appname] Options..." \
4944 -command do_options \
4945 -font font_ui
4946} else {
4947 # -- Edit Menu
4948 #
4949 .mbar.edit add separator
4950 .mbar.edit add command -label {Options...} \
4951 -command do_options \
4952 -font font_ui
4953 # -- Tools Menu
4955 #
4956 if {[file exists /usr/local/miga/lib/gui-miga]
4957 && [file exists .pvcsrc]} {
4958 proc do_miga {} {
4959 global ui_status_value
4960 if {![lock_index update]} return
4961 set cmd [list sh --login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
4962 set miga_fd [open "|$cmd" r]
4963 fconfigure $miga_fd -blocking 0
4964 fileevent $miga_fd readable [list miga_done $miga_fd]
4965 set ui_status_value {Running miga...}
4966 }
4967 proc miga_done {fd} {
4968 read $fd 512
4969 if {[eof $fd]} {
4970 close $fd
4971 unlock_index
4972 rescan [list set ui_status_value {Ready.}]
4973 }
4974 }
4975 .mbar add cascade -label Tools -menu .mbar.tools
4976 menu .mbar.tools
4977 .mbar.tools add command -label "Migrate" \
4978 -command do_miga \
4979 -font font_ui
4980 lappend disable_on_lock \
4981 [list .mbar.tools entryconf [.mbar.tools index last] -state]
4982 }
4983}
4984# -- Help Menu
4986#
4987.mbar add cascade -label Help -menu .mbar.help
4988menu .mbar.help
4989if {![is_MacOSX]} {
4991 .mbar.help add command -label "About [appname]" \
4992 -command do_about \
4993 -font font_ui
4994}
4995set browser {}
4997catch {set browser $repo_config(instaweb.browser)}
4998set doc_path [file dirname [gitexec]]
4999set doc_path [file join $doc_path Documentation index.html]
5000if {[is_Cygwin]} {
5002 set doc_path [exec cygpath --windows $doc_path]
5003}
5004if {$browser eq {}} {
5006 if {[is_MacOSX]} {
5007 set browser open
5008 } elseif {[is_Cygwin]} {
5009 set program_files [file dirname [exec cygpath --windir]]
5010 set program_files [file join $program_files {Program Files}]
5011 set firefox [file join $program_files {Mozilla Firefox} firefox.exe]
5012 set ie [file join $program_files {Internet Explorer} IEXPLORE.EXE]
5013 if {[file exists $firefox]} {
5014 set browser $firefox
5015 } elseif {[file exists $ie]} {
5016 set browser $ie
5017 }
5018 unset program_files firefox ie
5019 }
5020}
5021if {[file isfile $doc_path]} {
5023 set doc_url "file:$doc_path"
5024} else {
5025 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
5026}
5027if {$browser ne {}} {
5029 .mbar.help add command -label {Online Documentation} \
5030 -command [list exec $browser $doc_url &] \
5031 -font font_ui
5032}
5033unset browser doc_path doc_url
5034# -- Branch Control
5036#
5037frame .branch \
5038 -borderwidth 1 \
5039 -relief sunken
5040label .branch.l1 \
5041 -text {Current Branch:} \
5042 -anchor w \
5043 -justify left \
5044 -font font_ui
5045label .branch.cb \
5046 -textvariable current_branch \
5047 -anchor w \
5048 -justify left \
5049 -font font_ui
5050pack .branch.l1 -side left
5051pack .branch.cb -side left -fill x
5052pack .branch -side top -fill x
5053if {!$single_commit} {
5055 menu .mbar.merge
5056 .mbar.merge add command -label {Local Merge...} \
5057 -command do_local_merge \
5058 -font font_ui
5059 lappend disable_on_lock \
5060 [list .mbar.merge entryconf [.mbar.merge index last] -state]
5061 .mbar.merge add command -label {Abort Merge...} \
5062 -command do_reset_hard \
5063 -font font_ui
5064 lappend disable_on_lock \
5065 [list .mbar.merge entryconf [.mbar.merge index last] -state]
5066 menu .mbar.fetch
5069 menu .mbar.push
5071 .mbar.push add command -label {Push...} \
5072 -command do_push_anywhere \
5073 -font font_ui
5074}
5075# -- Main Window Layout
5077#
5078panedwindow .vpane -orient vertical
5079panedwindow .vpane.files -orient horizontal
5080.vpane add .vpane.files -sticky nsew -height 100 -width 200
5081pack .vpane -anchor n -side top -fill both -expand 1
5082# -- Index File List
5084#
5085frame .vpane.files.index -height 100 -width 200
5086label .vpane.files.index.title -text {Changes To Be Committed} \
5087 -background green \
5088 -font font_ui
5089text $ui_index -background white -borderwidth 0 \
5090 -width 20 -height 10 \
5091 -wrap none \
5092 -font font_ui \
5093 -cursor $cursor_ptr \
5094 -xscrollcommand {.vpane.files.index.sx set} \
5095 -yscrollcommand {.vpane.files.index.sy set} \
5096 -state disabled
5097scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
5098scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
5099pack .vpane.files.index.title -side top -fill x
5100pack .vpane.files.index.sx -side bottom -fill x
5101pack .vpane.files.index.sy -side right -fill y
5102pack $ui_index -side left -fill both -expand 1
5103.vpane.files add .vpane.files.index -sticky nsew
5104# -- Working Directory File List
5106#
5107frame .vpane.files.workdir -height 100 -width 200
5108label .vpane.files.workdir.title -text {Changed But Not Updated} \
5109 -background red \
5110 -font font_ui
5111text $ui_workdir -background white -borderwidth 0 \
5112 -width 20 -height 10 \
5113 -wrap none \
5114 -font font_ui \
5115 -cursor $cursor_ptr \
5116 -xscrollcommand {.vpane.files.workdir.sx set} \
5117 -yscrollcommand {.vpane.files.workdir.sy set} \
5118 -state disabled
5119scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
5120scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
5121pack .vpane.files.workdir.title -side top -fill x
5122pack .vpane.files.workdir.sx -side bottom -fill x
5123pack .vpane.files.workdir.sy -side right -fill y
5124pack $ui_workdir -side left -fill both -expand 1
5125.vpane.files add .vpane.files.workdir -sticky nsew
5126foreach i [list $ui_index $ui_workdir] {
5128 $i tag conf in_diff -font font_uibold
5129 $i tag conf in_sel \
5130 -background [$i cget -foreground] \
5131 -foreground [$i cget -background]
5132}
5133unset i
5134# -- Diff and Commit Area
5136#
5137frame .vpane.lower -height 300 -width 400
5138frame .vpane.lower.commarea
5139frame .vpane.lower.diff -relief sunken -borderwidth 1
5140pack .vpane.lower.commarea -side top -fill x
5141pack .vpane.lower.diff -side bottom -fill both -expand 1
5142.vpane add .vpane.lower -sticky nsew
5143# -- Commit Area Buttons
5145#
5146frame .vpane.lower.commarea.buttons
5147label .vpane.lower.commarea.buttons.l -text {} \
5148 -anchor w \
5149 -justify left \
5150 -font font_ui
5151pack .vpane.lower.commarea.buttons.l -side top -fill x
5152pack .vpane.lower.commarea.buttons -side left -fill y
5153button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
5155 -command do_rescan \
5156 -font font_ui
5157pack .vpane.lower.commarea.buttons.rescan -side top -fill x
5158lappend disable_on_lock \
5159 {.vpane.lower.commarea.buttons.rescan conf -state}
5160button .vpane.lower.commarea.buttons.incall -text {Add All} \
5162 -command do_add_all \
5163 -font font_ui
5164pack .vpane.lower.commarea.buttons.incall -side top -fill x
5165lappend disable_on_lock \
5166 {.vpane.lower.commarea.buttons.incall conf -state}
5167button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
5169 -command do_signoff \
5170 -font font_ui
5171pack .vpane.lower.commarea.buttons.signoff -side top -fill x
5172button .vpane.lower.commarea.buttons.commit -text {Commit} \
5174 -command do_commit \
5175 -font font_ui
5176pack .vpane.lower.commarea.buttons.commit -side top -fill x
5177lappend disable_on_lock \
5178 {.vpane.lower.commarea.buttons.commit conf -state}
5179# -- Commit Message Buffer
5181#
5182frame .vpane.lower.commarea.buffer
5183frame .vpane.lower.commarea.buffer.header
5184set ui_comm .vpane.lower.commarea.buffer.t
5185set ui_coml .vpane.lower.commarea.buffer.header.l
5186radiobutton .vpane.lower.commarea.buffer.header.new \
5187 -text {New Commit} \
5188 -command do_select_commit_type \
5189 -variable selected_commit_type \
5190 -value new \
5191 -font font_ui
5192lappend disable_on_lock \
5193 [list .vpane.lower.commarea.buffer.header.new conf -state]
5194radiobutton .vpane.lower.commarea.buffer.header.amend \
5195 -text {Amend Last Commit} \
5196 -command do_select_commit_type \
5197 -variable selected_commit_type \
5198 -value amend \
5199 -font font_ui
5200lappend disable_on_lock \
5201 [list .vpane.lower.commarea.buffer.header.amend conf -state]
5202label $ui_coml \
5203 -anchor w \
5204 -justify left \
5205 -font font_ui
5206proc trace_commit_type {varname args} {
5207 global ui_coml commit_type
5208 switch -glob -- $commit_type {
5209 initial {set txt {Initial Commit Message:}}
5210 amend {set txt {Amended Commit Message:}}
5211 amend-initial {set txt {Amended Initial Commit Message:}}
5212 amend-merge {set txt {Amended Merge Commit Message:}}
5213 merge {set txt {Merge Commit Message:}}
5214 * {set txt {Commit Message:}}
5215 }
5216 $ui_coml conf -text $txt
5217}
5218trace add variable commit_type write trace_commit_type
5219pack $ui_coml -side left -fill x
5220pack .vpane.lower.commarea.buffer.header.amend -side right
5221pack .vpane.lower.commarea.buffer.header.new -side right
5222text $ui_comm -background white -borderwidth 1 \
5224 -undo true \
5225 -maxundo 20 \
5226 -autoseparators true \
5227 -relief sunken \
5228 -width 75 -height 9 -wrap none \
5229 -font font_diff \
5230 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
5231scrollbar .vpane.lower.commarea.buffer.sby \
5232 -command [list $ui_comm yview]
5233pack .vpane.lower.commarea.buffer.header -side top -fill x
5234pack .vpane.lower.commarea.buffer.sby -side right -fill y
5235pack $ui_comm -side left -fill y
5236pack .vpane.lower.commarea.buffer -side left -fill y
5237# -- Commit Message Buffer Context Menu
5239#
5240set ctxm .vpane.lower.commarea.buffer.ctxm
5241menu $ctxm -tearoff 0
5242$ctxm add command \
5243 -label {Cut} \
5244 -font font_ui \
5245 -command {tk_textCut $ui_comm}
5246$ctxm add command \
5247 -label {Copy} \
5248 -font font_ui \
5249 -command {tk_textCopy $ui_comm}
5250$ctxm add command \
5251 -label {Paste} \
5252 -font font_ui \
5253 -command {tk_textPaste $ui_comm}
5254$ctxm add command \
5255 -label {Delete} \
5256 -font font_ui \
5257 -command {$ui_comm delete sel.first sel.last}
5258$ctxm add separator
5259$ctxm add command \
5260 -label {Select All} \
5261 -font font_ui \
5262 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
5263$ctxm add command \
5264 -label {Copy All} \
5265 -font font_ui \
5266 -command {
5267 $ui_comm tag add sel 0.0 end
5268 tk_textCopy $ui_comm
5269 $ui_comm tag remove sel 0.0 end
5270 }
5271$ctxm add separator
5272$ctxm add command \
5273 -label {Sign Off} \
5274 -font font_ui \
5275 -command do_signoff
5276bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
5277# -- Diff Header
5279#
5280set current_diff_path {}
5281set current_diff_side {}
5282set diff_actions [list]
5283proc trace_current_diff_path {varname args} {
5284 global current_diff_path diff_actions file_states
5285 if {$current_diff_path eq {}} {
5286 set s {}
5287 set f {}
5288 set p {}
5289 set o disabled
5290 } else {
5291 set p $current_diff_path
5292 set s [mapdesc [lindex $file_states($p) 0] $p]
5293 set f {File:}
5294 set p [escape_path $p]
5295 set o normal
5296 }
5297 .vpane.lower.diff.header.status configure -text $s
5299 .vpane.lower.diff.header.file configure -text $f
5300 .vpane.lower.diff.header.path configure -text $p
5301 foreach w $diff_actions {
5302 uplevel #0 $w $o
5303 }
5304}
5305trace add variable current_diff_path write trace_current_diff_path
5306frame .vpane.lower.diff.header -background orange
5308label .vpane.lower.diff.header.status \
5309 -background orange \
5310 -width $max_status_desc \
5311 -anchor w \
5312 -justify left \
5313 -font font_ui
5314label .vpane.lower.diff.header.file \
5315 -background orange \
5316 -anchor w \
5317 -justify left \
5318 -font font_ui
5319label .vpane.lower.diff.header.path \
5320 -background orange \
5321 -anchor w \
5322 -justify left \
5323 -font font_ui
5324pack .vpane.lower.diff.header.status -side left
5325pack .vpane.lower.diff.header.file -side left
5326pack .vpane.lower.diff.header.path -fill x
5327set ctxm .vpane.lower.diff.header.ctxm
5328menu $ctxm -tearoff 0
5329$ctxm add command \
5330 -label {Copy} \
5331 -font font_ui \
5332 -command {
5333 clipboard clear
5334 clipboard append \
5335 -format STRING \
5336 -type STRING \
5337 -- $current_diff_path
5338 }
5339lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5340bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
5341# -- Diff Body
5343#
5344frame .vpane.lower.diff.body
5345set ui_diff .vpane.lower.diff.body.t
5346text $ui_diff -background white -borderwidth 0 \
5347 -width 80 -height 15 -wrap none \
5348 -font font_diff \
5349 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
5350 -yscrollcommand {.vpane.lower.diff.body.sby set} \
5351 -state disabled
5352scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
5353 -command [list $ui_diff xview]
5354scrollbar .vpane.lower.diff.body.sby -orient vertical \
5355 -command [list $ui_diff yview]
5356pack .vpane.lower.diff.body.sbx -side bottom -fill x
5357pack .vpane.lower.diff.body.sby -side right -fill y
5358pack $ui_diff -side left -fill both -expand 1
5359pack .vpane.lower.diff.header -side top -fill x
5360pack .vpane.lower.diff.body -side bottom -fill both -expand 1
5361$ui_diff tag conf d_cr -elide true
5363$ui_diff tag conf d_@ -foreground blue -font font_diffbold
5364$ui_diff tag conf d_+ -foreground {#00a000}
5365$ui_diff tag conf d_- -foreground red
5366$ui_diff tag conf d_++ -foreground {#00a000}
5368$ui_diff tag conf d_-- -foreground red
5369$ui_diff tag conf d_+s \
5370 -foreground {#00a000} \
5371 -background {#e2effa}
5372$ui_diff tag conf d_-s \
5373 -foreground red \
5374 -background {#e2effa}
5375$ui_diff tag conf d_s+ \
5376 -foreground {#00a000} \
5377 -background ivory1
5378$ui_diff tag conf d_s- \
5379 -foreground red \
5380 -background ivory1
5381$ui_diff tag conf d<<<<<<< \
5383 -foreground orange \
5384 -font font_diffbold
5385$ui_diff tag conf d======= \
5386 -foreground orange \
5387 -font font_diffbold
5388$ui_diff tag conf d>>>>>>> \
5389 -foreground orange \
5390 -font font_diffbold
5391$ui_diff tag raise sel
5393# -- Diff Body Context Menu
5395#
5396set ctxm .vpane.lower.diff.body.ctxm
5397menu $ctxm -tearoff 0
5398$ctxm add command \
5399 -label {Refresh} \
5400 -font font_ui \
5401 -command reshow_diff
5402lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5403$ctxm add command \
5404 -label {Copy} \
5405 -font font_ui \
5406 -command {tk_textCopy $ui_diff}
5407lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5408$ctxm add command \
5409 -label {Select All} \
5410 -font font_ui \
5411 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
5412lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5413$ctxm add command \
5414 -label {Copy All} \
5415 -font font_ui \
5416 -command {
5417 $ui_diff tag add sel 0.0 end
5418 tk_textCopy $ui_diff
5419 $ui_diff tag remove sel 0.0 end
5420 }
5421lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5422$ctxm add separator
5423$ctxm add command \
5424 -label {Apply/Reverse Hunk} \
5425 -font font_ui \
5426 -command {apply_hunk $cursorX $cursorY}
5427set ui_diff_applyhunk [$ctxm index last]
5428lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
5429$ctxm add separator
5430$ctxm add command \
5431 -label {Decrease Font Size} \
5432 -font font_ui \
5433 -command {incr_font_size font_diff -1}
5434lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5435$ctxm add command \
5436 -label {Increase Font Size} \
5437 -font font_ui \
5438 -command {incr_font_size font_diff 1}
5439lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5440$ctxm add separator
5441$ctxm add command \
5442 -label {Show Less Context} \
5443 -font font_ui \
5444 -command {if {$repo_config(gui.diffcontext) >= 2} {
5445 incr repo_config(gui.diffcontext) -1
5446 reshow_diff
5447 }}
5448lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5449$ctxm add command \
5450 -label {Show More Context} \
5451 -font font_ui \
5452 -command {
5453 incr repo_config(gui.diffcontext)
5454 reshow_diff
5455 }
5456lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5457$ctxm add separator
5458$ctxm add command -label {Options...} \
5459 -font font_ui \
5460 -command do_options
5461bind_button3 $ui_diff "
5462 set cursorX %x
5463 set cursorY %y
5464 if {\$ui_index eq \$current_diff_side} {
5465 $ctxm entryconf $ui_diff_applyhunk -label {Unstage Hunk From Commit}
5466 } else {
5467 $ctxm entryconf $ui_diff_applyhunk -label {Stage Hunk For Commit}
5468 }
5469 tk_popup $ctxm %X %Y
5470"
5471unset ui_diff_applyhunk
5472# -- Status Bar
5474#
5475set ui_status_value {Initializing...}
5476label .status -textvariable ui_status_value \
5477 -anchor w \
5478 -justify left \
5479 -borderwidth 1 \
5480 -relief sunken \
5481 -font font_ui
5482pack .status -anchor w -side bottom -fill x
5483# -- Load geometry
5485#
5486catch {
5487set gm $repo_config(gui.geometry)
5488wm geometry . [lindex $gm 0]
5489.vpane sash place 0 \
5490 [lindex [.vpane sash coord 0] 0] \
5491 [lindex $gm 1]
5492.vpane.files sash place 0 \
5493 [lindex $gm 2] \
5494 [lindex [.vpane.files sash coord 0] 1]
5495unset gm
5496}
5497# -- Key Bindings
5499#
5500bind $ui_comm <$M1B-Key-Return> {do_commit;break}
5501bind $ui_comm <$M1B-Key-i> {do_add_all;break}
5502bind $ui_comm <$M1B-Key-I> {do_add_all;break}
5503bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
5504bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
5505bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
5506bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
5507bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
5508bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
5509bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
5510bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
5511bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
5513bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
5514bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
5515bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
5516bind $ui_diff <$M1B-Key-v> {break}
5517bind $ui_diff <$M1B-Key-V> {break}
5518bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
5519bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
5520bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
5521bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
5522bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
5523bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
5524bind $ui_diff <Button-1> {focus %W}
5525if {!$single_commit} {
5527 bind . <$M1B-Key-n> do_create_branch
5528 bind . <$M1B-Key-N> do_create_branch
5529}
5530bind . <Destroy> do_quit
5532bind all <Key-F5> do_rescan
5533bind all <$M1B-Key-r> do_rescan
5534bind all <$M1B-Key-R> do_rescan
5535bind . <$M1B-Key-s> do_signoff
5536bind . <$M1B-Key-S> do_signoff
5537bind . <$M1B-Key-i> do_add_all
5538bind . <$M1B-Key-I> do_add_all
5539bind . <$M1B-Key-Return> do_commit
5540bind all <$M1B-Key-q> do_quit
5541bind all <$M1B-Key-Q> do_quit
5542bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
5543bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
5544foreach i [list $ui_index $ui_workdir] {
5545 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
5546 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
5547 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
5548}
5549unset i
5550set file_lists($ui_index) [list]
5552set file_lists($ui_workdir) [list]
5553set HEAD {}
5555set PARENT {}
5556set MERGE_HEAD [list]
5557set commit_type {}
5558set empty_tree {}
5559set current_branch {}
5560set current_diff_path {}
5561set selected_commit_type new
5562wm title . "[appname] ([file normalize [file dirname [gitdir]]])"
5564focus -force $ui_comm
5565# -- Warn the user about environmental problems. Cygwin's Tcl
5567# does *not* pass its env array onto any processes it spawns.
5568# This means that git processes get none of our environment.
5569#
5570if {[is_Cygwin]} {
5571 set ignored_env 0
5572 set suggest_user {}
5573 set msg "Possible environment issues exist.
5574The following environment variables are probably
5576going to be ignored by any Git subprocess run
5577by [appname]:
5578"
5580 foreach name [array names env] {
5581 switch -regexp -- $name {
5582 {^GIT_INDEX_FILE$} -
5583 {^GIT_OBJECT_DIRECTORY$} -
5584 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
5585 {^GIT_DIFF_OPTS$} -
5586 {^GIT_EXTERNAL_DIFF$} -
5587 {^GIT_PAGER$} -
5588 {^GIT_TRACE$} -
5589 {^GIT_CONFIG$} -
5590 {^GIT_CONFIG_LOCAL$} -
5591 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
5592 append msg " - $name\n"
5593 incr ignored_env
5594 }
5595 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
5596 append msg " - $name\n"
5597 incr ignored_env
5598 set suggest_user $name
5599 }
5600 }
5601 }
5602 if {$ignored_env > 0} {
5603 append msg "
5604This is due to a known issue with the
5605Tcl binary distributed by Cygwin."
5606 if {$suggest_user ne {}} {
5608 append msg "
5609A good replacement for $suggest_user
5611is placing values for the user.name and
5612user.email settings into your personal
5613~/.gitconfig file.
5614"
5615 }
5616 warn_popup $msg
5617 }
5618 unset ignored_env msg suggest_user name
5619}
5620# -- Only initialize complex UI if we are going to stay running.
5622#
5623if {!$single_commit} {
5624 load_all_remotes
5625 load_all_heads
5626 populate_branch_menu
5628 populate_fetch_menu
5629 populate_push_menu
5630}
5631# -- Only suggest a gc run if we are going to stay running.
5633#
5634if {!$single_commit} {
5635 set object_limit 2000
5636 if {[is_Windows]} {set object_limit 200}
5637 regexp {^([0-9]+) objects,} [exec git count-objects] _junk objects_current
5638 if {$objects_current >= $object_limit} {
5639 if {[ask_popup \
5640 "This repository currently has $objects_current loose objects.
5641To maintain optimal performance it is strongly
5643recommended that you compress the database
5644when more than $object_limit loose objects exist.
5645Compress the database now?"] eq yes} {
5647 do_gc
5648 }
5649 }
5650 unset object_limit _junk objects_current
5651}
5652lock_index begin-read
5654after 1 do_rescan