git-gui: Use -M and -C when running blame.
[git/gitweb.git] / git-gui.sh
blobd5490cdde0af69102e8f5a4f0038f60528968ff9
1 #!/bin/sh
2 # Tcl ignores the next line -*- tcl -*- \
3 exec wish "$0" -- "$@"
5 set appvers {@@GIT_VERSION@@}
6 set copyright {
7 Copyright © 2006, 2007 Shawn Pearce, Paul Mackerras.
9 This program is free software; you can redistribute it and/or modify
10 it under the terms of the GNU General Public License as published by
11 the Free Software Foundation; either version 2 of the License, or
12 (at your option) any later version.
14 This program is distributed in the hope that it will be useful,
15 but WITHOUT ANY WARRANTY; without even the implied warranty of
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 GNU General Public License for more details.
19 You should have received a copy of the GNU General Public License
20 along with this program; if not, write to the Free Software
21 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA}
23 ######################################################################
25 ## read only globals
27 set _appname [lindex [file split $argv0] end]
28 set _gitdir {}
29 set _gitexec {}
30 set _reponame {}
31 set _iscygwin {}
33 proc appname {} {
34 global _appname
35 return $_appname
38 proc gitdir {args} {
39 global _gitdir
40 if {$args eq {}} {
41 return $_gitdir
43 return [eval [concat [list file join $_gitdir] $args]]
46 proc 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"
53 if {$args eq {}} {
54 return $_gitexec
56 return [eval [concat [list file join $_gitexec] $args]]
59 proc reponame {} {
60 global _reponame
61 return $_reponame
64 proc is_MacOSX {} {
65 global tcl_platform tk_library
66 if {[tk windowingsystem] eq {aqua}} {
67 return 1
69 return 0
72 proc is_Windows {} {
73 global tcl_platform
74 if {$tcl_platform(platform) eq {windows}} {
75 return 1
77 return 0
80 proc 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
89 } else {
90 set _iscygwin 0
93 return $_iscygwin
96 ######################################################################
98 ## config
100 proc is_many_config {name} {
101 switch -glob -- $name {
102 remote.*.fetch -
103 remote.*.push
104 {return 1}
106 {return 0}
110 proc 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
121 proc load_config {include_global} {
122 global repo_config global_config default_config
124 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
137 close $fd_rc
141 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
153 close $fd_rc
156 foreach name [array names default_config] {
157 if {[catch {set v $global_config($name)}]} {
158 set global_config($name) $default_config($name)
160 if {[catch {set v $repo_config($name)}]} {
161 set repo_config($name) $default_config($name)
166 proc save_config {} {
167 global default_config font_descs
168 global repo_config global_config
169 global repo_config_new global_config_new
171 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)
185 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
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
202 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
211 set repo_config($name) $value
216 proc error_popup {msg} {
217 set title [appname]
218 if {[reponame] ne {}} {
219 append title " ([reponame])"
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 .
229 eval $cmd
232 proc warn_popup {msg} {
233 set title [appname]
234 if {[reponame] ne {}} {
235 append title " ([reponame])"
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 .
245 eval $cmd
248 proc info_popup {msg {parent .}} {
249 set title [appname]
250 if {[reponame] ne {}} {
251 append title " ([reponame])"
253 tk_messageBox \
254 -parent $parent \
255 -icon info \
256 -type ok \
257 -title $title \
258 -message $msg
261 proc ask_popup {msg} {
262 set title [appname]
263 if {[reponame] ne {}} {
264 append title " ([reponame])"
266 return [tk_messageBox \
267 -parent . \
268 -icon question \
269 -type yesno \
270 -title $title \
271 -message $msg]
274 ######################################################################
276 ## repository setup
278 if { [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
284 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
285 catch {set _gitdir [exec cygpath --unix $_gitdir]}
287 if {![file isdirectory $_gitdir]} {
288 catch {wm withdraw .}
289 error_popup "Git directory not found:\n\n$_gitdir"
290 exit 1
292 if {[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
297 if {[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
302 set _reponame [lindex [file split \
303 [file normalize [file dirname $_gitdir]]] \
304 end]
306 set single_commit 0
307 if {[appname] eq {git-citool}} {
308 set single_commit 1
311 ######################################################################
313 ## task management
315 set rescan_active 0
316 set diff_active 0
317 set last_clicked {}
319 set disable_on_lock [list]
320 set index_lock_type none
322 proc lock_index {type} {
323 global index_lock_type disable_on_lock
325 if {$index_lock_type eq {none}} {
326 set index_lock_type $type
327 foreach w $disable_on_lock {
328 uplevel #0 $w disabled
330 return 1
331 } elseif {$index_lock_type eq "begin-$type"} {
332 set index_lock_type $type
333 return 1
335 return 0
338 proc unlock_index {} {
339 global index_lock_type disable_on_lock
341 set index_lock_type none
342 foreach w $disable_on_lock {
343 uplevel #0 $w normal
347 ######################################################################
349 ## status
351 proc repository_state {ctvar hdvar mhvar} {
352 global current_branch
353 upvar $ctvar ct $hdvar hd $mhvar mh
355 set mh [list]
357 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
366 if {[catch {set hd [exec git rev-parse --verify HEAD]}]} {
367 set hd {}
368 set ct initial
369 return
372 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
379 close $fd_mh
380 return
383 set ct normal
386 proc PARENT {} {
387 global PARENT empty_tree
389 set p [lindex $PARENT 0]
390 if {$p ne {}} {
391 return $p
393 if {$empty_tree eq {}} {
394 set empty_tree [exec git mktree << {}]
396 return $empty_tree
399 proc 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
405 if {$rescan_active > 0 || ![lock_index read]} return
407 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
418 array unset file_states
420 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]} {
426 $ui_comm edit reset
427 $ui_comm edit modified false
430 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]
447 proc rescan_stage2 {fd after} {
448 global ui_status_value
449 global rescan_active buf_rdi buf_rdf buf_rlo
451 if {$fd ne {}} {
452 read $fd
453 if {![eof $fd]} return
454 close $fd
457 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"
464 set buf_rdi {}
465 set buf_rdf {}
466 set buf_rlo {}
468 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]
474 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]
482 proc load_message {file} {
483 global ui_comm
485 set f [gitdir $file]
486 if {[file isfile $f]} {
487 if {[catch {set fd [open $f r]}]} {
488 return 0
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
497 return 0
500 proc read_diff_index {fd after} {
501 global buf_rdi
503 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
513 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
524 if {$c < $n} {
525 set buf_rdi [string range $buf_rdi $c end]
526 } else {
527 set buf_rdi {}
530 rescan_done $fd buf_rdi $after
533 proc read_diff_files {fd after} {
534 global buf_rdf
536 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
546 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
557 if {$c < $n} {
558 set buf_rdf [string range $buf_rdf $c end]
559 } else {
560 set buf_rdf {}
563 rescan_done $fd buf_rdf $after
566 proc read_ls_others {fd after} {
567 global buf_rlo
569 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
575 rescan_done $fd buf_rlo $after
578 proc rescan_done {fd buf after} {
579 global rescan_active
580 global file_states repo_config
581 upvar $buf to_clear
583 if {![eof $fd]} return
584 set to_clear {}
585 close $fd
586 if {[incr rescan_active -1] > 0} return
588 prune_selection
589 unlock_index
590 display_all_files
591 reshow_diff
592 uplevel #0 $after
595 proc prune_selection {} {
596 global file_states selected_paths
598 foreach path [array names selected_paths] {
599 if {[catch {set still_here $file_states($path)}]} {
600 unset selected_paths($path)
605 ######################################################################
607 ## diff
609 proc clear_diff {} {
610 global ui_diff current_diff_path current_diff_header
611 global ui_index ui_workdir
613 $ui_diff conf -state normal
614 $ui_diff delete 0.0 end
615 $ui_diff conf -state disabled
617 set current_diff_path {}
618 set current_diff_header {}
620 $ui_index tag remove in_diff 0.0 end
621 $ui_workdir tag remove in_diff 0.0 end
624 proc reshow_diff {} {
625 global ui_status_value file_states file_lists
626 global current_diff_path current_diff_side
628 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
639 proc handle_empty_diff {} {
640 global current_diff_path file_states file_lists
642 set path $current_diff_path
643 set s $file_states($path)
644 if {[lindex $s 0] ne {_M}} return
646 info_popup "No differences detected.
648 [short_path $path] has no changes.
650 The modification date of this file was updated
651 by another application, but the content within
652 the file was not changed.
654 A rescan will be automatically started to find
655 other files which may have the same state."
657 clear_diff
658 display_file $path __
659 rescan {set ui_status_value {Ready.}} 0
662 proc 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
668 if {$diff_active || ![lock_index read]} return
670 clear_diff
671 if {$lno == {}} {
672 set lno [lsearch -sorted -exact $file_lists($w) $path]
673 if {$lno >= 0} {
674 incr lno
677 if {$lno >= 1} {
678 $w tag add in_diff $lno.0 [expr {$lno + 1}].0
681 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]..."
690 # - Git won't give us the diff, there's nothing to compare to!
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
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
713 $ui_diff insert end "* $type\n" d_@
715 if {[string first "\0" $content] != -1} {
716 $ui_diff insert end \
717 "* Binary file (not showing content)." \
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_@
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_@
734 $ui_diff conf -state disabled
735 set diff_active 0
736 unlock_index
737 set ui_status_value {Ready.}
738 return
741 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
753 lappend cmd -p
754 lappend cmd --no-color
755 if {$repo_config(gui.diffcontext) > 0} {
756 lappend cmd "-U$repo_config(gui.diffcontext)"
758 if {$w eq $ui_index} {
759 lappend cmd [PARENT]
761 lappend cmd --
762 lappend cmd $path
764 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
772 fconfigure $fd \
773 -blocking 0 \
774 -encoding binary \
775 -translation binary
776 fileevent $fd readable [list read_diff $fd]
779 proc read_diff {fd} {
780 global ui_diff ui_status_value diff_active
781 global is_3way_diff current_diff_header
783 $ui_diff conf -state normal
784 while {[gets $fd line] >= 0} {
785 # -- Cleanup uninteresting diff header lines.
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
795 if {[string match {index *} $line]} continue
796 if {$line eq {deleted file mode 120000}} {
797 set line "deleted symlink"
800 # -- Automatically detect if this is a 3 way diff.
802 if {[string match {@@@ *} $line]} {set is_3way_diff 1}
804 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_++
829 default {
830 puts "error: Unhandled 3 way diff marker: {$op}"
831 set tags {}
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_+
848 default {
849 puts "error: Unhandled 2 way diff marker: {$op}"
850 set tags {}
854 $ui_diff insert end $line $tags
855 if {[string index $line end] eq "\r"} {
856 $ui_diff tag add d_cr {end - 2c}
858 $ui_diff insert end "\n" $tags
860 $ui_diff conf -state disabled
862 if {[eof $fd]} {
863 close $fd
864 set diff_active 0
865 unlock_index
866 set ui_status_value {Ready.}
868 if {[$ui_diff index end] eq {2.0}} {
869 handle_empty_diff
874 proc apply_hunk {x y} {
875 global current_diff_path current_diff_header current_diff_side
876 global ui_diff ui_index file_states
878 if {$current_diff_path eq {} || $current_diff_header eq {}} return
879 if {![lock_index apply_hunk]} return
881 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
890 } else {
891 set mode stage
892 if {[string index $mi 1] ne {M}} {
893 unlock_index
894 return
898 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
905 set e_lno [$ui_diff search -forwards -regexp ^@@ "$s_lno + 1 lines" end]
906 if {$e_lno eq {}} {
907 set e_lno end
910 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
921 $ui_diff conf -state normal
922 $ui_diff delete $s_lno $e_lno
923 $ui_diff conf -state disabled
925 if {[$ui_diff get 1.0 end] eq "\n"} {
926 set o _
927 } else {
928 set o ?
931 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
938 unlock_index
939 display_file $current_diff_path $mi
940 if {$o eq {_}} {
941 clear_diff
945 ######################################################################
947 ## commit
949 proc load_last_commit {} {
950 global HEAD PARENT MERGE_HEAD commit_type ui_comm
951 global repo_config
953 if {[llength $PARENT] == 0} {
954 error_popup {There is nothing to amend.
956 You are about to create the initial commit.
957 There is no commit before this to amend.
959 return
962 repository_state curType curHEAD curMERGE_HEAD
963 if {$curType eq {merge}} {
964 error_popup {Cannot amend while merging.
966 You are currently in the middle of a merge that
967 has not been fully completed. You cannot amend
968 the prior commit unless you first abort the
969 current merge activity.
971 return
974 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
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]]
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
997 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}
1006 $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.}}
1013 proc create_new_commit {} {
1014 global commit_type ui_comm
1016 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.}}
1023 set GIT_COMMITTER_IDENT {}
1025 proc committer_ident {} {
1026 global GIT_COMMITTER_IDENT
1028 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 {}
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 {}
1040 return $GIT_COMMITTER_IDENT
1043 proc commit_tree {} {
1044 global HEAD commit_type file_states ui_comm repo_config
1045 global ui_status_value pch_error
1047 if {[committer_ident] eq {}} return
1048 if {![lock_index update]} return
1050 # -- Our in memory state should match the repository.
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.
1059 Another Git program has modified this repository
1060 since the last scan. A rescan must be performed
1061 before another commit can be created.
1063 The rescan will be automatically started now.
1065 unlock_index
1066 rescan {set ui_status_value {Ready.}}
1067 return
1070 # -- At least one file should differ in the index.
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.
1082 File [short_path $path] has merge conflicts.
1083 You must resolve them and add the file before committing.
1085 unlock_index
1086 return
1088 default {
1089 error_popup "Unknown file state [lindex $s 0] detected.
1091 File [short_path $path] cannot be committed by this program.
1096 if {!$files_ready} {
1097 info_popup {No changes to commit.
1099 You must add at least 1 file before you can commit.
1101 unlock_index
1102 return
1105 # -- A message is required.
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.
1112 A good commit message has the following format:
1114 - First line: Describe in one sentance what you did.
1115 - Second line: Blank
1116 - Remaining lines: Describe why this change is good.
1118 unlock_index
1119 return
1122 # -- Run the pre-commit hook.
1124 set pchook [gitdir hooks pre-commit]
1126 # On Cygwin [file executable] might lie so we need to ask
1127 # the shell if the hook is executable. Yes that's annoying.
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
1141 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]
1149 proc commit_prehook_wait {fd_ph curHEAD msg} {
1150 global pch_error ui_status_value
1152 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
1162 set pch_error {}
1163 return
1165 fconfigure $fd_ph -blocking 0
1168 proc commit_writetree {curHEAD msg} {
1169 global ui_status_value
1171 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]
1177 proc 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
1184 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
1192 # -- Build the message.
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
1199 fconfigure $msg_wt -encoding $enc -translation binary
1200 puts -nonewline $msg_wt $msg
1201 close $msg_wt
1203 # -- Create the commit.
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
1211 } else {
1212 # git commit-tree writes to stderr during initial commit.
1213 lappend cmd 2>/dev/null
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
1223 # -- Update the HEAD ref.
1225 set reflogm commit
1226 if {$commit_type ne {normal}} {
1227 append reflogm " ($commit_type)"
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
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
1243 # -- Make sure our current branch exists.
1245 if {$commit_type eq {initial}} {
1246 lappend all_heads $current_branch
1247 set all_heads [lsort -unique $all_heads]
1248 populate_branch_menu
1251 # -- Cleanup after ourselves.
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]}
1259 # -- Let rerere do its thing.
1261 if {[file isdirectory [gitdir rr-cache]]} {
1262 catch {exec git rerere}
1265 # -- Run the post-commit hook.
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 {}
1276 if {$pchook ne {}} {
1277 catch {exec $pchook &}
1280 $ui_comm delete 0.0 end
1281 $ui_comm edit reset
1282 $ui_comm edit modified false
1284 if {$single_commit} do_quit
1286 # -- Update in memory status
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]
1294 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)}
1308 DO {
1309 set file_states($path) [list _O [lindex $s 1] {} {}]
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] \
1324 display_all_files
1325 unlock_index
1326 reshow_diff
1327 set ui_status_value \
1328 "Changes committed as [string range $cmt_id 0 7]."
1331 ######################################################################
1333 ## fetch push
1335 proc 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
1344 proc 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
1354 ######################################################################
1356 ## ui helpers
1358 proc mapicon {w state path} {
1359 global all_icons
1361 if {[catch {set r $all_icons($state$w)}]} {
1362 puts "error: no icon for $w state={$state} $path"
1363 return file_plain
1365 return $r
1368 proc mapdesc {state path} {
1369 global all_descs
1371 if {[catch {set r $all_descs($state)}]} {
1372 puts "error: no desc for state={$state} $path"
1373 return $state
1375 return $r
1378 proc escape_path {path} {
1379 regsub -all "\n" $path "\\n" path
1380 return $path
1383 proc short_path {path} {
1384 return [escape_path [lindex [file split $path] end]]
1387 set next_icon_id 0
1388 set null_sha1 [string repeat 0 40]
1390 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1391 global file_states next_icon_id null_sha1
1393 set s0 [string index $new_state 0]
1394 set s1 [string index $new_state 1]
1396 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]}
1406 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1407 elseif {$s0 eq {_}} {set s0 _}
1409 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1410 elseif {$s1 eq {_}} {set s1 _}
1412 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
1419 set file_states($path) [list $s0$s1 $icon \
1420 $head_info $index_info \
1422 return $state
1425 proc display_file_helper {w path icon_name old_m new_m} {
1426 global file_lists
1428 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
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
1456 proc display_file {path state} {
1457 global file_states selected_paths
1458 global ui_index ui_workdir
1460 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]
1465 set o [string index $old_m 0]
1466 set n [string index $new_m 0]
1467 if {$o eq {U}} {
1468 set o _
1470 if {$n eq {U}} {
1471 set n _
1473 display_file_helper $ui_index $path $icon_name $o $n
1475 if {[string index $old_m 0] eq {U}} {
1476 set o U
1477 } else {
1478 set o [string index $old_m 1]
1480 if {[string index $new_m 0] eq {U}} {
1481 set n U
1482 } else {
1483 set n [string index $new_m 1]
1485 display_file_helper $ui_workdir $path $icon_name $o $n
1487 if {$new_m eq {__}} {
1488 unset file_states($path)
1489 catch {unset selected_paths($path)}
1493 proc display_all_files_helper {w path icon_name m} {
1494 global file_lists
1496 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"
1505 proc display_all_files {} {
1506 global ui_index ui_workdir
1507 global file_states file_lists
1508 global last_clicked
1510 $ui_index conf -state normal
1511 $ui_workdir conf -state normal
1513 $ui_index delete 0.0 end
1514 $ui_workdir delete 0.0 end
1515 set last_clicked {}
1517 set file_lists($ui_index) [list]
1518 set file_lists($ui_workdir) [list]
1520 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]
1525 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
1531 if {[string index $m 0] eq {U}} {
1532 set s U
1533 } else {
1534 set s [string index $m 1]
1536 if {$s ne {_}} {
1537 display_all_files_helper $ui_workdir $path \
1538 $icon_name $s
1542 $ui_index conf -state disabled
1543 $ui_workdir conf -state disabled
1546 proc update_indexinfo {msg pathList after} {
1547 global update_index_cp ui_status_value
1549 if {![lock_index update]} return
1551 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}
1557 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 \
1580 proc write_update_indexinfo {fd pathList totalCnt batch msg after} {
1581 global update_index_cp ui_status_value
1582 global file_states current_diff_path
1584 if {$update_index_cp >= $totalCnt} {
1585 close $fd
1586 unlock_index
1587 uplevel #0 $after
1588 return
1591 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
1597 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}
1605 set info [lindex $s 2]
1606 if {$info eq {}} continue
1608 puts -nonewline $fd "$info\t[encoding convertto $path]\0"
1609 display_file $path $new
1612 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}]]
1619 proc update_index {msg pathList after} {
1620 global update_index_cp ui_status_value
1622 if {![lock_index update]} return
1624 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}
1630 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 \
1653 proc write_update_index {fd pathList totalCnt batch msg after} {
1654 global update_index_cp ui_status_value
1655 global file_states current_diff_path
1657 if {$update_index_cp >= $totalCnt} {
1658 close $fd
1659 unlock_index
1660 uplevel #0 $after
1661 return
1664 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
1670 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_
1682 ?M {set new M_}
1683 ?? {continue}
1685 puts -nonewline $fd "[encoding convertto $path]\0"
1686 display_file $path $new
1689 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}]]
1696 proc checkout_index {msg pathList after} {
1697 global update_index_cp ui_status_value
1699 if {![lock_index update]} return
1701 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}
1707 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 \
1736 proc write_checkout_index {fd pathList totalCnt batch msg after} {
1737 global update_index_cp ui_status_value
1738 global file_states current_diff_path
1740 if {$update_index_cp >= $totalCnt} {
1741 close $fd
1742 unlock_index
1743 uplevel #0 $after
1744 return
1747 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 ?_
1762 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}]]
1769 ######################################################################
1771 ## branch management
1773 proc is_tracking_branch {name} {
1774 global tracking_branches
1776 if {![catch {set info $tracking_branches($name)}]} {
1777 return 1
1779 foreach t [array names tracking_branches] {
1780 if {[string match {*/\*} $t] && [string match $t $name]} {
1781 return 1
1784 return 0
1787 proc load_all_heads {} {
1788 global all_heads
1790 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
1797 close $fd
1799 set all_heads [lsort $all_heads]
1802 proc populate_branch_menu {} {
1803 global all_heads disable_on_lock
1805 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
1816 set disable_on_lock $new_dol
1817 break
1821 if {$all_heads ne {}} {
1822 $m add separator
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]
1836 proc all_tracking_branches {} {
1837 global tracking_branches
1839 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
1850 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
1856 close $fd
1859 return [lsort -unique $all_trackings]
1862 proc 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
1868 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
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
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
1901 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}
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
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
1932 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
1941 proc radio_selector {varname value args} {
1942 upvar #0 $varname var
1943 set var $value
1946 trace add variable create_branch_head write \
1947 [list radio_selector create_branch_revtype head]
1948 trace add variable create_branch_trackinghead write \
1949 [list radio_selector create_branch_revtype tracking]
1951 trace add variable delete_branch_head write \
1952 [list radio_selector delete_branch_checktype head]
1953 trace add variable delete_branch_trackinghead write \
1954 [list radio_selector delete_branch_checktype tracking]
1956 proc 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
1962 set w .branch_editor
1963 toplevel $w
1964 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
1966 label $w.header -text {Create New Branch} \
1967 -font font_uibold
1968 pack $w.header -side top -fill x
1970 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
1982 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
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
2001 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
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
2041 return 1
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
2047 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
2057 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 {}
2063 bind $w <Visibility> "
2064 grab $w
2065 $w.desc.name_t icursor end
2066 focus $w.desc.name_t
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
2074 proc do_delete_branch_action {w} {
2075 global all_heads
2076 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
2078 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}}
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
2096 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
2109 lappend to_delete [list $b $o]
2111 if {$not_merged ne {}} {
2112 set msg "The following branches are not completely merged into $check_rev:
2114 - [join $not_merged "\n - "]"
2115 tk_messageBox \
2116 -icon info \
2117 -type ok \
2118 -title [wm title $w] \
2119 -parent $w \
2120 -message $msg
2122 if {$to_delete eq {}} return
2123 if {$delete_branch_checktype eq {always}} {
2124 set msg {Recovering deleted branches is difficult.
2126 Delete 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
2137 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]
2151 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"
2160 set all_heads [lsort $all_heads]
2161 populate_branch_menu
2162 destroy $w
2165 proc do_delete_branch {} {
2166 global all_heads tracking_branches current_branch
2167 global delete_branch_checktype delete_branch_head delete_branch_trackinghead
2169 set w .branch_editor
2170 toplevel $w
2171 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2173 label $w.header -text {Delete Local Branch} \
2174 -font font_uibold
2175 pack $w.header -side top -fill x
2177 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
2188 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
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
2207 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
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
2239 set delete_branch_head $current_branch
2240 set delete_branch_checktype head
2242 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
2248 proc switch_branch {new_branch} {
2249 global HEAD commit_type current_branch repo_config
2251 if {![lock_index switch]} return
2253 # -- Our in memory state should match the repository.
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.
2262 Another Git program has modified this repository
2263 since the last scan. A rescan must be performed
2264 before the current branch can be changed.
2266 The rescan will be automatically started now.
2268 unlock_index
2269 rescan {set ui_status_value {Ready.}}
2270 return
2273 # -- Don't do a pointless switch.
2275 if {$current_branch eq $new_branch} {
2276 unlock_index
2277 return
2280 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]
2296 proc switch_branch_stage2 {fd_rf new_branch} {
2297 global ui_status_value HEAD
2299 if {$fd_rf ne {}} {
2300 read $fd_rf
2301 if {![eof $fd_rf]} return
2302 close $fd_rf
2305 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]
2318 proc 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
2323 # -- We never get interesting output on stdout; only stderr.
2325 read $fd_rt
2326 fconfigure $fd_rt -blocking 1
2327 if {![eof $fd_rt]} {
2328 fconfigure $fd_rt -blocking 0
2329 return
2332 # -- 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.
2336 if {[catch {close $fd_rt} err]} {
2337 regsub {^fatal: } $err {} err
2338 warn_popup "File level merge required.
2340 $err
2342 Staying on branch '$current_branch'."
2343 set ui_status_value "Aborted checkout of '$new_branch' (file level merging is required)."
2344 unlock_index
2345 return
2348 # -- 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.
2352 if {[catch {exec git symbolic-ref HEAD "refs/heads/$new_branch"} err]} {
2353 error_popup "Failed to set current branch.
2355 This working directory is only partially switched.
2356 We successfully updated your files, but failed to
2357 update an internal Git file.
2359 This should not have occurred. [appname] will now
2360 close and give up.
2362 $err"
2363 do_quit
2364 return
2367 # -- 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.
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'."
2386 ######################################################################
2388 ## remote management
2390 proc load_all_remotes {} {
2391 global repo_config
2392 global all_remotes tracking_branches
2394 set all_remotes [list]
2395 array unset tracking_branches
2397 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 *]
2405 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"
2414 set tracking_branches($dst) [list $name $src]
2416 close $fd
2421 foreach line [array names repo_config remote.*.url] {
2422 if {![regexp ^remote\.(.*)\.url\$ $line line name]} continue
2423 lappend all_remotes $name
2425 if {[catch {set fl $repo_config(remote.$name.fetch)}]} {
2426 set fl {}
2428 foreach line $fl {
2429 if {![regexp {^([^:]+):(.+)$} $line line src dst]} continue
2430 if {![regexp ^refs/ $dst]} {
2431 set dst "refs/heads/$dst"
2433 set tracking_branches($dst) [list $name $src]
2437 set all_remotes [lsort -unique $all_remotes]
2440 proc populate_fetch_menu {} {
2441 global all_remotes repo_config
2443 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
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
2459 close $fd
2463 if {$enable} {
2464 $m add command \
2465 -label "Fetch from $r..." \
2466 -command [list fetch_from $r] \
2467 -font font_ui
2472 proc populate_push_menu {} {
2473 global all_remotes repo_config
2475 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
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
2492 close $fd
2496 if {$enable} {
2497 if {!$fast_count} {
2498 $m add separator
2500 $m add command \
2501 -label "Push to $r..." \
2502 -command [list push_to $r] \
2503 -font font_ui
2504 incr fast_count
2509 proc start_push_anywhere_action {w} {
2510 global push_urltype push_remote push_url push_thin push_tags
2512 set r_url {}
2513 switch -- $push_urltype {
2514 remote {set r_url $push_remote}
2515 url {set r_url $push_url}
2517 if {$r_url eq {}} return
2519 set cmd [list git push]
2520 lappend cmd -v
2521 if {$push_thin} {
2522 lappend cmd --thin
2524 if {$push_tags} {
2525 lappend cmd --tags
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
2534 if {$cnt == 0} {
2535 return
2536 } elseif {$cnt == 1} {
2537 set unit branch
2538 } else {
2539 set unit branches
2542 set cons [new_console "push $r_url" "Pushing $cnt $unit to $r_url"]
2543 console_exec $cons $cmd console_done
2544 destroy $w
2547 trace add variable push_remote write \
2548 [list radio_selector push_urltype remote]
2550 proc do_push_anywhere {} {
2551 global all_heads all_remotes current_branch
2552 global push_urltype push_remote push_url push_thin push_tags
2554 set w .push_setup
2555 toplevel $w
2556 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2558 label $w.header -text {Push Branches} -font font_uibold
2559 pack $w.header -side top -fill x
2561 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
2572 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
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
2592 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]
2608 set push_urltype remote
2609 } else {
2610 set push_urltype url
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
2629 return 1
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
2635 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
2651 set push_url {}
2652 set push_thin 0
2653 set push_tags 0
2655 bind $w <Visibility> "grab $w"
2656 bind $w <Key-Escape> "destroy $w"
2657 wm title $w "[appname] ([reponame]): Push"
2658 tkwait window $w
2661 ######################################################################
2663 ## merge
2665 proc can_merge {} {
2666 global HEAD commit_type file_states
2668 if {[string match amend* $commit_type]} {
2669 info_popup {Cannot merge while amending.
2671 You must finish amending this commit before
2672 starting any type of merge.
2674 return 0
2677 if {[committer_ident] eq {}} {return 0}
2678 if {![lock_index merge]} {return 0}
2680 # -- Our in memory state should match the repository.
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.
2686 Another Git program has modified this repository
2687 since the last scan. A rescan must be performed
2688 before a merge can be performed.
2690 The rescan will be automatically started now.
2692 unlock_index
2693 rescan {set ui_status_value {Ready.}}
2694 return 0
2697 foreach path [array names file_states] {
2698 switch -glob -- [lindex $file_states($path) 0] {
2699 _O {
2700 continue; # and pray it works!
2702 U? {
2703 error_popup "You are in the middle of a conflicted merge.
2705 File [short_path $path] has merge conflicts.
2707 You must resolve them, add the file, and commit to
2708 complete the current merge. Only then can you
2709 begin another merge.
2711 unlock_index
2712 return 0
2714 ?? {
2715 error_popup "You are in the middle of a change.
2717 File [short_path $path] is modified.
2719 You should complete the current commit before
2720 starting a merge. Doing so will help you abort
2721 a failed merge, should the need arise.
2723 unlock_index
2724 return 0
2729 return 1
2732 proc visualize_local_merge {w} {
2733 set revs {}
2734 foreach i [$w.source.l curselection] {
2735 lappend revs [$w.source.l get $i]
2737 if {$revs eq {}} return
2738 lappend revs --not HEAD
2739 do_gitk $revs
2742 proc start_local_merge_action {w} {
2743 global HEAD ui_status_value current_branch
2745 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
2755 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.
2769 You have requested to merge $revcnt branches
2770 in an octopus merge. This exceeds Git's
2771 internal limit of 15 branches per merge.
2773 Please select fewer branches. To merge more
2774 than 15 branches, merge the branches in batches.
2776 return
2779 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
2787 proc 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.
2795 Your merge of $revcnt branches has failed.
2797 There are file-level conflicts between the
2798 branches which must be resolved manually.
2800 The working directory will now be reset.
2802 You can attempt this merge again
2803 by merging only one branch at a time." $w
2805 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
2812 set msg {Merge failed. Conflict resolution is required.}
2814 unlock_index
2815 rescan [list set ui_status_value $msg]
2818 proc do_local_merge {} {
2819 global current_branch
2821 if {![can_merge]} return
2823 set w .merge_setup
2824 toplevel $w
2825 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
2827 label $w.header \
2828 -text "Merge Into $current_branch" \
2829 -font font_uibold
2830 pack $w.header -side top -fill x
2832 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
2847 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
2861 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]
2871 close $fr_fd
2873 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
2880 close $fr_fd
2882 foreach ref [lsort -unique $to_show] {
2883 $w.source.l insert end $ref
2886 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
2893 proc do_reset_hard {} {
2894 global HEAD commit_type file_states
2896 if {[string match amend* $commit_type]} {
2897 info_popup {Cannot abort while amending.
2899 You must finish amending this commit.
2901 return
2904 if {![lock_index abort]} return
2906 if {[string match *merge* $commit_type]} {
2907 set op merge
2908 } else {
2909 set op commit
2912 if {[ask_popup "Abort $op?
2914 Aborting the current $op will cause
2915 *ALL* uncommitted changes to be lost.
2917 Continue 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
2927 proc reset_hard_wait {fd} {
2928 global ui_comm
2930 read $fd
2931 if {[eof $fd]} {
2932 close $fd
2933 unlock_index
2935 $ui_comm delete 0.0 end
2936 $ui_comm edit modified false
2938 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]}
2944 rescan {set ui_status_value {Abort completed. Ready.}}
2948 ######################################################################
2950 ## browser
2952 set next_browser_id 0
2954 proc new_browser {commit} {
2955 global next_browser_id cursor_ptr
2956 global browser_commit browser_status browser_stack browser_path browser_busy
2958 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
2966 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
2975 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
2995 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
3003 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"
3006 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
3016 wm title $w "[appname] ([reponame]): File Browser"
3017 ls_tree $w_list $browser_commit($w_list) {}
3020 proc browser_click {was_double_click w pos} {
3021 global browser_files browser_status browser_path
3022 global browser_commit browser_stack browser_busy
3024 if {$browser_busy($w)} return
3025 set lno [lindex [split [$w index $pos] .] 0]
3026 set info [lindex $browser_files($w) [expr {$lno - 1}]]
3028 $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)
3043 set browser_status($w) "Loading $browser_path($w)..."
3044 ls_tree $w [lindex $parent 0] [lindex $parent 1]
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
3053 blob {
3054 set name [lindex $info 2]
3055 set p {}
3056 foreach n $browser_stack($w) {
3057 append p [lindex $n 1]
3059 append p $name
3060 show_blame $browser_commit($w) $p
3065 $w conf -state disabled
3068 proc ls_tree {w tree_id name} {
3069 global browser_buffer browser_files browser_stack browser_busy
3071 set browser_buffer($w) {}
3072 set browser_files($w) {}
3073 set browser_busy($w) 1
3075 $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
3087 lappend browser_stack($w) [list $tree_id $name]
3088 $w conf -state disabled
3090 set fd [open "| git ls-tree -z $tree_id" r]
3091 fconfigure $fd -blocking 0 -translation binary -encoding binary
3092 fileevent $fd readable [list read_ls_tree $fd $w]
3095 proc read_ls_tree {fd w} {
3096 global browser_buffer browser_files browser_status browser_busy
3098 if {![winfo exists $w]} {
3099 catch {close $fd}
3100 return
3103 append browser_buffer($w) [read $fd]
3104 set pck [split $browser_buffer($w) "\0"]
3105 set browser_buffer($w) [lindex $pck end]
3107 set n [llength $browser_files($w)]
3108 $w conf -state normal
3109 foreach p [lrange $pck 0 end-1] {
3110 set info [split $p "\t"]
3111 set path [lindex $info 1]
3112 set info [split [lindex $info 0] { }]
3113 set type [lindex $info 1]
3114 set object [lindex $info 2]
3116 switch -- $type {
3117 blob {
3118 set image file_mod
3120 tree {
3121 set image file_dir
3122 append path /
3124 default {
3125 set image file_question
3129 if {$n > 0} {$w insert end "\n"}
3130 $w image create end \
3131 -align center -padx 5 -pady 1 \
3132 -name icon[incr n] \
3133 -image $image
3134 $w insert end [escape_path $path]
3135 lappend browser_files($w) [list $type $object $path]
3137 $w conf -state disabled
3139 if {[eof $fd]} {
3140 close $fd
3141 set browser_status($w) Ready.
3142 set browser_busy($w) 0
3143 array unset browser_buffer $w
3147 proc show_blame {commit path} {
3148 global next_browser_id blame_status blame_data
3150 set w .browser[incr next_browser_id]
3151 set blame_status($w) {Loading current file content...}
3152 set texts [list]
3154 toplevel $w
3155 panedwindow $w.out -orient horizontal
3157 label $w.path -text "$commit:$path" \
3158 -anchor w \
3159 -justify left \
3160 -borderwidth 1 \
3161 -relief sunken \
3162 -font font_uibold
3163 pack $w.path -anchor w -side top -fill x
3165 text $w.out.commit -background white -borderwidth 0 \
3166 -state disabled \
3167 -wrap none \
3168 -height 40 \
3169 -width 8 \
3170 -font font_diff
3171 $w.out add $w.out.commit
3172 lappend texts $w.out.commit
3174 text $w.out.author -background white -borderwidth 0 \
3175 -state disabled \
3176 -wrap none \
3177 -height 40 \
3178 -width 20 \
3179 -font font_diff
3180 $w.out add $w.out.author
3181 lappend texts $w.out.author
3183 text $w.out.date -background white -borderwidth 0 \
3184 -state disabled \
3185 -wrap none \
3186 -height 40 \
3187 -width [string length "yyyy-mm-dd hh:mm:ss"] \
3188 -font font_diff
3189 $w.out add $w.out.date
3190 lappend texts $w.out.date
3192 text $w.out.linenumber -background white -borderwidth 0 \
3193 -state disabled \
3194 -wrap none \
3195 -height 40 \
3196 -width 5 \
3197 -font font_diff
3198 $w.out.linenumber tag conf linenumber -justify right
3199 $w.out add $w.out.linenumber
3200 lappend texts $w.out.linenumber
3202 text $w.out.file -background white -borderwidth 0 \
3203 -state disabled \
3204 -wrap none \
3205 -height 40 \
3206 -width 80 \
3207 -font font_diff
3208 $w.out add $w.out.file
3209 lappend texts $w.out.file
3211 label $w.status -textvariable blame_status($w) \
3212 -anchor w \
3213 -justify left \
3214 -borderwidth 1 \
3215 -relief sunken \
3216 -font font_ui
3217 pack $w.status -anchor w -side bottom -fill x
3219 scrollbar $w.sby -orient v -command [list scrollbar2many $texts yview]
3220 pack $w.sby -side right -fill y
3221 pack $w.out -side left -fill both -expand 1
3223 menu $w.ctxm -tearoff 0
3224 $w.ctxm add command -label "Copy Commit" \
3225 -font font_ui \
3226 -command "blame_copycommit $w \$cursorW @\$cursorX,\$cursorY"
3228 foreach i $texts {
3229 $i tag conf in_sel \
3230 -background [$i cget -foreground] \
3231 -foreground [$i cget -background]
3232 $i conf -yscrollcommand [list many2scrollbar $texts yview $w.sby]
3233 bind $i <Button-1> "blame_highlight $i @%x,%y $texts;break"
3234 bind_button3 $i "
3235 set cursorX %x
3236 set cursorY %y
3237 set cursorW %W
3238 tk_popup $w.ctxm %X %Y
3242 bind $w <Visibility> "focus $w"
3243 bind $w <Destroy> "
3244 array unset blame_status $w
3245 array unset blame_data $w,*
3247 wm title $w "[appname] ([reponame]): File Viewer"
3249 set blame_data($w,total_lines) 0
3250 set fd [open "| git cat-file blob $commit:$path" r]
3251 fconfigure $fd -blocking 0 -translation lf -encoding binary
3252 fileevent $fd readable [list read_blame_catfile $fd $w $commit $path \
3253 $texts $w.out.linenumber $w.out.file]
3256 proc read_blame_catfile {fd w commit path texts w_lno w_file} {
3257 global blame_status blame_data
3259 if {![winfo exists $w_file]} {
3260 catch {close $fd}
3261 return
3264 set n $blame_data($w,total_lines)
3265 foreach i $texts {$i conf -state normal}
3266 while {[gets $fd line] >= 0} {
3267 regsub "\r\$" $line {} line
3268 incr n
3269 $w_lno insert end $n linenumber
3270 $w_file insert end $line
3271 foreach i $texts {$i insert end "\n"}
3273 foreach i $texts {$i conf -state disabled}
3274 set blame_data($w,total_lines) $n
3276 if {[eof $fd]} {
3277 close $fd
3278 set blame_status($w) {Loading annotations...}
3279 set cmd [list git blame -M -C --incremental]
3280 lappend cmd $commit -- $path
3281 set fd [open "| $cmd" r]
3282 fconfigure $fd -blocking 0 -translation lf -encoding binary
3283 fileevent $fd readable "read_blame_incremental $fd $w $texts"
3287 proc read_blame_incremental {fd w w_commit w_author w_date w_lno w_file} {
3288 global blame_status blame_data
3290 if {![winfo exists $w_commit]} {
3291 catch {close $fd}
3292 return
3295 $w_commit conf -state normal
3296 $w_author conf -state normal
3297 $w_date conf -state normal
3299 while {[gets $fd line] >= 0} {
3300 if {[regexp {^([a-z0-9]{40}) (\d+) (\d+) (\d+)$} $line line \
3301 commit original_line final_line line_count]} {
3302 set blame_data($w,commit) $commit
3303 set blame_data($w,original_line) $original_line
3304 set blame_data($w,final_line) $final_line
3305 set blame_data($w,line_count) $line_count
3306 } elseif {[string match {filename *} $line]} {
3307 set n $blame_data($w,line_count)
3308 set lno $blame_data($w,final_line)
3309 set file [string range $line 9 end]
3310 set commit $blame_data($w,commit)
3311 set abbrev [string range $commit 0 8]
3313 if {[catch {set author $blame_data($w,$commit,author)} err]} {
3314 puts $err
3315 set author {}
3318 if {[catch {set atime $blame_data($w,$commit,author-time)}]} {
3319 set atime {}
3320 } else {
3321 set atime [clock format $atime -format {%Y-%m-%d %T}]
3324 while {$n > 0} {
3325 $w_commit delete $lno.0 "$lno.0 lineend"
3326 $w_author delete $lno.0 "$lno.0 lineend"
3327 $w_date delete $lno.0 "$lno.0 lineend"
3329 $w_commit insert $lno.0 $abbrev
3330 $w_author insert $lno.0 $author
3331 $w_date insert $lno.0 $atime
3332 set blame_data($w,line$lno,commit) $commit
3334 incr n -1
3335 incr lno
3337 } elseif {[regexp {^([a-z-]+) (.*)$} $line line header data]} {
3338 set blame_data($w,$blame_data($w,commit),$header) $data
3342 $w_commit conf -state disabled
3343 $w_author conf -state disabled
3344 $w_date conf -state disabled
3346 if {[eof $fd]} {
3347 close $fd
3348 set blame_status($w) {Annotation complete.}
3352 proc blame_highlight {w pos args} {
3353 set lno [lindex [split [$w index $pos] .] 0]
3354 foreach i $args {
3355 $i tag remove in_sel 0.0 end
3357 if {$lno eq {}} return
3358 foreach i $args {
3359 $i tag add in_sel $lno.0 "$lno.0 + 1 line"
3363 proc blame_copycommit {w i pos} {
3364 global blame_data
3365 set lno [lindex [split [$i index $pos] .] 0]
3366 if {![catch {set commit $blame_data($w,line$lno,commit)}]} {
3367 clipboard clear
3368 clipboard append \
3369 -format STRING \
3370 -type STRING \
3371 -- $commit
3375 ######################################################################
3377 ## icons
3379 set filemask {
3380 #define mask_width 14
3381 #define mask_height 15
3382 static unsigned char mask_bits[] = {
3383 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
3384 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
3385 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
3388 image create bitmap file_plain -background white -foreground black -data {
3389 #define plain_width 14
3390 #define plain_height 15
3391 static unsigned char plain_bits[] = {
3392 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
3393 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
3394 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
3395 } -maskdata $filemask
3397 image create bitmap file_mod -background white -foreground blue -data {
3398 #define mod_width 14
3399 #define mod_height 15
3400 static unsigned char mod_bits[] = {
3401 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
3402 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
3403 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
3404 } -maskdata $filemask
3406 image create bitmap file_fulltick -background white -foreground "#007000" -data {
3407 #define file_fulltick_width 14
3408 #define file_fulltick_height 15
3409 static unsigned char file_fulltick_bits[] = {
3410 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
3411 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
3412 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
3413 } -maskdata $filemask
3415 image create bitmap file_parttick -background white -foreground "#005050" -data {
3416 #define parttick_width 14
3417 #define parttick_height 15
3418 static unsigned char parttick_bits[] = {
3419 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
3420 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
3421 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
3422 } -maskdata $filemask
3424 image create bitmap file_question -background white -foreground black -data {
3425 #define file_question_width 14
3426 #define file_question_height 15
3427 static unsigned char file_question_bits[] = {
3428 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
3429 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
3430 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
3431 } -maskdata $filemask
3433 image create bitmap file_removed -background white -foreground red -data {
3434 #define file_removed_width 14
3435 #define file_removed_height 15
3436 static unsigned char file_removed_bits[] = {
3437 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
3438 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
3439 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
3440 } -maskdata $filemask
3442 image create bitmap file_merge -background white -foreground blue -data {
3443 #define file_merge_width 14
3444 #define file_merge_height 15
3445 static unsigned char file_merge_bits[] = {
3446 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
3447 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
3448 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
3449 } -maskdata $filemask
3451 set file_dir_data {
3452 #define file_width 18
3453 #define file_height 18
3454 static unsigned char file_bits[] = {
3455 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x03, 0x00,
3456 0x0c, 0x03, 0x00, 0x04, 0xfe, 0x00, 0x06, 0x80, 0x00, 0xff, 0x9f, 0x00,
3457 0x03, 0x98, 0x00, 0x02, 0x90, 0x00, 0x06, 0xb0, 0x00, 0x04, 0xa0, 0x00,
3458 0x0c, 0xe0, 0x00, 0x08, 0xc0, 0x00, 0xf8, 0xff, 0x00, 0x00, 0x00, 0x00,
3459 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
3461 image create bitmap file_dir -background white -foreground blue \
3462 -data $file_dir_data -maskdata $file_dir_data
3463 unset file_dir_data
3465 set file_uplevel_data {
3466 #define up_width 15
3467 #define up_height 15
3468 static unsigned char up_bits[] = {
3469 0x80, 0x00, 0xc0, 0x01, 0xe0, 0x03, 0xf0, 0x07, 0xf8, 0x0f, 0xfc, 0x1f,
3470 0xfe, 0x3f, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01,
3471 0xc0, 0x01, 0xc0, 0x01, 0x00, 0x00};
3473 image create bitmap file_uplevel -background white -foreground red \
3474 -data $file_uplevel_data -maskdata $file_uplevel_data
3475 unset file_uplevel_data
3477 set ui_index .vpane.files.index.list
3478 set ui_workdir .vpane.files.workdir.list
3480 set all_icons(_$ui_index) file_plain
3481 set all_icons(A$ui_index) file_fulltick
3482 set all_icons(M$ui_index) file_fulltick
3483 set all_icons(D$ui_index) file_removed
3484 set all_icons(U$ui_index) file_merge
3486 set all_icons(_$ui_workdir) file_plain
3487 set all_icons(M$ui_workdir) file_mod
3488 set all_icons(D$ui_workdir) file_question
3489 set all_icons(U$ui_workdir) file_merge
3490 set all_icons(O$ui_workdir) file_plain
3492 set max_status_desc 0
3493 foreach i {
3494 {__ "Unmodified"}
3496 {_M "Modified, not staged"}
3497 {M_ "Staged for commit"}
3498 {MM "Portions staged for commit"}
3499 {MD "Staged for commit, missing"}
3501 {_O "Untracked, not staged"}
3502 {A_ "Staged for commit"}
3503 {AM "Portions staged for commit"}
3504 {AD "Staged for commit, missing"}
3506 {_D "Missing"}
3507 {D_ "Staged for removal"}
3508 {DO "Staged for removal, still present"}
3510 {U_ "Requires merge resolution"}
3511 {UU "Requires merge resolution"}
3512 {UM "Requires merge resolution"}
3513 {UD "Requires merge resolution"}
3515 if {$max_status_desc < [string length [lindex $i 1]]} {
3516 set max_status_desc [string length [lindex $i 1]]
3518 set all_descs([lindex $i 0]) [lindex $i 1]
3520 unset i
3522 ######################################################################
3524 ## util
3526 proc bind_button3 {w cmd} {
3527 bind $w <Any-Button-3> $cmd
3528 if {[is_MacOSX]} {
3529 bind $w <Control-Button-1> $cmd
3533 proc scrollbar2many {list mode args} {
3534 foreach w $list {eval $w $mode $args}
3537 proc many2scrollbar {list mode sb top bottom} {
3538 $sb set $top $bottom
3539 foreach w $list {$w $mode moveto $top}
3542 proc incr_font_size {font {amt 1}} {
3543 set sz [font configure $font -size]
3544 incr sz $amt
3545 font configure $font -size $sz
3546 font configure ${font}bold -size $sz
3549 proc hook_failed_popup {hook msg} {
3550 set w .hookfail
3551 toplevel $w
3553 frame $w.m
3554 label $w.m.l1 -text "$hook hook failed:" \
3555 -anchor w \
3556 -justify left \
3557 -font font_uibold
3558 text $w.m.t \
3559 -background white -borderwidth 1 \
3560 -relief sunken \
3561 -width 80 -height 10 \
3562 -font font_diff \
3563 -yscrollcommand [list $w.m.sby set]
3564 label $w.m.l2 \
3565 -text {You must correct the above errors before committing.} \
3566 -anchor w \
3567 -justify left \
3568 -font font_uibold
3569 scrollbar $w.m.sby -command [list $w.m.t yview]
3570 pack $w.m.l1 -side top -fill x
3571 pack $w.m.l2 -side bottom -fill x
3572 pack $w.m.sby -side right -fill y
3573 pack $w.m.t -side left -fill both -expand 1
3574 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
3576 $w.m.t insert 1.0 $msg
3577 $w.m.t conf -state disabled
3579 button $w.ok -text OK \
3580 -width 15 \
3581 -font font_ui \
3582 -command "destroy $w"
3583 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
3585 bind $w <Visibility> "grab $w; focus $w"
3586 bind $w <Key-Return> "destroy $w"
3587 wm title $w "[appname] ([reponame]): error"
3588 tkwait window $w
3591 set next_console_id 0
3593 proc new_console {short_title long_title} {
3594 global next_console_id console_data
3595 set w .console[incr next_console_id]
3596 set console_data($w) [list $short_title $long_title]
3597 return [console_init $w]
3600 proc console_init {w} {
3601 global console_cr console_data M1B
3603 set console_cr($w) 1.0
3604 toplevel $w
3605 frame $w.m
3606 label $w.m.l1 -text "[lindex $console_data($w) 1]:" \
3607 -anchor w \
3608 -justify left \
3609 -font font_uibold
3610 text $w.m.t \
3611 -background white -borderwidth 1 \
3612 -relief sunken \
3613 -width 80 -height 10 \
3614 -font font_diff \
3615 -state disabled \
3616 -yscrollcommand [list $w.m.sby set]
3617 label $w.m.s -text {Working... please wait...} \
3618 -anchor w \
3619 -justify left \
3620 -font font_uibold
3621 scrollbar $w.m.sby -command [list $w.m.t yview]
3622 pack $w.m.l1 -side top -fill x
3623 pack $w.m.s -side bottom -fill x
3624 pack $w.m.sby -side right -fill y
3625 pack $w.m.t -side left -fill both -expand 1
3626 pack $w.m -side top -fill both -expand 1 -padx 5 -pady 10
3628 menu $w.ctxm -tearoff 0
3629 $w.ctxm add command -label "Copy" \
3630 -font font_ui \
3631 -command "tk_textCopy $w.m.t"
3632 $w.ctxm add command -label "Select All" \
3633 -font font_ui \
3634 -command "focus $w.m.t;$w.m.t tag add sel 0.0 end"
3635 $w.ctxm add command -label "Copy All" \
3636 -font font_ui \
3637 -command "
3638 $w.m.t tag add sel 0.0 end
3639 tk_textCopy $w.m.t
3640 $w.m.t tag remove sel 0.0 end
3643 button $w.ok -text {Close} \
3644 -font font_ui \
3645 -state disabled \
3646 -command "destroy $w"
3647 pack $w.ok -side bottom -anchor e -pady 10 -padx 10
3649 bind_button3 $w.m.t "tk_popup $w.ctxm %X %Y"
3650 bind $w.m.t <$M1B-Key-a> "$w.m.t tag add sel 0.0 end;break"
3651 bind $w.m.t <$M1B-Key-A> "$w.m.t tag add sel 0.0 end;break"
3652 bind $w <Visibility> "focus $w"
3653 wm title $w "[appname] ([reponame]): [lindex $console_data($w) 0]"
3654 return $w
3657 proc console_exec {w cmd after} {
3658 # -- Cygwin's Tcl tosses the enviroment when we exec our child.
3659 # But most users need that so we have to relogin. :-(
3661 if {[is_Cygwin]} {
3662 set cmd [list sh --login -c "cd \"[pwd]\" && [join $cmd { }]"]
3665 # -- Tcl won't let us redirect both stdout and stderr to
3666 # the same pipe. So pass it through cat...
3668 set cmd [concat | $cmd |& cat]
3670 set fd_f [open $cmd r]
3671 fconfigure $fd_f -blocking 0 -translation binary
3672 fileevent $fd_f readable [list console_read $w $fd_f $after]
3675 proc console_read {w fd after} {
3676 global console_cr
3678 set buf [read $fd]
3679 if {$buf ne {}} {
3680 if {![winfo exists $w]} {console_init $w}
3681 $w.m.t conf -state normal
3682 set c 0
3683 set n [string length $buf]
3684 while {$c < $n} {
3685 set cr [string first "\r" $buf $c]
3686 set lf [string first "\n" $buf $c]
3687 if {$cr < 0} {set cr [expr {$n + 1}]}
3688 if {$lf < 0} {set lf [expr {$n + 1}]}
3690 if {$lf < $cr} {
3691 $w.m.t insert end [string range $buf $c $lf]
3692 set console_cr($w) [$w.m.t index {end -1c}]
3693 set c $lf
3694 incr c
3695 } else {
3696 $w.m.t delete $console_cr($w) end
3697 $w.m.t insert end "\n"
3698 $w.m.t insert end [string range $buf $c $cr]
3699 set c $cr
3700 incr c
3703 $w.m.t conf -state disabled
3704 $w.m.t see end
3707 fconfigure $fd -blocking 1
3708 if {[eof $fd]} {
3709 if {[catch {close $fd}]} {
3710 set ok 0
3711 } else {
3712 set ok 1
3714 uplevel #0 $after $w $ok
3715 return
3717 fconfigure $fd -blocking 0
3720 proc console_chain {cmdlist w {ok 1}} {
3721 if {$ok} {
3722 if {[llength $cmdlist] == 0} {
3723 console_done $w $ok
3724 return
3727 set cmd [lindex $cmdlist 0]
3728 set cmdlist [lrange $cmdlist 1 end]
3730 if {[lindex $cmd 0] eq {console_exec}} {
3731 console_exec $w \
3732 [lindex $cmd 1] \
3733 [list console_chain $cmdlist]
3734 } else {
3735 uplevel #0 $cmd $cmdlist $w $ok
3737 } else {
3738 console_done $w $ok
3742 proc console_done {args} {
3743 global console_cr console_data
3745 switch -- [llength $args] {
3747 set w [lindex $args 0]
3748 set ok [lindex $args 1]
3751 set w [lindex $args 1]
3752 set ok [lindex $args 2]
3754 default {
3755 error "wrong number of args: console_done ?ignored? w ok"
3759 if {$ok} {
3760 if {[winfo exists $w]} {
3761 $w.m.s conf -background green -text {Success}
3762 $w.ok conf -state normal
3764 } else {
3765 if {![winfo exists $w]} {
3766 console_init $w
3768 $w.m.s conf -background red -text {Error: Command Failed}
3769 $w.ok conf -state normal
3772 array unset console_cr $w
3773 array unset console_data $w
3776 ######################################################################
3778 ## ui commands
3780 set starting_gitk_msg {Starting gitk... please wait...}
3782 proc do_gitk {revs} {
3783 global env ui_status_value starting_gitk_msg
3785 # -- On Windows gitk is severly broken, and right now it seems like
3786 # nobody cares about fixing it. The only known workaround is to
3787 # always delete ~/.gitk before starting the program.
3789 if {[is_Windows]} {
3790 catch {file delete [file join $env(HOME) .gitk]}
3793 # -- Always start gitk through whatever we were loaded with. This
3794 # lets us bypass using shell process on Windows systems.
3796 set cmd [info nameofexecutable]
3797 lappend cmd [gitexec gitk]
3798 if {$revs ne {}} {
3799 append cmd { }
3800 append cmd $revs
3803 if {[catch {eval exec $cmd &} err]} {
3804 error_popup "Failed to start gitk:\n\n$err"
3805 } else {
3806 set ui_status_value $starting_gitk_msg
3807 after 10000 {
3808 if {$ui_status_value eq $starting_gitk_msg} {
3809 set ui_status_value {Ready.}
3815 proc do_stats {} {
3816 set fd [open "| git count-objects -v" r]
3817 while {[gets $fd line] > 0} {
3818 if {[regexp {^([^:]+): (\d+)$} $line _ name value]} {
3819 set stats($name) $value
3822 close $fd
3824 set packed_sz 0
3825 foreach p [glob -directory [gitdir objects pack] \
3826 -type f \
3827 -nocomplain -- *] {
3828 incr packed_sz [file size $p]
3830 if {$packed_sz > 0} {
3831 set stats(size-pack) [expr {$packed_sz / 1024}]
3834 set w .stats_view
3835 toplevel $w
3836 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
3838 label $w.header -text {Database Statistics} \
3839 -font font_uibold
3840 pack $w.header -side top -fill x
3842 frame $w.buttons -border 1
3843 button $w.buttons.close -text Close \
3844 -font font_ui \
3845 -command [list destroy $w]
3846 button $w.buttons.gc -text {Compress Database} \
3847 -font font_ui \
3848 -command "destroy $w;do_gc"
3849 pack $w.buttons.close -side right
3850 pack $w.buttons.gc -side left
3851 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
3853 frame $w.stat -borderwidth 1 -relief solid
3854 foreach s {
3855 {count {Number of loose objects}}
3856 {size {Disk space used by loose objects} { KiB}}
3857 {in-pack {Number of packed objects}}
3858 {packs {Number of packs}}
3859 {size-pack {Disk space used by packed objects} { KiB}}
3860 {prune-packable {Packed objects waiting for pruning}}
3861 {garbage {Garbage files}}
3863 set name [lindex $s 0]
3864 set label [lindex $s 1]
3865 if {[catch {set value $stats($name)}]} continue
3866 if {[llength $s] > 2} {
3867 set value "$value[lindex $s 2]"
3870 label $w.stat.l_$name -text "$label:" -anchor w -font font_ui
3871 label $w.stat.v_$name -text $value -anchor w -font font_ui
3872 grid $w.stat.l_$name $w.stat.v_$name -sticky we -padx {0 5}
3874 pack $w.stat -pady 10 -padx 10
3876 bind $w <Visibility> "grab $w; focus $w"
3877 bind $w <Key-Escape> [list destroy $w]
3878 bind $w <Key-Return> [list destroy $w]
3879 wm title $w "[appname] ([reponame]): Database Statistics"
3880 tkwait window $w
3883 proc do_gc {} {
3884 set w [new_console {gc} {Compressing the object database}]
3885 console_chain {
3886 {console_exec {git pack-refs --prune}}
3887 {console_exec {git reflog expire --all}}
3888 {console_exec {git repack -a -d -l}}
3889 {console_exec {git rerere gc}}
3890 } $w
3893 proc do_fsck_objects {} {
3894 set w [new_console {fsck-objects} \
3895 {Verifying the object database with fsck-objects}]
3896 set cmd [list git fsck-objects]
3897 lappend cmd --full
3898 lappend cmd --cache
3899 lappend cmd --strict
3900 console_exec $w $cmd console_done
3903 set is_quitting 0
3905 proc do_quit {} {
3906 global ui_comm is_quitting repo_config commit_type
3908 if {$is_quitting} return
3909 set is_quitting 1
3911 # -- Stash our current commit buffer.
3913 set save [gitdir GITGUI_MSG]
3914 set msg [string trim [$ui_comm get 0.0 end]]
3915 regsub -all -line {[ \r\t]+$} $msg {} msg
3916 if {(![string match amend* $commit_type]
3917 || [$ui_comm edit modified])
3918 && $msg ne {}} {
3919 catch {
3920 set fd [open $save w]
3921 puts -nonewline $fd $msg
3922 close $fd
3924 } else {
3925 catch {file delete $save}
3928 # -- Stash our current window geometry into this repository.
3930 set cfg_geometry [list]
3931 lappend cfg_geometry [wm geometry .]
3932 lappend cfg_geometry [lindex [.vpane sash coord 0] 1]
3933 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0]
3934 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
3935 set rc_geometry {}
3937 if {$cfg_geometry ne $rc_geometry} {
3938 catch {exec git repo-config gui.geometry $cfg_geometry}
3941 destroy .
3944 proc do_rescan {} {
3945 rescan {set ui_status_value {Ready.}}
3948 proc unstage_helper {txt paths} {
3949 global file_states current_diff_path
3951 if {![lock_index begin-update]} return
3953 set pathList [list]
3954 set after {}
3955 foreach path $paths {
3956 switch -glob -- [lindex $file_states($path) 0] {
3957 A? -
3958 M? -
3959 D? {
3960 lappend pathList $path
3961 if {$path eq $current_diff_path} {
3962 set after {reshow_diff;}
3967 if {$pathList eq {}} {
3968 unlock_index
3969 } else {
3970 update_indexinfo \
3971 $txt \
3972 $pathList \
3973 [concat $after {set ui_status_value {Ready.}}]
3977 proc do_unstage_selection {} {
3978 global current_diff_path selected_paths
3980 if {[array size selected_paths] > 0} {
3981 unstage_helper \
3982 {Unstaging selected files from commit} \
3983 [array names selected_paths]
3984 } elseif {$current_diff_path ne {}} {
3985 unstage_helper \
3986 "Unstaging [short_path $current_diff_path] from commit" \
3987 [list $current_diff_path]
3991 proc add_helper {txt paths} {
3992 global file_states current_diff_path
3994 if {![lock_index begin-update]} return
3996 set pathList [list]
3997 set after {}
3998 foreach path $paths {
3999 switch -glob -- [lindex $file_states($path) 0] {
4000 _O -
4001 ?M -
4002 ?D -
4003 U? {
4004 lappend pathList $path
4005 if {$path eq $current_diff_path} {
4006 set after {reshow_diff;}
4011 if {$pathList eq {}} {
4012 unlock_index
4013 } else {
4014 update_index \
4015 $txt \
4016 $pathList \
4017 [concat $after {set ui_status_value {Ready to commit.}}]
4021 proc do_add_selection {} {
4022 global current_diff_path selected_paths
4024 if {[array size selected_paths] > 0} {
4025 add_helper \
4026 {Adding selected files} \
4027 [array names selected_paths]
4028 } elseif {$current_diff_path ne {}} {
4029 add_helper \
4030 "Adding [short_path $current_diff_path]" \
4031 [list $current_diff_path]
4035 proc do_add_all {} {
4036 global file_states
4038 set paths [list]
4039 foreach path [array names file_states] {
4040 switch -glob -- [lindex $file_states($path) 0] {
4041 U? {continue}
4042 ?M -
4043 ?D {lappend paths $path}
4046 add_helper {Adding all changed files} $paths
4049 proc revert_helper {txt paths} {
4050 global file_states current_diff_path
4052 if {![lock_index begin-update]} return
4054 set pathList [list]
4055 set after {}
4056 foreach path $paths {
4057 switch -glob -- [lindex $file_states($path) 0] {
4058 U? {continue}
4059 ?M -
4060 ?D {
4061 lappend pathList $path
4062 if {$path eq $current_diff_path} {
4063 set after {reshow_diff;}
4069 set n [llength $pathList]
4070 if {$n == 0} {
4071 unlock_index
4072 return
4073 } elseif {$n == 1} {
4074 set s "[short_path [lindex $pathList]]"
4075 } else {
4076 set s "these $n files"
4079 set reply [tk_dialog \
4080 .confirm_revert \
4081 "[appname] ([reponame])" \
4082 "Revert changes in $s?
4084 Any unadded changes will be permanently lost by the revert." \
4085 question \
4087 {Do Nothing} \
4088 {Revert Changes} \
4090 if {$reply == 1} {
4091 checkout_index \
4092 $txt \
4093 $pathList \
4094 [concat $after {set ui_status_value {Ready.}}]
4095 } else {
4096 unlock_index
4100 proc do_revert_selection {} {
4101 global current_diff_path selected_paths
4103 if {[array size selected_paths] > 0} {
4104 revert_helper \
4105 {Reverting selected files} \
4106 [array names selected_paths]
4107 } elseif {$current_diff_path ne {}} {
4108 revert_helper \
4109 "Reverting [short_path $current_diff_path]" \
4110 [list $current_diff_path]
4114 proc do_signoff {} {
4115 global ui_comm
4117 set me [committer_ident]
4118 if {$me eq {}} return
4120 set sob "Signed-off-by: $me"
4121 set last [$ui_comm get {end -1c linestart} {end -1c}]
4122 if {$last ne $sob} {
4123 $ui_comm edit separator
4124 if {$last ne {}
4125 && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
4126 $ui_comm insert end "\n"
4128 $ui_comm insert end "\n$sob"
4129 $ui_comm edit separator
4130 $ui_comm see end
4134 proc do_select_commit_type {} {
4135 global commit_type selected_commit_type
4137 if {$selected_commit_type eq {new}
4138 && [string match amend* $commit_type]} {
4139 create_new_commit
4140 } elseif {$selected_commit_type eq {amend}
4141 && ![string match amend* $commit_type]} {
4142 load_last_commit
4144 # The amend request was rejected...
4146 if {![string match amend* $commit_type]} {
4147 set selected_commit_type new
4152 proc do_commit {} {
4153 commit_tree
4156 proc do_about {} {
4157 global appvers copyright
4158 global tcl_patchLevel tk_patchLevel
4160 set w .about_dialog
4161 toplevel $w
4162 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
4164 label $w.header -text "About [appname]" \
4165 -font font_uibold
4166 pack $w.header -side top -fill x
4168 frame $w.buttons
4169 button $w.buttons.close -text {Close} \
4170 -font font_ui \
4171 -command [list destroy $w]
4172 pack $w.buttons.close -side right
4173 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
4175 label $w.desc \
4176 -text "[appname] - a commit creation tool for Git.
4177 $copyright" \
4178 -padx 5 -pady 5 \
4179 -justify left \
4180 -anchor w \
4181 -borderwidth 1 \
4182 -relief solid \
4183 -font font_ui
4184 pack $w.desc -side top -fill x -padx 5 -pady 5
4186 set v {}
4187 append v "[appname] version $appvers\n"
4188 append v "[exec git version]\n"
4189 append v "\n"
4190 if {$tcl_patchLevel eq $tk_patchLevel} {
4191 append v "Tcl/Tk version $tcl_patchLevel"
4192 } else {
4193 append v "Tcl version $tcl_patchLevel"
4194 append v ", Tk version $tk_patchLevel"
4197 label $w.vers \
4198 -text $v \
4199 -padx 5 -pady 5 \
4200 -justify left \
4201 -anchor w \
4202 -borderwidth 1 \
4203 -relief solid \
4204 -font font_ui
4205 pack $w.vers -side top -fill x -padx 5 -pady 5
4207 menu $w.ctxm -tearoff 0
4208 $w.ctxm add command \
4209 -label {Copy} \
4210 -font font_ui \
4211 -command "
4212 clipboard clear
4213 clipboard append -format STRING -type STRING -- \[$w.vers cget -text\]
4216 bind $w <Visibility> "grab $w; focus $w"
4217 bind $w <Key-Escape> "destroy $w"
4218 bind_button3 $w.vers "tk_popup $w.ctxm %X %Y; grab $w; focus $w"
4219 wm title $w "About [appname]"
4220 tkwait window $w
4223 proc do_options {} {
4224 global repo_config global_config font_descs
4225 global repo_config_new global_config_new
4227 array unset repo_config_new
4228 array unset global_config_new
4229 foreach name [array names repo_config] {
4230 set repo_config_new($name) $repo_config($name)
4232 load_config 1
4233 foreach name [array names repo_config] {
4234 switch -- $name {
4235 gui.diffcontext {continue}
4237 set repo_config_new($name) $repo_config($name)
4239 foreach name [array names global_config] {
4240 set global_config_new($name) $global_config($name)
4243 set w .options_editor
4244 toplevel $w
4245 wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
4247 label $w.header -text "[appname] Options" \
4248 -font font_uibold
4249 pack $w.header -side top -fill x
4251 frame $w.buttons
4252 button $w.buttons.restore -text {Restore Defaults} \
4253 -font font_ui \
4254 -command do_restore_defaults
4255 pack $w.buttons.restore -side left
4256 button $w.buttons.save -text Save \
4257 -font font_ui \
4258 -command [list do_save_config $w]
4259 pack $w.buttons.save -side right
4260 button $w.buttons.cancel -text {Cancel} \
4261 -font font_ui \
4262 -command [list destroy $w]
4263 pack $w.buttons.cancel -side right -padx 5
4264 pack $w.buttons -side bottom -fill x -pady 10 -padx 10
4266 labelframe $w.repo -text "[reponame] Repository" \
4267 -font font_ui
4268 labelframe $w.global -text {Global (All Repositories)} \
4269 -font font_ui
4270 pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
4271 pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
4273 set optid 0
4274 foreach option {
4275 {t user.name {User Name}}
4276 {t user.email {Email Address}}
4278 {b merge.summary {Summarize Merge Commits}}
4279 {i-1..5 merge.verbosity {Merge Verbosity}}
4281 {b gui.trustmtime {Trust File Modification Timestamps}}
4282 {i-1..99 gui.diffcontext {Number of Diff Context Lines}}
4283 {t gui.newbranchtemplate {New Branch Name Template}}
4285 set type [lindex $option 0]
4286 set name [lindex $option 1]
4287 set text [lindex $option 2]
4288 incr optid
4289 foreach f {repo global} {
4290 switch -glob -- $type {
4292 checkbutton $w.$f.$optid -text $text \
4293 -variable ${f}_config_new($name) \
4294 -onvalue true \
4295 -offvalue false \
4296 -font font_ui
4297 pack $w.$f.$optid -side top -anchor w
4299 i-* {
4300 regexp -- {-(\d+)\.\.(\d+)$} $type _junk min max
4301 frame $w.$f.$optid
4302 label $w.$f.$optid.l -text "$text:" -font font_ui
4303 pack $w.$f.$optid.l -side left -anchor w -fill x
4304 spinbox $w.$f.$optid.v \
4305 -textvariable ${f}_config_new($name) \
4306 -from $min \
4307 -to $max \
4308 -increment 1 \
4309 -width [expr {1 + [string length $max]}] \
4310 -font font_ui
4311 bind $w.$f.$optid.v <FocusIn> {%W selection range 0 end}
4312 pack $w.$f.$optid.v -side right -anchor e -padx 5
4313 pack $w.$f.$optid -side top -anchor w -fill x
4316 frame $w.$f.$optid
4317 label $w.$f.$optid.l -text "$text:" -font font_ui
4318 entry $w.$f.$optid.v \
4319 -borderwidth 1 \
4320 -relief sunken \
4321 -width 20 \
4322 -textvariable ${f}_config_new($name) \
4323 -font font_ui
4324 pack $w.$f.$optid.l -side left -anchor w
4325 pack $w.$f.$optid.v -side left -anchor w \
4326 -fill x -expand 1 \
4327 -padx 5
4328 pack $w.$f.$optid -side top -anchor w -fill x
4334 set all_fonts [lsort [font families]]
4335 foreach option $font_descs {
4336 set name [lindex $option 0]
4337 set font [lindex $option 1]
4338 set text [lindex $option 2]
4340 set global_config_new(gui.$font^^family) \
4341 [font configure $font -family]
4342 set global_config_new(gui.$font^^size) \
4343 [font configure $font -size]
4345 frame $w.global.$name
4346 label $w.global.$name.l -text "$text:" -font font_ui
4347 pack $w.global.$name.l -side left -anchor w -fill x
4348 eval tk_optionMenu $w.global.$name.family \
4349 global_config_new(gui.$font^^family) \
4350 $all_fonts
4351 spinbox $w.global.$name.size \
4352 -textvariable global_config_new(gui.$font^^size) \
4353 -from 2 -to 80 -increment 1 \
4354 -width 3 \
4355 -font font_ui
4356 bind $w.global.$name.size <FocusIn> {%W selection range 0 end}
4357 pack $w.global.$name.size -side right -anchor e
4358 pack $w.global.$name.family -side right -anchor e
4359 pack $w.global.$name -side top -anchor w -fill x
4362 bind $w <Visibility> "grab $w; focus $w"
4363 bind $w <Key-Escape> "destroy $w"
4364 wm title $w "[appname] ([reponame]): Options"
4365 tkwait window $w
4368 proc do_restore_defaults {} {
4369 global font_descs default_config repo_config
4370 global repo_config_new global_config_new
4372 foreach name [array names default_config] {
4373 set repo_config_new($name) $default_config($name)
4374 set global_config_new($name) $default_config($name)
4377 foreach option $font_descs {
4378 set name [lindex $option 0]
4379 set repo_config(gui.$name) $default_config(gui.$name)
4381 apply_config
4383 foreach option $font_descs {
4384 set name [lindex $option 0]
4385 set font [lindex $option 1]
4386 set global_config_new(gui.$font^^family) \
4387 [font configure $font -family]
4388 set global_config_new(gui.$font^^size) \
4389 [font configure $font -size]
4393 proc do_save_config {w} {
4394 if {[catch {save_config} err]} {
4395 error_popup "Failed to completely save options:\n\n$err"
4397 reshow_diff
4398 destroy $w
4401 proc do_windows_shortcut {} {
4402 global argv0
4404 set fn [tk_getSaveFile \
4405 -parent . \
4406 -title "[appname] ([reponame]): Create Desktop Icon" \
4407 -initialfile "Git [reponame].bat"]
4408 if {$fn != {}} {
4409 if {[catch {
4410 set fd [open $fn w]
4411 puts $fd "@ECHO Entering [reponame]"
4412 puts $fd "@ECHO Starting git-gui... please wait..."
4413 puts $fd "@SET PATH=[file normalize [gitexec]];%PATH%"
4414 puts $fd "@SET GIT_DIR=[file normalize [gitdir]]"
4415 puts -nonewline $fd "@\"[info nameofexecutable]\""
4416 puts $fd " \"[file normalize $argv0]\""
4417 close $fd
4418 } err]} {
4419 error_popup "Cannot write script:\n\n$err"
4424 proc do_cygwin_shortcut {} {
4425 global argv0
4427 if {[catch {
4428 set desktop [exec cygpath \
4429 --windows \
4430 --absolute \
4431 --long-name \
4432 --desktop]
4433 }]} {
4434 set desktop .
4436 set fn [tk_getSaveFile \
4437 -parent . \
4438 -title "[appname] ([reponame]): Create Desktop Icon" \
4439 -initialdir $desktop \
4440 -initialfile "Git [reponame].bat"]
4441 if {$fn != {}} {
4442 if {[catch {
4443 set fd [open $fn w]
4444 set sh [exec cygpath \
4445 --windows \
4446 --absolute \
4447 /bin/sh]
4448 set me [exec cygpath \
4449 --unix \
4450 --absolute \
4451 $argv0]
4452 set gd [exec cygpath \
4453 --unix \
4454 --absolute \
4455 [gitdir]]
4456 set gw [exec cygpath \
4457 --windows \
4458 --absolute \
4459 [file dirname [gitdir]]]
4460 regsub -all ' $me "'\\''" me
4461 regsub -all ' $gd "'\\''" gd
4462 puts $fd "@ECHO Entering $gw"
4463 puts $fd "@ECHO Starting git-gui... please wait..."
4464 puts -nonewline $fd "@\"$sh\" --login -c \""
4465 puts -nonewline $fd "GIT_DIR='$gd'"
4466 puts -nonewline $fd " '$me'"
4467 puts $fd "&\""
4468 close $fd
4469 } err]} {
4470 error_popup "Cannot write script:\n\n$err"
4475 proc do_macosx_app {} {
4476 global argv0 env
4478 set fn [tk_getSaveFile \
4479 -parent . \
4480 -title "[appname] ([reponame]): Create Desktop Icon" \
4481 -initialdir [file join $env(HOME) Desktop] \
4482 -initialfile "Git [reponame].app"]
4483 if {$fn != {}} {
4484 if {[catch {
4485 set Contents [file join $fn Contents]
4486 set MacOS [file join $Contents MacOS]
4487 set exe [file join $MacOS git-gui]
4489 file mkdir $MacOS
4491 set fd [open [file join $Contents Info.plist] w]
4492 puts $fd {<?xml version="1.0" encoding="UTF-8"?>
4493 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
4494 <plist version="1.0">
4495 <dict>
4496 <key>CFBundleDevelopmentRegion</key>
4497 <string>English</string>
4498 <key>CFBundleExecutable</key>
4499 <string>git-gui</string>
4500 <key>CFBundleIdentifier</key>
4501 <string>org.spearce.git-gui</string>
4502 <key>CFBundleInfoDictionaryVersion</key>
4503 <string>6.0</string>
4504 <key>CFBundlePackageType</key>
4505 <string>APPL</string>
4506 <key>CFBundleSignature</key>
4507 <string>????</string>
4508 <key>CFBundleVersion</key>
4509 <string>1.0</string>
4510 <key>NSPrincipalClass</key>
4511 <string>NSApplication</string>
4512 </dict>
4513 </plist>}
4514 close $fd
4516 set fd [open $exe w]
4517 set gd [file normalize [gitdir]]
4518 set ep [file normalize [gitexec]]
4519 regsub -all ' $gd "'\\''" gd
4520 regsub -all ' $ep "'\\''" ep
4521 puts $fd "#!/bin/sh"
4522 foreach name [array names env] {
4523 if {[string match GIT_* $name]} {
4524 regsub -all ' $env($name) "'\\''" v
4525 puts $fd "export $name='$v'"
4528 puts $fd "export PATH='$ep':\$PATH"
4529 puts $fd "export GIT_DIR='$gd'"
4530 puts $fd "exec [file normalize $argv0]"
4531 close $fd
4533 file attributes $exe -permissions u+x,g+x,o+x
4534 } err]} {
4535 error_popup "Cannot write icon:\n\n$err"
4540 proc toggle_or_diff {w x y} {
4541 global file_states file_lists current_diff_path ui_index ui_workdir
4542 global last_clicked selected_paths
4544 set pos [split [$w index @$x,$y] .]
4545 set lno [lindex $pos 0]
4546 set col [lindex $pos 1]
4547 set path [lindex $file_lists($w) [expr {$lno - 1}]]
4548 if {$path eq {}} {
4549 set last_clicked {}
4550 return
4553 set last_clicked [list $w $lno]
4554 array unset selected_paths
4555 $ui_index tag remove in_sel 0.0 end
4556 $ui_workdir tag remove in_sel 0.0 end
4558 if {$col == 0} {
4559 if {$current_diff_path eq $path} {
4560 set after {reshow_diff;}
4561 } else {
4562 set after {}
4564 if {$w eq $ui_index} {
4565 update_indexinfo \
4566 "Unstaging [short_path $path] from commit" \
4567 [list $path] \
4568 [concat $after {set ui_status_value {Ready.}}]
4569 } elseif {$w eq $ui_workdir} {
4570 update_index \
4571 "Adding [short_path $path]" \
4572 [list $path] \
4573 [concat $after {set ui_status_value {Ready.}}]
4575 } else {
4576 show_diff $path $w $lno
4580 proc add_one_to_selection {w x y} {
4581 global file_lists last_clicked selected_paths
4583 set lno [lindex [split [$w index @$x,$y] .] 0]
4584 set path [lindex $file_lists($w) [expr {$lno - 1}]]
4585 if {$path eq {}} {
4586 set last_clicked {}
4587 return
4590 if {$last_clicked ne {}
4591 && [lindex $last_clicked 0] ne $w} {
4592 array unset selected_paths
4593 [lindex $last_clicked 0] tag remove in_sel 0.0 end
4596 set last_clicked [list $w $lno]
4597 if {[catch {set in_sel $selected_paths($path)}]} {
4598 set in_sel 0
4600 if {$in_sel} {
4601 unset selected_paths($path)
4602 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
4603 } else {
4604 set selected_paths($path) 1
4605 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
4609 proc add_range_to_selection {w x y} {
4610 global file_lists last_clicked selected_paths
4612 if {[lindex $last_clicked 0] ne $w} {
4613 toggle_or_diff $w $x $y
4614 return
4617 set lno [lindex [split [$w index @$x,$y] .] 0]
4618 set lc [lindex $last_clicked 1]
4619 if {$lc < $lno} {
4620 set begin $lc
4621 set end $lno
4622 } else {
4623 set begin $lno
4624 set end $lc
4627 foreach path [lrange $file_lists($w) \
4628 [expr {$begin - 1}] \
4629 [expr {$end - 1}]] {
4630 set selected_paths($path) 1
4632 $w tag add in_sel $begin.0 [expr {$end + 1}].0
4635 ######################################################################
4637 ## config defaults
4639 set cursor_ptr arrow
4640 font create font_diff -family Courier -size 10
4641 font create font_ui
4642 catch {
4643 label .dummy
4644 eval font configure font_ui [font actual [.dummy cget -font]]
4645 destroy .dummy
4648 font create font_uibold
4649 font create font_diffbold
4651 if {[is_Windows]} {
4652 set M1B Control
4653 set M1T Ctrl
4654 } elseif {[is_MacOSX]} {
4655 set M1B M1
4656 set M1T Cmd
4657 } else {
4658 set M1B M1
4659 set M1T M1
4662 proc apply_config {} {
4663 global repo_config font_descs
4665 foreach option $font_descs {
4666 set name [lindex $option 0]
4667 set font [lindex $option 1]
4668 if {[catch {
4669 foreach {cn cv} $repo_config(gui.$name) {
4670 font configure $font $cn $cv
4672 } err]} {
4673 error_popup "Invalid font specified in gui.$name:\n\n$err"
4675 foreach {cn cv} [font configure $font] {
4676 font configure ${font}bold $cn $cv
4678 font configure ${font}bold -weight bold
4682 set default_config(merge.summary) false
4683 set default_config(merge.verbosity) 2
4684 set default_config(user.name) {}
4685 set default_config(user.email) {}
4687 set default_config(gui.trustmtime) false
4688 set default_config(gui.diffcontext) 5
4689 set default_config(gui.newbranchtemplate) {}
4690 set default_config(gui.fontui) [font configure font_ui]
4691 set default_config(gui.fontdiff) [font configure font_diff]
4692 set font_descs {
4693 {fontui font_ui {Main Font}}
4694 {fontdiff font_diff {Diff/Console Font}}
4696 load_config 0
4697 apply_config
4699 ######################################################################
4701 ## ui construction
4703 # -- Menu Bar
4705 menu .mbar -tearoff 0
4706 .mbar add cascade -label Repository -menu .mbar.repository
4707 .mbar add cascade -label Edit -menu .mbar.edit
4708 if {!$single_commit} {
4709 .mbar add cascade -label Branch -menu .mbar.branch
4711 .mbar add cascade -label Commit -menu .mbar.commit
4712 if {!$single_commit} {
4713 .mbar add cascade -label Merge -menu .mbar.merge
4714 .mbar add cascade -label Fetch -menu .mbar.fetch
4715 .mbar add cascade -label Push -menu .mbar.push
4717 . configure -menu .mbar
4719 # -- Repository Menu
4721 menu .mbar.repository
4723 .mbar.repository add command \
4724 -label {Browse Current Branch} \
4725 -command {new_browser $current_branch} \
4726 -font font_ui
4727 .mbar.repository add separator
4729 .mbar.repository add command \
4730 -label {Visualize Current Branch} \
4731 -command {do_gitk {}} \
4732 -font font_ui
4733 .mbar.repository add command \
4734 -label {Visualize All Branches} \
4735 -command {do_gitk {--all}} \
4736 -font font_ui
4737 .mbar.repository add separator
4739 if {!$single_commit} {
4740 .mbar.repository add command -label {Database Statistics} \
4741 -command do_stats \
4742 -font font_ui
4744 .mbar.repository add command -label {Compress Database} \
4745 -command do_gc \
4746 -font font_ui
4748 .mbar.repository add command -label {Verify Database} \
4749 -command do_fsck_objects \
4750 -font font_ui
4752 .mbar.repository add separator
4754 if {[is_Cygwin]} {
4755 .mbar.repository add command \
4756 -label {Create Desktop Icon} \
4757 -command do_cygwin_shortcut \
4758 -font font_ui
4759 } elseif {[is_Windows]} {
4760 .mbar.repository add command \
4761 -label {Create Desktop Icon} \
4762 -command do_windows_shortcut \
4763 -font font_ui
4764 } elseif {[is_MacOSX]} {
4765 .mbar.repository add command \
4766 -label {Create Desktop Icon} \
4767 -command do_macosx_app \
4768 -font font_ui
4772 .mbar.repository add command -label Quit \
4773 -command do_quit \
4774 -accelerator $M1T-Q \
4775 -font font_ui
4777 # -- Edit Menu
4779 menu .mbar.edit
4780 .mbar.edit add command -label Undo \
4781 -command {catch {[focus] edit undo}} \
4782 -accelerator $M1T-Z \
4783 -font font_ui
4784 .mbar.edit add command -label Redo \
4785 -command {catch {[focus] edit redo}} \
4786 -accelerator $M1T-Y \
4787 -font font_ui
4788 .mbar.edit add separator
4789 .mbar.edit add command -label Cut \
4790 -command {catch {tk_textCut [focus]}} \
4791 -accelerator $M1T-X \
4792 -font font_ui
4793 .mbar.edit add command -label Copy \
4794 -command {catch {tk_textCopy [focus]}} \
4795 -accelerator $M1T-C \
4796 -font font_ui
4797 .mbar.edit add command -label Paste \
4798 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
4799 -accelerator $M1T-V \
4800 -font font_ui
4801 .mbar.edit add command -label Delete \
4802 -command {catch {[focus] delete sel.first sel.last}} \
4803 -accelerator Del \
4804 -font font_ui
4805 .mbar.edit add separator
4806 .mbar.edit add command -label {Select All} \
4807 -command {catch {[focus] tag add sel 0.0 end}} \
4808 -accelerator $M1T-A \
4809 -font font_ui
4811 # -- Branch Menu
4813 if {!$single_commit} {
4814 menu .mbar.branch
4816 .mbar.branch add command -label {Create...} \
4817 -command do_create_branch \
4818 -accelerator $M1T-N \
4819 -font font_ui
4820 lappend disable_on_lock [list .mbar.branch entryconf \
4821 [.mbar.branch index last] -state]
4823 .mbar.branch add command -label {Delete...} \
4824 -command do_delete_branch \
4825 -font font_ui
4826 lappend disable_on_lock [list .mbar.branch entryconf \
4827 [.mbar.branch index last] -state]
4830 # -- Commit Menu
4832 menu .mbar.commit
4834 .mbar.commit add radiobutton \
4835 -label {New Commit} \
4836 -command do_select_commit_type \
4837 -variable selected_commit_type \
4838 -value new \
4839 -font font_ui
4840 lappend disable_on_lock \
4841 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4843 .mbar.commit add radiobutton \
4844 -label {Amend Last Commit} \
4845 -command do_select_commit_type \
4846 -variable selected_commit_type \
4847 -value amend \
4848 -font font_ui
4849 lappend disable_on_lock \
4850 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4852 .mbar.commit add separator
4854 .mbar.commit add command -label Rescan \
4855 -command do_rescan \
4856 -accelerator F5 \
4857 -font font_ui
4858 lappend disable_on_lock \
4859 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4861 .mbar.commit add command -label {Add To Commit} \
4862 -command do_add_selection \
4863 -font font_ui
4864 lappend disable_on_lock \
4865 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4867 .mbar.commit add command -label {Add All To Commit} \
4868 -command do_add_all \
4869 -accelerator $M1T-I \
4870 -font font_ui
4871 lappend disable_on_lock \
4872 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4874 .mbar.commit add command -label {Unstage From Commit} \
4875 -command do_unstage_selection \
4876 -font font_ui
4877 lappend disable_on_lock \
4878 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4880 .mbar.commit add command -label {Revert Changes} \
4881 -command do_revert_selection \
4882 -font font_ui
4883 lappend disable_on_lock \
4884 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4886 .mbar.commit add separator
4888 .mbar.commit add command -label {Sign Off} \
4889 -command do_signoff \
4890 -accelerator $M1T-S \
4891 -font font_ui
4893 .mbar.commit add command -label Commit \
4894 -command do_commit \
4895 -accelerator $M1T-Return \
4896 -font font_ui
4897 lappend disable_on_lock \
4898 [list .mbar.commit entryconf [.mbar.commit index last] -state]
4900 if {[is_MacOSX]} {
4901 # -- Apple Menu (Mac OS X only)
4903 .mbar add cascade -label Apple -menu .mbar.apple
4904 menu .mbar.apple
4906 .mbar.apple add command -label "About [appname]" \
4907 -command do_about \
4908 -font font_ui
4909 .mbar.apple add command -label "[appname] Options..." \
4910 -command do_options \
4911 -font font_ui
4912 } else {
4913 # -- Edit Menu
4915 .mbar.edit add separator
4916 .mbar.edit add command -label {Options...} \
4917 -command do_options \
4918 -font font_ui
4920 # -- Tools Menu
4922 if {[file exists /usr/local/miga/lib/gui-miga]
4923 && [file exists .pvcsrc]} {
4924 proc do_miga {} {
4925 global ui_status_value
4926 if {![lock_index update]} return
4927 set cmd [list sh --login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
4928 set miga_fd [open "|$cmd" r]
4929 fconfigure $miga_fd -blocking 0
4930 fileevent $miga_fd readable [list miga_done $miga_fd]
4931 set ui_status_value {Running miga...}
4933 proc miga_done {fd} {
4934 read $fd 512
4935 if {[eof $fd]} {
4936 close $fd
4937 unlock_index
4938 rescan [list set ui_status_value {Ready.}]
4941 .mbar add cascade -label Tools -menu .mbar.tools
4942 menu .mbar.tools
4943 .mbar.tools add command -label "Migrate" \
4944 -command do_miga \
4945 -font font_ui
4946 lappend disable_on_lock \
4947 [list .mbar.tools entryconf [.mbar.tools index last] -state]
4951 # -- Help Menu
4953 .mbar add cascade -label Help -menu .mbar.help
4954 menu .mbar.help
4956 if {![is_MacOSX]} {
4957 .mbar.help add command -label "About [appname]" \
4958 -command do_about \
4959 -font font_ui
4962 set browser {}
4963 catch {set browser $repo_config(instaweb.browser)}
4964 set doc_path [file dirname [gitexec]]
4965 set doc_path [file join $doc_path Documentation index.html]
4967 if {[is_Cygwin]} {
4968 set doc_path [exec cygpath --windows $doc_path]
4971 if {$browser eq {}} {
4972 if {[is_MacOSX]} {
4973 set browser open
4974 } elseif {[is_Cygwin]} {
4975 set program_files [file dirname [exec cygpath --windir]]
4976 set program_files [file join $program_files {Program Files}]
4977 set firefox [file join $program_files {Mozilla Firefox} firefox.exe]
4978 set ie [file join $program_files {Internet Explorer} IEXPLORE.EXE]
4979 if {[file exists $firefox]} {
4980 set browser $firefox
4981 } elseif {[file exists $ie]} {
4982 set browser $ie
4984 unset program_files firefox ie
4988 if {[file isfile $doc_path]} {
4989 set doc_url "file:$doc_path"
4990 } else {
4991 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
4994 if {$browser ne {}} {
4995 .mbar.help add command -label {Online Documentation} \
4996 -command [list exec $browser $doc_url &] \
4997 -font font_ui
4999 unset browser doc_path doc_url
5001 # -- Branch Control
5003 frame .branch \
5004 -borderwidth 1 \
5005 -relief sunken
5006 label .branch.l1 \
5007 -text {Current Branch:} \
5008 -anchor w \
5009 -justify left \
5010 -font font_ui
5011 label .branch.cb \
5012 -textvariable current_branch \
5013 -anchor w \
5014 -justify left \
5015 -font font_ui
5016 pack .branch.l1 -side left
5017 pack .branch.cb -side left -fill x
5018 pack .branch -side top -fill x
5020 if {!$single_commit} {
5021 menu .mbar.merge
5022 .mbar.merge add command -label {Local Merge...} \
5023 -command do_local_merge \
5024 -font font_ui
5025 lappend disable_on_lock \
5026 [list .mbar.merge entryconf [.mbar.merge index last] -state]
5027 .mbar.merge add command -label {Abort Merge...} \
5028 -command do_reset_hard \
5029 -font font_ui
5030 lappend disable_on_lock \
5031 [list .mbar.merge entryconf [.mbar.merge index last] -state]
5034 menu .mbar.fetch
5036 menu .mbar.push
5037 .mbar.push add command -label {Push...} \
5038 -command do_push_anywhere \
5039 -font font_ui
5042 # -- Main Window Layout
5044 panedwindow .vpane -orient vertical
5045 panedwindow .vpane.files -orient horizontal
5046 .vpane add .vpane.files -sticky nsew -height 100 -width 200
5047 pack .vpane -anchor n -side top -fill both -expand 1
5049 # -- Index File List
5051 frame .vpane.files.index -height 100 -width 200
5052 label .vpane.files.index.title -text {Changes To Be Committed} \
5053 -background green \
5054 -font font_ui
5055 text $ui_index -background white -borderwidth 0 \
5056 -width 20 -height 10 \
5057 -wrap none \
5058 -font font_ui \
5059 -cursor $cursor_ptr \
5060 -xscrollcommand {.vpane.files.index.sx set} \
5061 -yscrollcommand {.vpane.files.index.sy set} \
5062 -state disabled
5063 scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
5064 scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
5065 pack .vpane.files.index.title -side top -fill x
5066 pack .vpane.files.index.sx -side bottom -fill x
5067 pack .vpane.files.index.sy -side right -fill y
5068 pack $ui_index -side left -fill both -expand 1
5069 .vpane.files add .vpane.files.index -sticky nsew
5071 # -- Working Directory File List
5073 frame .vpane.files.workdir -height 100 -width 200
5074 label .vpane.files.workdir.title -text {Changed But Not Updated} \
5075 -background red \
5076 -font font_ui
5077 text $ui_workdir -background white -borderwidth 0 \
5078 -width 20 -height 10 \
5079 -wrap none \
5080 -font font_ui \
5081 -cursor $cursor_ptr \
5082 -xscrollcommand {.vpane.files.workdir.sx set} \
5083 -yscrollcommand {.vpane.files.workdir.sy set} \
5084 -state disabled
5085 scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
5086 scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
5087 pack .vpane.files.workdir.title -side top -fill x
5088 pack .vpane.files.workdir.sx -side bottom -fill x
5089 pack .vpane.files.workdir.sy -side right -fill y
5090 pack $ui_workdir -side left -fill both -expand 1
5091 .vpane.files add .vpane.files.workdir -sticky nsew
5093 foreach i [list $ui_index $ui_workdir] {
5094 $i tag conf in_diff -font font_uibold
5095 $i tag conf in_sel \
5096 -background [$i cget -foreground] \
5097 -foreground [$i cget -background]
5099 unset i
5101 # -- Diff and Commit Area
5103 frame .vpane.lower -height 300 -width 400
5104 frame .vpane.lower.commarea
5105 frame .vpane.lower.diff -relief sunken -borderwidth 1
5106 pack .vpane.lower.commarea -side top -fill x
5107 pack .vpane.lower.diff -side bottom -fill both -expand 1
5108 .vpane add .vpane.lower -sticky nsew
5110 # -- Commit Area Buttons
5112 frame .vpane.lower.commarea.buttons
5113 label .vpane.lower.commarea.buttons.l -text {} \
5114 -anchor w \
5115 -justify left \
5116 -font font_ui
5117 pack .vpane.lower.commarea.buttons.l -side top -fill x
5118 pack .vpane.lower.commarea.buttons -side left -fill y
5120 button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
5121 -command do_rescan \
5122 -font font_ui
5123 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
5124 lappend disable_on_lock \
5125 {.vpane.lower.commarea.buttons.rescan conf -state}
5127 button .vpane.lower.commarea.buttons.incall -text {Add All} \
5128 -command do_add_all \
5129 -font font_ui
5130 pack .vpane.lower.commarea.buttons.incall -side top -fill x
5131 lappend disable_on_lock \
5132 {.vpane.lower.commarea.buttons.incall conf -state}
5134 button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
5135 -command do_signoff \
5136 -font font_ui
5137 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
5139 button .vpane.lower.commarea.buttons.commit -text {Commit} \
5140 -command do_commit \
5141 -font font_ui
5142 pack .vpane.lower.commarea.buttons.commit -side top -fill x
5143 lappend disable_on_lock \
5144 {.vpane.lower.commarea.buttons.commit conf -state}
5146 # -- Commit Message Buffer
5148 frame .vpane.lower.commarea.buffer
5149 frame .vpane.lower.commarea.buffer.header
5150 set ui_comm .vpane.lower.commarea.buffer.t
5151 set ui_coml .vpane.lower.commarea.buffer.header.l
5152 radiobutton .vpane.lower.commarea.buffer.header.new \
5153 -text {New Commit} \
5154 -command do_select_commit_type \
5155 -variable selected_commit_type \
5156 -value new \
5157 -font font_ui
5158 lappend disable_on_lock \
5159 [list .vpane.lower.commarea.buffer.header.new conf -state]
5160 radiobutton .vpane.lower.commarea.buffer.header.amend \
5161 -text {Amend Last Commit} \
5162 -command do_select_commit_type \
5163 -variable selected_commit_type \
5164 -value amend \
5165 -font font_ui
5166 lappend disable_on_lock \
5167 [list .vpane.lower.commarea.buffer.header.amend conf -state]
5168 label $ui_coml \
5169 -anchor w \
5170 -justify left \
5171 -font font_ui
5172 proc trace_commit_type {varname args} {
5173 global ui_coml commit_type
5174 switch -glob -- $commit_type {
5175 initial {set txt {Initial Commit Message:}}
5176 amend {set txt {Amended Commit Message:}}
5177 amend-initial {set txt {Amended Initial Commit Message:}}
5178 amend-merge {set txt {Amended Merge Commit Message:}}
5179 merge {set txt {Merge Commit Message:}}
5180 * {set txt {Commit Message:}}
5182 $ui_coml conf -text $txt
5184 trace add variable commit_type write trace_commit_type
5185 pack $ui_coml -side left -fill x
5186 pack .vpane.lower.commarea.buffer.header.amend -side right
5187 pack .vpane.lower.commarea.buffer.header.new -side right
5189 text $ui_comm -background white -borderwidth 1 \
5190 -undo true \
5191 -maxundo 20 \
5192 -autoseparators true \
5193 -relief sunken \
5194 -width 75 -height 9 -wrap none \
5195 -font font_diff \
5196 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
5197 scrollbar .vpane.lower.commarea.buffer.sby \
5198 -command [list $ui_comm yview]
5199 pack .vpane.lower.commarea.buffer.header -side top -fill x
5200 pack .vpane.lower.commarea.buffer.sby -side right -fill y
5201 pack $ui_comm -side left -fill y
5202 pack .vpane.lower.commarea.buffer -side left -fill y
5204 # -- Commit Message Buffer Context Menu
5206 set ctxm .vpane.lower.commarea.buffer.ctxm
5207 menu $ctxm -tearoff 0
5208 $ctxm add command \
5209 -label {Cut} \
5210 -font font_ui \
5211 -command {tk_textCut $ui_comm}
5212 $ctxm add command \
5213 -label {Copy} \
5214 -font font_ui \
5215 -command {tk_textCopy $ui_comm}
5216 $ctxm add command \
5217 -label {Paste} \
5218 -font font_ui \
5219 -command {tk_textPaste $ui_comm}
5220 $ctxm add command \
5221 -label {Delete} \
5222 -font font_ui \
5223 -command {$ui_comm delete sel.first sel.last}
5224 $ctxm add separator
5225 $ctxm add command \
5226 -label {Select All} \
5227 -font font_ui \
5228 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
5229 $ctxm add command \
5230 -label {Copy All} \
5231 -font font_ui \
5232 -command {
5233 $ui_comm tag add sel 0.0 end
5234 tk_textCopy $ui_comm
5235 $ui_comm tag remove sel 0.0 end
5237 $ctxm add separator
5238 $ctxm add command \
5239 -label {Sign Off} \
5240 -font font_ui \
5241 -command do_signoff
5242 bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
5244 # -- Diff Header
5246 set current_diff_path {}
5247 set current_diff_side {}
5248 set diff_actions [list]
5249 proc trace_current_diff_path {varname args} {
5250 global current_diff_path diff_actions file_states
5251 if {$current_diff_path eq {}} {
5252 set s {}
5253 set f {}
5254 set p {}
5255 set o disabled
5256 } else {
5257 set p $current_diff_path
5258 set s [mapdesc [lindex $file_states($p) 0] $p]
5259 set f {File:}
5260 set p [escape_path $p]
5261 set o normal
5264 .vpane.lower.diff.header.status configure -text $s
5265 .vpane.lower.diff.header.file configure -text $f
5266 .vpane.lower.diff.header.path configure -text $p
5267 foreach w $diff_actions {
5268 uplevel #0 $w $o
5271 trace add variable current_diff_path write trace_current_diff_path
5273 frame .vpane.lower.diff.header -background orange
5274 label .vpane.lower.diff.header.status \
5275 -background orange \
5276 -width $max_status_desc \
5277 -anchor w \
5278 -justify left \
5279 -font font_ui
5280 label .vpane.lower.diff.header.file \
5281 -background orange \
5282 -anchor w \
5283 -justify left \
5284 -font font_ui
5285 label .vpane.lower.diff.header.path \
5286 -background orange \
5287 -anchor w \
5288 -justify left \
5289 -font font_ui
5290 pack .vpane.lower.diff.header.status -side left
5291 pack .vpane.lower.diff.header.file -side left
5292 pack .vpane.lower.diff.header.path -fill x
5293 set ctxm .vpane.lower.diff.header.ctxm
5294 menu $ctxm -tearoff 0
5295 $ctxm add command \
5296 -label {Copy} \
5297 -font font_ui \
5298 -command {
5299 clipboard clear
5300 clipboard append \
5301 -format STRING \
5302 -type STRING \
5303 -- $current_diff_path
5305 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5306 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
5308 # -- Diff Body
5310 frame .vpane.lower.diff.body
5311 set ui_diff .vpane.lower.diff.body.t
5312 text $ui_diff -background white -borderwidth 0 \
5313 -width 80 -height 15 -wrap none \
5314 -font font_diff \
5315 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
5316 -yscrollcommand {.vpane.lower.diff.body.sby set} \
5317 -state disabled
5318 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
5319 -command [list $ui_diff xview]
5320 scrollbar .vpane.lower.diff.body.sby -orient vertical \
5321 -command [list $ui_diff yview]
5322 pack .vpane.lower.diff.body.sbx -side bottom -fill x
5323 pack .vpane.lower.diff.body.sby -side right -fill y
5324 pack $ui_diff -side left -fill both -expand 1
5325 pack .vpane.lower.diff.header -side top -fill x
5326 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
5328 $ui_diff tag conf d_cr -elide true
5329 $ui_diff tag conf d_@ -foreground blue -font font_diffbold
5330 $ui_diff tag conf d_+ -foreground {#00a000}
5331 $ui_diff tag conf d_- -foreground red
5333 $ui_diff tag conf d_++ -foreground {#00a000}
5334 $ui_diff tag conf d_-- -foreground red
5335 $ui_diff tag conf d_+s \
5336 -foreground {#00a000} \
5337 -background {#e2effa}
5338 $ui_diff tag conf d_-s \
5339 -foreground red \
5340 -background {#e2effa}
5341 $ui_diff tag conf d_s+ \
5342 -foreground {#00a000} \
5343 -background ivory1
5344 $ui_diff tag conf d_s- \
5345 -foreground red \
5346 -background ivory1
5348 $ui_diff tag conf d<<<<<<< \
5349 -foreground orange \
5350 -font font_diffbold
5351 $ui_diff tag conf d======= \
5352 -foreground orange \
5353 -font font_diffbold
5354 $ui_diff tag conf d>>>>>>> \
5355 -foreground orange \
5356 -font font_diffbold
5358 $ui_diff tag raise sel
5360 # -- Diff Body Context Menu
5362 set ctxm .vpane.lower.diff.body.ctxm
5363 menu $ctxm -tearoff 0
5364 $ctxm add command \
5365 -label {Refresh} \
5366 -font font_ui \
5367 -command reshow_diff
5368 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5369 $ctxm add command \
5370 -label {Copy} \
5371 -font font_ui \
5372 -command {tk_textCopy $ui_diff}
5373 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5374 $ctxm add command \
5375 -label {Select All} \
5376 -font font_ui \
5377 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
5378 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5379 $ctxm add command \
5380 -label {Copy All} \
5381 -font font_ui \
5382 -command {
5383 $ui_diff tag add sel 0.0 end
5384 tk_textCopy $ui_diff
5385 $ui_diff tag remove sel 0.0 end
5387 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5388 $ctxm add separator
5389 $ctxm add command \
5390 -label {Apply/Reverse Hunk} \
5391 -font font_ui \
5392 -command {apply_hunk $cursorX $cursorY}
5393 set ui_diff_applyhunk [$ctxm index last]
5394 lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
5395 $ctxm add separator
5396 $ctxm add command \
5397 -label {Decrease Font Size} \
5398 -font font_ui \
5399 -command {incr_font_size font_diff -1}
5400 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5401 $ctxm add command \
5402 -label {Increase Font Size} \
5403 -font font_ui \
5404 -command {incr_font_size font_diff 1}
5405 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5406 $ctxm add separator
5407 $ctxm add command \
5408 -label {Show Less Context} \
5409 -font font_ui \
5410 -command {if {$repo_config(gui.diffcontext) >= 2} {
5411 incr repo_config(gui.diffcontext) -1
5412 reshow_diff
5414 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5415 $ctxm add command \
5416 -label {Show More Context} \
5417 -font font_ui \
5418 -command {
5419 incr repo_config(gui.diffcontext)
5420 reshow_diff
5422 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
5423 $ctxm add separator
5424 $ctxm add command -label {Options...} \
5425 -font font_ui \
5426 -command do_options
5427 bind_button3 $ui_diff "
5428 set cursorX %x
5429 set cursorY %y
5430 if {\$ui_index eq \$current_diff_side} {
5431 $ctxm entryconf $ui_diff_applyhunk -label {Unstage Hunk From Commit}
5432 } else {
5433 $ctxm entryconf $ui_diff_applyhunk -label {Stage Hunk For Commit}
5435 tk_popup $ctxm %X %Y
5437 unset ui_diff_applyhunk
5439 # -- Status Bar
5441 set ui_status_value {Initializing...}
5442 label .status -textvariable ui_status_value \
5443 -anchor w \
5444 -justify left \
5445 -borderwidth 1 \
5446 -relief sunken \
5447 -font font_ui
5448 pack .status -anchor w -side bottom -fill x
5450 # -- Load geometry
5452 catch {
5453 set gm $repo_config(gui.geometry)
5454 wm geometry . [lindex $gm 0]
5455 .vpane sash place 0 \
5456 [lindex [.vpane sash coord 0] 0] \
5457 [lindex $gm 1]
5458 .vpane.files sash place 0 \
5459 [lindex $gm 2] \
5460 [lindex [.vpane.files sash coord 0] 1]
5461 unset gm
5464 # -- Key Bindings
5466 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
5467 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
5468 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
5469 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
5470 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
5471 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
5472 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
5473 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
5474 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
5475 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
5476 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
5478 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
5479 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
5480 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
5481 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
5482 bind $ui_diff <$M1B-Key-v> {break}
5483 bind $ui_diff <$M1B-Key-V> {break}
5484 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
5485 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
5486 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
5487 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
5488 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
5489 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
5490 bind $ui_diff <Button-1> {focus %W}
5492 if {!$single_commit} {
5493 bind . <$M1B-Key-n> do_create_branch
5494 bind . <$M1B-Key-N> do_create_branch
5497 bind . <Destroy> do_quit
5498 bind all <Key-F5> do_rescan
5499 bind all <$M1B-Key-r> do_rescan
5500 bind all <$M1B-Key-R> do_rescan
5501 bind . <$M1B-Key-s> do_signoff
5502 bind . <$M1B-Key-S> do_signoff
5503 bind . <$M1B-Key-i> do_add_all
5504 bind . <$M1B-Key-I> do_add_all
5505 bind . <$M1B-Key-Return> do_commit
5506 bind all <$M1B-Key-q> do_quit
5507 bind all <$M1B-Key-Q> do_quit
5508 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
5509 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
5510 foreach i [list $ui_index $ui_workdir] {
5511 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
5512 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
5513 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
5515 unset i
5517 set file_lists($ui_index) [list]
5518 set file_lists($ui_workdir) [list]
5520 set HEAD {}
5521 set PARENT {}
5522 set MERGE_HEAD [list]
5523 set commit_type {}
5524 set empty_tree {}
5525 set current_branch {}
5526 set current_diff_path {}
5527 set selected_commit_type new
5529 wm title . "[appname] ([file normalize [file dirname [gitdir]]])"
5530 focus -force $ui_comm
5532 # -- Warn the user about environmental problems. Cygwin's Tcl
5533 # does *not* pass its env array onto any processes it spawns.
5534 # This means that git processes get none of our environment.
5536 if {[is_Cygwin]} {
5537 set ignored_env 0
5538 set suggest_user {}
5539 set msg "Possible environment issues exist.
5541 The following environment variables are probably
5542 going to be ignored by any Git subprocess run
5543 by [appname]:
5546 foreach name [array names env] {
5547 switch -regexp -- $name {
5548 {^GIT_INDEX_FILE$} -
5549 {^GIT_OBJECT_DIRECTORY$} -
5550 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
5551 {^GIT_DIFF_OPTS$} -
5552 {^GIT_EXTERNAL_DIFF$} -
5553 {^GIT_PAGER$} -
5554 {^GIT_TRACE$} -
5555 {^GIT_CONFIG$} -
5556 {^GIT_CONFIG_LOCAL$} -
5557 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
5558 append msg " - $name\n"
5559 incr ignored_env
5561 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
5562 append msg " - $name\n"
5563 incr ignored_env
5564 set suggest_user $name
5568 if {$ignored_env > 0} {
5569 append msg "
5570 This is due to a known issue with the
5571 Tcl binary distributed by Cygwin."
5573 if {$suggest_user ne {}} {
5574 append msg "
5576 A good replacement for $suggest_user
5577 is placing values for the user.name and
5578 user.email settings into your personal
5579 ~/.gitconfig file.
5582 warn_popup $msg
5584 unset ignored_env msg suggest_user name
5587 # -- Only initialize complex UI if we are going to stay running.
5589 if {!$single_commit} {
5590 load_all_remotes
5591 load_all_heads
5593 populate_branch_menu
5594 populate_fetch_menu
5595 populate_push_menu
5598 # -- Only suggest a gc run if we are going to stay running.
5600 if {!$single_commit} {
5601 set object_limit 2000
5602 if {[is_Windows]} {set object_limit 200}
5603 regexp {^([0-9]+) objects,} [exec git count-objects] _junk objects_current
5604 if {$objects_current >= $object_limit} {
5605 if {[ask_popup \
5606 "This repository currently has $objects_current loose objects.
5608 To maintain optimal performance it is strongly
5609 recommended that you compress the database
5610 when more than $object_limit loose objects exist.
5612 Compress the database now?"] eq yes} {
5613 do_gc
5616 unset object_limit _junk objects_current
5619 lock_index begin-read
5620 after 1 do_rescan