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 if { [info exists
::env
(GIT_GUI_LIB_DIR
) ] } {
53 set oguilib $
::env
(GIT_GUI_LIB_DIR
)
55 set oguilib
{@@GITGUI_LIBDIR@@
}
57 set oguirel
{@@GITGUI_RELATIVE@@
}
58 if {$oguirel eq
{1}} {
59 set oguilib
[file dirname [file normalize
$argv0]]
60 if {[file tail $oguilib] eq
{git-core
}} {
61 set oguilib
[file dirname $oguilib]
63 set oguilib
[file dirname $oguilib]
64 set oguilib
[file join $oguilib share git-gui lib
]
65 set oguimsg
[file join $oguilib msgs
]
66 } elseif
{[string match @@
* $oguirel]} {
67 set oguilib
[file join [file dirname [file normalize
$argv0]] lib
]
68 set oguimsg
[file join [file dirname [file normalize
$argv0]] po
]
70 set oguimsg
[file join $oguilib msgs
]
74 ######################################################################
76 ## enable verbose loading?
78 if {![catch
{set _verbose
$env(GITGUI_VERBOSE
)}]} {
80 rename auto_load real__auto_load
81 proc auto_load
{name args
} {
82 puts stderr
"auto_load $name"
83 return [uplevel
1 real__auto_load
$name $args]
85 rename
source real__source
87 puts stderr
"source $args"
88 uplevel
1 [linsert
$args 0 real__source
]
90 if {[tk windowingsystem
] eq
"win32"} { console show
}
93 ######################################################################
95 ## Internationalization (i18n) through msgcat and gettext. See
96 ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
98 package require msgcat
100 # Check for Windows 7 MUI language pack (missed by msgcat < 1.4.4)
101 if {[tk windowingsystem
] eq
"win32"
102 && [package vcompare
[package provide msgcat
] 1.4.4] < 0
104 proc _mc_update_locale
{} {
105 set key
{HKEY_CURRENT_USER\Control Panel\Desktop
}
107 package require registry
108 set uilocale
[registry get
$key "PreferredUILanguages"]
109 msgcat
::ConvertLocale
[string map
{- _
} [lindex
$uilocale 0]]
111 if {[string length
$uilocale] > 0} {
112 msgcat
::mclocale
$uilocale
119 proc _mc_trim
{fmt} {
120 set cmk
[string first @@
$fmt]
122 return [string range
$fmt 0 [expr {$cmk - 1}]]
127 proc mc
{en_fmt args
} {
128 set fmt [_mc_trim
[::msgcat
::mc
$en_fmt]]
129 if {[catch
{set msg
[eval [list format
$fmt] $args]} err
]} {
130 set msg
[eval [list format
[_mc_trim
$en_fmt]] $args]
136 return [join $args {}]
139 ::msgcat
::mcload
$oguimsg
142 ######################################################################
144 ## On Mac, bring the current Wish process window to front
146 if {[tk windowingsystem
] eq
"aqua"} {
148 exec osascript
-e [format
{
149 tell application
"System Events"
150 set frontmost of processes whose unix id is
%d to true
156 ######################################################################
160 set _appname
{Git Gui
}
169 set _shellpath
{@@SHELL_PATH@@
}
171 set _trace
[lsearch
-exact $argv --trace]
173 set argv
[lreplace
$argv $_trace $_trace]
175 if {[tk windowingsystem
] eq
"win32"} { console show
}
180 # variable for the last merged branch (useful for a default when deleting
182 set _last_merged_branch
{}
185 global _shellpath env
186 if {[string match @@
* $_shellpath]} {
187 if {[info exists env
(SHELL
)]} {
206 return [eval [list
file join $_gitdir] $args]
209 proc gitexec
{args
} {
211 if {$_gitexec eq
{}} {
212 if {[catch
{set _gitexec
[git
--exec-path]} err
]} {
213 error
"Git not installed?\n\n$err"
216 set _gitexec
[exec cygpath \
221 set _gitexec
[file normalize
$_gitexec]
227 return [eval [list
file join $_gitexec] $args]
230 proc githtmldir
{args
} {
232 if {$_githtmldir eq
{}} {
233 if {[catch
{set _githtmldir
[git
--html-path]}]} {
234 # Git not installed or option not yet supported
238 set _githtmldir
[exec cygpath \
243 set _githtmldir
[file normalize
$_githtmldir]
249 return [eval [list
file join $_githtmldir] $args]
257 if {[tk windowingsystem
] eq
{aqua
}} {
264 if {$
::tcl_platform
(platform
) eq
{windows
}} {
272 if {$_iscygwin eq
{}} {
273 if {$
::tcl_platform
(platform
) eq
{windows
}} {
274 if {[catch
{set p
[exec cygpath
--windir]} err
]} {
278 # Handle MSys2 which is only cygwin when MSYSTEM is MSYS.
279 if {[info exists
::env
(MSYSTEM
)] && $
::env
(MSYSTEM
) ne
"MSYS"} {
290 proc is_enabled
{option
} {
291 global enabled_options
292 if {[catch
{set on
$enabled_options($option)}]} {return 0}
296 proc enable_option
{option
} {
297 global enabled_options
298 set enabled_options
($option) 1
301 proc disable_option
{option
} {
302 global enabled_options
303 set enabled_options
($option) 0
306 ######################################################################
310 proc is_many_config
{name
} {
311 switch
-glob -- $name {
321 proc is_config_true
{name
} {
323 if {[catch
{set v
$repo_config($name)}]} {
326 set v
[string tolower
$v]
327 if {$v eq
{} ||
$v eq
{true
} ||
$v eq
{1} ||
$v eq
{yes} ||
$v eq
{on
}} {
334 proc is_config_false
{name
} {
336 if {[catch
{set v
$repo_config($name)}]} {
339 set v
[string tolower
$v]
340 if {$v eq
{false
} ||
$v eq
{0} ||
$v eq
{no
} ||
$v eq
{off
}} {
347 proc get_config
{name
} {
349 if {[catch
{set v
$repo_config($name)}]} {
361 if {$_isbare eq
{}} {
363 set _bare
[git rev-parse
--is-bare-repository]
365 true
{ set _isbare
1 }
366 false
{ set _isbare
0}
370 if {[is_config_true core.bare
]
371 ||
($_gitworktree eq
{}
372 && [lindex
[file split $_gitdir] end
] ne
{.git
})} {
382 ######################################################################
386 proc _trace_exec
{cmd
} {
387 if {!$
::_trace
} return
393 if {[regexp
{[ \t\r\n'"$?*]} $v]} {
401 #'" fix poor old emacs font-lock mode
403 proc _git_cmd {name} {
406 if {[catch {set v $_git_cmd_path($name)}]} {
410 --exec-path { return [list $::_git $name] }
413 set p [gitexec git-$name$::_search_exe]
414 if {[file exists $p]} {
416 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
417 # Try to determine what sort of magic will make
418 # git-$name go and do its thing, because native
419 # Tcl on Windows doesn't know it.
421 set p [gitexec git-$name]
426 switch -glob -- [lindex $s 0] {
428 #!*perl { set i perl }
429 #!*python { set i python }
430 default { error "git-
$name is not supported
: $s" }
434 if {![info exists interp]} {
435 set interp [_which $i]
438 error "git-
$name requires
$i (not
in PATH
)"
440 set v [concat [list $interp] [lrange $s 1 end] [list $p]]
442 # Assume it is builtin to git somehow and we
443 # aren't actually able to see a file for it.
445 set v [list $::_git $name]
447 set _git_cmd_path($name) $v
452 proc _which {what args} {
453 global env _search_exe _search_path
455 if {$_search_path eq {}} {
456 if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
457 set _search_path [split [exec cygpath \
463 } elseif {[is_Windows]} {
464 set gitguidir [file dirname [info script]]
465 regsub -all ";" $gitguidir "\\;" gitguidir
466 set env(PATH) "$gitguidir;$env(PATH
)"
467 set _search_path [split $env(PATH) {;}]
470 set _search_path [split $env(PATH) :]
475 if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
478 set suffix $_search_exe
481 foreach p $_search_path {
482 set p [file join $p $what$suffix]
483 if {[file exists $p]} {
484 return [file normalize $p]
490 # Test a file for a hashbang to identify executable scripts on Windows.
491 proc is_shellscript {filename} {
492 if {![file exists $filename]} {return 0}
493 set f [open $filename r]
494 fconfigure $f -encoding binary
495 set magic [read $f 2]
497 return [expr {$magic eq "#!"}]
500 # Run a command connected via pipes on stdout.
501 # This is for use with textconv filters and uses sh -c "..." to allow it to
502 # contain a command with arguments. On windows we must check for shell
503 # scripts specifically otherwise just call the filter command.
504 proc open_cmd_pipe
{cmd path
} {
506 if {![file executable
[shellpath
]]} {
507 set exe
[auto_execok
[lindex
$cmd 0]]
508 if {[is_shellscript
[lindex
$exe 0]]} {
509 set run
[linsert
[auto_execok sh
] end
-c "$cmd \"\$0\"" $path]
511 set run
[concat
$exe [lrange
$cmd 1 end
] $path]
514 set run
[list
[shellpath
] -c "$cmd \"\$0\"" $path]
516 return [open |
$run r
]
519 proc _lappend_nice
{cmd_var
} {
523 if {![info exists _nice
]} {
524 set _nice
[_which nice
]
525 if {[catch
{exec $_nice git version
}]} {
527 } elseif
{[is_Windows
] && [file dirname $_nice] ne
[file dirname $
::_git
]} {
540 switch
-- [lindex
$args 0] {
551 set args
[lrange
$args 1 end
]
554 set cmdp
[_git_cmd
[lindex
$args 0]]
555 set args
[lrange
$args 1 end
]
557 _trace_exec
[concat
$opt $cmdp $args]
558 set result
[eval exec $opt $cmdp $args]
560 puts stderr
"< $result"
565 proc _open_stdout_stderr
{cmd
} {
568 set fd
[open
[concat
[list |
] $cmd] r
]
570 if { [lindex
$cmd end
] eq
{2>@
1}
571 && $err eq
{can not
find channel named
"1"}
573 # Older versions of Tcl 8.4 don't have this 2>@1 IO
574 # redirect operator. Fallback to |& cat for those.
575 # The command was not actually started, so its safe
576 # to try to start it a second time.
578 set fd
[open
[concat \
580 [lrange
$cmd 0 end-1
] \
587 fconfigure
$fd -eofchar {}
591 proc git_read
{args
} {
595 switch
-- [lindex
$args 0] {
610 set args
[lrange
$args 1 end
]
613 set cmdp
[_git_cmd
[lindex
$args 0]]
614 set args
[lrange
$args 1 end
]
616 return [_open_stdout_stderr
[concat
$opt $cmdp $args]]
619 proc git_write
{args
} {
623 switch
-- [lindex
$args 0] {
634 set args
[lrange
$args 1 end
]
637 set cmdp
[_git_cmd
[lindex
$args 0]]
638 set args
[lrange
$args 1 end
]
640 _trace_exec
[concat
$opt $cmdp $args]
641 return [open
[concat
[list |
] $opt $cmdp $args] w
]
644 proc githook_read
{hook_name args
} {
645 set pchook
[gitdir hooks
$hook_name]
648 # On Windows [file executable] might lie so we need to ask
649 # the shell if the hook is executable. Yes that's annoying.
653 if {![info exists interp
]} {
654 set interp
[_which sh
]
657 error
"hook execution requires sh (not in PATH)"
660 set scr
{if test -x "$1";then exec "$@";fi}
661 set sh_c
[list
$interp -c $scr $interp $pchook]
662 return [_open_stdout_stderr
[concat
$sh_c $args]]
665 if {[file executable
$pchook]} {
666 return [_open_stdout_stderr
[concat
[list
$pchook] $args]]
672 proc kill_file_process
{fd
} {
673 set process
[pid
$fd]
677 exec taskkill
/pid
$process
684 proc gitattr
{path attr default
} {
685 if {[catch
{set r
[git check-attr
$attr -- $path]}]} {
688 set r
[join [lrange
[split $r :] 2 end
] :]
691 if {$r eq
{unspecified
}} {
698 regsub
-all ' $value "'\\''" value
702 proc load_current_branch {} {
703 global current_branch is_detached
705 set fd [open [gitdir HEAD] r]
706 if {[gets $fd ref] < 1} {
711 set pfx {ref: refs/heads/}
712 set len [string length $pfx]
713 if {[string equal -length $len $pfx $ref]} {
714 # We're on a branch. It might not exist. But
715 # HEAD looks good enough to be a branch.
717 set current_branch [string range $ref $len end]
720 # Assume this is a detached head.
722 set current_branch HEAD
727 auto_load tk_optionMenu
728 rename tk_optionMenu real__tkOptionMenu
729 proc tk_optionMenu {w varName args} {
730 set m [eval real__tkOptionMenu $w $varName $args]
731 $m configure -font font_ui
732 $w configure -font font_ui
736 proc rmsel_tag {text} {
738 -background [$text cget -background] \
739 -foreground [$text cget -foreground] \
741 $text tag conf in_sel -background lightgray
742 bind $text <Motion> break
748 bind . <Visibility> {
749 bind . <Visibility> {}
754 wm iconbitmap . -default $oguilib/git-gui.ico
755 set ::tk::AlwaysShowSelection 1
756 bind . <Control-F2> {console show}
758 # Spoof an X11 display for SSH
759 if {![info exists env(DISPLAY)]} {
760 set env(DISPLAY) :9999
764 image create photo gitlogo -width 16 -height 16
766 gitlogo put #33CC33 -to 7 0 9 2
767 gitlogo put #33CC33 -to 4 2 12 4
768 gitlogo put #33CC33 -to 7 4 9 6
769 gitlogo put #CC3333 -to 4 6 12 8
770 gitlogo put gray26 -to 4 9 6 10
771 gitlogo put gray26 -to 3 10 6 12
772 gitlogo put gray26 -to 8 9 13 11
773 gitlogo put gray26 -to 8 11 10 12
774 gitlogo put gray26 -to 11 11 13 14
775 gitlogo put gray26 -to 3 12 5 14
776 gitlogo put gray26 -to 5 13
777 gitlogo put gray26 -to 10 13
778 gitlogo put gray26 -to 4 14 12 15
779 gitlogo put gray26 -to 5 15 11 16
782 image create photo gitlogo32 -width 32 -height 32
783 gitlogo32 copy gitlogo -zoom 2 2
785 wm iconphoto . -default gitlogo gitlogo32
789 ######################################################################
795 if {[lsearch -exact [font names] TkDefaultFont] != -1} {
796 eval [linsert [font actual TkDefaultFont] 0 font configure font_ui]
797 eval [linsert [font actual TkFixedFont] 0 font create font_diff]
799 font create font_diff -family Courier -size 10
802 eval font configure font_ui [font actual [.dummy cget -font]]
807 font create font_uiitalic
808 font create font_uibold
809 font create font_diffbold
810 font create font_diffitalic
812 foreach class {Button Checkbutton Entry Label
813 Labelframe Listbox Message
814 Radiobutton Spinbox Text} {
815 option add *$class.font font_ui
818 option add *Menu.font font_ui
819 option add *Entry.borderWidth 1 startupFile
820 option add *Entry.relief sunken startupFile
821 option add *RadioButton.anchor w startupFile
825 if {[is_Windows] || [is_MacOSX]} {
826 option add *Menu.tearOff 0
837 proc bind_button3 {w cmd} {
838 bind $w <Any-Button-3> $cmd
840 # Mac OS X sends Button-2 on right click through three-button mouse,
841 # or through trackpad right-clicking (two-finger touch + click).
842 bind $w <Any-Button-2> $cmd
843 bind $w <Control-Button-1> $cmd
847 proc apply_config {} {
848 global repo_config font_descs
850 foreach option $font_descs {
851 set name [lindex $option 0]
852 set font [lindex $option 1]
855 foreach {cn cv} $repo_config(gui.$name) {
856 if {$cn eq {-weight}} {
859 font configure $font $cn $cv
862 font configure $font -weight normal
865 error_popup [strcat [mc "Invalid font specified
in %s
:" "gui.
$name"] "\n\n$err"]
867 foreach {cn cv} [font configure $font] {
868 font configure ${font}bold $cn $cv
869 font configure ${font}italic $cn $cv
871 font configure ${font}bold -weight bold
872 font configure ${font}italic -slant italic
878 if {$repo_config(gui.usettk)} {
879 set use_ttk [package vsatisfies [package provide Tk] 8.5]
882 bind [winfo class .] <<ThemeChanged>> [list InitTheme]
888 set default_config(branch.autosetupmerge) true
889 set default_config(merge.tool) {}
890 set default_config(mergetool.keepbackup) true
891 set default_config(merge.diffstat) true
892 set default_config(merge.summary) false
893 set default_config(merge.verbosity) 2
894 set default_config(user.name) {}
895 set default_config(user.email) {}
897 set default_config(gui.encoding) [encoding system]
898 set default_config(gui.matchtrackingbranch) false
899 set default_config(gui.textconv) true
900 set default_config(gui.pruneduringfetch) false
901 set default_config(gui.trustmtime) false
902 set default_config(gui.fastcopyblame) false
903 set default_config(gui.maxrecentrepo) 10
904 set default_config(gui.copyblamethreshold) 40
905 set default_config(gui.blamehistoryctx) 7
906 set default_config(gui.diffcontext) 5
907 set default_config(gui.diffopts) {}
908 set default_config(gui.commitmsgwidth) 75
909 set default_config(gui.newbranchtemplate) {}
910 set default_config(gui.spellingdictionary) {}
911 set default_config(gui.fontui) [font configure font_ui]
912 set default_config(gui.fontdiff) [font configure font_diff]
913 # TODO: this option should be added to the git-config documentation
914 set default_config(gui.maxfilesdisplayed) 5000
915 set default_config(gui.usettk) 1
916 set default_config(gui.warndetachedcommit) 1
917 set default_config(gui.tabsize) 8
919 {fontui font_ui {mc "Main Font
"}}
920 {fontdiff font_diff {mc "Diff
/Console Font
"}}
922 set default_config(gui.stageuntracked) ask
923 set default_config(gui.displayuntracked) true
925 ######################################################################
929 set _git [_which git]
931 catch {wm withdraw .}
935 -title [mc "git-gui
: fatal error
"] \
936 -message [mc "Cannot
find git
in PATH.
"]
940 ######################################################################
944 if {[catch {set _git_version [git --version]} err]} {
945 catch {wm withdraw .}
949 -title [mc "git-gui
: fatal error
"] \
950 -message "Cannot determine Git version
:
954 [appname
] requires Git
1.5.0 or later.
"
957 if {![regsub {^git version } $_git_version {} _git_version]} {
958 catch {wm withdraw .}
962 -title [mc "git-gui
: fatal error
"] \
963 -message [strcat [mc "Cannot parse Git version string
:"] "\n\n$_git_version"]
967 proc get_trimmed_version {s} {
969 foreach x [split $s -._] {
970 if {[string is integer -strict $x]} {
978 set _real_git_version $_git_version
979 set _git_version [get_trimmed_version $_git_version]
981 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
982 catch {wm withdraw .}
987 -title "[appname
]: warning
" \
988 -message [mc "Git version cannot be determined.
990 %s claims it is version
'%s'.
992 %s requires
at least Git
1.5.0 or later.
994 Assume
'%s' is version
1.5.0?
995 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
996 set _git_version 1.5.0
1001 unset _real_git_version
1003 proc git-version {args} {
1006 switch [llength $args] {
1008 return $_git_version
1012 set op [lindex $args 0]
1013 set vr [lindex $args 1]
1014 set cm [package vcompare $_git_version $vr]
1015 return [expr $cm $op 0]
1019 set type [lindex $args 0]
1020 set name [lindex $args 1]
1021 set parm [lindex $args 2]
1022 set body [lindex $args 3]
1024 if {($type ne {proc} && $type ne {method})} {
1025 error "Invalid arguments to git-version
"
1027 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
1028 error "Last arm of
$type $name must be default
"
1031 foreach {op vr cb} [lrange $body 0 end-2] {
1032 if {[git-version $op $vr]} {
1033 return [uplevel [list $type $name $parm $cb]]
1037 return [uplevel [list $type $name $parm [lindex $body end]]]
1041 error "git-version
>= x
"
1047 if {[git-version < 1.5]} {
1048 catch {wm withdraw .}
1052 -title [mc "git-gui
: fatal error
"] \
1053 -message "[appname
] requires Git
1.5.0 or later.
1055 You are using
[git-version
]:
1061 ######################################################################
1063 ## configure our library
1065 set idx [file join $oguilib tclIndex]
1066 if {[catch {set fd [open $idx r]} err]} {
1067 catch {wm withdraw .}
1071 -title [mc "git-gui
: fatal error
"] \
1075 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
1077 while {[gets $fd n] >= 0} {
1078 if {$n ne {} && ![string match #* $n]} {
1090 if {[lsearch -exact $loaded $p] >= 0} continue
1091 source [file join $oguilib $p]
1096 set auto_path [concat [list $oguilib] $auto_path]
1098 unset -nocomplain idx fd
1100 ######################################################################
1102 ## config file parsing
1104 git-version proc _parse_config {arr_name args} {
1111 [list git_read config] \
1113 [list --null --list]]
1114 fconfigure $fd_rc -translation binary
1115 set buf [read $fd_rc]
1118 foreach line [split $buf "\
0"] {
1119 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
1120 if {[is_many_config $name]} {
1121 lappend arr($name) $value
1123 set arr($name) $value
1125 } elseif {[regexp {^([^\n]+)$} $line line name]} {
1126 # no value given, but interpreting them as
1127 # boolean will be handled as true
1136 set fd_rc [eval [list git_read config --list] $args]
1137 while {[gets $fd_rc line] >= 0} {
1138 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
1139 if {[is_many_config $name]} {
1140 lappend arr($name) $value
1142 set arr($name) $value
1144 } elseif {[regexp {^([^=]+)$} $line line name]} {
1145 # no value given, but interpreting them as
1146 # boolean will be handled as true
1155 proc load_config {include_global} {
1156 global repo_config global_config system_config default_config
1158 if {$include_global} {
1159 _parse_config system_config --system
1160 _parse_config global_config --global
1162 _parse_config repo_config
1164 foreach name [array names default_config] {
1165 if {[catch {set v $system_config($name)}]} {
1166 set system_config($name) $default_config($name)
1169 foreach name [array names system_config] {
1170 if {[catch {set v $global_config($name)}]} {
1171 set global_config($name) $system_config($name)
1173 if {[catch {set v $repo_config($name)}]} {
1174 set repo_config($name) $system_config($name)
1179 ######################################################################
1181 ## feature option selection
1183 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
1188 if {$subcommand eq {gui.sh}} {
1191 if {$subcommand eq {gui} && [llength $argv] > 0} {
1192 set subcommand [lindex $argv 0]
1193 set argv [lrange $argv 1 end]
1196 enable_option multicommit
1197 enable_option branch
1198 enable_option transport
1201 switch -- $subcommand {
1206 disable_option multicommit
1207 disable_option branch
1208 disable_option transport
1211 enable_option singlecommit
1212 enable_option retcode
1214 disable_option multicommit
1215 disable_option branch
1216 disable_option transport
1218 while {[llength $argv] > 0} {
1219 set a [lindex $argv 0]
1222 enable_option initialamend
1225 enable_option nocommit
1226 enable_option nocommitmsg
1229 disable_option nocommitmsg
1236 set argv [lrange $argv 1 end]
1241 ######################################################################
1243 ## execution environment
1245 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
1247 # Suggest our implementation of askpass, if none is set
1248 if {![info exists env(SSH_ASKPASS)]} {
1249 set env(SSH_ASKPASS) [gitexec git-gui--askpass]
1252 ######################################################################
1258 set _gitdir $env(GIT_DIR)
1262 # beware that from the .git dir this sets _gitdir to .
1263 # and _prefix to the empty string
1264 set _gitdir [git rev-parse --git-dir]
1265 set _prefix [git rev-parse --show-prefix]
1269 choose_repository::pick
1273 # we expand the _gitdir when it's just a single dot (i.e. when we're being
1274 # run from the .git dir itself) lest the routines to find the worktree
1276 if {$_gitdir eq ".
"} {
1280 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1281 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1283 if {![file isdirectory $_gitdir]} {
1284 catch {wm withdraw .}
1285 error_popup [strcat [mc "Git directory not found
:"] "\n\n$_gitdir"]
1288 # _gitdir exists, so try loading the config
1292 # v1.7.0 introduced --show-toplevel to return the canonical work-tree
1293 if {[package vcompare $_git_version 1.7.0] >= 0} {
1294 if { [is_Cygwin] } {
1295 catch {set _gitworktree [exec cygpath --windows [git rev-parse --show-toplevel]]}
1297 set _gitworktree [git rev-parse --show-toplevel]
1300 # try to set work tree from environment, core.worktree or use
1301 # cdup to obtain a relative path to the top of the worktree. If
1302 # run from the top, the ./ prefix ensures normalize expands pwd.
1303 if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {
1304 set _gitworktree [get_config core.worktree]
1305 if {$_gitworktree eq ""} {
1306 set _gitworktree [file normalize ./[git rev-parse --show-cdup]]
1311 if {$_prefix ne {}} {
1312 if {$_gitworktree eq {}} {
1313 regsub -all {[^/]+/} $_prefix ../ cdup
1315 set cdup $_gitworktree
1317 if {[catch {cd $cdup} err]} {
1318 catch {wm withdraw .}
1319 error_popup [strcat [mc "Cannot move to top of working directory
:"] "\n\n$err"]
1322 set _gitworktree [pwd]
1324 } elseif {![is_enabled bare]} {
1326 catch {wm withdraw .}
1327 error_popup [strcat [mc "Cannot use bare repository
:"] "\n\n$_gitdir"]
1330 if {$_gitworktree eq {}} {
1331 set _gitworktree [file dirname $_gitdir]
1333 if {[catch {cd $_gitworktree} err]} {
1334 catch {wm withdraw .}
1335 error_popup [strcat [mc "No working directory
"] " $_gitworktree:\n\n$err"]
1338 set _gitworktree [pwd]
1340 set _reponame [file split [file normalize $_gitdir]]
1341 if {[lindex $_reponame end] eq {.git}} {
1342 set _reponame [lindex $_reponame end-1]
1344 set _reponame [lindex $_reponame end]
1347 set env(GIT_DIR) $_gitdir
1348 set env(GIT_WORK_TREE) $_gitworktree
1350 ######################################################################
1354 set current_diff_path {}
1355 set current_diff_side {}
1356 set diff_actions [list]
1360 set MERGE_HEAD [list]
1363 set current_branch {}
1365 set current_diff_path {}
1367 set is_submodule_diff 0
1368 set is_conflict_diff 0
1369 set selected_commit_type new
1370 set diff_empty_count 0
1372 set nullid "0000000000000000000000000000000000000000"
1373 set nullid2 "0000000000000000000000000000000000000001"
1375 ######################################################################
1383 set disable_on_lock [list]
1384 set index_lock_type none
1386 proc lock_index {type} {
1387 global index_lock_type disable_on_lock
1389 if {$index_lock_type eq {none}} {
1390 set index_lock_type $type
1391 foreach w $disable_on_lock {
1392 uplevel #0 $w disabled
1395 } elseif {$index_lock_type eq "begin-
$type"} {
1396 set index_lock_type $type
1402 proc unlock_index {} {
1403 global index_lock_type disable_on_lock
1405 set index_lock_type none
1406 foreach w $disable_on_lock {
1407 uplevel #0 $w normal
1411 ######################################################################
1415 proc repository_state {ctvar hdvar mhvar} {
1416 global current_branch
1417 upvar $ctvar ct $hdvar hd $mhvar mh
1422 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1428 set merge_head [gitdir MERGE_HEAD]
1429 if {[file exists $merge_head]} {
1431 set fd_mh [open $merge_head r]
1432 while {[gets $fd_mh line] >= 0} {
1443 global PARENT empty_tree
1445 set p [lindex $PARENT 0]
1449 if {$empty_tree eq {}} {
1450 set empty_tree [git mktree << {}]
1455 proc force_amend {} {
1456 global selected_commit_type
1457 global HEAD PARENT MERGE_HEAD commit_type
1459 repository_state newType newHEAD newMERGE_HEAD
1462 set MERGE_HEAD $newMERGE_HEAD
1463 set commit_type $newType
1465 set selected_commit_type amend
1466 do_select_commit_type
1469 proc rescan {after {honor_trustmtime 1}} {
1470 global HEAD PARENT MERGE_HEAD commit_type
1471 global ui_index ui_workdir ui_comm
1472 global rescan_active file_states
1475 if {$rescan_active > 0 || ![lock_index read]} return
1477 repository_state newType newHEAD newMERGE_HEAD
1478 if {[string match amend* $commit_type]
1479 && $newType eq {normal}
1480 && $newHEAD eq $HEAD} {
1484 set MERGE_HEAD $newMERGE_HEAD
1485 set commit_type $newType
1488 array unset file_states
1490 if {!$::GITGUI_BCK_exists &&
1491 (![$ui_comm edit modified]
1492 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1493 if {[string match amend* $commit_type]} {
1494 } elseif {[load_message GITGUI_MSG utf-8]} {
1495 } elseif {[run_prepare_commit_msg_hook]} {
1496 } elseif {[load_message MERGE_MSG]} {
1497 } elseif {[load_message SQUASH_MSG]} {
1500 $ui_comm edit modified false
1503 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1504 rescan_stage2 {} $after
1507 ui_status [mc "Refreshing
file status...
"]
1508 set fd_rf [git_read update-index \
1514 fconfigure $fd_rf -blocking 0 -translation binary
1515 fileevent $fd_rf readable \
1516 [list rescan_stage2 $fd_rf $after]
1521 set is_git_info_exclude {}
1522 proc have_info_exclude {} {
1523 global is_git_info_exclude
1525 if {$is_git_info_exclude eq {}} {
1526 if {[catch {exec test -f [gitdir info exclude]}]} {
1527 set is_git_info_exclude 0
1529 set is_git_info_exclude 1
1532 return $is_git_info_exclude
1535 proc have_info_exclude {} {
1536 return [file readable [gitdir info exclude]]
1540 proc rescan_stage2 {fd after} {
1541 global rescan_active buf_rdi buf_rdf buf_rlo
1545 if {![eof $fd]} return
1549 if {[package vcompare $::_git_version 1.6.3] >= 0} {
1550 set ls_others [list --exclude-standard]
1552 set ls_others [list --exclude-per-directory=.gitignore]
1553 if {[have_info_exclude]} {
1554 lappend ls_others "--exclude-from=[gitdir info exclude
]"
1556 set user_exclude [get_config core.excludesfile]
1557 if {$user_exclude ne {} && [file readable $user_exclude]} {
1558 lappend ls_others "--exclude-from=[file normalize
$user_exclude]"
1567 ui_status [mc "Scanning
for modified files ...
"]
1568 if {[git-version >= "1.7.2"]} {
1569 set fd_di [git_read diff-index --cached --ignore-submodules=dirty -z [PARENT]]
1571 set fd_di [git_read diff-index --cached -z [PARENT]]
1573 set fd_df [git_read diff-files -z]
1575 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1576 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1578 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1579 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1581 if {[is_config_true gui.displayuntracked]} {
1582 set fd_lo [eval git_read ls-files --others -z $ls_others]
1583 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1584 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1589 proc load_message {file {encoding {}}} {
1592 set f [gitdir $file]
1593 if {[file isfile $f]} {
1594 if {[catch {set fd [open $f r]}]} {
1597 fconfigure $fd -eofchar {}
1598 if {$encoding ne {}} {
1599 fconfigure $fd -encoding $encoding
1601 set content [string trim [read $fd]]
1603 regsub -all -line {[ \r\t]+$} $content {} content
1604 $ui_comm delete 0.0 end
1605 $ui_comm insert end $content
1611 proc run_prepare_commit_msg_hook {} {
1614 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1615 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1616 # empty file but existent file.
1618 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1620 if {[file isfile [gitdir MERGE_MSG]]} {
1621 set pcm_source "merge
"
1622 set fd_mm [open [gitdir MERGE_MSG] r]
1623 fconfigure $fd_mm -encoding utf-8
1624 puts -nonewline $fd_pcm [read $fd_mm]
1626 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1627 set pcm_source "squash
"
1628 set fd_sm [open [gitdir SQUASH_MSG] r]
1629 fconfigure $fd_sm -encoding utf-8
1630 puts -nonewline $fd_pcm [read $fd_sm]
1638 set fd_ph [githook_read prepare-commit-msg \
1639 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1641 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1645 ui_status [mc "Calling prepare-commit-msg hook...
"]
1648 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1649 fileevent $fd_ph readable \
1650 [list prepare_commit_msg_hook_wait $fd_ph]
1655 proc prepare_commit_msg_hook_wait {fd_ph} {
1658 append pch_error [read $fd_ph]
1659 fconfigure $fd_ph -blocking 1
1661 if {[catch {close $fd_ph}]} {
1662 ui_status [mc "Commit declined by prepare-commit-msg hook.
"]
1663 hook_failed_popup prepare-commit-msg $pch_error
1664 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1667 load_message PREPARE_COMMIT_MSG
1670 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1673 fconfigure $fd_ph -blocking 0
1674 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1677 proc read_diff_index {fd after} {
1680 append buf_rdi [read $fd]
1682 set n [string length $buf_rdi]
1684 set z1 [string first "\
0" $buf_rdi $c]
1685 if {$z1 == -1} break
1687 set z2 [string first "\
0" $buf_rdi $z1]
1688 if {$z2 == -1} break
1691 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1692 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1694 [encoding convertfrom $p] \
1696 [list [lindex $i 0] [lindex $i 2]] \
1702 set buf_rdi [string range $buf_rdi $c end]
1707 rescan_done $fd buf_rdi $after
1710 proc read_diff_files {fd after} {
1713 append buf_rdf [read $fd]
1715 set n [string length $buf_rdf]
1717 set z1 [string first "\
0" $buf_rdf $c]
1718 if {$z1 == -1} break
1720 set z2 [string first "\
0" $buf_rdf $z1]
1721 if {$z2 == -1} break
1724 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1725 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1727 [encoding convertfrom $p] \
1730 [list [lindex $i 0] [lindex $i 2]]
1735 set buf_rdf [string range $buf_rdf $c end]
1740 rescan_done $fd buf_rdf $after
1743 proc read_ls_others {fd after} {
1746 append buf_rlo [read $fd]
1747 set pck [split $buf_rlo "\
0"]
1748 set buf_rlo [lindex $pck end]
1749 foreach p [lrange $pck 0 end-1] {
1750 set p [encoding convertfrom $p]
1751 if {[string index $p end] eq {/}} {
1752 set p [string range $p 0 end-1]
1756 rescan_done $fd buf_rlo $after
1759 proc rescan_done {fd buf after} {
1760 global rescan_active current_diff_path
1761 global file_states repo_config
1764 if {![eof $fd]} return
1767 if {[incr rescan_active -1] > 0} return
1772 if {$current_diff_path ne {}} { reshow_diff $after }
1773 if {$current_diff_path eq {}} { select_first_diff $after }
1776 proc prune_selection {} {
1777 global file_states selected_paths
1779 foreach path [array names selected_paths] {
1780 if {[catch {set still_here $file_states($path)}]} {
1781 unset selected_paths($path)
1786 ######################################################################
1790 proc mapicon {w state path} {
1793 if {[catch {set r $all_icons($state$w)}]} {
1794 puts "error
: no icon
for $w state
={$state} $path"
1800 proc mapdesc {state path} {
1803 if {[catch {set r $all_descs($state)}]} {
1804 puts "error
: no desc
for state
={$state} $path"
1810 proc ui_status {msg} {
1812 if {[info exists main_status]} {
1813 $main_status show $msg
1817 proc ui_ready {{test {}}} {
1819 if {[info exists main_status]} {
1820 $main_status show [mc "Ready.
"] $test
1824 proc escape_path {path} {
1825 regsub -all {\\} $path "\\\\" path
1826 regsub -all "\n" $path "\\n
" path
1830 proc short_path {path} {
1831 return [escape_path [lindex [file split $path] end]]
1835 set null_sha1 [string repeat 0 40]
1837 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1838 global file_states next_icon_id null_sha1
1840 set s0 [string index $new_state 0]
1841 set s1 [string index $new_state 1]
1843 if {[catch {set info $file_states($path)}]} {
1845 set icon n[incr next_icon_id]
1847 set state [lindex $info 0]
1848 set icon [lindex $info 1]
1849 if {$head_info eq {}} {set head_info [lindex $info 2]}
1850 if {$index_info eq {}} {set index_info [lindex $info 3]}
1853 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1854 elseif {$s0 eq {_}} {set s0 _}
1856 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1857 elseif {$s1 eq {_}} {set s1 _}
1859 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1860 set head_info [list 0 $null_sha1]
1861 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1862 && $head_info eq {}} {
1863 set head_info $index_info
1864 } elseif {$s0 eq {_} && [string index $state 0] ne {_}} {
1865 set index_info $head_info
1869 set file_states($path) [list $s0$s1 $icon \
1870 $head_info $index_info \
1875 proc display_file_helper {w path icon_name old_m new_m} {
1878 if {$new_m eq {_}} {
1879 set lno [lsearch -sorted -exact $file_lists($w) $path]
1881 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1883 $w conf -state normal
1884 $w delete $lno.0 [expr {$lno + 1}].0
1885 $w conf -state disabled
1887 } elseif {$old_m eq {_} && $new_m ne {_}} {
1888 lappend file_lists($w) $path
1889 set file_lists($w) [lsort -unique $file_lists($w)]
1890 set lno [lsearch -sorted -exact $file_lists($w) $path]
1892 $w conf -state normal
1893 $w image create $lno.0 \
1894 -align center -padx 5 -pady 1 \
1896 -image [mapicon $w $new_m $path]
1897 $w insert $lno.1 "[escape_path
$path]\n"
1898 $w conf -state disabled
1899 } elseif {$old_m ne $new_m} {
1900 $w conf -state normal
1901 $w image conf $icon_name -image [mapicon $w $new_m $path]
1902 $w conf -state disabled
1906 proc display_file {path state} {
1907 global file_states selected_paths
1908 global ui_index ui_workdir
1910 set old_m [merge_state $path $state]
1911 set s $file_states($path)
1912 set new_m [lindex $s 0]
1913 set icon_name [lindex $s 1]
1915 set o [string index $old_m 0]
1916 set n [string index $new_m 0]
1923 display_file_helper $ui_index $path $icon_name $o $n
1925 if {[string index $old_m 0] eq {U}} {
1928 set o [string index $old_m 1]
1930 if {[string index $new_m 0] eq {U}} {
1933 set n [string index $new_m 1]
1935 display_file_helper $ui_workdir $path $icon_name $o $n
1937 if {$new_m eq {__}} {
1938 unset file_states($path)
1939 catch {unset selected_paths($path)}
1943 proc display_all_files_helper {w path icon_name m} {
1946 lappend file_lists($w) $path
1947 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1948 $w image create end \
1949 -align center -padx 5 -pady 1 \
1951 -image [mapicon $w $m $path]
1952 $w insert end "[escape_path
$path]\n"
1956 proc display_all_files {} {
1957 global ui_index ui_workdir
1958 global file_states file_lists
1960 global files_warning
1962 $ui_index conf -state normal
1963 $ui_workdir conf -state normal
1965 $ui_index delete 0.0 end
1966 $ui_workdir delete 0.0 end
1969 set file_lists($ui_index) [list]
1970 set file_lists($ui_workdir) [list]
1972 set to_display [lsort [array names file_states]]
1973 set display_limit [get_config gui.maxfilesdisplayed]
1975 foreach path $to_display {
1976 set s $file_states($path)
1978 set icon_name [lindex $s 1]
1980 if {$displayed > $display_limit && [string index $m 1] eq {O} } {
1981 if {!$files_warning} {
1982 # do not repeatedly warn:
1984 info_popup [mc "Display limit
(gui.maxfilesdisplayed
= %s
) reached
, not showing all
%s files.
" \
1985 $display_limit [llength $to_display]]
1990 set s [string index $m 0]
1991 if {$s ne {U} && $s ne {_}} {
1992 display_all_files_helper $ui_index $path \
1996 if {[string index $m 0] eq {U}} {
1999 set s [string index $m 1]
2002 display_all_files_helper $ui_workdir $path \
2008 $ui_index conf -state disabled
2009 $ui_workdir conf -state disabled
2012 ######################################################################
2017 #define mask_width 14
2018 #define mask_height 15
2019 static unsigned char mask_bits[] = {
2020 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2021 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2022 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2025 image create bitmap file_plain -background white -foreground black -data {
2026 #define plain_width 14
2027 #define plain_height 15
2028 static unsigned char plain_bits[] = {
2029 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2030 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2031 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2032 } -maskdata $filemask
2034 image create bitmap file_mod -background white -foreground blue -data {
2035 #define mod_width 14
2036 #define mod_height 15
2037 static unsigned char mod_bits[] = {
2038 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2039 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2040 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2041 } -maskdata $filemask
2043 image create bitmap file_fulltick -background white -foreground "#007000" -data {
2044 #define file_fulltick_width 14
2045 #define file_fulltick_height 15
2046 static unsigned char file_fulltick_bits
[] = {
2047 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2048 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2049 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2050 } -maskdata $filemask
2052 image create bitmap file_question
-background white
-foreground black
-data {
2053 #define file_question_width 14
2054 #define file_question_height 15
2055 static unsigned char file_question_bits
[] = {
2056 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2057 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2058 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2059 } -maskdata $filemask
2061 image create bitmap file_removed
-background white
-foreground red
-data {
2062 #define file_removed_width 14
2063 #define file_removed_height 15
2064 static unsigned char file_removed_bits
[] = {
2065 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2066 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2067 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2068 } -maskdata $filemask
2070 image create bitmap file_merge
-background white
-foreground blue
-data {
2071 #define file_merge_width 14
2072 #define file_merge_height 15
2073 static unsigned char file_merge_bits
[] = {
2074 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2075 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2076 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2077 } -maskdata $filemask
2079 image create bitmap file_statechange
-background white
-foreground green
-data {
2080 #define file_statechange_width 14
2081 #define file_statechange_height 15
2082 static unsigned char file_statechange_bits
[] = {
2083 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
2084 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
2085 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2086 } -maskdata $filemask
2088 set ui_index .vpane.files.index.list
2089 set ui_workdir .vpane.files.workdir.list
2091 set all_icons
(_
$ui_index) file_plain
2092 set all_icons
(A
$ui_index) file_plain
2093 set all_icons
(M
$ui_index) file_fulltick
2094 set all_icons
(D
$ui_index) file_removed
2095 set all_icons
(U
$ui_index) file_merge
2096 set all_icons
(T
$ui_index) file_statechange
2098 set all_icons
(_
$ui_workdir) file_plain
2099 set all_icons
(M
$ui_workdir) file_mod
2100 set all_icons
(D
$ui_workdir) file_question
2101 set all_icons
(U
$ui_workdir) file_merge
2102 set all_icons
(O
$ui_workdir) file_plain
2103 set all_icons
(T
$ui_workdir) file_statechange
2105 set max_status_desc
0
2107 {__
{mc
"Unmodified"}}
2109 {_M
{mc
"Modified, not staged"}}
2110 {M_
{mc
"Staged for commit"}}
2111 {MM
{mc
"Portions staged for commit"}}
2112 {MD
{mc
"Staged for commit, missing"}}
2114 {_T
{mc
"File type changed, not staged"}}
2115 {MT
{mc
"File type changed, old type staged for commit"}}
2116 {AT
{mc
"File type changed, old type staged for commit"}}
2117 {T_
{mc
"File type changed, staged"}}
2118 {TM
{mc
"File type change staged, modification not staged"}}
2119 {TD
{mc
"File type change staged, file missing"}}
2121 {_O
{mc
"Untracked, not staged"}}
2122 {A_
{mc
"Staged for commit"}}
2123 {AM
{mc
"Portions staged for commit"}}
2124 {AD
{mc
"Staged for commit, missing"}}
2127 {D_
{mc
"Staged for removal"}}
2128 {DO
{mc
"Staged for removal, still present"}}
2130 {_U
{mc
"Requires merge resolution"}}
2131 {U_
{mc
"Requires merge resolution"}}
2132 {UU
{mc
"Requires merge resolution"}}
2133 {UM
{mc
"Requires merge resolution"}}
2134 {UD
{mc
"Requires merge resolution"}}
2135 {UT
{mc
"Requires merge resolution"}}
2137 set text
[eval [lindex
$i 1]]
2138 if {$max_status_desc < [string length
$text]} {
2139 set max_status_desc
[string length
$text]
2141 set all_descs
([lindex
$i 0]) $text
2145 ######################################################################
2149 proc scrollbar2many
{list mode args
} {
2150 foreach w
$list {eval $w $mode $args}
2153 proc many2scrollbar
{list mode sb top bottom
} {
2154 $sb set $top $bottom
2155 foreach w
$list {$w $mode moveto
$top}
2158 proc incr_font_size
{font
{amt
1}} {
2159 set sz
[font configure
$font -size]
2161 font configure
$font -size $sz
2162 font configure
${font}bold
-size $sz
2163 font configure
${font}italic
-size $sz
2166 ######################################################################
2170 set starting_gitk_msg
[mc
"Starting gitk... please wait..."]
2172 proc do_gitk
{revs
{is_submodule false
}} {
2173 global current_diff_path file_states current_diff_side ui_index
2174 global _gitdir _gitworktree
2176 # -- Always start gitk through whatever we were loaded with. This
2177 # lets us bypass using shell process on Windows systems.
2179 set exe
[_which gitk
-script]
2180 set cmd
[list
[info nameofexecutable
] $exe]
2182 error_popup
[mc
"Couldn't find gitk in PATH"]
2188 if {!$is_submodule} {
2193 cd $current_diff_path
2194 if {$revs eq
{--}} {
2195 set s
$file_states($current_diff_path)
2198 switch
-glob -- [lindex
$s 0] {
2199 M_
{ set old_sha1
[lindex
[lindex
$s 2] 1] }
2200 _M
{ set old_sha1
[lindex
[lindex
$s 3] 1] }
2202 if {$current_diff_side eq
$ui_index} {
2203 set old_sha1
[lindex
[lindex
$s 2] 1]
2204 set new_sha1
[lindex
[lindex
$s 3] 1]
2206 set old_sha1
[lindex
[lindex
$s 3] 1]
2210 set revs
$old_sha1...
$new_sha1
2212 # GIT_DIR and GIT_WORK_TREE for the submodule are not the ones
2213 # we've been using for the main repository, so unset them.
2214 # TODO we could make life easier (start up faster?) for gitk
2215 # by setting these to the appropriate values to allow gitk
2216 # to skip the heuristics to find their proper value
2218 unset env
(GIT_WORK_TREE
)
2220 eval exec $cmd $revs "--" "--" &
2222 set env
(GIT_DIR
) $_gitdir
2223 set env
(GIT_WORK_TREE
) $_gitworktree
2226 ui_status $
::starting_gitk_msg
2228 ui_ready
$starting_gitk_msg
2233 proc do_git_gui
{} {
2234 global current_diff_path
2236 # -- Always start git gui through whatever we were loaded with. This
2237 # lets us bypass using shell process on Windows systems.
2239 set exe
[list
[_which git
]]
2241 error_popup
[mc
"Couldn't find git gui in PATH"]
2244 global _gitdir _gitworktree
2246 # see note in do_gitk about unsetting these vars when
2247 # running tools in a submodule
2249 unset env
(GIT_WORK_TREE
)
2252 cd $current_diff_path
2254 eval exec $exe gui
&
2256 set env
(GIT_DIR
) $_gitdir
2257 set env
(GIT_WORK_TREE
) $_gitworktree
2260 ui_status $
::starting_gitk_msg
2262 ui_ready
$starting_gitk_msg
2267 proc do_explore
{} {
2270 if {[is_Cygwin
] ||
[is_Windows
]} {
2271 set explorer
"explorer.exe"
2272 } elseif
{[is_MacOSX
]} {
2275 # freedesktop.org-conforming system is our best shot
2276 set explorer
"xdg-open"
2278 eval exec $explorer [list
[file nativename
$_gitworktree]] &
2284 proc terminate_me
{win
} {
2286 if {$win ne
{.
}} return
2290 proc do_quit
{{rc
{1}}} {
2291 global ui_comm is_quitting repo_config commit_type
2292 global GITGUI_BCK_exists GITGUI_BCK_i
2293 global ui_comm_spell
2294 global ret_code use_ttk
2296 if {$is_quitting} return
2299 if {[winfo exists
$ui_comm]} {
2300 # -- Stash our current commit buffer.
2302 set save
[gitdir GITGUI_MSG
]
2303 if {$GITGUI_BCK_exists && ![$ui_comm edit modified
]} {
2304 file rename
-force [gitdir GITGUI_BCK
] $save
2305 set GITGUI_BCK_exists
0
2307 set msg
[string trim
[$ui_comm get
0.0 end
]]
2308 regsub
-all -line {[ \r\t]+$
} $msg {} msg
2309 if {(![string match amend
* $commit_type]
2310 ||
[$ui_comm edit modified
])
2313 set fd
[open
$save w
]
2314 fconfigure
$fd -encoding utf-8
2315 puts
-nonewline $fd $msg
2319 catch
{file delete
$save}
2323 # -- Cancel our spellchecker if its running.
2325 if {[info exists ui_comm_spell
]} {
2329 # -- Remove our editor backup, its not needed.
2331 after cancel
$GITGUI_BCK_i
2332 if {$GITGUI_BCK_exists} {
2333 catch
{file delete
[gitdir GITGUI_BCK
]}
2336 # -- Stash our current window geometry into this repository.
2338 set cfg_wmstate
[wm state .
]
2339 if {[catch
{set rc_wmstate
$repo_config(gui.wmstate
)}]} {
2342 if {$cfg_wmstate ne
$rc_wmstate} {
2343 catch
{git config gui.wmstate
$cfg_wmstate}
2345 if {$cfg_wmstate eq
{zoomed
}} {
2346 # on Windows wm geometry will lie about window
2347 # position (but not size) when window is zoomed
2348 # restore the window before querying wm geometry
2351 set cfg_geometry
[list
]
2352 lappend cfg_geometry
[wm geometry .
]
2354 lappend cfg_geometry
[.vpane sashpos
0]
2355 lappend cfg_geometry
[.vpane.files sashpos
0]
2357 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 0]
2358 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 1]
2360 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
2363 if {$cfg_geometry ne
$rc_geometry} {
2364 catch
{git config gui.geometry
$cfg_geometry}
2370 # Briefly enable send again, working around Tk bug
2371 # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
2372 tk appname
[appname
]
2381 proc ui_do_rescan
{} {
2382 rescan
{force_first_diff ui_ready
}
2389 proc next_diff
{{after
{}}} {
2390 global next_diff_p next_diff_w next_diff_i
2391 show_diff
$next_diff_p $next_diff_w {} {} $after
2394 proc find_anchor_pos
{lst name
} {
2395 set lid
[lsearch
-sorted -exact $lst $name]
2399 foreach lname
$lst {
2400 if {$lname >= $name} break
2408 proc find_file_from
{flist idx delta path mmask
} {
2411 set len
[llength
$flist]
2412 while {$idx >= 0 && $idx < $len} {
2413 set name
[lindex
$flist $idx]
2415 if {$name ne
$path && [info exists file_states
($name)]} {
2416 set state
[lindex
$file_states($name) 0]
2418 if {$mmask eq
{} ||
[regexp
$mmask $state]} {
2429 proc find_next_diff
{w path
{lno
{}} {mmask
{}}} {
2430 global next_diff_p next_diff_w next_diff_i
2431 global file_lists ui_index ui_workdir
2433 set flist
$file_lists($w)
2435 set lno
[find_anchor_pos
$flist $path]
2440 if {$mmask ne
{} && ![regexp
{(^\^
)|
(\$$
)} $mmask]} {
2441 if {$w eq
$ui_index} {
2444 set mmask
"$mmask\$"
2448 set idx
[find_file_from
$flist $lno 1 $path $mmask]
2451 set idx
[find_file_from
$flist $lno -1 $path $mmask]
2456 set next_diff_p
[lindex
$flist $idx]
2457 set next_diff_i
[expr {$idx+1}]
2464 proc next_diff_after_action
{w path
{lno
{}} {mmask
{}}} {
2465 global current_diff_path
2467 if {$path ne
$current_diff_path} {
2469 } elseif
{[find_next_diff
$w $path $lno $mmask]} {
2472 return {reshow_diff
;}
2476 proc select_first_diff
{after
} {
2479 if {[find_next_diff
$ui_workdir {} 1 {^_?U
}] ||
2480 [find_next_diff
$ui_workdir {} 1 {[^O
]$
}]} {
2487 proc force_first_diff
{after
} {
2488 global ui_workdir current_diff_path file_states
2490 if {[info exists file_states
($current_diff_path)]} {
2491 set state
[lindex
$file_states($current_diff_path) 0]
2497 if {[string first
{U
} $state] >= 0} {
2498 # Already a conflict, do nothing
2499 } elseif
{[find_next_diff
$ui_workdir $current_diff_path {} {^_?U
}]} {
2501 } elseif
{[string index
$state 1] ne
{O
}} {
2502 # Already a diff & no conflicts, do nothing
2503 } elseif
{[find_next_diff
$ui_workdir $current_diff_path {} {[^O
]$
}]} {
2514 proc toggle_or_diff
{mode w args
} {
2515 global file_states file_lists current_diff_path ui_index ui_workdir
2516 global last_clicked selected_paths
2518 if {$mode eq
"click"} {
2519 foreach
{x y
} $args break
2520 set pos
[split [$w index @
$x,$y] .
]
2521 foreach
{lno
col} $pos break
2523 if {$last_clicked ne
{}} {
2524 set lno
[lindex
$last_clicked 1]
2526 set lno
[expr {int
([lindex
[$w tag ranges in_diff
] 0])}]
2528 if {$mode eq
"toggle"} {
2531 incr lno
[expr {$mode eq
"up" ?
-1 : 1}]
2536 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2542 set last_clicked
[list
$w $lno]
2544 array
unset selected_paths
2545 $ui_index tag remove in_sel
0.0 end
2546 $ui_workdir tag remove in_sel
0.0 end
2548 # Determine the state of the file
2549 if {[info exists file_states
($path)]} {
2550 set state
[lindex
$file_states($path) 0]
2555 # Restage the file, or simply show the diff
2556 if {$col == 0 && $y > 1} {
2557 # Conflicts need special handling
2558 if {[string first
{U
} $state] >= 0} {
2559 # $w must always be $ui_workdir, but...
2560 if {$w ne
$ui_workdir} { set lno
{} }
2561 merge_stage_workdir
$path $lno
2565 if {[string index
$state 1] eq
{O
}} {
2571 set after
[next_diff_after_action
$w $path $lno $mmask]
2573 if {$w eq
$ui_index} {
2575 "Unstaging [short_path $path] from commit" \
2577 [concat
$after [list ui_ready
]]
2578 } elseif
{$w eq
$ui_workdir} {
2580 "Adding [short_path $path]" \
2582 [concat
$after [list ui_ready
]]
2585 set selected_paths
($path) 1
2586 show_diff
$path $w $lno
2590 proc add_one_to_selection
{w x y
} {
2591 global file_lists last_clicked selected_paths
2593 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2594 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2600 if {$last_clicked ne
{}
2601 && [lindex
$last_clicked 0] ne
$w} {
2602 array
unset selected_paths
2603 [lindex
$last_clicked 0] tag remove in_sel
0.0 end
2606 set last_clicked
[list
$w $lno]
2607 if {[catch
{set in_sel
$selected_paths($path)}]} {
2611 unset selected_paths
($path)
2612 $w tag remove in_sel
$lno.0 [expr {$lno + 1}].0
2614 set selected_paths
($path) 1
2615 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
2619 proc add_range_to_selection
{w x y
} {
2620 global file_lists last_clicked selected_paths
2622 if {[lindex
$last_clicked 0] ne
$w} {
2623 toggle_or_diff click
$w $x $y
2627 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2628 set lc
[lindex
$last_clicked 1]
2637 foreach path
[lrange
$file_lists($w) \
2638 [expr {$begin - 1}] \
2639 [expr {$end - 1}]] {
2640 set selected_paths
($path) 1
2642 $w tag add in_sel
$begin.0 [expr {$end + 1}].0
2645 proc show_more_context
{} {
2647 if {$repo_config(gui.diffcontext
) < 99} {
2648 incr repo_config
(gui.diffcontext
)
2653 proc show_less_context
{} {
2655 if {$repo_config(gui.diffcontext
) > 1} {
2656 incr repo_config
(gui.diffcontext
) -1
2661 ######################################################################
2669 menu .mbar
-tearoff 0
2671 # -- Apple Menu (Mac OS X only)
2673 .mbar add cascade
-label Apple
-menu .mbar.apple
2676 .mbar add cascade
-label [mc Repository
] -menu .mbar.repository
2677 .mbar add cascade
-label [mc Edit
] -menu .mbar.edit
2678 if {[is_enabled branch
]} {
2679 .mbar add cascade
-label [mc Branch
] -menu .mbar.branch
2681 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2682 .mbar add cascade
-label [mc Commit@@noun
] -menu .mbar.commit
2684 if {[is_enabled transport
]} {
2685 .mbar add cascade
-label [mc Merge
] -menu .mbar.merge
2686 .mbar add cascade
-label [mc Remote
] -menu .mbar.remote
2688 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2689 .mbar add cascade
-label [mc Tools
] -menu .mbar.tools
2692 # -- Repository Menu
2694 menu .mbar.repository
2697 .mbar.repository add
command \
2698 -label [mc
"Explore Working Copy"] \
2699 -command {do_explore
}
2703 .mbar.repository add
command \
2704 -label [mc
"Git Bash"] \
2705 -command {eval exec [auto_execok start
] \
2706 [list
"Git Bash" bash
--login -l &]}
2709 if {[is_Windows
] ||
![is_bare
]} {
2710 .mbar.repository add separator
2713 .mbar.repository add
command \
2714 -label [mc
"Browse Current Branch's Files"] \
2715 -command {browser
::new
$current_branch}
2716 set ui_browse_current
[.mbar.repository index last
]
2717 .mbar.repository add
command \
2718 -label [mc
"Browse Branch Files..."] \
2719 -command browser_open
::dialog
2720 .mbar.repository add separator
2722 .mbar.repository add
command \
2723 -label [mc
"Visualize Current Branch's History"] \
2724 -command {do_gitk
$current_branch}
2725 set ui_visualize_current
[.mbar.repository index last
]
2726 .mbar.repository add
command \
2727 -label [mc
"Visualize All Branch History"] \
2728 -command {do_gitk
--all}
2729 .mbar.repository add separator
2731 proc current_branch_write
{args
} {
2732 global current_branch
2733 .mbar.repository entryconf $
::ui_browse_current \
2734 -label [mc
"Browse %s's Files" $current_branch]
2735 .mbar.repository entryconf $
::ui_visualize_current \
2736 -label [mc
"Visualize %s's History" $current_branch]
2738 trace add variable current_branch
write current_branch_write
2740 if {[is_enabled multicommit
]} {
2741 .mbar.repository add
command -label [mc
"Database Statistics"] \
2744 .mbar.repository add
command -label [mc
"Compress Database"] \
2747 .mbar.repository add
command -label [mc
"Verify Database"] \
2748 -command do_fsck_objects
2750 .mbar.repository add separator
2753 .mbar.repository add
command \
2754 -label [mc
"Create Desktop Icon"] \
2755 -command do_cygwin_shortcut
2756 } elseif
{[is_Windows
]} {
2757 .mbar.repository add
command \
2758 -label [mc
"Create Desktop Icon"] \
2759 -command do_windows_shortcut
2760 } elseif
{[is_MacOSX
]} {
2761 .mbar.repository add
command \
2762 -label [mc
"Create Desktop Icon"] \
2763 -command do_macosx_app
2768 proc
::tk
::mac
::Quit
{args
} { do_quit
}
2770 .mbar.repository add
command -label [mc Quit
] \
2778 .mbar.edit add
command -label [mc Undo
] \
2779 -command {catch
{[focus
] edit undo
}} \
2781 .mbar.edit add
command -label [mc Redo
] \
2782 -command {catch
{[focus
] edit redo
}} \
2784 .mbar.edit add separator
2785 .mbar.edit add
command -label [mc Cut
] \
2786 -command {catch
{tk_textCut
[focus
]}} \
2788 .mbar.edit add
command -label [mc Copy
] \
2789 -command {catch
{tk_textCopy
[focus
]}} \
2791 .mbar.edit add
command -label [mc Paste
] \
2792 -command {catch
{tk_textPaste
[focus
]; [focus
] see insert
}} \
2794 .mbar.edit add
command -label [mc Delete
] \
2795 -command {catch
{[focus
] delete sel.first sel.last
}} \
2797 .mbar.edit add separator
2798 .mbar.edit add
command -label [mc
"Select All"] \
2799 -command {catch
{[focus
] tag add sel
0.0 end
}} \
2804 if {[is_enabled branch
]} {
2807 .mbar.branch add
command -label [mc
"Create..."] \
2808 -command branch_create
::dialog \
2810 lappend disable_on_lock
[list .mbar.branch entryconf \
2811 [.mbar.branch index last
] -state]
2813 .mbar.branch add
command -label [mc
"Checkout..."] \
2814 -command branch_checkout
::dialog \
2816 lappend disable_on_lock
[list .mbar.branch entryconf \
2817 [.mbar.branch index last
] -state]
2819 .mbar.branch add
command -label [mc
"Rename..."] \
2820 -command branch_rename
::dialog
2821 lappend disable_on_lock
[list .mbar.branch entryconf \
2822 [.mbar.branch index last
] -state]
2824 .mbar.branch add
command -label [mc
"Delete..."] \
2825 -command branch_delete
::dialog
2826 lappend disable_on_lock
[list .mbar.branch entryconf \
2827 [.mbar.branch index last
] -state]
2829 .mbar.branch add
command -label [mc
"Reset..."] \
2830 -command merge
::reset_hard
2831 lappend disable_on_lock
[list .mbar.branch entryconf \
2832 [.mbar.branch index last
] -state]
2837 proc commit_btn_caption
{} {
2838 if {[is_enabled nocommit
]} {
2841 return [mc Commit@@verb
]
2845 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2848 if {![is_enabled nocommit
]} {
2849 .mbar.commit add radiobutton \
2850 -label [mc
"New Commit"] \
2851 -command do_select_commit_type \
2852 -variable selected_commit_type \
2854 lappend disable_on_lock \
2855 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2857 .mbar.commit add radiobutton \
2858 -label [mc
"Amend Last Commit"] \
2859 -command do_select_commit_type \
2860 -variable selected_commit_type \
2862 lappend disable_on_lock \
2863 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2865 .mbar.commit add separator
2868 .mbar.commit add
command -label [mc Rescan
] \
2869 -command ui_do_rescan \
2871 lappend disable_on_lock \
2872 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2874 .mbar.commit add
command -label [mc
"Stage To Commit"] \
2875 -command do_add_selection \
2877 lappend disable_on_lock \
2878 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2880 .mbar.commit add
command -label [mc
"Stage Changed Files To Commit"] \
2881 -command do_add_all \
2883 lappend disable_on_lock \
2884 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2886 .mbar.commit add
command -label [mc
"Unstage From Commit"] \
2887 -command do_unstage_selection \
2889 lappend disable_on_lock \
2890 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2892 .mbar.commit add
command -label [mc
"Revert Changes"] \
2893 -command do_revert_selection \
2895 lappend disable_on_lock \
2896 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2898 .mbar.commit add separator
2900 .mbar.commit add
command -label [mc
"Show Less Context"] \
2901 -command show_less_context \
2902 -accelerator $M1T-\
-
2904 .mbar.commit add
command -label [mc
"Show More Context"] \
2905 -command show_more_context \
2908 .mbar.commit add separator
2910 if {![is_enabled nocommitmsg
]} {
2911 .mbar.commit add
command -label [mc
"Sign Off"] \
2912 -command do_signoff \
2916 .mbar.commit add
command -label [commit_btn_caption
] \
2917 -command do_commit \
2918 -accelerator $M1T-Return
2919 lappend disable_on_lock \
2920 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2925 if {[is_enabled branch
]} {
2927 .mbar.merge add
command -label [mc
"Local Merge..."] \
2928 -command merge
::dialog \
2930 lappend disable_on_lock \
2931 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2932 .mbar.merge add
command -label [mc
"Abort Merge..."] \
2933 -command merge
::reset_hard
2934 lappend disable_on_lock \
2935 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2940 if {[is_enabled transport
]} {
2943 .mbar.remote add
command \
2944 -label [mc
"Add..."] \
2945 -command remote_add
::dialog \
2947 .mbar.remote add
command \
2948 -label [mc
"Push..."] \
2949 -command do_push_anywhere \
2951 .mbar.remote add
command \
2952 -label [mc
"Delete Branch..."] \
2953 -command remote_branch_delete
::dialog
2957 proc
::tk
::mac
::ShowPreferences
{} {do_options
}
2961 .mbar.edit add separator
2962 .mbar.edit add
command -label [mc
"Options..."] \
2968 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2969 set tools_menubar .mbar.tools
2971 $tools_menubar add separator
2972 $tools_menubar add
command -label [mc
"Add..."] -command tools_add
::dialog
2973 $tools_menubar add
command -label [mc
"Remove..."] -command tools_remove
::dialog
2975 if {[array names repo_config guitool.
*.cmd
] ne
{}} {
2982 .mbar add cascade
-label [mc Help
] -menu .mbar.
help
2986 .mbar.apple add
command -label [mc
"About %s" [appname
]] \
2988 .mbar.apple add separator
2990 .mbar.
help add
command -label [mc
"About %s" [appname
]] \
2993 . configure
-menu .mbar
2995 set doc_path
[githtmldir
]
2996 if {$doc_path ne
{}} {
2997 set doc_path
[file join $doc_path index.html
]
3000 set doc_path
[exec cygpath
--mixed $doc_path]
3004 if {[file isfile
$doc_path]} {
3005 set doc_url
"file:$doc_path"
3007 set doc_url
{http
://www.kernel.org
/pub
/software
/scm
/git
/docs
/}
3010 proc start_browser
{url
} {
3011 git
"web--browse" $url
3014 .mbar.
help add
command -label [mc
"Online Documentation"] \
3015 -command [list start_browser
$doc_url]
3017 .mbar.
help add
command -label [mc
"Show SSH Key"] \
3020 unset doc_path doc_url
3022 # -- Standard bindings
3024 wm protocol . WM_DELETE_WINDOW do_quit
3025 bind all
<$M1B-Key-q> do_quit
3026 bind all
<$M1B-Key-Q> do_quit
3027 bind all
<$M1B-Key-w> {destroy
[winfo toplevel
%W
]}
3028 bind all
<$M1B-Key-W> {destroy
[winfo toplevel
%W
]}
3030 set subcommand_args
{}
3032 set s
"[mc usage:] $::argv0 $::subcommand $::subcommand_args"
3033 if {[tk windowingsystem
] eq
"win32"} {
3035 tk_messageBox
-icon info
-message $s \
3043 proc normalize_relpath
{path
} {
3045 foreach item
[file split $path] {
3046 if {$item eq
{.
}} continue
3047 if {$item eq
{..
} && [llength
$elements] > 0
3048 && [lindex
$elements end
] ne
{..
}} {
3049 set elements
[lrange
$elements 0 end-1
]
3052 lappend elements
$item
3054 return [eval file join $elements]
3057 # -- Not a normal commit type invocation? Do that instead!
3059 switch
-- $subcommand {
3062 if {$subcommand eq
"blame"} {
3063 set subcommand_args
{[--line=<num
>] rev? path
}
3065 set subcommand_args
{rev? path
}
3067 if {$argv eq
{}} usage
3073 set p
[file join $_prefix $a]
3075 if {$is_path ||
[file exists
$p]} {
3076 if {$path ne
{}} usage
3077 set path
[normalize_relpath
$p]
3079 } elseif
{$a eq
{--}} {
3081 if {$head ne
{}} usage
3086 } elseif
{[regexp
{^
--line=(\d
+)$
} $a a lnum
]} {
3087 if {$jump_spec ne
{} ||
$head ne
{}} usage
3088 set jump_spec
[list
$lnum]
3089 } elseif
{$head eq
{}} {
3090 if {$head ne
{}} usage
3099 if {$head ne
{} && $path eq
{}} {
3100 if {[string index
$head 0] eq
{/}} {
3101 set path
[normalize_relpath
$head]
3104 set path
[normalize_relpath
$_prefix$head]
3112 if {[regexp
{^
[0-9a-f]{1,39}$
} $head]} {
3114 set head [git rev-parse
--verify $head]
3116 if {[tk windowingsystem
] eq
"win32"} {
3117 tk_messageBox
-icon error
-title [mc Error
] -message $err
3124 set current_branch
$head
3128 switch
-- $subcommand {
3130 if {$jump_spec ne
{}} usage
3132 if {$path ne
{} && [file isdirectory
$path]} {
3133 set head $current_branch
3139 browser
::new
$head $path
3142 if {$head eq
{} && ![file exists
$path]} {
3143 catch
{wm withdraw .
}
3147 -title [mc
"git-gui: fatal error"] \
3148 -message [mc
"fatal: cannot stat path %s: No such file or directory" $path]
3151 blame
::new
$head $path $jump_spec
3158 if {[llength
$argv] != 0} {
3161 # fall through to setup UI for commits
3164 set err
"[mc usage:] $argv0 \[{blame|browser|citool}\]"
3165 if {[tk windowingsystem
] eq
"win32"} {
3167 tk_messageBox
-icon error
-message $err \
3178 ${NS}::frame .branch
3179 if {!$use_ttk} {.branch configure
-borderwidth 1 -relief sunken
}
3180 ${NS}::label .branch.l1 \
3181 -text [mc
"Current Branch:"] \
3184 ${NS}::label .branch.cb \
3185 -textvariable current_branch \
3188 pack .branch.l1
-side left
3189 pack .branch.cb
-side left
-fill x
3190 pack .branch
-side top
-fill x
3192 # -- Main Window Layout
3194 ${NS}::panedwindow .vpane
-orient horizontal
3195 ${NS}::panedwindow .vpane.files
-orient vertical
3197 .vpane add .vpane.files
3199 .vpane add .vpane.files
-sticky nsew
-height 100 -width 200
3201 pack .vpane
-anchor n
-side top
-fill both
-expand 1
3203 # -- Working Directory File List
3205 textframe .vpane.files.workdir
-height 100 -width 200
3206 tlabel .vpane.files.workdir.title
-text [mc
"Unstaged Changes"] \
3207 -background lightsalmon
-foreground black
3208 ttext
$ui_workdir -background white
-foreground black \
3210 -width 20 -height 10 \
3212 -takefocus 1 -highlightthickness 1\
3213 -cursor $cursor_ptr \
3214 -xscrollcommand {.vpane.files.workdir.sx
set} \
3215 -yscrollcommand {.vpane.files.workdir.sy
set} \
3217 ${NS}::scrollbar .vpane.files.workdir.sx
-orient h
-command [list
$ui_workdir xview
]
3218 ${NS}::scrollbar .vpane.files.workdir.sy
-orient v
-command [list
$ui_workdir yview
]
3219 pack .vpane.files.workdir.title
-side top
-fill x
3220 pack .vpane.files.workdir.sx
-side bottom
-fill x
3221 pack .vpane.files.workdir.sy
-side right
-fill y
3222 pack
$ui_workdir -side left
-fill both
-expand 1
3224 # -- Index File List
3226 textframe .vpane.files.index
-height 100 -width 200
3227 tlabel .vpane.files.index.title \
3228 -text [mc
"Staged Changes (Will Commit)"] \
3229 -background lightgreen
-foreground black
3230 ttext
$ui_index -background white
-foreground black \
3232 -width 20 -height 10 \
3234 -takefocus 1 -highlightthickness 1\
3235 -cursor $cursor_ptr \
3236 -xscrollcommand {.vpane.files.index.sx
set} \
3237 -yscrollcommand {.vpane.files.index.sy
set} \
3239 ${NS}::scrollbar .vpane.files.index.sx
-orient h
-command [list
$ui_index xview
]
3240 ${NS}::scrollbar .vpane.files.index.sy
-orient v
-command [list
$ui_index yview
]
3241 pack .vpane.files.index.title
-side top
-fill x
3242 pack .vpane.files.index.sx
-side bottom
-fill x
3243 pack .vpane.files.index.sy
-side right
-fill y
3244 pack
$ui_index -side left
-fill both
-expand 1
3246 # -- Insert the workdir and index into the panes
3248 .vpane.files add .vpane.files.workdir
3249 .vpane.files add .vpane.files.index
3251 .vpane.files paneconfigure .vpane.files.workdir
-sticky news
3252 .vpane.files paneconfigure .vpane.files.index
-sticky news
3255 foreach i
[list
$ui_index $ui_workdir] {
3257 $i tag conf in_diff
-background [$i tag cget in_sel
-background]
3261 # -- Diff and Commit Area
3264 ${NS}::panedwindow .vpane.lower
-orient vertical
3265 ${NS}::frame .vpane.lower.commarea
3266 ${NS}::frame .vpane.lower.
diff -relief sunken
-borderwidth 1 -height 500
3267 .vpane.lower add .vpane.lower.
diff
3268 .vpane.lower add .vpane.lower.commarea
3269 .vpane add .vpane.lower
3271 .vpane.lower pane .vpane.lower.
diff -weight 1
3272 .vpane.lower pane .vpane.lower.commarea
-weight 0
3274 .vpane.lower paneconfigure .vpane.lower.
diff -stretch always
3275 .vpane.lower paneconfigure .vpane.lower.commarea
-stretch never
3278 frame .vpane.lower
-height 300 -width 400
3279 frame .vpane.lower.commarea
3280 frame .vpane.lower.
diff -relief sunken
-borderwidth 1
3281 pack .vpane.lower.
diff -fill both
-expand 1
3282 pack .vpane.lower.commarea
-side bottom
-fill x
3283 .vpane add .vpane.lower
3284 .vpane paneconfigure .vpane.lower
-sticky nsew
3287 # -- Commit Area Buttons
3289 ${NS}::frame .vpane.lower.commarea.buttons
3290 ${NS}::label .vpane.lower.commarea.buttons.l
-text {} \
3293 pack .vpane.lower.commarea.buttons.l
-side top
-fill x
3294 pack .vpane.lower.commarea.buttons
-side left
-fill y
3296 ${NS}::button .vpane.lower.commarea.buttons.rescan
-text [mc Rescan
] \
3297 -command ui_do_rescan
3298 pack .vpane.lower.commarea.buttons.rescan
-side top
-fill x
3299 lappend disable_on_lock \
3300 {.vpane.lower.commarea.buttons.rescan conf
-state}
3302 ${NS}::button .vpane.lower.commarea.buttons.incall
-text [mc
"Stage Changed"] \
3304 pack .vpane.lower.commarea.buttons.incall
-side top
-fill x
3305 lappend disable_on_lock \
3306 {.vpane.lower.commarea.buttons.incall conf
-state}
3308 if {![is_enabled nocommitmsg
]} {
3309 ${NS}::button .vpane.lower.commarea.buttons.signoff
-text [mc
"Sign Off"] \
3311 pack .vpane.lower.commarea.buttons.signoff
-side top
-fill x
3314 ${NS}::button .vpane.lower.commarea.buttons.commit
-text [commit_btn_caption
] \
3316 pack .vpane.lower.commarea.buttons.commit
-side top
-fill x
3317 lappend disable_on_lock \
3318 {.vpane.lower.commarea.buttons.commit conf
-state}
3320 if {![is_enabled nocommit
]} {
3321 ${NS}::button .vpane.lower.commarea.buttons.push
-text [mc Push
] \
3322 -command do_push_anywhere
3323 pack .vpane.lower.commarea.buttons.push
-side top
-fill x
3326 # -- Commit Message Buffer
3328 ${NS}::frame .vpane.lower.commarea.buffer
3329 ${NS}::frame .vpane.lower.commarea.buffer.header
3330 set ui_comm .vpane.lower.commarea.buffer.frame.t
3331 set ui_coml .vpane.lower.commarea.buffer.header.l
3333 if {![is_enabled nocommit
]} {
3334 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.new \
3335 -text [mc
"New Commit"] \
3336 -command do_select_commit_type \
3337 -variable selected_commit_type \
3339 lappend disable_on_lock \
3340 [list .vpane.lower.commarea.buffer.header.new conf
-state]
3341 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.amend \
3342 -text [mc
"Amend Last Commit"] \
3343 -command do_select_commit_type \
3344 -variable selected_commit_type \
3346 lappend disable_on_lock \
3347 [list .vpane.lower.commarea.buffer.header.amend conf
-state]
3350 ${NS}::label
$ui_coml \
3353 proc trace_commit_type
{varname args
} {
3354 global ui_coml commit_type
3355 switch
-glob -- $commit_type {
3356 initial
{set txt
[mc
"Initial Commit Message:"]}
3357 amend
{set txt
[mc
"Amended Commit Message:"]}
3358 amend-initial
{set txt
[mc
"Amended Initial Commit Message:"]}
3359 amend-merge
{set txt
[mc
"Amended Merge Commit Message:"]}
3360 merge
{set txt
[mc
"Merge Commit Message:"]}
3361 * {set txt
[mc
"Commit Message:"]}
3363 $ui_coml conf
-text $txt
3365 trace add variable commit_type
write trace_commit_type
3366 pack
$ui_coml -side left
-fill x
3368 if {![is_enabled nocommit
]} {
3369 pack .vpane.lower.commarea.buffer.header.amend
-side right
3370 pack .vpane.lower.commarea.buffer.header.new
-side right
3373 textframe .vpane.lower.commarea.buffer.frame
3374 ttext
$ui_comm -background white
-foreground black \
3378 -autoseparators true \
3380 -highlightthickness 1 \
3382 -width $repo_config(gui.commitmsgwidth
) -height 9 -wrap none \
3384 -yscrollcommand {.vpane.lower.commarea.buffer.frame.sby
set}
3385 ${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sby \
3386 -command [list
$ui_comm yview
]
3388 pack .vpane.lower.commarea.buffer.frame.sby
-side right
-fill y
3389 pack
$ui_comm -side left
-fill y
3390 pack .vpane.lower.commarea.buffer.header
-side top
-fill x
3391 pack .vpane.lower.commarea.buffer.frame
-side left
-fill y
3392 pack .vpane.lower.commarea.buffer
-side left
-fill y
3394 # -- Commit Message Buffer Context Menu
3396 set ctxm .vpane.lower.commarea.buffer.ctxm
3397 menu
$ctxm -tearoff 0
3400 -command {tk_textCut
$ui_comm}
3403 -command {tk_textCopy
$ui_comm}
3406 -command {tk_textPaste
$ui_comm}
3408 -label [mc Delete
] \
3409 -command {catch
{$ui_comm delete sel.first sel.last
}}
3412 -label [mc
"Select All"] \
3413 -command {focus
$ui_comm;$ui_comm tag add sel
0.0 end
}
3415 -label [mc
"Copy All"] \
3417 $ui_comm tag add sel
0.0 end
3418 tk_textCopy
$ui_comm
3419 $ui_comm tag remove sel
0.0 end
3423 -label [mc
"Sign Off"] \
3425 set ui_comm_ctxm
$ctxm
3429 proc trace_current_diff_path
{varname args
} {
3430 global current_diff_path diff_actions file_states
3431 if {$current_diff_path eq
{}} {
3437 set p
$current_diff_path
3438 set s
[mapdesc
[lindex
$file_states($p) 0] $p]
3440 set p
[escape_path
$p]
3444 .vpane.lower.
diff.header.status configure
-text $s
3445 .vpane.lower.
diff.header.
file configure
-text $f
3446 .vpane.lower.
diff.header.path configure
-text $p
3447 foreach w
$diff_actions {
3451 trace add variable current_diff_path
write trace_current_diff_path
3453 gold_frame .vpane.lower.
diff.header
3454 tlabel .vpane.lower.
diff.header.status \
3457 -width $max_status_desc \
3460 tlabel .vpane.lower.
diff.header.
file \
3465 tlabel .vpane.lower.
diff.header.path \
3470 pack .vpane.lower.
diff.header.status
-side left
3471 pack .vpane.lower.
diff.header.
file -side left
3472 pack .vpane.lower.
diff.header.path
-fill x
3473 set ctxm .vpane.lower.
diff.header.ctxm
3474 menu
$ctxm -tearoff 0
3482 -- $current_diff_path
3484 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3485 bind_button3 .vpane.lower.
diff.header.path
"tk_popup $ctxm %X %Y"
3489 textframe .vpane.lower.
diff.body
3490 set ui_diff .vpane.lower.
diff.body.t
3491 ttext
$ui_diff -background white
-foreground black \
3493 -width 80 -height 5 -wrap none \
3495 -takefocus 1 -highlightthickness 1 \
3496 -xscrollcommand {.vpane.lower.
diff.body.sbx
set} \
3497 -yscrollcommand {.vpane.lower.
diff.body.sby
set} \
3499 catch
{$ui_diff configure
-tabstyle wordprocessor
}
3500 ${NS}::scrollbar .vpane.lower.
diff.body.sbx
-orient horizontal \
3501 -command [list
$ui_diff xview
]
3502 ${NS}::scrollbar .vpane.lower.
diff.body.sby
-orient vertical \
3503 -command [list
$ui_diff yview
]
3504 pack .vpane.lower.
diff.body.sbx
-side bottom
-fill x
3505 pack .vpane.lower.
diff.body.sby
-side right
-fill y
3506 pack
$ui_diff -side left
-fill both
-expand 1
3507 pack .vpane.lower.
diff.header
-side top
-fill x
3508 pack .vpane.lower.
diff.body
-side bottom
-fill both
-expand 1
3510 foreach
{n c
} {0 black
1 red4
2 green4
3 yellow4
4 blue4
5 magenta4
6 cyan4
7 grey60
} {
3511 $ui_diff tag configure clr4
$n -background $c
3512 $ui_diff tag configure clri4
$n -foreground $c
3513 $ui_diff tag configure clr3
$n -foreground $c
3514 $ui_diff tag configure clri3
$n -background $c
3516 $ui_diff tag configure clr1
-font font_diffbold
3517 $ui_diff tag configure clr4
-underline 1
3519 $ui_diff tag conf d_info
-foreground blue
-font font_diffbold
3521 $ui_diff tag conf d_cr
-elide true
3522 $ui_diff tag conf d_@
-font font_diffbold
3523 $ui_diff tag conf d_
+ -foreground {#00a000}
3524 $ui_diff tag conf d_-
-foreground red
3526 $ui_diff tag conf d_
++ -foreground {#00a000}
3527 $ui_diff tag conf d_--
-foreground red
3528 $ui_diff tag conf d_
+s \
3529 -foreground {#00a000} \
3530 -background {#e2effa}
3531 $ui_diff tag conf d_-s \
3533 -background {#e2effa}
3534 $ui_diff tag conf d_s
+ \
3535 -foreground {#00a000} \
3537 $ui_diff tag conf d_s- \
3541 $ui_diff tag conf d
< \
3542 -foreground orange \
3544 $ui_diff tag conf d
= \
3545 -foreground orange \
3547 $ui_diff tag conf d
> \
3548 -foreground orange \
3551 $ui_diff tag raise sel
3553 # -- Diff Body Context Menu
3556 proc create_common_diff_popup
{ctxm
} {
3558 -label [mc Refresh
] \
3559 -command reshow_diff
3560 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3563 -command {tk_textCopy
$ui_diff}
3564 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3566 -label [mc
"Select All"] \
3567 -command {focus
$ui_diff;$ui_diff tag add sel
0.0 end
}
3568 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3570 -label [mc
"Copy All"] \
3572 $ui_diff tag add sel
0.0 end
3573 tk_textCopy
$ui_diff
3574 $ui_diff tag remove sel
0.0 end
3576 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3579 -label [mc
"Decrease Font Size"] \
3580 -command {incr_font_size font_diff
-1}
3581 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3583 -label [mc
"Increase Font Size"] \
3584 -command {incr_font_size font_diff
1}
3585 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3589 build_encoding_menu
$emenu [list force_diff_encoding
]
3591 -label [mc
"Encoding"] \
3593 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3595 $ctxm add
command -label [mc
"Options..."] \
3599 set ctxm .vpane.lower.
diff.body.ctxm
3600 menu
$ctxm -tearoff 0
3602 -label [mc
"Apply/Reverse Hunk"] \
3603 -command {apply_hunk
$cursorX $cursorY}
3604 set ui_diff_applyhunk
[$ctxm index last
]
3605 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyhunk -state]
3607 -label [mc
"Apply/Reverse Line"] \
3608 -command {apply_range_or_line
$cursorX $cursorY; do_rescan
}
3609 set ui_diff_applyline
[$ctxm index last
]
3610 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyline -state]
3613 -label [mc
"Show Less Context"] \
3614 -command show_less_context
3615 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3617 -label [mc
"Show More Context"] \
3618 -command show_more_context
3619 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3621 create_common_diff_popup
$ctxm
3623 set ctxmmg .vpane.lower.
diff.body.ctxmmg
3624 menu
$ctxmmg -tearoff 0
3625 $ctxmmg add
command \
3626 -label [mc
"Run Merge Tool"] \
3627 -command {merge_resolve_tool
}
3628 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3629 $ctxmmg add separator
3630 $ctxmmg add
command \
3631 -label [mc
"Use Remote Version"] \
3632 -command {merge_resolve_one
3}
3633 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3634 $ctxmmg add
command \
3635 -label [mc
"Use Local Version"] \
3636 -command {merge_resolve_one
2}
3637 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3638 $ctxmmg add
command \
3639 -label [mc
"Revert To Base"] \
3640 -command {merge_resolve_one
1}
3641 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3642 $ctxmmg add separator
3643 $ctxmmg add
command \
3644 -label [mc
"Show Less Context"] \
3645 -command show_less_context
3646 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3647 $ctxmmg add
command \
3648 -label [mc
"Show More Context"] \
3649 -command show_more_context
3650 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3651 $ctxmmg add separator
3652 create_common_diff_popup
$ctxmmg
3654 set ctxmsm .vpane.lower.
diff.body.ctxmsm
3655 menu
$ctxmsm -tearoff 0
3656 $ctxmsm add
command \
3657 -label [mc
"Visualize These Changes In The Submodule"] \
3658 -command {do_gitk
-- true
}
3659 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3660 $ctxmsm add
command \
3661 -label [mc
"Visualize Current Branch History In The Submodule"] \
3662 -command {do_gitk
{} true
}
3663 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3664 $ctxmsm add
command \
3665 -label [mc
"Visualize All Branch History In The Submodule"] \
3666 -command {do_gitk
--all true
}
3667 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3668 $ctxmsm add separator
3669 $ctxmsm add
command \
3670 -label [mc
"Start git gui In The Submodule"] \
3671 -command {do_git_gui
}
3672 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3673 $ctxmsm add separator
3674 create_common_diff_popup
$ctxmsm
3676 proc has_textconv
{path
} {
3677 if {[is_config_false gui.textconv
]} {
3680 set filter
[gitattr
$path diff set]
3681 set textconv
[get_config
[join [list
diff $filter textconv
] .
]]
3682 if {$filter ne
{set} && $textconv ne
{}} {
3689 proc popup_diff_menu
{ctxm ctxmmg ctxmsm x y X Y
} {
3690 global current_diff_path file_states
3693 if {[info exists file_states
($current_diff_path)]} {
3694 set state
[lindex
$file_states($current_diff_path) 0]
3698 if {[string first
{U
} $state] >= 0} {
3699 tk_popup
$ctxmmg $X $Y
3700 } elseif
{$
::is_submodule_diff
} {
3701 tk_popup
$ctxmsm $X $Y
3703 set has_range
[expr {[$
::ui_diff tag nextrange sel
0.0] != {}}]
3704 if {$
::ui_index eq $
::current_diff_side
} {
3705 set l
[mc
"Unstage Hunk From Commit"]
3707 set t
[mc
"Unstage Lines From Commit"]
3709 set t
[mc
"Unstage Line From Commit"]
3712 set l
[mc
"Stage Hunk For Commit"]
3714 set t
[mc
"Stage Lines For Commit"]
3716 set t
[mc
"Stage Line For Commit"]
3720 ||
$current_diff_path eq
{}
3723 ||
[string match
{?T
} $state]
3724 ||
[string match
{T?
} $state]
3725 ||
[has_textconv
$current_diff_path]} {
3730 $ctxm entryconf $
::ui_diff_applyhunk
-state $s -label $l
3731 $ctxm entryconf $
::ui_diff_applyline
-state $s -label $t
3732 tk_popup
$ctxm $X $Y
3735 bind_button3
$ui_diff [list popup_diff_menu
$ctxm $ctxmmg $ctxmsm %x
%y
%X
%Y
]
3739 set main_status
[::status_bar
::new .status
]
3740 pack .status
-anchor w
-side bottom
-fill x
3741 $main_status show
[mc
"Initializing..."]
3745 proc on_ttk_pane_mapped
{w pane pos
} {
3747 after
0 [list after idle
[list
$w sashpos
$pane $pos]]
3749 proc on_tk_pane_mapped
{w pane x y
} {
3751 after
0 [list after idle
[list
$w sash place
$pane $x $y]]
3753 proc on_application_mapped
{} {
3754 global repo_config use_ttk
3756 set gm
$repo_config(gui.geometry
)
3759 [list on_ttk_pane_mapped
%W
0 [lindex
$gm 1]]
3760 bind .vpane.files
<Map
> \
3761 [list on_ttk_pane_mapped
%W
0 [lindex
$gm 2]]
3764 [list on_tk_pane_mapped
%W
0 \
3766 [lindex
[.vpane sash coord
0] 1]]
3767 bind .vpane.files
<Map
> \
3768 [list on_tk_pane_mapped
%W
0 \
3769 [lindex
[.vpane.files sash coord
0] 0] \
3772 wm geometry .
[lindex
$gm 0]
3774 if {[info exists repo_config
(gui.geometry
)]} {
3775 bind .
<Map
> [list on_application_mapped
]
3776 wm geometry .
[lindex
$repo_config(gui.geometry
) 0]
3779 # -- Load window state
3781 if {[info exists repo_config
(gui.wmstate
)]} {
3782 catch
{wm state .
$repo_config(gui.wmstate
)}
3787 bind $ui_comm <$M1B-Key-Return> {do_commit
;break}
3788 bind $ui_comm <$M1B-Key-t> {do_add_selection
;break}
3789 bind $ui_comm <$M1B-Key-T> {do_add_selection
;break}
3790 bind $ui_comm <$M1B-Key-u> {do_unstage_selection
;break}
3791 bind $ui_comm <$M1B-Key-U> {do_unstage_selection
;break}
3792 bind $ui_comm <$M1B-Key-j> {do_revert_selection
;break}
3793 bind $ui_comm <$M1B-Key-J> {do_revert_selection
;break}
3794 bind $ui_comm <$M1B-Key-i> {do_add_all
;break}
3795 bind $ui_comm <$M1B-Key-I> {do_add_all
;break}
3796 bind $ui_comm <$M1B-Key-x> {tk_textCut
%W
;break}
3797 bind $ui_comm <$M1B-Key-X> {tk_textCut
%W
;break}
3798 bind $ui_comm <$M1B-Key-c> {tk_textCopy
%W
;break}
3799 bind $ui_comm <$M1B-Key-C> {tk_textCopy
%W
;break}
3800 bind $ui_comm <$M1B-Key-v> {tk_textPaste
%W
; %W see insert
; break}
3801 bind $ui_comm <$M1B-Key-V> {tk_textPaste
%W
; %W see insert
; break}
3802 bind $ui_comm <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3803 bind $ui_comm <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3804 bind $ui_comm <$M1B-Key-minus> {show_less_context
;break}
3805 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context
;break}
3806 bind $ui_comm <$M1B-Key-equal> {show_more_context
;break}
3807 bind $ui_comm <$M1B-Key-plus> {show_more_context
;break}
3808 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context
;break}
3810 bind $ui_diff <$M1B-Key-x> {tk_textCopy
%W
;break}
3811 bind $ui_diff <$M1B-Key-X> {tk_textCopy
%W
;break}
3812 bind $ui_diff <$M1B-Key-c> {tk_textCopy
%W
;break}
3813 bind $ui_diff <$M1B-Key-C> {tk_textCopy
%W
;break}
3814 bind $ui_diff <$M1B-Key-v> {break}
3815 bind $ui_diff <$M1B-Key-V> {break}
3816 bind $ui_diff <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3817 bind $ui_diff <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3818 bind $ui_diff <$M1B-Key-j> {do_revert_selection
;break}
3819 bind $ui_diff <$M1B-Key-J> {do_revert_selection
;break}
3820 bind $ui_diff <Key-Up
> {catch
{%W yview scroll
-1 units
};break}
3821 bind $ui_diff <Key-Down
> {catch
{%W yview scroll
1 units
};break}
3822 bind $ui_diff <Key-Left
> {catch
{%W xview scroll
-1 units
};break}
3823 bind $ui_diff <Key-Right
> {catch
{%W xview scroll
1 units
};break}
3824 bind $ui_diff <Key-k
> {catch
{%W yview scroll
-1 units
};break}
3825 bind $ui_diff <Key-j
> {catch
{%W yview scroll
1 units
};break}
3826 bind $ui_diff <Key-h
> {catch
{%W xview scroll
-1 units
};break}
3827 bind $ui_diff <Key-l
> {catch
{%W xview scroll
1 units
};break}
3828 bind $ui_diff <Control-Key-b
> {catch
{%W yview scroll
-1 pages
};break}
3829 bind $ui_diff <Control-Key-f
> {catch
{%W yview scroll
1 pages
};break}
3830 bind $ui_diff <Button-1
> {focus
%W
}
3832 if {[is_enabled branch
]} {
3833 bind .
<$M1B-Key-n> branch_create
::dialog
3834 bind .
<$M1B-Key-N> branch_create
::dialog
3835 bind .
<$M1B-Key-o> branch_checkout
::dialog
3836 bind .
<$M1B-Key-O> branch_checkout
::dialog
3837 bind .
<$M1B-Key-m> merge
::dialog
3838 bind .
<$M1B-Key-M> merge
::dialog
3840 if {[is_enabled transport
]} {
3841 bind .
<$M1B-Key-p> do_push_anywhere
3842 bind .
<$M1B-Key-P> do_push_anywhere
3845 bind .
<Key-F5
> ui_do_rescan
3846 bind .
<$M1B-Key-r> ui_do_rescan
3847 bind .
<$M1B-Key-R> ui_do_rescan
3848 bind .
<$M1B-Key-s> do_signoff
3849 bind .
<$M1B-Key-S> do_signoff
3850 bind .
<$M1B-Key-t> { toggle_or_diff toggle
%W
}
3851 bind .
<$M1B-Key-T> { toggle_or_diff toggle
%W
}
3852 bind .
<$M1B-Key-u> { toggle_or_diff toggle
%W
}
3853 bind .
<$M1B-Key-U> { toggle_or_diff toggle
%W
}
3854 bind .
<$M1B-Key-j> do_revert_selection
3855 bind .
<$M1B-Key-J> do_revert_selection
3856 bind .
<$M1B-Key-i> do_add_all
3857 bind .
<$M1B-Key-I> do_add_all
3858 bind .
<$M1B-Key-minus> {show_less_context
;break}
3859 bind .
<$M1B-Key-KP_Subtract> {show_less_context
;break}
3860 bind .
<$M1B-Key-equal> {show_more_context
;break}
3861 bind .
<$M1B-Key-plus> {show_more_context
;break}
3862 bind .
<$M1B-Key-KP_Add> {show_more_context
;break}
3863 bind .
<$M1B-Key-Return> do_commit
3864 foreach i
[list
$ui_index $ui_workdir] {
3865 bind $i <Button-1
> { toggle_or_diff click
%W
%x
%y
; break }
3866 bind $i <$M1B-Button-1> { add_one_to_selection
%W
%x
%y
; break }
3867 bind $i <Shift-Button-1
> { add_range_to_selection
%W
%x
%y
; break }
3868 bind $i <Key-Up
> { toggle_or_diff up
%W
; break }
3869 bind $i <Key-Down
> { toggle_or_diff down
%W
; break }
3873 set file_lists
($ui_index) [list
]
3874 set file_lists
($ui_workdir) [list
]
3876 wm title .
"[appname] ([reponame]) [file normalize $_gitworktree]"
3877 focus
-force $ui_comm
3879 # -- Warn the user about environmental problems. Cygwin's Tcl
3880 # does *not* pass its env array onto any processes it spawns.
3881 # This means that git processes get none of our environment.
3886 set msg
[mc
"Possible environment issues exist.
3888 The following environment variables are probably
3889 going to be ignored by any Git subprocess run
3893 foreach name
[array names env
] {
3894 switch
-regexp -- $name {
3895 {^GIT_INDEX_FILE$
} -
3896 {^GIT_OBJECT_DIRECTORY$
} -
3897 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$
} -
3899 {^GIT_EXTERNAL_DIFF$
} -
3903 {^GIT_
(AUTHOR|COMMITTER
)_DATE$
} {
3904 append msg
" - $name\n"
3907 {^GIT_
(AUTHOR|COMMITTER
)_
(NAME|EMAIL
)$
} {
3908 append msg
" - $name\n"
3910 set suggest_user
$name
3914 if {$ignored_env > 0} {
3916 This is due to a known issue with the
3917 Tcl binary distributed by Cygwin."]
3919 if {$suggest_user ne
{}} {
3922 A good replacement for %s
3923 is placing values for the user.name and
3924 user.email settings into your personal
3930 unset ignored_env msg suggest_user name
3933 # -- Only initialize complex UI if we are going to stay running.
3935 if {[is_enabled transport
]} {
3938 set n
[.mbar.remote index end
]
3939 populate_remotes_menu
3940 set n
[expr {[.mbar.remote index end
] - $n}]
3942 if {[.mbar.remote
type 0] eq
"tearoff"} { incr n
}
3943 .mbar.remote insert
$n separator
3948 if {[winfo exists
$ui_comm]} {
3949 set GITGUI_BCK_exists
[load_message GITGUI_BCK utf-8
]
3951 # -- If both our backup and message files exist use the
3952 # newer of the two files to initialize the buffer.
3954 if {$GITGUI_BCK_exists} {
3955 set m
[gitdir GITGUI_MSG
]
3956 if {[file isfile
$m]} {
3957 if {[file mtime
[gitdir GITGUI_BCK
]] > [file mtime
$m]} {
3958 catch
{file delete
[gitdir GITGUI_MSG
]}
3960 $ui_comm delete
0.0 end
3962 $ui_comm edit modified false
3963 catch
{file delete
[gitdir GITGUI_BCK
]}
3964 set GITGUI_BCK_exists
0
3970 proc backup_commit_buffer
{} {
3971 global ui_comm GITGUI_BCK_exists
3973 set m
[$ui_comm edit modified
]
3974 if {$m ||
$GITGUI_BCK_exists} {
3975 set msg
[string trim
[$ui_comm get
0.0 end
]]
3976 regsub
-all -line {[ \r\t]+$
} $msg {} msg
3979 if {$GITGUI_BCK_exists} {
3980 catch
{file delete
[gitdir GITGUI_BCK
]}
3981 set GITGUI_BCK_exists
0
3985 set fd
[open
[gitdir GITGUI_BCK
] w
]
3986 fconfigure
$fd -encoding utf-8
3987 puts
-nonewline $fd $msg
3989 set GITGUI_BCK_exists
1
3993 $ui_comm edit modified false
3996 set ::GITGUI_BCK_i
[after
2000 backup_commit_buffer
]
3999 backup_commit_buffer
4001 # -- If the user has aspell available we can drive it
4002 # in pipe mode to spellcheck the commit message.
4004 set spell_cmd
[list |
]
4005 set spell_dict
[get_config gui.spellingdictionary
]
4006 lappend spell_cmd aspell
4007 if {$spell_dict ne
{}} {
4008 lappend spell_cmd
--master=$spell_dict
4010 lappend spell_cmd
--mode=none
4011 lappend spell_cmd
--encoding=utf-8
4012 lappend spell_cmd pipe
4013 if {$spell_dict eq
{none
}
4014 ||
[catch
{set spell_fd
[open
$spell_cmd r
+]} spell_err
]} {
4015 bind_button3
$ui_comm [list tk_popup
$ui_comm_ctxm %X
%Y
]
4017 set ui_comm_spell
[spellcheck
::init \
4023 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
4026 lock_index begin-read
4027 if {![winfo ismapped .
]} {
4031 if {[is_enabled initialamend
]} {
4037 if {[is_enabled nocommitmsg
]} {
4038 $ui_comm configure
-state disabled
-background gray
4041 if {[is_enabled multicommit
] && ![is_config_false gui.gcwarning
]} {
4044 if {[is_enabled retcode
]} {
4045 bind .
<Destroy
> {+terminate_me
%W
}
4047 if {$picked && [is_config_true gui.autoexplore
]} {
4053 # indent-tabs-mode: t