2 # Tcl ignores the next line -*- tcl -*- \
3 if test "z$*" = zversion \
4 ||
test "z$*" = z--version
; \
6 echo 'git-gui version @@GITGUI_VERSION@@'; \
10 exec wish
"$argv0" -- "$@"
12 set appvers
{@@GITGUI_VERSION@@
}
13 set copyright
[string map
[list
(c
) \u00a9] {
14 Copyright
(c
) 2006-2010 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
]
41 -title "git-gui: fatal error" \
46 catch
{rename send
{}} ; # What an evil concept...
48 ######################################################################
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
]
66 set oguimsg
[file join $oguilib msgs
]
70 ######################################################################
72 ## enable verbose loading?
74 if {![catch
{set _verbose
$env(GITGUI_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
83 puts stderr
"source $name"
84 uplevel
1 real__source
$name
86 if {[tk windowingsystem
] eq
"win32"} { console show
}
89 ######################################################################
91 ## Internationalization (i18n) through msgcat and gettext. See
92 ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
94 package require msgcat
97 set cmk
[string first @@
$fmt]
99 return [string range
$fmt 0 [expr {$cmk - 1}]]
104 proc mc
{en_fmt args
} {
105 set fmt [_mc_trim
[::msgcat
::mc
$en_fmt]]
106 if {[catch
{set msg
[eval [list format
$fmt] $args]} err
]} {
107 set msg
[eval [list format
[_mc_trim
$en_fmt]] $args]
113 return [join $args {}]
116 ::msgcat
::mcload
$oguimsg
119 ######################################################################
123 set _appname
{Git Gui
}
132 set _shellpath
{@@SHELL_PATH@@
}
134 set _trace
[lsearch
-exact $argv --trace]
136 set argv
[lreplace
$argv $_trace $_trace]
143 global _shellpath env
144 if {[string match @@
* $_shellpath]} {
145 if {[info exists env
(SHELL
)]} {
164 return [eval [list
file join $_gitdir] $args]
167 proc gitexec
{args
} {
169 if {$_gitexec eq
{}} {
170 if {[catch
{set _gitexec
[git
--exec-path]} err
]} {
171 error
"Git not installed?\n\n$err"
174 set _gitexec
[exec cygpath \
179 set _gitexec
[file normalize
$_gitexec]
185 return [eval [list
file join $_gitexec] $args]
188 proc githtmldir
{args
} {
190 if {$_githtmldir eq
{}} {
191 if {[catch
{set _githtmldir
[git
--html-path]}]} {
192 # Git not installed or option not yet supported
196 set _githtmldir
[exec cygpath \
201 set _githtmldir
[file normalize
$_githtmldir]
207 return [eval [list
file join $_githtmldir] $args]
215 if {[tk windowingsystem
] eq
{aqua
}} {
222 if {$
::tcl_platform
(platform
) eq
{windows
}} {
230 if {$_iscygwin eq
{}} {
231 if {$
::tcl_platform
(platform
) eq
{windows
}} {
232 if {[catch
{set p
[exec cygpath
--windir]} err
]} {
244 proc is_enabled
{option
} {
245 global enabled_options
246 if {[catch
{set on
$enabled_options($option)}]} {return 0}
250 proc enable_option
{option
} {
251 global enabled_options
252 set enabled_options
($option) 1
255 proc disable_option
{option
} {
256 global enabled_options
257 set enabled_options
($option) 0
260 ######################################################################
264 proc is_many_config
{name
} {
265 switch
-glob -- $name {
275 proc is_config_true
{name
} {
277 if {[catch
{set v
$repo_config($name)}]} {
279 } elseif
{$v eq
{true
} ||
$v eq
{1} ||
$v eq
{yes}} {
286 proc is_config_false
{name
} {
288 if {[catch
{set v
$repo_config($name)}]} {
290 } elseif
{$v eq
{false
} ||
$v eq
{0} ||
$v eq
{no
}} {
297 proc get_config
{name
} {
299 if {[catch
{set v
$repo_config($name)}]} {
311 if {$_isbare eq
{}} {
313 set _bare
[git rev-parse
--is-bare-repository]
315 true
{ set _isbare
1 }
316 false
{ set _isbare
0}
320 if {[is_config_true core.bare
]
321 ||
($_gitworktree eq
{}
322 && [lindex
[file split $_gitdir] end
] ne
{.git
})} {
332 ######################################################################
336 proc _trace_exec
{cmd
} {
337 if {!$
::_trace
} return
343 if {[regexp
{[ \t\r\n'"$?*]} $v]} {
351 #'" fix poor old emacs font-lock mode
353 proc _git_cmd {name} {
356 if {[catch {set v $_git_cmd_path($name)}]} {
360 --exec-path { return [list $::_git $name] }
363 set p [gitexec git-$name$::_search_exe]
364 if {[file exists $p]} {
366 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
367 # Try to determine what sort of magic will make
368 # git-$name go and do its thing, because native
369 # Tcl on Windows doesn't know it.
371 set p [gitexec git-$name]
376 switch -glob -- [lindex $s 0] {
378 #!*perl { set i perl }
379 #!*python { set i python }
380 default { error "git-
$name is not supported
: $s" }
384 if {![info exists interp]} {
385 set interp [_which $i]
388 error "git-
$name requires
$i (not
in PATH
)"
390 set v [concat [list $interp] [lrange $s 1 end] [list $p]]
392 # Assume it is builtin to git somehow and we
393 # aren't actually able to see a file for it.
395 set v [list $::_git $name]
397 set _git_cmd_path($name) $v
402 proc _which {what args} {
403 global env _search_exe _search_path
405 if {$_search_path eq {}} {
406 if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
407 set _search_path [split [exec cygpath \
413 } elseif {[is_Windows]} {
414 set gitguidir [file dirname [info script]]
415 regsub -all ";" $gitguidir "\\;" gitguidir
416 set env(PATH) "$gitguidir;$env(PATH
)"
417 set _search_path [split $env(PATH) {;}]
420 set _search_path [split $env(PATH) :]
425 if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
428 set suffix $_search_exe
431 foreach p $_search_path {
432 set p [file join $p $what$suffix]
433 if {[file exists $p]} {
434 return [file normalize $p]
440 proc _lappend_nice {cmd_var} {
444 if {![info exists _nice]} {
445 set _nice [_which nice]
446 if {[catch {exec $_nice git version}]} {
448 } elseif {[is_Windows] && [file dirname $_nice] ne [file dirname $::_git]} {
461 switch -- [lindex $args 0] {
472 set args [lrange $args 1 end]
475 set cmdp [_git_cmd [lindex $args 0]]
476 set args [lrange $args 1 end]
478 _trace_exec [concat $opt $cmdp $args]
479 set result [eval exec $opt $cmdp $args]
481 puts stderr "< $result"
486 proc _open_stdout_stderr {cmd} {
489 set fd [open [concat [list | ] $cmd] r]
491 if { [lindex $cmd end] eq {2>@1}
492 && $err eq {can not find channel named "1"}
494 # Older versions of Tcl 8.4 don't have this 2>@1 IO
495 # redirect operator. Fallback to |& cat for those.
496 # The command was not actually started, so its safe
497 # to try to start it a second time.
499 set fd [open [concat \
501 [lrange $cmd 0 end-1] \
508 fconfigure $fd -eofchar {}
512 proc git_read {args} {
516 switch -- [lindex $args 0] {
531 set args [lrange $args 1 end]
534 set cmdp [_git_cmd [lindex $args 0]]
535 set args [lrange $args 1 end]
537 return [_open_stdout_stderr [concat $opt $cmdp $args]]
540 proc git_write {args} {
544 switch -- [lindex $args 0] {
555 set args [lrange $args 1 end]
558 set cmdp [_git_cmd [lindex $args 0]]
559 set args [lrange $args 1 end]
561 _trace_exec [concat $opt $cmdp $args]
562 return [open [concat [list | ] $opt $cmdp $args] w]
565 proc githook_read {hook_name args} {
566 set pchook [gitdir hooks $hook_name]
569 # On Windows [file executable] might lie so we need to ask
570 # the shell if the hook is executable. Yes that's annoying.
574 if {![info exists interp]} {
575 set interp [_which sh]
578 error "hook execution requires sh
(not
in PATH
)"
581 set scr {if test -x "$1";then exec "$@
";fi}
582 set sh_c [list $interp -c $scr $interp $pchook]
583 return [_open_stdout_stderr [concat $sh_c $args]]
586 if {[file executable $pchook]} {
587 return [_open_stdout_stderr [concat [list $pchook] $args]]
593 proc kill_file_process {fd} {
594 set process [pid $fd]
598 # Use a Cygwin-specific flag to allow killing
599 # native Windows processes
600 exec kill -f $process
607 proc gitattr {path attr default} {
608 if {[catch {set r [git check-attr $attr -- $path]}]} {
611 set r [join [lrange [split $r :] 2 end] :]
614 if {$r eq {unspecified}} {
621 regsub -all ' $value "'\\''" value
625 proc load_current_branch {} {
626 global current_branch is_detached
628 set fd [open [gitdir HEAD] r]
629 if {[gets $fd ref] < 1} {
634 set pfx {ref: refs/heads/}
635 set len [string length $pfx]
636 if {[string equal -length $len $pfx $ref]} {
637 # We're on a branch. It might not exist. But
638 # HEAD looks good enough to be a branch.
640 set current_branch
[string range
$ref $len end
]
643 # Assume this is a detached head.
645 set current_branch HEAD
650 auto_load tk_optionMenu
651 rename tk_optionMenu real__tkOptionMenu
652 proc tk_optionMenu
{w varName args
} {
653 set m
[eval real__tkOptionMenu
$w $varName $args]
654 $m configure
-font font_ui
655 $w configure
-font font_ui
659 proc rmsel_tag
{text
} {
661 -background [$text cget
-background] \
662 -foreground [$text cget
-foreground] \
664 $text tag conf in_sel
-background lightgray
665 bind $text <Motion
> break
671 bind .
<Visibility
> {
672 bind .
<Visibility
> {}
677 wm iconbitmap .
-default $oguilib/git-gui.ico
678 set ::tk
::AlwaysShowSelection
1
679 bind .
<Control-F2
> {console show
}
681 # Spoof an X11 display for SSH
682 if {![info exists env
(DISPLAY
)]} {
683 set env
(DISPLAY
) :9999
687 image create photo gitlogo
-width 16 -height 16
689 gitlogo put
#33CC33 -to 7 0 9 2
690 gitlogo put
#33CC33 -to 4 2 12 4
691 gitlogo put
#33CC33 -to 7 4 9 6
692 gitlogo put
#CC3333 -to 4 6 12 8
693 gitlogo put gray26
-to 4 9 6 10
694 gitlogo put gray26
-to 3 10 6 12
695 gitlogo put gray26
-to 8 9 13 11
696 gitlogo put gray26
-to 8 11 10 12
697 gitlogo put gray26
-to 11 11 13 14
698 gitlogo put gray26
-to 3 12 5 14
699 gitlogo put gray26
-to 5 13
700 gitlogo put gray26
-to 10 13
701 gitlogo put gray26
-to 4 14 12 15
702 gitlogo put gray26
-to 5 15 11 16
705 wm iconphoto .
-default gitlogo
709 ######################################################################
715 if {[lsearch
-exact [font names
] TkDefaultFont
] != -1} {
716 eval [linsert
[font actual TkDefaultFont
] 0 font configure font_ui
]
717 eval [linsert
[font actual TkFixedFont
] 0 font create font_diff
]
719 font create font_diff
-family Courier
-size 10
722 eval font configure font_ui
[font actual
[.dummy cget
-font]]
727 font create font_uiitalic
728 font create font_uibold
729 font create font_diffbold
730 font create font_diffitalic
732 foreach class
{Button Checkbutton Entry Label
733 Labelframe Listbox Message
734 Radiobutton Spinbox Text
} {
735 option add
*$class.font font_ui
738 option add
*Menu.font font_ui
739 option add
*Entry.borderWidth
1 startupFile
740 option add
*Entry.relief sunken startupFile
741 option add
*RadioButton.anchor w startupFile
745 if {[is_Windows
] ||
[is_MacOSX
]} {
746 option add
*Menu.tearOff
0
757 proc bind_button3
{w cmd
} {
758 bind $w <Any-Button-3
> $cmd
760 # Mac OS X sends Button-2 on right click through three-button mouse,
761 # or through trackpad right-clicking (two-finger touch + click).
762 bind $w <Any-Button-2
> $cmd
763 bind $w <Control-Button-1
> $cmd
767 proc apply_config
{} {
768 global repo_config font_descs
770 foreach option
$font_descs {
771 set name
[lindex
$option 0]
772 set font
[lindex
$option 1]
775 foreach
{cn cv
} $repo_config(gui.
$name) {
776 if {$cn eq
{-weight}} {
779 font configure
$font $cn $cv
782 font configure
$font -weight normal
785 error_popup
[strcat
[mc
"Invalid font specified in %s:" "gui.$name"] "\n\n$err"]
787 foreach
{cn cv
} [font configure
$font] {
788 font configure
${font}bold
$cn $cv
789 font configure
${font}italic
$cn $cv
791 font configure
${font}bold
-weight bold
792 font configure
${font}italic
-slant italic
798 if {$repo_config(gui.usettk
)} {
799 set use_ttk
[package vsatisfies
[package provide Tk
] 8.5]
802 bind [winfo class .
] <<ThemeChanged>> [list InitTheme]
808 set default_config(branch.autosetupmerge) true
809 set default_config(merge.tool) {}
810 set default_config(mergetool.keepbackup) true
811 set default_config(merge.diffstat) true
812 set default_config(merge.summary) false
813 set default_config(merge.verbosity) 2
814 set default_config(user.name) {}
815 set default_config(user.email) {}
817 set default_config(gui.encoding) [encoding system]
818 set default_config(gui.matchtrackingbranch) false
819 set default_config(gui.textconv) true
820 set default_config(gui.pruneduringfetch) false
821 set default_config(gui.trustmtime) false
822 set default_config(gui.fastcopyblame) false
823 set default_config(gui.copyblamethreshold) 40
824 set default_config(gui.blamehistoryctx) 7
825 set default_config(gui.diffcontext) 5
826 set default_config(gui.commitmsgwidth) 75
827 set default_config(gui.newbranchtemplate) {}
828 set default_config(gui.spellingdictionary) {}
829 set default_config(gui.fontui) [font configure font_ui]
830 set default_config(gui.fontdiff) [font configure font_diff]
831 # TODO: this option should be added to the git-config documentation
832 set default_config(gui.maxfilesdisplayed) 5000
833 set default_config(gui.usettk) 1
835 {fontui font_ui {mc "Main Font"}}
836 {fontdiff font_diff {mc "Diff/Console Font"}}
839 ######################################################################
843 set _git [_which git]
845 catch {wm withdraw .}
849 -title [mc "git-gui: fatal error"] \
850 -message [mc "Cannot find git in PATH."]
854 ######################################################################
858 if {[catch {set _git_version [git --version]} err]} {
859 catch {wm withdraw .}
863 -title [mc "git-gui: fatal error"] \
864 -message "Cannot determine Git version:
868 [appname] requires Git 1.5.0 or later."
871 if {![regsub {^git version } $_git_version {} _git_version]} {
872 catch {wm withdraw .}
876 -title [mc "git-gui: fatal error"] \
877 -message [strcat [mc "Cannot parse Git version string:"] "\n\n$_git_version"]
881 proc get_trimmed_version {s} {
883 foreach x [split $s -._] {
884 if {[string is integer -strict $x]} {
892 set _real_git_version $_git_version
893 set _git_version [get_trimmed_version $_git_version]
895 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
896 catch {wm withdraw .}
901 -title "[appname]: warning" \
902 -message [mc "Git version cannot be determined.
904 %s claims it is version '%s'.
906 %s requires at least Git 1.5.0 or later.
908 Assume '%s' is version 1.5.0?
909 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
910 set _git_version 1.5.0
915 unset _real_git_version
917 proc git-version {args} {
920 switch [llength $args] {
926 set op [lindex $args 0]
927 set vr [lindex $args 1]
928 set cm [package vcompare $_git_version $vr]
929 return [expr $cm $op 0]
933 set type [lindex $args 0]
934 set name [lindex $args 1]
935 set parm [lindex $args 2]
936 set body [lindex $args 3]
938 if {($type ne {proc} && $type ne {method})} {
939 error "Invalid arguments to git-version"
941 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
942 error "Last arm of $type $name must be default"
945 foreach {op vr cb} [lrange $body 0 end-2] {
946 if {[git-version $op $vr]} {
947 return [uplevel [list $type $name $parm $cb]]
951 return [uplevel [list $type $name $parm [lindex $body end]]]
955 error "git-version >= x"
961 if {[git-version < 1.5]} {
962 catch {wm withdraw .}
966 -title [mc "git-gui: fatal error"] \
967 -message "[appname] requires Git 1.5.0 or later.
969 You are using [git-version]:
975 ######################################################################
977 ## configure our library
979 set idx [file join $oguilib tclIndex]
980 if {[catch {set fd [open $idx r]} err]} {
981 catch {wm withdraw .}
985 -title [mc "git-gui: fatal error"] \
989 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
991 while {[gets $fd n] >= 0} {
992 if {$n ne {} && ![string match #* $n]} {
1004 if {[lsearch -exact $loaded $p] >= 0} continue
1005 source [file join $oguilib $p]
1010 set auto_path [concat [list $oguilib] $auto_path]
1012 unset -nocomplain idx fd
1014 ######################################################################
1016 ## config file parsing
1018 git-version proc _parse_config {arr_name args} {
1025 [list git_read config] \
1027 [list --null --list]]
1028 fconfigure $fd_rc -translation binary
1029 set buf [read $fd_rc]
1032 foreach line [split $buf "\0"] {
1033 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
1034 if {[is_many_config $name]} {
1035 lappend arr($name) $value
1037 set arr($name) $value
1046 set fd_rc [eval [list git_read config --list] $args]
1047 while {[gets $fd_rc line] >= 0} {
1048 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
1049 if {[is_many_config $name]} {
1050 lappend arr($name) $value
1052 set arr($name) $value
1061 proc load_config {include_global} {
1062 global repo_config global_config system_config default_config
1064 if {$include_global} {
1065 _parse_config system_config --system
1066 _parse_config global_config --global
1068 _parse_config repo_config
1070 foreach name [array names default_config] {
1071 if {[catch {set v $system_config($name)}]} {
1072 set system_config($name) $default_config($name)
1075 foreach name [array names system_config] {
1076 if {[catch {set v $global_config($name)}]} {
1077 set global_config($name) $system_config($name)
1079 if {[catch {set v $repo_config($name)}]} {
1080 set repo_config($name) $system_config($name)
1085 ######################################################################
1087 ## feature option selection
1089 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
1094 if {$subcommand eq {gui.sh}} {
1097 if {$subcommand eq {gui} && [llength $argv] > 0} {
1098 set subcommand [lindex $argv 0]
1099 set argv [lrange $argv 1 end]
1102 enable_option multicommit
1103 enable_option branch
1104 enable_option transport
1107 switch -- $subcommand {
1112 disable_option multicommit
1113 disable_option branch
1114 disable_option transport
1117 enable_option singlecommit
1118 enable_option retcode
1120 disable_option multicommit
1121 disable_option branch
1122 disable_option transport
1124 while {[llength $argv] > 0} {
1125 set a [lindex $argv 0]
1128 enable_option initialamend
1131 enable_option nocommit
1132 enable_option nocommitmsg
1135 disable_option nocommitmsg
1142 set argv [lrange $argv 1 end]
1147 ######################################################################
1149 ## execution environment
1151 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
1153 # Suggest our implementation of askpass, if none is set
1154 if {![info exists env(SSH_ASKPASS)]} {
1155 set env(SSH_ASKPASS) [gitexec git-gui--askpass]
1158 ######################################################################
1164 set _gitdir $env(GIT_DIR)
1168 # beware that from the .git dir this sets _gitdir to .
1169 # and _prefix to the empty string
1170 set _gitdir [git rev-parse --git-dir]
1171 set _prefix [git rev-parse --show-prefix]
1175 choose_repository::pick
1179 # we expand the _gitdir when it's just a single dot (i.e. when we're being
1180 # run from the .git dir itself) lest the routines to find the worktree
1182 if {$_gitdir eq "."} {
1186 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1187 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1189 if {![file isdirectory $_gitdir]} {
1190 catch {wm withdraw .}
1191 error_popup [strcat [mc "Git directory not found:"] "\n\n$_gitdir"]
1194 # _gitdir exists, so try loading the config
1198 # v1.7.0 introduced --show-toplevel to return the canonical work-tree
1199 if {[package vsatisfies $_git_version 1.7.0]} {
1200 set _gitworktree [git rev-parse --show-toplevel]
1202 # try to set work tree from environment, core.worktree or use
1203 # cdup to obtain a relative path to the top of the worktree. If
1204 # run from the top, the ./ prefix ensures normalize expands pwd.
1205 if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {
1206 set _gitworktree [get_config core.worktree]
1207 if {$_gitworktree eq ""} {
1208 set _gitworktree [file normalize ./[git rev-parse --show-cdup]]
1213 if {$_prefix ne {}} {
1214 if {$_gitworktree eq {}} {
1215 regsub -all {[^/]+/} $_prefix ../ cdup
1217 set cdup $_gitworktree
1219 if {[catch {cd $cdup} err]} {
1220 catch {wm withdraw .}
1221 error_popup [strcat [mc "Cannot move to top of working directory:"] "\n\n$err"]
1224 set _gitworktree [pwd]
1226 } elseif {![is_enabled bare]} {
1228 catch {wm withdraw .}
1229 error_popup [strcat [mc "Cannot use bare repository:"] "\n\n$_gitdir"]
1232 if {$_gitworktree eq {}} {
1233 set _gitworktree [file dirname $_gitdir]
1235 if {[catch {cd $_gitworktree} err]} {
1236 catch {wm withdraw .}
1237 error_popup [strcat [mc "No working directory"] " $_gitworktree:\n\n$err"]
1240 set _gitworktree [pwd]
1242 set _reponame [file split [file normalize $_gitdir]]
1243 if {[lindex $_reponame end] eq {.git}} {
1244 set _reponame [lindex $_reponame end-1]
1246 set _reponame [lindex $_reponame end]
1249 set env(GIT_DIR) $_gitdir
1250 set env(GIT_WORK_TREE) $_gitworktree
1252 ######################################################################
1256 set current_diff_path {}
1257 set current_diff_side {}
1258 set diff_actions [list]
1262 set MERGE_HEAD [list]
1265 set current_branch {}
1267 set current_diff_path {}
1269 set is_submodule_diff 0
1270 set is_conflict_diff 0
1271 set selected_commit_type new
1272 set diff_empty_count 0
1274 set nullid "0000000000000000000000000000000000000000"
1275 set nullid2 "0000000000000000000000000000000000000001"
1277 ######################################################################
1285 set disable_on_lock [list]
1286 set index_lock_type none
1288 proc lock_index {type} {
1289 global index_lock_type disable_on_lock
1291 if {$index_lock_type eq {none}} {
1292 set index_lock_type $type
1293 foreach w $disable_on_lock {
1294 uplevel #0 $w disabled
1297 } elseif {$index_lock_type eq "begin-$type"} {
1298 set index_lock_type $type
1304 proc unlock_index {} {
1305 global index_lock_type disable_on_lock
1307 set index_lock_type none
1308 foreach w $disable_on_lock {
1309 uplevel #0 $w normal
1313 ######################################################################
1317 proc repository_state {ctvar hdvar mhvar} {
1318 global current_branch
1319 upvar $ctvar ct $hdvar hd $mhvar mh
1324 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1330 set merge_head [gitdir MERGE_HEAD]
1331 if {[file exists $merge_head]} {
1333 set fd_mh [open $merge_head r]
1334 while {[gets $fd_mh line] >= 0} {
1345 global PARENT empty_tree
1347 set p [lindex $PARENT 0]
1351 if {$empty_tree eq {}} {
1352 set empty_tree [git mktree << {}]
1357 proc force_amend {} {
1358 global selected_commit_type
1359 global HEAD PARENT MERGE_HEAD commit_type
1361 repository_state newType newHEAD newMERGE_HEAD
1364 set MERGE_HEAD $newMERGE_HEAD
1365 set commit_type $newType
1367 set selected_commit_type amend
1368 do_select_commit_type
1371 proc rescan {after {honor_trustmtime 1}} {
1372 global HEAD PARENT MERGE_HEAD commit_type
1373 global ui_index ui_workdir ui_comm
1374 global rescan_active file_states
1377 if {$rescan_active > 0 || ![lock_index read]} return
1379 repository_state newType newHEAD newMERGE_HEAD
1380 if {[string match amend* $commit_type]
1381 && $newType eq {normal}
1382 && $newHEAD eq $HEAD} {
1386 set MERGE_HEAD $newMERGE_HEAD
1387 set commit_type $newType
1390 array unset file_states
1392 if {!$::GITGUI_BCK_exists &&
1393 (![$ui_comm edit modified]
1394 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1395 if {[string match amend* $commit_type]} {
1396 } elseif {[load_message GITGUI_MSG]} {
1397 } elseif {[run_prepare_commit_msg_hook]} {
1398 } elseif {[load_message MERGE_MSG]} {
1399 } elseif {[load_message SQUASH_MSG]} {
1402 $ui_comm edit modified false
1405 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1406 rescan_stage2 {} $after
1409 ui_status [mc "Refreshing file status..."]
1410 set fd_rf [git_read update-index \
1416 fconfigure $fd_rf -blocking 0 -translation binary
1417 fileevent $fd_rf readable \
1418 [list rescan_stage2 $fd_rf $after]
1423 set is_git_info_exclude {}
1424 proc have_info_exclude {} {
1425 global is_git_info_exclude
1427 if {$is_git_info_exclude eq {}} {
1428 if {[catch {exec test -f [gitdir info exclude]}]} {
1429 set is_git_info_exclude 0
1431 set is_git_info_exclude 1
1434 return $is_git_info_exclude
1437 proc have_info_exclude {} {
1438 return [file readable [gitdir info exclude]]
1442 proc rescan_stage2 {fd after} {
1443 global rescan_active buf_rdi buf_rdf buf_rlo
1447 if {![eof $fd]} return
1451 if {[package vsatisfies $::_git_version 1.6.3]} {
1452 set ls_others [list --exclude-standard]
1454 set ls_others [list --exclude-per-directory=.gitignore]
1455 if {[have_info_exclude]} {
1456 lappend ls_others "--exclude-from=[gitdir info exclude]"
1458 set user_exclude [get_config core.excludesfile]
1459 if {$user_exclude ne {} && [file readable $user_exclude]} {
1460 lappend ls_others "--exclude-from=[file normalize $user_exclude]"
1469 ui_status [mc "Scanning for modified files ..."]
1470 set fd_di [git_read diff-index --cached -z [PARENT]]
1471 set fd_df [git_read diff-files -z]
1472 set fd_lo [eval git_read ls-files --others -z $ls_others]
1474 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1475 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1476 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1477 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1478 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1479 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1482 proc load_message {file} {
1485 set f [gitdir $file]
1486 if {[file isfile $f]} {
1487 if {[catch {set fd [open $f r]}]} {
1490 fconfigure $fd -eofchar {}
1491 set content [string trim [read $fd]]
1493 regsub -all -line {[ \r\t]+$} $content {} content
1494 $ui_comm delete 0.0 end
1495 $ui_comm insert end $content
1501 proc run_prepare_commit_msg_hook {} {
1504 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1505 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1506 # empty file but existant file.
1508 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1510 if {[file isfile [gitdir MERGE_MSG]]} {
1511 set pcm_source "merge"
1512 set fd_mm [open [gitdir MERGE_MSG] r]
1513 puts -nonewline $fd_pcm [read $fd_mm]
1515 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1516 set pcm_source "squash"
1517 set fd_sm [open [gitdir SQUASH_MSG] r]
1518 puts -nonewline $fd_pcm [read $fd_sm]
1526 set fd_ph [githook_read prepare-commit-msg \
1527 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1529 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1533 ui_status [mc "Calling prepare-commit-msg hook..."]
1536 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1537 fileevent $fd_ph readable \
1538 [list prepare_commit_msg_hook_wait $fd_ph]
1543 proc prepare_commit_msg_hook_wait {fd_ph} {
1546 append pch_error [read $fd_ph]
1547 fconfigure $fd_ph -blocking 1
1549 if {[catch {close $fd_ph}]} {
1550 ui_status [mc "Commit declined by prepare-commit-msg hook."]
1551 hook_failed_popup prepare-commit-msg $pch_error
1552 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1555 load_message PREPARE_COMMIT_MSG
1558 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1561 fconfigure $fd_ph -blocking 0
1562 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1565 proc read_diff_index {fd after} {
1568 append buf_rdi [read $fd]
1570 set n [string length $buf_rdi]
1572 set z1 [string first "\0" $buf_rdi $c]
1573 if {$z1 == -1} break
1575 set z2 [string first "\0" $buf_rdi $z1]
1576 if {$z2 == -1} break
1579 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1580 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1582 [encoding convertfrom $p] \
1584 [list [lindex $i 0] [lindex $i 2]] \
1590 set buf_rdi [string range $buf_rdi $c end]
1595 rescan_done $fd buf_rdi $after
1598 proc read_diff_files {fd after} {
1601 append buf_rdf [read $fd]
1603 set n [string length $buf_rdf]
1605 set z1 [string first "\0" $buf_rdf $c]
1606 if {$z1 == -1} break
1608 set z2 [string first "\0" $buf_rdf $z1]
1609 if {$z2 == -1} break
1612 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1613 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1615 [encoding convertfrom $p] \
1618 [list [lindex $i 0] [lindex $i 2]]
1623 set buf_rdf [string range $buf_rdf $c end]
1628 rescan_done $fd buf_rdf $after
1631 proc read_ls_others {fd after} {
1634 append buf_rlo [read $fd]
1635 set pck [split $buf_rlo "\0"]
1636 set buf_rlo [lindex $pck end]
1637 foreach p [lrange $pck 0 end-1] {
1638 set p [encoding convertfrom $p]
1639 if {[string index $p end] eq {/}} {
1640 set p [string range $p 0 end-1]
1644 rescan_done $fd buf_rlo $after
1647 proc rescan_done {fd buf after} {
1648 global rescan_active current_diff_path
1649 global file_states repo_config
1652 if {![eof $fd]} return
1655 if {[incr rescan_active -1] > 0} return
1660 if {$current_diff_path ne {}} { reshow_diff $after }
1661 if {$current_diff_path eq {}} { select_first_diff $after }
1664 proc prune_selection {} {
1665 global file_states selected_paths
1667 foreach path [array names selected_paths] {
1668 if {[catch {set still_here $file_states($path)}]} {
1669 unset selected_paths($path)
1674 ######################################################################
1678 proc mapicon {w state path} {
1681 if {[catch {set r $all_icons($state$w)}]} {
1682 puts "error: no icon for $w state={$state} $path"
1688 proc mapdesc {state path} {
1691 if {[catch {set r $all_descs($state)}]} {
1692 puts "error: no desc for state={$state} $path"
1698 proc ui_status {msg} {
1700 if {[info exists main_status]} {
1701 $main_status show $msg
1705 proc ui_ready {{test {}}} {
1707 if {[info exists main_status]} {
1708 $main_status show [mc "Ready."] $test
1712 proc escape_path {path} {
1713 regsub -all {\\} $path "\\\\" path
1714 regsub -all "\n" $path "\\n" path
1718 proc short_path {path} {
1719 return [escape_path [lindex [file split $path] end]]
1723 set null_sha1 [string repeat 0 40]
1725 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1726 global file_states next_icon_id null_sha1
1728 set s0 [string index $new_state 0]
1729 set s1 [string index $new_state 1]
1731 if {[catch {set info $file_states($path)}]} {
1733 set icon n[incr next_icon_id]
1735 set state [lindex $info 0]
1736 set icon [lindex $info 1]
1737 if {$head_info eq {}} {set head_info [lindex $info 2]}
1738 if {$index_info eq {}} {set index_info [lindex $info 3]}
1741 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1742 elseif {$s0 eq {_}} {set s0 _}
1744 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1745 elseif {$s1 eq {_}} {set s1 _}
1747 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1748 set head_info [list 0 $null_sha1]
1749 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1750 && $head_info eq {}} {
1751 set head_info $index_info
1752 } elseif {$s0 eq {_} && [string index $state 0] ne {_}} {
1753 set index_info $head_info
1757 set file_states($path) [list $s0$s1 $icon \
1758 $head_info $index_info \
1763 proc display_file_helper {w path icon_name old_m new_m} {
1766 if {$new_m eq {_}} {
1767 set lno [lsearch -sorted -exact $file_lists($w) $path]
1769 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1771 $w conf -state normal
1772 $w delete $lno.0 [expr {$lno + 1}].0
1773 $w conf -state disabled
1775 } elseif {$old_m eq {_} && $new_m ne {_}} {
1776 lappend file_lists($w) $path
1777 set file_lists($w) [lsort -unique $file_lists($w)]
1778 set lno [lsearch -sorted -exact $file_lists($w) $path]
1780 $w conf -state normal
1781 $w image create $lno.0 \
1782 -align center -padx 5 -pady 1 \
1784 -image [mapicon $w $new_m $path]
1785 $w insert $lno.1 "[escape_path $path]\n"
1786 $w conf -state disabled
1787 } elseif {$old_m ne $new_m} {
1788 $w conf -state normal
1789 $w image conf $icon_name -image [mapicon $w $new_m $path]
1790 $w conf -state disabled
1794 proc display_file {path state} {
1795 global file_states selected_paths
1796 global ui_index ui_workdir
1798 set old_m [merge_state $path $state]
1799 set s $file_states($path)
1800 set new_m [lindex $s 0]
1801 set icon_name [lindex $s 1]
1803 set o [string index $old_m 0]
1804 set n [string index $new_m 0]
1811 display_file_helper $ui_index $path $icon_name $o $n
1813 if {[string index $old_m 0] eq {U}} {
1816 set o [string index $old_m 1]
1818 if {[string index $new_m 0] eq {U}} {
1821 set n [string index $new_m 1]
1823 display_file_helper $ui_workdir $path $icon_name $o $n
1825 if {$new_m eq {__}} {
1826 unset file_states($path)
1827 catch {unset selected_paths($path)}
1831 proc display_all_files_helper {w path icon_name m} {
1834 lappend file_lists($w) $path
1835 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1836 $w image create end \
1837 -align center -padx 5 -pady 1 \
1839 -image [mapicon $w $m $path]
1840 $w insert end "[escape_path $path]\n"
1844 proc display_all_files {} {
1845 global ui_index ui_workdir
1846 global file_states file_lists
1848 global files_warning
1850 $ui_index conf -state normal
1851 $ui_workdir conf -state normal
1853 $ui_index delete 0.0 end
1854 $ui_workdir delete 0.0 end
1857 set file_lists($ui_index) [list]
1858 set file_lists($ui_workdir) [list]
1860 set to_display [lsort [array names file_states]]
1861 set display_limit [get_config gui.maxfilesdisplayed]
1862 if {[llength $to_display] > $display_limit} {
1863 if {!$files_warning} {
1864 # do not repeatedly warn:
1866 info_popup [mc "Displaying only %s of %s files." \
1867 $display_limit [llength $to_display]]
1869 set to_display [lrange $to_display 0 [expr {$display_limit-1}]]
1871 foreach path $to_display {
1872 set s $file_states($path)
1874 set icon_name [lindex $s 1]
1876 set s [string index $m 0]
1877 if {$s ne {U} && $s ne {_}} {
1878 display_all_files_helper $ui_index $path \
1882 if {[string index $m 0] eq {U}} {
1885 set s [string index $m 1]
1888 display_all_files_helper $ui_workdir $path \
1893 $ui_index conf -state disabled
1894 $ui_workdir conf -state disabled
1897 ######################################################################
1902 #define mask_width 14
1903 #define mask_height 15
1904 static unsigned char mask_bits[] = {
1905 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1906 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1907 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1910 image create bitmap file_plain -background white -foreground black -data {
1911 #define plain_width 14
1912 #define plain_height 15
1913 static unsigned char plain_bits[] = {
1914 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1915 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1916 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1917 } -maskdata $filemask
1919 image create bitmap file_mod -background white -foreground blue -data {
1920 #define mod_width 14
1921 #define mod_height 15
1922 static unsigned char mod_bits[] = {
1923 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1924 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1925 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1926 } -maskdata $filemask
1928 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1929 #define file_fulltick_width 14
1930 #define file_fulltick_height 15
1931 static unsigned char file_fulltick_bits[] = {
1932 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1933 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1934 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1935 } -maskdata $filemask
1937 image create bitmap file_question -background white -foreground black -data {
1938 #define file_question_width 14
1939 #define file_question_height 15
1940 static unsigned char file_question_bits[] = {
1941 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1942 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1943 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1944 } -maskdata $filemask
1946 image create bitmap file_removed -background white -foreground red -data {
1947 #define file_removed_width 14
1948 #define file_removed_height 15
1949 static unsigned char file_removed_bits[] = {
1950 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1951 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1952 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1953 } -maskdata $filemask
1955 image create bitmap file_merge -background white -foreground blue -data {
1956 #define file_merge_width 14
1957 #define file_merge_height 15
1958 static unsigned char file_merge_bits[] = {
1959 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1960 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1961 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1962 } -maskdata $filemask
1964 image create bitmap file_statechange -background white -foreground green -data {
1965 #define file_statechange_width 14
1966 #define file_statechange_height 15
1967 static unsigned char file_statechange_bits[] = {
1968 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
1969 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
1970 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1971 } -maskdata $filemask
1973 set ui_index .vpane.files.index.list
1974 set ui_workdir .vpane.files.workdir.list
1976 set all_icons(_$ui_index) file_plain
1977 set all_icons(A$ui_index) file_plain
1978 set all_icons(M$ui_index) file_fulltick
1979 set all_icons(D$ui_index) file_removed
1980 set all_icons(U$ui_index) file_merge
1981 set all_icons(T$ui_index) file_statechange
1983 set all_icons(_$ui_workdir) file_plain
1984 set all_icons(M$ui_workdir) file_mod
1985 set all_icons(D$ui_workdir) file_question
1986 set all_icons(U$ui_workdir) file_merge
1987 set all_icons(O$ui_workdir) file_plain
1988 set all_icons(T$ui_workdir) file_statechange
1990 set max_status_desc 0
1992 {__ {mc "Unmodified"}}
1994 {_M {mc "Modified, not staged"}}
1995 {M_ {mc "Staged for commit"}}
1996 {MM {mc "Portions staged for commit"}}
1997 {MD {mc "Staged for commit, missing"}}
1999 {_T {mc "File type changed, not staged"}}
2000 {MT {mc "File type changed, old type staged for commit"}}
2001 {AT {mc "File type changed, old type staged for commit"}}
2002 {T_ {mc "File type changed, staged"}}
2003 {TM {mc "File type change staged, modification not staged"}}
2004 {TD {mc "File type change staged, file missing"}}
2006 {_O {mc "Untracked, not staged"}}
2007 {A_ {mc "Staged for commit"}}
2008 {AM {mc "Portions staged for commit"}}
2009 {AD {mc "Staged for commit, missing"}}
2012 {D_ {mc "Staged for removal"}}
2013 {DO {mc "Staged for removal, still present"}}
2015 {_U {mc "Requires merge resolution"}}
2016 {U_ {mc "Requires merge resolution"}}
2017 {UU {mc "Requires merge resolution"}}
2018 {UM {mc "Requires merge resolution"}}
2019 {UD {mc "Requires merge resolution"}}
2020 {UT {mc "Requires merge resolution"}}
2022 set text [eval [lindex $i 1]]
2023 if {$max_status_desc < [string length $text]} {
2024 set max_status_desc [string length $text]
2026 set all_descs([lindex $i 0]) $text
2030 ######################################################################
2034 proc scrollbar2many {list mode args} {
2035 foreach w $list {eval $w $mode $args}
2038 proc many2scrollbar {list mode sb top bottom} {
2039 $sb set $top $bottom
2040 foreach w $list {$w $mode moveto $top}
2043 proc incr_font_size {font {amt 1}} {
2044 set sz [font configure $font -size]
2046 font configure $font -size $sz
2047 font configure ${font}bold -size $sz
2048 font configure ${font}italic -size $sz
2051 ######################################################################
2055 set starting_gitk_msg [mc "Starting gitk... please wait..."]
2057 proc do_gitk {revs {is_submodule false}} {
2058 global current_diff_path file_states current_diff_side ui_index
2059 global _gitdir _gitworktree
2061 # -- Always start gitk through whatever we were loaded with. This
2062 # lets us bypass using shell process on Windows systems.
2064 set exe [_which gitk -script]
2065 set cmd [list [info nameofexecutable] $exe]
2067 error_popup [mc "Couldn't find gitk in PATH"]
2073 if {!$is_submodule} {
2078 cd $current_diff_path
2079 if {$revs eq {--}} {
2080 set s $file_states($current_diff_path)
2083 switch -glob -- [lindex $s 0] {
2084 M_ { set old_sha1 [lindex [lindex $s 2] 1] }
2085 _M { set old_sha1 [lindex [lindex $s 3] 1] }
2087 if {$current_diff_side eq $ui_index} {
2088 set old_sha1 [lindex [lindex $s 2] 1]
2089 set new_sha1 [lindex [lindex $s 3] 1]
2091 set old_sha1 [lindex [lindex $s 3] 1]
2095 set revs $old_sha1...$new_sha1
2097 # GIT_DIR and GIT_WORK_TREE for the submodule are not the ones
2098 # we've been using for the main repository, so unset them.
2099 # TODO we could make life easier (start up faster?) for gitk
2100 # by setting these to the appropriate values to allow gitk
2101 # to skip the heuristics to find their proper value
2103 unset env(GIT_WORK_TREE)
2105 eval exec $cmd $revs "--" "--" &
2107 set env(GIT_DIR) $_gitdir
2108 set env(GIT_WORK_TREE) $_gitworktree
2111 ui_status $::starting_gitk_msg
2113 ui_ready $starting_gitk_msg
2118 proc do_git_gui {} {
2119 global current_diff_path
2121 # -- Always start git gui through whatever we were loaded with. This
2122 # lets us bypass using shell process on Windows systems.
2124 set exe [list [_which git]]
2126 error_popup [mc "Couldn't find git gui in PATH"]
2129 global _gitdir _gitworktree
2131 # see note in do_gitk about unsetting these vars when
2132 # running tools in a submodule
2134 unset env(GIT_WORK_TREE)
2137 cd $current_diff_path
2139 eval exec $exe gui &
2141 set env(GIT_DIR) $_gitdir
2142 set env(GIT_WORK_TREE) $_gitworktree
2145 ui_status $::starting_gitk_msg
2147 ui_ready $starting_gitk_msg
2152 proc do_explore {} {
2155 if {[is_Cygwin] || [is_Windows]} {
2156 set explorer "explorer.exe"
2157 } elseif {[is_MacOSX]} {
2160 # freedesktop.org-conforming system is our best shot
2161 set explorer "xdg-open"
2163 eval exec $explorer [list [file nativename $_gitworktree]] &
2169 proc terminate_me {win} {
2171 if {$win ne {.}} return
2175 proc do_quit {{rc {1}}} {
2176 global ui_comm is_quitting repo_config commit_type
2177 global GITGUI_BCK_exists GITGUI_BCK_i
2178 global ui_comm_spell
2179 global ret_code use_ttk
2181 if {$is_quitting} return
2184 if {[winfo exists $ui_comm]} {
2185 # -- Stash our current commit buffer.
2187 set save [gitdir GITGUI_MSG]
2188 if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
2189 file rename -force [gitdir GITGUI_BCK] $save
2190 set GITGUI_BCK_exists 0
2192 set msg [string trim [$ui_comm get 0.0 end]]
2193 regsub -all -line {[ \r\t]+$} $msg {} msg
2194 if {(![string match amend* $commit_type]
2195 || [$ui_comm edit modified])
2198 set fd [open $save w]
2199 puts -nonewline $fd $msg
2203 catch {file delete $save}
2207 # -- Cancel our spellchecker if its running.
2209 if {[info exists ui_comm_spell]} {
2213 # -- Remove our editor backup, its not needed.
2215 after cancel $GITGUI_BCK_i
2216 if {$GITGUI_BCK_exists} {
2217 catch {file delete [gitdir GITGUI_BCK]}
2220 # -- Stash our current window geometry into this repository.
2222 set cfg_wmstate [wm state .]
2223 if {[catch {set rc_wmstate $repo_config(gui.wmstate)}]} {
2226 if {$cfg_wmstate ne $rc_wmstate} {
2227 catch {git config gui.wmstate $cfg_wmstate}
2229 if {$cfg_wmstate eq {zoomed}} {
2230 # on Windows wm geometry will lie about window
2231 # position (but not size) when window is zoomed
2232 # restore the window before querying wm geometry
2235 set cfg_geometry [list]
2236 lappend cfg_geometry [wm geometry .]
2238 lappend cfg_geometry [.vpane sashpos 0]
2239 lappend cfg_geometry [.vpane.files sashpos 0]
2241 lappend cfg_geometry [lindex [.vpane sash coord 0] 0]
2242 lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1]
2244 if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
2247 if {$cfg_geometry ne $rc_geometry} {
2248 catch {git config gui.geometry $cfg_geometry}
2254 # Briefly enable send again, working around Tk bug
2255 # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
2256 tk appname [appname]
2265 proc ui_do_rescan {} {
2266 rescan {force_first_diff ui_ready}
2273 proc next_diff {{after {}}} {
2274 global next_diff_p next_diff_w next_diff_i
2275 show_diff $next_diff_p $next_diff_w {} {} $after
2278 proc find_anchor_pos {lst name} {
2279 set lid [lsearch -sorted -exact $lst $name]
2283 foreach lname $lst {
2284 if {$lname >= $name} break
2292 proc find_file_from {flist idx delta path mmask} {
2295 set len [llength $flist]
2296 while {$idx >= 0 && $idx < $len} {
2297 set name [lindex $flist $idx]
2299 if {$name ne $path && [info exists file_states($name)]} {
2300 set state [lindex $file_states($name) 0]
2302 if {$mmask eq {} || [regexp $mmask $state]} {
2313 proc find_next_diff {w path {lno {}} {mmask {}}} {
2314 global next_diff_p next_diff_w next_diff_i
2315 global file_lists ui_index ui_workdir
2317 set flist $file_lists($w)
2319 set lno [find_anchor_pos $flist $path]
2324 if {$mmask ne {} && ![regexp {(^\^)|(\$$)} $mmask]} {
2325 if {$w eq $ui_index} {
2328 set mmask "$mmask\$"
2332 set idx [find_file_from $flist $lno 1 $path $mmask]
2335 set idx [find_file_from $flist $lno -1 $path $mmask]
2340 set next_diff_p [lindex $flist $idx]
2341 set next_diff_i [expr {$idx+1}]
2348 proc next_diff_after_action {w path {lno {}} {mmask {}}} {
2349 global current_diff_path
2351 if {$path ne $current_diff_path} {
2353 } elseif {[find_next_diff $w $path $lno $mmask]} {
2356 return {reshow_diff;}
2360 proc select_first_diff {after} {
2363 if {[find_next_diff $ui_workdir {} 1 {^_?U}] ||
2364 [find_next_diff $ui_workdir {} 1 {[^O]$}]} {
2371 proc force_first_diff {after} {
2372 global ui_workdir current_diff_path file_states
2374 if {[info exists file_states($current_diff_path)]} {
2375 set state [lindex $file_states($current_diff_path) 0]
2381 if {[string first {U} $state] >= 0} {
2382 # Already a conflict, do nothing
2383 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {^_?U}]} {
2385 } elseif {[string index $state 1] ne {O}} {
2386 # Already a diff & no conflicts, do nothing
2387 } elseif {[find_next_diff $ui_workdir $current_diff_path {} {[^O]$}]} {
2398 proc toggle_or_diff {w x y} {
2399 global file_states file_lists current_diff_path ui_index ui_workdir
2400 global last_clicked selected_paths
2402 set pos [split [$w index @$x,$y] .]
2403 set lno [lindex $pos 0]
2404 set col [lindex $pos 1]
2405 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2411 set last_clicked [list $w $lno]
2412 array unset selected_paths
2413 $ui_index tag remove in_sel 0.0 end
2414 $ui_workdir tag remove in_sel 0.0 end
2416 # Determine the state of the file
2417 if {[info exists file_states($path)]} {
2418 set state [lindex $file_states($path) 0]
2423 # Restage the file, or simply show the diff
2424 if {$col == 0 && $y > 1} {
2425 # Conflicts need special handling
2426 if {[string first {U} $state] >= 0} {
2427 # $w must always be $ui_workdir, but...
2428 if {$w ne $ui_workdir} { set lno {} }
2429 merge_stage_workdir $path $lno
2433 if {[string index $state 1] eq {O}} {
2439 set after [next_diff_after_action $w $path $lno $mmask]
2441 if {$w eq $ui_index} {
2443 "Unstaging [short_path $path] from commit" \
2445 [concat $after [list ui_ready]]
2446 } elseif {$w eq $ui_workdir} {
2448 "Adding [short_path $path]" \
2450 [concat $after [list ui_ready]]
2453 show_diff $path $w $lno
2457 proc add_one_to_selection {w x y} {
2458 global file_lists last_clicked selected_paths
2460 set lno [lindex [split [$w index @$x,$y] .] 0]
2461 set path [lindex $file_lists($w) [expr {$lno - 1}]]
2467 if {$last_clicked ne {}
2468 && [lindex $last_clicked 0] ne $w} {
2469 array unset selected_paths
2470 [lindex $last_clicked 0] tag remove in_sel 0.0 end
2473 set last_clicked [list $w $lno]
2474 if {[catch {set in_sel $selected_paths($path)}]} {
2478 unset selected_paths($path)
2479 $w tag remove in_sel $lno.0 [expr {$lno + 1}].0
2481 set selected_paths($path) 1
2482 $w tag add in_sel $lno.0 [expr {$lno + 1}].0
2486 proc add_range_to_selection {w x y} {
2487 global file_lists last_clicked selected_paths
2489 if {[lindex $last_clicked 0] ne $w} {
2490 toggle_or_diff $w $x $y
2494 set lno [lindex [split [$w index @$x,$y] .] 0]
2495 set lc [lindex $last_clicked 1]
2504 foreach path [lrange $file_lists($w) \
2505 [expr {$begin - 1}] \
2506 [expr {$end - 1}]] {
2507 set selected_paths($path) 1
2509 $w tag add in_sel $begin.0 [expr {$end + 1}].0
2512 proc show_more_context {} {
2514 if {$repo_config(gui.diffcontext) < 99} {
2515 incr repo_config(gui.diffcontext)
2520 proc show_less_context {} {
2522 if {$repo_config(gui.diffcontext) > 1} {
2523 incr repo_config(gui.diffcontext) -1
2528 ######################################################################
2536 menu .mbar -tearoff 0
2538 # -- Apple Menu (Mac OS X only)
2540 .mbar add cascade -label Apple -menu .mbar.apple
2543 .mbar add cascade -label [mc Repository] -menu .mbar.repository
2544 .mbar add cascade -label [mc Edit] -menu .mbar.edit
2545 if {[is_enabled branch]} {
2546 .mbar add cascade -label [mc Branch] -menu .mbar.branch
2548 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2549 .mbar add cascade -label [mc Commit@@noun] -menu .mbar.commit
2551 if {[is_enabled transport]} {
2552 .mbar add cascade -label [mc Merge] -menu .mbar.merge
2553 .mbar add cascade -label [mc Remote] -menu .mbar.remote
2555 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2556 .mbar add cascade -label [mc Tools] -menu .mbar.tools
2559 # -- Repository Menu
2561 menu .mbar.repository
2564 .mbar.repository add command \
2565 -label [mc "Explore Working Copy"] \
2566 -command {do_explore}
2567 .mbar.repository add separator
2570 .mbar.repository add command \
2571 -label [mc "Browse Current Branch's Files"] \
2572 -command {browser::new $current_branch}
2573 set ui_browse_current [.mbar.repository index last]
2574 .mbar.repository add command \
2575 -label [mc "Browse Branch Files..."] \
2576 -command browser_open::dialog
2577 .mbar.repository add separator
2579 .mbar.repository add command \
2580 -label [mc "Visualize Current Branch's History"] \
2581 -command {do_gitk $current_branch}
2582 set ui_visualize_current [.mbar.repository index last]
2583 .mbar.repository add command \
2584 -label [mc "Visualize All Branch History"] \
2585 -command {do_gitk --all}
2586 .mbar.repository add separator
2588 proc current_branch_write {args} {
2589 global current_branch
2590 .mbar.repository entryconf $::ui_browse_current \
2591 -label [mc "Browse %s's Files" $current_branch]
2592 .mbar.repository entryconf $::ui_visualize_current \
2593 -label [mc "Visualize %s's History" $current_branch]
2595 trace add variable current_branch write current_branch_write
2597 if {[is_enabled multicommit]} {
2598 .mbar.repository add command -label [mc "Database Statistics"] \
2601 .mbar.repository add command -label [mc "Compress Database"] \
2604 .mbar.repository add command -label [mc "Verify Database"] \
2605 -command do_fsck_objects
2607 .mbar.repository add separator
2610 .mbar.repository add command \
2611 -label [mc "Create Desktop Icon"] \
2612 -command do_cygwin_shortcut
2613 } elseif {[is_Windows]} {
2614 .mbar.repository add command \
2615 -label [mc "Create Desktop Icon"] \
2616 -command do_windows_shortcut
2617 } elseif {[is_MacOSX]} {
2618 .mbar.repository add command \
2619 -label [mc "Create Desktop Icon"] \
2620 -command do_macosx_app
2625 proc ::tk::mac::Quit {args} { do_quit }
2627 .mbar.repository add command -label [mc Quit] \
2635 .mbar.edit add command -label [mc Undo] \
2636 -command {catch {[focus] edit undo}} \
2638 .mbar.edit add command -label [mc Redo] \
2639 -command {catch {[focus] edit redo}} \
2641 .mbar.edit add separator
2642 .mbar.edit add command -label [mc Cut] \
2643 -command {catch {tk_textCut [focus]}} \
2645 .mbar.edit add command -label [mc Copy] \
2646 -command {catch {tk_textCopy [focus]}} \
2648 .mbar.edit add command -label [mc Paste] \
2649 -command {catch {tk_textPaste [focus]; [focus] see insert}} \
2651 .mbar.edit add command -label [mc Delete] \
2652 -command {catch {[focus] delete sel.first sel.last}} \
2654 .mbar.edit add separator
2655 .mbar.edit add command -label [mc "Select All"] \
2656 -command {catch {[focus] tag add sel 0.0 end}} \
2661 if {[is_enabled branch]} {
2664 .mbar.branch add command -label [mc "Create..."] \
2665 -command branch_create::dialog \
2667 lappend disable_on_lock [list .mbar.branch entryconf \
2668 [.mbar.branch index last] -state]
2670 .mbar.branch add command -label [mc "Checkout..."] \
2671 -command branch_checkout::dialog \
2673 lappend disable_on_lock [list .mbar.branch entryconf \
2674 [.mbar.branch index last] -state]
2676 .mbar.branch add command -label [mc "Rename..."] \
2677 -command branch_rename::dialog
2678 lappend disable_on_lock [list .mbar.branch entryconf \
2679 [.mbar.branch index last] -state]
2681 .mbar.branch add command -label [mc "Delete..."] \
2682 -command branch_delete::dialog
2683 lappend disable_on_lock [list .mbar.branch entryconf \
2684 [.mbar.branch index last] -state]
2686 .mbar.branch add command -label [mc "Reset..."] \
2687 -command merge::reset_hard
2688 lappend disable_on_lock [list .mbar.branch entryconf \
2689 [.mbar.branch index last] -state]
2694 proc commit_btn_caption {} {
2695 if {[is_enabled nocommit]} {
2698 return [mc Commit@@verb]
2702 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2705 if {![is_enabled nocommit]} {
2706 .mbar.commit add radiobutton \
2707 -label [mc "New Commit"] \
2708 -command do_select_commit_type \
2709 -variable selected_commit_type \
2711 lappend disable_on_lock \
2712 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2714 .mbar.commit add radiobutton \
2715 -label [mc "Amend Last Commit"] \
2716 -command do_select_commit_type \
2717 -variable selected_commit_type \
2719 lappend disable_on_lock \
2720 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2722 .mbar.commit add separator
2725 .mbar.commit add command -label [mc Rescan] \
2726 -command ui_do_rescan \
2728 lappend disable_on_lock \
2729 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2731 .mbar.commit add command -label [mc "Stage To Commit"] \
2732 -command do_add_selection \
2734 lappend disable_on_lock \
2735 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2737 .mbar.commit add command -label [mc "Stage Changed Files To Commit"] \
2738 -command do_add_all \
2740 lappend disable_on_lock \
2741 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2743 .mbar.commit add command -label [mc "Unstage From Commit"] \
2744 -command do_unstage_selection \
2746 lappend disable_on_lock \
2747 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2749 .mbar.commit add command -label [mc "Revert Changes"] \
2750 -command do_revert_selection \
2752 lappend disable_on_lock \
2753 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2755 .mbar.commit add separator
2757 .mbar.commit add command -label [mc "Show Less Context"] \
2758 -command show_less_context \
2759 -accelerator $M1T-\-
2761 .mbar.commit add command -label [mc "Show More Context"] \
2762 -command show_more_context \
2765 .mbar.commit add separator
2767 if {![is_enabled nocommitmsg]} {
2768 .mbar.commit add command -label [mc "Sign Off"] \
2769 -command do_signoff \
2773 .mbar.commit add command -label [commit_btn_caption] \
2774 -command do_commit \
2775 -accelerator $M1T-Return
2776 lappend disable_on_lock \
2777 [list .mbar.commit entryconf [.mbar.commit index last] -state]
2782 if {[is_enabled branch]} {
2784 .mbar.merge add command -label [mc "Local Merge..."] \
2785 -command merge::dialog \
2787 lappend disable_on_lock \
2788 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2789 .mbar.merge add command -label [mc "Abort Merge..."] \
2790 -command merge::reset_hard
2791 lappend disable_on_lock \
2792 [list .mbar.merge entryconf [.mbar.merge index last] -state]
2797 if {[is_enabled transport]} {
2800 .mbar.remote add command \
2801 -label [mc "Add..."] \
2802 -command remote_add::dialog \
2804 .mbar.remote add command \
2805 -label [mc "Push..."] \
2806 -command do_push_anywhere \
2808 .mbar.remote add command \
2809 -label [mc "Delete Branch..."] \
2810 -command remote_branch_delete::dialog
2814 proc ::tk::mac::ShowPreferences {} {do_options}
2818 .mbar.edit add separator
2819 .mbar.edit add command -label [mc "Options..."] \
2825 if {[is_enabled multicommit] || [is_enabled singlecommit]} {
2826 set tools_menubar .mbar.tools
2828 $tools_menubar add separator
2829 $tools_menubar add command -label [mc "Add..."] -command tools_add::dialog
2830 $tools_menubar add command -label [mc "Remove..."] -command tools_remove::dialog
2832 if {[array names repo_config guitool.*.cmd] ne {}} {
2839 .mbar add cascade -label [mc Help] -menu .mbar.help
2843 .mbar.apple add command -label [mc "About %s" [appname]] \
2845 .mbar.apple add separator
2847 .mbar.help add command -label [mc "About %s" [appname]] \
2850 . configure -menu .mbar
2852 set doc_path [githtmldir]
2853 if {$doc_path ne {}} {
2854 set doc_path [file join $doc_path index.html]
2857 set doc_path [exec cygpath --mixed $doc_path]
2861 if {[file isfile $doc_path]} {
2862 set doc_url "file:$doc_path"
2864 set doc_url {http://www.kernel.org/pub/software/scm/git/docs/}
2867 proc start_browser {url} {
2868 git "web--browse" $url
2871 .mbar.help add command -label [mc "Online Documentation"] \
2872 -command [list start_browser $doc_url]
2874 .mbar.help add command -label [mc "Show SSH Key"] \
2877 unset doc_path doc_url
2879 # -- Standard bindings
2881 wm protocol . WM_DELETE_WINDOW do_quit
2882 bind all <$M1B-Key-q> do_quit
2883 bind all <$M1B-Key-Q> do_quit
2884 bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
2885 bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
2887 set subcommand_args {}
2889 set s "usage: $::argv0 $::subcommand $::subcommand_args"
2890 if {[tk windowingsystem] eq "win32"} {
2892 tk_messageBox -icon info -message $s \
2900 proc normalize_relpath {path} {
2902 foreach item [file split $path] {
2903 if {$item eq {.}} continue
2904 if {$item eq {..} && [llength $elements] > 0
2905 && [lindex $elements end] ne {..}} {
2906 set elements [lrange $elements 0 end-1]
2909 lappend elements $item
2911 return [eval file join $elements]
2914 # -- Not a normal commit type invocation? Do that instead!
2916 switch -- $subcommand {
2919 if {$subcommand eq "blame"} {
2920 set subcommand_args {[--line=<num>] rev? path}
2922 set subcommand_args {rev? path}
2924 if {$argv eq {}} usage
2930 if {$is_path || [file exists $_prefix$a]} {
2931 if {$path ne {}} usage
2932 set path [normalize_relpath $_prefix$a]
2934 } elseif {$a eq {--}} {
2936 if {$head ne {}} usage
2941 } elseif {[regexp {^--line=(\d+)$} $a a lnum]} {
2942 if {$jump_spec ne {} || $head ne {}} usage
2943 set jump_spec [list $lnum]
2944 } elseif {$head eq {}} {
2945 if {$head ne {}} usage
2954 if {$head ne {} && $path eq {}} {
2955 set path [normalize_relpath $_prefix$head]
2962 if {[regexp {^[0-9a-f]{1,39}$} $head]} {
2964 set head [git rev-parse --verify $head]
2966 if {[tk windowingsystem] eq "win32"} {
2967 tk_messageBox -icon error -title [mc Error] -message $err
2974 set current_branch $head
2978 switch -- $subcommand {
2980 if {$jump_spec ne {}} usage
2982 if {$path ne {} && [file isdirectory $path]} {
2983 set head $current_branch
2989 browser::new $head $path
2992 if {$head eq {} && ![file exists $path]} {
2993 catch {wm withdraw .}
2997 -title [mc "git-gui: fatal error"] \
2998 -message [mc "fatal: cannot stat path %s: No such file or directory" $path]
3001 blame::new $head $path $jump_spec
3008 if {[llength $argv] != 0} {
3011 # fall through to setup UI for commits
3014 set err "usage: $argv0 \[{blame|browser|citool}\]"
3015 if {[tk windowingsystem] eq "win32"} {
3017 tk_messageBox -icon error -message $err \
3028 ${NS}::frame .branch
3029 if {!$use_ttk} {.branch configure -borderwidth 1 -relief sunken}
3030 ${NS}::label .branch.l1 \
3031 -text [mc "Current Branch:"] \
3034 ${NS}::label .branch.cb \
3035 -textvariable current_branch \
3038 pack .branch.l1 -side left
3039 pack .branch.cb -side left -fill x
3040 pack .branch -side top -fill x
3042 # -- Main Window Layout
3044 ${NS}::panedwindow .vpane -orient horizontal
3045 ${NS}::panedwindow .vpane.files -orient vertical
3047 .vpane add .vpane.files
3049 .vpane add .vpane.files -sticky nsew -height 100 -width 200
3051 pack .vpane -anchor n -side top -fill both -expand 1
3053 # -- Index File List
3055 ${NS}::frame .vpane.files.index -height 100 -width 200
3056 tlabel .vpane.files.index.title \
3057 -text [mc "Staged Changes (Will Commit)"] \
3058 -background lightgreen -foreground black
3059 text $ui_index -background white -foreground black \
3061 -width 20 -height 10 \
3063 -cursor $cursor_ptr \
3064 -xscrollcommand {.vpane.files.index.sx set} \
3065 -yscrollcommand {.vpane.files.index.sy set} \
3067 ${NS}::scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
3068 ${NS}::scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
3069 pack .vpane.files.index.title -side top -fill x
3070 pack .vpane.files.index.sx -side bottom -fill x
3071 pack .vpane.files.index.sy -side right -fill y
3072 pack $ui_index -side left -fill both -expand 1
3074 # -- Working Directory File List
3076 ${NS}::frame .vpane.files.workdir -height 100 -width 200
3077 tlabel .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
3078 -background lightsalmon -foreground black
3079 text $ui_workdir -background white -foreground black \
3081 -width 20 -height 10 \
3083 -cursor $cursor_ptr \
3084 -xscrollcommand {.vpane.files.workdir.sx set} \
3085 -yscrollcommand {.vpane.files.workdir.sy set} \
3087 ${NS}::scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
3088 ${NS}::scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
3089 pack .vpane.files.workdir.title -side top -fill x
3090 pack .vpane.files.workdir.sx -side bottom -fill x
3091 pack .vpane.files.workdir.sy -side right -fill y
3092 pack $ui_workdir -side left -fill both -expand 1
3094 .vpane.files add .vpane.files.workdir
3095 .vpane.files add .vpane.files.index
3097 .vpane.files paneconfigure .vpane.files.workdir -sticky news
3098 .vpane.files paneconfigure .vpane.files.index -sticky news
3101 foreach i [list $ui_index $ui_workdir] {
3103 $i tag conf in_diff -background [$i tag cget in_sel -background]
3107 # -- Diff and Commit Area
3109 ${NS}::frame .vpane.lower -height 300 -width 400
3110 ${NS}::frame .vpane.lower.commarea
3111 ${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1
3112 pack .vpane.lower.diff -fill both -expand 1
3113 pack .vpane.lower.commarea -side bottom -fill x
3114 .vpane add .vpane.lower
3115 if {!$use_ttk} {.vpane paneconfigure .vpane.lower -sticky nsew}
3117 # -- Commit Area Buttons
3119 ${NS}::frame .vpane.lower.commarea.buttons
3120 ${NS}::label .vpane.lower.commarea.buttons.l -text {} \
3123 pack .vpane.lower.commarea.buttons.l -side top -fill x
3124 pack .vpane.lower.commarea.buttons -side left -fill y
3126 ${NS}::button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
3127 -command ui_do_rescan
3128 pack .vpane.lower.commarea.buttons.rescan -side top -fill x
3129 lappend disable_on_lock \
3130 {.vpane.lower.commarea.buttons.rescan conf -state}
3132 ${NS}::button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
3134 pack .vpane.lower.commarea.buttons.incall -side top -fill x
3135 lappend disable_on_lock \
3136 {.vpane.lower.commarea.buttons.incall conf -state}
3138 if {![is_enabled nocommitmsg]} {
3139 ${NS}::button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
3141 pack .vpane.lower.commarea.buttons.signoff -side top -fill x
3144 ${NS}::button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \
3146 pack .vpane.lower.commarea.buttons.commit -side top -fill x
3147 lappend disable_on_lock \
3148 {.vpane.lower.commarea.buttons.commit conf -state}
3150 if {![is_enabled nocommit]} {
3151 ${NS}::button .vpane.lower.commarea.buttons.push -text [mc Push] \
3152 -command do_push_anywhere
3153 pack .vpane.lower.commarea.buttons.push -side top -fill x
3156 # -- Commit Message Buffer
3158 ${NS}::frame .vpane.lower.commarea.buffer
3159 ${NS}::frame .vpane.lower.commarea.buffer.header
3160 set ui_comm .vpane.lower.commarea.buffer.t
3161 set ui_coml .vpane.lower.commarea.buffer.header.l
3163 if {![is_enabled nocommit]} {
3164 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.new \
3165 -text [mc "New Commit"] \
3166 -command do_select_commit_type \
3167 -variable selected_commit_type \
3169 lappend disable_on_lock \
3170 [list .vpane.lower.commarea.buffer.header.new conf -state]
3171 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.amend \
3172 -text [mc "Amend Last Commit"] \
3173 -command do_select_commit_type \
3174 -variable selected_commit_type \
3176 lappend disable_on_lock \
3177 [list .vpane.lower.commarea.buffer.header.amend conf -state]
3180 ${NS}::label $ui_coml \
3183 proc trace_commit_type {varname args} {
3184 global ui_coml commit_type
3185 switch -glob -- $commit_type {
3186 initial {set txt [mc "Initial Commit Message:"]}
3187 amend {set txt [mc "Amended Commit Message:"]}
3188 amend-initial {set txt [mc "Amended Initial Commit Message:"]}
3189 amend-merge {set txt [mc "Amended Merge Commit Message:"]}
3190 merge {set txt [mc "Merge Commit Message:"]}
3191 * {set txt [mc "Commit Message:"]}
3193 $ui_coml conf -text $txt
3195 trace add variable commit_type write trace_commit_type
3196 pack $ui_coml -side left -fill x
3198 if {![is_enabled nocommit]} {
3199 pack .vpane.lower.commarea.buffer.header.amend -side right
3200 pack .vpane.lower.commarea.buffer.header.new -side right
3203 text $ui_comm -background white -foreground black \
3207 -autoseparators true \
3209 -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \
3211 -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
3212 ${NS}::scrollbar .vpane.lower.commarea.buffer.sby \
3213 -command [list $ui_comm yview]
3214 pack .vpane.lower.commarea.buffer.header -side top -fill x
3215 pack .vpane.lower.commarea.buffer.sby -side right -fill y
3216 pack $ui_comm -side left -fill y
3217 pack .vpane.lower.commarea.buffer -side left -fill y
3219 # -- Commit Message Buffer Context Menu
3221 set ctxm .vpane.lower.commarea.buffer.ctxm
3222 menu $ctxm -tearoff 0
3225 -command {tk_textCut $ui_comm}
3228 -command {tk_textCopy $ui_comm}
3231 -command {tk_textPaste $ui_comm}
3233 -label [mc Delete] \
3234 -command {catch {$ui_comm delete sel.first sel.last}}
3237 -label [mc "Select All"] \
3238 -command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
3240 -label [mc "Copy All"] \
3242 $ui_comm tag add sel 0.0 end
3243 tk_textCopy $ui_comm
3244 $ui_comm tag remove sel 0.0 end
3248 -label [mc "Sign Off"] \
3250 set ui_comm_ctxm $ctxm
3254 proc trace_current_diff_path {varname args} {
3255 global current_diff_path diff_actions file_states
3256 if {$current_diff_path eq {}} {
3262 set p $current_diff_path
3263 set s [mapdesc [lindex $file_states($p) 0] $p]
3265 set p [escape_path $p]
3269 .vpane.lower.diff.header.status configure -text $s
3270 .vpane.lower.diff.header.file configure -text $f
3271 .vpane.lower.diff.header.path configure -text $p
3272 foreach w $diff_actions {
3276 trace add variable current_diff_path write trace_current_diff_path
3278 gold_frame .vpane.lower.diff.header
3279 tlabel .vpane.lower.diff.header.status \
3282 -width $max_status_desc \
3285 tlabel .vpane.lower.diff.header.file \
3290 tlabel .vpane.lower.diff.header.path \
3295 pack .vpane.lower.diff.header.status -side left
3296 pack .vpane.lower.diff.header.file -side left
3297 pack .vpane.lower.diff.header.path -fill x
3298 set ctxm .vpane.lower.diff.header.ctxm
3299 menu $ctxm -tearoff 0
3307 -- $current_diff_path
3309 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3310 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
3314 ${NS}::frame .vpane.lower.diff.body
3315 set ui_diff .vpane.lower.diff.body.t
3316 text $ui_diff -background white -foreground black \
3318 -width 80 -height 5 -wrap none \
3320 -xscrollcommand {.vpane.lower.diff.body.sbx set} \
3321 -yscrollcommand {.vpane.lower.diff.body.sby set} \
3323 catch {$ui_diff configure -tabstyle wordprocessor}
3324 ${NS}::scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
3325 -command [list $ui_diff xview]
3326 ${NS}::scrollbar .vpane.lower.diff.body.sby -orient vertical \
3327 -command [list $ui_diff yview]
3328 pack .vpane.lower.diff.body.sbx -side bottom -fill x
3329 pack .vpane.lower.diff.body.sby -side right -fill y
3330 pack $ui_diff -side left -fill both -expand 1
3331 pack .vpane.lower.diff.header -side top -fill x
3332 pack .vpane.lower.diff.body -side bottom -fill both -expand 1
3334 foreach {n c} {0 black 1 red4 2 green4 3 yellow4 4 blue4 5 magenta4 6 cyan4 7 grey60} {
3335 $ui_diff tag configure clr4$n -background $c
3336 $ui_diff tag configure clri4$n -foreground $c
3337 $ui_diff tag configure clr3$n -foreground $c
3338 $ui_diff tag configure clri3$n -background $c
3340 $ui_diff tag configure clr1 -font font_diffbold
3342 $ui_diff tag conf d_info -foreground blue -font font_diffbold
3344 $ui_diff tag conf d_cr -elide true
3345 $ui_diff tag conf d_@ -font font_diffbold
3346 $ui_diff tag conf d_+ -foreground {#00a000}
3347 $ui_diff tag conf d_- -foreground red
3349 $ui_diff tag conf d_++ -foreground {#00a000}
3350 $ui_diff tag conf d_-- -foreground red
3351 $ui_diff tag conf d_+s \
3352 -foreground {#00a000} \
3353 -background {#e2effa}
3354 $ui_diff tag conf d_-s \
3356 -background {#e2effa}
3357 $ui_diff tag conf d_s+ \
3358 -foreground {#00a000} \
3360 $ui_diff tag conf d_s- \
3364 $ui_diff tag conf d< \
3365 -foreground orange \
3367 $ui_diff tag conf d= \
3368 -foreground orange \
3370 $ui_diff tag conf d> \
3371 -foreground orange \
3374 $ui_diff tag raise sel
3376 # -- Diff Body Context Menu
3379 proc create_common_diff_popup {ctxm} {
3381 -label [mc Refresh] \
3382 -command reshow_diff
3383 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3386 -command {tk_textCopy $ui_diff}
3387 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3389 -label [mc "Select All"] \
3390 -command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
3391 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3393 -label [mc "Copy All"] \
3395 $ui_diff tag add sel 0.0 end
3396 tk_textCopy $ui_diff
3397 $ui_diff tag remove sel 0.0 end
3399 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3402 -label [mc "Decrease Font Size"] \
3403 -command {incr_font_size font_diff -1}
3404 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3406 -label [mc "Increase Font Size"] \
3407 -command {incr_font_size font_diff 1}
3408 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3412 build_encoding_menu $emenu [list force_diff_encoding]
3414 -label [mc "Encoding"] \
3416 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3418 $ctxm add command -label [mc "Options..."] \
3422 set ctxm .vpane.lower.diff.body.ctxm
3423 menu $ctxm -tearoff 0
3425 -label [mc "Apply/Reverse Hunk"] \
3426 -command {apply_hunk $cursorX $cursorY}
3427 set ui_diff_applyhunk [$ctxm index last]
3428 lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state]
3430 -label [mc "Apply/Reverse Line"] \
3431 -command {apply_range_or_line $cursorX $cursorY; do_rescan}
3432 set ui_diff_applyline [$ctxm index last]
3433 lappend diff_actions [list $ctxm entryconf $ui_diff_applyline -state]
3436 -label [mc "Show Less Context"] \
3437 -command show_less_context
3438 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3440 -label [mc "Show More Context"] \
3441 -command show_more_context
3442 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
3444 create_common_diff_popup $ctxm
3446 set ctxmmg .vpane.lower.diff.body.ctxmmg
3447 menu $ctxmmg -tearoff 0
3448 $ctxmmg add command \
3449 -label [mc "Run Merge Tool"] \
3450 -command {merge_resolve_tool}
3451 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3452 $ctxmmg add separator
3453 $ctxmmg add command \
3454 -label [mc "Use Remote Version"] \
3455 -command {merge_resolve_one 3}
3456 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3457 $ctxmmg add command \
3458 -label [mc "Use Local Version"] \
3459 -command {merge_resolve_one 2}
3460 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3461 $ctxmmg add command \
3462 -label [mc "Revert To Base"] \
3463 -command {merge_resolve_one 1}
3464 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3465 $ctxmmg add separator
3466 $ctxmmg add command \
3467 -label [mc "Show Less Context"] \
3468 -command show_less_context
3469 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3470 $ctxmmg add command \
3471 -label [mc "Show More Context"] \
3472 -command show_more_context
3473 lappend diff_actions [list $ctxmmg entryconf [$ctxmmg index last] -state]
3474 $ctxmmg add separator
3475 create_common_diff_popup $ctxmmg
3477 set ctxmsm .vpane.lower.diff.body.ctxmsm
3478 menu $ctxmsm -tearoff 0
3479 $ctxmsm add command \
3480 -label [mc "Visualize These Changes In The Submodule"] \
3481 -command {do_gitk -- true}
3482 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3483 $ctxmsm add command \
3484 -label [mc "Visualize Current Branch History In The Submodule"] \
3485 -command {do_gitk {} true}
3486 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3487 $ctxmsm add command \
3488 -label [mc "Visualize All Branch History In The Submodule"] \
3489 -command {do_gitk --all true}
3490 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3491 $ctxmsm add separator
3492 $ctxmsm add command \
3493 -label [mc "Start git gui In The Submodule"] \
3494 -command {do_git_gui}
3495 lappend diff_actions [list $ctxmsm entryconf [$ctxmsm index last] -state]
3496 $ctxmsm add separator
3497 create_common_diff_popup $ctxmsm
3499 proc has_textconv {path} {
3500 if {[is_config_false gui.textconv]} {
3503 set filter [gitattr $path diff set]
3504 set textconv [get_config [join [list diff $filter textconv] .]]
3505 if {$filter ne {set} && $textconv ne {}} {
3512 proc popup_diff_menu {ctxm ctxmmg ctxmsm x y X Y} {
3513 global current_diff_path file_states
3516 if {[info exists file_states($current_diff_path)]} {
3517 set state [lindex $file_states($current_diff_path) 0]
3521 if {[string first {U} $state] >= 0} {
3522 tk_popup $ctxmmg $X $Y
3523 } elseif {$::is_submodule_diff} {
3524 tk_popup $ctxmsm $X $Y
3526 set has_range [expr {[$::ui_diff tag nextrange sel 0.0] != {}}]
3527 if {$::ui_index eq $::current_diff_side} {
3528 set l [mc "Unstage Hunk From Commit"]
3530 set t [mc "Unstage Lines From Commit"]
3532 set t [mc "Unstage Line From Commit"]
3535 set l [mc "Stage Hunk For Commit"]
3537 set t [mc "Stage Lines For Commit"]
3539 set t [mc "Stage Line For Commit"]
3543 || $current_diff_path eq {}
3546 || [string match {?T} $state]
3547 || [string match {T?} $state]
3548 || [has_textconv $current_diff_path]} {
3553 $ctxm entryconf $::ui_diff_applyhunk -state $s -label $l
3554 $ctxm entryconf $::ui_diff_applyline -state $s -label $t
3555 tk_popup $ctxm $X $Y
3558 bind_button3 $ui_diff [list popup_diff_menu $ctxm $ctxmmg $ctxmsm %x %y %X %Y]
3562 set main_status [::status_bar::new .status]
3563 pack .status -anchor w -side bottom -fill x
3564 $main_status show [mc "Initializing..."]
3568 proc on_ttk_pane_mapped {w pane pos} {
3570 after 0 [list after idle [list $w sashpos $pane $pos]]
3572 proc on_tk_pane_mapped {w pane x y} {
3574 after 0 [list after idle [list $w sash place $pane $x $y]]
3576 proc on_application_mapped {} {
3577 global repo_config use_ttk
3579 set gm $repo_config(gui.geometry)
3582 [list on_ttk_pane_mapped %W 0 [lindex $gm 1]]
3583 bind .vpane.files <Map> \
3584 [list on_ttk_pane_mapped %W 0 [lindex $gm 2]]
3587 [list on_tk_pane_mapped %W 0 \
3589 [lindex [.vpane sash coord 0] 1]]
3590 bind .vpane.files <Map> \
3591 [list on_tk_pane_mapped %W 0 \
3592 [lindex [.vpane.files sash coord 0] 0] \
3595 wm geometry . [lindex $gm 0]
3597 if {[info exists repo_config(gui.geometry)]} {
3598 bind . <Map> [list on_application_mapped]
3599 wm geometry . [lindex $repo_config(gui.geometry) 0]
3602 # -- Load window state
3604 if {[info exists repo_config(gui.wmstate)]} {
3605 catch {wm state . $repo_config(gui.wmstate)}
3610 bind $ui_comm <$M1B-Key-Return> {do_commit;break}
3611 bind $ui_comm <$M1B-Key-t> {do_add_selection;break}
3612 bind $ui_comm <$M1B-Key-T> {do_add_selection;break}
3613 bind $ui_comm <$M1B-Key-u> {do_unstage_selection;break}
3614 bind $ui_comm <$M1B-Key-U> {do_unstage_selection;break}
3615 bind $ui_comm <$M1B-Key-j> {do_revert_selection;break}
3616 bind $ui_comm <$M1B-Key-J> {do_revert_selection;break}
3617 bind $ui_comm <$M1B-Key-i> {do_add_all;break}
3618 bind $ui_comm <$M1B-Key-I> {do_add_all;break}
3619 bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break}
3620 bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break}
3621 bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break}
3622 bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break}
3623 bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break}
3624 bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break}
3625 bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3626 bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3627 bind $ui_comm <$M1B-Key-minus> {show_less_context;break}
3628 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break}
3629 bind $ui_comm <$M1B-Key-equal> {show_more_context;break}
3630 bind $ui_comm <$M1B-Key-plus> {show_more_context;break}
3631 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break}
3633 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
3634 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
3635 bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break}
3636 bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break}
3637 bind $ui_diff <$M1B-Key-v> {break}
3638 bind $ui_diff <$M1B-Key-V> {break}
3639 bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break}
3640 bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break}
3641 bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break}
3642 bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break}
3643 bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break}
3644 bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break}
3645 bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break}
3646 bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break}
3647 bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break}
3648 bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break}
3649 bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break}
3650 bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break}
3651 bind $ui_diff <Button-1> {focus %W}
3653 if {[is_enabled branch]} {
3654 bind . <$M1B-Key-n> branch_create::dialog
3655 bind . <$M1B-Key-N> branch_create::dialog
3656 bind . <$M1B-Key-o> branch_checkout::dialog
3657 bind . <$M1B-Key-O> branch_checkout::dialog
3658 bind . <$M1B-Key-m> merge::dialog
3659 bind . <$M1B-Key-M> merge::dialog
3661 if {[is_enabled transport]} {
3662 bind . <$M1B-Key-p> do_push_anywhere
3663 bind . <$M1B-Key-P> do_push_anywhere
3666 bind . <Key-F5> ui_do_rescan
3667 bind . <$M1B-Key-r> ui_do_rescan
3668 bind . <$M1B-Key-R> ui_do_rescan
3669 bind . <$M1B-Key-s> do_signoff
3670 bind . <$M1B-Key-S> do_signoff
3671 bind . <$M1B-Key-t> do_add_selection
3672 bind . <$M1B-Key-T> do_add_selection
3673 bind . <$M1B-Key-j> do_revert_selection
3674 bind . <$M1B-Key-J> do_revert_selection
3675 bind . <$M1B-Key-i> do_add_all
3676 bind . <$M1B-Key-I> do_add_all
3677 bind . <$M1B-Key-minus> {show_less_context;break}
3678 bind . <$M1B-Key-KP_Subtract> {show_less_context;break}
3679 bind . <$M1B-Key-equal> {show_more_context;break}
3680 bind . <$M1B-Key-plus> {show_more_context;break}
3681 bind . <$M1B-Key-KP_Add> {show_more_context;break}
3682 bind . <$M1B-Key-Return> do_commit
3683 foreach i [list $ui_index $ui_workdir] {
3684 bind $i <Button-1> "toggle_or_diff $i %x %y; break"
3685 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3686 bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break"
3690 set file_lists($ui_index) [list]
3691 set file_lists($ui_workdir) [list]
3693 wm title . "[appname] ([reponame]) [file normalize $_gitworktree]"
3694 focus -force $ui_comm
3696 # -- Warn the user about environmental problems. Cygwin's Tcl
3697 # does *not* pass its env array onto any processes it spawns.
3698 # This means that git processes get none of our environment.
3703 set msg [mc "Possible environment issues exist.
3705 The following environment variables are probably
3706 going to be ignored by any Git subprocess run
3710 foreach name [array names env] {
3711 switch -regexp -- $name {
3712 {^GIT_INDEX_FILE$} -
3713 {^GIT_OBJECT_DIRECTORY$} -
3714 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$} -
3716 {^GIT_EXTERNAL_DIFF$} -
3720 {^GIT_(AUTHOR|COMMITTER)_DATE$} {
3721 append msg " - $name\n"
3724 {^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} {
3725 append msg " - $name\n"
3727 set suggest_user $name
3731 if {$ignored_env > 0} {
3733 This is due to a known issue with the
3734 Tcl binary distributed by Cygwin."]
3736 if {$suggest_user ne {}} {
3739 A good replacement for %s
3740 is placing values for the user.name and
3741 user.email settings into your personal
3747 unset ignored_env msg suggest_user name
3750 # -- Only initialize complex UI if we are going to stay running.
3752 if {[is_enabled transport]} {
3755 set n [.mbar.remote index end]
3756 populate_remotes_menu
3757 set n [expr {[.mbar.remote index end] - $n}]
3759 if {[.mbar.remote type 0] eq "tearoff"} { incr n }
3760 .mbar.remote insert $n separator
3765 if {[winfo exists $ui_comm]} {
3766 set GITGUI_BCK_exists [load_message GITGUI_BCK]
3768 # -- If both our backup and message files exist use the
3769 # newer of the two files to initialize the buffer.
3771 if {$GITGUI_BCK_exists} {
3772 set m [gitdir GITGUI_MSG]
3773 if {[file isfile $m]} {
3774 if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} {
3775 catch {file delete [gitdir GITGUI_MSG]}
3777 $ui_comm delete 0.0 end
3779 $ui_comm edit modified false
3780 catch {file delete [gitdir GITGUI_BCK]}
3781 set GITGUI_BCK_exists 0
3787 proc backup_commit_buffer {} {
3788 global ui_comm GITGUI_BCK_exists
3790 set m [$ui_comm edit modified]
3791 if {$m || $GITGUI_BCK_exists} {
3792 set msg [string trim [$ui_comm get 0.0 end]]
3793 regsub -all -line {[ \r\t]+$} $msg {} msg
3796 if {$GITGUI_BCK_exists} {
3797 catch {file delete [gitdir GITGUI_BCK]}
3798 set GITGUI_BCK_exists 0
3802 set fd [open [gitdir GITGUI_BCK] w]
3803 puts -nonewline $fd $msg
3805 set GITGUI_BCK_exists 1
3809 $ui_comm edit modified false
3812 set ::GITGUI_BCK_i [after 2000 backup_commit_buffer]
3815 backup_commit_buffer
3817 # -- If the user has aspell available we can drive it
3818 # in pipe mode to spellcheck the commit message.
3820 set spell_cmd [list |]
3821 set spell_dict [get_config gui.spellingdictionary]
3822 lappend spell_cmd aspell
3823 if {$spell_dict ne {}} {
3824 lappend spell_cmd --master=$spell_dict
3826 lappend spell_cmd --mode=none
3827 lappend spell_cmd --encoding=utf-8
3828 lappend spell_cmd pipe
3829 if {$spell_dict eq {none}
3830 || [catch {set spell_fd [open $spell_cmd r+]} spell_err]} {
3831 bind_button3 $ui_comm [list tk_popup $ui_comm_ctxm %X %Y]
3833 set ui_comm_spell [spellcheck::init \
3839 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
3842 lock_index begin-read
3843 if {![winfo ismapped .]} {
3847 if {[is_enabled initialamend]} {
3853 if {[is_enabled nocommitmsg]} {
3854 $ui_comm configure -state disabled -background gray
3857 if {[is_enabled multicommit]} {
3860 if {[is_enabled retcode]} {
3861 bind . <Destroy> {+terminate_me %W}
3863 if {$picked && [is_config_true gui.autoexplore]} {
3869 # indent-tabs-mode: t