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
]} {
537 set fd
[eval [list git_read
] $args]
538 fconfigure
$fd -translation binary
-encoding utf-8
539 set result
[string trimright
[read $fd] "\n"]
542 puts stderr
"< $result"
547 proc _open_stdout_stderr
{cmd
} {
550 set fd
[open
[concat
[list |
] $cmd] r
]
552 if { [lindex
$cmd end
] eq
{2>@
1}
553 && $err eq
{can not
find channel named
"1"}
555 # Older versions of Tcl 8.4 don't have this 2>@1 IO
556 # redirect operator. Fallback to |& cat for those.
557 # The command was not actually started, so its safe
558 # to try to start it a second time.
560 set fd
[open
[concat \
562 [lrange
$cmd 0 end-1
] \
569 fconfigure
$fd -eofchar
{}
573 proc git_read
{args
} {
577 switch
-- [lindex
$args 0] {
592 set args
[lrange
$args 1 end
]
595 set cmdp
[_git_cmd
[lindex
$args 0]]
596 set args
[lrange
$args 1 end
]
598 return [_open_stdout_stderr
[concat
$opt $cmdp $args]]
601 proc git_write
{args
} {
605 switch
-- [lindex
$args 0] {
616 set args
[lrange
$args 1 end
]
619 set cmdp
[_git_cmd
[lindex
$args 0]]
620 set args
[lrange
$args 1 end
]
622 _trace_exec
[concat
$opt $cmdp $args]
623 return [open
[concat
[list |
] $opt $cmdp $args] w
]
626 proc githook_read
{hook_name args
} {
627 set pchook
[gitdir hooks
$hook_name]
630 # On Windows [file executable] might lie so we need to ask
631 # the shell if the hook is executable. Yes that's annoying.
635 if {![info exists interp
]} {
636 set interp
[_which sh
]
639 error
"hook execution requires sh (not in PATH)"
642 set scr
{if test -x
"$1";then exec "$@";fi}
643 set sh_c
[list
$interp -c
$scr $interp $pchook]
644 return [_open_stdout_stderr
[concat
$sh_c $args]]
647 if {[file executable
$pchook]} {
648 return [_open_stdout_stderr
[concat
[list
$pchook] $args]]
654 proc kill_file_process
{fd
} {
655 set process
[pid
$fd]
659 exec taskkill
/pid
$process
666 proc gitattr
{path attr default
} {
667 if {[catch
{set r
[git check-attr
$attr -- $path]}]} {
670 set r
[join [lrange
[split $r :] 2 end
] :]
673 if {$r eq
{unspecified
}} {
680 regsub
-all
' $value "'\\''" value
684 proc load_current_branch {} {
685 global current_branch is_detached
687 set fd [open [gitdir HEAD] r]
688 if {[gets $fd ref] < 1} {
693 set pfx {ref: refs/heads/}
694 set len [string length $pfx]
695 if {[string equal -length $len $pfx $ref]} {
696 # We're on a branch. It might not exist. But
697 # HEAD looks good enough to be a branch.
699 set current_branch [string range $ref $len end]
702 # Assume this is a detached head.
704 set current_branch HEAD
709 auto_load tk_optionMenu
710 rename tk_optionMenu real__tkOptionMenu
711 proc tk_optionMenu {w varName args} {
712 set m [eval real__tkOptionMenu $w $varName $args]
713 $m configure -font font_ui
714 $w configure -font font_ui
718 proc rmsel_tag {text} {
720 -background [$text cget -background] \
721 -foreground [$text cget -foreground] \
723 $text tag conf in_sel -background lightgray
724 bind $text <Motion> break
730 bind . <Visibility> {
731 bind . <Visibility> {}
736 wm iconbitmap . -default $oguilib/git-gui.ico
737 set ::tk::AlwaysShowSelection 1
738 bind . <Control-F2> {console show}
740 # Spoof an X11 display for SSH
741 if {![info exists env(DISPLAY)]} {
742 set env(DISPLAY) :9999
746 image create photo gitlogo -width 16 -height 16
748 gitlogo put #33CC33 -to 7 0 9 2
749 gitlogo put #33CC33 -to 4 2 12 4
750 gitlogo put #33CC33 -to 7 4 9 6
751 gitlogo put #CC3333 -to 4 6 12 8
752 gitlogo put gray26 -to 4 9 6 10
753 gitlogo put gray26 -to 3 10 6 12
754 gitlogo put gray26 -to 8 9 13 11
755 gitlogo put gray26 -to 8 11 10 12
756 gitlogo put gray26 -to 11 11 13 14
757 gitlogo put gray26 -to 3 12 5 14
758 gitlogo put gray26 -to 5 13
759 gitlogo put gray26 -to 10 13
760 gitlogo put gray26 -to 4 14 12 15
761 gitlogo put gray26 -to 5 15 11 16
764 image create photo gitlogo32 -width 32 -height 32
765 gitlogo32 copy gitlogo -zoom 2 2
767 wm iconphoto . -default gitlogo gitlogo32
771 ######################################################################
777 if {[lsearch -exact [font names] TkDefaultFont] != -1} {
778 eval [linsert [font actual TkDefaultFont] 0 font configure font_ui]
779 eval [linsert [font actual TkFixedFont] 0 font create font_diff]
781 font create font_diff -family Courier -size 10
784 eval font configure font_ui [font actual [.dummy cget -font]]
789 font create font_uiitalic
790 font create font_uibold
791 font create font_diffbold
792 font create font_diffitalic
794 foreach class {Button Checkbutton Entry Label
795 Labelframe Listbox Message
796 Radiobutton Spinbox Text} {
797 option add *$class.font font_ui
800 option add *Menu.font font_ui
801 option add *Entry.borderWidth 1 startupFile
802 option add *Entry.relief sunken startupFile
803 option add *RadioButton.anchor w startupFile
807 if {[is_Windows] || [is_MacOSX]} {
808 option add *Menu.tearOff 0
819 proc bind_button3 {w cmd} {
820 bind $w <Any-Button-3> $cmd
822 # Mac OS X sends Button-2 on right click through three-button mouse,
823 # or through trackpad right-clicking (two-finger touch + click).
824 bind $w <Any-Button-2> $cmd
825 bind $w <Control-Button-1> $cmd
829 proc apply_config {} {
830 global repo_config font_descs
832 foreach option $font_descs {
833 set name [lindex $option 0]
834 set font [lindex $option 1]
837 foreach {cn cv} $repo_config(gui.$name) {
838 if {$cn eq {-weight}} {
841 font configure $font $cn $cv
844 font configure $font -weight normal
847 error_popup [strcat [mc "Invalid font specified
in %s
:" "gui.
$name"] "\n\n$err"]
849 foreach {cn cv} [font configure $font] {
850 font configure ${font}bold $cn $cv
851 font configure ${font}italic $cn $cv
853 font configure ${font}bold -weight bold
854 font configure ${font}italic -slant italic
860 if {$repo_config(gui.usettk)} {
861 set use_ttk [package vsatisfies [package provide Tk] 8.5]
864 bind [winfo class .] <<ThemeChanged>> [list InitTheme]
870 set default_config(branch.autosetupmerge) true
871 set default_config(merge.tool) {}
872 set default_config(mergetool.keepbackup) true
873 set default_config(merge.diffstat) true
874 set default_config(merge.summary) false
875 set default_config(merge.verbosity) 2
876 set default_config(user.name) {}
877 set default_config(user.email) {}
879 set default_config(gui.encoding) [encoding system]
880 set default_config(gui.matchtrackingbranch) false
881 set default_config(gui.textconv) true
882 set default_config(gui.pruneduringfetch) false
883 set default_config(gui.trustmtime) false
884 set default_config(gui.fastcopyblame) false
885 set default_config(gui.maxrecentrepo) 10
886 set default_config(gui.copyblamethreshold) 40
887 set default_config(gui.blamehistoryctx) 7
888 set default_config(gui.diffcontext) 5
889 set default_config(gui.diffopts) {}
890 set default_config(gui.commitmsgwidth) 75
891 set default_config(gui.newbranchtemplate) {}
892 set default_config(gui.spellingdictionary) {}
893 set default_config(gui.fontui) [font configure font_ui]
894 set default_config(gui.fontdiff) [font configure font_diff]
895 # TODO: this option should be added to the git-config documentation
896 set default_config(gui.maxfilesdisplayed) 5000
897 set default_config(gui.usettk) 1
898 set default_config(gui.warndetachedcommit) 1
899 set default_config(gui.tabsize) 8
901 {fontui font_ui {mc "Main Font
"}}
902 {fontdiff font_diff {mc "Diff
/Console Font
"}}
904 set default_config(gui.stageuntracked) ask
905 set default_config(gui.displayuntracked) true
907 ######################################################################
911 set _git [_which git]
913 catch {wm withdraw .}
917 -title [mc "git-gui
: fatal error
"] \
918 -message [mc "Cannot
find git
in PATH.
"]
922 ######################################################################
926 if {[catch {set _git_version [git --version]} err]} {
927 catch {wm withdraw .}
931 -title [mc "git-gui
: fatal error
"] \
932 -message "Cannot determine Git version
:
936 [appname
] requires Git
1.5.0 or later.
"
939 if {![regsub {^git version } $_git_version {} _git_version]} {
940 catch {wm withdraw .}
944 -title [mc "git-gui
: fatal error
"] \
945 -message [strcat [mc "Cannot parse Git version string
:"] "\n\n$_git_version"]
949 proc get_trimmed_version {s} {
951 foreach x [split $s -._] {
952 if {[string is integer -strict $x]} {
960 set _real_git_version $_git_version
961 set _git_version [get_trimmed_version $_git_version]
963 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
964 catch {wm withdraw .}
969 -title "[appname
]: warning
" \
970 -message [mc "Git version cannot be determined.
972 %s claims it is version
'%s'.
974 %s requires
at least Git
1.5.0 or later.
976 Assume
'%s' is version
1.5.0?
977 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
978 set _git_version 1.5.0
983 unset _real_git_version
985 proc git-version {args} {
988 switch [llength $args] {
994 set op [lindex $args 0]
995 set vr [lindex $args 1]
996 set cm [package vcompare $_git_version $vr]
997 return [expr $cm $op 0]
1001 set type [lindex $args 0]
1002 set name [lindex $args 1]
1003 set parm [lindex $args 2]
1004 set body [lindex $args 3]
1006 if {($type ne {proc} && $type ne {method})} {
1007 error "Invalid arguments to git-version
"
1009 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
1010 error "Last arm of
$type $name must be default
"
1013 foreach {op vr cb} [lrange $body 0 end-2] {
1014 if {[git-version $op $vr]} {
1015 return [uplevel [list $type $name $parm $cb]]
1019 return [uplevel [list $type $name $parm [lindex $body end]]]
1023 error "git-version
>= x
"
1029 if {[git-version < 1.5]} {
1030 catch {wm withdraw .}
1034 -title [mc "git-gui
: fatal error
"] \
1035 -message "[appname
] requires Git
1.5.0 or later.
1037 You are using
[git-version
]:
1043 ######################################################################
1045 ## configure our library
1047 set idx [file join $oguilib tclIndex]
1048 if {[catch {set fd [open $idx r]} err]} {
1049 catch {wm withdraw .}
1053 -title [mc "git-gui
: fatal error
"] \
1057 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
1059 while {[gets $fd n] >= 0} {
1060 if {$n ne {} && ![string match #* $n]} {
1072 if {[lsearch -exact $loaded $p] >= 0} continue
1073 source [file join $oguilib $p]
1078 set auto_path [concat [list $oguilib] $auto_path]
1080 unset -nocomplain idx fd
1082 ######################################################################
1084 ## config file parsing
1086 git-version proc _parse_config {arr_name args} {
1093 [list git_read config] \
1095 [list --null --list]]
1096 fconfigure $fd_rc -translation binary -encoding utf-8
1097 set buf [read $fd_rc]
1100 foreach line [split $buf "\
0"] {
1101 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
1102 if {[is_many_config $name]} {
1103 lappend arr($name) $value
1105 set arr($name) $value
1107 } elseif {[regexp {^([^\n]+)$} $line line name]} {
1108 # no value given, but interpreting them as
1109 # boolean will be handled as true
1118 set fd_rc [eval [list git_read config --list] $args]
1119 while {[gets $fd_rc line] >= 0} {
1120 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
1121 if {[is_many_config $name]} {
1122 lappend arr($name) $value
1124 set arr($name) $value
1126 } elseif {[regexp {^([^=]+)$} $line line name]} {
1127 # no value given, but interpreting them as
1128 # boolean will be handled as true
1137 proc load_config {include_global} {
1138 global repo_config global_config system_config default_config
1140 if {$include_global} {
1141 _parse_config system_config --system
1142 _parse_config global_config --global
1144 _parse_config repo_config
1146 foreach name [array names default_config] {
1147 if {[catch {set v $system_config($name)}]} {
1148 set system_config($name) $default_config($name)
1151 foreach name [array names system_config] {
1152 if {[catch {set v $global_config($name)}]} {
1153 set global_config($name) $system_config($name)
1155 if {[catch {set v $repo_config($name)}]} {
1156 set repo_config($name) $system_config($name)
1161 ######################################################################
1163 ## feature option selection
1165 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
1170 if {$subcommand eq {gui.sh}} {
1173 if {$subcommand eq {gui} && [llength $argv] > 0} {
1174 set subcommand [lindex $argv 0]
1175 set argv [lrange $argv 1 end]
1178 enable_option multicommit
1179 enable_option branch
1180 enable_option transport
1183 switch -- $subcommand {
1188 disable_option multicommit
1189 disable_option branch
1190 disable_option transport
1193 enable_option singlecommit
1194 enable_option retcode
1196 disable_option multicommit
1197 disable_option branch
1198 disable_option transport
1200 while {[llength $argv] > 0} {
1201 set a [lindex $argv 0]
1204 enable_option initialamend
1207 enable_option nocommit
1208 enable_option nocommitmsg
1211 disable_option nocommitmsg
1218 set argv [lrange $argv 1 end]
1223 ######################################################################
1225 ## execution environment
1227 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
1229 # Suggest our implementation of askpass, if none is set
1230 if {![info exists env(SSH_ASKPASS)]} {
1231 set env(SSH_ASKPASS) [gitexec git-gui--askpass]
1234 ######################################################################
1240 set _gitdir $env(GIT_DIR)
1244 # beware that from the .git dir this sets _gitdir to .
1245 # and _prefix to the empty string
1246 set _gitdir [git rev-parse --git-dir]
1247 set _prefix [git rev-parse --show-prefix]
1251 choose_repository::pick
1255 # we expand the _gitdir when it's just a single dot (i.e. when we're being
1256 # run from the .git dir itself) lest the routines to find the worktree
1258 if {$_gitdir eq ".
"} {
1262 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1263 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1265 if {![file isdirectory $_gitdir]} {
1266 catch {wm withdraw .}
1267 error_popup [strcat [mc "Git directory not found
:"] "\n\n$_gitdir"]
1270 # _gitdir exists, so try loading the config
1274 # v1.7.0 introduced --show-toplevel to return the canonical work-tree
1275 if {[package vcompare $_git_version 1.7.0] >= 0} {
1276 if { [is_Cygwin] } {
1277 catch {set _gitworktree [exec cygpath --windows [git rev-parse --show-toplevel]]}
1279 set _gitworktree [git rev-parse --show-toplevel]
1282 # try to set work tree from environment, core.worktree or use
1283 # cdup to obtain a relative path to the top of the worktree. If
1284 # run from the top, the ./ prefix ensures normalize expands pwd.
1285 if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {
1286 set _gitworktree [get_config core.worktree]
1287 if {$_gitworktree eq ""} {
1288 set _gitworktree [file normalize ./[git rev-parse --show-cdup]]
1293 if {$_prefix ne {}} {
1294 if {$_gitworktree eq {}} {
1295 regsub -all {[^/]+/} $_prefix ../ cdup
1297 set cdup $_gitworktree
1299 if {[catch {cd $cdup} err]} {
1300 catch {wm withdraw .}
1301 error_popup [strcat [mc "Cannot move to top of working directory
:"] "\n\n$err"]
1304 set _gitworktree [pwd]
1306 } elseif {![is_enabled bare]} {
1308 catch {wm withdraw .}
1309 error_popup [strcat [mc "Cannot use bare repository
:"] "\n\n$_gitdir"]
1312 if {$_gitworktree eq {}} {
1313 set _gitworktree [file dirname $_gitdir]
1315 if {[catch {cd $_gitworktree} err]} {
1316 catch {wm withdraw .}
1317 error_popup [strcat [mc "No working directory
"] " $_gitworktree:\n\n$err"]
1320 set _gitworktree [pwd]
1322 set _reponame [file split [file normalize $_gitdir]]
1323 if {[lindex $_reponame end] eq {.git}} {
1324 set _reponame [lindex $_reponame end-1]
1326 set _reponame [lindex $_reponame end]
1329 set env(GIT_DIR) $_gitdir
1330 set env(GIT_WORK_TREE) $_gitworktree
1332 ######################################################################
1336 set current_diff_path {}
1337 set current_diff_side {}
1338 set diff_actions [list]
1342 set MERGE_HEAD [list]
1345 set current_branch {}
1347 set current_diff_path {}
1349 set is_submodule_diff 0
1350 set is_conflict_diff 0
1351 set selected_commit_type new
1352 set diff_empty_count 0
1354 set nullid "0000000000000000000000000000000000000000"
1355 set nullid2 "0000000000000000000000000000000000000001"
1357 ######################################################################
1365 set disable_on_lock [list]
1366 set index_lock_type none
1368 proc lock_index {type} {
1369 global index_lock_type disable_on_lock
1371 if {$index_lock_type eq {none}} {
1372 set index_lock_type $type
1373 foreach w $disable_on_lock {
1374 uplevel #0 $w disabled
1377 } elseif {$index_lock_type eq "begin-
$type"} {
1378 set index_lock_type $type
1384 proc unlock_index {} {
1385 global index_lock_type disable_on_lock
1387 set index_lock_type none
1388 foreach w $disable_on_lock {
1389 uplevel #0 $w normal
1393 ######################################################################
1397 proc repository_state {ctvar hdvar mhvar} {
1398 global current_branch
1399 upvar $ctvar ct $hdvar hd $mhvar mh
1404 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1410 set merge_head [gitdir MERGE_HEAD]
1411 if {[file exists $merge_head]} {
1413 set fd_mh [open $merge_head r]
1414 while {[gets $fd_mh line] >= 0} {
1425 global PARENT empty_tree
1427 set p [lindex $PARENT 0]
1431 if {$empty_tree eq {}} {
1432 set empty_tree [git mktree << {}]
1437 proc force_amend {} {
1438 global selected_commit_type
1439 global HEAD PARENT MERGE_HEAD commit_type
1441 repository_state newType newHEAD newMERGE_HEAD
1444 set MERGE_HEAD $newMERGE_HEAD
1445 set commit_type $newType
1447 set selected_commit_type amend
1448 do_select_commit_type
1451 proc rescan {after {honor_trustmtime 1}} {
1452 global HEAD PARENT MERGE_HEAD commit_type
1453 global ui_index ui_workdir ui_comm
1454 global rescan_active file_states
1457 if {$rescan_active > 0 || ![lock_index read]} return
1459 repository_state newType newHEAD newMERGE_HEAD
1460 if {[string match amend* $commit_type]
1461 && $newType eq {normal}
1462 && $newHEAD eq $HEAD} {
1466 set MERGE_HEAD $newMERGE_HEAD
1467 set commit_type $newType
1470 array unset file_states
1472 if {!$::GITGUI_BCK_exists &&
1473 (![$ui_comm edit modified]
1474 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1475 if {[string match amend* $commit_type]} {
1476 } elseif {[load_message GITGUI_MSG utf-8]} {
1477 } elseif {[run_prepare_commit_msg_hook]} {
1478 } elseif {[load_message MERGE_MSG]} {
1479 } elseif {[load_message SQUASH_MSG]} {
1482 $ui_comm edit modified false
1485 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1486 rescan_stage2 {} $after
1489 ui_status [mc "Refreshing
file status...
"]
1490 set fd_rf [git_read update-index \
1496 fconfigure $fd_rf -blocking 0 -translation binary
1497 fileevent $fd_rf readable \
1498 [list rescan_stage2 $fd_rf $after]
1503 set is_git_info_exclude {}
1504 proc have_info_exclude {} {
1505 global is_git_info_exclude
1507 if {$is_git_info_exclude eq {}} {
1508 if {[catch {exec test -f [gitdir info exclude]}]} {
1509 set is_git_info_exclude 0
1511 set is_git_info_exclude 1
1514 return $is_git_info_exclude
1517 proc have_info_exclude {} {
1518 return [file readable [gitdir info exclude]]
1522 proc rescan_stage2 {fd after} {
1523 global rescan_active buf_rdi buf_rdf buf_rlo
1527 if {![eof $fd]} return
1531 if {[package vcompare $::_git_version 1.6.3] >= 0} {
1532 set ls_others [list --exclude-standard]
1534 set ls_others [list --exclude-per-directory=.gitignore]
1535 if {[have_info_exclude]} {
1536 lappend ls_others "--exclude-from
=[gitdir info exclude
]"
1538 set user_exclude [get_config core.excludesfile]
1539 if {$user_exclude ne {} && [file readable $user_exclude]} {
1540 lappend ls_others "--exclude-from
=[file normalize
$user_exclude]"
1549 ui_status [mc "Scanning
for modified files ...
"]
1550 if {[git-version >= "1.7.2"]} {
1551 set fd_di [git_read diff-index --cached --ignore-submodules=dirty -z [PARENT]]
1553 set fd_di [git_read diff-index --cached -z [PARENT]]
1555 set fd_df [git_read diff-files -z]
1557 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1558 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1560 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1561 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1563 if {[is_config_true gui.displayuntracked]} {
1564 set fd_lo [eval git_read ls-files --others -z $ls_others]
1565 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1566 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1571 proc load_message {file {encoding {}}} {
1574 set f [gitdir $file]
1575 if {[file isfile $f]} {
1576 if {[catch {set fd [open $f r]}]} {
1579 fconfigure $fd -eofchar {}
1580 if {$encoding ne {}} {
1581 fconfigure $fd -encoding $encoding
1583 set content [string trim [read $fd]]
1585 regsub -all -line {[ \r\t]+$} $content {} content
1586 $ui_comm delete 0.0 end
1587 $ui_comm insert end $content
1593 proc run_prepare_commit_msg_hook {} {
1596 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1597 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1598 # empty file but existent file.
1600 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1602 if {[file isfile [gitdir MERGE_MSG]]} {
1603 set pcm_source "merge
"
1604 set fd_mm [open [gitdir MERGE_MSG] r]
1605 fconfigure $fd_mm -encoding utf-8
1606 puts -nonewline $fd_pcm [read $fd_mm]
1608 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1609 set pcm_source "squash
"
1610 set fd_sm [open [gitdir SQUASH_MSG] r]
1611 fconfigure $fd_sm -encoding utf-8
1612 puts -nonewline $fd_pcm [read $fd_sm]
1620 set fd_ph [githook_read prepare-commit-msg \
1621 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1623 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1627 ui_status [mc "Calling prepare-commit-msg hook...
"]
1630 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1631 fileevent $fd_ph readable \
1632 [list prepare_commit_msg_hook_wait $fd_ph]
1637 proc prepare_commit_msg_hook_wait {fd_ph} {
1640 append pch_error [read $fd_ph]
1641 fconfigure $fd_ph -blocking 1
1643 if {[catch {close $fd_ph}]} {
1644 ui_status [mc "Commit declined by prepare-commit-msg hook.
"]
1645 hook_failed_popup prepare-commit-msg $pch_error
1646 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1649 load_message PREPARE_COMMIT_MSG
1652 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1655 fconfigure $fd_ph -blocking 0
1656 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1659 proc read_diff_index {fd after} {
1662 append buf_rdi [read $fd]
1664 set n [string length $buf_rdi]
1666 set z1 [string first "\
0" $buf_rdi $c]
1667 if {$z1 == -1} break
1669 set z2 [string first "\
0" $buf_rdi $z1]
1670 if {$z2 == -1} break
1673 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1674 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1676 [encoding convertfrom utf-8 $p] \
1678 [list [lindex $i 0] [lindex $i 2]] \
1684 set buf_rdi [string range $buf_rdi $c end]
1689 rescan_done $fd buf_rdi $after
1692 proc read_diff_files {fd after} {
1695 append buf_rdf [read $fd]
1697 set n [string length $buf_rdf]
1699 set z1 [string first "\
0" $buf_rdf $c]
1700 if {$z1 == -1} break
1702 set z2 [string first "\
0" $buf_rdf $z1]
1703 if {$z2 == -1} break
1706 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1707 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1709 [encoding convertfrom utf-8 $p] \
1712 [list [lindex $i 0] [lindex $i 2]]
1717 set buf_rdf [string range $buf_rdf $c end]
1722 rescan_done $fd buf_rdf $after
1725 proc read_ls_others {fd after} {
1728 append buf_rlo [read $fd]
1729 set pck [split $buf_rlo "\
0"]
1730 set buf_rlo [lindex $pck end]
1731 foreach p [lrange $pck 0 end-1] {
1732 set p [encoding convertfrom utf-8 $p]
1733 if {[string index $p end] eq {/}} {
1734 set p [string range $p 0 end-1]
1738 rescan_done $fd buf_rlo $after
1741 proc rescan_done {fd buf after} {
1742 global rescan_active current_diff_path
1743 global file_states repo_config
1746 if {![eof $fd]} return
1749 if {[incr rescan_active -1] > 0} return
1754 if {$current_diff_path ne {}} { reshow_diff $after }
1755 if {$current_diff_path eq {}} { select_first_diff $after }
1758 proc prune_selection {} {
1759 global file_states selected_paths
1761 foreach path [array names selected_paths] {
1762 if {[catch {set still_here $file_states($path)}]} {
1763 unset selected_paths($path)
1768 ######################################################################
1772 proc mapicon {w state path} {
1775 if {[catch {set r $all_icons($state$w)}]} {
1776 puts "error
: no icon
for $w state
={$state} $path"
1782 proc mapdesc {state path} {
1785 if {[catch {set r $all_descs($state)}]} {
1786 puts "error
: no desc
for state
={$state} $path"
1792 proc ui_status {msg} {
1794 if {[info exists main_status]} {
1795 $main_status show $msg
1799 proc ui_ready {{test {}}} {
1801 if {[info exists main_status]} {
1802 $main_status show [mc "Ready.
"] $test
1806 proc escape_path {path} {
1807 regsub -all {\\} $path "\\\\" path
1808 regsub -all "\n" $path "\\n
" path
1812 proc short_path {path} {
1813 return [escape_path [lindex [file split $path] end]]
1817 set null_sha1 [string repeat 0 40]
1819 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1820 global file_states next_icon_id null_sha1
1822 set s0 [string index $new_state 0]
1823 set s1 [string index $new_state 1]
1825 if {[catch {set info $file_states($path)}]} {
1827 set icon n[incr next_icon_id]
1829 set state [lindex $info 0]
1830 set icon [lindex $info 1]
1831 if {$head_info eq {}} {set head_info [lindex $info 2]}
1832 if {$index_info eq {}} {set index_info [lindex $info 3]}
1835 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1836 elseif {$s0 eq {_}} {set s0 _}
1838 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1839 elseif {$s1 eq {_}} {set s1 _}
1841 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1842 set head_info [list 0 $null_sha1]
1843 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1844 && $head_info eq {}} {
1845 set head_info $index_info
1846 } elseif {$s0 eq {_} && [string index $state 0] ne {_}} {
1847 set index_info $head_info
1851 set file_states($path) [list $s0$s1 $icon \
1852 $head_info $index_info \
1857 proc display_file_helper {w path icon_name old_m new_m} {
1860 if {$new_m eq {_}} {
1861 set lno [lsearch -sorted -exact $file_lists($w) $path]
1863 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1865 $w conf -state normal
1866 $w delete $lno.0 [expr {$lno + 1}].0
1867 $w conf -state disabled
1869 } elseif {$old_m eq {_} && $new_m ne {_}} {
1870 lappend file_lists($w) $path
1871 set file_lists($w) [lsort -unique $file_lists($w)]
1872 set lno [lsearch -sorted -exact $file_lists($w) $path]
1874 $w conf -state normal
1875 $w image create $lno.0 \
1876 -align center -padx 5 -pady 1 \
1878 -image [mapicon $w $new_m $path]
1879 $w insert $lno.1 "[escape_path
$path]\n"
1880 $w conf -state disabled
1881 } elseif {$old_m ne $new_m} {
1882 $w conf -state normal
1883 $w image conf $icon_name -image [mapicon $w $new_m $path]
1884 $w conf -state disabled
1888 proc display_file {path state} {
1889 global file_states selected_paths
1890 global ui_index ui_workdir
1892 set old_m [merge_state $path $state]
1893 set s $file_states($path)
1894 set new_m [lindex $s 0]
1895 set icon_name [lindex $s 1]
1897 set o [string index $old_m 0]
1898 set n [string index $new_m 0]
1905 display_file_helper $ui_index $path $icon_name $o $n
1907 if {[string index $old_m 0] eq {U}} {
1910 set o [string index $old_m 1]
1912 if {[string index $new_m 0] eq {U}} {
1915 set n [string index $new_m 1]
1917 display_file_helper $ui_workdir $path $icon_name $o $n
1919 if {$new_m eq {__}} {
1920 unset file_states($path)
1921 catch {unset selected_paths($path)}
1925 proc display_all_files_helper {w path icon_name m} {
1928 lappend file_lists($w) $path
1929 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1930 $w image create end \
1931 -align center -padx 5 -pady 1 \
1933 -image [mapicon $w $m $path]
1934 $w insert end "[escape_path
$path]\n"
1938 proc display_all_files {} {
1939 global ui_index ui_workdir
1940 global file_states file_lists
1942 global files_warning
1944 $ui_index conf -state normal
1945 $ui_workdir conf -state normal
1947 $ui_index delete 0.0 end
1948 $ui_workdir delete 0.0 end
1951 set file_lists($ui_index) [list]
1952 set file_lists($ui_workdir) [list]
1954 set to_display [lsort [array names file_states]]
1955 set display_limit [get_config gui.maxfilesdisplayed]
1957 foreach path $to_display {
1958 set s $file_states($path)
1960 set icon_name [lindex $s 1]
1962 if {$displayed > $display_limit && [string index $m 1] eq {O} } {
1963 if {!$files_warning} {
1964 # do not repeatedly warn:
1966 info_popup [mc "Display limit
(gui.maxfilesdisplayed
= %s
) reached
, not showing all
%s files.
" \
1967 $display_limit [llength $to_display]]
1972 set s [string index $m 0]
1973 if {$s ne {U} && $s ne {_}} {
1974 display_all_files_helper $ui_index $path \
1978 if {[string index $m 0] eq {U}} {
1981 set s [string index $m 1]
1984 display_all_files_helper $ui_workdir $path \
1990 $ui_index conf -state disabled
1991 $ui_workdir conf -state disabled
1994 ######################################################################
1999 #define mask_width 14
2000 #define mask_height 15
2001 static unsigned char mask_bits[] = {
2002 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2003 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2004 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2007 image create bitmap file_plain -background white -foreground black -data {
2008 #define plain_width 14
2009 #define plain_height 15
2010 static unsigned char plain_bits[] = {
2011 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2012 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2013 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2014 } -maskdata $filemask
2016 image create bitmap file_mod -background white -foreground blue -data {
2017 #define mod_width 14
2018 #define mod_height 15
2019 static unsigned char mod_bits[] = {
2020 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2021 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2022 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2023 } -maskdata $filemask
2025 image create bitmap file_fulltick -background white -foreground "#007000" -data {
2026 #define file_fulltick_width 14
2027 #define file_fulltick_height 15
2028 static unsigned char file_fulltick_bits
[] = {
2029 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2030 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2031 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2032 } -maskdata
$filemask
2034 image create bitmap file_question
-background white
-foreground black
-data
{
2035 #define file_question_width 14
2036 #define file_question_height 15
2037 static unsigned char file_question_bits
[] = {
2038 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2039 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2040 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2041 } -maskdata
$filemask
2043 image create bitmap file_removed
-background white
-foreground red
-data
{
2044 #define file_removed_width 14
2045 #define file_removed_height 15
2046 static unsigned char file_removed_bits
[] = {
2047 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2048 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2049 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2050 } -maskdata
$filemask
2052 image create bitmap file_merge
-background white
-foreground blue
-data
{
2053 #define file_merge_width 14
2054 #define file_merge_height 15
2055 static unsigned char file_merge_bits
[] = {
2056 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2057 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2058 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2059 } -maskdata
$filemask
2061 image create bitmap file_statechange
-background white
-foreground green
-data
{
2062 #define file_statechange_width 14
2063 #define file_statechange_height 15
2064 static unsigned char file_statechange_bits
[] = {
2065 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
2066 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
2067 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2068 } -maskdata
$filemask
2070 set ui_index .vpane.files.index.list
2071 set ui_workdir .vpane.files.workdir.list
2073 set all_icons
(_
$ui_index) file_plain
2074 set all_icons
(A
$ui_index) file_plain
2075 set all_icons
(M
$ui_index) file_fulltick
2076 set all_icons
(D
$ui_index) file_removed
2077 set all_icons
(U
$ui_index) file_merge
2078 set all_icons
(T
$ui_index) file_statechange
2080 set all_icons
(_
$ui_workdir) file_plain
2081 set all_icons
(M
$ui_workdir) file_mod
2082 set all_icons
(D
$ui_workdir) file_question
2083 set all_icons
(U
$ui_workdir) file_merge
2084 set all_icons
(O
$ui_workdir) file_plain
2085 set all_icons
(T
$ui_workdir) file_statechange
2087 set max_status_desc
0
2089 {__
{mc
"Unmodified"}}
2091 {_M
{mc
"Modified, not staged"}}
2092 {M_
{mc
"Staged for commit"}}
2093 {MM
{mc
"Portions staged for commit"}}
2094 {MD
{mc
"Staged for commit, missing"}}
2096 {_T
{mc
"File type changed, not staged"}}
2097 {MT
{mc
"File type changed, old type staged for commit"}}
2098 {AT
{mc
"File type changed, old type staged for commit"}}
2099 {T_
{mc
"File type changed, staged"}}
2100 {TM
{mc
"File type change staged, modification not staged"}}
2101 {TD
{mc
"File type change staged, file missing"}}
2103 {_O
{mc
"Untracked, not staged"}}
2104 {A_
{mc
"Staged for commit"}}
2105 {AM
{mc
"Portions staged for commit"}}
2106 {AD
{mc
"Staged for commit, missing"}}
2109 {D_
{mc
"Staged for removal"}}
2110 {DO
{mc
"Staged for removal, still present"}}
2112 {_U
{mc
"Requires merge resolution"}}
2113 {U_
{mc
"Requires merge resolution"}}
2114 {UU
{mc
"Requires merge resolution"}}
2115 {UM
{mc
"Requires merge resolution"}}
2116 {UD
{mc
"Requires merge resolution"}}
2117 {UT
{mc
"Requires merge resolution"}}
2119 set text
[eval [lindex
$i 1]]
2120 if {$max_status_desc < [string length
$text]} {
2121 set max_status_desc
[string length
$text]
2123 set all_descs
([lindex
$i 0]) $text
2127 ######################################################################
2131 proc scrollbar2many
{list mode args
} {
2132 foreach w
$list {eval $w $mode $args}
2135 proc many2scrollbar
{list mode sb top bottom
} {
2136 $sb set $top $bottom
2137 foreach w
$list {$w $mode moveto
$top}
2140 proc incr_font_size
{font
{amt
1}} {
2141 set sz
[font configure
$font -size
]
2143 font configure
$font -size
$sz
2144 font configure
${font}bold
-size
$sz
2145 font configure
${font}italic
-size
$sz
2148 ######################################################################
2152 set starting_gitk_msg
[mc
"Starting gitk... please wait..."]
2154 proc do_gitk
{revs
{is_submodule false
}} {
2155 global current_diff_path file_states current_diff_side ui_index
2156 global _gitdir _gitworktree
2158 # -- Always start gitk through whatever we were loaded with. This
2159 # lets us bypass using shell process on Windows systems.
2161 set exe
[_which gitk
-script]
2162 set cmd
[list
[info nameofexecutable
] $exe]
2164 error_popup
[mc
"Couldn't find gitk in PATH"]
2170 if {!$is_submodule} {
2175 cd $current_diff_path
2176 if {$revs eq
{--}} {
2177 set s
$file_states($current_diff_path)
2180 switch
-glob
-- [lindex
$s 0] {
2181 M_
{ set old_sha1
[lindex
[lindex
$s 2] 1] }
2182 _M
{ set old_sha1
[lindex
[lindex
$s 3] 1] }
2184 if {$current_diff_side eq
$ui_index} {
2185 set old_sha1
[lindex
[lindex
$s 2] 1]
2186 set new_sha1
[lindex
[lindex
$s 3] 1]
2188 set old_sha1
[lindex
[lindex
$s 3] 1]
2192 set revs
$old_sha1...
$new_sha1
2194 # GIT_DIR and GIT_WORK_TREE for the submodule are not the ones
2195 # we've been using for the main repository, so unset them.
2196 # TODO we could make life easier (start up faster?) for gitk
2197 # by setting these to the appropriate values to allow gitk
2198 # to skip the heuristics to find their proper value
2200 unset env
(GIT_WORK_TREE
)
2202 eval exec $cmd $revs "--" "--" &
2204 set env
(GIT_DIR
) $_gitdir
2205 set env
(GIT_WORK_TREE
) $_gitworktree
2208 ui_status $
::starting_gitk_msg
2210 ui_ready
$starting_gitk_msg
2215 proc do_git_gui
{} {
2216 global current_diff_path
2218 # -- Always start git gui through whatever we were loaded with. This
2219 # lets us bypass using shell process on Windows systems.
2221 set exe
[list
[_which git
]]
2223 error_popup
[mc
"Couldn't find git gui in PATH"]
2226 global _gitdir _gitworktree
2228 # see note in do_gitk about unsetting these vars when
2229 # running tools in a submodule
2231 unset env
(GIT_WORK_TREE
)
2234 cd $current_diff_path
2236 eval exec $exe gui
&
2238 set env
(GIT_DIR
) $_gitdir
2239 set env
(GIT_WORK_TREE
) $_gitworktree
2242 ui_status $
::starting_gitk_msg
2244 ui_ready
$starting_gitk_msg
2249 proc do_explore
{} {
2252 if {[is_Cygwin
] ||
[is_Windows
]} {
2253 set explorer
"explorer.exe"
2254 } elseif
{[is_MacOSX
]} {
2257 # freedesktop.org-conforming system is our best shot
2258 set explorer
"xdg-open"
2260 eval exec $explorer [list
[file nativename
$_gitworktree]] &
2266 proc terminate_me
{win
} {
2268 if {$win ne
{.
}} return
2272 proc do_quit
{{rc
{1}}} {
2273 global ui_comm is_quitting repo_config commit_type
2274 global GITGUI_BCK_exists GITGUI_BCK_i
2275 global ui_comm_spell
2276 global ret_code use_ttk
2278 if {$is_quitting} return
2281 if {[winfo exists
$ui_comm]} {
2282 # -- Stash our current commit buffer.
2284 set save
[gitdir GITGUI_MSG
]
2285 if {$GITGUI_BCK_exists && ![$ui_comm edit modified
]} {
2286 file rename
-force
[gitdir GITGUI_BCK
] $save
2287 set GITGUI_BCK_exists
0
2289 set msg
[string trim
[$ui_comm get
0.0 end
]]
2290 regsub
-all
-line
{[ \r\t]+$
} $msg {} msg
2291 if {(![string match amend
* $commit_type]
2292 ||
[$ui_comm edit modified
])
2295 set fd
[open
$save w
]
2296 fconfigure
$fd -encoding utf-8
2297 puts
-nonewline
$fd $msg
2301 catch
{file delete
$save}
2305 # -- Cancel our spellchecker if its running.
2307 if {[info exists ui_comm_spell
]} {
2311 # -- Remove our editor backup, its not needed.
2313 after cancel
$GITGUI_BCK_i
2314 if {$GITGUI_BCK_exists} {
2315 catch
{file delete
[gitdir GITGUI_BCK
]}
2318 # -- Stash our current window geometry into this repository.
2320 set cfg_wmstate
[wm state .
]
2321 if {[catch
{set rc_wmstate
$repo_config(gui.wmstate
)}]} {
2324 if {$cfg_wmstate ne
$rc_wmstate} {
2325 catch
{git config gui.wmstate
$cfg_wmstate}
2327 if {$cfg_wmstate eq
{zoomed
}} {
2328 # on Windows wm geometry will lie about window
2329 # position (but not size) when window is zoomed
2330 # restore the window before querying wm geometry
2333 set cfg_geometry
[list
]
2334 lappend cfg_geometry
[wm geometry .
]
2336 lappend cfg_geometry
[.vpane sashpos
0]
2337 lappend cfg_geometry
[.vpane.files sashpos
0]
2339 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 0]
2340 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 1]
2342 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
2345 if {$cfg_geometry ne
$rc_geometry} {
2346 catch
{git config gui.geometry
$cfg_geometry}
2352 # Briefly enable send again, working around Tk bug
2353 # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
2354 tk appname
[appname
]
2363 proc ui_do_rescan
{} {
2364 rescan
{force_first_diff ui_ready
}
2371 proc next_diff
{{after
{}}} {
2372 global next_diff_p next_diff_w next_diff_i
2373 show_diff
$next_diff_p $next_diff_w {} {} $after
2376 proc find_anchor_pos
{lst name
} {
2377 set lid
[lsearch
-sorted
-exact
$lst $name]
2381 foreach lname
$lst {
2382 if {$lname >= $name} break
2390 proc find_file_from
{flist idx delta path mmask
} {
2393 set len
[llength
$flist]
2394 while {$idx >= 0 && $idx < $len} {
2395 set name
[lindex
$flist $idx]
2397 if {$name ne
$path && [info exists file_states
($name)]} {
2398 set state
[lindex
$file_states($name) 0]
2400 if {$mmask eq
{} ||
[regexp
$mmask $state]} {
2411 proc find_next_diff
{w path
{lno
{}} {mmask
{}}} {
2412 global next_diff_p next_diff_w next_diff_i
2413 global file_lists ui_index ui_workdir
2415 set flist
$file_lists($w)
2417 set lno
[find_anchor_pos
$flist $path]
2422 if {$mmask ne
{} && ![regexp
{(^\^
)|
(\$$
)} $mmask]} {
2423 if {$w eq
$ui_index} {
2426 set mmask
"$mmask\$"
2430 set idx
[find_file_from
$flist $lno 1 $path $mmask]
2433 set idx
[find_file_from
$flist $lno -1 $path $mmask]
2438 set next_diff_p
[lindex
$flist $idx]
2439 set next_diff_i
[expr {$idx+1}]
2446 proc next_diff_after_action
{w path
{lno
{}} {mmask
{}}} {
2447 global current_diff_path
2449 if {$path ne
$current_diff_path} {
2451 } elseif
{[find_next_diff
$w $path $lno $mmask]} {
2454 return {reshow_diff
;}
2458 proc select_first_diff
{after
} {
2461 if {[find_next_diff
$ui_workdir {} 1 {^_?U
}] ||
2462 [find_next_diff
$ui_workdir {} 1 {[^O
]$
}]} {
2469 proc force_first_diff
{after
} {
2470 global ui_workdir current_diff_path file_states
2472 if {[info exists file_states
($current_diff_path)]} {
2473 set state
[lindex
$file_states($current_diff_path) 0]
2479 if {[string first
{U
} $state] >= 0} {
2480 # Already a conflict, do nothing
2481 } elseif
{[find_next_diff
$ui_workdir $current_diff_path {} {^_?U
}]} {
2483 } elseif
{[string index
$state 1] ne
{O
}} {
2484 # Already a diff & no conflicts, do nothing
2485 } elseif
{[find_next_diff
$ui_workdir $current_diff_path {} {[^O
]$
}]} {
2496 proc toggle_or_diff
{mode w args
} {
2497 global file_states file_lists current_diff_path ui_index ui_workdir
2498 global last_clicked selected_paths
2500 if {$mode eq
"click"} {
2501 foreach
{x y
} $args break
2502 set pos
[split [$w index @
$x,$y] .
]
2503 foreach
{lno
col} $pos break
2505 if {$mode eq
"toggle"} {
2506 if {$w eq
$ui_workdir} {
2511 if {$w eq
$ui_index} {
2512 do_unstage_selection
2518 if {$last_clicked ne
{}} {
2519 set lno
[lindex
$last_clicked 1]
2521 if {![info exists file_lists
]
2522 ||
![info exists file_lists
($w)]
2523 ||
[llength
$file_lists($w)] == 0} {
2527 set lno
[expr {int
([lindex
[$w tag ranges in_diff
] 0])}]
2529 if {$mode eq
"toggle"} {
2532 incr lno
[expr {$mode eq
"up" ?
-1 : 1}]
2537 if {![info exists file_lists
]
2538 ||
![info exists file_lists
($w)]
2539 ||
[llength
$file_lists($w)] < $lno - 1} {
2542 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2549 set last_clicked
[list
$w $lno]
2551 array
unset selected_paths
2552 $ui_index tag remove in_sel
0.0 end
2553 $ui_workdir tag remove in_sel
0.0 end
2555 # Determine the state of the file
2556 if {[info exists file_states
($path)]} {
2557 set state
[lindex
$file_states($path) 0]
2562 # Restage the file, or simply show the diff
2563 if {$col == 0 && $y > 1} {
2564 # Conflicts need special handling
2565 if {[string first
{U
} $state] >= 0} {
2566 # $w must always be $ui_workdir, but...
2567 if {$w ne
$ui_workdir} { set lno
{} }
2568 merge_stage_workdir
$path $lno
2572 if {[string index
$state 1] eq
{O
}} {
2578 set after
[next_diff_after_action
$w $path $lno $mmask]
2580 if {$w eq
$ui_index} {
2582 "Unstaging [short_path $path] from commit" \
2584 [concat
$after [list ui_ready
]]
2585 } elseif
{$w eq
$ui_workdir} {
2587 "Adding [short_path $path]" \
2589 [concat
$after [list ui_ready
]]
2592 set selected_paths
($path) 1
2593 show_diff
$path $w $lno
2597 proc add_one_to_selection
{w x y
} {
2598 global file_lists last_clicked selected_paths
2600 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2601 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2607 if {$last_clicked ne
{}
2608 && [lindex
$last_clicked 0] ne
$w} {
2609 array
unset selected_paths
2610 [lindex
$last_clicked 0] tag remove in_sel
0.0 end
2613 set last_clicked
[list
$w $lno]
2614 if {[catch
{set in_sel
$selected_paths($path)}]} {
2618 unset selected_paths
($path)
2619 $w tag remove in_sel
$lno.0 [expr {$lno + 1}].0
2621 set selected_paths
($path) 1
2622 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
2626 proc add_range_to_selection
{w x y
} {
2627 global file_lists last_clicked selected_paths
2629 if {[lindex
$last_clicked 0] ne
$w} {
2630 toggle_or_diff click
$w $x $y
2634 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2635 set lc
[lindex
$last_clicked 1]
2644 foreach path
[lrange
$file_lists($w) \
2645 [expr {$begin - 1}] \
2646 [expr {$end - 1}]] {
2647 set selected_paths
($path) 1
2649 $w tag add in_sel
$begin.0 [expr {$end + 1}].0
2652 proc show_more_context
{} {
2654 if {$repo_config(gui.diffcontext
) < 99} {
2655 incr repo_config
(gui.diffcontext
)
2660 proc show_less_context
{} {
2662 if {$repo_config(gui.diffcontext
) > 1} {
2663 incr repo_config
(gui.diffcontext
) -1
2668 ######################################################################
2676 menu .mbar
-tearoff
0
2678 # -- Apple Menu (Mac OS X only)
2680 .mbar add cascade
-label Apple
-menu .mbar.apple
2683 .mbar add cascade
-label
[mc Repository
] -menu .mbar.repository
2684 .mbar add cascade
-label
[mc Edit
] -menu .mbar.edit
2685 if {[is_enabled branch
]} {
2686 .mbar add cascade
-label
[mc Branch
] -menu .mbar.branch
2688 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2689 .mbar add cascade
-label
[mc Commit@@noun
] -menu .mbar.commit
2691 if {[is_enabled transport
]} {
2692 .mbar add cascade
-label
[mc Merge
] -menu .mbar.merge
2693 .mbar add cascade
-label
[mc Remote
] -menu .mbar.remote
2695 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2696 .mbar add cascade
-label
[mc Tools
] -menu .mbar.tools
2699 # -- Repository Menu
2701 menu .mbar.repository
2704 .mbar.repository add
command \
2705 -label
[mc
"Explore Working Copy"] \
2706 -command {do_explore
}
2710 .mbar.repository add
command \
2711 -label
[mc
"Git Bash"] \
2712 -command {eval exec [auto_execok start
] \
2713 [list
"Git Bash" bash
--login
-l
&]}
2716 if {[is_Windows
] ||
![is_bare
]} {
2717 .mbar.repository add separator
2720 .mbar.repository add
command \
2721 -label
[mc
"Browse Current Branch's Files"] \
2722 -command {browser
::new
$current_branch}
2723 set ui_browse_current
[.mbar.repository index last
]
2724 .mbar.repository add
command \
2725 -label
[mc
"Browse Branch Files..."] \
2726 -command browser_open
::dialog
2727 .mbar.repository add separator
2729 .mbar.repository add
command \
2730 -label
[mc
"Visualize Current Branch's History"] \
2731 -command {do_gitk
$current_branch}
2732 set ui_visualize_current
[.mbar.repository index last
]
2733 .mbar.repository add
command \
2734 -label
[mc
"Visualize All Branch History"] \
2735 -command {do_gitk
--all
}
2736 .mbar.repository add separator
2738 proc current_branch_write
{args
} {
2739 global current_branch
2740 .mbar.repository entryconf $
::ui_browse_current \
2741 -label
[mc
"Browse %s's Files" $current_branch]
2742 .mbar.repository entryconf $
::ui_visualize_current \
2743 -label
[mc
"Visualize %s's History" $current_branch]
2745 trace add variable current_branch
write current_branch_write
2747 if {[is_enabled multicommit
]} {
2748 .mbar.repository add
command -label
[mc
"Database Statistics"] \
2751 .mbar.repository add
command -label
[mc
"Compress Database"] \
2754 .mbar.repository add
command -label
[mc
"Verify Database"] \
2755 -command do_fsck_objects
2757 .mbar.repository add separator
2760 .mbar.repository add
command \
2761 -label
[mc
"Create Desktop Icon"] \
2762 -command do_cygwin_shortcut
2763 } elseif
{[is_Windows
]} {
2764 .mbar.repository add
command \
2765 -label
[mc
"Create Desktop Icon"] \
2766 -command do_windows_shortcut
2767 } elseif
{[is_MacOSX
]} {
2768 .mbar.repository add
command \
2769 -label
[mc
"Create Desktop Icon"] \
2770 -command do_macosx_app
2775 proc
::tk
::mac
::Quit
{args
} { do_quit
}
2777 .mbar.repository add
command -label
[mc Quit
] \
2785 .mbar.edit add
command -label
[mc Undo
] \
2786 -command {catch
{[focus
] edit undo
}} \
2788 .mbar.edit add
command -label
[mc Redo
] \
2789 -command {catch
{[focus
] edit redo
}} \
2791 .mbar.edit add separator
2792 .mbar.edit add
command -label
[mc Cut
] \
2793 -command {catch
{tk_textCut
[focus
]}} \
2795 .mbar.edit add
command -label
[mc Copy
] \
2796 -command {catch
{tk_textCopy
[focus
]}} \
2798 .mbar.edit add
command -label
[mc Paste
] \
2799 -command {catch
{tk_textPaste
[focus
]; [focus
] see insert
}} \
2801 .mbar.edit add
command -label
[mc Delete
] \
2802 -command {catch
{[focus
] delete sel.first sel.last
}} \
2804 .mbar.edit add separator
2805 .mbar.edit add
command -label
[mc
"Select All"] \
2806 -command {catch
{[focus
] tag add sel
0.0 end
}} \
2811 if {[is_enabled branch
]} {
2814 .mbar.branch add
command -label
[mc
"Create..."] \
2815 -command branch_create
::dialog \
2817 lappend disable_on_lock
[list .mbar.branch entryconf \
2818 [.mbar.branch index last
] -state
]
2820 .mbar.branch add
command -label
[mc
"Checkout..."] \
2821 -command branch_checkout
::dialog \
2823 lappend disable_on_lock
[list .mbar.branch entryconf \
2824 [.mbar.branch index last
] -state
]
2826 .mbar.branch add
command -label
[mc
"Rename..."] \
2827 -command branch_rename
::dialog
2828 lappend disable_on_lock
[list .mbar.branch entryconf \
2829 [.mbar.branch index last
] -state
]
2831 .mbar.branch add
command -label
[mc
"Delete..."] \
2832 -command branch_delete
::dialog
2833 lappend disable_on_lock
[list .mbar.branch entryconf \
2834 [.mbar.branch index last
] -state
]
2836 .mbar.branch add
command -label
[mc
"Reset..."] \
2837 -command merge
::reset_hard
2838 lappend disable_on_lock
[list .mbar.branch entryconf \
2839 [.mbar.branch index last
] -state
]
2844 proc commit_btn_caption
{} {
2845 if {[is_enabled nocommit
]} {
2848 return [mc Commit@@verb
]
2852 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2855 if {![is_enabled nocommit
]} {
2856 .mbar.commit add radiobutton \
2857 -label
[mc
"New Commit"] \
2858 -command do_select_commit_type \
2859 -variable selected_commit_type \
2861 lappend disable_on_lock \
2862 [list .mbar.commit entryconf
[.mbar.commit index last
] -state
]
2864 .mbar.commit add radiobutton \
2865 -label
[mc
"Amend Last Commit"] \
2866 -command do_select_commit_type \
2867 -variable selected_commit_type \
2869 lappend disable_on_lock \
2870 [list .mbar.commit entryconf
[.mbar.commit index last
] -state
]
2872 .mbar.commit add separator
2875 .mbar.commit add
command -label
[mc Rescan
] \
2876 -command ui_do_rescan \
2878 lappend disable_on_lock \
2879 [list .mbar.commit entryconf
[.mbar.commit index last
] -state
]
2881 .mbar.commit add
command -label
[mc
"Stage To Commit"] \
2882 -command do_add_selection \
2884 lappend disable_on_lock \
2885 [list .mbar.commit entryconf
[.mbar.commit index last
] -state
]
2887 .mbar.commit add
command -label
[mc
"Stage Changed Files To Commit"] \
2888 -command do_add_all \
2890 lappend disable_on_lock \
2891 [list .mbar.commit entryconf
[.mbar.commit index last
] -state
]
2893 .mbar.commit add
command -label
[mc
"Unstage From Commit"] \
2894 -command do_unstage_selection \
2896 lappend disable_on_lock \
2897 [list .mbar.commit entryconf
[.mbar.commit index last
] -state
]
2899 .mbar.commit add
command -label
[mc
"Revert Changes"] \
2900 -command do_revert_selection \
2902 lappend disable_on_lock \
2903 [list .mbar.commit entryconf
[.mbar.commit index last
] -state
]
2905 .mbar.commit add separator
2907 .mbar.commit add
command -label
[mc
"Show Less Context"] \
2908 -command show_less_context \
2909 -accelerator
$M1T-\
-
2911 .mbar.commit add
command -label
[mc
"Show More Context"] \
2912 -command show_more_context \
2915 .mbar.commit add separator
2917 if {![is_enabled nocommitmsg
]} {
2918 .mbar.commit add
command -label
[mc
"Sign Off"] \
2919 -command do_signoff \
2923 .mbar.commit add
command -label
[commit_btn_caption
] \
2924 -command do_commit \
2925 -accelerator
$M1T-Return
2926 lappend disable_on_lock \
2927 [list .mbar.commit entryconf
[.mbar.commit index last
] -state
]
2932 if {[is_enabled branch
]} {
2934 .mbar.merge add
command -label
[mc
"Local Merge..."] \
2935 -command merge
::dialog \
2937 lappend disable_on_lock \
2938 [list .mbar.merge entryconf
[.mbar.merge index last
] -state
]
2939 .mbar.merge add
command -label
[mc
"Abort Merge..."] \
2940 -command merge
::reset_hard
2941 lappend disable_on_lock \
2942 [list .mbar.merge entryconf
[.mbar.merge index last
] -state
]
2947 if {[is_enabled transport
]} {
2950 .mbar.remote add
command \
2951 -label
[mc
"Add..."] \
2952 -command remote_add
::dialog \
2954 .mbar.remote add
command \
2955 -label
[mc
"Push..."] \
2956 -command do_push_anywhere \
2958 .mbar.remote add
command \
2959 -label
[mc
"Delete Branch..."] \
2960 -command remote_branch_delete
::dialog
2964 proc
::tk
::mac
::ShowPreferences
{} {do_options
}
2968 .mbar.edit add separator
2969 .mbar.edit add
command -label
[mc
"Options..."] \
2975 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2976 set tools_menubar .mbar.tools
2978 $tools_menubar add separator
2979 $tools_menubar add
command -label
[mc
"Add..."] -command tools_add
::dialog
2980 $tools_menubar add
command -label
[mc
"Remove..."] -command tools_remove
::dialog
2982 if {[array names repo_config guitool.
*.cmd
] ne
{}} {
2989 .mbar add cascade
-label
[mc Help
] -menu .mbar.
help
2993 .mbar.apple add
command -label
[mc
"About %s" [appname
]] \
2995 .mbar.apple add separator
2997 .mbar.
help add
command -label
[mc
"About %s" [appname
]] \
3000 . configure
-menu .mbar
3002 set doc_path
[githtmldir
]
3003 if {$doc_path ne
{}} {
3004 set doc_path
[file join $doc_path index.html
]
3007 set doc_path
[exec cygpath
--mixed
$doc_path]
3011 if {[file isfile
$doc_path]} {
3012 set doc_url
"file:$doc_path"
3014 set doc_url
{http
://www.kernel.org
/pub
/software
/scm
/git
/docs
/}
3017 proc start_browser
{url
} {
3018 git
"web--browse" $url
3021 .mbar.
help add
command -label
[mc
"Online Documentation"] \
3022 -command [list start_browser
$doc_url]
3024 .mbar.
help add
command -label
[mc
"Show SSH Key"] \
3027 unset doc_path doc_url
3029 # -- Standard bindings
3031 wm protocol . WM_DELETE_WINDOW do_quit
3032 bind all
<$M1B-Key
-q
> do_quit
3033 bind all
<$M1B-Key
-Q
> do_quit
3034 bind all
<$M1B-Key
-w
> {destroy
[winfo toplevel
%W
]}
3035 bind all
<$M1B-Key
-W
> {destroy
[winfo toplevel
%W
]}
3037 set subcommand_args
{}
3039 set s
"[mc usage:] $::argv0 $::subcommand $::subcommand_args"
3040 if {[tk windowingsystem
] eq
"win32"} {
3042 tk_messageBox
-icon info
-message
$s \
3050 proc normalize_relpath
{path
} {
3052 foreach item
[file split $path] {
3053 if {$item eq
{.
}} continue
3054 if {$item eq
{..
} && [llength
$elements] > 0
3055 && [lindex
$elements end
] ne
{..
}} {
3056 set elements
[lrange
$elements 0 end-1
]
3059 lappend elements
$item
3061 return [eval file join $elements]
3064 # -- Not a normal commit type invocation? Do that instead!
3066 switch
-- $subcommand {
3069 if {$subcommand eq
"blame"} {
3070 set subcommand_args
{[--line
=<num
>] rev? path
}
3072 set subcommand_args
{rev? path
}
3074 if {$argv eq
{}} usage
3080 set p
[file join $_prefix $a]
3082 if {$is_path ||
[file exists
$p]} {
3083 if {$path ne
{}} usage
3084 set path
[normalize_relpath
$p]
3086 } elseif
{$a eq
{--}} {
3088 if {$head ne
{}} usage
3093 } elseif
{[regexp
{^
--line
=(\d
+)$
} $a a lnum
]} {
3094 if {$jump_spec ne
{} ||
$head ne
{}} usage
3095 set jump_spec
[list
$lnum]
3096 } elseif
{$head eq
{}} {
3097 if {$head ne
{}} usage
3106 if {$head ne
{} && $path eq
{}} {
3107 if {[string index
$head 0] eq
{/}} {
3108 set path
[normalize_relpath
$head]
3111 set path
[normalize_relpath
$_prefix$head]
3119 if {[regexp
{^
[0-9a-f
]{1,39}$
} $head]} {
3121 set head [git rev-parse
--verify
$head]
3123 if {[tk windowingsystem
] eq
"win32"} {
3124 tk_messageBox
-icon error
-title
[mc Error
] -message
$err
3131 set current_branch
$head
3135 switch
-- $subcommand {
3137 if {$jump_spec ne
{}} usage
3139 if {$path ne
{} && [file isdirectory
$path]} {
3140 set head $current_branch
3146 browser
::new
$head $path
3149 if {$head eq
{} && ![file exists
$path]} {
3150 catch
{wm withdraw .
}
3154 -title
[mc
"git-gui: fatal error"] \
3155 -message
[mc
"fatal: cannot stat path %s: No such file or directory" $path]
3158 blame
::new
$head $path $jump_spec
3165 if {[llength
$argv] != 0} {
3168 # fall through to setup UI for commits
3171 set err
"[mc usage:] $argv0 \[{blame|browser|citool}\]"
3172 if {[tk windowingsystem
] eq
"win32"} {
3174 tk_messageBox
-icon error
-message
$err \
3185 ${NS}::frame .branch
3186 if {!$use_ttk} {.branch configure
-borderwidth
1 -relief sunken
}
3187 ${NS}::label .branch.l1 \
3188 -text
[mc
"Current Branch:"] \
3191 ${NS}::label .branch.cb \
3192 -textvariable current_branch \
3195 pack .branch.l1
-side left
3196 pack .branch.cb
-side left
-fill x
3197 pack .branch
-side top
-fill x
3199 # -- Main Window Layout
3201 ${NS}::panedwindow .vpane
-orient horizontal
3202 ${NS}::panedwindow .vpane.files
-orient vertical
3204 .vpane add .vpane.files
3206 .vpane add .vpane.files
-sticky nsew
-height
100 -width
200
3208 pack .vpane
-anchor n
-side top
-fill both
-expand 1
3210 # -- Working Directory File List
3212 textframe .vpane.files.workdir
-height
100 -width
200
3213 tlabel .vpane.files.workdir.title
-text
[mc
"Unstaged Changes"] \
3214 -background lightsalmon
-foreground black
3215 ttext
$ui_workdir -background white
-foreground black \
3217 -width
20 -height
10 \
3219 -takefocus
1 -highlightthickness
1\
3220 -cursor
$cursor_ptr \
3221 -xscrollcommand
{.vpane.files.workdir.sx
set} \
3222 -yscrollcommand
{.vpane.files.workdir.sy
set} \
3224 ${NS}::scrollbar .vpane.files.workdir.sx
-orient h
-command [list
$ui_workdir xview
]
3225 ${NS}::scrollbar .vpane.files.workdir.sy
-orient v
-command [list
$ui_workdir yview
]
3226 pack .vpane.files.workdir.title
-side top
-fill x
3227 pack .vpane.files.workdir.sx
-side bottom
-fill x
3228 pack .vpane.files.workdir.sy
-side right
-fill y
3229 pack
$ui_workdir -side left
-fill both
-expand 1
3231 # -- Index File List
3233 textframe .vpane.files.index
-height
100 -width
200
3234 tlabel .vpane.files.index.title \
3235 -text
[mc
"Staged Changes (Will Commit)"] \
3236 -background lightgreen
-foreground black
3237 ttext
$ui_index -background white
-foreground black \
3239 -width
20 -height
10 \
3241 -takefocus
1 -highlightthickness
1\
3242 -cursor
$cursor_ptr \
3243 -xscrollcommand
{.vpane.files.index.sx
set} \
3244 -yscrollcommand
{.vpane.files.index.sy
set} \
3246 ${NS}::scrollbar .vpane.files.index.sx
-orient h
-command [list
$ui_index xview
]
3247 ${NS}::scrollbar .vpane.files.index.sy
-orient v
-command [list
$ui_index yview
]
3248 pack .vpane.files.index.title
-side top
-fill x
3249 pack .vpane.files.index.sx
-side bottom
-fill x
3250 pack .vpane.files.index.sy
-side right
-fill y
3251 pack
$ui_index -side left
-fill both
-expand 1
3253 # -- Insert the workdir and index into the panes
3255 .vpane.files add .vpane.files.workdir
3256 .vpane.files add .vpane.files.index
3258 .vpane.files paneconfigure .vpane.files.workdir
-sticky news
3259 .vpane.files paneconfigure .vpane.files.index
-sticky news
3262 foreach i
[list
$ui_index $ui_workdir] {
3264 $i tag conf in_diff
-background
[$i tag cget in_sel
-background
]
3268 # -- Diff and Commit Area
3271 ${NS}::panedwindow .vpane.lower
-orient vertical
3272 ${NS}::frame .vpane.lower.commarea
3273 ${NS}::frame .vpane.lower.
diff -relief sunken
-borderwidth
1 -height
500
3274 .vpane.lower add .vpane.lower.
diff
3275 .vpane.lower add .vpane.lower.commarea
3276 .vpane add .vpane.lower
3278 .vpane.lower pane .vpane.lower.
diff -weight
1
3279 .vpane.lower pane .vpane.lower.commarea
-weight
0
3281 .vpane.lower paneconfigure .vpane.lower.
diff -stretch always
3282 .vpane.lower paneconfigure .vpane.lower.commarea
-stretch never
3285 frame .vpane.lower
-height
300 -width
400
3286 frame .vpane.lower.commarea
3287 frame .vpane.lower.
diff -relief sunken
-borderwidth
1
3288 pack .vpane.lower.
diff -fill both
-expand 1
3289 pack .vpane.lower.commarea
-side bottom
-fill x
3290 .vpane add .vpane.lower
3291 .vpane paneconfigure .vpane.lower
-sticky nsew
3294 # -- Commit Area Buttons
3296 ${NS}::frame .vpane.lower.commarea.buttons
3297 ${NS}::label .vpane.lower.commarea.buttons.l
-text
{} \
3300 pack .vpane.lower.commarea.buttons.l
-side top
-fill x
3301 pack .vpane.lower.commarea.buttons
-side left
-fill y
3303 ${NS}::button .vpane.lower.commarea.buttons.rescan
-text
[mc Rescan
] \
3304 -command ui_do_rescan
3305 pack .vpane.lower.commarea.buttons.rescan
-side top
-fill x
3306 lappend disable_on_lock \
3307 {.vpane.lower.commarea.buttons.rescan conf
-state
}
3309 ${NS}::button .vpane.lower.commarea.buttons.incall
-text
[mc
"Stage Changed"] \
3311 pack .vpane.lower.commarea.buttons.incall
-side top
-fill x
3312 lappend disable_on_lock \
3313 {.vpane.lower.commarea.buttons.incall conf
-state
}
3315 if {![is_enabled nocommitmsg
]} {
3316 ${NS}::button .vpane.lower.commarea.buttons.signoff
-text
[mc
"Sign Off"] \
3318 pack .vpane.lower.commarea.buttons.signoff
-side top
-fill x
3321 ${NS}::button .vpane.lower.commarea.buttons.commit
-text
[commit_btn_caption
] \
3323 pack .vpane.lower.commarea.buttons.commit
-side top
-fill x
3324 lappend disable_on_lock \
3325 {.vpane.lower.commarea.buttons.commit conf
-state
}
3327 if {![is_enabled nocommit
]} {
3328 ${NS}::button .vpane.lower.commarea.buttons.push
-text
[mc Push
] \
3329 -command do_push_anywhere
3330 pack .vpane.lower.commarea.buttons.push
-side top
-fill x
3333 # -- Commit Message Buffer
3335 ${NS}::frame .vpane.lower.commarea.buffer
3336 ${NS}::frame .vpane.lower.commarea.buffer.header
3337 set ui_comm .vpane.lower.commarea.buffer.frame.t
3338 set ui_coml .vpane.lower.commarea.buffer.header.l
3340 if {![is_enabled nocommit
]} {
3341 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.new \
3342 -text
[mc
"New Commit"] \
3343 -command do_select_commit_type \
3344 -variable selected_commit_type \
3346 lappend disable_on_lock \
3347 [list .vpane.lower.commarea.buffer.header.new conf
-state
]
3348 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.amend \
3349 -text
[mc
"Amend Last Commit"] \
3350 -command do_select_commit_type \
3351 -variable selected_commit_type \
3353 lappend disable_on_lock \
3354 [list .vpane.lower.commarea.buffer.header.amend conf
-state
]
3357 ${NS}::label
$ui_coml \
3360 proc trace_commit_type
{varname args
} {
3361 global ui_coml commit_type
3362 switch
-glob
-- $commit_type {
3363 initial
{set txt
[mc
"Initial Commit Message:"]}
3364 amend
{set txt
[mc
"Amended Commit Message:"]}
3365 amend-initial
{set txt
[mc
"Amended Initial Commit Message:"]}
3366 amend-merge
{set txt
[mc
"Amended Merge Commit Message:"]}
3367 merge
{set txt
[mc
"Merge Commit Message:"]}
3368 * {set txt
[mc
"Commit Message:"]}
3370 $ui_coml conf
-text
$txt
3372 trace add variable commit_type
write trace_commit_type
3373 pack
$ui_coml -side left
-fill x
3375 if {![is_enabled nocommit
]} {
3376 pack .vpane.lower.commarea.buffer.header.amend
-side right
3377 pack .vpane.lower.commarea.buffer.header.new
-side right
3380 textframe .vpane.lower.commarea.buffer.frame
3381 ttext
$ui_comm -background white
-foreground black \
3385 -autoseparators true \
3387 -highlightthickness
1 \
3389 -width
$repo_config(gui.commitmsgwidth
) -height
9 -wrap none \
3391 -yscrollcommand
{.vpane.lower.commarea.buffer.frame.sby
set}
3392 ${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sby \
3393 -command [list
$ui_comm yview
]
3395 pack .vpane.lower.commarea.buffer.frame.sby
-side right
-fill y
3396 pack
$ui_comm -side left
-fill y
3397 pack .vpane.lower.commarea.buffer.header
-side top
-fill x
3398 pack .vpane.lower.commarea.buffer.frame
-side left
-fill y
3399 pack .vpane.lower.commarea.buffer
-side left
-fill y
3401 # -- Commit Message Buffer Context Menu
3403 set ctxm .vpane.lower.commarea.buffer.ctxm
3404 menu
$ctxm -tearoff
0
3407 -command {tk_textCut
$ui_comm}
3410 -command {tk_textCopy
$ui_comm}
3413 -command {tk_textPaste
$ui_comm}
3415 -label
[mc Delete
] \
3416 -command {catch
{$ui_comm delete sel.first sel.last
}}
3419 -label
[mc
"Select All"] \
3420 -command {focus
$ui_comm;$ui_comm tag add sel
0.0 end
}
3422 -label
[mc
"Copy All"] \
3424 $ui_comm tag add sel
0.0 end
3425 tk_textCopy
$ui_comm
3426 $ui_comm tag remove sel
0.0 end
3430 -label
[mc
"Sign Off"] \
3432 set ui_comm_ctxm
$ctxm
3436 proc trace_current_diff_path
{varname args
} {
3437 global current_diff_path diff_actions file_states
3438 if {$current_diff_path eq
{}} {
3444 set p
$current_diff_path
3445 set s
[mapdesc
[lindex
$file_states($p) 0] $p]
3447 set p
[escape_path
$p]
3451 .vpane.lower.
diff.header.status configure
-text
$s
3452 .vpane.lower.
diff.header.
file configure
-text
$f
3453 .vpane.lower.
diff.header.path configure
-text
$p
3454 foreach w
$diff_actions {
3458 trace add variable current_diff_path
write trace_current_diff_path
3460 gold_frame .vpane.lower.
diff.header
3461 tlabel .vpane.lower.
diff.header.status \
3464 -width
$max_status_desc \
3467 tlabel .vpane.lower.
diff.header.
file \
3472 tlabel .vpane.lower.
diff.header.path \
3477 pack .vpane.lower.
diff.header.status
-side left
3478 pack .vpane.lower.
diff.header.
file -side left
3479 pack .vpane.lower.
diff.header.path
-fill x
3480 set ctxm .vpane.lower.
diff.header.ctxm
3481 menu
$ctxm -tearoff
0
3489 -- $current_diff_path
3491 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state
]
3492 bind_button3 .vpane.lower.
diff.header.path
"tk_popup $ctxm %X %Y"
3496 textframe .vpane.lower.
diff.body
3497 set ui_diff .vpane.lower.
diff.body.t
3498 ttext
$ui_diff -background white
-foreground black \
3500 -width
80 -height
5 -wrap none \
3502 -takefocus
1 -highlightthickness
1 \
3503 -xscrollcommand
{.vpane.lower.
diff.body.sbx
set} \
3504 -yscrollcommand
{.vpane.lower.
diff.body.sby
set} \
3506 catch
{$ui_diff configure
-tabstyle wordprocessor
}
3507 ${NS}::scrollbar .vpane.lower.
diff.body.sbx
-orient horizontal \
3508 -command [list
$ui_diff xview
]
3509 ${NS}::scrollbar .vpane.lower.
diff.body.sby
-orient vertical \
3510 -command [list
$ui_diff yview
]
3511 pack .vpane.lower.
diff.body.sbx
-side bottom
-fill x
3512 pack .vpane.lower.
diff.body.sby
-side right
-fill y
3513 pack
$ui_diff -side left
-fill both
-expand 1
3514 pack .vpane.lower.
diff.header
-side top
-fill x
3515 pack .vpane.lower.
diff.body
-side bottom
-fill both
-expand 1
3517 foreach
{n c
} {0 black
1 red4
2 green4
3 yellow4
4 blue4
5 magenta4
6 cyan4
7 grey60
} {
3518 $ui_diff tag configure clr4
$n -background
$c
3519 $ui_diff tag configure clri4
$n -foreground
$c
3520 $ui_diff tag configure clr3
$n -foreground
$c
3521 $ui_diff tag configure clri3
$n -background
$c
3523 $ui_diff tag configure clr1
-font font_diffbold
3524 $ui_diff tag configure clr4
-underline
1
3526 $ui_diff tag conf d_info
-foreground blue
-font font_diffbold
3528 $ui_diff tag conf d_cr
-elide true
3529 $ui_diff tag conf d_@
-font font_diffbold
3530 $ui_diff tag conf d_
+ -foreground
{#00a000}
3531 $ui_diff tag conf d_-
-foreground red
3533 $ui_diff tag conf d_
++ -foreground
{#00a000}
3534 $ui_diff tag conf d_--
-foreground red
3535 $ui_diff tag conf d_
+s \
3536 -foreground
{#00a000} \
3537 -background
{#e2effa}
3538 $ui_diff tag conf d_-s \
3540 -background
{#e2effa}
3541 $ui_diff tag conf d_s
+ \
3542 -foreground
{#00a000} \
3544 $ui_diff tag conf d_s- \
3548 $ui_diff tag conf d
< \
3549 -foreground orange \
3551 $ui_diff tag conf d
= \
3552 -foreground orange \
3554 $ui_diff tag conf d
> \
3555 -foreground orange \
3558 $ui_diff tag raise sel
3560 # -- Diff Body Context Menu
3563 proc create_common_diff_popup
{ctxm
} {
3565 -label
[mc Refresh
] \
3566 -command reshow_diff
3567 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state
]
3570 -command {tk_textCopy
$ui_diff}
3571 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state
]
3573 -label
[mc
"Select All"] \
3574 -command {focus
$ui_diff;$ui_diff tag add sel
0.0 end
}
3575 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state
]
3577 -label
[mc
"Copy All"] \
3579 $ui_diff tag add sel
0.0 end
3580 tk_textCopy
$ui_diff
3581 $ui_diff tag remove sel
0.0 end
3583 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state
]
3586 -label
[mc
"Decrease Font Size"] \
3587 -command {incr_font_size font_diff
-1}
3588 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state
]
3590 -label
[mc
"Increase Font Size"] \
3591 -command {incr_font_size font_diff
1}
3592 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state
]
3596 build_encoding_menu
$emenu [list force_diff_encoding
]
3598 -label
[mc
"Encoding"] \
3600 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state
]
3602 $ctxm add
command -label
[mc
"Options..."] \
3606 set ctxm .vpane.lower.
diff.body.ctxm
3607 menu
$ctxm -tearoff
0
3609 -label
[mc
"Apply/Reverse Hunk"] \
3610 -command {apply_hunk
$cursorX $cursorY}
3611 set ui_diff_applyhunk
[$ctxm index last
]
3612 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyhunk -state
]
3614 -label
[mc
"Apply/Reverse Line"] \
3615 -command {apply_range_or_line
$cursorX $cursorY; do_rescan
}
3616 set ui_diff_applyline
[$ctxm index last
]
3617 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyline -state
]
3620 -label
[mc
"Show Less Context"] \
3621 -command show_less_context
3622 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state
]
3624 -label
[mc
"Show More Context"] \
3625 -command show_more_context
3626 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state
]
3628 create_common_diff_popup
$ctxm
3630 set ctxmmg .vpane.lower.
diff.body.ctxmmg
3631 menu
$ctxmmg -tearoff
0
3632 $ctxmmg add
command \
3633 -label
[mc
"Run Merge Tool"] \
3634 -command {merge_resolve_tool
}
3635 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state
]
3636 $ctxmmg add separator
3637 $ctxmmg add
command \
3638 -label
[mc
"Use Remote Version"] \
3639 -command {merge_resolve_one
3}
3640 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state
]
3641 $ctxmmg add
command \
3642 -label
[mc
"Use Local Version"] \
3643 -command {merge_resolve_one
2}
3644 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state
]
3645 $ctxmmg add
command \
3646 -label
[mc
"Revert To Base"] \
3647 -command {merge_resolve_one
1}
3648 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state
]
3649 $ctxmmg add separator
3650 $ctxmmg add
command \
3651 -label
[mc
"Show Less Context"] \
3652 -command show_less_context
3653 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state
]
3654 $ctxmmg add
command \
3655 -label
[mc
"Show More Context"] \
3656 -command show_more_context
3657 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state
]
3658 $ctxmmg add separator
3659 create_common_diff_popup
$ctxmmg
3661 set ctxmsm .vpane.lower.
diff.body.ctxmsm
3662 menu
$ctxmsm -tearoff
0
3663 $ctxmsm add
command \
3664 -label
[mc
"Visualize These Changes In The Submodule"] \
3665 -command {do_gitk
-- true
}
3666 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state
]
3667 $ctxmsm add
command \
3668 -label
[mc
"Visualize Current Branch History In The Submodule"] \
3669 -command {do_gitk
{} true
}
3670 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state
]
3671 $ctxmsm add
command \
3672 -label
[mc
"Visualize All Branch History In The Submodule"] \
3673 -command {do_gitk
--all true
}
3674 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state
]
3675 $ctxmsm add separator
3676 $ctxmsm add
command \
3677 -label
[mc
"Start git gui In The Submodule"] \
3678 -command {do_git_gui
}
3679 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state
]
3680 $ctxmsm add separator
3681 create_common_diff_popup
$ctxmsm
3683 proc has_textconv
{path
} {
3684 if {[is_config_false gui.textconv
]} {
3687 set filter
[gitattr
$path diff set]
3688 set textconv
[get_config
[join [list
diff $filter textconv
] .
]]
3689 if {$filter ne
{set} && $textconv ne
{}} {
3696 proc popup_diff_menu
{ctxm ctxmmg ctxmsm x y X Y
} {
3697 global current_diff_path file_states
3700 if {[info exists file_states
($current_diff_path)]} {
3701 set state
[lindex
$file_states($current_diff_path) 0]
3705 if {[string first
{U
} $state] >= 0} {
3706 tk_popup
$ctxmmg $X $Y
3707 } elseif
{$
::is_submodule_diff
} {
3708 tk_popup
$ctxmsm $X $Y
3710 set has_range
[expr {[$
::ui_diff tag nextrange sel
0.0] != {}}]
3711 if {$
::ui_index eq $
::current_diff_side
} {
3712 set l
[mc
"Unstage Hunk From Commit"]
3714 set t
[mc
"Unstage Lines From Commit"]
3716 set t
[mc
"Unstage Line From Commit"]
3719 set l
[mc
"Stage Hunk For Commit"]
3721 set t
[mc
"Stage Lines For Commit"]
3723 set t
[mc
"Stage Line For Commit"]
3727 ||
$current_diff_path eq
{}
3730 ||
[string match
{?T
} $state]
3731 ||
[string match
{T?
} $state]
3732 ||
[has_textconv
$current_diff_path]} {
3737 $ctxm entryconf $
::ui_diff_applyhunk
-state
$s -label
$l
3738 $ctxm entryconf $
::ui_diff_applyline
-state
$s -label
$t
3739 tk_popup
$ctxm $X $Y
3742 bind_button3
$ui_diff [list popup_diff_menu
$ctxm $ctxmmg $ctxmsm %x
%y
%X
%Y
]
3746 set main_status
[::status_bar
::new .status
]
3747 pack .status
-anchor w
-side bottom
-fill x
3748 $main_status show
[mc
"Initializing..."]
3752 proc on_ttk_pane_mapped
{w pane pos
} {
3754 after
0 [list after idle
[list
$w sashpos
$pane $pos]]
3756 proc on_tk_pane_mapped
{w pane x y
} {
3758 after
0 [list after idle
[list
$w sash place
$pane $x $y]]
3760 proc on_application_mapped
{} {
3761 global repo_config use_ttk
3763 set gm
$repo_config(gui.geometry
)
3766 [list on_ttk_pane_mapped
%W
0 [lindex
$gm 1]]
3767 bind .vpane.files
<Map
> \
3768 [list on_ttk_pane_mapped
%W
0 [lindex
$gm 2]]
3771 [list on_tk_pane_mapped
%W
0 \
3773 [lindex
[.vpane sash coord
0] 1]]
3774 bind .vpane.files
<Map
> \
3775 [list on_tk_pane_mapped
%W
0 \
3776 [lindex
[.vpane.files sash coord
0] 0] \
3779 wm geometry .
[lindex
$gm 0]
3781 if {[info exists repo_config
(gui.geometry
)]} {
3782 bind .
<Map
> [list on_application_mapped
]
3783 wm geometry .
[lindex
$repo_config(gui.geometry
) 0]
3786 # -- Load window state
3788 if {[info exists repo_config
(gui.wmstate
)]} {
3789 catch
{wm state .
$repo_config(gui.wmstate
)}
3794 bind $ui_comm <$M1B-Key
-Return
> {do_commit
;break}
3795 bind $ui_comm <$M1B-Key
-t
> {do_add_selection
;break}
3796 bind $ui_comm <$M1B-Key
-T
> {do_add_selection
;break}
3797 bind $ui_comm <$M1B-Key
-u
> {do_unstage_selection
;break}
3798 bind $ui_comm <$M1B-Key
-U
> {do_unstage_selection
;break}
3799 bind $ui_comm <$M1B-Key
-j
> {do_revert_selection
;break}
3800 bind $ui_comm <$M1B-Key
-J
> {do_revert_selection
;break}
3801 bind $ui_comm <$M1B-Key
-i
> {do_add_all
;break}
3802 bind $ui_comm <$M1B-Key
-I
> {do_add_all
;break}
3803 bind $ui_comm <$M1B-Key
-x
> {tk_textCut
%W
;break}
3804 bind $ui_comm <$M1B-Key
-X
> {tk_textCut
%W
;break}
3805 bind $ui_comm <$M1B-Key
-c
> {tk_textCopy
%W
;break}
3806 bind $ui_comm <$M1B-Key
-C
> {tk_textCopy
%W
;break}
3807 bind $ui_comm <$M1B-Key
-v
> {tk_textPaste
%W
; %W see insert
; break}
3808 bind $ui_comm <$M1B-Key
-V
> {tk_textPaste
%W
; %W see insert
; break}
3809 bind $ui_comm <$M1B-Key
-a
> {%W tag add sel
0.0 end
;break}
3810 bind $ui_comm <$M1B-Key
-A
> {%W tag add sel
0.0 end
;break}
3811 bind $ui_comm <$M1B-Key
-minus
> {show_less_context
;break}
3812 bind $ui_comm <$M1B-Key
-KP_Subtract
> {show_less_context
;break}
3813 bind $ui_comm <$M1B-Key
-equal
> {show_more_context
;break}
3814 bind $ui_comm <$M1B-Key
-plus
> {show_more_context
;break}
3815 bind $ui_comm <$M1B-Key
-KP_Add
> {show_more_context
;break}
3817 bind $ui_diff <$M1B-Key
-x
> {tk_textCopy
%W
;break}
3818 bind $ui_diff <$M1B-Key
-X
> {tk_textCopy
%W
;break}
3819 bind $ui_diff <$M1B-Key
-c
> {tk_textCopy
%W
;break}
3820 bind $ui_diff <$M1B-Key
-C
> {tk_textCopy
%W
;break}
3821 bind $ui_diff <$M1B-Key
-v
> {break}
3822 bind $ui_diff <$M1B-Key
-V
> {break}
3823 bind $ui_diff <$M1B-Key
-a
> {%W tag add sel
0.0 end
;break}
3824 bind $ui_diff <$M1B-Key
-A
> {%W tag add sel
0.0 end
;break}
3825 bind $ui_diff <$M1B-Key
-j
> {do_revert_selection
;break}
3826 bind $ui_diff <$M1B-Key
-J
> {do_revert_selection
;break}
3827 bind $ui_diff <Key-Up
> {catch
{%W yview scroll
-1 units
};break}
3828 bind $ui_diff <Key-Down
> {catch
{%W yview scroll
1 units
};break}
3829 bind $ui_diff <Key-Left
> {catch
{%W xview scroll
-1 units
};break}
3830 bind $ui_diff <Key-Right
> {catch
{%W xview scroll
1 units
};break}
3831 bind $ui_diff <Key-k
> {catch
{%W yview scroll
-1 units
};break}
3832 bind $ui_diff <Key-j
> {catch
{%W yview scroll
1 units
};break}
3833 bind $ui_diff <Key-h
> {catch
{%W xview scroll
-1 units
};break}
3834 bind $ui_diff <Key-l
> {catch
{%W xview scroll
1 units
};break}
3835 bind $ui_diff <Control-Key-b
> {catch
{%W yview scroll
-1 pages
};break}
3836 bind $ui_diff <Control-Key-f
> {catch
{%W yview scroll
1 pages
};break}
3837 bind $ui_diff <Button-1
> {focus
%W
}
3839 if {[is_enabled branch
]} {
3840 bind .
<$M1B-Key
-n
> branch_create
::dialog
3841 bind .
<$M1B-Key
-N
> branch_create
::dialog
3842 bind .
<$M1B-Key
-o
> branch_checkout
::dialog
3843 bind .
<$M1B-Key
-O
> branch_checkout
::dialog
3844 bind .
<$M1B-Key
-m
> merge
::dialog
3845 bind .
<$M1B-Key
-M
> merge
::dialog
3847 if {[is_enabled transport
]} {
3848 bind .
<$M1B-Key
-p
> do_push_anywhere
3849 bind .
<$M1B-Key
-P
> do_push_anywhere
3852 bind .
<Key-F5
> ui_do_rescan
3853 bind .
<$M1B-Key
-r
> ui_do_rescan
3854 bind .
<$M1B-Key
-R
> ui_do_rescan
3855 bind .
<$M1B-Key
-s
> do_signoff
3856 bind .
<$M1B-Key
-S
> do_signoff
3857 bind .
<$M1B-Key
-t
> { toggle_or_diff toggle
%W
}
3858 bind .
<$M1B-Key
-T
> { toggle_or_diff toggle
%W
}
3859 bind .
<$M1B-Key
-u
> { toggle_or_diff toggle
%W
}
3860 bind .
<$M1B-Key
-U
> { toggle_or_diff toggle
%W
}
3861 bind .
<$M1B-Key
-j
> do_revert_selection
3862 bind .
<$M1B-Key
-J
> do_revert_selection
3863 bind .
<$M1B-Key
-i
> do_add_all
3864 bind .
<$M1B-Key
-I
> do_add_all
3865 bind .
<$M1B-Key
-minus
> {show_less_context
;break}
3866 bind .
<$M1B-Key
-KP_Subtract
> {show_less_context
;break}
3867 bind .
<$M1B-Key
-equal
> {show_more_context
;break}
3868 bind .
<$M1B-Key
-plus
> {show_more_context
;break}
3869 bind .
<$M1B-Key
-KP_Add
> {show_more_context
;break}
3870 bind .
<$M1B-Key
-Return
> do_commit
3871 foreach i
[list
$ui_index $ui_workdir] {
3872 bind $i <Button-1
> { toggle_or_diff click
%W
%x
%y
; break }
3873 bind $i <$M1B-Button
-1> { add_one_to_selection
%W
%x
%y
; break }
3874 bind $i <Shift-Button-1
> { add_range_to_selection
%W
%x
%y
; break }
3875 bind $i <Key-Up
> { toggle_or_diff up
%W
; break }
3876 bind $i <Key-Down
> { toggle_or_diff down
%W
; break }
3880 set file_lists
($ui_index) [list
]
3881 set file_lists
($ui_workdir) [list
]
3883 wm title .
"[appname] ([reponame]) [file normalize $_gitworktree]"
3884 focus
-force
$ui_comm
3886 # -- Warn the user about environmental problems. Cygwin's Tcl
3887 # does *not* pass its env array onto any processes it spawns.
3888 # This means that git processes get none of our environment.
3893 set msg
[mc
"Possible environment issues exist.
3895 The following environment variables are probably
3896 going to be ignored by any Git subprocess run
3900 foreach name
[array names env
] {
3901 switch
-regexp
-- $name {
3902 {^GIT_INDEX_FILE$
} -
3903 {^GIT_OBJECT_DIRECTORY$
} -
3904 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$
} -
3906 {^GIT_EXTERNAL_DIFF$
} -
3910 {^GIT_
(AUTHOR|COMMITTER
)_DATE$
} {
3911 append msg
" - $name\n"
3914 {^GIT_
(AUTHOR|COMMITTER
)_
(NAME|EMAIL
)$
} {
3915 append msg
" - $name\n"
3917 set suggest_user
$name
3921 if {$ignored_env > 0} {
3923 This is due to a known issue with the
3924 Tcl binary distributed by Cygwin."]
3926 if {$suggest_user ne
{}} {
3929 A good replacement for %s
3930 is placing values for the user.name and
3931 user.email settings into your personal
3937 unset ignored_env msg suggest_user name
3940 # -- Only initialize complex UI if we are going to stay running.
3942 if {[is_enabled transport
]} {
3945 set n
[.mbar.remote index end
]
3946 populate_remotes_menu
3947 set n
[expr {[.mbar.remote index end
] - $n}]
3949 if {[.mbar.remote
type 0] eq
"tearoff"} { incr n
}
3950 .mbar.remote insert
$n separator
3955 if {[winfo exists
$ui_comm]} {
3956 set GITGUI_BCK_exists
[load_message GITGUI_BCK utf-8
]
3958 # -- If both our backup and message files exist use the
3959 # newer of the two files to initialize the buffer.
3961 if {$GITGUI_BCK_exists} {
3962 set m
[gitdir GITGUI_MSG
]
3963 if {[file isfile
$m]} {
3964 if {[file mtime
[gitdir GITGUI_BCK
]] > [file mtime
$m]} {
3965 catch
{file delete
[gitdir GITGUI_MSG
]}
3967 $ui_comm delete
0.0 end
3969 $ui_comm edit modified false
3970 catch
{file delete
[gitdir GITGUI_BCK
]}
3971 set GITGUI_BCK_exists
0
3977 proc backup_commit_buffer
{} {
3978 global ui_comm GITGUI_BCK_exists
3980 set m
[$ui_comm edit modified
]
3981 if {$m ||
$GITGUI_BCK_exists} {
3982 set msg
[string trim
[$ui_comm get
0.0 end
]]
3983 regsub
-all
-line
{[ \r\t]+$
} $msg {} msg
3986 if {$GITGUI_BCK_exists} {
3987 catch
{file delete
[gitdir GITGUI_BCK
]}
3988 set GITGUI_BCK_exists
0
3992 set fd
[open
[gitdir GITGUI_BCK
] w
]
3993 fconfigure
$fd -encoding utf-8
3994 puts
-nonewline
$fd $msg
3996 set GITGUI_BCK_exists
1
4000 $ui_comm edit modified false
4003 set ::GITGUI_BCK_i
[after
2000 backup_commit_buffer
]
4006 backup_commit_buffer
4008 # -- If the user has aspell available we can drive it
4009 # in pipe mode to spellcheck the commit message.
4011 set spell_cmd
[list |
]
4012 set spell_dict
[get_config gui.spellingdictionary
]
4013 lappend spell_cmd aspell
4014 if {$spell_dict ne
{}} {
4015 lappend spell_cmd
--master
=$spell_dict
4017 lappend spell_cmd
--mode
=none
4018 lappend spell_cmd
--encoding
=utf-8
4019 lappend spell_cmd pipe
4020 if {$spell_dict eq
{none
}
4021 ||
[catch
{set spell_fd
[open
$spell_cmd r
+]} spell_err
]} {
4022 bind_button3
$ui_comm [list tk_popup
$ui_comm_ctxm %X
%Y
]
4024 set ui_comm_spell
[spellcheck
::init \
4030 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
4033 lock_index begin-read
4034 if {![winfo ismapped .
]} {
4038 if {[is_enabled initialamend
]} {
4044 if {[is_enabled nocommitmsg
]} {
4045 $ui_comm configure
-state disabled
-background gray
4048 if {[is_enabled multicommit
] && ![is_config_false gui.gcwarning
]} {
4051 if {[is_enabled retcode
]} {
4052 bind .
<Destroy
> {+terminate_me
%W
}
4054 if {$picked && [is_config_true gui.autoexplore
]} {
4060 # indent-tabs-mode: t