git-gui: handle bare repos correctly
[git/jnareb-git.git] / git-gui.sh
blob5d399555e6f43b1b9d622a486cf6def6b7ae24ac
1 #!/bin/sh
2 # Tcl ignores the next line -*- tcl -*- \
3 if test "z$*" = zversion \
4 || test "z$*" = z--version; \
5 then \
6 echo 'git-gui version @@GITGUI_VERSION@@'; \
7 exit; \
8 fi; \
9 argv0=$0; \
10 exec wish "$argv0" -- "$@"
12 set appvers {@@GITGUI_VERSION@@}
13 set copyright [encoding convertfrom utf-8 {
14 Copyright © 2006, 2007 Shawn Pearce, et. al.
16 This program is free software; you can redistribute it and/or modify
17 it under the terms of the GNU General Public License as published by
18 the Free Software Foundation; either version 2 of the License, or
19 (at your option) any later version.
21 This program is distributed in the hope that it will be useful,
22 but WITHOUT ANY WARRANTY; without even the implied warranty of
23 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24 GNU General Public License for more details.
26 You should have received a copy of the GNU General Public License
27 along with this program; if not, write to the Free Software
28 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA}]
30 ######################################################################
32 ## Tcl/Tk sanity check
34 if {[catch {package require Tcl 8.4} err]
35 || [catch {package require Tk 8.4} err]
36 } {
37 catch {wm withdraw .}
38 tk_messageBox \
39 -icon error \
40 -type ok \
41 -title [mc "git-gui: fatal error"] \
42 -message $err
43 exit 1
46 catch {rename send {}} ; # What an evil concept...
48 ######################################################################
50 ## locate our library
52 set oguilib {@@GITGUI_LIBDIR@@}
53 set oguirel {@@GITGUI_RELATIVE@@}
54 if {$oguirel eq {1}} {
55 set oguilib [file dirname [file normalize $argv0]]
56 if {[file tail $oguilib] eq {git-core}} {
57 set oguilib [file dirname $oguilib]
59 set oguilib [file dirname $oguilib]
60 set oguilib [file join $oguilib share git-gui lib]
61 set oguimsg [file join $oguilib msgs]
62 } elseif {[string match @@* $oguirel]} {
63 set oguilib [file join [file dirname [file normalize $argv0]] lib]
64 set oguimsg [file join [file dirname [file normalize $argv0]] po]
65 } else {
66 set oguimsg [file join $oguilib msgs]
68 unset oguirel
70 ######################################################################
72 ## enable verbose loading?
74 if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} {
75 unset _verbose
76 rename auto_load real__auto_load
77 proc auto_load {name args} {
78 puts stderr "auto_load $name"
79 return [uplevel 1 real__auto_load $name $args]
81 rename source real__source
82 proc source {name} {
83 puts stderr "source $name"
84 uplevel 1 real__source $name
88 ######################################################################
90 ## Internationalization (i18n) through msgcat and gettext. See
91 ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
93 package require msgcat
95 proc _mc_trim {fmt} {
96 set cmk [string first @@ $fmt]
97 if {$cmk > 0} {
98 return [string range $fmt 0 [expr {$cmk - 1}]]
100 return $fmt
103 proc mc {en_fmt args} {
104 set fmt [_mc_trim [::msgcat::mc $en_fmt]]
105 if {[catch {set msg [eval [list format $fmt] $args]} err]} {
106 set msg [eval [list format [_mc_trim $en_fmt]] $args]
108 return $msg
111 proc strcat {args} {
112 return [join $args {}]
115 ::msgcat::mcload $oguimsg
116 unset oguimsg
118 ######################################################################
120 ## read only globals
122 set _appname {Git Gui}
123 set _gitdir {}
124 set _gitworktree {}
125 set _isbare {}
126 set _gitexec {}
127 set _githtmldir {}
128 set _reponame {}
129 set _iscygwin {}
130 set _search_path {}
132 set _trace [lsearch -exact $argv --trace]
133 if {$_trace >= 0} {
134 set argv [lreplace $argv $_trace $_trace]
135 set _trace 1
136 } else {
137 set _trace 0
140 proc appname {} {
141 global _appname
142 return $_appname
145 proc gitdir {args} {
146 global _gitdir
147 if {$args eq {}} {
148 return $_gitdir
150 return [eval [list file join $_gitdir] $args]
153 proc gitexec {args} {
154 global _gitexec
155 if {$_gitexec eq {}} {
156 if {[catch {set _gitexec [git --exec-path]} err]} {
157 error "Git not installed?\n\n$err"
159 if {[is_Cygwin]} {
160 set _gitexec [exec cygpath \
161 --windows \
162 --absolute \
163 $_gitexec]
164 } else {
165 set _gitexec [file normalize $_gitexec]
168 if {$args eq {}} {
169 return $_gitexec
171 return [eval [list file join $_gitexec] $args]
174 proc githtmldir {args} {
175 global _githtmldir
176 if {$_githtmldir eq {}} {
177 if {[catch {set _githtmldir [git --html-path]}]} {
178 # Git not installed or option not yet supported
179 return {}
181 if {[is_Cygwin]} {
182 set _githtmldir [exec cygpath \
183 --windows \
184 --absolute \
185 $_githtmldir]
186 } else {
187 set _githtmldir [file normalize $_githtmldir]
190 if {$args eq {}} {
191 return $_githtmldir
193 return [eval [list file join $_githtmldir] $args]
196 proc reponame {} {
197 return $::_reponame
200 proc is_MacOSX {} {
201 if {[tk windowingsystem] eq {aqua}} {
202 return 1
204 return 0
207 proc is_Windows {} {
208 if {$::tcl_platform(platform) eq {windows}} {
209 return 1
211 return 0
214 proc is_Cygwin {} {
215 global _iscygwin
216 if {$_iscygwin eq {}} {
217 if {$::tcl_platform(platform) eq {windows}} {
218 if {[catch {set p [exec cygpath --windir]} err]} {
219 set _iscygwin 0
220 } else {
221 set _iscygwin 1
223 } else {
224 set _iscygwin 0
227 return $_iscygwin
230 proc is_enabled {option} {
231 global enabled_options
232 if {[catch {set on $enabled_options($option)}]} {return 0}
233 return $on
236 proc enable_option {option} {
237 global enabled_options
238 set enabled_options($option) 1
241 proc disable_option {option} {
242 global enabled_options
243 set enabled_options($option) 0
246 ######################################################################
248 ## config
250 proc is_many_config {name} {
251 switch -glob -- $name {
252 gui.recentrepo -
253 remote.*.fetch -
254 remote.*.push
255 {return 1}
257 {return 0}
261 proc is_config_true {name} {
262 global repo_config
263 if {[catch {set v $repo_config($name)}]} {
264 return 0
265 } elseif {$v eq {true} || $v eq {1} || $v eq {yes}} {
266 return 1
267 } else {
268 return 0
272 proc get_config {name} {
273 global repo_config
274 if {[catch {set v $repo_config($name)}]} {
275 return {}
276 } else {
277 return $v
281 proc is_bare {} {
282 global _isbare
283 global _gitdir
284 global _gitworktree
286 if {$_isbare eq {}} {
287 if {[catch {
288 set _bare [git rev-parse --is-bare-repository]
289 switch -- $_bare {
290 true { set _isbare 1 }
291 false { set _isbare 0}
292 default { throw }
294 }]} {
295 if {[is_config_true core.bare]
296 || ($_gitworktree eq {}
297 && [lindex [file split $_gitdir] end] ne {.git})} {
298 set _isbare 1
299 } else {
300 set _isbare 0
304 return $_isbare
307 ######################################################################
309 ## handy utils
311 proc _trace_exec {cmd} {
312 if {!$::_trace} return
313 set d {}
314 foreach v $cmd {
315 if {$d ne {}} {
316 append d { }
318 if {[regexp {[ \t\r\n'"$?*]} $v]} {
319 set v [sq $v]
321 append d $v
323 puts stderr $d
326 proc _git_cmd {name} {
327 global _git_cmd_path
329 if {[catch {set v $_git_cmd_path($name)}]} {
330 switch -- $name {
331 version -
332 --version -
333 --exec-path { return [list $::_git $name] }
336 set p [gitexec git-$name$::_search_exe]
337 if {[file exists $p]} {
338 set v [list $p]
339 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
340 # Try to determine what sort of magic will make
341 # git-$name go and do its thing, because native
342 # Tcl on Windows doesn't know it.
344 set p [gitexec git-$name]
345 set f [open $p r]
346 set s [gets $f]
347 close $f
349 switch -glob -- [lindex $s 0] {
350 #!*sh { set i sh }
351 #!*perl { set i perl }
352 #!*python { set i python }
353 default { error "git-$name is not supported: $s" }
356 upvar #0 _$i interp
357 if {![info exists interp]} {
358 set interp [_which $i]
360 if {$interp eq {}} {
361 error "git-$name requires $i (not in PATH)"
363 set v [concat [list $interp] [lrange $s 1 end] [list $p]]
364 } else {
365 # Assume it is builtin to git somehow and we
366 # aren't actually able to see a file for it.
368 set v [list $::_git $name]
370 set _git_cmd_path($name) $v
372 return $v
375 proc _which {what args} {
376 global env _search_exe _search_path
378 if {$_search_path eq {}} {
379 if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
380 set _search_path [split [exec cygpath \
381 --windows \
382 --path \
383 --absolute \
384 $env(PATH)] {;}]
385 set _search_exe .exe
386 } elseif {[is_Windows]} {
387 set gitguidir [file dirname [info script]]
388 regsub -all ";" $gitguidir "\\;" gitguidir
389 set env(PATH) "$gitguidir;$env(PATH)"
390 set _search_path [split $env(PATH) {;}]
391 set _search_exe .exe
392 } else {
393 set _search_path [split $env(PATH) :]
394 set _search_exe {}
398 if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
399 set suffix {}
400 } else {
401 set suffix $_search_exe
404 foreach p $_search_path {
405 set p [file join $p $what$suffix]
406 if {[file exists $p]} {
407 return [file normalize $p]
410 return {}
413 proc _lappend_nice {cmd_var} {
414 global _nice
415 upvar $cmd_var cmd
417 if {![info exists _nice]} {
418 set _nice [_which nice]
420 if {$_nice ne {}} {
421 lappend cmd $_nice
425 proc git {args} {
426 set opt [list]
428 while {1} {
429 switch -- [lindex $args 0] {
430 --nice {
431 _lappend_nice opt
434 default {
435 break
440 set args [lrange $args 1 end]
443 set cmdp [_git_cmd [lindex $args 0]]
444 set args [lrange $args 1 end]
446 _trace_exec [concat $opt $cmdp $args]
447 set result [eval exec $opt $cmdp $args]
448 if {$::_trace} {
449 puts stderr "< $result"
451 return $result
454 proc _open_stdout_stderr {cmd} {
455 _trace_exec $cmd
456 if {[catch {
457 set fd [open [concat [list | ] $cmd] r]
458 } err]} {
459 if { [lindex $cmd end] eq {2>@1}
460 && $err eq {can not find channel named "1"}
462 # Older versions of Tcl 8.4 don't have this 2>@1 IO
463 # redirect operator. Fallback to |& cat for those.
464 # The command was not actually started, so its safe
465 # to try to start it a second time.
467 set fd [open [concat \
468 [list | ] \
469 [lrange $cmd 0 end-1] \
470 [list |& cat] \
471 ] r]
472 } else {
473 error $err
476 fconfigure $fd -eofchar {}
477 return $fd
480 proc git_read {args} {
481 set opt [list]
483 while {1} {
484 switch -- [lindex $args 0] {
485 --nice {
486 _lappend_nice opt
489 --stderr {
490 lappend args 2>@1
493 default {
494 break
499 set args [lrange $args 1 end]
502 set cmdp [_git_cmd [lindex $args 0]]
503 set args [lrange $args 1 end]
505 return [_open_stdout_stderr [concat $opt $cmdp $args]]
508 proc git_write {args} {
509 set opt [list]
511 while {1} {
512 switch -- [lindex $args 0] {
513 --nice {
514 _lappend_nice opt
517 default {
518 break
523 set args [lrange $args 1 end]
526 set cmdp [_git_cmd [lindex $args 0]]
527 set args [lrange $args 1 end]
529 _trace_exec [concat $opt $cmdp $args]
530 return [open [concat [list | ] $opt $cmdp $args] w]
533 proc githook_read {hook_name args} {
534 set pchook [gitdir hooks $hook_name]
535 lappend args 2>@1
537 # On Windows [file executable] might lie so we need to ask
538 # the shell if the hook is executable. Yes that's annoying.
540 if {[is_Windows]} {
541 upvar #0 _sh interp
542 if {![info exists interp]} {
543 set interp [_which sh]
545 if {$interp eq {}} {
546 error "hook execution requires sh (not in PATH)"
549 set scr {if test -x "$1";then exec "$@";fi}
550 set sh_c [list $interp -c $scr $interp $pchook]
551 return [_open_stdout_stderr [concat $sh_c $args]]
554 if {[file executable $pchook]} {
555 return [_open_stdout_stderr [concat [list $pchook] $args]]
558 return {}
561 proc kill_file_process {fd} {
562 set process [pid $fd]
564 catch {
565 if {[is_Windows]} {
566 # Use a Cygwin-specific flag to allow killing
567 # native Windows processes
568 exec kill -f $process
569 } else {
570 exec kill $process
575 proc gitattr {path attr default} {
576 if {[catch {set r [git check-attr $attr -- $path]}]} {
577 set r unspecified
578 } else {
579 set r [join [lrange [split $r :] 2 end] :]
580 regsub {^ } $r {} r
582 if {$r eq {unspecified}} {
583 return $default
585 return $r
588 proc sq {value} {
589 regsub -all ' $value "'\\''" value
590 return "'$value'"
593 proc load_current_branch {} {
594 global current_branch is_detached
596 set fd [open [gitdir HEAD] r]
597 if {[gets $fd ref] < 1} {
598 set ref {}
600 close $fd
602 set pfx {ref: refs/heads/}
603 set len [string length $pfx]
604 if {[string equal -length $len $pfx $ref]} {
605 # We're on a branch. It might not exist. But
606 # HEAD looks good enough to be a branch.
608 set current_branch [string range $ref $len end]
609 set is_detached 0
610 } else {
611 # Assume this is a detached head.
613 set current_branch HEAD
614 set is_detached 1
618 auto_load tk_optionMenu
619 rename tk_optionMenu real__tkOptionMenu
620 proc tk_optionMenu {w varName args} {
621 set m [eval real__tkOptionMenu $w $varName $args]
622 $m configure -font font_ui
623 $w configure -font font_ui
624 return $m
627 proc rmsel_tag {text} {
628 $text tag conf sel \
629 -background [$text cget -background] \
630 -foreground [$text cget -foreground] \
631 -borderwidth 0
632 $text tag conf in_sel -background lightgray
633 bind $text <Motion> break
634 return $text
637 set root_exists 0
638 bind . <Visibility> {
639 bind . <Visibility> {}
640 set root_exists 1
643 if {[is_Windows]} {
644 wm iconbitmap . -default $oguilib/git-gui.ico
645 set ::tk::AlwaysShowSelection 1
647 # Spoof an X11 display for SSH
648 if {![info exists env(DISPLAY)]} {
649 set env(DISPLAY) :9999
651 } else {
652 catch {
653 image create photo gitlogo -width 16 -height 16
655 gitlogo put #33CC33 -to 7 0 9 2
656 gitlogo put #33CC33 -to 4 2 12 4
657 gitlogo put #33CC33 -to 7 4 9 6
658 gitlogo put #CC3333 -to 4 6 12 8
659 gitlogo put gray26 -to 4 9 6 10
660 gitlogo put gray26 -to 3 10 6 12
661 gitlogo put gray26 -to 8 9 13 11
662 gitlogo put gray26 -to 8 11 10 12
663 gitlogo put gray26 -to 11 11 13 14
664 gitlogo put gray26 -to 3 12 5 14
665 gitlogo put gray26 -to 5 13
666 gitlogo put gray26 -to 10 13
667 gitlogo put gray26 -to 4 14 12 15
668 gitlogo put gray26 -to 5 15 11 16
669 gitlogo redither
671 wm iconphoto . -default gitlogo
675 ######################################################################
677 ## config defaults
679 set cursor_ptr arrow
680 font create font_diff -family Courier -size 10
681 font create font_ui
682 catch {
683 label .dummy
684 eval font configure font_ui [font actual [.dummy cget -font]]
685 destroy .dummy
688 font create font_uiitalic
689 font create font_uibold
690 font create font_diffbold
691 font create font_diffitalic
693 foreach class {Button Checkbutton Entry Label
694 Labelframe Listbox Message
695 Radiobutton Spinbox Text} {
696 option add *$class.font font_ui
698 if {![is_MacOSX]} {
699 option add *Menu.font font_ui
701 unset class
703 if {[is_Windows] || [is_MacOSX]} {
704 option add *Menu.tearOff 0
707 if {[is_MacOSX]} {
708 set M1B M1
709 set M1T Cmd
710 } else {
711 set M1B Control
712 set M1T Ctrl
715 proc bind_button3 {w cmd} {
716 bind $w <Any-Button-3> $cmd
717 if {[is_MacOSX]} {
718 # Mac OS X sends Button-2 on right click through three-button mouse,
719 # or through trackpad right-clicking (two-finger touch + click).
720 bind $w <Any-Button-2> $cmd
721 bind $w <Control-Button-1> $cmd
725 proc apply_config {} {
726 global repo_config font_descs
728 foreach option $font_descs {
729 set name [lindex $option 0]
730 set font [lindex $option 1]
731 if {[catch {
732 set need_weight 1
733 foreach {cn cv} $repo_config(gui.$name) {
734 if {$cn eq {-weight}} {
735 set need_weight 0
737 font configure $font $cn $cv
739 if {$need_weight} {
740 font configure $font -weight normal
742 } err]} {
743 error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]
745 foreach {cn cv} [font configure $font] {
746 font configure ${font}bold $cn $cv
747 font configure ${font}italic $cn $cv
749 font configure ${font}bold -weight bold
750 font configure ${font}italic -slant italic
754 set default_config(branch.autosetupmerge) true
755 set default_config(merge.tool) {}
756 set default_config(mergetool.keepbackup) true
757 set default_config(merge.diffstat) true
758 set default_config(merge.summary) false
759 set default_config(merge.verbosity) 2
760 set default_config(user.name) {}
761 set default_config(user.email) {}
763 set default_config(gui.encoding) [encoding system]
764 set default_config(gui.matchtrackingbranch) false
765 set default_config(gui.pruneduringfetch) false
766 set default_config(gui.trustmtime) false
767 set default_config(gui.fastcopyblame) false
768 set default_config(gui.copyblamethreshold) 40
769 set default_config(gui.blamehistoryctx) 7
770 set default_config(gui.diffcontext) 5
771 set default_config(gui.commitmsgwidth) 75
772 set default_config(gui.newbranchtemplate) {}
773 set default_config(gui.spellingdictionary) {}
774 set default_config(gui.fontui) [font configure font_ui]
775 set default_config(gui.fontdiff) [font configure font_diff]
776 # TODO: this option should be added to the git-config documentation
777 set default_config(gui.maxfilesdisplayed) 5000
778 set font_descs {
779 {fontui font_ui {mc "Main Font"}}
780 {fontdiff font_diff {mc "Diff/Console Font"}}
783 ######################################################################
785 ## find git
787 set _git [_which git]
788 if {$_git eq {}} {
789 catch {wm withdraw .}
790 tk_messageBox \
791 -icon error \
792 -type ok \
793 -title [mc "git-gui: fatal error"] \
794 -message [mc "Cannot find git in PATH."]
795 exit 1
798 ######################################################################
800 ## version check
802 if {[catch {set _git_version [git --version]} err]} {
803 catch {wm withdraw .}
804 tk_messageBox \
805 -icon error \
806 -type ok \
807 -title [mc "git-gui: fatal error"] \
808 -message "Cannot determine Git version:
810 $err
812 [appname] requires Git 1.5.0 or later."
813 exit 1
815 if {![regsub {^git version } $_git_version {} _git_version]} {
816 catch {wm withdraw .}
817 tk_messageBox \
818 -icon error \
819 -type ok \
820 -title [mc "git-gui: fatal error"] \
821 -message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"]
822 exit 1
825 set _real_git_version $_git_version
826 regsub -- {[\-\.]dirty$} $_git_version {} _git_version
827 regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
828 regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
829 regsub {\.GIT$} $_git_version {} _git_version
830 regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
832 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
833 catch {wm withdraw .}
834 if {[tk_messageBox \
835 -icon warning \
836 -type yesno \
837 -default no \
838 -title "[appname]: warning" \
839 -message [mc "Git version cannot be determined.
841 %s claims it is version '%s'.
843 %s requires at least Git 1.5.0 or later.
845 Assume '%s' is version 1.5.0?
846 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
847 set _git_version 1.5.0
848 } else {
849 exit 1
852 unset _real_git_version
854 proc git-version {args} {
855 global _git_version
857 switch [llength $args] {
859 return $_git_version
863 set op [lindex $args 0]
864 set vr [lindex $args 1]
865 set cm [package vcompare $_git_version $vr]
866 return [expr $cm $op 0]
870 set type [lindex $args 0]
871 set name [lindex $args 1]
872 set parm [lindex $args 2]
873 set body [lindex $args 3]
875 if {($type ne {proc} && $type ne {method})} {
876 error "Invalid arguments to git-version"
878 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
879 error "Last arm of $type $name must be default"
882 foreach {op vr cb} [lrange $body 0 end-2] {
883 if {[git-version $op $vr]} {
884 return [uplevel [list $type $name $parm $cb]]
888 return [uplevel [list $type $name $parm [lindex $body end]]]
891 default {
892 error "git-version >= x"
898 if {[git-version < 1.5]} {
899 catch {wm withdraw .}
900 tk_messageBox \
901 -icon error \
902 -type ok \
903 -title [mc "git-gui: fatal error"] \
904 -message "[appname] requires Git 1.5.0 or later.
906 You are using [git-version]:
908 [git --version]"
909 exit 1
912 ######################################################################
914 ## configure our library
916 set idx [file join $oguilib tclIndex]
917 if {[catch {set fd [open $idx r]} err]} {
918 catch {wm withdraw .}
919 tk_messageBox \
920 -icon error \
921 -type ok \
922 -title [mc "git-gui: fatal error"] \
923 -message $err
924 exit 1
926 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
927 set idx [list]
928 while {[gets $fd n] >= 0} {
929 if {$n ne {} && ![string match #* $n]} {
930 lappend idx $n
933 } else {
934 set idx {}
936 close $fd
938 if {$idx ne {}} {
939 set loaded [list]
940 foreach p $idx {
941 if {[lsearch -exact $loaded $p] >= 0} continue
942 source [file join $oguilib $p]
943 lappend loaded $p
945 unset loaded p
946 } else {
947 set auto_path [concat [list $oguilib] $auto_path]
949 unset -nocomplain idx fd
951 ######################################################################
953 ## config file parsing
955 git-version proc _parse_config {arr_name args} {
956 >= 1.5.3 {
957 upvar $arr_name arr
958 array unset arr
959 set buf {}
960 catch {
961 set fd_rc [eval \
962 [list git_read config] \
963 $args \
964 [list --null --list]]
965 fconfigure $fd_rc -translation binary
966 set buf [read $fd_rc]
967 close $fd_rc
969 foreach line [split $buf "\0"] {
970 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
971 if {[is_many_config $name]} {
972 lappend arr($name) $value
973 } else {
974 set arr($name) $value
979 default {
980 upvar $arr_name arr
981 array unset arr
982 catch {
983 set fd_rc [eval [list git_read config --list] $args]
984 while {[gets $fd_rc line] >= 0} {
985 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
986 if {[is_many_config $name]} {
987 lappend arr($name) $value
988 } else {
989 set arr($name) $value
993 close $fd_rc
998 proc load_config {include_global} {
999 global repo_config global_config system_config default_config
1001 if {$include_global} {
1002 _parse_config system_config --system
1003 _parse_config global_config --global
1005 _parse_config repo_config
1007 foreach name [array names default_config] {
1008 if {[catch {set v $system_config($name)}]} {
1009 set system_config($name) $default_config($name)
1012 foreach name [array names system_config] {
1013 if {[catch {set v $global_config($name)}]} {
1014 set global_config($name) $system_config($name)
1016 if {[catch {set v $repo_config($name)}]} {
1017 set repo_config($name) $system_config($name)
1022 ######################################################################
1024 ## feature option selection
1026 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
1027 unset _junk
1028 } else {
1029 set subcommand gui
1031 if {$subcommand eq {gui.sh}} {
1032 set subcommand gui
1034 if {$subcommand eq {gui} && [llength $argv] > 0} {
1035 set subcommand [lindex $argv 0]
1036 set argv [lrange $argv 1 end]
1039 enable_option multicommit
1040 enable_option branch
1041 enable_option transport
1042 disable_option bare
1044 switch -- $subcommand {
1045 browser -
1046 blame {
1047 enable_option bare
1049 disable_option multicommit
1050 disable_option branch
1051 disable_option transport
1053 citool {
1054 enable_option singlecommit
1055 enable_option retcode
1057 disable_option multicommit
1058 disable_option branch
1059 disable_option transport
1061 while {[llength $argv] > 0} {
1062 set a [lindex $argv 0]
1063 switch -- $a {
1064 --amend {
1065 enable_option initialamend
1067 --nocommit {
1068 enable_option nocommit
1069 enable_option nocommitmsg
1071 --commitmsg {
1072 disable_option nocommitmsg
1074 default {
1075 break
1079 set argv [lrange $argv 1 end]
1084 ######################################################################
1086 ## execution environment
1088 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
1090 # Suggest our implementation of askpass, if none is set
1091 if {![info exists env(SSH_ASKPASS)]} {
1092 set env(SSH_ASKPASS) [gitexec git-gui--askpass]
1095 ######################################################################
1097 ## repository setup
1099 set picked 0
1100 if {[catch {
1101 set _gitdir $env(GIT_DIR)
1102 set _prefix {}
1104 && [catch {
1105 # beware that from the .git dir this sets _gitdir to .
1106 # and _prefix to the empty string
1107 set _gitdir [git rev-parse --git-dir]
1108 set _prefix [git rev-parse --show-prefix]
1109 } err]} {
1110 load_config 1
1111 apply_config
1112 choose_repository::pick
1113 set picked 1
1116 # we expand the _gitdir when it's just a single dot (i.e. when we're being
1117 # run from the .git dir itself) lest the routines to find the worktree
1118 # get confused
1119 if {$_gitdir eq "."} {
1120 set _gitdir [pwd]
1123 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1124 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1126 if {![file isdirectory $_gitdir]} {
1127 catch {wm withdraw .}
1128 error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"]
1129 exit 1
1131 # _gitdir exists, so try loading the config
1132 load_config 0
1133 apply_config
1134 # try to set work tree from environment, falling back to core.worktree
1135 if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {
1136 set _gitworktree [get_config core.worktree]
1138 if {$_prefix ne {}} {
1139 if {$_gitworktree eq {}} {
1140 regsub -all {[^/]+/} $_prefix ../ cdup
1141 } else {
1142 set cdup $_gitworktree
1144 if {[catch {cd $cdup} err]} {
1145 catch {wm withdraw .}
1146 error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"]
1147 exit 1
1149 set _gitworktree [pwd]
1150 unset cdup
1151 } elseif {![is_enabled bare]} {
1152 if {[is_bare]} {
1153 catch {wm withdraw .}
1154 error_popup [strcat [mc "Cannot use bare repository:"] "\n\n$_gitdir"]
1155 exit 1
1157 if {$_gitworktree eq {}} {
1158 set _gitworktree [file dirname $_gitdir]
1160 if {[catch {cd $_gitworktree} err]} {
1161 catch {wm withdraw .}
1162 error_popup [strcat [mc "No working directory"] " $_gitworktree:\n\n$err"]
1163 exit 1
1165 set _gitworktree [pwd]
1167 set _reponame [file split [file normalize $_gitdir]]
1168 if {[lindex $_reponame end] eq {.git}} {
1169 set _reponame [lindex $_reponame end-1]
1170 } else {
1171 set _reponame [lindex $_reponame end]
1174 ######################################################################
1176 ## global init
1178 set current_diff_path {}
1179 set current_diff_side {}
1180 set diff_actions [list]
1182 set HEAD {}
1183 set PARENT {}
1184 set MERGE_HEAD [list]
1185 set commit_type {}
1186 set empty_tree {}
1187 set current_branch {}
1188 set is_detached 0
1189 set current_diff_path {}
1190 set is_3way_diff 0
1191 set is_submodule_diff 0
1192 set is_conflict_diff 0
1193 set selected_commit_type new
1194 set diff_empty_count 0
1196 set nullid "0000000000000000000000000000000000000000"
1197 set nullid2 "0000000000000000000000000000000000000001"
1199 ######################################################################
1201 ## task management
1203 set rescan_active 0
1204 set diff_active 0
1205 set last_clicked {}
1207 set disable_on_lock [list]
1208 set index_lock_type none
1210 proc lock_index {type} {
1211 global index_lock_type disable_on_lock
1213 if {$index_lock_type eq {none}} {
1214 set index_lock_type $type
1215 foreach w $disable_on_lock {
1216 uplevel #0 $w disabled
1218 return 1
1219 } elseif {$index_lock_type eq "begin-$type"} {
1220 set index_lock_type $type
1221 return 1
1223 return 0
1226 proc unlock_index {} {
1227 global index_lock_type disable_on_lock
1229 set index_lock_type none
1230 foreach w $disable_on_lock {
1231 uplevel #0 $w normal
1235 ######################################################################
1237 ## status
1239 proc repository_state {ctvar hdvar mhvar} {
1240 global current_branch
1241 upvar $ctvar ct $hdvar hd $mhvar mh
1243 set mh [list]
1245 load_current_branch
1246 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1247 set hd {}
1248 set ct initial
1249 return
1252 set merge_head [gitdir MERGE_HEAD]
1253 if {[file exists $merge_head]} {
1254 set ct merge
1255 set fd_mh [open $merge_head r]
1256 while {[gets $fd_mh line] >= 0} {
1257 lappend mh $line
1259 close $fd_mh
1260 return
1263 set ct normal
1266 proc PARENT {} {
1267 global PARENT empty_tree
1269 set p [lindex $PARENT 0]
1270 if {$p ne {}} {
1271 return $p
1273 if {$empty_tree eq {}} {
1274 set empty_tree [git mktree << {}]
1276 return $empty_tree
1279 proc force_amend {} {
1280 global selected_commit_type
1281 global HEAD PARENT MERGE_HEAD commit_type
1283 repository_state newType newHEAD newMERGE_HEAD
1284 set HEAD $newHEAD
1285 set PARENT $newHEAD
1286 set MERGE_HEAD $newMERGE_HEAD
1287 set commit_type $newType
1289 set selected_commit_type amend
1290 do_select_commit_type
1293 proc rescan {after {honor_trustmtime 1}} {
1294 global HEAD PARENT MERGE_HEAD commit_type
1295 global ui_index ui_workdir ui_comm
1296 global rescan_active file_states
1297 global repo_config
1299 if {$rescan_active > 0 || ![lock_index read]} return
1301 repository_state newType newHEAD newMERGE_HEAD
1302 if {[string match amend* $commit_type]
1303 && $newType eq {normal}
1304 && $newHEAD eq $HEAD} {
1305 } else {
1306 set HEAD $newHEAD
1307 set PARENT $newHEAD
1308 set MERGE_HEAD $newMERGE_HEAD
1309 set commit_type $newType
1312 array unset file_states
1314 if {!$::GITGUI_BCK_exists &&
1315 (![$ui_comm edit modified]
1316 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1317 if {[string match amend* $commit_type]} {
1318 } elseif {[load_message GITGUI_MSG]} {
1319 } elseif {[run_prepare_commit_msg_hook]} {
1320 } elseif {[load_message MERGE_MSG]} {
1321 } elseif {[load_message SQUASH_MSG]} {
1323 $ui_comm edit reset
1324 $ui_comm edit modified false
1327 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1328 rescan_stage2 {} $after
1329 } else {
1330 set rescan_active 1
1331 ui_status [mc "Refreshing file status..."]
1332 set fd_rf [git_read update-index \
1333 -q \
1334 --unmerged \
1335 --ignore-missing \
1336 --refresh \
1338 fconfigure $fd_rf -blocking 0 -translation binary
1339 fileevent $fd_rf readable \
1340 [list rescan_stage2 $fd_rf $after]
1344 if {[is_Cygwin]} {
1345 set is_git_info_exclude {}
1346 proc have_info_exclude {} {
1347 global is_git_info_exclude
1349 if {$is_git_info_exclude eq {}} {
1350 if {[catch {exec test -f [gitdir info exclude]}]} {
1351 set is_git_info_exclude 0
1352 } else {
1353 set is_git_info_exclude 1
1356 return $is_git_info_exclude
1358 } else {
1359 proc have_info_exclude {} {
1360 return [file readable [gitdir info exclude]]
1364 proc rescan_stage2 {fd after} {
1365 global rescan_active buf_rdi buf_rdf buf_rlo
1367 if {$fd ne {}} {
1368 read $fd
1369 if {![eof $fd]} return
1370 close $fd
1373 set ls_others [list --exclude-per-directory=.gitignore]
1374 if {[have_info_exclude]} {
1375 lappend ls_others "--exclude-from=[gitdir info exclude]"
1377 set user_exclude [get_config core.excludesfile]
1378 if {$user_exclude ne {} && [file readable $user_exclude]} {
1379 lappend ls_others "--exclude-from=$user_exclude"
1382 set buf_rdi {}
1383 set buf_rdf {}
1384 set buf_rlo {}
1386 set rescan_active 3
1387 ui_status [mc "Scanning for modified files ..."]
1388 set fd_di [git_read diff-index --cached -z [PARENT]]
1389 set fd_df [git_read diff-files -z]
1390 set fd_lo [eval git_read ls-files --others -z $ls_others]
1392 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1393 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1394 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1395 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1396 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1397 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1400 proc load_message {file} {
1401 global ui_comm
1403 set f [gitdir $file]
1404 if {[file isfile $f]} {
1405 if {[catch {set fd [open $f r]}]} {
1406 return 0
1408 fconfigure $fd -eofchar {}
1409 set content [string trim [read $fd]]
1410 close $fd
1411 regsub -all -line {[ \r\t]+$} $content {} content
1412 $ui_comm delete 0.0 end
1413 $ui_comm insert end $content
1414 return 1
1416 return 0
1419 proc run_prepare_commit_msg_hook {} {
1420 global pch_error
1422 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1423 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1424 # empty file but existant file.
1426 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1428 if {[file isfile [gitdir MERGE_MSG]]} {
1429 set pcm_source "merge"
1430 set fd_mm [open [gitdir MERGE_MSG] r]
1431 puts -nonewline $fd_pcm [read $fd_mm]
1432 close $fd_mm
1433 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1434 set pcm_source "squash"
1435 set fd_sm [open [gitdir SQUASH_MSG] r]
1436 puts -nonewline $fd_pcm [read $fd_sm]
1437 close $fd_sm
1438 } else {
1439 set pcm_source ""
1442 close $fd_pcm
1444 set fd_ph [githook_read prepare-commit-msg \
1445 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1446 if {$fd_ph eq {}} {
1447 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1448 return 0;
1451 ui_status [mc "Calling prepare-commit-msg hook..."]
1452 set pch_error {}
1454 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1455 fileevent $fd_ph readable \
1456 [list prepare_commit_msg_hook_wait $fd_ph]
1458 return 1;
1461 proc prepare_commit_msg_hook_wait {fd_ph} {
1462 global pch_error
1464 append pch_error [read $fd_ph]
1465 fconfigure $fd_ph -blocking 1
1466 if {[eof $fd_ph]} {
1467 if {[catch {close $fd_ph}]} {
1468 ui_status [mc "Commit declined by prepare-commit-msg hook."]
1469 hook_failed_popup prepare-commit-msg $pch_error
1470 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1471 exit 1
1472 } else {
1473 load_message PREPARE_COMMIT_MSG
1475 set pch_error {}
1476 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1477 return
1479 fconfigure $fd_ph -blocking 0
1480 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1483 proc read_diff_index {fd after} {
1484 global buf_rdi
1486 append buf_rdi [read $fd]
1487 set c 0
1488 set n [string length $buf_rdi]
1489 while {$c < $n} {
1490 set z1 [string first "\0" $buf_rdi $c]
1491 if {$z1 == -1} break
1492 incr z1
1493 set z2 [string first "\0" $buf_rdi $z1]
1494 if {$z2 == -1} break
1496 incr c
1497 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1498 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1499 merge_state \
1500 [encoding convertfrom $p] \
1501 [lindex $i 4]? \
1502 [list [lindex $i 0] [lindex $i 2]] \
1503 [list]
1504 set c $z2
1505 incr c
1507 if {$c < $n} {
1508 set buf_rdi [string range $buf_rdi $c end]
1509 } else {
1510 set buf_rdi {}
1513 rescan_done $fd buf_rdi $after
1516 proc read_diff_files {fd after} {
1517 global buf_rdf
1519 append buf_rdf [read $fd]
1520 set c 0
1521 set n [string length $buf_rdf]
1522 while {$c < $n} {
1523 set z1 [string first "\0" $buf_rdf $c]
1524 if {$z1 == -1} break
1525 incr z1
1526 set z2 [string first "\0" $buf_rdf $z1]
1527 if {$z2 == -1} break
1529 incr c
1530 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1531 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1532 merge_state \
1533 [encoding convertfrom $p] \
1534 ?[lindex $i 4] \
1535 [list] \
1536 [list [lindex $i 0] [lindex $i 2]]
1537 set c $z2
1538 incr c
1540 if {$c < $n} {
1541 set buf_rdf [string range $buf_rdf $c end]
1542 } else {
1543 set buf_rdf {}
1546 rescan_done $fd buf_rdf $after
1549 proc read_ls_others {fd after} {
1550 global buf_rlo
1552 append buf_rlo [read $fd]
1553 set pck [split $buf_rlo "\0"]
1554 set buf_rlo [lindex $pck end]
1555 foreach p [lrange $pck 0 end-1] {
1556 set p [encoding convertfrom $p]
1557 if {[string index $p end] eq {/}} {
1558 set p [string range $p 0 end-1]
1560 merge_state $p ?O
1562 rescan_done $fd buf_rlo $after
1565 proc rescan_done {fd buf after} {
1566 global rescan_active current_diff_path
1567 global file_states repo_config
1568 upvar $buf to_clear
1570 if {![eof $fd]} return
1571 set to_clear {}
1572 close $fd
1573 if {[incr rescan_active -1] > 0} return
1575 prune_selection
1576 unlock_index
1577 display_all_files
1578 if {$current_diff_path ne {}} { reshow_diff $after }
1579 if {$current_diff_path eq {}} { select_first_diff $after }
1582 proc prune_selection {} {
1583 global file_states selected_paths
1585 foreach path [array names selected_paths] {
1586 if {[catch {set still_here $file_states($path)}]} {
1587 unset selected_paths($path)
1592 ######################################################################
1594 ## ui helpers
1596 proc mapicon {w state path} {
1597 global all_icons
1599 if {[catch {set r $all_icons($state$w)}]} {
1600 puts "error: no icon for $w state={$state} $path"
1601 return file_plain
1603 return $r
1606 proc mapdesc {state path} {
1607 global all_descs
1609 if {[catch {set r $all_descs($state)}]} {
1610 puts "error: no desc for state={$state} $path"
1611 return $state
1613 return $r
1616 proc ui_status {msg} {
1617 global main_status
1618 if {[info exists main_status]} {
1619 $main_status show $msg
1623 proc ui_ready {{test {}}} {
1624 global main_status
1625 if {[info exists main_status]} {
1626 $main_status show [mc "Ready."] $test
1630 proc escape_path {path} {
1631 regsub -all {\\} $path "\\\\" path
1632 regsub -all "\n" $path "\\n" path
1633 return $path
1636 proc short_path {path} {
1637 return [escape_path [lindex [file split $path] end]]
1640 set next_icon_id 0
1641 set null_sha1 [string repeat 0 40]
1643 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1644 global file_states next_icon_id null_sha1
1646 set s0 [string index $new_state 0]
1647 set s1 [string index $new_state 1]
1649 if {[catch {set info $file_states($path)}]} {
1650 set state __
1651 set icon n[incr next_icon_id]
1652 } else {
1653 set state [lindex $info 0]
1654 set icon [lindex $info 1]
1655 if {$head_info eq {}} {set head_info [lindex $info 2]}
1656 if {$index_info eq {}} {set index_info [lindex $info 3]}
1659 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1660 elseif {$s0 eq {_}} {set s0 _}
1662 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1663 elseif {$s1 eq {_}} {set s1 _}
1665 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1666 set head_info [list 0 $null_sha1]
1667 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1668 && $head_info eq {}} {
1669 set head_info $index_info
1670 } elseif {$s0 eq {_} && [string index $state 0] ne {_}} {
1671 set index_info $head_info
1672 set head_info {}
1675 set file_states($path) [list $s0$s1 $icon \
1676 $head_info $index_info \
1678 return $state
1681 proc display_file_helper {w path icon_name old_m new_m} {
1682 global file_lists
1684 if {$new_m eq {_}} {
1685 set lno [lsearch -sorted -exact $file_lists($w) $path]
1686 if {$lno >= 0} {
1687 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1688 incr lno
1689 $w conf -state normal
1690 $w delete $lno.0 [expr {$lno + 1}].0
1691 $w conf -state disabled
1693 } elseif {$old_m eq {_} && $new_m ne {_}} {
1694 lappend file_lists($w) $path
1695 set file_lists($w) [lsort -unique $file_lists($w)]
1696 set lno [lsearch -sorted -exact $file_lists($w) $path]
1697 incr lno
1698 $w conf -state normal
1699 $w image create $lno.0 \
1700 -align center -padx 5 -pady 1 \
1701 -name $icon_name \
1702 -image [mapicon $w $new_m $path]
1703 $w insert $lno.1 "[escape_path $path]\n"
1704 $w conf -state disabled
1705 } elseif {$old_m ne $new_m} {
1706 $w conf -state normal
1707 $w image conf $icon_name -image [mapicon $w $new_m $path]
1708 $w conf -state disabled
1712 proc display_file {path state} {
1713 global file_states selected_paths
1714 global ui_index ui_workdir
1716 set old_m [merge_state $path $state]
1717 set s $file_states($path)
1718 set new_m [lindex $s 0]
1719 set icon_name [lindex $s 1]
1721 set o [string index $old_m 0]
1722 set n [string index $new_m 0]
1723 if {$o eq {U}} {
1724 set o _
1726 if {$n eq {U}} {
1727 set n _
1729 display_file_helper $ui_index $path $icon_name $o $n
1731 if {[string index $old_m 0] eq {U}} {
1732 set o U
1733 } else {
1734 set o [string index $old_m 1]
1736 if {[string index $new_m 0] eq {U}} {
1737 set n U
1738 } else {
1739 set n [string index $new_m 1]
1741 display_file_helper $ui_workdir $path $icon_name $o $n
1743 if {$new_m eq {__}} {
1744 unset file_states($path)
1745 catch {unset selected_paths($path)}
1749 proc display_all_files_helper {w path icon_name m} {
1750 global file_lists
1752 lappend file_lists($w) $path
1753 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1754 $w image create end \
1755 -align center -padx 5 -pady 1 \
1756 -name $icon_name \
1757 -image [mapicon $w $m $path]
1758 $w insert end "[escape_path $path]\n"
1761 set files_warning 0
1762 proc display_all_files {} {
1763 global ui_index ui_workdir
1764 global file_states file_lists
1765 global last_clicked
1766 global files_warning
1768 $ui_index conf -state normal
1769 $ui_workdir conf -state normal
1771 $ui_index delete 0.0 end
1772 $ui_workdir delete 0.0 end
1773 set last_clicked {}
1775 set file_lists($ui_index) [list]
1776 set file_lists($ui_workdir) [list]
1778 set to_display [lsort [array names file_states]]
1779 set display_limit [get_config gui.maxfilesdisplayed]
1780 if {[llength $to_display] > $display_limit} {
1781 if {!$files_warning} {
1782 # do not repeatedly warn:
1783 set files_warning 1
1784 info_popup [mc "Displaying only %s of %s files." \
1785 $display_limit [llength $to_display]]
1787 set to_display [lrange $to_display 0 [expr {$display_limit-1}]]
1789 foreach path $to_display {
1790 set s $file_states($path)
1791 set m [lindex $s 0]
1792 set icon_name [lindex $s 1]
1794 set s [string index $m 0]
1795 if {$s ne {U} && $s ne {_}} {
1796 display_all_files_helper $ui_index $path \
1797 $icon_name $s
1800 if {[string index $m 0] eq {U}} {
1801 set s U
1802 } else {
1803 set s [string index $m 1]
1805 if {$s ne {_}} {
1806 display_all_files_helper $ui_workdir $path \
1807 $icon_name $s
1811 $ui_index conf -state disabled
1812 $ui_workdir conf -state disabled
1815 ######################################################################
1817 ## icons
1819 set filemask {
1820 #define mask_width 14
1821 #define mask_height 15
1822 static unsigned char mask_bits[] = {
1823 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1824 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1825 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1828 image create bitmap file_plain -background white -foreground black -data {
1829 #define plain_width 14
1830 #define plain_height 15
1831 static unsigned char plain_bits[] = {
1832 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1833 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1834 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1835 } -maskdata $filemask
1837 image create bitmap file_mod -background white -foreground blue -data {
1838 #define mod_width 14
1839 #define mod_height 15
1840 static unsigned char mod_bits[] = {
1841 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1842 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1843 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1844 } -maskdata $filemask
1846 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1847 #define file_fulltick_width 14
1848 #define file_fulltick_height 15
1849 static unsigned char file_fulltick_bits[] = {
1850 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1851 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1852 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1853 } -maskdata $filemask
1855 image create bitmap file_parttick -background white -foreground "#005050" -data {
1856 #define parttick_width 14
1857 #define parttick_height 15
1858 static unsigned char parttick_bits[] = {
1859 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1860 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1861 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1862 } -maskdata $filemask
1864 image create bitmap file_question -background white -foreground black -data {
1865 #define file_question_width 14
1866 #define file_question_height 15
1867 static unsigned char file_question_bits[] = {
1868 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1869 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1870 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1871 } -maskdata $filemask
1873 image create bitmap file_removed -background white -foreground red -data {
1874 #define file_removed_width 14
1875 #define file_removed_height 15
1876 static unsigned char file_removed_bits[] = {
1877 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1878 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1879 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1880 } -maskdata $filemask
1882 image create bitmap file_merge -background white -foreground blue -data {
1883 #define file_merge_width 14
1884 #define file_merge_height 15
1885 static unsigned char file_merge_bits[] = {
1886 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1887 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1888 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1889 } -maskdata $filemask
1891 image create bitmap file_statechange -background white -foreground green -data {
1892 #define file_merge_width 14
1893 #define file_merge_height 15
1894 static unsigned char file_statechange_bits[] = {
1895 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
1896 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
1897 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1898 } -maskdata $filemask
1900 set ui_index .vpane.files.index.list
1901 set ui_workdir .vpane.files.workdir.list
1903 set all_icons(_$ui_index) file_plain
1904 set all_icons(A$ui_index) file_fulltick
1905 set all_icons(M$ui_index) file_fulltick
1906 set all_icons(D$ui_index) file_removed
1907 set all_icons(U$ui_index) file_merge
1908 set all_icons(T$ui_index) file_statechange
1910 set all_icons(_$ui_workdir) file_plain
1911 set all_icons(M$ui_workdir) file_mod
1912 set all_icons(D$ui_workdir) file_question
1913 set all_icons(U$ui_workdir) file_merge
1914 set all_icons(O$ui_workdir) file_plain
1915 set all_icons(T$ui_workdir) file_statechange
1917 set max_status_desc 0
1918 foreach i {
1919 {__ {mc "Unmodified"}}
1921 {_M {mc "Modified, not staged"}}
1922 {M_ {mc "Staged for commit"}}
1923 {MM {mc "Portions staged for commit"}}
1924 {MD {mc "Staged for commit, missing"}}
1926 {_T {mc "File type changed, not staged"}}
1927 {T_ {mc "File type changed, staged"}}
1929 {_O {mc "Untracked, not staged"}}
1930 {A_ {mc "Staged for commit"}}
1931 {AM {mc "Portions staged for commit"}}
1932 {AD {mc "Staged for commit, missing"}}
1934 {_D {mc "Missing"}}
1935 {D_ {mc "Staged for removal"}}
1936 {DO {mc "Staged for removal, still present"}}
1938 {_U {mc "Requires merge resolution"}}
1939 {U_ {mc "Requires merge resolution"}}
1940 {UU {mc "Requires merge resolution"}}
1941 {UM {mc "Requires merge resolution"}}
1942 {UD {mc "Requires merge resolution"}}
1943 {UT {mc "Requires merge resolution"}}
1945 set text [eval [lindex $i 1]]
1946 if {$max_status_desc < [string length $text]} {
1947 set max_status_desc [string length $text]
1949 set all_descs([lindex $i 0]) $text
1951 unset i
1953 ######################################################################
1955 ## util
1957 proc scrollbar2many {list mode args} {
1958 foreach w $list {eval $w $mode $args}
1961 proc many2scrollbar {list mode sb top bottom} {
1962 $sb set $top $bottom
1963 foreach w $list {$w $mode moveto $top}
1966 proc incr_font_size {font {amt 1}} {
1967 set sz [font configure $font -size]
1968 incr sz $amt
1969 font configure $font -size $sz
1970 font configure ${font}bold -size $sz
1971 font configure ${font}italic -size $sz
1974 ######################################################################
1976 ## ui commands
1978 set starting_gitk_msg [mc "Starting gitk... please wait..."]
1980 proc do_gitk {revs {is_submodule false}} {
1981 global current_diff_path file_states current_diff_side ui_index
1982 global _gitworktree
1984 # -- Always start gitk through whatever we were loaded with. This
1985 # lets us bypass using shell process on Windows systems.
1987 set exe [_which gitk -script]
1988 set cmd [list [info nameofexecutable] $exe]
1989 if {$exe eq {}} {
1990 error_popup [mc "Couldn't find gitk in PATH"]
1991 } else {
1992 global env
1994 if {[info exists env(GIT_DIR)]} {
1995 set old_GIT_DIR $env(GIT_DIR)
1996 } else {
1997 set old_GIT_DIR {}
2000 set pwd [pwd]
2002 if {!$is_submodule} {
2003 if {![is_bare]} {
2004 cd $_gitworktree
2006 set env(GIT_DIR) [file normalize [gitdir]]
2007 } else {
2008 cd $current_diff_path
2009 if {$revs eq {--}} {
2010 set s $file_states($current_diff_path)
2011 set old_sha1 {}
2012 set new_sha1 {}
2013 switch -glob -- [lindex $s 0] {
2014 M_ { set old_sha1 [lindex [lindex $s 2] 1] }
2015 _M { set old_sha1 [lindex [lindex $s 3] 1] }
2016 MM {
2017 if {$current_diff_side eq $ui_index} {
2018 set old_sha1 [lindex [lindex $s 2] 1]
2019 set new_sha1 [lindex [lindex $s 3] 1]
2020 } else {
2021 set old_sha1 [lindex [lindex $s 3] 1]
2025 set revs $old_sha1...$new_sha1
2027 if {[info exists env(GIT_DIR)]} {
2028 unset env(GIT_DIR)
2031 eval exec $cmd $revs "--" "--" &
2033 if {$old_GIT_DIR ne {}} {
2034 set env(GIT_DIR) $old_GIT_DIR
2036 cd $pwd
2038 ui_status $::starting_gitk_msg
2039 after 10000 {
2040 ui_ready $starting_gitk_msg
2045 proc do_git_gui {} {
2046 global current_diff_path
2048 # -- Always start git gui through whatever we were loaded with. This
2049 # lets us bypass using shell process on Windows systems.
2051 set exe [_which git]
2052 if {$exe eq {}} {
2053 error_popup [mc "Couldn't find git gui in PATH"]
2054 } else {
2055 global env
2057 if {[info exists env(GIT_DIR)]} {
2058 set old_GIT_DIR $env(GIT_DIR)
2059 unset env(GIT_DIR)
2060 } else {
2061 set old_GIT_DIR {}
2064 set pwd [pwd]
2065 cd $current_diff_path
2067 eval exec $exe gui &
2069 if {$old_GIT_DIR ne {}} {
2070 set env(GIT_DIR) $old_GIT_DIR
2072 cd $pwd
2074 ui_status $::starting_gitk_msg
2075 after 10000 {
2076 ui_ready $starting_gitk_msg
2081 proc do_explore {} {
2082 global _gitworktree
2083 set explorer {}
2084 if {[is_Cygwin] || [is_Windows]} {
2085 set explorer "explorer.exe"
2086 } elseif {[is_MacOSX]} {
2087 set explorer "open"
2088 } else {
2089 # freedesktop.org-conforming system is our best shot
2090 set explorer "xdg-open"
2092 eval exec $explorer $_gitworktree &
2095 set is_quitting 0
2096 set ret_code 1
2098 proc terminate_me {win} {
2099 global ret_code
2100 if {$win ne {.}} return
2101 exit $ret_code
2104 proc do_quit {{rc {1}}} {
2105 global ui_comm is_quitting repo_config commit_type
2106 global GITGUI_BCK_exists GITGUI_BCK_i
2107 global ui_comm_spell
2108 global ret_code
2110 if {$is_quitting} return
2111 set is_quitting 1
2113 if {[winfo exists $ui_comm]} {
2114 # -- Stash our current commit buffer.
2116 set save [gitdir GITGUI_MSG]
2117 if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
2118 file rename -force [gitdir GITGUI_BCK] $save
2119 set GITGUI_BCK_exists 0
2120 } else {
2121 set msg [string trim [$ui_comm get 0.0 end]]
2122 regsub -all -line {[ \r\t]+$} $msg {} msg
2123 if {(![string match amend* $commit_type]
2124 || [$ui_comm edit modified])
2125 && $msg ne {}} {
2126 catch {
2127 set fd [open $save w]
2128 puts -nonewline $fd $msg
2129 close $fd
2131 } else {
2132 catch {file delete $save}
2136 # -- Cancel our spellchecker if its running.
2138 if {[info exists ui_comm_spell]} {
2139 $ui_comm_spell stop
2142 # -- Remove our editor backup, its not needed.
2144 after cancel $GITGUI_BCK_i
2145 if {$GITGUI_BCK_exists} {
2146 catch {file delete [gitdir GITGUI_BCK]}
2149 # -- Stash our current window geometry into this repository.
2151 set cfg_wmstate [wm state .]
2152 if {[catch {set rc_wmstate $repo_config(gui.wmstate)}]} {
2153 set rc_wmstate {}
2155 if {$cfg_wmstate ne $rc_wmstate} {
2156 catch {git config gui.wmstate $cfg_wmstate}
2158 if {$cfg_wmstate eq {zoomed}} {
2159 # on Windows wm geometry will lie about window
2160 # position (but not size) when window is zoomed
2161 # restore the window before querying wm geometry
2162 wm state . normal
2164 set cfg_geometry [list]
2165 lappend cfg_geometry [wm geometry .]
2166 lappend cfg_geometry [lindex [.vpane sash coord 0] 0]
2167 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1]
2168 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2169 set rc_geometry {}
2171 if {$cfg_geometry ne $rc_geometry} {
2172 catch {git config gui.geometry $cfg_geometry}
2176 set ret_code $rc
2178 # Briefly enable send again, working around Tk bug
2179 # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
2180 tk appname [appname]
2182 destroy .
2185 proc do_rescan {} {
2186 rescan ui_ready
2189 proc ui_do_rescan {} {
2190 rescan {force_first_diff ui_ready}
2193 proc do_commit {} {
2194 commit_tree
2197 proc next_diff {{after {}}} {
2198 global next_diff_p next_diff_w next_diff_i
2199 show_diff $next_diff_p $next_diff_w {} {} $after
2202 proc find_anchor_pos {lst name} {
2203 set lid [lsearch -sorted -exact $lst $name]
2205 if {$lid == -1} {
2206 set lid 0
2207 foreach lname $lst {
2208 if {$lname >= $name} break
2209 incr lid
2213 return $lid
2216 proc find_file_from {flist idx delta path mmask} {
2217 global file_states
2219 set len [llength $flist]
2220 while {$idx >= 0 && $idx < $len} {
2221 set name [lindex $flist $idx]
2223 if {$name ne $path && [info exists file_states($name)]} {
2224 set state [lindex $file_states($name) 0]
2226 if {$mmask eq {} || [regexp $mmask $state]} {
2227 return $idx
2231 incr idx $delta
2234 return {}
2237 proc find_next_diff {w path {lno {}} {mmask {}}} {
2238 global next_diff_p next_diff_w next_diff_i
2239 global file_lists ui_index ui_workdir
2241 set flist $file_lists($w)
2242 if {$lno eq {}} {
2243 set lno [find_anchor_pos $flist $path]
2244 } else {
2245 incr lno -1
2248 if {$mmask ne {} && ![regexp {(^\^)|(\$$)} $mmask]} {
2249 if {$w eq $ui_index} {
2250 set mmask "^$mmask"
2251 } else {
2252 set mmask "$mmask\$"
2256 set idx [find_file_from $flist $lno 1 $path $mmask]
2257 if {$idx eq {}} {
2258 incr lno -1
2259 set idx [find_file_from $flist $lno -1 $path $mmask]
2262 if {$idx ne {}} {
2263 set next_diff_w $w
2264 set next_diff_p [lindex $flist $idx]
2265 set next_diff_i [expr {$idx+1}]
2266 return 1
2267 } else {
2268 return 0
2272 proc next_diff_after_action {w path {lno {}} {mmask {}}} {
2273 global current_diff_path
2275 if {$path ne $current_diff_path} {
2276 return {}
2277 } elseif {[find_next_diff $w $path $lno $mmask]} {
2278 return {next_diff;}
2279 } else {
2280 return {reshow_diff;}
2284 proc select_first_diff {after} {
2285 global ui_workdir
2287 if {[find_next_diff $ui_workdir {} 1 {^_?U}] ||
2288 [find_next_diff $ui_workdir {} 1 {[^O]$}]} {
2289 next_diff $after
2290 } else {
2291 uplevel #0 $after
2295 proc force_first_diff {after} {
2296 global ui_workdir current_diff_path file_states
2298 if {[info exists file_states($current_diff_path)]} {
2299 set state [lindex $file_states($current_diff_path) 0]
2300 } else {
2301 set state {OO}
2304 set reselect 0
2305 if {[string first {U} $state] >= 0} {
2306 # Already a conflict, do nothing
2307 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {^_?U}]} {
2308 set reselect 1
2309 } elseif {[string index $state 1] ne {O}} {
2310 # Already a diff & no conflicts, do nothing
2311 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {[^O]$}]} {
2312 set reselect 1
2315 if {$reselect} {
2316 next_diff $after
2317 } else {
2318 uplevel #0 $after
2322 proc toggle_or_diff {w x y} {
2323 global file_states file_lists current_diff_path ui_index ui_workdir
2324 global last_clicked selected_paths
2326 set pos [split [$w index @$x,$y] .]
2327 set lno [lindex $pos 0]
2328 set col [lindex $pos 1]
2329 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2330 if {$path eq {}} {
2331 set last_clicked {}
2332 return
2335 set last_clicked [list $w $lno]
2336 array unset selected_paths
2337 $ui_index tag remove in_sel 0.0 end
2338 $ui_workdir tag remove in_sel 0.0 end
2340 # Determine the state of the file
2341 if {[info exists file_states($path)]} {
2342 set state [lindex $file_states($path) 0]
2343 } else {
2344 set state {__}
2347 # Restage the file, or simply show the diff
2348 if {$col == 0 && $y > 1} {
2349 # Conflicts need special handling
2350 if {[string first {U} $state] >= 0} {
2351 # $w must always be $ui_workdir, but...
2352 if {$w ne $ui_workdir} { set lno {} }
2353 merge_stage_workdir $path $lno
2354 return
2357 if {[string index $state 1] eq {O}} {
2358 set mmask {}
2359 } else {
2360 set mmask {[^O]}
2363 set after [next_diff_after_action $w $path $lno $mmask]
2365 if {$w eq $ui_index} {
2366 update_indexinfo \
2367 "Unstaging [short_path $path] from commit" \
2368 [list $path] \
2369 [concat $after [list ui_ready]]
2370 } elseif {$w eq $ui_workdir} {
2371 update_index \
2372 "Adding [short_path $path]" \
2373 [list $path] \
2374 [concat $after [list ui_ready]]
2376 } else {
2377 show_diff $path $w $lno
2381 proc add_one_to_selection {w x y} {
2382 global file_lists last_clicked selected_paths
2384 set lno [lindex [split [$w index @$x,$y] .] 0]
2385 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2386 if {$path eq {}} {
2387 set last_clicked {}
2388 return
2391 if {$last_clicked ne {}
2392 && [lindex $last_clicked 0] ne $w} {
2393 array unset selected_paths
2394 [lindex $last_clicked 0] tag remove in_sel 0.0 end
2397 set last_clicked [list $w $lno]
2398 if {[catch {set in_sel $selected_paths($path)}]} {
2399 set in_sel 0
2401 if {$in_sel} {
2402 unset selected_paths($path)
2403 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2404 } else {
2405 set selected_paths($path) 1
2406 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2410 proc add_range_to_selection {w x y} {
2411 global file_lists last_clicked selected_paths
2413 if {[lindex $last_clicked 0] ne $w} {
2414 toggle_or_diff $w $x $y
2415 return
2418 set lno [lindex [split [$w index @$x,$y] .] 0]
2419 set lc [lindex $last_clicked 1]
2420 if {$lc < $lno} {
2421 set begin $lc
2422 set end $lno
2423 } else {
2424 set begin $lno
2425 set end $lc
2428 foreach path [lrange $file_lists($w) \
2429 [expr {$begin - 1}] \
2430 [expr {$end - 1}]] {
2431 set selected_paths($path) 1
2433 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2436 proc show_more_context {} {
2437 global repo_config
2438 if {$repo_config(gui.diffcontext) < 99} {
2439 incr repo_config(gui.diffcontext)
2440 reshow_diff
2444 proc show_less_context {} {
2445 global repo_config
2446 if {$repo_config(gui.diffcontext) > 1} {
2447 incr repo_config(gui.diffcontext) -1
2448 reshow_diff
2452 ######################################################################
2454 ## ui construction
2456 set ui_comm {}
2458 # -- Menu Bar
2460 menu .mbar -tearoff 0
2461 if {[is_MacOSX]} {
2462 # -- Apple Menu (Mac OS X only)
2464 .mbar add cascade -label Apple -menu .mbar.apple
2465 menu .mbar.apple
2467 .mbar add cascade -label [mc Repository] -menu .mbar.repository
2468 .mbar add cascade -label [mc Edit] -menu .mbar.edit
2469 if {[is_enabled branch]} {
2470 .mbar add cascade -label [mc Branch] -menu .mbar.branch
2472 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2473 .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit
2475 if {[is_enabled transport]} {
2476 .mbar add cascade -label [mc Merge] -menu .mbar.merge
2477 .mbar add cascade -label [mc Remote] -menu .mbar.remote
2479 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2480 .mbar add cascade -label [mc Tools] -menu .mbar.tools
2483 # -- Repository Menu
2485 menu .mbar.repository
2487 if {![is_bare]} {
2488 .mbar.repository add command \
2489 -label [mc "Explore Working Copy"] \
2490 -command {do_explore}
2491 .mbar.repository add separator
2494 .mbar.repository add command \
2495 -label [mc "Browse Current Branch's Files"] \
2496 -command {browser::new $current_branch}
2497 set ui_browse_current [.mbar.repository index last]
2498 .mbar.repository add command \
2499 -label [mc "Browse Branch Files..."] \
2500 -command browser_open::dialog
2501 .mbar.repository add separator
2503 .mbar.repository add command \
2504 -label [mc "Visualize Current Branch's History"] \
2505 -command {do_gitk $current_branch}
2506 set ui_visualize_current [.mbar.repository index last]
2507 .mbar.repository add command \
2508 -label [mc "Visualize All Branch History"] \
2509 -command {do_gitk --all}
2510 .mbar.repository add separator
2512 proc current_branch_write {args} {
2513 global current_branch
2514 .mbar.repository entryconf $::ui_browse_current \
2515 -label [mc "Browse %s's Files" $current_branch]
2516 .mbar.repository entryconf $::ui_visualize_current \
2517 -label [mc "Visualize %s's History" $current_branch]
2519 trace add variable current_branch write current_branch_write
2521 if {[is_enabled multicommit]} {
2522 .mbar.repository add command -label [mc "Database Statistics"] \
2523 -command do_stats
2525 .mbar.repository add command -label [mc "Compress Database"] \
2526 -command do_gc
2528 .mbar.repository add command -label [mc "Verify Database"] \
2529 -command do_fsck_objects
2531 .mbar.repository add separator
2533 if {[is_Cygwin]} {
2534 .mbar.repository add command \
2535 -label [mc "Create Desktop Icon"] \
2536 -command do_cygwin_shortcut
2537 } elseif {[is_Windows]} {
2538 .mbar.repository add command \
2539 -label [mc "Create Desktop Icon"] \
2540 -command do_windows_shortcut
2541 } elseif {[is_MacOSX]} {
2542 .mbar.repository add command \
2543 -label [mc "Create Desktop Icon"] \
2544 -command do_macosx_app
2548 if {[is_MacOSX]} {
2549 proc ::tk::mac::Quit {args} { do_quit }
2550 } else {
2551 .mbar.repository add command -label [mc Quit] \
2552 -command do_quit \
2553 -accelerator $M1T-Q
2556 # -- Edit Menu
2558 menu .mbar.edit
2559 .mbar.edit add command -label [mc Undo] \
2560 -command {catch {[focus] edit undo}} \
2561 -accelerator $M1T-Z
2562 .mbar.edit add command -label [mc Redo] \
2563 -command {catch {[focus] edit redo}} \
2564 -accelerator $M1T-Y
2565 .mbar.edit add separator
2566 .mbar.edit add command -label [mc Cut] \
2567 -command {catch {tk_textCut [focus]}} \
2568 -accelerator $M1T-X
2569 .mbar.edit add command -label [mc Copy] \
2570 -command {catch {tk_textCopy [focus]}} \
2571 -accelerator $M1T-C
2572 .mbar.edit add command -label [mc Paste] \
2573 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
2574 -accelerator $M1T-V
2575 .mbar.edit add command -label [mc Delete] \
2576 -command {catch {[focus] delete sel.first sel.last}} \
2577 -accelerator Del
2578 .mbar.edit add separator
2579 .mbar.edit add command -label [mc "Select All"] \
2580 -command {catch {[focus] tag add sel 0.0 end}} \
2581 -accelerator $M1T-A
2583 # -- Branch Menu
2585 if {[is_enabled branch]} {
2586 menu .mbar.branch
2588 .mbar.branch add command -label [mc "Create..."] \
2589 -command branch_create::dialog \
2590 -accelerator $M1T-N
2591 lappend disable_on_lock [list .mbar.branch entryconf \
2592 [.mbar.branch index last] -state]
2594 .mbar.branch add command -label [mc "Checkout..."] \
2595 -command branch_checkout::dialog \
2596 -accelerator $M1T-O
2597 lappend disable_on_lock [list .mbar.branch entryconf \
2598 [.mbar.branch index last] -state]
2600 .mbar.branch add command -label [mc "Rename..."] \
2601 -command branch_rename::dialog
2602 lappend disable_on_lock [list .mbar.branch entryconf \
2603 [.mbar.branch index last] -state]
2605 .mbar.branch add command -label [mc "Delete..."] \
2606 -command branch_delete::dialog
2607 lappend disable_on_lock [list .mbar.branch entryconf \
2608 [.mbar.branch index last] -state]
2610 .mbar.branch add command -label [mc "Reset..."] \
2611 -command merge::reset_hard
2612 lappend disable_on_lock [list .mbar.branch entryconf \
2613 [.mbar.branch index last] -state]
2616 # -- Commit Menu
2618 proc commit_btn_caption {} {
2619 if {[is_enabled nocommit]} {
2620 return [mc "Done"]
2621 } else {
2622 return [mc Commit@@verb]
2626 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2627 menu .mbar.commit
2629 if {![is_enabled nocommit]} {
2630 .mbar.commit add radiobutton \
2631 -label [mc "New Commit"] \
2632 -command do_select_commit_type \
2633 -variable selected_commit_type \
2634 -value new
2635 lappend disable_on_lock \
2636 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2638 .mbar.commit add radiobutton \
2639 -label [mc "Amend Last Commit"] \
2640 -command do_select_commit_type \
2641 -variable selected_commit_type \
2642 -value amend
2643 lappend disable_on_lock \
2644 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2646 .mbar.commit add separator
2649 .mbar.commit add command -label [mc Rescan] \
2650 -command ui_do_rescan \
2651 -accelerator F5
2652 lappend disable_on_lock \
2653 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2655 .mbar.commit add command -label [mc "Stage To Commit"] \
2656 -command do_add_selection \
2657 -accelerator $M1T-T
2658 lappend disable_on_lock \
2659 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2661 .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \
2662 -command do_add_all \
2663 -accelerator $M1T-I
2664 lappend disable_on_lock \
2665 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2667 .mbar.commit add command -label [mc "Unstage From Commit"] \
2668 -command do_unstage_selection \
2669 -accelerator $M1T-U
2670 lappend disable_on_lock \
2671 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2673 .mbar.commit add command -label [mc "Revert Changes"] \
2674 -command do_revert_selection \
2675 -accelerator $M1T-J
2676 lappend disable_on_lock \
2677 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2679 .mbar.commit add separator
2681 .mbar.commit add command -label [mc "Show Less Context"] \
2682 -command show_less_context \
2683 -accelerator $M1T-\-
2685 .mbar.commit add command -label [mc "Show More Context"] \
2686 -command show_more_context \
2687 -accelerator $M1T-=
2689 .mbar.commit add separator
2691 if {![is_enabled nocommitmsg]} {
2692 .mbar.commit add command -label [mc "Sign Off"] \
2693 -command do_signoff \
2694 -accelerator $M1T-S
2697 .mbar.commit add command -label [commit_btn_caption] \
2698 -command do_commit \
2699 -accelerator $M1T-Return
2700 lappend disable_on_lock \
2701 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2704 # -- Merge Menu
2706 if {[is_enabled branch]} {
2707 menu .mbar.merge
2708 .mbar.merge add command -label [mc "Local Merge..."] \
2709 -command merge::dialog \
2710 -accelerator $M1T-M
2711 lappend disable_on_lock \
2712 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2713 .mbar.merge add command -label [mc "Abort Merge..."] \
2714 -command merge::reset_hard
2715 lappend disable_on_lock \
2716 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2719 # -- Transport Menu
2721 if {[is_enabled transport]} {
2722 menu .mbar.remote
2724 .mbar.remote add command \
2725 -label [mc "Add..."] \
2726 -command remote_add::dialog \
2727 -accelerator $M1T-A
2728 .mbar.remote add command \
2729 -label [mc "Push..."] \
2730 -command do_push_anywhere \
2731 -accelerator $M1T-P
2732 .mbar.remote add command \
2733 -label [mc "Delete Branch..."] \
2734 -command remote_branch_delete::dialog
2737 if {[is_MacOSX]} {
2738 proc ::tk::mac::ShowPreferences {} {do_options}
2739 } else {
2740 # -- Edit Menu
2742 .mbar.edit add separator
2743 .mbar.edit add command -label [mc "Options..."] \
2744 -command do_options
2747 # -- Tools Menu
2749 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2750 set tools_menubar .mbar.tools
2751 menu $tools_menubar
2752 $tools_menubar add separator
2753 $tools_menubar add command -label [mc "Add..."] -command tools_add::dialog
2754 $tools_menubar add command -label [mc "Remove..."] -command tools_remove::dialog
2755 set tools_tailcnt 3
2756 if {[array names repo_config guitool.*.cmd] ne {}} {
2757 tools_populate_all
2761 # -- Help Menu
2763 .mbar add cascade -label [mc Help] -menu .mbar.help
2764 menu .mbar.help
2766 if {[is_MacOSX]} {
2767 .mbar.apple add command -label [mc "About %s" [appname]] \
2768 -command do_about
2769 .mbar.apple add separator
2770 } else {
2771 .mbar.help add command -label [mc "About %s" [appname]] \
2772 -command do_about
2774 . configure -menu .mbar
2776 set doc_path [githtmldir]
2777 if {$doc_path ne {}} {
2778 set doc_path [file join $doc_path index.html]
2780 if {[is_Cygwin]} {
2781 set doc_path [exec cygpath --mixed $doc_path]
2785 if {[file isfile $doc_path]} {
2786 set doc_url "file:$doc_path"
2787 } else {
2788 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
2791 proc start_browser {url} {
2792 git "web--browse" $url
2795 .mbar.help add command -label [mc "Online Documentation"] \
2796 -command [list start_browser $doc_url]
2798 .mbar.help add command -label [mc "Show SSH Key"] \
2799 -command do_ssh_key
2801 unset doc_path doc_url
2803 # -- Standard bindings
2805 wm protocol . WM_DELETE_WINDOW do_quit
2806 bind all <$M1B-Key-q> do_quit
2807 bind all <$M1B-Key-Q> do_quit
2808 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
2809 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
2811 set subcommand_args {}
2812 proc usage {} {
2813 puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
2814 exit 1
2817 proc normalize_relpath {path} {
2818 set elements {}
2819 foreach item [file split $path] {
2820 if {$item eq {.}} continue
2821 if {$item eq {..} && [llength $elements] > 0
2822 && [lindex $elements end] ne {..}} {
2823 set elements [lrange $elements 0 end-1]
2824 continue
2826 lappend elements $item
2828 return [eval file join $elements]
2831 # -- Not a normal commit type invocation? Do that instead!
2833 switch -- $subcommand {
2834 browser -
2835 blame {
2836 if {$subcommand eq "blame"} {
2837 set subcommand_args {[--line=<num>] rev? path}
2838 } else {
2839 set subcommand_args {rev? path}
2841 if {$argv eq {}} usage
2842 set head {}
2843 set path {}
2844 set jump_spec {}
2845 set is_path 0
2846 foreach a $argv {
2847 if {$is_path || [file exists $_prefix$a]} {
2848 if {$path ne {}} usage
2849 set path [normalize_relpath $_prefix$a]
2850 break
2851 } elseif {$a eq {--}} {
2852 if {$path ne {}} {
2853 if {$head ne {}} usage
2854 set head $path
2855 set path {}
2857 set is_path 1
2858 } elseif {[regexp {^--line=(\d+)$} $a a lnum]} {
2859 if {$jump_spec ne {} || $head ne {}} usage
2860 set jump_spec [list $lnum]
2861 } elseif {$head eq {}} {
2862 if {$head ne {}} usage
2863 set head $a
2864 set is_path 1
2865 } else {
2866 usage
2869 unset is_path
2871 if {$head ne {} && $path eq {}} {
2872 set path [normalize_relpath $_prefix$head]
2873 set head {}
2876 if {$head eq {}} {
2877 load_current_branch
2878 } else {
2879 if {[regexp {^[0-9a-f]{1,39}$} $head]} {
2880 if {[catch {
2881 set head [git rev-parse --verify $head]
2882 } err]} {
2883 puts stderr $err
2884 exit 1
2887 set current_branch $head
2890 switch -- $subcommand {
2891 browser {
2892 if {$jump_spec ne {}} usage
2893 if {$head eq {}} {
2894 if {$path ne {} && [file isdirectory $path]} {
2895 set head $current_branch
2896 } else {
2897 set head $path
2898 set path {}
2901 browser::new $head $path
2903 blame {
2904 if {$head eq {} && ![file exists $path]} {
2905 puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path]
2906 exit 1
2908 blame::new $head $path $jump_spec
2911 return
2913 citool -
2914 gui {
2915 if {[llength $argv] != 0} {
2916 puts -nonewline stderr "usage: $argv0"
2917 if {$subcommand ne {gui}
2918 && [file tail $argv0] ne "git-$subcommand"} {
2919 puts -nonewline stderr " $subcommand"
2921 puts stderr {}
2922 exit 1
2924 # fall through to setup UI for commits
2926 default {
2927 puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
2928 exit 1
2932 # -- Branch Control
2934 frame .branch \
2935 -borderwidth 1 \
2936 -relief sunken
2937 label .branch.l1 \
2938 -text [mc "Current Branch:"] \
2939 -anchor w \
2940 -justify left
2941 label .branch.cb \
2942 -textvariable current_branch \
2943 -anchor w \
2944 -justify left
2945 pack .branch.l1 -side left
2946 pack .branch.cb -side left -fill x
2947 pack .branch -side top -fill x
2949 # -- Main Window Layout
2951 panedwindow .vpane -orient horizontal
2952 panedwindow .vpane.files -orient vertical
2953 .vpane add .vpane.files -sticky nsew -height 100 -width 200
2954 pack .vpane -anchor n -side top -fill both -expand 1
2956 # -- Index File List
2958 frame .vpane.files.index -height 100 -width 200
2959 label .vpane.files.index.title -text [mc "Staged Changes (Will Commit)"] \
2960 -background lightgreen -foreground black
2961 text $ui_index -background white -foreground black \
2962 -borderwidth 0 \
2963 -width 20 -height 10 \
2964 -wrap none \
2965 -cursor $cursor_ptr \
2966 -xscrollcommand {.vpane.files.index.sx set} \
2967 -yscrollcommand {.vpane.files.index.sy set} \
2968 -state disabled
2969 scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
2970 scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
2971 pack .vpane.files.index.title -side top -fill x
2972 pack .vpane.files.index.sx -side bottom -fill x
2973 pack .vpane.files.index.sy -side right -fill y
2974 pack $ui_index -side left -fill both -expand 1
2976 # -- Working Directory File List
2978 frame .vpane.files.workdir -height 100 -width 200
2979 label .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
2980 -background lightsalmon -foreground black
2981 text $ui_workdir -background white -foreground black \
2982 -borderwidth 0 \
2983 -width 20 -height 10 \
2984 -wrap none \
2985 -cursor $cursor_ptr \
2986 -xscrollcommand {.vpane.files.workdir.sx set} \
2987 -yscrollcommand {.vpane.files.workdir.sy set} \
2988 -state disabled
2989 scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
2990 scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
2991 pack .vpane.files.workdir.title -side top -fill x
2992 pack .vpane.files.workdir.sx -side bottom -fill x
2993 pack .vpane.files.workdir.sy -side right -fill y
2994 pack $ui_workdir -side left -fill both -expand 1
2996 .vpane.files add .vpane.files.workdir -sticky nsew
2997 .vpane.files add .vpane.files.index -sticky nsew
2999 foreach i [list $ui_index $ui_workdir] {
3000 rmsel_tag $i
3001 $i tag conf in_diff -background [$i tag cget in_sel -background]
3003 unset i
3005 # -- Diff and Commit Area
3007 frame .vpane.lower -height 300 -width 400
3008 frame .vpane.lower.commarea
3009 frame .vpane.lower.diff -relief sunken -borderwidth 1
3010 pack .vpane.lower.diff -fill both -expand 1
3011 pack .vpane.lower.commarea -side bottom -fill x
3012 .vpane add .vpane.lower -sticky nsew
3014 # -- Commit Area Buttons
3016 frame .vpane.lower.commarea.buttons
3017 label .vpane.lower.commarea.buttons.l -text {} \
3018 -anchor w \
3019 -justify left
3020 pack .vpane.lower.commarea.buttons.l -side top -fill x
3021 pack .vpane.lower.commarea.buttons -side left -fill y
3023 button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
3024 -command ui_do_rescan
3025 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3026 lappend disable_on_lock \
3027 {.vpane.lower.commarea.buttons.rescan conf -state}
3029 button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
3030 -command do_add_all
3031 pack .vpane.lower.commarea.buttons.incall -side top -fill x
3032 lappend disable_on_lock \
3033 {.vpane.lower.commarea.buttons.incall conf -state}
3035 if {![is_enabled nocommitmsg]} {
3036 button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
3037 -command do_signoff
3038 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3041 button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \
3042 -command do_commit
3043 pack .vpane.lower.commarea.buttons.commit -side top -fill x
3044 lappend disable_on_lock \
3045 {.vpane.lower.commarea.buttons.commit conf -state}
3047 if {![is_enabled nocommit]} {
3048 button .vpane.lower.commarea.buttons.push -text [mc Push] \
3049 -command do_push_anywhere
3050 pack .vpane.lower.commarea.buttons.push -side top -fill x
3053 # -- Commit Message Buffer
3055 frame .vpane.lower.commarea.buffer
3056 frame .vpane.lower.commarea.buffer.header
3057 set ui_comm .vpane.lower.commarea.buffer.t
3058 set ui_coml .vpane.lower.commarea.buffer.header.l
3060 if {![is_enabled nocommit]} {
3061 radiobutton .vpane.lower.commarea.buffer.header.new \
3062 -text [mc "New Commit"] \
3063 -command do_select_commit_type \
3064 -variable selected_commit_type \
3065 -value new
3066 lappend disable_on_lock \
3067 [list .vpane.lower.commarea.buffer.header.new conf -state]
3068 radiobutton .vpane.lower.commarea.buffer.header.amend \
3069 -text [mc "Amend Last Commit"] \
3070 -command do_select_commit_type \
3071 -variable selected_commit_type \
3072 -value amend
3073 lappend disable_on_lock \
3074 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3077 label $ui_coml \
3078 -anchor w \
3079 -justify left
3080 proc trace_commit_type {varname args} {
3081 global ui_coml commit_type
3082 switch -glob -- $commit_type {
3083 initial {set txt [mc "Initial Commit Message:"]}
3084 amend {set txt [mc "Amended Commit Message:"]}
3085 amend-initial {set txt [mc "Amended Initial Commit Message:"]}
3086 amend-merge {set txt [mc "Amended Merge Commit Message:"]}
3087 merge {set txt [mc "Merge Commit Message:"]}
3088 * {set txt [mc "Commit Message:"]}
3090 $ui_coml conf -text $txt
3092 trace add variable commit_type write trace_commit_type
3093 pack $ui_coml -side left -fill x
3095 if {![is_enabled nocommit]} {
3096 pack .vpane.lower.commarea.buffer.header.amend -side right
3097 pack .vpane.lower.commarea.buffer.header.new -side right
3100 text $ui_comm -background white -foreground black \
3101 -borderwidth 1 \
3102 -undo true \
3103 -maxundo 20 \
3104 -autoseparators true \
3105 -relief sunken \
3106 -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
3107 -font font_diff \
3108 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3109 scrollbar .vpane.lower.commarea.buffer.sby \
3110 -command [list $ui_comm yview]
3111 pack .vpane.lower.commarea.buffer.header -side top -fill x
3112 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3113 pack $ui_comm -side left -fill y
3114 pack .vpane.lower.commarea.buffer -side left -fill y
3116 # -- Commit Message Buffer Context Menu
3118 set ctxm .vpane.lower.commarea.buffer.ctxm
3119 menu $ctxm -tearoff 0
3120 $ctxm add command \
3121 -label [mc Cut] \
3122 -command {tk_textCut $ui_comm}
3123 $ctxm add command \
3124 -label [mc Copy] \
3125 -command {tk_textCopy $ui_comm}
3126 $ctxm add command \
3127 -label [mc Paste] \
3128 -command {tk_textPaste $ui_comm}
3129 $ctxm add command \
3130 -label [mc Delete] \
3131 -command {catch {$ui_comm delete sel.first sel.last}}
3132 $ctxm add separator
3133 $ctxm add command \
3134 -label [mc "Select All"] \
3135 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
3136 $ctxm add command \
3137 -label [mc "Copy All"] \
3138 -command {
3139 $ui_comm tag add sel 0.0 end
3140 tk_textCopy $ui_comm
3141 $ui_comm tag remove sel 0.0 end
3143 $ctxm add separator
3144 $ctxm add command \
3145 -label [mc "Sign Off"] \
3146 -command do_signoff
3147 set ui_comm_ctxm $ctxm
3149 # -- Diff Header
3151 proc trace_current_diff_path {varname args} {
3152 global current_diff_path diff_actions file_states
3153 if {$current_diff_path eq {}} {
3154 set s {}
3155 set f {}
3156 set p {}
3157 set o disabled
3158 } else {
3159 set p $current_diff_path
3160 set s [mapdesc [lindex $file_states($p) 0] $p]
3161 set f [mc "File:"]
3162 set p [escape_path $p]
3163 set o normal
3166 .vpane.lower.diff.header.status configure -text $s
3167 .vpane.lower.diff.header.file configure -text $f
3168 .vpane.lower.diff.header.path configure -text $p
3169 foreach w $diff_actions {
3170 uplevel #0 $w $o
3173 trace add variable current_diff_path write trace_current_diff_path
3175 frame .vpane.lower.diff.header -background gold
3176 label .vpane.lower.diff.header.status \
3177 -background gold \
3178 -foreground black \
3179 -width $max_status_desc \
3180 -anchor w \
3181 -justify left
3182 label .vpane.lower.diff.header.file \
3183 -background gold \
3184 -foreground black \
3185 -anchor w \
3186 -justify left
3187 label .vpane.lower.diff.header.path \
3188 -background gold \
3189 -foreground black \
3190 -anchor w \
3191 -justify left
3192 pack .vpane.lower.diff.header.status -side left
3193 pack .vpane.lower.diff.header.file -side left
3194 pack .vpane.lower.diff.header.path -fill x
3195 set ctxm .vpane.lower.diff.header.ctxm
3196 menu $ctxm -tearoff 0
3197 $ctxm add command \
3198 -label [mc Copy] \
3199 -command {
3200 clipboard clear
3201 clipboard append \
3202 -format STRING \
3203 -type STRING \
3204 -- $current_diff_path
3206 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3207 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3209 # -- Diff Body
3211 frame .vpane.lower.diff.body
3212 set ui_diff .vpane.lower.diff.body.t
3213 text $ui_diff -background white -foreground black \
3214 -borderwidth 0 \
3215 -width 80 -height 5 -wrap none \
3216 -font font_diff \
3217 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3218 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3219 -state disabled
3220 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3221 -command [list $ui_diff xview]
3222 scrollbar .vpane.lower.diff.body.sby -orient vertical \
3223 -command [list $ui_diff yview]
3224 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3225 pack .vpane.lower.diff.body.sby -side right -fill y
3226 pack $ui_diff -side left -fill both -expand 1
3227 pack .vpane.lower.diff.header -side top -fill x
3228 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3230 $ui_diff tag conf d_cr -elide true
3231 $ui_diff tag conf d_@ -foreground blue -font font_diffbold
3232 $ui_diff tag conf d_+ -foreground {#00a000}
3233 $ui_diff tag conf d_- -foreground red
3235 $ui_diff tag conf d_++ -foreground {#00a000}
3236 $ui_diff tag conf d_-- -foreground red
3237 $ui_diff tag conf d_+s \
3238 -foreground {#00a000} \
3239 -background {#e2effa}
3240 $ui_diff tag conf d_-s \
3241 -foreground red \
3242 -background {#e2effa}
3243 $ui_diff tag conf d_s+ \
3244 -foreground {#00a000} \
3245 -background ivory1
3246 $ui_diff tag conf d_s- \
3247 -foreground red \
3248 -background ivory1
3250 $ui_diff tag conf d<<<<<<< \
3251 -foreground orange \
3252 -font font_diffbold
3253 $ui_diff tag conf d======= \
3254 -foreground orange \
3255 -font font_diffbold
3256 $ui_diff tag conf d>>>>>>> \
3257 -foreground orange \
3258 -font font_diffbold
3260 $ui_diff tag raise sel
3262 # -- Diff Body Context Menu
3265 proc create_common_diff_popup {ctxm} {
3266 $ctxm add command \
3267 -label [mc Refresh] \
3268 -command reshow_diff
3269 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3270 $ctxm add command \
3271 -label [mc Copy] \
3272 -command {tk_textCopy $ui_diff}
3273 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3274 $ctxm add command \
3275 -label [mc "Select All"] \
3276 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
3277 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3278 $ctxm add command \
3279 -label [mc "Copy All"] \
3280 -command {
3281 $ui_diff tag add sel 0.0 end
3282 tk_textCopy $ui_diff
3283 $ui_diff tag remove sel 0.0 end
3285 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3286 $ctxm add separator
3287 $ctxm add command \
3288 -label [mc "Decrease Font Size"] \
3289 -command {incr_font_size font_diff -1}
3290 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3291 $ctxm add command \
3292 -label [mc "Increase Font Size"] \
3293 -command {incr_font_size font_diff 1}
3294 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3295 $ctxm add separator
3296 set emenu $ctxm.enc
3297 menu $emenu
3298 build_encoding_menu $emenu [list force_diff_encoding]
3299 $ctxm add cascade \
3300 -label [mc "Encoding"] \
3301 -menu $emenu
3302 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3303 $ctxm add separator
3304 $ctxm add command -label [mc "Options..."] \
3305 -command do_options
3308 set ctxm .vpane.lower.diff.body.ctxm
3309 menu $ctxm -tearoff 0
3310 $ctxm add command \
3311 -label [mc "Apply/Reverse Hunk"] \
3312 -command {apply_hunk $cursorX $cursorY}
3313 set ui_diff_applyhunk [$ctxm index last]
3314 lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
3315 $ctxm add command \
3316 -label [mc "Apply/Reverse Line"] \
3317 -command {apply_range_or_line $cursorX $cursorY; do_rescan}
3318 set ui_diff_applyline [$ctxm index last]
3319 lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state]
3320 $ctxm add separator
3321 $ctxm add command \
3322 -label [mc "Show Less Context"] \
3323 -command show_less_context
3324 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3325 $ctxm add command \
3326 -label [mc "Show More Context"] \
3327 -command show_more_context
3328 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3329 $ctxm add separator
3330 create_common_diff_popup $ctxm
3332 set ctxmmg .vpane.lower.diff.body.ctxmmg
3333 menu $ctxmmg -tearoff 0
3334 $ctxmmg add command \
3335 -label [mc "Run Merge Tool"] \
3336 -command {merge_resolve_tool}
3337 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3338 $ctxmmg add separator
3339 $ctxmmg add command \
3340 -label [mc "Use Remote Version"] \
3341 -command {merge_resolve_one 3}
3342 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3343 $ctxmmg add command \
3344 -label [mc "Use Local Version"] \
3345 -command {merge_resolve_one 2}
3346 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3347 $ctxmmg add command \
3348 -label [mc "Revert To Base"] \
3349 -command {merge_resolve_one 1}
3350 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3351 $ctxmmg add separator
3352 $ctxmmg add command \
3353 -label [mc "Show Less Context"] \
3354 -command show_less_context
3355 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3356 $ctxmmg add command \
3357 -label [mc "Show More Context"] \
3358 -command show_more_context
3359 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3360 $ctxmmg add separator
3361 create_common_diff_popup $ctxmmg
3363 set ctxmsm .vpane.lower.diff.body.ctxmsm
3364 menu $ctxmsm -tearoff 0
3365 $ctxmsm add command \
3366 -label [mc "Visualize These Changes In The Submodule"] \
3367 -command {do_gitk -- true}
3368 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3369 $ctxmsm add command \
3370 -label [mc "Visualize Current Branch History In The Submodule"] \
3371 -command {do_gitk {} true}
3372 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3373 $ctxmsm add command \
3374 -label [mc "Visualize All Branch History In The Submodule"] \
3375 -command {do_gitk --all true}
3376 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3377 $ctxmsm add separator
3378 $ctxmsm add command \
3379 -label [mc "Start git gui In The Submodule"] \
3380 -command {do_git_gui}
3381 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3382 $ctxmsm add separator
3383 create_common_diff_popup $ctxmsm
3385 proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
3386 global current_diff_path file_states
3387 set ::cursorX $x
3388 set ::cursorY $y
3389 if {[info exists file_states($current_diff_path)]} {
3390 set state [lindex $file_states($current_diff_path) 0]
3391 } else {
3392 set state {__}
3394 if {[string first {U} $state] >= 0} {
3395 tk_popup $ctxmmg $X $Y
3396 } elseif {$::is_submodule_diff} {
3397 tk_popup $ctxmsm $X $Y
3398 } else {
3399 set has_range [expr {[$::ui_diff tag nextrange sel 0.0] != {}}]
3400 if {$::ui_index eq $::current_diff_side} {
3401 set l [mc "Unstage Hunk From Commit"]
3402 if {$has_range} {
3403 set t [mc "Unstage Lines From Commit"]
3404 } else {
3405 set t [mc "Unstage Line From Commit"]
3407 } else {
3408 set l [mc "Stage Hunk For Commit"]
3409 if {$has_range} {
3410 set t [mc "Stage Lines For Commit"]
3411 } else {
3412 set t [mc "Stage Line For Commit"]
3415 if {$::is_3way_diff
3416 || $current_diff_path eq {}
3417 || {__} eq $state
3418 || {_O} eq $state
3419 || {_T} eq $state
3420 || {T_} eq $state} {
3421 set s disabled
3422 } else {
3423 set s normal
3425 $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
3426 $ctxm entryconf $::ui_diff_applyline -state $s -label $t
3427 tk_popup $ctxm $X $Y
3430 bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg $ctxmsm %x %y %X %Y]
3432 # -- Status Bar
3434 set main_status [::status_bar::new .status]
3435 pack .status -anchor w -side bottom -fill x
3436 $main_status show [mc "Initializing..."]
3438 # -- Load geometry
3440 catch {
3441 set gm $repo_config(gui.geometry)
3442 wm geometry . [lindex $gm 0]
3443 .vpane sash place 0 \
3444 [lindex $gm 1] \
3445 [lindex [.vpane sash coord 0] 1]
3446 .vpane.files sash place 0 \
3447 [lindex [.vpane.files sash coord 0] 0] \
3448 [lindex $gm 2]
3449 unset gm
3452 # -- Load window state
3454 catch {
3455 set gws $repo_config(gui.wmstate)
3456 wm state . $gws
3457 unset gws
3460 # -- Key Bindings
3462 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3463 bind $ui_comm <$M1B-Key-t> {do_add_selection;break}
3464 bind $ui_comm <$M1B-Key-T> {do_add_selection;break}
3465 bind $ui_comm <$M1B-Key-u> {do_unstage_selection;break}
3466 bind $ui_comm <$M1B-Key-U> {do_unstage_selection;break}
3467 bind $ui_comm <$M1B-Key-j> {do_revert_selection;break}
3468 bind $ui_comm <$M1B-Key-J> {do_revert_selection;break}
3469 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
3470 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
3471 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3472 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3473 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3474 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3475 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3476 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3477 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3478 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3479 bind $ui_comm <$M1B-Key-minus> {show_less_context;break}
3480 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break}
3481 bind $ui_comm <$M1B-Key-equal> {show_more_context;break}
3482 bind $ui_comm <$M1B-Key-plus> {show_more_context;break}
3483 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break}
3485 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3486 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3487 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3488 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3489 bind $ui_diff <$M1B-Key-v> {break}
3490 bind $ui_diff <$M1B-Key-V> {break}
3491 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3492 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3493 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3494 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3495 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3496 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3497 bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
3498 bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
3499 bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
3500 bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
3501 bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
3502 bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
3503 bind $ui_diff <Button-1> {focus %W}
3505 if {[is_enabled branch]} {
3506 bind . <$M1B-Key-n> branch_create::dialog
3507 bind . <$M1B-Key-N> branch_create::dialog
3508 bind . <$M1B-Key-o> branch_checkout::dialog
3509 bind . <$M1B-Key-O> branch_checkout::dialog
3510 bind . <$M1B-Key-m> merge::dialog
3511 bind . <$M1B-Key-M> merge::dialog
3513 if {[is_enabled transport]} {
3514 bind . <$M1B-Key-p> do_push_anywhere
3515 bind . <$M1B-Key-P> do_push_anywhere
3518 bind . <Key-F5> ui_do_rescan
3519 bind . <$M1B-Key-r> ui_do_rescan
3520 bind . <$M1B-Key-R> ui_do_rescan
3521 bind . <$M1B-Key-s> do_signoff
3522 bind . <$M1B-Key-S> do_signoff
3523 bind . <$M1B-Key-t> do_add_selection
3524 bind . <$M1B-Key-T> do_add_selection
3525 bind . <$M1B-Key-i> do_add_all
3526 bind . <$M1B-Key-I> do_add_all
3527 bind . <$M1B-Key-minus> {show_less_context;break}
3528 bind . <$M1B-Key-KP_Subtract> {show_less_context;break}
3529 bind . <$M1B-Key-equal> {show_more_context;break}
3530 bind . <$M1B-Key-plus> {show_more_context;break}
3531 bind . <$M1B-Key-KP_Add> {show_more_context;break}
3532 bind . <$M1B-Key-Return> do_commit
3533 foreach i [list $ui_index $ui_workdir] {
3534 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
3535 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3536 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
3538 unset i
3540 set file_lists($ui_index) [list]
3541 set file_lists($ui_workdir) [list]
3543 wm title . "[appname] ([reponame]) [file normalize $_gitworktree]"
3544 focus -force $ui_comm
3546 # -- Warn the user about environmental problems. Cygwin's Tcl
3547 # does *not* pass its env array onto any processes it spawns.
3548 # This means that git processes get none of our environment.
3550 if {[is_Cygwin]} {
3551 set ignored_env 0
3552 set suggest_user {}
3553 set msg [mc "Possible environment issues exist.
3555 The following environment variables are probably
3556 going to be ignored by any Git subprocess run
3557 by %s:
3559 " [appname]]
3560 foreach name [array names env] {
3561 switch -regexp -- $name {
3562 {^GIT_INDEX_FILE$} -
3563 {^GIT_OBJECT_DIRECTORY$} -
3564 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3565 {^GIT_DIFF_OPTS$} -
3566 {^GIT_EXTERNAL_DIFF$} -
3567 {^GIT_PAGER$} -
3568 {^GIT_TRACE$} -
3569 {^GIT_CONFIG$} -
3570 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3571 append msg " - $name\n"
3572 incr ignored_env
3574 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3575 append msg " - $name\n"
3576 incr ignored_env
3577 set suggest_user $name
3581 if {$ignored_env > 0} {
3582 append msg [mc "
3583 This is due to a known issue with the
3584 Tcl binary distributed by Cygwin."]
3586 if {$suggest_user ne {}} {
3587 append msg [mc "
3589 A good replacement for %s
3590 is placing values for the user.name and
3591 user.email settings into your personal
3592 ~/.gitconfig file.
3593 " $suggest_user]
3595 warn_popup $msg
3597 unset ignored_env msg suggest_user name
3600 # -- Only initialize complex UI if we are going to stay running.
3602 if {[is_enabled transport]} {
3603 load_all_remotes
3605 set n [.mbar.remote index end]
3606 populate_remotes_menu
3607 set n [expr {[.mbar.remote index end] - $n}]
3608 if {$n > 0} {
3609 if {[.mbar.remote type 0] eq "tearoff"} { incr n }
3610 .mbar.remote insert $n separator
3612 unset n
3615 if {[winfo exists $ui_comm]} {
3616 set GITGUI_BCK_exists [load_message GITGUI_BCK]
3618 # -- If both our backup and message files exist use the
3619 # newer of the two files to initialize the buffer.
3621 if {$GITGUI_BCK_exists} {
3622 set m [gitdir GITGUI_MSG]
3623 if {[file isfile $m]} {
3624 if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} {
3625 catch {file delete [gitdir GITGUI_MSG]}
3626 } else {
3627 $ui_comm delete 0.0 end
3628 $ui_comm edit reset
3629 $ui_comm edit modified false
3630 catch {file delete [gitdir GITGUI_BCK]}
3631 set GITGUI_BCK_exists 0
3634 unset m
3637 proc backup_commit_buffer {} {
3638 global ui_comm GITGUI_BCK_exists
3640 set m [$ui_comm edit modified]
3641 if {$m || $GITGUI_BCK_exists} {
3642 set msg [string trim [$ui_comm get 0.0 end]]
3643 regsub -all -line {[ \r\t]+$} $msg {} msg
3645 if {$msg eq {}} {
3646 if {$GITGUI_BCK_exists} {
3647 catch {file delete [gitdir GITGUI_BCK]}
3648 set GITGUI_BCK_exists 0
3650 } elseif {$m} {
3651 catch {
3652 set fd [open [gitdir GITGUI_BCK] w]
3653 puts -nonewline $fd $msg
3654 close $fd
3655 set GITGUI_BCK_exists 1
3659 $ui_comm edit modified false
3662 set ::GITGUI_BCK_i [after 2000 backup_commit_buffer]
3665 backup_commit_buffer
3667 # -- If the user has aspell available we can drive it
3668 # in pipe mode to spellcheck the commit message.
3670 set spell_cmd [list |]
3671 set spell_dict [get_config gui.spellingdictionary]
3672 lappend spell_cmd aspell
3673 if {$spell_dict ne {}} {
3674 lappend spell_cmd --master=$spell_dict
3676 lappend spell_cmd --mode=none
3677 lappend spell_cmd --encoding=utf-8
3678 lappend spell_cmd pipe
3679 if {$spell_dict eq {none}
3680 || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} {
3681 bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y]
3682 } else {
3683 set ui_comm_spell [spellcheck::init \
3684 $spell_fd \
3685 $ui_comm \
3686 $ui_comm_ctxm \
3689 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
3692 lock_index begin-read
3693 if {![winfo ismapped .]} {
3694 wm deiconify .
3696 after 1 {
3697 if {[is_enabled initialamend]} {
3698 force_amend
3699 } else {
3700 do_rescan
3703 if {[is_enabled nocommitmsg]} {
3704 $ui_comm configure -state disabled -background gray
3707 if {[is_enabled multicommit]} {
3708 after 1000 hint_gc
3710 if {[is_enabled retcode]} {
3711 bind . <Destroy> {+terminate_me %W}
3713 if {$picked && [is_config_true gui.autoexplore]} {
3714 do_explore