"reset --merge": fix unmerged case
[git/dscho.git] / git-gui / git-gui.sh
blob718277a651f1fbc8e100e7eb657d87699b1059cb
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 _gitexec {}
125 set _githtmldir {}
126 set _reponame {}
127 set _iscygwin {}
128 set _search_path {}
130 set _trace [lsearch -exact $argv --trace]
131 if {$_trace >= 0} {
132 set argv [lreplace $argv $_trace $_trace]
133 set _trace 1
134 } else {
135 set _trace 0
138 proc appname {} {
139 global _appname
140 return $_appname
143 proc gitdir {args} {
144 global _gitdir
145 if {$args eq {}} {
146 return $_gitdir
148 return [eval [list file join $_gitdir] $args]
151 proc gitexec {args} {
152 global _gitexec
153 if {$_gitexec eq {}} {
154 if {[catch {set _gitexec [git --exec-path]} err]} {
155 error "Git not installed?\n\n$err"
157 if {[is_Cygwin]} {
158 set _gitexec [exec cygpath \
159 --windows \
160 --absolute \
161 $_gitexec]
162 } else {
163 set _gitexec [file normalize $_gitexec]
166 if {$args eq {}} {
167 return $_gitexec
169 return [eval [list file join $_gitexec] $args]
172 proc githtmldir {args} {
173 global _githtmldir
174 if {$_githtmldir eq {}} {
175 if {[catch {set _githtmldir [git --html-path]}]} {
176 # Git not installed or option not yet supported
177 return {}
179 if {[is_Cygwin]} {
180 set _githtmldir [exec cygpath \
181 --windows \
182 --absolute \
183 $_githtmldir]
184 } else {
185 set _githtmldir [file normalize $_githtmldir]
188 if {$args eq {}} {
189 return $_githtmldir
191 return [eval [list file join $_githtmldir] $args]
194 proc reponame {} {
195 return $::_reponame
198 proc is_MacOSX {} {
199 if {[tk windowingsystem] eq {aqua}} {
200 return 1
202 return 0
205 proc is_Windows {} {
206 if {$::tcl_platform(platform) eq {windows}} {
207 return 1
209 return 0
212 proc is_Cygwin {} {
213 global _iscygwin
214 if {$_iscygwin eq {}} {
215 if {$::tcl_platform(platform) eq {windows}} {
216 if {[catch {set p [exec cygpath --windir]} err]} {
217 set _iscygwin 0
218 } else {
219 set _iscygwin 1
221 } else {
222 set _iscygwin 0
225 return $_iscygwin
228 proc is_enabled {option} {
229 global enabled_options
230 if {[catch {set on $enabled_options($option)}]} {return 0}
231 return $on
234 proc enable_option {option} {
235 global enabled_options
236 set enabled_options($option) 1
239 proc disable_option {option} {
240 global enabled_options
241 set enabled_options($option) 0
244 ######################################################################
246 ## config
248 proc is_many_config {name} {
249 switch -glob -- $name {
250 gui.recentrepo -
251 remote.*.fetch -
252 remote.*.push
253 {return 1}
255 {return 0}
259 proc is_config_true {name} {
260 global repo_config
261 if {[catch {set v $repo_config($name)}]} {
262 return 0
263 } elseif {$v eq {true} || $v eq {1} || $v eq {yes}} {
264 return 1
265 } else {
266 return 0
270 proc get_config {name} {
271 global repo_config
272 if {[catch {set v $repo_config($name)}]} {
273 return {}
274 } else {
275 return $v
279 ######################################################################
281 ## handy utils
283 proc _trace_exec {cmd} {
284 if {!$::_trace} return
285 set d {}
286 foreach v $cmd {
287 if {$d ne {}} {
288 append d { }
290 if {[regexp {[ \t\r\n'"$?*]} $v]} {
291 set v [sq $v]
293 append d $v
295 puts stderr $d
298 proc _git_cmd {name} {
299 global _git_cmd_path
301 if {[catch {set v $_git_cmd_path($name)}]} {
302 switch -- $name {
303 version -
304 --version -
305 --exec-path { return [list $::_git $name] }
308 set p [gitexec git-$name$::_search_exe]
309 if {[file exists $p]} {
310 set v [list $p]
311 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
312 # Try to determine what sort of magic will make
313 # git-$name go and do its thing, because native
314 # Tcl on Windows doesn't know it.
316 set p [gitexec git-$name]
317 set f [open $p r]
318 set s [gets $f]
319 close $f
321 switch -glob -- [lindex $s 0] {
322 #!*sh { set i sh }
323 #!*perl { set i perl }
324 #!*python { set i python }
325 default { error "git-$name is not supported: $s" }
328 upvar #0 _$i interp
329 if {![info exists interp]} {
330 set interp [_which $i]
332 if {$interp eq {}} {
333 error "git-$name requires $i (not in PATH)"
335 set v [concat [list $interp] [lrange $s 1 end] [list $p]]
336 } else {
337 # Assume it is builtin to git somehow and we
338 # aren't actually able to see a file for it.
340 set v [list $::_git $name]
342 set _git_cmd_path($name) $v
344 return $v
347 proc _which {what args} {
348 global env _search_exe _search_path
350 if {$_search_path eq {}} {
351 if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
352 set _search_path [split [exec cygpath \
353 --windows \
354 --path \
355 --absolute \
356 $env(PATH)] {;}]
357 set _search_exe .exe
358 } elseif {[is_Windows]} {
359 set gitguidir [file dirname [info script]]
360 regsub -all ";" $gitguidir "\\;" gitguidir
361 set env(PATH) "$gitguidir;$env(PATH)"
362 set _search_path [split $env(PATH) {;}]
363 set _search_exe .exe
364 } else {
365 set _search_path [split $env(PATH) :]
366 set _search_exe {}
370 if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
371 set suffix {}
372 } else {
373 set suffix $_search_exe
376 foreach p $_search_path {
377 set p [file join $p $what$suffix]
378 if {[file exists $p]} {
379 return [file normalize $p]
382 return {}
385 proc _lappend_nice {cmd_var} {
386 global _nice
387 upvar $cmd_var cmd
389 if {![info exists _nice]} {
390 set _nice [_which nice]
392 if {$_nice ne {}} {
393 lappend cmd $_nice
397 proc git {args} {
398 set opt [list]
400 while {1} {
401 switch -- [lindex $args 0] {
402 --nice {
403 _lappend_nice opt
406 default {
407 break
412 set args [lrange $args 1 end]
415 set cmdp [_git_cmd [lindex $args 0]]
416 set args [lrange $args 1 end]
418 _trace_exec [concat $opt $cmdp $args]
419 set result [eval exec $opt $cmdp $args]
420 if {$::_trace} {
421 puts stderr "< $result"
423 return $result
426 proc _open_stdout_stderr {cmd} {
427 _trace_exec $cmd
428 if {[catch {
429 set fd [open [concat [list | ] $cmd] r]
430 } err]} {
431 if { [lindex $cmd end] eq {2>@1}
432 && $err eq {can not find channel named "1"}
434 # Older versions of Tcl 8.4 don't have this 2>@1 IO
435 # redirect operator. Fallback to |& cat for those.
436 # The command was not actually started, so its safe
437 # to try to start it a second time.
439 set fd [open [concat \
440 [list | ] \
441 [lrange $cmd 0 end-1] \
442 [list |& cat] \
443 ] r]
444 } else {
445 error $err
448 fconfigure $fd -eofchar {}
449 return $fd
452 proc git_read {args} {
453 set opt [list]
455 while {1} {
456 switch -- [lindex $args 0] {
457 --nice {
458 _lappend_nice opt
461 --stderr {
462 lappend args 2>@1
465 default {
466 break
471 set args [lrange $args 1 end]
474 set cmdp [_git_cmd [lindex $args 0]]
475 set args [lrange $args 1 end]
477 return [_open_stdout_stderr [concat $opt $cmdp $args]]
480 proc git_write {args} {
481 set opt [list]
483 while {1} {
484 switch -- [lindex $args 0] {
485 --nice {
486 _lappend_nice opt
489 default {
490 break
495 set args [lrange $args 1 end]
498 set cmdp [_git_cmd [lindex $args 0]]
499 set args [lrange $args 1 end]
501 _trace_exec [concat $opt $cmdp $args]
502 return [open [concat [list | ] $opt $cmdp $args] w]
505 proc githook_read {hook_name args} {
506 set pchook [gitdir hooks $hook_name]
507 lappend args 2>@1
509 # On Windows [file executable] might lie so we need to ask
510 # the shell if the hook is executable. Yes that's annoying.
512 if {[is_Windows]} {
513 upvar #0 _sh interp
514 if {![info exists interp]} {
515 set interp [_which sh]
517 if {$interp eq {}} {
518 error "hook execution requires sh (not in PATH)"
521 set scr {if test -x "$1";then exec "$@";fi}
522 set sh_c [list $interp -c $scr $interp $pchook]
523 return [_open_stdout_stderr [concat $sh_c $args]]
526 if {[file executable $pchook]} {
527 return [_open_stdout_stderr [concat [list $pchook] $args]]
530 return {}
533 proc kill_file_process {fd} {
534 set process [pid $fd]
536 catch {
537 if {[is_Windows]} {
538 # Use a Cygwin-specific flag to allow killing
539 # native Windows processes
540 exec kill -f $process
541 } else {
542 exec kill $process
547 proc gitattr {path attr default} {
548 if {[catch {set r [git check-attr $attr -- $path]}]} {
549 set r unspecified
550 } else {
551 set r [join [lrange [split $r :] 2 end] :]
552 regsub {^ } $r {} r
554 if {$r eq {unspecified}} {
555 return $default
557 return $r
560 proc sq {value} {
561 regsub -all ' $value "'\\''" value
562 return "'$value'"
565 proc load_current_branch {} {
566 global current_branch is_detached
568 set fd [open [gitdir HEAD] r]
569 if {[gets $fd ref] < 1} {
570 set ref {}
572 close $fd
574 set pfx {ref: refs/heads/}
575 set len [string length $pfx]
576 if {[string equal -length $len $pfx $ref]} {
577 # We're on a branch. It might not exist. But
578 # HEAD looks good enough to be a branch.
580 set current_branch [string range $ref $len end]
581 set is_detached 0
582 } else {
583 # Assume this is a detached head.
585 set current_branch HEAD
586 set is_detached 1
590 auto_load tk_optionMenu
591 rename tk_optionMenu real__tkOptionMenu
592 proc tk_optionMenu {w varName args} {
593 set m [eval real__tkOptionMenu $w $varName $args]
594 $m configure -font font_ui
595 $w configure -font font_ui
596 return $m
599 proc rmsel_tag {text} {
600 $text tag conf sel \
601 -background [$text cget -background] \
602 -foreground [$text cget -foreground] \
603 -borderwidth 0
604 $text tag conf in_sel -background lightgray
605 bind $text <Motion> break
606 return $text
609 set root_exists 0
610 bind . <Visibility> {
611 bind . <Visibility> {}
612 set root_exists 1
615 if {[is_Windows]} {
616 wm iconbitmap . -default $oguilib/git-gui.ico
617 set ::tk::AlwaysShowSelection 1
619 # Spoof an X11 display for SSH
620 if {![info exists env(DISPLAY)]} {
621 set env(DISPLAY) :9999
623 } else {
624 catch {
625 image create photo gitlogo -width 16 -height 16
627 gitlogo put #33CC33 -to 7 0 9 2
628 gitlogo put #33CC33 -to 4 2 12 4
629 gitlogo put #33CC33 -to 7 4 9 6
630 gitlogo put #CC3333 -to 4 6 12 8
631 gitlogo put gray26 -to 4 9 6 10
632 gitlogo put gray26 -to 3 10 6 12
633 gitlogo put gray26 -to 8 9 13 11
634 gitlogo put gray26 -to 8 11 10 12
635 gitlogo put gray26 -to 11 11 13 14
636 gitlogo put gray26 -to 3 12 5 14
637 gitlogo put gray26 -to 5 13
638 gitlogo put gray26 -to 10 13
639 gitlogo put gray26 -to 4 14 12 15
640 gitlogo put gray26 -to 5 15 11 16
641 gitlogo redither
643 wm iconphoto . -default gitlogo
647 ######################################################################
649 ## config defaults
651 set cursor_ptr arrow
652 font create font_diff -family Courier -size 10
653 font create font_ui
654 catch {
655 label .dummy
656 eval font configure font_ui [font actual [.dummy cget -font]]
657 destroy .dummy
660 font create font_uiitalic
661 font create font_uibold
662 font create font_diffbold
663 font create font_diffitalic
665 foreach class {Button Checkbutton Entry Label
666 Labelframe Listbox Message
667 Radiobutton Spinbox Text} {
668 option add *$class.font font_ui
670 if {![is_MacOSX]} {
671 option add *Menu.font font_ui
673 unset class
675 if {[is_Windows] || [is_MacOSX]} {
676 option add *Menu.tearOff 0
679 if {[is_MacOSX]} {
680 set M1B M1
681 set M1T Cmd
682 } else {
683 set M1B Control
684 set M1T Ctrl
687 proc bind_button3 {w cmd} {
688 bind $w <Any-Button-3> $cmd
689 if {[is_MacOSX]} {
690 # Mac OS X sends Button-2 on right click through three-button mouse,
691 # or through trackpad right-clicking (two-finger touch + click).
692 bind $w <Any-Button-2> $cmd
693 bind $w <Control-Button-1> $cmd
697 proc apply_config {} {
698 global repo_config font_descs
700 foreach option $font_descs {
701 set name [lindex $option 0]
702 set font [lindex $option 1]
703 if {[catch {
704 set need_weight 1
705 foreach {cn cv} $repo_config(gui.$name) {
706 if {$cn eq {-weight}} {
707 set need_weight 0
709 font configure $font $cn $cv
711 if {$need_weight} {
712 font configure $font -weight normal
714 } err]} {
715 error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]
717 foreach {cn cv} [font configure $font] {
718 font configure ${font}bold $cn $cv
719 font configure ${font}italic $cn $cv
721 font configure ${font}bold -weight bold
722 font configure ${font}italic -slant italic
726 set default_config(branch.autosetupmerge) true
727 set default_config(merge.tool) {}
728 set default_config(mergetool.keepbackup) true
729 set default_config(merge.diffstat) true
730 set default_config(merge.summary) false
731 set default_config(merge.verbosity) 2
732 set default_config(user.name) {}
733 set default_config(user.email) {}
735 set default_config(gui.encoding) [encoding system]
736 set default_config(gui.matchtrackingbranch) false
737 set default_config(gui.pruneduringfetch) false
738 set default_config(gui.trustmtime) false
739 set default_config(gui.fastcopyblame) false
740 set default_config(gui.copyblamethreshold) 40
741 set default_config(gui.blamehistoryctx) 7
742 set default_config(gui.diffcontext) 5
743 set default_config(gui.commitmsgwidth) 75
744 set default_config(gui.newbranchtemplate) {}
745 set default_config(gui.spellingdictionary) {}
746 set default_config(gui.fontui) [font configure font_ui]
747 set default_config(gui.fontdiff) [font configure font_diff]
748 # TODO: this option should be added to the git-config documentation
749 set default_config(gui.maxfilesdisplayed) 5000
750 set font_descs {
751 {fontui font_ui {mc "Main Font"}}
752 {fontdiff font_diff {mc "Diff/Console Font"}}
755 ######################################################################
757 ## find git
759 set _git [_which git]
760 if {$_git eq {}} {
761 catch {wm withdraw .}
762 tk_messageBox \
763 -icon error \
764 -type ok \
765 -title [mc "git-gui: fatal error"] \
766 -message [mc "Cannot find git in PATH."]
767 exit 1
770 ######################################################################
772 ## version check
774 if {[catch {set _git_version [git --version]} err]} {
775 catch {wm withdraw .}
776 tk_messageBox \
777 -icon error \
778 -type ok \
779 -title [mc "git-gui: fatal error"] \
780 -message "Cannot determine Git version:
782 $err
784 [appname] requires Git 1.5.0 or later."
785 exit 1
787 if {![regsub {^git version } $_git_version {} _git_version]} {
788 catch {wm withdraw .}
789 tk_messageBox \
790 -icon error \
791 -type ok \
792 -title [mc "git-gui: fatal error"] \
793 -message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"]
794 exit 1
797 set _real_git_version $_git_version
798 regsub -- {[\-\.]dirty$} $_git_version {} _git_version
799 regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
800 regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
801 regsub {\.GIT$} $_git_version {} _git_version
802 regsub {\.[a-zA-Z]+\.?[0-9]+$} $_git_version {} _git_version
804 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
805 catch {wm withdraw .}
806 if {[tk_messageBox \
807 -icon warning \
808 -type yesno \
809 -default no \
810 -title "[appname]: warning" \
811 -message [mc "Git version cannot be determined.
813 %s claims it is version '%s'.
815 %s requires at least Git 1.5.0 or later.
817 Assume '%s' is version 1.5.0?
818 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
819 set _git_version 1.5.0
820 } else {
821 exit 1
824 unset _real_git_version
826 proc git-version {args} {
827 global _git_version
829 switch [llength $args] {
831 return $_git_version
835 set op [lindex $args 0]
836 set vr [lindex $args 1]
837 set cm [package vcompare $_git_version $vr]
838 return [expr $cm $op 0]
842 set type [lindex $args 0]
843 set name [lindex $args 1]
844 set parm [lindex $args 2]
845 set body [lindex $args 3]
847 if {($type ne {proc} && $type ne {method})} {
848 error "Invalid arguments to git-version"
850 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
851 error "Last arm of $type $name must be default"
854 foreach {op vr cb} [lrange $body 0 end-2] {
855 if {[git-version $op $vr]} {
856 return [uplevel [list $type $name $parm $cb]]
860 return [uplevel [list $type $name $parm [lindex $body end]]]
863 default {
864 error "git-version >= x"
870 if {[git-version < 1.5]} {
871 catch {wm withdraw .}
872 tk_messageBox \
873 -icon error \
874 -type ok \
875 -title [mc "git-gui: fatal error"] \
876 -message "[appname] requires Git 1.5.0 or later.
878 You are using [git-version]:
880 [git --version]"
881 exit 1
884 ######################################################################
886 ## configure our library
888 set idx [file join $oguilib tclIndex]
889 if {[catch {set fd [open $idx r]} err]} {
890 catch {wm withdraw .}
891 tk_messageBox \
892 -icon error \
893 -type ok \
894 -title [mc "git-gui: fatal error"] \
895 -message $err
896 exit 1
898 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
899 set idx [list]
900 while {[gets $fd n] >= 0} {
901 if {$n ne {} && ![string match #* $n]} {
902 lappend idx $n
905 } else {
906 set idx {}
908 close $fd
910 if {$idx ne {}} {
911 set loaded [list]
912 foreach p $idx {
913 if {[lsearch -exact $loaded $p] >= 0} continue
914 source [file join $oguilib $p]
915 lappend loaded $p
917 unset loaded p
918 } else {
919 set auto_path [concat [list $oguilib] $auto_path]
921 unset -nocomplain idx fd
923 ######################################################################
925 ## config file parsing
927 git-version proc _parse_config {arr_name args} {
928 >= 1.5.3 {
929 upvar $arr_name arr
930 array unset arr
931 set buf {}
932 catch {
933 set fd_rc [eval \
934 [list git_read config] \
935 $args \
936 [list --null --list]]
937 fconfigure $fd_rc -translation binary
938 set buf [read $fd_rc]
939 close $fd_rc
941 foreach line [split $buf "\0"] {
942 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
943 if {[is_many_config $name]} {
944 lappend arr($name) $value
945 } else {
946 set arr($name) $value
951 default {
952 upvar $arr_name arr
953 array unset arr
954 catch {
955 set fd_rc [eval [list git_read config --list] $args]
956 while {[gets $fd_rc line] >= 0} {
957 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
958 if {[is_many_config $name]} {
959 lappend arr($name) $value
960 } else {
961 set arr($name) $value
965 close $fd_rc
970 proc load_config {include_global} {
971 global repo_config global_config system_config default_config
973 if {$include_global} {
974 _parse_config system_config --system
975 _parse_config global_config --global
977 _parse_config repo_config
979 foreach name [array names default_config] {
980 if {[catch {set v $system_config($name)}]} {
981 set system_config($name) $default_config($name)
984 foreach name [array names system_config] {
985 if {[catch {set v $global_config($name)}]} {
986 set global_config($name) $system_config($name)
988 if {[catch {set v $repo_config($name)}]} {
989 set repo_config($name) $system_config($name)
994 ######################################################################
996 ## feature option selection
998 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
999 unset _junk
1000 } else {
1001 set subcommand gui
1003 if {$subcommand eq {gui.sh}} {
1004 set subcommand gui
1006 if {$subcommand eq {gui} && [llength $argv] > 0} {
1007 set subcommand [lindex $argv 0]
1008 set argv [lrange $argv 1 end]
1011 enable_option multicommit
1012 enable_option branch
1013 enable_option transport
1014 disable_option bare
1016 switch -- $subcommand {
1017 browser -
1018 blame {
1019 enable_option bare
1021 disable_option multicommit
1022 disable_option branch
1023 disable_option transport
1025 citool {
1026 enable_option singlecommit
1027 enable_option retcode
1029 disable_option multicommit
1030 disable_option branch
1031 disable_option transport
1033 while {[llength $argv] > 0} {
1034 set a [lindex $argv 0]
1035 switch -- $a {
1036 --amend {
1037 enable_option initialamend
1039 --nocommit {
1040 enable_option nocommit
1041 enable_option nocommitmsg
1043 --commitmsg {
1044 disable_option nocommitmsg
1046 default {
1047 break
1051 set argv [lrange $argv 1 end]
1056 ######################################################################
1058 ## execution environment
1060 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
1062 # Suggest our implementation of askpass, if none is set
1063 if {![info exists env(SSH_ASKPASS)]} {
1064 set env(SSH_ASKPASS) [gitexec git-gui--askpass]
1067 ######################################################################
1069 ## repository setup
1071 set picked 0
1072 if {[catch {
1073 set _gitdir $env(GIT_DIR)
1074 set _prefix {}
1076 && [catch {
1077 set _gitdir [git rev-parse --git-dir]
1078 set _prefix [git rev-parse --show-prefix]
1079 } err]} {
1080 load_config 1
1081 apply_config
1082 choose_repository::pick
1083 set picked 1
1085 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1086 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1088 if {![file isdirectory $_gitdir]} {
1089 catch {wm withdraw .}
1090 error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"]
1091 exit 1
1093 if {$_prefix ne {}} {
1094 regsub -all {[^/]+/} $_prefix ../ cdup
1095 if {[catch {cd $cdup} err]} {
1096 catch {wm withdraw .}
1097 error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"]
1098 exit 1
1100 unset cdup
1101 } elseif {![is_enabled bare]} {
1102 if {[lindex [file split $_gitdir] end] ne {.git}} {
1103 catch {wm withdraw .}
1104 error_popup [strcat [mc "Cannot use funny .git directory:"] "\n\n$_gitdir"]
1105 exit 1
1107 if {[catch {cd [file dirname $_gitdir]} err]} {
1108 catch {wm withdraw .}
1109 error_popup [strcat [mc "No working directory"] " [file dirname $_gitdir]:\n\n$err"]
1110 exit 1
1113 set _reponame [file split [file normalize $_gitdir]]
1114 if {[lindex $_reponame end] eq {.git}} {
1115 set _reponame [lindex $_reponame end-1]
1116 } else {
1117 set _reponame [lindex $_reponame end]
1120 ######################################################################
1122 ## global init
1124 set current_diff_path {}
1125 set current_diff_side {}
1126 set diff_actions [list]
1128 set HEAD {}
1129 set PARENT {}
1130 set MERGE_HEAD [list]
1131 set commit_type {}
1132 set empty_tree {}
1133 set current_branch {}
1134 set is_detached 0
1135 set current_diff_path {}
1136 set is_3way_diff 0
1137 set is_submodule_diff 0
1138 set is_conflict_diff 0
1139 set selected_commit_type new
1140 set diff_empty_count 0
1142 set nullid "0000000000000000000000000000000000000000"
1143 set nullid2 "0000000000000000000000000000000000000001"
1145 ######################################################################
1147 ## task management
1149 set rescan_active 0
1150 set diff_active 0
1151 set last_clicked {}
1153 set disable_on_lock [list]
1154 set index_lock_type none
1156 proc lock_index {type} {
1157 global index_lock_type disable_on_lock
1159 if {$index_lock_type eq {none}} {
1160 set index_lock_type $type
1161 foreach w $disable_on_lock {
1162 uplevel #0 $w disabled
1164 return 1
1165 } elseif {$index_lock_type eq "begin-$type"} {
1166 set index_lock_type $type
1167 return 1
1169 return 0
1172 proc unlock_index {} {
1173 global index_lock_type disable_on_lock
1175 set index_lock_type none
1176 foreach w $disable_on_lock {
1177 uplevel #0 $w normal
1181 ######################################################################
1183 ## status
1185 proc repository_state {ctvar hdvar mhvar} {
1186 global current_branch
1187 upvar $ctvar ct $hdvar hd $mhvar mh
1189 set mh [list]
1191 load_current_branch
1192 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1193 set hd {}
1194 set ct initial
1195 return
1198 set merge_head [gitdir MERGE_HEAD]
1199 if {[file exists $merge_head]} {
1200 set ct merge
1201 set fd_mh [open $merge_head r]
1202 while {[gets $fd_mh line] >= 0} {
1203 lappend mh $line
1205 close $fd_mh
1206 return
1209 set ct normal
1212 proc PARENT {} {
1213 global PARENT empty_tree
1215 set p [lindex $PARENT 0]
1216 if {$p ne {}} {
1217 return $p
1219 if {$empty_tree eq {}} {
1220 set empty_tree [git mktree << {}]
1222 return $empty_tree
1225 proc force_amend {} {
1226 global selected_commit_type
1227 global HEAD PARENT MERGE_HEAD commit_type
1229 repository_state newType newHEAD newMERGE_HEAD
1230 set HEAD $newHEAD
1231 set PARENT $newHEAD
1232 set MERGE_HEAD $newMERGE_HEAD
1233 set commit_type $newType
1235 set selected_commit_type amend
1236 do_select_commit_type
1239 proc rescan {after {honor_trustmtime 1}} {
1240 global HEAD PARENT MERGE_HEAD commit_type
1241 global ui_index ui_workdir ui_comm
1242 global rescan_active file_states
1243 global repo_config
1245 if {$rescan_active > 0 || ![lock_index read]} return
1247 repository_state newType newHEAD newMERGE_HEAD
1248 if {[string match amend* $commit_type]
1249 && $newType eq {normal}
1250 && $newHEAD eq $HEAD} {
1251 } else {
1252 set HEAD $newHEAD
1253 set PARENT $newHEAD
1254 set MERGE_HEAD $newMERGE_HEAD
1255 set commit_type $newType
1258 array unset file_states
1260 if {!$::GITGUI_BCK_exists &&
1261 (![$ui_comm edit modified]
1262 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1263 if {[string match amend* $commit_type]} {
1264 } elseif {[load_message GITGUI_MSG]} {
1265 } elseif {[run_prepare_commit_msg_hook]} {
1266 } elseif {[load_message MERGE_MSG]} {
1267 } elseif {[load_message SQUASH_MSG]} {
1269 $ui_comm edit reset
1270 $ui_comm edit modified false
1273 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1274 rescan_stage2 {} $after
1275 } else {
1276 set rescan_active 1
1277 ui_status [mc "Refreshing file status..."]
1278 set fd_rf [git_read update-index \
1279 -q \
1280 --unmerged \
1281 --ignore-missing \
1282 --refresh \
1284 fconfigure $fd_rf -blocking 0 -translation binary
1285 fileevent $fd_rf readable \
1286 [list rescan_stage2 $fd_rf $after]
1290 if {[is_Cygwin]} {
1291 set is_git_info_exclude {}
1292 proc have_info_exclude {} {
1293 global is_git_info_exclude
1295 if {$is_git_info_exclude eq {}} {
1296 if {[catch {exec test -f [gitdir info exclude]}]} {
1297 set is_git_info_exclude 0
1298 } else {
1299 set is_git_info_exclude 1
1302 return $is_git_info_exclude
1304 } else {
1305 proc have_info_exclude {} {
1306 return [file readable [gitdir info exclude]]
1310 proc rescan_stage2 {fd after} {
1311 global rescan_active buf_rdi buf_rdf buf_rlo
1313 if {$fd ne {}} {
1314 read $fd
1315 if {![eof $fd]} return
1316 close $fd
1319 set ls_others [list --exclude-per-directory=.gitignore]
1320 if {[have_info_exclude]} {
1321 lappend ls_others "--exclude-from=[gitdir info exclude]"
1323 set user_exclude [get_config core.excludesfile]
1324 if {$user_exclude ne {} && [file readable $user_exclude]} {
1325 lappend ls_others "--exclude-from=$user_exclude"
1328 set buf_rdi {}
1329 set buf_rdf {}
1330 set buf_rlo {}
1332 set rescan_active 3
1333 ui_status [mc "Scanning for modified files ..."]
1334 set fd_di [git_read diff-index --cached -z [PARENT]]
1335 set fd_df [git_read diff-files -z]
1336 set fd_lo [eval git_read ls-files --others -z $ls_others]
1338 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1339 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1340 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1341 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1342 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1343 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1346 proc load_message {file} {
1347 global ui_comm
1349 set f [gitdir $file]
1350 if {[file isfile $f]} {
1351 if {[catch {set fd [open $f r]}]} {
1352 return 0
1354 fconfigure $fd -eofchar {}
1355 set content [string trim [read $fd]]
1356 close $fd
1357 regsub -all -line {[ \r\t]+$} $content {} content
1358 $ui_comm delete 0.0 end
1359 $ui_comm insert end $content
1360 return 1
1362 return 0
1365 proc run_prepare_commit_msg_hook {} {
1366 global pch_error
1368 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1369 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1370 # empty file but existant file.
1372 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1374 if {[file isfile [gitdir MERGE_MSG]]} {
1375 set pcm_source "merge"
1376 set fd_mm [open [gitdir MERGE_MSG] r]
1377 puts -nonewline $fd_pcm [read $fd_mm]
1378 close $fd_mm
1379 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1380 set pcm_source "squash"
1381 set fd_sm [open [gitdir SQUASH_MSG] r]
1382 puts -nonewline $fd_pcm [read $fd_sm]
1383 close $fd_sm
1384 } else {
1385 set pcm_source ""
1388 close $fd_pcm
1390 set fd_ph [githook_read prepare-commit-msg \
1391 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1392 if {$fd_ph eq {}} {
1393 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1394 return 0;
1397 ui_status [mc "Calling prepare-commit-msg hook..."]
1398 set pch_error {}
1400 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1401 fileevent $fd_ph readable \
1402 [list prepare_commit_msg_hook_wait $fd_ph]
1404 return 1;
1407 proc prepare_commit_msg_hook_wait {fd_ph} {
1408 global pch_error
1410 append pch_error [read $fd_ph]
1411 fconfigure $fd_ph -blocking 1
1412 if {[eof $fd_ph]} {
1413 if {[catch {close $fd_ph}]} {
1414 ui_status [mc "Commit declined by prepare-commit-msg hook."]
1415 hook_failed_popup prepare-commit-msg $pch_error
1416 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1417 exit 1
1418 } else {
1419 load_message PREPARE_COMMIT_MSG
1421 set pch_error {}
1422 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1423 return
1425 fconfigure $fd_ph -blocking 0
1426 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1429 proc read_diff_index {fd after} {
1430 global buf_rdi
1432 append buf_rdi [read $fd]
1433 set c 0
1434 set n [string length $buf_rdi]
1435 while {$c < $n} {
1436 set z1 [string first "\0" $buf_rdi $c]
1437 if {$z1 == -1} break
1438 incr z1
1439 set z2 [string first "\0" $buf_rdi $z1]
1440 if {$z2 == -1} break
1442 incr c
1443 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1444 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1445 merge_state \
1446 [encoding convertfrom $p] \
1447 [lindex $i 4]? \
1448 [list [lindex $i 0] [lindex $i 2]] \
1449 [list]
1450 set c $z2
1451 incr c
1453 if {$c < $n} {
1454 set buf_rdi [string range $buf_rdi $c end]
1455 } else {
1456 set buf_rdi {}
1459 rescan_done $fd buf_rdi $after
1462 proc read_diff_files {fd after} {
1463 global buf_rdf
1465 append buf_rdf [read $fd]
1466 set c 0
1467 set n [string length $buf_rdf]
1468 while {$c < $n} {
1469 set z1 [string first "\0" $buf_rdf $c]
1470 if {$z1 == -1} break
1471 incr z1
1472 set z2 [string first "\0" $buf_rdf $z1]
1473 if {$z2 == -1} break
1475 incr c
1476 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1477 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1478 merge_state \
1479 [encoding convertfrom $p] \
1480 ?[lindex $i 4] \
1481 [list] \
1482 [list [lindex $i 0] [lindex $i 2]]
1483 set c $z2
1484 incr c
1486 if {$c < $n} {
1487 set buf_rdf [string range $buf_rdf $c end]
1488 } else {
1489 set buf_rdf {}
1492 rescan_done $fd buf_rdf $after
1495 proc read_ls_others {fd after} {
1496 global buf_rlo
1498 append buf_rlo [read $fd]
1499 set pck [split $buf_rlo "\0"]
1500 set buf_rlo [lindex $pck end]
1501 foreach p [lrange $pck 0 end-1] {
1502 set p [encoding convertfrom $p]
1503 if {[string index $p end] eq {/}} {
1504 set p [string range $p 0 end-1]
1506 merge_state $p ?O
1508 rescan_done $fd buf_rlo $after
1511 proc rescan_done {fd buf after} {
1512 global rescan_active current_diff_path
1513 global file_states repo_config
1514 upvar $buf to_clear
1516 if {![eof $fd]} return
1517 set to_clear {}
1518 close $fd
1519 if {[incr rescan_active -1] > 0} return
1521 prune_selection
1522 unlock_index
1523 display_all_files
1524 if {$current_diff_path ne {}} { reshow_diff $after }
1525 if {$current_diff_path eq {}} { select_first_diff $after }
1528 proc prune_selection {} {
1529 global file_states selected_paths
1531 foreach path [array names selected_paths] {
1532 if {[catch {set still_here $file_states($path)}]} {
1533 unset selected_paths($path)
1538 ######################################################################
1540 ## ui helpers
1542 proc mapicon {w state path} {
1543 global all_icons
1545 if {[catch {set r $all_icons($state$w)}]} {
1546 puts "error: no icon for $w state={$state} $path"
1547 return file_plain
1549 return $r
1552 proc mapdesc {state path} {
1553 global all_descs
1555 if {[catch {set r $all_descs($state)}]} {
1556 puts "error: no desc for state={$state} $path"
1557 return $state
1559 return $r
1562 proc ui_status {msg} {
1563 global main_status
1564 if {[info exists main_status]} {
1565 $main_status show $msg
1569 proc ui_ready {{test {}}} {
1570 global main_status
1571 if {[info exists main_status]} {
1572 $main_status show [mc "Ready."] $test
1576 proc escape_path {path} {
1577 regsub -all {\\} $path "\\\\" path
1578 regsub -all "\n" $path "\\n" path
1579 return $path
1582 proc short_path {path} {
1583 return [escape_path [lindex [file split $path] end]]
1586 set next_icon_id 0
1587 set null_sha1 [string repeat 0 40]
1589 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1590 global file_states next_icon_id null_sha1
1592 set s0 [string index $new_state 0]
1593 set s1 [string index $new_state 1]
1595 if {[catch {set info $file_states($path)}]} {
1596 set state __
1597 set icon n[incr next_icon_id]
1598 } else {
1599 set state [lindex $info 0]
1600 set icon [lindex $info 1]
1601 if {$head_info eq {}} {set head_info [lindex $info 2]}
1602 if {$index_info eq {}} {set index_info [lindex $info 3]}
1605 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1606 elseif {$s0 eq {_}} {set s0 _}
1608 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1609 elseif {$s1 eq {_}} {set s1 _}
1611 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1612 set head_info [list 0 $null_sha1]
1613 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1614 && $head_info eq {}} {
1615 set head_info $index_info
1618 set file_states($path) [list $s0$s1 $icon \
1619 $head_info $index_info \
1621 return $state
1624 proc display_file_helper {w path icon_name old_m new_m} {
1625 global file_lists
1627 if {$new_m eq {_}} {
1628 set lno [lsearch -sorted -exact $file_lists($w) $path]
1629 if {$lno >= 0} {
1630 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1631 incr lno
1632 $w conf -state normal
1633 $w delete $lno.0 [expr {$lno + 1}].0
1634 $w conf -state disabled
1636 } elseif {$old_m eq {_} && $new_m ne {_}} {
1637 lappend file_lists($w) $path
1638 set file_lists($w) [lsort -unique $file_lists($w)]
1639 set lno [lsearch -sorted -exact $file_lists($w) $path]
1640 incr lno
1641 $w conf -state normal
1642 $w image create $lno.0 \
1643 -align center -padx 5 -pady 1 \
1644 -name $icon_name \
1645 -image [mapicon $w $new_m $path]
1646 $w insert $lno.1 "[escape_path $path]\n"
1647 $w conf -state disabled
1648 } elseif {$old_m ne $new_m} {
1649 $w conf -state normal
1650 $w image conf $icon_name -image [mapicon $w $new_m $path]
1651 $w conf -state disabled
1655 proc display_file {path state} {
1656 global file_states selected_paths
1657 global ui_index ui_workdir
1659 set old_m [merge_state $path $state]
1660 set s $file_states($path)
1661 set new_m [lindex $s 0]
1662 set icon_name [lindex $s 1]
1664 set o [string index $old_m 0]
1665 set n [string index $new_m 0]
1666 if {$o eq {U}} {
1667 set o _
1669 if {$n eq {U}} {
1670 set n _
1672 display_file_helper $ui_index $path $icon_name $o $n
1674 if {[string index $old_m 0] eq {U}} {
1675 set o U
1676 } else {
1677 set o [string index $old_m 1]
1679 if {[string index $new_m 0] eq {U}} {
1680 set n U
1681 } else {
1682 set n [string index $new_m 1]
1684 display_file_helper $ui_workdir $path $icon_name $o $n
1686 if {$new_m eq {__}} {
1687 unset file_states($path)
1688 catch {unset selected_paths($path)}
1692 proc display_all_files_helper {w path icon_name m} {
1693 global file_lists
1695 lappend file_lists($w) $path
1696 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1697 $w image create end \
1698 -align center -padx 5 -pady 1 \
1699 -name $icon_name \
1700 -image [mapicon $w $m $path]
1701 $w insert end "[escape_path $path]\n"
1704 set files_warning 0
1705 proc display_all_files {} {
1706 global ui_index ui_workdir
1707 global file_states file_lists
1708 global last_clicked
1709 global files_warning
1711 $ui_index conf -state normal
1712 $ui_workdir conf -state normal
1714 $ui_index delete 0.0 end
1715 $ui_workdir delete 0.0 end
1716 set last_clicked {}
1718 set file_lists($ui_index) [list]
1719 set file_lists($ui_workdir) [list]
1721 set to_display [lsort [array names file_states]]
1722 set display_limit [get_config gui.maxfilesdisplayed]
1723 if {[llength $to_display] > $display_limit} {
1724 if {!$files_warning} {
1725 # do not repeatedly warn:
1726 set files_warning 1
1727 info_popup [mc "Displaying only %s of %s files." \
1728 $display_limit [llength $to_display]]
1730 set to_display [lrange $to_display 0 [expr {$display_limit-1}]]
1732 foreach path $to_display {
1733 set s $file_states($path)
1734 set m [lindex $s 0]
1735 set icon_name [lindex $s 1]
1737 set s [string index $m 0]
1738 if {$s ne {U} && $s ne {_}} {
1739 display_all_files_helper $ui_index $path \
1740 $icon_name $s
1743 if {[string index $m 0] eq {U}} {
1744 set s U
1745 } else {
1746 set s [string index $m 1]
1748 if {$s ne {_}} {
1749 display_all_files_helper $ui_workdir $path \
1750 $icon_name $s
1754 $ui_index conf -state disabled
1755 $ui_workdir conf -state disabled
1758 ######################################################################
1760 ## icons
1762 set filemask {
1763 #define mask_width 14
1764 #define mask_height 15
1765 static unsigned char mask_bits[] = {
1766 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1767 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1768 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1771 image create bitmap file_plain -background white -foreground black -data {
1772 #define plain_width 14
1773 #define plain_height 15
1774 static unsigned char plain_bits[] = {
1775 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1776 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1777 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1778 } -maskdata $filemask
1780 image create bitmap file_mod -background white -foreground blue -data {
1781 #define mod_width 14
1782 #define mod_height 15
1783 static unsigned char mod_bits[] = {
1784 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1785 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1786 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1787 } -maskdata $filemask
1789 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1790 #define file_fulltick_width 14
1791 #define file_fulltick_height 15
1792 static unsigned char file_fulltick_bits[] = {
1793 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1794 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1795 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1796 } -maskdata $filemask
1798 image create bitmap file_parttick -background white -foreground "#005050" -data {
1799 #define parttick_width 14
1800 #define parttick_height 15
1801 static unsigned char parttick_bits[] = {
1802 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1803 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1804 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1805 } -maskdata $filemask
1807 image create bitmap file_question -background white -foreground black -data {
1808 #define file_question_width 14
1809 #define file_question_height 15
1810 static unsigned char file_question_bits[] = {
1811 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1812 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1813 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1814 } -maskdata $filemask
1816 image create bitmap file_removed -background white -foreground red -data {
1817 #define file_removed_width 14
1818 #define file_removed_height 15
1819 static unsigned char file_removed_bits[] = {
1820 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1821 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1822 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1823 } -maskdata $filemask
1825 image create bitmap file_merge -background white -foreground blue -data {
1826 #define file_merge_width 14
1827 #define file_merge_height 15
1828 static unsigned char file_merge_bits[] = {
1829 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1830 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1831 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1832 } -maskdata $filemask
1834 image create bitmap file_statechange -background white -foreground green -data {
1835 #define file_merge_width 14
1836 #define file_merge_height 15
1837 static unsigned char file_statechange_bits[] = {
1838 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
1839 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
1840 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1841 } -maskdata $filemask
1843 set ui_index .vpane.files.index.list
1844 set ui_workdir .vpane.files.workdir.list
1846 set all_icons(_$ui_index) file_plain
1847 set all_icons(A$ui_index) file_fulltick
1848 set all_icons(M$ui_index) file_fulltick
1849 set all_icons(D$ui_index) file_removed
1850 set all_icons(U$ui_index) file_merge
1851 set all_icons(T$ui_index) file_statechange
1853 set all_icons(_$ui_workdir) file_plain
1854 set all_icons(M$ui_workdir) file_mod
1855 set all_icons(D$ui_workdir) file_question
1856 set all_icons(U$ui_workdir) file_merge
1857 set all_icons(O$ui_workdir) file_plain
1858 set all_icons(T$ui_workdir) file_statechange
1860 set max_status_desc 0
1861 foreach i {
1862 {__ {mc "Unmodified"}}
1864 {_M {mc "Modified, not staged"}}
1865 {M_ {mc "Staged for commit"}}
1866 {MM {mc "Portions staged for commit"}}
1867 {MD {mc "Staged for commit, missing"}}
1869 {_T {mc "File type changed, not staged"}}
1870 {T_ {mc "File type changed, staged"}}
1872 {_O {mc "Untracked, not staged"}}
1873 {A_ {mc "Staged for commit"}}
1874 {AM {mc "Portions staged for commit"}}
1875 {AD {mc "Staged for commit, missing"}}
1877 {_D {mc "Missing"}}
1878 {D_ {mc "Staged for removal"}}
1879 {DO {mc "Staged for removal, still present"}}
1881 {_U {mc "Requires merge resolution"}}
1882 {U_ {mc "Requires merge resolution"}}
1883 {UU {mc "Requires merge resolution"}}
1884 {UM {mc "Requires merge resolution"}}
1885 {UD {mc "Requires merge resolution"}}
1886 {UT {mc "Requires merge resolution"}}
1888 set text [eval [lindex $i 1]]
1889 if {$max_status_desc < [string length $text]} {
1890 set max_status_desc [string length $text]
1892 set all_descs([lindex $i 0]) $text
1894 unset i
1896 ######################################################################
1898 ## util
1900 proc scrollbar2many {list mode args} {
1901 foreach w $list {eval $w $mode $args}
1904 proc many2scrollbar {list mode sb top bottom} {
1905 $sb set $top $bottom
1906 foreach w $list {$w $mode moveto $top}
1909 proc incr_font_size {font {amt 1}} {
1910 set sz [font configure $font -size]
1911 incr sz $amt
1912 font configure $font -size $sz
1913 font configure ${font}bold -size $sz
1914 font configure ${font}italic -size $sz
1917 ######################################################################
1919 ## ui commands
1921 set starting_gitk_msg [mc "Starting gitk... please wait..."]
1923 proc do_gitk {revs} {
1924 # -- Always start gitk through whatever we were loaded with. This
1925 # lets us bypass using shell process on Windows systems.
1927 set exe [_which gitk -script]
1928 set cmd [list [info nameofexecutable] $exe]
1929 if {$exe eq {}} {
1930 error_popup [mc "Couldn't find gitk in PATH"]
1931 } else {
1932 global env
1934 if {[info exists env(GIT_DIR)]} {
1935 set old_GIT_DIR $env(GIT_DIR)
1936 } else {
1937 set old_GIT_DIR {}
1940 set pwd [pwd]
1941 cd [file dirname [gitdir]]
1942 set env(GIT_DIR) [file tail [gitdir]]
1944 eval exec $cmd $revs &
1946 if {$old_GIT_DIR eq {}} {
1947 unset env(GIT_DIR)
1948 } else {
1949 set env(GIT_DIR) $old_GIT_DIR
1951 cd $pwd
1953 ui_status $::starting_gitk_msg
1954 after 10000 {
1955 ui_ready $starting_gitk_msg
1960 proc do_explore {} {
1961 set explorer {}
1962 if {[is_Cygwin] || [is_Windows]} {
1963 set explorer "explorer.exe"
1964 } elseif {[is_MacOSX]} {
1965 set explorer "open"
1966 } else {
1967 # freedesktop.org-conforming system is our best shot
1968 set explorer "xdg-open"
1970 eval exec $explorer [list [file nativename [file dirname [gitdir]]]] &
1973 set is_quitting 0
1974 set ret_code 1
1976 proc terminate_me {win} {
1977 global ret_code
1978 if {$win ne {.}} return
1979 exit $ret_code
1982 proc do_quit {{rc {1}}} {
1983 global ui_comm is_quitting repo_config commit_type
1984 global GITGUI_BCK_exists GITGUI_BCK_i
1985 global ui_comm_spell
1986 global ret_code
1988 if {$is_quitting} return
1989 set is_quitting 1
1991 if {[winfo exists $ui_comm]} {
1992 # -- Stash our current commit buffer.
1994 set save [gitdir GITGUI_MSG]
1995 if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
1996 file rename -force [gitdir GITGUI_BCK] $save
1997 set GITGUI_BCK_exists 0
1998 } else {
1999 set msg [string trim [$ui_comm get 0.0 end]]
2000 regsub -all -line {[ \r\t]+$} $msg {} msg
2001 if {(![string match amend* $commit_type]
2002 || [$ui_comm edit modified])
2003 && $msg ne {}} {
2004 catch {
2005 set fd [open $save w]
2006 puts -nonewline $fd $msg
2007 close $fd
2009 } else {
2010 catch {file delete $save}
2014 # -- Cancel our spellchecker if its running.
2016 if {[info exists ui_comm_spell]} {
2017 $ui_comm_spell stop
2020 # -- Remove our editor backup, its not needed.
2022 after cancel $GITGUI_BCK_i
2023 if {$GITGUI_BCK_exists} {
2024 catch {file delete [gitdir GITGUI_BCK]}
2027 # -- Stash our current window geometry into this repository.
2029 set cfg_wmstate [wm state .]
2030 if {[catch {set rc_wmstate $repo_config(gui.wmstate)}]} {
2031 set rc_wmstate {}
2033 if {$cfg_wmstate ne $rc_wmstate} {
2034 catch {git config gui.wmstate $cfg_wmstate}
2036 if {$cfg_wmstate eq {zoomed}} {
2037 # on Windows wm geometry will lie about window
2038 # position (but not size) when window is zoomed
2039 # restore the window before querying wm geometry
2040 wm state . normal
2042 set cfg_geometry [list]
2043 lappend cfg_geometry [wm geometry .]
2044 lappend cfg_geometry [lindex [.vpane sash coord 0] 0]
2045 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1]
2046 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2047 set rc_geometry {}
2049 if {$cfg_geometry ne $rc_geometry} {
2050 catch {git config gui.geometry $cfg_geometry}
2054 set ret_code $rc
2056 # Briefly enable send again, working around Tk bug
2057 # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
2058 tk appname [appname]
2060 destroy .
2063 proc do_rescan {} {
2064 rescan ui_ready
2067 proc ui_do_rescan {} {
2068 rescan {force_first_diff ui_ready}
2071 proc do_commit {} {
2072 commit_tree
2075 proc next_diff {{after {}}} {
2076 global next_diff_p next_diff_w next_diff_i
2077 show_diff $next_diff_p $next_diff_w {} {} $after
2080 proc find_anchor_pos {lst name} {
2081 set lid [lsearch -sorted -exact $lst $name]
2083 if {$lid == -1} {
2084 set lid 0
2085 foreach lname $lst {
2086 if {$lname >= $name} break
2087 incr lid
2091 return $lid
2094 proc find_file_from {flist idx delta path mmask} {
2095 global file_states
2097 set len [llength $flist]
2098 while {$idx >= 0 && $idx < $len} {
2099 set name [lindex $flist $idx]
2101 if {$name ne $path && [info exists file_states($name)]} {
2102 set state [lindex $file_states($name) 0]
2104 if {$mmask eq {} || [regexp $mmask $state]} {
2105 return $idx
2109 incr idx $delta
2112 return {}
2115 proc find_next_diff {w path {lno {}} {mmask {}}} {
2116 global next_diff_p next_diff_w next_diff_i
2117 global file_lists ui_index ui_workdir
2119 set flist $file_lists($w)
2120 if {$lno eq {}} {
2121 set lno [find_anchor_pos $flist $path]
2122 } else {
2123 incr lno -1
2126 if {$mmask ne {} && ![regexp {(^\^)|(\$$)} $mmask]} {
2127 if {$w eq $ui_index} {
2128 set mmask "^$mmask"
2129 } else {
2130 set mmask "$mmask\$"
2134 set idx [find_file_from $flist $lno 1 $path $mmask]
2135 if {$idx eq {}} {
2136 incr lno -1
2137 set idx [find_file_from $flist $lno -1 $path $mmask]
2140 if {$idx ne {}} {
2141 set next_diff_w $w
2142 set next_diff_p [lindex $flist $idx]
2143 set next_diff_i [expr {$idx+1}]
2144 return 1
2145 } else {
2146 return 0
2150 proc next_diff_after_action {w path {lno {}} {mmask {}}} {
2151 global current_diff_path
2153 if {$path ne $current_diff_path} {
2154 return {}
2155 } elseif {[find_next_diff $w $path $lno $mmask]} {
2156 return {next_diff;}
2157 } else {
2158 return {reshow_diff;}
2162 proc select_first_diff {after} {
2163 global ui_workdir
2165 if {[find_next_diff $ui_workdir {} 1 {^_?U}] ||
2166 [find_next_diff $ui_workdir {} 1 {[^O]$}]} {
2167 next_diff $after
2168 } else {
2169 uplevel #0 $after
2173 proc force_first_diff {after} {
2174 global ui_workdir current_diff_path file_states
2176 if {[info exists file_states($current_diff_path)]} {
2177 set state [lindex $file_states($current_diff_path) 0]
2178 } else {
2179 set state {OO}
2182 set reselect 0
2183 if {[string first {U} $state] >= 0} {
2184 # Already a conflict, do nothing
2185 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {^_?U}]} {
2186 set reselect 1
2187 } elseif {[string index $state 1] ne {O}} {
2188 # Already a diff & no conflicts, do nothing
2189 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {[^O]$}]} {
2190 set reselect 1
2193 if {$reselect} {
2194 next_diff $after
2195 } else {
2196 uplevel #0 $after
2200 proc toggle_or_diff {w x y} {
2201 global file_states file_lists current_diff_path ui_index ui_workdir
2202 global last_clicked selected_paths
2204 set pos [split [$w index @$x,$y] .]
2205 set lno [lindex $pos 0]
2206 set col [lindex $pos 1]
2207 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2208 if {$path eq {}} {
2209 set last_clicked {}
2210 return
2213 set last_clicked [list $w $lno]
2214 array unset selected_paths
2215 $ui_index tag remove in_sel 0.0 end
2216 $ui_workdir tag remove in_sel 0.0 end
2218 # Determine the state of the file
2219 if {[info exists file_states($path)]} {
2220 set state [lindex $file_states($path) 0]
2221 } else {
2222 set state {__}
2225 # Restage the file, or simply show the diff
2226 if {$col == 0 && $y > 1} {
2227 # Conflicts need special handling
2228 if {[string first {U} $state] >= 0} {
2229 # $w must always be $ui_workdir, but...
2230 if {$w ne $ui_workdir} { set lno {} }
2231 merge_stage_workdir $path $lno
2232 return
2235 if {[string index $state 1] eq {O}} {
2236 set mmask {}
2237 } else {
2238 set mmask {[^O]}
2241 set after [next_diff_after_action $w $path $lno $mmask]
2243 if {$w eq $ui_index} {
2244 update_indexinfo \
2245 "Unstaging [short_path $path] from commit" \
2246 [list $path] \
2247 [concat $after [list ui_ready]]
2248 } elseif {$w eq $ui_workdir} {
2249 update_index \
2250 "Adding [short_path $path]" \
2251 [list $path] \
2252 [concat $after [list ui_ready]]
2254 } else {
2255 show_diff $path $w $lno
2259 proc add_one_to_selection {w x y} {
2260 global file_lists last_clicked selected_paths
2262 set lno [lindex [split [$w index @$x,$y] .] 0]
2263 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2264 if {$path eq {}} {
2265 set last_clicked {}
2266 return
2269 if {$last_clicked ne {}
2270 && [lindex $last_clicked 0] ne $w} {
2271 array unset selected_paths
2272 [lindex $last_clicked 0] tag remove in_sel 0.0 end
2275 set last_clicked [list $w $lno]
2276 if {[catch {set in_sel $selected_paths($path)}]} {
2277 set in_sel 0
2279 if {$in_sel} {
2280 unset selected_paths($path)
2281 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2282 } else {
2283 set selected_paths($path) 1
2284 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2288 proc add_range_to_selection {w x y} {
2289 global file_lists last_clicked selected_paths
2291 if {[lindex $last_clicked 0] ne $w} {
2292 toggle_or_diff $w $x $y
2293 return
2296 set lno [lindex [split [$w index @$x,$y] .] 0]
2297 set lc [lindex $last_clicked 1]
2298 if {$lc < $lno} {
2299 set begin $lc
2300 set end $lno
2301 } else {
2302 set begin $lno
2303 set end $lc
2306 foreach path [lrange $file_lists($w) \
2307 [expr {$begin - 1}] \
2308 [expr {$end - 1}]] {
2309 set selected_paths($path) 1
2311 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2314 proc show_more_context {} {
2315 global repo_config
2316 if {$repo_config(gui.diffcontext) < 99} {
2317 incr repo_config(gui.diffcontext)
2318 reshow_diff
2322 proc show_less_context {} {
2323 global repo_config
2324 if {$repo_config(gui.diffcontext) > 1} {
2325 incr repo_config(gui.diffcontext) -1
2326 reshow_diff
2330 ######################################################################
2332 ## ui construction
2334 load_config 0
2335 apply_config
2336 set ui_comm {}
2338 # -- Menu Bar
2340 menu .mbar -tearoff 0
2341 if {[is_MacOSX]} {
2342 # -- Apple Menu (Mac OS X only)
2344 .mbar add cascade -label Apple -menu .mbar.apple
2345 menu .mbar.apple
2347 .mbar add cascade -label [mc Repository] -menu .mbar.repository
2348 .mbar add cascade -label [mc Edit] -menu .mbar.edit
2349 if {[is_enabled branch]} {
2350 .mbar add cascade -label [mc Branch] -menu .mbar.branch
2352 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2353 .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit
2355 if {[is_enabled transport]} {
2356 .mbar add cascade -label [mc Merge] -menu .mbar.merge
2357 .mbar add cascade -label [mc Remote] -menu .mbar.remote
2359 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2360 .mbar add cascade -label [mc Tools] -menu .mbar.tools
2363 # -- Repository Menu
2365 menu .mbar.repository
2367 .mbar.repository add command \
2368 -label [mc "Explore Working Copy"] \
2369 -command {do_explore}
2370 .mbar.repository add separator
2372 .mbar.repository add command \
2373 -label [mc "Browse Current Branch's Files"] \
2374 -command {browser::new $current_branch}
2375 set ui_browse_current [.mbar.repository index last]
2376 .mbar.repository add command \
2377 -label [mc "Browse Branch Files..."] \
2378 -command browser_open::dialog
2379 .mbar.repository add separator
2381 .mbar.repository add command \
2382 -label [mc "Visualize Current Branch's History"] \
2383 -command {do_gitk $current_branch}
2384 set ui_visualize_current [.mbar.repository index last]
2385 .mbar.repository add command \
2386 -label [mc "Visualize All Branch History"] \
2387 -command {do_gitk --all}
2388 .mbar.repository add separator
2390 proc current_branch_write {args} {
2391 global current_branch
2392 .mbar.repository entryconf $::ui_browse_current \
2393 -label [mc "Browse %s's Files" $current_branch]
2394 .mbar.repository entryconf $::ui_visualize_current \
2395 -label [mc "Visualize %s's History" $current_branch]
2397 trace add variable current_branch write current_branch_write
2399 if {[is_enabled multicommit]} {
2400 .mbar.repository add command -label [mc "Database Statistics"] \
2401 -command do_stats
2403 .mbar.repository add command -label [mc "Compress Database"] \
2404 -command do_gc
2406 .mbar.repository add command -label [mc "Verify Database"] \
2407 -command do_fsck_objects
2409 .mbar.repository add separator
2411 if {[is_Cygwin]} {
2412 .mbar.repository add command \
2413 -label [mc "Create Desktop Icon"] \
2414 -command do_cygwin_shortcut
2415 } elseif {[is_Windows]} {
2416 .mbar.repository add command \
2417 -label [mc "Create Desktop Icon"] \
2418 -command do_windows_shortcut
2419 } elseif {[is_MacOSX]} {
2420 .mbar.repository add command \
2421 -label [mc "Create Desktop Icon"] \
2422 -command do_macosx_app
2426 if {[is_MacOSX]} {
2427 proc ::tk::mac::Quit {args} { do_quit }
2428 } else {
2429 .mbar.repository add command -label [mc Quit] \
2430 -command do_quit \
2431 -accelerator $M1T-Q
2434 # -- Edit Menu
2436 menu .mbar.edit
2437 .mbar.edit add command -label [mc Undo] \
2438 -command {catch {[focus] edit undo}} \
2439 -accelerator $M1T-Z
2440 .mbar.edit add command -label [mc Redo] \
2441 -command {catch {[focus] edit redo}} \
2442 -accelerator $M1T-Y
2443 .mbar.edit add separator
2444 .mbar.edit add command -label [mc Cut] \
2445 -command {catch {tk_textCut [focus]}} \
2446 -accelerator $M1T-X
2447 .mbar.edit add command -label [mc Copy] \
2448 -command {catch {tk_textCopy [focus]}} \
2449 -accelerator $M1T-C
2450 .mbar.edit add command -label [mc Paste] \
2451 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
2452 -accelerator $M1T-V
2453 .mbar.edit add command -label [mc Delete] \
2454 -command {catch {[focus] delete sel.first sel.last}} \
2455 -accelerator Del
2456 .mbar.edit add separator
2457 .mbar.edit add command -label [mc "Select All"] \
2458 -command {catch {[focus] tag add sel 0.0 end}} \
2459 -accelerator $M1T-A
2461 # -- Branch Menu
2463 if {[is_enabled branch]} {
2464 menu .mbar.branch
2466 .mbar.branch add command -label [mc "Create..."] \
2467 -command branch_create::dialog \
2468 -accelerator $M1T-N
2469 lappend disable_on_lock [list .mbar.branch entryconf \
2470 [.mbar.branch index last] -state]
2472 .mbar.branch add command -label [mc "Checkout..."] \
2473 -command branch_checkout::dialog \
2474 -accelerator $M1T-O
2475 lappend disable_on_lock [list .mbar.branch entryconf \
2476 [.mbar.branch index last] -state]
2478 .mbar.branch add command -label [mc "Rename..."] \
2479 -command branch_rename::dialog
2480 lappend disable_on_lock [list .mbar.branch entryconf \
2481 [.mbar.branch index last] -state]
2483 .mbar.branch add command -label [mc "Delete..."] \
2484 -command branch_delete::dialog
2485 lappend disable_on_lock [list .mbar.branch entryconf \
2486 [.mbar.branch index last] -state]
2488 .mbar.branch add command -label [mc "Reset..."] \
2489 -command merge::reset_hard
2490 lappend disable_on_lock [list .mbar.branch entryconf \
2491 [.mbar.branch index last] -state]
2494 # -- Commit Menu
2496 proc commit_btn_caption {} {
2497 if {[is_enabled nocommit]} {
2498 return [mc "Done"]
2499 } else {
2500 return [mc Commit@@verb]
2504 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2505 menu .mbar.commit
2507 if {![is_enabled nocommit]} {
2508 .mbar.commit add radiobutton \
2509 -label [mc "New Commit"] \
2510 -command do_select_commit_type \
2511 -variable selected_commit_type \
2512 -value new
2513 lappend disable_on_lock \
2514 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2516 .mbar.commit add radiobutton \
2517 -label [mc "Amend Last Commit"] \
2518 -command do_select_commit_type \
2519 -variable selected_commit_type \
2520 -value amend
2521 lappend disable_on_lock \
2522 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2524 .mbar.commit add separator
2527 .mbar.commit add command -label [mc Rescan] \
2528 -command ui_do_rescan \
2529 -accelerator F5
2530 lappend disable_on_lock \
2531 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2533 .mbar.commit add command -label [mc "Stage To Commit"] \
2534 -command do_add_selection \
2535 -accelerator $M1T-T
2536 lappend disable_on_lock \
2537 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2539 .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \
2540 -command do_add_all \
2541 -accelerator $M1T-I
2542 lappend disable_on_lock \
2543 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2545 .mbar.commit add command -label [mc "Unstage From Commit"] \
2546 -command do_unstage_selection
2547 lappend disable_on_lock \
2548 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2550 .mbar.commit add command -label [mc "Revert Changes"] \
2551 -command do_revert_selection
2552 lappend disable_on_lock \
2553 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2555 .mbar.commit add separator
2557 .mbar.commit add command -label [mc "Show Less Context"] \
2558 -command show_less_context \
2559 -accelerator $M1T-\-
2561 .mbar.commit add command -label [mc "Show More Context"] \
2562 -command show_more_context \
2563 -accelerator $M1T-=
2565 .mbar.commit add separator
2567 if {![is_enabled nocommitmsg]} {
2568 .mbar.commit add command -label [mc "Sign Off"] \
2569 -command do_signoff \
2570 -accelerator $M1T-S
2573 .mbar.commit add command -label [commit_btn_caption] \
2574 -command do_commit \
2575 -accelerator $M1T-Return
2576 lappend disable_on_lock \
2577 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2580 # -- Merge Menu
2582 if {[is_enabled branch]} {
2583 menu .mbar.merge
2584 .mbar.merge add command -label [mc "Local Merge..."] \
2585 -command merge::dialog \
2586 -accelerator $M1T-M
2587 lappend disable_on_lock \
2588 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2589 .mbar.merge add command -label [mc "Abort Merge..."] \
2590 -command merge::reset_hard
2591 lappend disable_on_lock \
2592 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2595 # -- Transport Menu
2597 if {[is_enabled transport]} {
2598 menu .mbar.remote
2600 .mbar.remote add command \
2601 -label [mc "Add..."] \
2602 -command remote_add::dialog \
2603 -accelerator $M1T-A
2604 .mbar.remote add command \
2605 -label [mc "Push..."] \
2606 -command do_push_anywhere \
2607 -accelerator $M1T-P
2608 .mbar.remote add command \
2609 -label [mc "Delete Branch..."] \
2610 -command remote_branch_delete::dialog
2613 if {[is_MacOSX]} {
2614 proc ::tk::mac::ShowPreferences {} {do_options}
2615 } else {
2616 # -- Edit Menu
2618 .mbar.edit add separator
2619 .mbar.edit add command -label [mc "Options..."] \
2620 -command do_options
2623 # -- Tools Menu
2625 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2626 set tools_menubar .mbar.tools
2627 menu $tools_menubar
2628 $tools_menubar add separator
2629 $tools_menubar add command -label [mc "Add..."] -command tools_add::dialog
2630 $tools_menubar add command -label [mc "Remove..."] -command tools_remove::dialog
2631 set tools_tailcnt 3
2632 if {[array names repo_config guitool.*.cmd] ne {}} {
2633 tools_populate_all
2637 # -- Help Menu
2639 .mbar add cascade -label [mc Help] -menu .mbar.help
2640 menu .mbar.help
2642 if {[is_MacOSX]} {
2643 .mbar.apple add command -label [mc "About %s" [appname]] \
2644 -command do_about
2645 .mbar.apple add separator
2646 } else {
2647 .mbar.help add command -label [mc "About %s" [appname]] \
2648 -command do_about
2650 . configure -menu .mbar
2652 set doc_path [githtmldir]
2653 if {$doc_path ne {}} {
2654 set doc_path [file join $doc_path index.html]
2656 if {[is_Cygwin]} {
2657 set doc_path [exec cygpath --mixed $doc_path]
2661 if {[file isfile $doc_path]} {
2662 set doc_url "file:$doc_path"
2663 } else {
2664 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
2667 proc start_browser {url} {
2668 git "web--browse" $url
2671 .mbar.help add command -label [mc "Online Documentation"] \
2672 -command [list start_browser $doc_url]
2674 .mbar.help add command -label [mc "Show SSH Key"] \
2675 -command do_ssh_key
2677 unset doc_path doc_url
2679 # -- Standard bindings
2681 wm protocol . WM_DELETE_WINDOW do_quit
2682 bind all <$M1B-Key-q> do_quit
2683 bind all <$M1B-Key-Q> do_quit
2684 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
2685 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
2687 set subcommand_args {}
2688 proc usage {} {
2689 puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
2690 exit 1
2693 proc normalize_relpath {path} {
2694 set elements {}
2695 foreach item [file split $path] {
2696 if {$item eq {.}} continue
2697 if {$item eq {..} && [llength $elements] > 0
2698 && [lindex $elements end] ne {..}} {
2699 set elements [lrange $elements 0 end-1]
2700 continue
2702 lappend elements $item
2704 return [eval file join $elements]
2707 # -- Not a normal commit type invocation? Do that instead!
2709 switch -- $subcommand {
2710 browser -
2711 blame {
2712 if {$subcommand eq "blame"} {
2713 set subcommand_args {[--line=<num>] rev? path}
2714 } else {
2715 set subcommand_args {rev? path}
2717 if {$argv eq {}} usage
2718 set head {}
2719 set path {}
2720 set jump_spec {}
2721 set is_path 0
2722 foreach a $argv {
2723 if {$is_path || [file exists $_prefix$a]} {
2724 if {$path ne {}} usage
2725 set path [normalize_relpath $_prefix$a]
2726 break
2727 } elseif {$a eq {--}} {
2728 if {$path ne {}} {
2729 if {$head ne {}} usage
2730 set head $path
2731 set path {}
2733 set is_path 1
2734 } elseif {[regexp {^--line=(\d+)$} $a a lnum]} {
2735 if {$jump_spec ne {} || $head ne {}} usage
2736 set jump_spec [list $lnum]
2737 } elseif {$head eq {}} {
2738 if {$head ne {}} usage
2739 set head $a
2740 set is_path 1
2741 } else {
2742 usage
2745 unset is_path
2747 if {$head ne {} && $path eq {}} {
2748 set path [normalize_relpath $_prefix$head]
2749 set head {}
2752 if {$head eq {}} {
2753 load_current_branch
2754 } else {
2755 if {[regexp {^[0-9a-f]{1,39}$} $head]} {
2756 if {[catch {
2757 set head [git rev-parse --verify $head]
2758 } err]} {
2759 puts stderr $err
2760 exit 1
2763 set current_branch $head
2766 switch -- $subcommand {
2767 browser {
2768 if {$jump_spec ne {}} usage
2769 if {$head eq {}} {
2770 if {$path ne {} && [file isdirectory $path]} {
2771 set head $current_branch
2772 } else {
2773 set head $path
2774 set path {}
2777 browser::new $head $path
2779 blame {
2780 if {$head eq {} && ![file exists $path]} {
2781 puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path]
2782 exit 1
2784 blame::new $head $path $jump_spec
2787 return
2789 citool -
2790 gui {
2791 if {[llength $argv] != 0} {
2792 puts -nonewline stderr "usage: $argv0"
2793 if {$subcommand ne {gui}
2794 && [file tail $argv0] ne "git-$subcommand"} {
2795 puts -nonewline stderr " $subcommand"
2797 puts stderr {}
2798 exit 1
2800 # fall through to setup UI for commits
2802 default {
2803 puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
2804 exit 1
2808 # -- Branch Control
2810 frame .branch \
2811 -borderwidth 1 \
2812 -relief sunken
2813 label .branch.l1 \
2814 -text [mc "Current Branch:"] \
2815 -anchor w \
2816 -justify left
2817 label .branch.cb \
2818 -textvariable current_branch \
2819 -anchor w \
2820 -justify left
2821 pack .branch.l1 -side left
2822 pack .branch.cb -side left -fill x
2823 pack .branch -side top -fill x
2825 # -- Main Window Layout
2827 panedwindow .vpane -orient horizontal
2828 panedwindow .vpane.files -orient vertical
2829 .vpane add .vpane.files -sticky nsew -height 100 -width 200
2830 pack .vpane -anchor n -side top -fill both -expand 1
2832 # -- Index File List
2834 frame .vpane.files.index -height 100 -width 200
2835 label .vpane.files.index.title -text [mc "Staged Changes (Will Commit)"] \
2836 -background lightgreen -foreground black
2837 text $ui_index -background white -foreground black \
2838 -borderwidth 0 \
2839 -width 20 -height 10 \
2840 -wrap none \
2841 -cursor $cursor_ptr \
2842 -xscrollcommand {.vpane.files.index.sx set} \
2843 -yscrollcommand {.vpane.files.index.sy set} \
2844 -state disabled
2845 scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
2846 scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
2847 pack .vpane.files.index.title -side top -fill x
2848 pack .vpane.files.index.sx -side bottom -fill x
2849 pack .vpane.files.index.sy -side right -fill y
2850 pack $ui_index -side left -fill both -expand 1
2852 # -- Working Directory File List
2854 frame .vpane.files.workdir -height 100 -width 200
2855 label .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
2856 -background lightsalmon -foreground black
2857 text $ui_workdir -background white -foreground black \
2858 -borderwidth 0 \
2859 -width 20 -height 10 \
2860 -wrap none \
2861 -cursor $cursor_ptr \
2862 -xscrollcommand {.vpane.files.workdir.sx set} \
2863 -yscrollcommand {.vpane.files.workdir.sy set} \
2864 -state disabled
2865 scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
2866 scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
2867 pack .vpane.files.workdir.title -side top -fill x
2868 pack .vpane.files.workdir.sx -side bottom -fill x
2869 pack .vpane.files.workdir.sy -side right -fill y
2870 pack $ui_workdir -side left -fill both -expand 1
2872 .vpane.files add .vpane.files.workdir -sticky nsew
2873 .vpane.files add .vpane.files.index -sticky nsew
2875 foreach i [list $ui_index $ui_workdir] {
2876 rmsel_tag $i
2877 $i tag conf in_diff -background [$i tag cget in_sel -background]
2879 unset i
2881 # -- Diff and Commit Area
2883 frame .vpane.lower -height 300 -width 400
2884 frame .vpane.lower.commarea
2885 frame .vpane.lower.diff -relief sunken -borderwidth 1
2886 pack .vpane.lower.diff -fill both -expand 1
2887 pack .vpane.lower.commarea -side bottom -fill x
2888 .vpane add .vpane.lower -sticky nsew
2890 # -- Commit Area Buttons
2892 frame .vpane.lower.commarea.buttons
2893 label .vpane.lower.commarea.buttons.l -text {} \
2894 -anchor w \
2895 -justify left
2896 pack .vpane.lower.commarea.buttons.l -side top -fill x
2897 pack .vpane.lower.commarea.buttons -side left -fill y
2899 button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
2900 -command ui_do_rescan
2901 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
2902 lappend disable_on_lock \
2903 {.vpane.lower.commarea.buttons.rescan conf -state}
2905 button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
2906 -command do_add_all
2907 pack .vpane.lower.commarea.buttons.incall -side top -fill x
2908 lappend disable_on_lock \
2909 {.vpane.lower.commarea.buttons.incall conf -state}
2911 if {![is_enabled nocommitmsg]} {
2912 button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
2913 -command do_signoff
2914 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
2917 button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \
2918 -command do_commit
2919 pack .vpane.lower.commarea.buttons.commit -side top -fill x
2920 lappend disable_on_lock \
2921 {.vpane.lower.commarea.buttons.commit conf -state}
2923 if {![is_enabled nocommit]} {
2924 button .vpane.lower.commarea.buttons.push -text [mc Push] \
2925 -command do_push_anywhere
2926 pack .vpane.lower.commarea.buttons.push -side top -fill x
2929 # -- Commit Message Buffer
2931 frame .vpane.lower.commarea.buffer
2932 frame .vpane.lower.commarea.buffer.header
2933 set ui_comm .vpane.lower.commarea.buffer.t
2934 set ui_coml .vpane.lower.commarea.buffer.header.l
2936 if {![is_enabled nocommit]} {
2937 radiobutton .vpane.lower.commarea.buffer.header.new \
2938 -text [mc "New Commit"] \
2939 -command do_select_commit_type \
2940 -variable selected_commit_type \
2941 -value new
2942 lappend disable_on_lock \
2943 [list .vpane.lower.commarea.buffer.header.new conf -state]
2944 radiobutton .vpane.lower.commarea.buffer.header.amend \
2945 -text [mc "Amend Last Commit"] \
2946 -command do_select_commit_type \
2947 -variable selected_commit_type \
2948 -value amend
2949 lappend disable_on_lock \
2950 [list .vpane.lower.commarea.buffer.header.amend conf -state]
2953 label $ui_coml \
2954 -anchor w \
2955 -justify left
2956 proc trace_commit_type {varname args} {
2957 global ui_coml commit_type
2958 switch -glob -- $commit_type {
2959 initial {set txt [mc "Initial Commit Message:"]}
2960 amend {set txt [mc "Amended Commit Message:"]}
2961 amend-initial {set txt [mc "Amended Initial Commit Message:"]}
2962 amend-merge {set txt [mc "Amended Merge Commit Message:"]}
2963 merge {set txt [mc "Merge Commit Message:"]}
2964 * {set txt [mc "Commit Message:"]}
2966 $ui_coml conf -text $txt
2968 trace add variable commit_type write trace_commit_type
2969 pack $ui_coml -side left -fill x
2971 if {![is_enabled nocommit]} {
2972 pack .vpane.lower.commarea.buffer.header.amend -side right
2973 pack .vpane.lower.commarea.buffer.header.new -side right
2976 text $ui_comm -background white -foreground black \
2977 -borderwidth 1 \
2978 -undo true \
2979 -maxundo 20 \
2980 -autoseparators true \
2981 -relief sunken \
2982 -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
2983 -font font_diff \
2984 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
2985 scrollbar .vpane.lower.commarea.buffer.sby \
2986 -command [list $ui_comm yview]
2987 pack .vpane.lower.commarea.buffer.header -side top -fill x
2988 pack .vpane.lower.commarea.buffer.sby -side right -fill y
2989 pack $ui_comm -side left -fill y
2990 pack .vpane.lower.commarea.buffer -side left -fill y
2992 # -- Commit Message Buffer Context Menu
2994 set ctxm .vpane.lower.commarea.buffer.ctxm
2995 menu $ctxm -tearoff 0
2996 $ctxm add command \
2997 -label [mc Cut] \
2998 -command {tk_textCut $ui_comm}
2999 $ctxm add command \
3000 -label [mc Copy] \
3001 -command {tk_textCopy $ui_comm}
3002 $ctxm add command \
3003 -label [mc Paste] \
3004 -command {tk_textPaste $ui_comm}
3005 $ctxm add command \
3006 -label [mc Delete] \
3007 -command {catch {$ui_comm delete sel.first sel.last}}
3008 $ctxm add separator
3009 $ctxm add command \
3010 -label [mc "Select All"] \
3011 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
3012 $ctxm add command \
3013 -label [mc "Copy All"] \
3014 -command {
3015 $ui_comm tag add sel 0.0 end
3016 tk_textCopy $ui_comm
3017 $ui_comm tag remove sel 0.0 end
3019 $ctxm add separator
3020 $ctxm add command \
3021 -label [mc "Sign Off"] \
3022 -command do_signoff
3023 set ui_comm_ctxm $ctxm
3025 # -- Diff Header
3027 proc trace_current_diff_path {varname args} {
3028 global current_diff_path diff_actions file_states
3029 if {$current_diff_path eq {}} {
3030 set s {}
3031 set f {}
3032 set p {}
3033 set o disabled
3034 } else {
3035 set p $current_diff_path
3036 set s [mapdesc [lindex $file_states($p) 0] $p]
3037 set f [mc "File:"]
3038 set p [escape_path $p]
3039 set o normal
3042 .vpane.lower.diff.header.status configure -text $s
3043 .vpane.lower.diff.header.file configure -text $f
3044 .vpane.lower.diff.header.path configure -text $p
3045 foreach w $diff_actions {
3046 uplevel #0 $w $o
3049 trace add variable current_diff_path write trace_current_diff_path
3051 frame .vpane.lower.diff.header -background gold
3052 label .vpane.lower.diff.header.status \
3053 -background gold \
3054 -foreground black \
3055 -width $max_status_desc \
3056 -anchor w \
3057 -justify left
3058 label .vpane.lower.diff.header.file \
3059 -background gold \
3060 -foreground black \
3061 -anchor w \
3062 -justify left
3063 label .vpane.lower.diff.header.path \
3064 -background gold \
3065 -foreground black \
3066 -anchor w \
3067 -justify left
3068 pack .vpane.lower.diff.header.status -side left
3069 pack .vpane.lower.diff.header.file -side left
3070 pack .vpane.lower.diff.header.path -fill x
3071 set ctxm .vpane.lower.diff.header.ctxm
3072 menu $ctxm -tearoff 0
3073 $ctxm add command \
3074 -label [mc Copy] \
3075 -command {
3076 clipboard clear
3077 clipboard append \
3078 -format STRING \
3079 -type STRING \
3080 -- $current_diff_path
3082 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3083 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3085 # -- Diff Body
3087 frame .vpane.lower.diff.body
3088 set ui_diff .vpane.lower.diff.body.t
3089 text $ui_diff -background white -foreground black \
3090 -borderwidth 0 \
3091 -width 80 -height 5 -wrap none \
3092 -font font_diff \
3093 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3094 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3095 -state disabled
3096 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3097 -command [list $ui_diff xview]
3098 scrollbar .vpane.lower.diff.body.sby -orient vertical \
3099 -command [list $ui_diff yview]
3100 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3101 pack .vpane.lower.diff.body.sby -side right -fill y
3102 pack $ui_diff -side left -fill both -expand 1
3103 pack .vpane.lower.diff.header -side top -fill x
3104 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3106 $ui_diff tag conf d_cr -elide true
3107 $ui_diff tag conf d_@ -foreground blue -font font_diffbold
3108 $ui_diff tag conf d_+ -foreground {#00a000}
3109 $ui_diff tag conf d_- -foreground red
3111 $ui_diff tag conf d_++ -foreground {#00a000}
3112 $ui_diff tag conf d_-- -foreground red
3113 $ui_diff tag conf d_+s \
3114 -foreground {#00a000} \
3115 -background {#e2effa}
3116 $ui_diff tag conf d_-s \
3117 -foreground red \
3118 -background {#e2effa}
3119 $ui_diff tag conf d_s+ \
3120 -foreground {#00a000} \
3121 -background ivory1
3122 $ui_diff tag conf d_s- \
3123 -foreground red \
3124 -background ivory1
3126 $ui_diff tag conf d<<<<<<< \
3127 -foreground orange \
3128 -font font_diffbold
3129 $ui_diff tag conf d======= \
3130 -foreground orange \
3131 -font font_diffbold
3132 $ui_diff tag conf d>>>>>>> \
3133 -foreground orange \
3134 -font font_diffbold
3136 $ui_diff tag raise sel
3138 # -- Diff Body Context Menu
3141 proc create_common_diff_popup {ctxm} {
3142 $ctxm add command \
3143 -label [mc "Show Less Context"] \
3144 -command show_less_context
3145 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3146 $ctxm add command \
3147 -label [mc "Show More Context"] \
3148 -command show_more_context
3149 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3150 $ctxm add separator
3151 $ctxm add command \
3152 -label [mc Refresh] \
3153 -command reshow_diff
3154 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3155 $ctxm add command \
3156 -label [mc Copy] \
3157 -command {tk_textCopy $ui_diff}
3158 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3159 $ctxm add command \
3160 -label [mc "Select All"] \
3161 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
3162 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3163 $ctxm add command \
3164 -label [mc "Copy All"] \
3165 -command {
3166 $ui_diff tag add sel 0.0 end
3167 tk_textCopy $ui_diff
3168 $ui_diff tag remove sel 0.0 end
3170 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3171 $ctxm add separator
3172 $ctxm add command \
3173 -label [mc "Decrease Font Size"] \
3174 -command {incr_font_size font_diff -1}
3175 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3176 $ctxm add command \
3177 -label [mc "Increase Font Size"] \
3178 -command {incr_font_size font_diff 1}
3179 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3180 $ctxm add separator
3181 set emenu $ctxm.enc
3182 menu $emenu
3183 build_encoding_menu $emenu [list force_diff_encoding]
3184 $ctxm add cascade \
3185 -label [mc "Encoding"] \
3186 -menu $emenu
3187 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3188 $ctxm add separator
3189 $ctxm add command -label [mc "Options..."] \
3190 -command do_options
3193 set ctxm .vpane.lower.diff.body.ctxm
3194 menu $ctxm -tearoff 0
3195 $ctxm add command \
3196 -label [mc "Apply/Reverse Hunk"] \
3197 -command {apply_hunk $cursorX $cursorY}
3198 set ui_diff_applyhunk [$ctxm index last]
3199 lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
3200 $ctxm add command \
3201 -label [mc "Apply/Reverse Line"] \
3202 -command {apply_line $cursorX $cursorY; do_rescan}
3203 set ui_diff_applyline [$ctxm index last]
3204 lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state]
3205 $ctxm add separator
3206 create_common_diff_popup $ctxm
3208 set ctxmmg .vpane.lower.diff.body.ctxmmg
3209 menu $ctxmmg -tearoff 0
3210 $ctxmmg add command \
3211 -label [mc "Run Merge Tool"] \
3212 -command {merge_resolve_tool}
3213 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3214 $ctxmmg add separator
3215 $ctxmmg add command \
3216 -label [mc "Use Remote Version"] \
3217 -command {merge_resolve_one 3}
3218 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3219 $ctxmmg add command \
3220 -label [mc "Use Local Version"] \
3221 -command {merge_resolve_one 2}
3222 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3223 $ctxmmg add command \
3224 -label [mc "Revert To Base"] \
3225 -command {merge_resolve_one 1}
3226 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3227 $ctxmmg add separator
3228 create_common_diff_popup $ctxmmg
3230 proc popup_diff_menu {ctxm ctxmmg x y X Y} {
3231 global current_diff_path file_states
3232 set ::cursorX $x
3233 set ::cursorY $y
3234 if {[info exists file_states($current_diff_path)]} {
3235 set state [lindex $file_states($current_diff_path) 0]
3236 } else {
3237 set state {__}
3239 if {[string first {U} $state] >= 0} {
3240 tk_popup $ctxmmg $X $Y
3241 } else {
3242 if {$::ui_index eq $::current_diff_side} {
3243 set l [mc "Unstage Hunk From Commit"]
3244 set t [mc "Unstage Line From Commit"]
3245 } else {
3246 set l [mc "Stage Hunk For Commit"]
3247 set t [mc "Stage Line For Commit"]
3249 if {$::is_3way_diff || $::is_submodule_diff
3250 || $current_diff_path eq {}
3251 || {__} eq $state
3252 || {_O} eq $state
3253 || {_T} eq $state
3254 || {T_} eq $state} {
3255 set s disabled
3256 } else {
3257 set s normal
3259 $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
3260 $ctxm entryconf $::ui_diff_applyline -state $s -label $t
3261 tk_popup $ctxm $X $Y
3264 bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg %x %y %X %Y]
3266 # -- Status Bar
3268 set main_status [::status_bar::new .status]
3269 pack .status -anchor w -side bottom -fill x
3270 $main_status show [mc "Initializing..."]
3272 # -- Load geometry
3274 catch {
3275 set gm $repo_config(gui.geometry)
3276 wm geometry . [lindex $gm 0]
3277 .vpane sash place 0 \
3278 [lindex $gm 1] \
3279 [lindex [.vpane sash coord 0] 1]
3280 .vpane.files sash place 0 \
3281 [lindex [.vpane.files sash coord 0] 0] \
3282 [lindex $gm 2]
3283 unset gm
3286 # -- Load window state
3288 catch {
3289 set gws $repo_config(gui.wmstate)
3290 wm state . $gws
3291 unset gws
3294 # -- Key Bindings
3296 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3297 bind $ui_comm <$M1B-Key-t> {do_add_selection;break}
3298 bind $ui_comm <$M1B-Key-T> {do_add_selection;break}
3299 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
3300 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
3301 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3302 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3303 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3304 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3305 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3306 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3307 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3308 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3309 bind $ui_comm <$M1B-Key-minus> {show_less_context;break}
3310 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break}
3311 bind $ui_comm <$M1B-Key-equal> {show_more_context;break}
3312 bind $ui_comm <$M1B-Key-plus> {show_more_context;break}
3313 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break}
3315 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3316 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3317 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3318 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3319 bind $ui_diff <$M1B-Key-v> {break}
3320 bind $ui_diff <$M1B-Key-V> {break}
3321 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3322 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3323 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3324 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3325 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3326 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3327 bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
3328 bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
3329 bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
3330 bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
3331 bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
3332 bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
3333 bind $ui_diff <Button-1> {focus %W}
3335 if {[is_enabled branch]} {
3336 bind . <$M1B-Key-n> branch_create::dialog
3337 bind . <$M1B-Key-N> branch_create::dialog
3338 bind . <$M1B-Key-o> branch_checkout::dialog
3339 bind . <$M1B-Key-O> branch_checkout::dialog
3340 bind . <$M1B-Key-m> merge::dialog
3341 bind . <$M1B-Key-M> merge::dialog
3343 if {[is_enabled transport]} {
3344 bind . <$M1B-Key-p> do_push_anywhere
3345 bind . <$M1B-Key-P> do_push_anywhere
3348 bind . <Key-F5> ui_do_rescan
3349 bind . <$M1B-Key-r> ui_do_rescan
3350 bind . <$M1B-Key-R> ui_do_rescan
3351 bind . <$M1B-Key-s> do_signoff
3352 bind . <$M1B-Key-S> do_signoff
3353 bind . <$M1B-Key-t> do_add_selection
3354 bind . <$M1B-Key-T> do_add_selection
3355 bind . <$M1B-Key-i> do_add_all
3356 bind . <$M1B-Key-I> do_add_all
3357 bind . <$M1B-Key-minus> {show_less_context;break}
3358 bind . <$M1B-Key-KP_Subtract> {show_less_context;break}
3359 bind . <$M1B-Key-equal> {show_more_context;break}
3360 bind . <$M1B-Key-plus> {show_more_context;break}
3361 bind . <$M1B-Key-KP_Add> {show_more_context;break}
3362 bind . <$M1B-Key-Return> do_commit
3363 foreach i [list $ui_index $ui_workdir] {
3364 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
3365 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3366 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
3368 unset i
3370 set file_lists($ui_index) [list]
3371 set file_lists($ui_workdir) [list]
3373 wm title . "[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
3374 focus -force $ui_comm
3376 # -- Warn the user about environmental problems. Cygwin's Tcl
3377 # does *not* pass its env array onto any processes it spawns.
3378 # This means that git processes get none of our environment.
3380 if {[is_Cygwin]} {
3381 set ignored_env 0
3382 set suggest_user {}
3383 set msg [mc "Possible environment issues exist.
3385 The following environment variables are probably
3386 going to be ignored by any Git subprocess run
3387 by %s:
3389 " [appname]]
3390 foreach name [array names env] {
3391 switch -regexp -- $name {
3392 {^GIT_INDEX_FILE$} -
3393 {^GIT_OBJECT_DIRECTORY$} -
3394 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3395 {^GIT_DIFF_OPTS$} -
3396 {^GIT_EXTERNAL_DIFF$} -
3397 {^GIT_PAGER$} -
3398 {^GIT_TRACE$} -
3399 {^GIT_CONFIG$} -
3400 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3401 append msg " - $name\n"
3402 incr ignored_env
3404 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3405 append msg " - $name\n"
3406 incr ignored_env
3407 set suggest_user $name
3411 if {$ignored_env > 0} {
3412 append msg [mc "
3413 This is due to a known issue with the
3414 Tcl binary distributed by Cygwin."]
3416 if {$suggest_user ne {}} {
3417 append msg [mc "
3419 A good replacement for %s
3420 is placing values for the user.name and
3421 user.email settings into your personal
3422 ~/.gitconfig file.
3423 " $suggest_user]
3425 warn_popup $msg
3427 unset ignored_env msg suggest_user name
3430 # -- Only initialize complex UI if we are going to stay running.
3432 if {[is_enabled transport]} {
3433 load_all_remotes
3435 set n [.mbar.remote index end]
3436 populate_remotes_menu
3437 set n [expr {[.mbar.remote index end] - $n}]
3438 if {$n > 0} {
3439 if {[.mbar.remote type 0] eq "tearoff"} { incr n }
3440 .mbar.remote insert $n separator
3442 unset n
3445 if {[winfo exists $ui_comm]} {
3446 set GITGUI_BCK_exists [load_message GITGUI_BCK]
3448 # -- If both our backup and message files exist use the
3449 # newer of the two files to initialize the buffer.
3451 if {$GITGUI_BCK_exists} {
3452 set m [gitdir GITGUI_MSG]
3453 if {[file isfile $m]} {
3454 if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} {
3455 catch {file delete [gitdir GITGUI_MSG]}
3456 } else {
3457 $ui_comm delete 0.0 end
3458 $ui_comm edit reset
3459 $ui_comm edit modified false
3460 catch {file delete [gitdir GITGUI_BCK]}
3461 set GITGUI_BCK_exists 0
3464 unset m
3467 proc backup_commit_buffer {} {
3468 global ui_comm GITGUI_BCK_exists
3470 set m [$ui_comm edit modified]
3471 if {$m || $GITGUI_BCK_exists} {
3472 set msg [string trim [$ui_comm get 0.0 end]]
3473 regsub -all -line {[ \r\t]+$} $msg {} msg
3475 if {$msg eq {}} {
3476 if {$GITGUI_BCK_exists} {
3477 catch {file delete [gitdir GITGUI_BCK]}
3478 set GITGUI_BCK_exists 0
3480 } elseif {$m} {
3481 catch {
3482 set fd [open [gitdir GITGUI_BCK] w]
3483 puts -nonewline $fd $msg
3484 close $fd
3485 set GITGUI_BCK_exists 1
3489 $ui_comm edit modified false
3492 set ::GITGUI_BCK_i [after 2000 backup_commit_buffer]
3495 backup_commit_buffer
3497 # -- If the user has aspell available we can drive it
3498 # in pipe mode to spellcheck the commit message.
3500 set spell_cmd [list |]
3501 set spell_dict [get_config gui.spellingdictionary]
3502 lappend spell_cmd aspell
3503 if {$spell_dict ne {}} {
3504 lappend spell_cmd --master=$spell_dict
3506 lappend spell_cmd --mode=none
3507 lappend spell_cmd --encoding=utf-8
3508 lappend spell_cmd pipe
3509 if {$spell_dict eq {none}
3510 || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} {
3511 bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y]
3512 } else {
3513 set ui_comm_spell [spellcheck::init \
3514 $spell_fd \
3515 $ui_comm \
3516 $ui_comm_ctxm \
3519 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
3522 lock_index begin-read
3523 if {![winfo ismapped .]} {
3524 wm deiconify .
3526 after 1 {
3527 if {[is_enabled initialamend]} {
3528 force_amend
3529 } else {
3530 do_rescan
3533 if {[is_enabled nocommitmsg]} {
3534 $ui_comm configure -state disabled -background gray
3537 if {[is_enabled multicommit]} {
3538 after 1000 hint_gc
3540 if {[is_enabled retcode]} {
3541 bind . <Destroy> {+terminate_me %W}
3543 if {$picked && [is_config_true gui.autoexplore]} {
3544 do_explore