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
, see
<http
://www.gnu.org
/licenses
/>.
}]
29 ######################################################################
31 ## Tcl/Tk sanity check
33 if {[catch
{package require Tcl
8.5} err
]
34 ||
[catch
{package require Tk
8.5} err
]
40 -title "git-gui: fatal error" \
45 catch
{rename send
{}} ; # What an evil concept...
47 ######################################################################
51 if { [info exists
::env
(GIT_GUI_LIB_DIR
) ] } {
52 set oguilib $
::env
(GIT_GUI_LIB_DIR
)
54 set oguilib
{@@GITGUI_LIBDIR@@
}
56 set oguirel
{@@GITGUI_RELATIVE@@
}
57 if {$oguirel eq
{1}} {
58 set oguilib
[file dirname [file normalize
$argv0]]
59 if {[file tail $oguilib] eq
{git-core
}} {
60 set oguilib
[file dirname $oguilib]
62 set oguilib
[file dirname $oguilib]
63 set oguilib
[file join $oguilib share git-gui lib
]
64 set oguimsg
[file join $oguilib msgs
]
65 } elseif
{[string match @@
* $oguirel]} {
66 set oguilib
[file join [file dirname [file normalize
$argv0]] lib
]
67 set oguimsg
[file join [file dirname [file normalize
$argv0]] po
]
69 set oguimsg
[file join $oguilib msgs
]
73 ######################################################################
75 ## enable verbose loading?
77 if {![catch
{set _verbose
$env(GITGUI_VERBOSE
)}]} {
79 rename auto_load real__auto_load
80 proc auto_load
{name args
} {
81 puts stderr
"auto_load $name"
82 return [uplevel
1 real__auto_load
$name $args]
84 rename
source real__source
86 puts stderr
"source $args"
87 uplevel
1 [linsert
$args 0 real__source
]
89 if {[tk windowingsystem
] eq
"win32"} { console show
}
92 ######################################################################
94 ## Internationalization (i18n) through msgcat and gettext. See
95 ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
97 package require msgcat
99 # Check for Windows 7 MUI language pack (missed by msgcat < 1.4.4)
100 if {[tk windowingsystem
] eq
"win32"
101 && [package vcompare
[package provide msgcat
] 1.4.4] < 0
103 proc _mc_update_locale
{} {
104 set key
{HKEY_CURRENT_USER\Control Panel\Desktop
}
106 package require registry
107 set uilocale
[registry get
$key "PreferredUILanguages"]
108 msgcat
::ConvertLocale
[string map
{- _
} [lindex
$uilocale 0]]
110 if {[string length
$uilocale] > 0} {
111 msgcat
::mclocale
$uilocale
118 proc _mc_trim
{fmt} {
119 set cmk
[string first @@
$fmt]
121 return [string range
$fmt 0 [expr {$cmk - 1}]]
126 proc mc
{en_fmt args
} {
127 set fmt [_mc_trim
[::msgcat
::mc
$en_fmt]]
128 if {[catch
{set msg
[eval [list format
$fmt] $args]} err
]} {
129 set msg
[eval [list format
[_mc_trim
$en_fmt]] $args]
135 return [join $args {}]
138 ::msgcat
::mcload
$oguimsg
141 ######################################################################
143 ## On Mac, bring the current Wish process window to front
145 if {[tk windowingsystem
] eq
"aqua"} {
147 exec osascript
-e [format
{
148 tell application
"System Events"
149 set frontmost of processes whose unix id is
%d to true
155 ######################################################################
159 set _appname
{Git Gui
}
168 set _shellpath
{@@SHELL_PATH@@
}
170 set _trace
[lsearch
-exact $argv --trace]
172 set argv
[lreplace
$argv $_trace $_trace]
174 if {[tk windowingsystem
] eq
"win32"} { console show
}
179 # variable for the last merged branch (useful for a default when deleting
181 set _last_merged_branch
{}
184 global _shellpath env
185 if {[string match @@
* $_shellpath]} {
186 if {[info exists env
(SHELL
)]} {
205 return [eval [list
file join $_gitdir] $args]
208 proc gitexec
{args
} {
210 if {$_gitexec eq
{}} {
211 if {[catch
{set _gitexec
[git
--exec-path]} err
]} {
212 error
"Git not installed?\n\n$err"
215 set _gitexec
[exec cygpath \
220 set _gitexec
[file normalize
$_gitexec]
226 return [eval [list
file join $_gitexec] $args]
229 proc githtmldir
{args
} {
231 if {$_githtmldir eq
{}} {
232 if {[catch
{set _githtmldir
[git
--html-path]}]} {
233 # Git not installed or option not yet supported
237 set _githtmldir
[exec cygpath \
242 set _githtmldir
[file normalize
$_githtmldir]
248 return [eval [list
file join $_githtmldir] $args]
256 if {[tk windowingsystem
] eq
{aqua
}} {
263 if {$
::tcl_platform
(platform
) eq
{windows
}} {
271 if {$_iscygwin eq
{}} {
272 if {$
::tcl_platform
(platform
) eq
{windows
}} {
273 if {[catch
{set p
[exec cygpath
--windir]} err
]} {
277 # Handle MSys2 which is only cygwin when MSYSTEM is MSYS.
278 if {[info exists
::env
(MSYSTEM
)] && $
::env
(MSYSTEM
) ne
"MSYS"} {
289 proc is_enabled
{option
} {
290 global enabled_options
291 if {[catch
{set on
$enabled_options($option)}]} {return 0}
295 proc enable_option
{option
} {
296 global enabled_options
297 set enabled_options
($option) 1
300 proc disable_option
{option
} {
301 global enabled_options
302 set enabled_options
($option) 0
305 ######################################################################
309 proc is_many_config
{name
} {
310 switch
-glob -- $name {
320 proc is_config_true
{name
} {
322 if {[catch
{set v
$repo_config($name)}]} {
325 set v
[string tolower
$v]
326 if {$v eq
{} ||
$v eq
{true
} ||
$v eq
{1} ||
$v eq
{yes} ||
$v eq
{on
}} {
333 proc is_config_false
{name
} {
335 if {[catch
{set v
$repo_config($name)}]} {
338 set v
[string tolower
$v]
339 if {$v eq
{false
} ||
$v eq
{0} ||
$v eq
{no
} ||
$v eq
{off
}} {
346 proc get_config
{name
} {
348 if {[catch
{set v
$repo_config($name)}]} {
360 if {$_isbare eq
{}} {
362 set _bare
[git rev-parse
--is-bare-repository]
364 true
{ set _isbare
1 }
365 false
{ set _isbare
0}
369 if {[is_config_true core.bare
]
370 ||
($_gitworktree eq
{}
371 && [lindex
[file split $_gitdir] end
] ne
{.git
})} {
381 ######################################################################
385 proc _trace_exec
{cmd
} {
386 if {!$
::_trace
} return
392 if {[regexp
{[ \t\r\n'"$?*]} $v]} {
400 #'" fix poor old emacs font-lock mode
402 proc _git_cmd {name} {
405 if {[catch {set v $_git_cmd_path($name)}]} {
409 --exec-path { return [list $::_git $name] }
412 set p [gitexec git-$name$::_search_exe]
413 if {[file exists $p]} {
415 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
416 # Try to determine what sort of magic will make
417 # git-$name go and do its thing, because native
418 # Tcl on Windows doesn't know it.
420 set p [gitexec git-$name]
425 switch -glob -- [lindex $s 0] {
427 #!*perl { set i perl }
428 #!*python { set i python }
429 default { error "git-
$name is not supported
: $s" }
433 if {![info exists interp]} {
434 set interp [_which $i]
437 error "git-
$name requires
$i (not
in PATH
)"
439 set v [concat [list $interp] [lrange $s 1 end] [list $p]]
441 # Assume it is builtin to git somehow and we
442 # aren't actually able to see a file for it.
444 set v [list $::_git $name]
446 set _git_cmd_path($name) $v
451 proc _which {what args} {
452 global env _search_exe _search_path
454 if {$_search_path eq {}} {
455 if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
456 set _search_path [split [exec cygpath \
462 } elseif {[is_Windows]} {
463 set gitguidir [file dirname [info script]]
464 regsub -all ";" $gitguidir "\\;" gitguidir
465 set env(PATH) "$gitguidir;$env(PATH
)"
466 set _search_path [split $env(PATH) {;}]
469 set _search_path [split $env(PATH) :]
474 if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
477 set suffix $_search_exe
480 foreach p $_search_path {
481 set p [file join $p $what$suffix]
482 if {[file exists $p]} {
483 return [file normalize $p]
489 # Test a file for a hashbang to identify executable scripts on Windows.
490 proc is_shellscript {filename} {
491 if {![file exists $filename]} {return 0}
492 set f [open $filename r]
493 fconfigure $f -encoding binary
494 set magic [read $f 2]
496 return [expr {$magic eq "#!"}]
499 # Run a command connected via pipes on stdout.
500 # This is for use with textconv filters and uses sh -c "..." to allow it to
501 # contain a command with arguments. On windows we must check for shell
502 # scripts specifically otherwise just call the filter command.
503 proc open_cmd_pipe
{cmd path
} {
505 if {![file executable
[shellpath
]]} {
506 set exe
[auto_execok
[lindex
$cmd 0]]
507 if {[is_shellscript
[lindex
$exe 0]]} {
508 set run
[linsert
[auto_execok sh
] end
-c "$cmd \"\$0\"" $path]
510 set run
[concat
$exe [lrange
$cmd 1 end
] $path]
513 set run
[list
[shellpath
] -c "$cmd \"\$0\"" $path]
515 return [open |
$run r
]
518 proc _lappend_nice
{cmd_var
} {
522 if {![info exists _nice
]} {
523 set _nice
[_which nice
]
524 if {[catch
{exec $_nice git version
}]} {
526 } elseif
{[is_Windows
] && [file dirname $_nice] ne
[file dirname $
::_git
]} {
536 set fd
[eval [list git_read
] $args]
537 fconfigure
$fd -translation binary
-encoding utf-8
538 set result
[string trimright
[read $fd] "\n"]
541 puts stderr
"< $result"
546 proc _open_stdout_stderr
{cmd
} {
549 set fd
[open
[concat
[list |
] $cmd] r
]
551 if { [lindex
$cmd end
] eq
{2>@
1}
552 && $err eq
{can not
find channel named
"1"}
554 # Older versions of Tcl 8.4 don't have this 2>@1 IO
555 # redirect operator. Fallback to |& cat for those.
556 # The command was not actually started, so its safe
557 # to try to start it a second time.
559 set fd
[open
[concat \
561 [lrange
$cmd 0 end-1
] \
568 fconfigure
$fd -eofchar {}
572 proc git_read
{args
} {
576 switch
-- [lindex
$args 0] {
591 set args
[lrange
$args 1 end
]
594 set cmdp
[_git_cmd
[lindex
$args 0]]
595 set args
[lrange
$args 1 end
]
597 return [_open_stdout_stderr
[concat
$opt $cmdp $args]]
600 proc git_write
{args
} {
604 switch
-- [lindex
$args 0] {
615 set args
[lrange
$args 1 end
]
618 set cmdp
[_git_cmd
[lindex
$args 0]]
619 set args
[lrange
$args 1 end
]
621 _trace_exec
[concat
$opt $cmdp $args]
622 return [open
[concat
[list |
] $opt $cmdp $args] w
]
625 proc githook_read
{hook_name args
} {
626 set pchook
[gitdir hooks
$hook_name]
629 # On Windows [file executable] might lie so we need to ask
630 # the shell if the hook is executable. Yes that's annoying.
634 if {![info exists interp
]} {
635 set interp
[_which sh
]
638 error
"hook execution requires sh (not in PATH)"
641 set scr
{if test -x "$1";then exec "$@";fi}
642 set sh_c
[list
$interp -c $scr $interp $pchook]
643 return [_open_stdout_stderr
[concat
$sh_c $args]]
646 if {[file executable
$pchook]} {
647 return [_open_stdout_stderr
[concat
[list
$pchook] $args]]
653 proc kill_file_process
{fd
} {
654 set process
[pid
$fd]
658 exec taskkill
/pid
$process
665 proc gitattr
{path attr default
} {
666 if {[catch
{set r
[git check-attr
$attr -- $path]}]} {
669 set r
[join [lrange
[split $r :] 2 end
] :]
672 if {$r eq
{unspecified
}} {
679 regsub
-all ' $value "'\\''" value
683 proc load_current_branch {} {
684 global current_branch is_detached
686 set fd [open [gitdir HEAD] r]
687 fconfigure $fd -translation binary -encoding utf-8
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 bind $text <Motion> break
729 bind . <Visibility> {
730 bind . <Visibility> {}
735 wm iconbitmap . -default $oguilib/git-gui.ico
736 set ::tk::AlwaysShowSelection 1
737 bind . <Control-F2> {console show}
739 # Spoof an X11 display for SSH
740 if {![info exists env(DISPLAY)]} {
741 set env(DISPLAY) :9999
745 image create photo gitlogo -width 16 -height 16
747 gitlogo put #33CC33 -to 7 0 9 2
748 gitlogo put #33CC33 -to 4 2 12 4
749 gitlogo put #33CC33 -to 7 4 9 6
750 gitlogo put #CC3333 -to 4 6 12 8
751 gitlogo put gray26 -to 4 9 6 10
752 gitlogo put gray26 -to 3 10 6 12
753 gitlogo put gray26 -to 8 9 13 11
754 gitlogo put gray26 -to 8 11 10 12
755 gitlogo put gray26 -to 11 11 13 14
756 gitlogo put gray26 -to 3 12 5 14
757 gitlogo put gray26 -to 5 13
758 gitlogo put gray26 -to 10 13
759 gitlogo put gray26 -to 4 14 12 15
760 gitlogo put gray26 -to 5 15 11 16
763 image create photo gitlogo32 -width 32 -height 32
764 gitlogo32 copy gitlogo -zoom 2 2
766 wm iconphoto . -default gitlogo gitlogo32
770 ######################################################################
776 if {[lsearch -exact [font names] TkDefaultFont] != -1} {
777 eval [linsert [font actual TkDefaultFont] 0 font configure font_ui]
778 eval [linsert [font actual TkFixedFont] 0 font create font_diff]
780 font create font_diff -family Courier -size 10
783 eval font configure font_ui [font actual [.dummy cget -font]]
788 font create font_uiitalic
789 font create font_uibold
790 font create font_diffbold
791 font create font_diffitalic
793 foreach class {Button Checkbutton Entry Label
794 Labelframe Listbox Message
795 Radiobutton Spinbox Text} {
796 option add *$class.font font_ui
799 option add *Menu.font font_ui
800 option add *Entry.borderWidth 1 startupFile
801 option add *Entry.relief sunken startupFile
802 option add *RadioButton.anchor w startupFile
806 if {[is_Windows] || [is_MacOSX]} {
807 option add *Menu.tearOff 0
818 proc bind_button3 {w cmd} {
819 bind $w <Any-Button-3> $cmd
821 # Mac OS X sends Button-2 on right click through three-button mouse,
822 # or through trackpad right-clicking (two-finger touch + click).
823 bind $w <Any-Button-2> $cmd
824 bind $w <Control-Button-1> $cmd
828 proc apply_config {} {
829 global repo_config font_descs
831 foreach option $font_descs {
832 set name [lindex $option 0]
833 set font [lindex $option 1]
836 foreach {cn cv} $repo_config(gui.$name) {
837 if {$cn eq {-weight}} {
840 font configure $font $cn $cv
843 font configure $font -weight normal
846 error_popup [strcat [mc "Invalid font specified
in %s
:" "gui.
$name"] "\n\n$err"]
848 foreach {cn cv} [font configure $font] {
849 font configure ${font}bold $cn $cv
850 font configure ${font}italic $cn $cv
852 font configure ${font}bold -weight bold
853 font configure ${font}italic -slant italic
859 if {$repo_config(gui.usettk)} {
860 set use_ttk [package vsatisfies [package provide Tk] 8.5]
863 bind [winfo class .] <<ThemeChanged>> [list InitTheme]
865 color::sync_with_theme
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]
1344 set commit_type_is_amend 0
1346 set current_branch {}
1348 set current_diff_path {}
1350 set is_submodule_diff 0
1351 set is_conflict_diff 0
1352 set diff_empty_count 0
1354 set last_revert_enc {}
1356 set nullid "0000000000000000000000000000000000000000"
1357 set nullid2 "0000000000000000000000000000000000000001"
1359 ######################################################################
1367 set disable_on_lock [list]
1368 set index_lock_type none
1370 proc lock_index {type} {
1371 global index_lock_type disable_on_lock
1373 if {$index_lock_type eq {none}} {
1374 set index_lock_type $type
1375 foreach w $disable_on_lock {
1376 uplevel #0 $w disabled
1379 } elseif {$index_lock_type eq "begin-
$type"} {
1380 set index_lock_type $type
1386 proc unlock_index {} {
1387 global index_lock_type disable_on_lock
1389 set index_lock_type none
1390 foreach w $disable_on_lock {
1391 uplevel #0 $w normal
1395 ######################################################################
1399 proc repository_state {ctvar hdvar mhvar} {
1400 global current_branch
1401 upvar $ctvar ct $hdvar hd $mhvar mh
1406 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1412 set merge_head [gitdir MERGE_HEAD]
1413 if {[file exists $merge_head]} {
1415 set fd_mh [open $merge_head r]
1416 while {[gets $fd_mh line] >= 0} {
1427 global PARENT empty_tree
1429 set p [lindex $PARENT 0]
1433 if {$empty_tree eq {}} {
1434 set empty_tree [git mktree << {}]
1439 proc force_amend {} {
1440 global commit_type_is_amend
1441 global HEAD PARENT MERGE_HEAD commit_type
1443 repository_state newType newHEAD newMERGE_HEAD
1446 set MERGE_HEAD $newMERGE_HEAD
1447 set commit_type $newType
1449 set commit_type_is_amend 1
1450 do_select_commit_type
1453 proc rescan {after {honor_trustmtime 1}} {
1454 global HEAD PARENT MERGE_HEAD commit_type
1455 global ui_index ui_workdir ui_comm
1456 global rescan_active file_states
1459 if {$rescan_active > 0 || ![lock_index read]} return
1461 repository_state newType newHEAD newMERGE_HEAD
1462 if {[string match amend* $commit_type]
1463 && $newType eq {normal}
1464 && $newHEAD eq $HEAD} {
1468 set MERGE_HEAD $newMERGE_HEAD
1469 set commit_type $newType
1472 array unset file_states
1474 if {!$::GITGUI_BCK_exists &&
1475 (![$ui_comm edit modified]
1476 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1477 if {[string match amend* $commit_type]} {
1478 } elseif {[load_message GITGUI_MSG utf-8]} {
1479 } elseif {[run_prepare_commit_msg_hook]} {
1480 } elseif {[load_message MERGE_MSG]} {
1481 } elseif {[load_message SQUASH_MSG]} {
1482 } elseif {[load_message [get_config commit.template]]} {
1485 $ui_comm edit modified false
1488 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1489 rescan_stage2 {} $after
1492 ui_status [mc "Refreshing
file status...
"]
1493 set fd_rf [git_read update-index \
1499 fconfigure $fd_rf -blocking 0 -translation binary
1500 fileevent $fd_rf readable \
1501 [list rescan_stage2 $fd_rf $after]
1506 set is_git_info_exclude {}
1507 proc have_info_exclude {} {
1508 global is_git_info_exclude
1510 if {$is_git_info_exclude eq {}} {
1511 if {[catch {exec test -f [gitdir info exclude]}]} {
1512 set is_git_info_exclude 0
1514 set is_git_info_exclude 1
1517 return $is_git_info_exclude
1520 proc have_info_exclude {} {
1521 return [file readable [gitdir info exclude]]
1525 proc rescan_stage2 {fd after} {
1526 global rescan_active buf_rdi buf_rdf buf_rlo
1530 if {![eof $fd]} return
1534 if {[package vcompare $::_git_version 1.6.3] >= 0} {
1535 set ls_others [list --exclude-standard]
1537 set ls_others [list --exclude-per-directory=.gitignore]
1538 if {[have_info_exclude]} {
1539 lappend ls_others "--exclude-from=[gitdir info exclude
]"
1541 set user_exclude [get_config core.excludesfile]
1542 if {$user_exclude ne {} && [file readable $user_exclude]} {
1543 lappend ls_others "--exclude-from=[file normalize
$user_exclude]"
1552 ui_status [mc "Scanning
for modified files ...
"]
1553 if {[git-version >= "1.7.2"]} {
1554 set fd_di [git_read diff-index --cached --ignore-submodules=dirty -z [PARENT]]
1556 set fd_di [git_read diff-index --cached -z [PARENT]]
1558 set fd_df [git_read diff-files -z]
1560 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1561 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1563 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1564 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1566 if {[is_config_true gui.displayuntracked]} {
1567 set fd_lo [eval git_read ls-files --others -z $ls_others]
1568 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1569 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1574 proc load_message {file {encoding {}}} {
1577 set f [gitdir $file]
1578 if {[file isfile $f]} {
1579 if {[catch {set fd [open $f r]}]} {
1582 fconfigure $fd -eofchar {}
1583 if {$encoding ne {}} {
1584 fconfigure $fd -encoding $encoding
1586 set content [string trim [read $fd]]
1588 regsub -all -line {[ \r\t]+$} $content {} content
1589 $ui_comm delete 0.0 end
1590 $ui_comm insert end $content
1596 proc run_prepare_commit_msg_hook {} {
1599 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1600 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1601 # empty file but existent file.
1603 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1605 if {[file isfile [gitdir MERGE_MSG]]} {
1606 set pcm_source "merge
"
1607 set fd_mm [open [gitdir MERGE_MSG] r]
1608 fconfigure $fd_mm -encoding utf-8
1609 puts -nonewline $fd_pcm [read $fd_mm]
1611 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1612 set pcm_source "squash
"
1613 set fd_sm [open [gitdir SQUASH_MSG] r]
1614 fconfigure $fd_sm -encoding utf-8
1615 puts -nonewline $fd_pcm [read $fd_sm]
1617 } elseif {[file isfile [get_config commit.template]]} {
1618 set pcm_source "template
"
1619 set fd_sm [open [get_config commit.template] r]
1620 fconfigure $fd_sm -encoding utf-8
1621 puts -nonewline $fd_pcm [read $fd_sm]
1629 set fd_ph [githook_read prepare-commit-msg \
1630 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1632 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1636 ui_status [mc "Calling prepare-commit-msg hook...
"]
1639 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1640 fileevent $fd_ph readable \
1641 [list prepare_commit_msg_hook_wait $fd_ph]
1646 proc prepare_commit_msg_hook_wait {fd_ph} {
1649 append pch_error [read $fd_ph]
1650 fconfigure $fd_ph -blocking 1
1652 if {[catch {close $fd_ph}]} {
1653 ui_status [mc "Commit declined by prepare-commit-msg hook.
"]
1654 hook_failed_popup prepare-commit-msg $pch_error
1655 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1658 load_message PREPARE_COMMIT_MSG
1661 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1664 fconfigure $fd_ph -blocking 0
1665 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1668 proc read_diff_index {fd after} {
1671 append buf_rdi [read $fd]
1673 set n [string length $buf_rdi]
1675 set z1 [string first "\
0" $buf_rdi $c]
1676 if {$z1 == -1} break
1678 set z2 [string first "\
0" $buf_rdi $z1]
1679 if {$z2 == -1} break
1682 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1683 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1685 [encoding convertfrom utf-8 $p] \
1687 [list [lindex $i 0] [lindex $i 2]] \
1693 set buf_rdi [string range $buf_rdi $c end]
1698 rescan_done $fd buf_rdi $after
1701 proc read_diff_files {fd after} {
1704 append buf_rdf [read $fd]
1706 set n [string length $buf_rdf]
1708 set z1 [string first "\
0" $buf_rdf $c]
1709 if {$z1 == -1} break
1711 set z2 [string first "\
0" $buf_rdf $z1]
1712 if {$z2 == -1} break
1715 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1716 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1718 [encoding convertfrom utf-8 $p] \
1721 [list [lindex $i 0] [lindex $i 2]]
1726 set buf_rdf [string range $buf_rdf $c end]
1731 rescan_done $fd buf_rdf $after
1734 proc read_ls_others {fd after} {
1737 append buf_rlo [read $fd]
1738 set pck [split $buf_rlo "\
0"]
1739 set buf_rlo [lindex $pck end]
1740 foreach p [lrange $pck 0 end-1] {
1741 set p [encoding convertfrom utf-8 $p]
1742 if {[string index $p end] eq {/}} {
1743 set p [string range $p 0 end-1]
1747 rescan_done $fd buf_rlo $after
1750 proc rescan_done {fd buf after} {
1751 global rescan_active current_diff_path
1752 global file_states repo_config
1755 if {![eof $fd]} return
1758 if {[incr rescan_active -1] > 0} return
1763 if {$current_diff_path ne {}} { reshow_diff $after }
1764 if {$current_diff_path eq {}} { select_first_diff $after }
1767 proc prune_selection {} {
1768 global file_states selected_paths
1770 foreach path [array names selected_paths] {
1771 if {[catch {set still_here $file_states($path)}]} {
1772 unset selected_paths($path)
1777 ######################################################################
1781 proc mapicon {w state path} {
1784 if {[catch {set r $all_icons($state$w)}]} {
1785 puts "error
: no icon
for $w state
={$state} $path"
1791 proc mapdesc {state path} {
1794 if {[catch {set r $all_descs($state)}]} {
1795 puts "error
: no desc
for state
={$state} $path"
1801 proc ui_status {msg} {
1803 if {[info exists main_status]} {
1804 $main_status show $msg
1810 if {[info exists main_status]} {
1811 $main_status show [mc "Ready.
"]
1815 proc escape_path {path} {
1816 regsub -all {\\} $path "\\\\" path
1817 regsub -all "\n" $path "\\n
" path
1821 proc short_path {path} {
1822 return [escape_path [lindex [file split $path] end]]
1826 set null_sha1 [string repeat 0 40]
1828 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1829 global file_states next_icon_id null_sha1
1831 set s0 [string index $new_state 0]
1832 set s1 [string index $new_state 1]
1834 if {[catch {set info $file_states($path)}]} {
1836 set icon n[incr next_icon_id]
1838 set state [lindex $info 0]
1839 set icon [lindex $info 1]
1840 if {$head_info eq {}} {set head_info [lindex $info 2]}
1841 if {$index_info eq {}} {set index_info [lindex $info 3]}
1844 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1845 elseif {$s0 eq {_}} {set s0 _}
1847 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1848 elseif {$s1 eq {_}} {set s1 _}
1850 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1851 set head_info [list 0 $null_sha1]
1852 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1853 && $head_info eq {}} {
1854 set head_info $index_info
1855 } elseif {$s0 eq {_} && [string index $state 0] ne {_}} {
1856 set index_info $head_info
1860 set file_states($path) [list $s0$s1 $icon \
1861 $head_info $index_info \
1866 proc display_file_helper {w path icon_name old_m new_m} {
1869 if {$new_m eq {_}} {
1870 set lno [lsearch -sorted -exact $file_lists($w) $path]
1872 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1874 $w conf -state normal
1875 $w delete $lno.0 [expr {$lno + 1}].0
1876 $w conf -state disabled
1878 } elseif {$old_m eq {_} && $new_m ne {_}} {
1879 lappend file_lists($w) $path
1880 set file_lists($w) [lsort -unique $file_lists($w)]
1881 set lno [lsearch -sorted -exact $file_lists($w) $path]
1883 $w conf -state normal
1884 $w image create $lno.0 \
1885 -align center -padx 5 -pady 1 \
1887 -image [mapicon $w $new_m $path]
1888 $w insert $lno.1 "[escape_path
$path]\n"
1889 $w conf -state disabled
1890 } elseif {$old_m ne $new_m} {
1891 $w conf -state normal
1892 $w image conf $icon_name -image [mapicon $w $new_m $path]
1893 $w conf -state disabled
1897 proc display_file {path state} {
1898 global file_states selected_paths
1899 global ui_index ui_workdir
1901 set old_m [merge_state $path $state]
1902 set s $file_states($path)
1903 set new_m [lindex $s 0]
1904 set icon_name [lindex $s 1]
1906 set o [string index $old_m 0]
1907 set n [string index $new_m 0]
1914 display_file_helper $ui_index $path $icon_name $o $n
1916 if {[string index $old_m 0] eq {U}} {
1919 set o [string index $old_m 1]
1921 if {[string index $new_m 0] eq {U}} {
1924 set n [string index $new_m 1]
1926 display_file_helper $ui_workdir $path $icon_name $o $n
1928 if {$new_m eq {__}} {
1929 unset file_states($path)
1930 catch {unset selected_paths($path)}
1934 proc display_all_files_helper {w path icon_name m} {
1937 lappend file_lists($w) $path
1938 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1939 $w image create end \
1940 -align center -padx 5 -pady 1 \
1942 -image [mapicon $w $m $path]
1943 $w insert end "[escape_path
$path]\n"
1947 proc display_all_files {} {
1948 global ui_index ui_workdir
1949 global file_states file_lists
1951 global files_warning
1953 $ui_index conf -state normal
1954 $ui_workdir conf -state normal
1956 $ui_index delete 0.0 end
1957 $ui_workdir delete 0.0 end
1960 set file_lists($ui_index) [list]
1961 set file_lists($ui_workdir) [list]
1963 set to_display [lsort [array names file_states]]
1964 set display_limit [get_config gui.maxfilesdisplayed]
1966 foreach path $to_display {
1967 set s $file_states($path)
1969 set icon_name [lindex $s 1]
1971 if {$displayed > $display_limit && [string index $m 1] eq {O} } {
1972 if {!$files_warning} {
1973 # do not repeatedly warn:
1975 info_popup [mc "Display limit
(gui.maxfilesdisplayed
= %s
) reached
, not showing all
%s files.
" \
1976 $display_limit [llength $to_display]]
1981 set s [string index $m 0]
1982 if {$s ne {U} && $s ne {_}} {
1983 display_all_files_helper $ui_index $path \
1987 if {[string index $m 0] eq {U}} {
1990 set s [string index $m 1]
1993 display_all_files_helper $ui_workdir $path \
1999 $ui_index conf -state disabled
2000 $ui_workdir conf -state disabled
2003 ######################################################################
2008 #define mask_width 14
2009 #define mask_height 15
2010 static unsigned char mask_bits[] = {
2011 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2012 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2013 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2016 image create bitmap file_plain -background white -foreground black -data {
2017 #define plain_width 14
2018 #define plain_height 15
2019 static unsigned char plain_bits[] = {
2020 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2021 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2022 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2023 } -maskdata $filemask
2025 image create bitmap file_mod -background white -foreground blue -data {
2026 #define mod_width 14
2027 #define mod_height 15
2028 static unsigned char mod_bits[] = {
2029 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2030 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2031 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2032 } -maskdata $filemask
2034 image create bitmap file_fulltick -background white -foreground "#007000" -data {
2035 #define file_fulltick_width 14
2036 #define file_fulltick_height 15
2037 static unsigned char file_fulltick_bits
[] = {
2038 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2039 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2040 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2041 } -maskdata $filemask
2043 image create bitmap file_question
-background white
-foreground black
-data {
2044 #define file_question_width 14
2045 #define file_question_height 15
2046 static unsigned char file_question_bits
[] = {
2047 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2048 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2049 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2050 } -maskdata $filemask
2052 image create bitmap file_removed
-background white
-foreground red
-data {
2053 #define file_removed_width 14
2054 #define file_removed_height 15
2055 static unsigned char file_removed_bits
[] = {
2056 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2057 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2058 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2059 } -maskdata $filemask
2061 image create bitmap file_merge
-background white
-foreground blue
-data {
2062 #define file_merge_width 14
2063 #define file_merge_height 15
2064 static unsigned char file_merge_bits
[] = {
2065 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2066 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2067 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2068 } -maskdata $filemask
2070 image create bitmap file_statechange
-background white
-foreground green
-data {
2071 #define file_statechange_width 14
2072 #define file_statechange_height 15
2073 static unsigned char file_statechange_bits
[] = {
2074 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
2075 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
2076 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2077 } -maskdata $filemask
2079 set ui_index .vpane.files.index.list
2080 set ui_workdir .vpane.files.workdir.list
2082 set all_icons
(_
$ui_index) file_plain
2083 set all_icons
(A
$ui_index) file_plain
2084 set all_icons
(M
$ui_index) file_fulltick
2085 set all_icons
(D
$ui_index) file_removed
2086 set all_icons
(U
$ui_index) file_merge
2087 set all_icons
(T
$ui_index) file_statechange
2089 set all_icons
(_
$ui_workdir) file_plain
2090 set all_icons
(M
$ui_workdir) file_mod
2091 set all_icons
(D
$ui_workdir) file_question
2092 set all_icons
(U
$ui_workdir) file_merge
2093 set all_icons
(O
$ui_workdir) file_plain
2094 set all_icons
(T
$ui_workdir) file_statechange
2096 set max_status_desc
0
2098 {__
{mc
"Unmodified"}}
2100 {_M
{mc
"Modified, not staged"}}
2101 {M_
{mc
"Staged for commit"}}
2102 {MM
{mc
"Portions staged for commit"}}
2103 {MD
{mc
"Staged for commit, missing"}}
2105 {_T
{mc
"File type changed, not staged"}}
2106 {MT
{mc
"File type changed, old type staged for commit"}}
2107 {AT
{mc
"File type changed, old type staged for commit"}}
2108 {T_
{mc
"File type changed, staged"}}
2109 {TM
{mc
"File type change staged, modification not staged"}}
2110 {TD
{mc
"File type change staged, file missing"}}
2112 {_O
{mc
"Untracked, not staged"}}
2113 {A_
{mc
"Staged for commit"}}
2114 {AM
{mc
"Portions staged for commit"}}
2115 {AD
{mc
"Staged for commit, missing"}}
2118 {D_
{mc
"Staged for removal"}}
2119 {DO
{mc
"Staged for removal, still present"}}
2121 {_U
{mc
"Requires merge resolution"}}
2122 {U_
{mc
"Requires merge resolution"}}
2123 {UU
{mc
"Requires merge resolution"}}
2124 {UM
{mc
"Requires merge resolution"}}
2125 {UD
{mc
"Requires merge resolution"}}
2126 {UT
{mc
"Requires merge resolution"}}
2128 set text
[eval [lindex
$i 1]]
2129 if {$max_status_desc < [string length
$text]} {
2130 set max_status_desc
[string length
$text]
2132 set all_descs
([lindex
$i 0]) $text
2136 ######################################################################
2140 proc scrollbar2many
{list mode args
} {
2141 foreach w
$list {eval $w $mode $args}
2144 proc many2scrollbar
{list mode sb top bottom
} {
2145 $sb set $top $bottom
2146 foreach w
$list {$w $mode moveto
$top}
2149 proc incr_font_size
{font
{amt
1}} {
2150 set sz
[font configure
$font -size]
2152 font configure
$font -size $sz
2153 font configure
${font}bold
-size $sz
2154 font configure
${font}italic
-size $sz
2157 ######################################################################
2161 proc do_gitk
{revs
{is_submodule false
}} {
2162 global current_diff_path file_states current_diff_side ui_index
2163 global _gitdir _gitworktree
2165 # -- Always start gitk through whatever we were loaded with. This
2166 # lets us bypass using shell process on Windows systems.
2168 set exe
[_which gitk
-script]
2169 set cmd
[list
[info nameofexecutable
] $exe]
2171 error_popup
[mc
"Couldn't find gitk in PATH"]
2177 if {!$is_submodule} {
2182 cd $current_diff_path
2183 if {$revs eq
{--}} {
2184 set s
$file_states($current_diff_path)
2187 switch
-glob -- [lindex
$s 0] {
2188 M_
{ set old_sha1
[lindex
[lindex
$s 2] 1] }
2189 _M
{ set old_sha1
[lindex
[lindex
$s 3] 1] }
2191 if {$current_diff_side eq
$ui_index} {
2192 set old_sha1
[lindex
[lindex
$s 2] 1]
2193 set new_sha1
[lindex
[lindex
$s 3] 1]
2195 set old_sha1
[lindex
[lindex
$s 3] 1]
2199 set revs
$old_sha1...
$new_sha1
2201 # GIT_DIR and GIT_WORK_TREE for the submodule are not the ones
2202 # we've been using for the main repository, so unset them.
2203 # TODO we could make life easier (start up faster?) for gitk
2204 # by setting these to the appropriate values to allow gitk
2205 # to skip the heuristics to find their proper value
2207 unset env
(GIT_WORK_TREE
)
2209 eval exec $cmd $revs "--" "--" &
2211 set env
(GIT_DIR
) $_gitdir
2212 set env
(GIT_WORK_TREE
) $_gitworktree
2215 if {[info exists main_status
]} {
2216 set status_operation
[$
::main_status \
2218 [mc
"Starting %s... please wait..." "gitk"]]
2220 after
3500 [list
$status_operation stop
]
2225 proc do_git_gui
{} {
2226 global current_diff_path
2228 # -- Always start git gui through whatever we were loaded with. This
2229 # lets us bypass using shell process on Windows systems.
2231 set exe
[list
[_which git
]]
2233 error_popup
[mc
"Couldn't find git gui in PATH"]
2236 global _gitdir _gitworktree
2238 # see note in do_gitk about unsetting these vars when
2239 # running tools in a submodule
2241 unset env
(GIT_WORK_TREE
)
2244 cd $current_diff_path
2246 eval exec $exe gui
&
2248 set env
(GIT_DIR
) $_gitdir
2249 set env
(GIT_WORK_TREE
) $_gitworktree
2252 set status_operation
[$
::main_status \
2254 [mc
"Starting %s... please wait..." "git-gui"]]
2256 after
3500 [list
$status_operation stop
]
2260 # Get the system-specific explorer app/command.
2261 proc get_explorer
{} {
2262 if {[is_Cygwin
] ||
[is_Windows
]} {
2263 set explorer
"explorer.exe"
2264 } elseif
{[is_MacOSX
]} {
2267 # freedesktop.org-conforming system is our best shot
2268 set explorer
"xdg-open"
2273 proc do_explore
{} {
2275 set explorer
[get_explorer
]
2276 eval exec $explorer [list
[file nativename
$_gitworktree]] &
2279 # Open file relative to the working tree by the default associated app.
2280 proc do_file_open
{file} {
2282 set explorer
[get_explorer
]
2283 set full_file_path
[file join $_gitworktree $file]
2284 exec $explorer [file nativename
$full_file_path] &
2290 proc terminate_me
{win
} {
2292 if {$win ne
{.
}} return
2296 proc do_quit
{{rc
{1}}} {
2297 global ui_comm is_quitting repo_config commit_type
2298 global GITGUI_BCK_exists GITGUI_BCK_i
2299 global ui_comm_spell
2300 global ret_code use_ttk
2302 if {$is_quitting} return
2305 if {[winfo exists
$ui_comm]} {
2306 # -- Stash our current commit buffer.
2308 set save
[gitdir GITGUI_MSG
]
2309 if {$GITGUI_BCK_exists && ![$ui_comm edit modified
]} {
2310 file rename
-force [gitdir GITGUI_BCK
] $save
2311 set GITGUI_BCK_exists
0
2312 } elseif
{[$ui_comm edit modified
]} {
2313 set msg
[string trim
[$ui_comm get
0.0 end
]]
2314 regsub
-all -line {[ \r\t]+$
} $msg {} msg
2315 if {![string match amend
* $commit_type]
2318 set fd
[open
$save w
]
2319 fconfigure
$fd -encoding utf-8
2320 puts
-nonewline $fd $msg
2324 catch
{file delete
$save}
2328 # -- Cancel our spellchecker if its running.
2330 if {[info exists ui_comm_spell
]} {
2334 # -- Remove our editor backup, its not needed.
2336 after cancel
$GITGUI_BCK_i
2337 if {$GITGUI_BCK_exists} {
2338 catch
{file delete
[gitdir GITGUI_BCK
]}
2341 # -- Stash our current window geometry into this repository.
2343 set cfg_wmstate
[wm state .
]
2344 if {[catch
{set rc_wmstate
$repo_config(gui.wmstate
)}]} {
2347 if {$cfg_wmstate ne
$rc_wmstate} {
2348 catch
{git config gui.wmstate
$cfg_wmstate}
2350 if {$cfg_wmstate eq
{zoomed
}} {
2351 # on Windows wm geometry will lie about window
2352 # position (but not size) when window is zoomed
2353 # restore the window before querying wm geometry
2356 set cfg_geometry
[list
]
2357 lappend cfg_geometry
[wm geometry .
]
2359 lappend cfg_geometry
[.vpane sashpos
0]
2360 lappend cfg_geometry
[.vpane.files sashpos
0]
2362 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 0]
2363 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 1]
2365 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
2368 if {$cfg_geometry ne
$rc_geometry} {
2369 catch
{git config gui.geometry
$cfg_geometry}
2375 # Briefly enable send again, working around Tk bug
2376 # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
2377 tk appname
[appname
]
2386 proc ui_do_rescan
{} {
2387 rescan
{force_first_diff ui_ready
}
2394 proc next_diff
{{after
{}}} {
2395 global next_diff_p next_diff_w next_diff_i
2396 show_diff
$next_diff_p $next_diff_w {} {} $after
2399 proc find_anchor_pos
{lst name
} {
2400 set lid
[lsearch
-sorted -exact $lst $name]
2404 foreach lname
$lst {
2405 if {$lname >= $name} break
2413 proc find_file_from
{flist idx delta path mmask
} {
2416 set len
[llength
$flist]
2417 while {$idx >= 0 && $idx < $len} {
2418 set name
[lindex
$flist $idx]
2420 if {$name ne
$path && [info exists file_states
($name)]} {
2421 set state
[lindex
$file_states($name) 0]
2423 if {$mmask eq
{} ||
[regexp
$mmask $state]} {
2434 proc find_next_diff
{w path
{lno
{}} {mmask
{}}} {
2435 global next_diff_p next_diff_w next_diff_i
2436 global file_lists ui_index ui_workdir
2438 set flist
$file_lists($w)
2440 set lno
[find_anchor_pos
$flist $path]
2445 if {$mmask ne
{} && ![regexp
{(^\^
)|
(\$$
)} $mmask]} {
2446 if {$w eq
$ui_index} {
2449 set mmask
"$mmask\$"
2453 set idx
[find_file_from
$flist $lno 1 $path $mmask]
2456 set idx
[find_file_from
$flist $lno -1 $path $mmask]
2461 set next_diff_p
[lindex
$flist $idx]
2462 set next_diff_i
[expr {$idx+1}]
2469 proc next_diff_after_action
{w path
{lno
{}} {mmask
{}}} {
2470 global current_diff_path
2472 if {$path ne
$current_diff_path} {
2474 } elseif
{[find_next_diff
$w $path $lno $mmask]} {
2477 return {reshow_diff
;}
2481 proc select_first_diff
{after
} {
2484 if {[find_next_diff
$ui_workdir {} 1 {^_?U
}] ||
2485 [find_next_diff
$ui_workdir {} 1 {[^O
]$
}]} {
2492 proc force_first_diff
{after
} {
2493 global ui_workdir current_diff_path file_states
2495 if {[info exists file_states
($current_diff_path)]} {
2496 set state
[lindex
$file_states($current_diff_path) 0]
2502 if {[string first
{U
} $state] >= 0} {
2503 # Already a conflict, do nothing
2504 } elseif
{[find_next_diff
$ui_workdir $current_diff_path {} {^_?U
}]} {
2506 } elseif
{[string index
$state 1] ne
{O
}} {
2507 # Already a diff & no conflicts, do nothing
2508 } elseif
{[find_next_diff
$ui_workdir $current_diff_path {} {[^O
]$
}]} {
2519 proc toggle_or_diff
{mode w args
} {
2520 global file_states file_lists current_diff_path ui_index ui_workdir
2521 global last_clicked selected_paths file_lists_last_clicked
2523 if {$mode eq
"click"} {
2524 foreach
{x y
} $args break
2525 set pos
[split [$w index @
$x,$y] .
]
2526 foreach
{lno
col} $pos break
2528 if {$mode eq
"toggle"} {
2529 if {$w eq
$ui_workdir} {
2534 if {$w eq
$ui_index} {
2535 do_unstage_selection
2541 if {$last_clicked ne
{}} {
2542 set lno
[lindex
$last_clicked 1]
2544 if {![info exists file_lists
]
2545 ||
![info exists file_lists
($w)]
2546 ||
[llength
$file_lists($w)] == 0} {
2550 set lno
[expr {int
([lindex
[$w tag ranges in_diff
] 0])}]
2552 if {$mode eq
"toggle"} {
2555 incr lno
[expr {$mode eq
"up" ?
-1 : 1}]
2560 if {![info exists file_lists
]
2561 ||
![info exists file_lists
($w)]
2562 ||
[llength
$file_lists($w)] < $lno - 1} {
2565 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2572 set last_clicked
[list
$w $lno]
2574 array
unset selected_paths
2575 $ui_index tag remove in_sel
0.0 end
2576 $ui_workdir tag remove in_sel
0.0 end
2578 set file_lists_last_clicked
($w) $path
2580 # Determine the state of the file
2581 if {[info exists file_states
($path)]} {
2582 set state
[lindex
$file_states($path) 0]
2587 # Restage the file, or simply show the diff
2588 if {$col == 0 && $y > 1} {
2589 # Conflicts need special handling
2590 if {[string first
{U
} $state] >= 0} {
2591 # $w must always be $ui_workdir, but...
2592 if {$w ne
$ui_workdir} { set lno
{} }
2593 merge_stage_workdir
$path $lno
2597 if {[string index
$state 1] eq
{O
}} {
2603 set after
[next_diff_after_action
$w $path $lno $mmask]
2605 if {$w eq
$ui_index} {
2607 "Unstaging [short_path $path] from commit" \
2609 [concat
$after {ui_ready
;}]
2610 } elseif
{$w eq
$ui_workdir} {
2612 "Adding [short_path $path]" \
2614 [concat
$after {ui_ready
;}]
2617 set selected_paths
($path) 1
2618 show_diff
$path $w $lno
2622 proc add_one_to_selection
{w x y
} {
2623 global file_lists last_clicked selected_paths
2625 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2626 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2632 if {$last_clicked ne
{}
2633 && [lindex
$last_clicked 0] ne
$w} {
2634 array
unset selected_paths
2635 [lindex
$last_clicked 0] tag remove in_sel
0.0 end
2638 set last_clicked
[list
$w $lno]
2639 if {[catch
{set in_sel
$selected_paths($path)}]} {
2643 unset selected_paths
($path)
2644 $w tag remove in_sel
$lno.0 [expr {$lno + 1}].0
2646 set selected_paths
($path) 1
2647 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
2651 proc add_range_to_selection
{w x y
} {
2652 global file_lists last_clicked selected_paths
2654 if {[lindex
$last_clicked 0] ne
$w} {
2655 toggle_or_diff click
$w $x $y
2659 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2660 set lc
[lindex
$last_clicked 1]
2669 foreach path
[lrange
$file_lists($w) \
2670 [expr {$begin - 1}] \
2671 [expr {$end - 1}]] {
2672 set selected_paths
($path) 1
2674 $w tag add in_sel
$begin.0 [expr {$end + 1}].0
2677 proc show_more_context
{} {
2679 if {$repo_config(gui.diffcontext
) < 99} {
2680 incr repo_config
(gui.diffcontext
)
2685 proc show_less_context
{} {
2687 if {$repo_config(gui.diffcontext
) > 1} {
2688 incr repo_config
(gui.diffcontext
) -1
2693 proc focus_widget
{widget
} {
2694 global file_lists last_clicked selected_paths
2695 global file_lists_last_clicked
2697 if {[llength
$file_lists($widget)] > 0} {
2698 set path
$file_lists_last_clicked($widget)
2699 set index
[lsearch
-sorted -exact $file_lists($widget) $path]
2702 set path
[lindex
$file_lists($widget) $index]
2706 set last_clicked
[list
$widget [expr $index + 1]]
2707 array
unset selected_paths
2708 set selected_paths
($path) 1
2709 show_diff
$path $widget
2713 proc toggle_commit_type
{} {
2714 global commit_type_is_amend
2715 set commit_type_is_amend
[expr !$commit_type_is_amend]
2716 do_select_commit_type
2719 ######################################################################
2727 menu .mbar
-tearoff 0
2729 # -- Apple Menu (Mac OS X only)
2731 .mbar add cascade
-label Apple
-menu .mbar.apple
2734 .mbar add cascade
-label [mc Repository
] -menu .mbar.repository
2735 .mbar add cascade
-label [mc Edit
] -menu .mbar.edit
2736 if {[is_enabled branch
]} {
2737 .mbar add cascade
-label [mc Branch
] -menu .mbar.branch
2739 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2740 .mbar add cascade
-label [mc Commit@@noun
] -menu .mbar.commit
2742 if {[is_enabled transport
]} {
2743 .mbar add cascade
-label [mc Merge
] -menu .mbar.merge
2744 .mbar add cascade
-label [mc Remote
] -menu .mbar.remote
2746 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2747 .mbar add cascade
-label [mc Tools
] -menu .mbar.tools
2750 # -- Repository Menu
2752 menu .mbar.repository
2755 .mbar.repository add
command \
2756 -label [mc
"Explore Working Copy"] \
2757 -command {do_explore
}
2761 # Use /git-bash.exe if available
2762 set normalized
[file normalize $
::argv0
]
2763 regsub
"/mingw../libexec/git-core/git-gui$" \
2764 $normalized "/git-bash.exe" cmdLine
2765 if {$cmdLine != $normalized && [file exists
$cmdLine]} {
2766 set cmdLine
[list
"Git Bash" $cmdLine &]
2768 set cmdLine
[list
"Git Bash" bash
--login -l &]
2770 .mbar.repository add
command \
2771 -label [mc
"Git Bash"] \
2772 -command {eval exec [auto_execok start
] $cmdLine}
2775 if {[is_Windows
] ||
![is_bare
]} {
2776 .mbar.repository add separator
2779 .mbar.repository add
command \
2780 -label [mc
"Browse Current Branch's Files"] \
2781 -command {browser
::new
$current_branch}
2782 set ui_browse_current
[.mbar.repository index last
]
2783 .mbar.repository add
command \
2784 -label [mc
"Browse Branch Files..."] \
2785 -command browser_open
::dialog
2786 .mbar.repository add separator
2788 .mbar.repository add
command \
2789 -label [mc
"Visualize Current Branch's History"] \
2790 -command {do_gitk
$current_branch}
2791 set ui_visualize_current
[.mbar.repository index last
]
2792 .mbar.repository add
command \
2793 -label [mc
"Visualize All Branch History"] \
2794 -command {do_gitk
--all}
2795 .mbar.repository add separator
2797 proc current_branch_write
{args
} {
2798 global current_branch
2799 .mbar.repository entryconf $
::ui_browse_current \
2800 -label [mc
"Browse %s's Files" $current_branch]
2801 .mbar.repository entryconf $
::ui_visualize_current \
2802 -label [mc
"Visualize %s's History" $current_branch]
2804 trace add variable current_branch
write current_branch_write
2806 if {[is_enabled multicommit
]} {
2807 .mbar.repository add
command -label [mc
"Database Statistics"] \
2810 .mbar.repository add
command -label [mc
"Compress Database"] \
2813 .mbar.repository add
command -label [mc
"Verify Database"] \
2814 -command do_fsck_objects
2816 .mbar.repository add separator
2819 .mbar.repository add
command \
2820 -label [mc
"Create Desktop Icon"] \
2821 -command do_cygwin_shortcut
2822 } elseif
{[is_Windows
]} {
2823 .mbar.repository add
command \
2824 -label [mc
"Create Desktop Icon"] \
2825 -command do_windows_shortcut
2826 } elseif
{[is_MacOSX
]} {
2827 .mbar.repository add
command \
2828 -label [mc
"Create Desktop Icon"] \
2829 -command do_macosx_app
2834 proc
::tk
::mac
::Quit
{args
} { do_quit
}
2836 .mbar.repository add
command -label [mc Quit
] \
2844 .mbar.edit add
command -label [mc Undo
] \
2845 -command {catch
{[focus
] edit undo
}} \
2847 .mbar.edit add
command -label [mc Redo
] \
2848 -command {catch
{[focus
] edit redo
}} \
2850 .mbar.edit add separator
2851 .mbar.edit add
command -label [mc Cut
] \
2852 -command {catch
{tk_textCut
[focus
]}} \
2854 .mbar.edit add
command -label [mc Copy
] \
2855 -command {catch
{tk_textCopy
[focus
]}} \
2857 .mbar.edit add
command -label [mc Paste
] \
2858 -command {catch
{tk_textPaste
[focus
]; [focus
] see insert
}} \
2860 .mbar.edit add
command -label [mc Delete
] \
2861 -command {catch
{[focus
] delete sel.first sel.last
}} \
2863 .mbar.edit add separator
2864 .mbar.edit add
command -label [mc
"Select All"] \
2865 -command {catch
{[focus
] tag add sel
0.0 end
}} \
2870 if {[is_enabled branch
]} {
2873 .mbar.branch add
command -label [mc
"Create..."] \
2874 -command branch_create
::dialog \
2876 lappend disable_on_lock
[list .mbar.branch entryconf \
2877 [.mbar.branch index last
] -state]
2879 .mbar.branch add
command -label [mc
"Checkout..."] \
2880 -command branch_checkout
::dialog \
2882 lappend disable_on_lock
[list .mbar.branch entryconf \
2883 [.mbar.branch index last
] -state]
2885 .mbar.branch add
command -label [mc
"Rename..."] \
2886 -command branch_rename
::dialog
2887 lappend disable_on_lock
[list .mbar.branch entryconf \
2888 [.mbar.branch index last
] -state]
2890 .mbar.branch add
command -label [mc
"Delete..."] \
2891 -command branch_delete
::dialog
2892 lappend disable_on_lock
[list .mbar.branch entryconf \
2893 [.mbar.branch index last
] -state]
2895 .mbar.branch add
command -label [mc
"Reset..."] \
2896 -command merge
::reset_hard
2897 lappend disable_on_lock
[list .mbar.branch entryconf \
2898 [.mbar.branch index last
] -state]
2903 proc commit_btn_caption
{} {
2904 if {[is_enabled nocommit
]} {
2907 return [mc Commit@@verb
]
2911 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2914 if {![is_enabled nocommit
]} {
2915 .mbar.commit add checkbutton \
2916 -label [mc
"Amend Last Commit"] \
2917 -accelerator $M1T-E \
2918 -variable commit_type_is_amend \
2919 -command do_select_commit_type
2920 lappend disable_on_lock \
2921 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2923 .mbar.commit add separator
2926 .mbar.commit add
command -label [mc Rescan
] \
2927 -command ui_do_rescan \
2929 lappend disable_on_lock \
2930 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2932 .mbar.commit add
command -label [mc
"Stage To Commit"] \
2933 -command do_add_selection \
2935 lappend disable_on_lock \
2936 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2938 .mbar.commit add
command -label [mc
"Stage Changed Files To Commit"] \
2939 -command do_add_all \
2941 lappend disable_on_lock \
2942 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2944 .mbar.commit add
command -label [mc
"Unstage From Commit"] \
2945 -command do_unstage_selection \
2947 lappend disable_on_lock \
2948 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2950 .mbar.commit add
command -label [mc
"Revert Changes"] \
2951 -command do_revert_selection \
2953 lappend disable_on_lock \
2954 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2956 .mbar.commit add separator
2958 .mbar.commit add
command -label [mc
"Show Less Context"] \
2959 -command show_less_context \
2960 -accelerator $M1T-\
-
2962 .mbar.commit add
command -label [mc
"Show More Context"] \
2963 -command show_more_context \
2966 .mbar.commit add separator
2968 if {![is_enabled nocommitmsg
]} {
2969 .mbar.commit add
command -label [mc
"Sign Off"] \
2970 -command do_signoff \
2974 .mbar.commit add
command -label [commit_btn_caption
] \
2975 -command do_commit \
2976 -accelerator $M1T-Return
2977 lappend disable_on_lock \
2978 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2983 if {[is_enabled branch
]} {
2985 .mbar.merge add
command -label [mc
"Local Merge..."] \
2986 -command merge
::dialog \
2988 lappend disable_on_lock \
2989 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2990 .mbar.merge add
command -label [mc
"Abort Merge..."] \
2991 -command merge
::reset_hard
2992 lappend disable_on_lock \
2993 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2998 if {[is_enabled transport
]} {
3001 .mbar.remote add
command \
3002 -label [mc
"Add..."] \
3003 -command remote_add
::dialog \
3005 .mbar.remote add
command \
3006 -label [mc
"Push..."] \
3007 -command do_push_anywhere \
3009 .mbar.remote add
command \
3010 -label [mc
"Delete Branch..."] \
3011 -command remote_branch_delete
::dialog
3015 proc
::tk
::mac
::ShowPreferences
{} {do_options
}
3019 .mbar.edit add separator
3020 .mbar.edit add
command -label [mc
"Options..."] \
3026 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
3027 set tools_menubar .mbar.tools
3029 $tools_menubar add separator
3030 $tools_menubar add
command -label [mc
"Add..."] -command tools_add
::dialog
3031 $tools_menubar add
command -label [mc
"Remove..."] -command tools_remove
::dialog
3033 if {[array names repo_config guitool.
*.cmd
] ne
{}} {
3040 .mbar add cascade
-label [mc Help
] -menu .mbar.
help
3044 .mbar.apple add
command -label [mc
"About %s" [appname
]] \
3046 .mbar.apple add separator
3048 .mbar.
help add
command -label [mc
"About %s" [appname
]] \
3051 . configure
-menu .mbar
3053 set doc_path
[githtmldir
]
3054 if {$doc_path ne
{}} {
3055 set doc_path
[file join $doc_path index.html
]
3058 set doc_path
[exec cygpath
--mixed $doc_path]
3062 if {[file isfile
$doc_path]} {
3063 set doc_url
"file:$doc_path"
3065 set doc_url
{http
://www.kernel.org
/pub
/software
/scm
/git
/docs
/}
3068 proc start_browser
{url
} {
3069 git
"web--browse" $url
3072 .mbar.
help add
command -label [mc
"Online Documentation"] \
3073 -command [list start_browser
$doc_url]
3075 .mbar.
help add
command -label [mc
"Show SSH Key"] \
3078 unset doc_path doc_url
3080 # -- Standard bindings
3082 wm protocol . WM_DELETE_WINDOW do_quit
3083 bind all
<$M1B-Key-q> do_quit
3084 bind all
<$M1B-Key-Q> do_quit
3087 set toplvl_win
[winfo toplevel
%W
]
3089 # If we are destroying the main window, we should call do_quit to take
3090 # care of cleanup before exiting the program.
3091 if {$toplvl_win eq
"."} {
3098 bind all
<$M1B-Key-w> $m1b_w_script
3099 bind all
<$M1B-Key-W> $m1b_w_script
3103 set subcommand_args
{}
3105 set s
"[mc usage:] $::argv0 $::subcommand $::subcommand_args"
3106 if {[tk windowingsystem
] eq
"win32"} {
3108 tk_messageBox
-icon info
-message $s \
3116 proc normalize_relpath
{path
} {
3118 foreach item
[file split $path] {
3119 if {$item eq
{.
}} continue
3120 if {$item eq
{..
} && [llength
$elements] > 0
3121 && [lindex
$elements end
] ne
{..
}} {
3122 set elements
[lrange
$elements 0 end-1
]
3125 lappend elements
$item
3127 return [eval file join $elements]
3130 # -- Not a normal commit type invocation? Do that instead!
3132 switch
-- $subcommand {
3135 if {$subcommand eq
"blame"} {
3136 set subcommand_args
{[--line=<num
>] rev? path
}
3138 set subcommand_args
{rev? path
}
3140 if {$argv eq
{}} usage
3146 set p
[file join $_prefix $a]
3148 if {$is_path ||
[file exists
$p]} {
3149 if {$path ne
{}} usage
3150 set path
[normalize_relpath
$p]
3152 } elseif
{$a eq
{--}} {
3154 if {$head ne
{}} usage
3159 } elseif
{[regexp
{^
--line=(\d
+)$
} $a a lnum
]} {
3160 if {$jump_spec ne
{} ||
$head ne
{}} usage
3161 set jump_spec
[list
$lnum]
3162 } elseif
{$head eq
{}} {
3163 if {$head ne
{}} usage
3172 if {$head ne
{} && $path eq
{}} {
3173 if {[string index
$head 0] eq
{/}} {
3174 set path
[normalize_relpath
$head]
3177 set path
[normalize_relpath
$_prefix$head]
3185 if {[regexp
{^
[0-9a-f]{1,39}$
} $head]} {
3187 set head [git rev-parse
--verify $head]
3189 if {[tk windowingsystem
] eq
"win32"} {
3190 tk_messageBox
-icon error
-title [mc Error
] -message $err
3197 set current_branch
$head
3201 switch
-- $subcommand {
3203 if {$jump_spec ne
{}} usage
3205 if {$path ne
{} && [file isdirectory
$path]} {
3206 set head $current_branch
3212 browser
::new
$head $path
3215 if {$head eq
{} && ![file exists
$path]} {
3216 catch
{wm withdraw .
}
3220 -title [mc
"git-gui: fatal error"] \
3221 -message [mc
"fatal: cannot stat path %s: No such file or directory" $path]
3224 blame
::new
$head $path $jump_spec
3231 if {[llength
$argv] != 0} {
3234 # fall through to setup UI for commits
3237 set err
"[mc usage:] $argv0 \[{blame|browser|citool}\]"
3238 if {[tk windowingsystem
] eq
"win32"} {
3240 tk_messageBox
-icon error
-message $err \
3251 ${NS}::frame .branch
3252 if {!$use_ttk} {.branch configure
-borderwidth 1 -relief sunken
}
3253 ${NS}::label .branch.l1 \
3254 -text [mc
"Current Branch:"] \
3257 ${NS}::label .branch.cb \
3258 -textvariable current_branch \
3261 pack .branch.l1
-side left
3262 pack .branch.cb
-side left
-fill x
3263 pack .branch
-side top
-fill x
3265 # -- Main Window Layout
3267 ${NS}::panedwindow .vpane
-orient horizontal
3268 ${NS}::panedwindow .vpane.files
-orient vertical
3270 .vpane add .vpane.files
3272 .vpane add .vpane.files
-sticky nsew
-height 100 -width 200
3274 pack .vpane
-anchor n
-side top
-fill both
-expand 1
3276 # -- Working Directory File List
3278 textframe .vpane.files.workdir
-height 100 -width 200
3279 tlabel .vpane.files.workdir.title
-text [mc
"Unstaged Changes"] \
3280 -background lightsalmon
-foreground black
3283 -width 20 -height 10 \
3285 -takefocus 1 -highlightthickness 1\
3286 -cursor $cursor_ptr \
3287 -xscrollcommand {.vpane.files.workdir.sx
set} \
3288 -yscrollcommand {.vpane.files.workdir.sy
set} \
3290 ${NS}::scrollbar .vpane.files.workdir.sx
-orient h
-command [list
$ui_workdir xview
]
3291 ${NS}::scrollbar .vpane.files.workdir.sy
-orient v
-command [list
$ui_workdir yview
]
3292 pack .vpane.files.workdir.title
-side top
-fill x
3293 pack .vpane.files.workdir.sx
-side bottom
-fill x
3294 pack .vpane.files.workdir.sy
-side right
-fill y
3295 pack
$ui_workdir -side left
-fill both
-expand 1
3297 # -- Index File List
3299 textframe .vpane.files.index
-height 100 -width 200
3300 tlabel .vpane.files.index.title \
3301 -text [mc
"Staged Changes (Will Commit)"] \
3302 -background lightgreen
-foreground black
3305 -width 20 -height 10 \
3307 -takefocus 1 -highlightthickness 1\
3308 -cursor $cursor_ptr \
3309 -xscrollcommand {.vpane.files.index.sx
set} \
3310 -yscrollcommand {.vpane.files.index.sy
set} \
3312 ${NS}::scrollbar .vpane.files.index.sx
-orient h
-command [list
$ui_index xview
]
3313 ${NS}::scrollbar .vpane.files.index.sy
-orient v
-command [list
$ui_index yview
]
3314 pack .vpane.files.index.title
-side top
-fill x
3315 pack .vpane.files.index.sx
-side bottom
-fill x
3316 pack .vpane.files.index.sy
-side right
-fill y
3317 pack
$ui_index -side left
-fill both
-expand 1
3319 # -- Insert the workdir and index into the panes
3321 .vpane.files add .vpane.files.workdir
3322 .vpane.files add .vpane.files.index
3324 .vpane.files paneconfigure .vpane.files.workdir
-sticky news
3325 .vpane.files paneconfigure .vpane.files.index
-sticky news
3328 proc set_selection_colors
{w has_focus
} {
3329 foreach tag
[list in_diff in_sel
] {
3331 -background [expr {$has_focus ?
$color::select_bg
: $color::inactive_select_bg
}] \
3332 -foreground [expr {$has_focus ?
$color::select_fg
: $color::inactive_select_fg
}]
3336 foreach i
[list
$ui_index $ui_workdir] {
3339 set_selection_colors
$i 0
3340 bind $i <FocusIn
> { set_selection_colors
%W
1 }
3341 bind $i <FocusOut
> { set_selection_colors
%W
0 }
3345 # -- Diff and Commit Area
3348 ${NS}::panedwindow .vpane.lower
-orient vertical
3349 ${NS}::frame .vpane.lower.commarea
3350 ${NS}::frame .vpane.lower.
diff -relief sunken
-borderwidth 1 -height 500
3351 .vpane.lower add .vpane.lower.
diff
3352 .vpane.lower add .vpane.lower.commarea
3353 .vpane add .vpane.lower
3355 .vpane.lower pane .vpane.lower.
diff -weight 1
3356 .vpane.lower pane .vpane.lower.commarea
-weight 0
3358 .vpane.lower paneconfigure .vpane.lower.
diff -stretch always
3359 .vpane.lower paneconfigure .vpane.lower.commarea
-stretch never
3362 frame .vpane.lower
-height 300 -width 400
3363 frame .vpane.lower.commarea
3364 frame .vpane.lower.
diff -relief sunken
-borderwidth 1
3365 pack .vpane.lower.
diff -fill both
-expand 1
3366 pack .vpane.lower.commarea
-side bottom
-fill x
3367 .vpane add .vpane.lower
3368 .vpane paneconfigure .vpane.lower
-sticky nsew
3371 # -- Commit Area Buttons
3373 ${NS}::frame .vpane.lower.commarea.buttons
3374 ${NS}::label .vpane.lower.commarea.buttons.l
-text {} \
3377 pack .vpane.lower.commarea.buttons.l
-side top
-fill x
3378 pack .vpane.lower.commarea.buttons
-side left
-fill y
3380 ${NS}::button .vpane.lower.commarea.buttons.rescan
-text [mc Rescan
] \
3381 -command ui_do_rescan
3382 pack .vpane.lower.commarea.buttons.rescan
-side top
-fill x
3383 lappend disable_on_lock \
3384 {.vpane.lower.commarea.buttons.rescan conf
-state}
3386 ${NS}::button .vpane.lower.commarea.buttons.incall
-text [mc
"Stage Changed"] \
3388 pack .vpane.lower.commarea.buttons.incall
-side top
-fill x
3389 lappend disable_on_lock \
3390 {.vpane.lower.commarea.buttons.incall conf
-state}
3392 if {![is_enabled nocommitmsg
]} {
3393 ${NS}::button .vpane.lower.commarea.buttons.signoff
-text [mc
"Sign Off"] \
3395 pack .vpane.lower.commarea.buttons.signoff
-side top
-fill x
3398 ${NS}::button .vpane.lower.commarea.buttons.commit
-text [commit_btn_caption
] \
3400 pack .vpane.lower.commarea.buttons.commit
-side top
-fill x
3401 lappend disable_on_lock \
3402 {.vpane.lower.commarea.buttons.commit conf
-state}
3404 if {![is_enabled nocommit
]} {
3405 ${NS}::button .vpane.lower.commarea.buttons.push
-text [mc Push
] \
3406 -command do_push_anywhere
3407 pack .vpane.lower.commarea.buttons.push
-side top
-fill x
3410 # -- Commit Message Buffer
3412 ${NS}::frame .vpane.lower.commarea.buffer
3413 ${NS}::frame .vpane.lower.commarea.buffer.header
3414 set ui_comm .vpane.lower.commarea.buffer.frame.t
3415 set ui_coml .vpane.lower.commarea.buffer.header.l
3417 if {![is_enabled nocommit
]} {
3418 ${NS}::checkbutton .vpane.lower.commarea.buffer.header.amend \
3419 -text [mc
"Amend Last Commit"] \
3420 -variable commit_type_is_amend \
3421 -command do_select_commit_type
3422 lappend disable_on_lock \
3423 [list .vpane.lower.commarea.buffer.header.amend conf
-state]
3426 ${NS}::label
$ui_coml \
3429 proc trace_commit_type
{varname args
} {
3430 global ui_coml commit_type
3431 switch
-glob -- $commit_type {
3432 initial
{set txt
[mc
"Initial Commit Message:"]}
3433 amend
{set txt
[mc
"Amended Commit Message:"]}
3434 amend-initial
{set txt
[mc
"Amended Initial Commit Message:"]}
3435 amend-merge
{set txt
[mc
"Amended Merge Commit Message:"]}
3436 merge
{set txt
[mc
"Merge Commit Message:"]}
3437 * {set txt
[mc
"Commit Message:"]}
3439 $ui_coml conf
-text $txt
3441 trace add variable commit_type
write trace_commit_type
3442 pack
$ui_coml -side left
-fill x
3444 if {![is_enabled nocommit
]} {
3445 pack .vpane.lower.commarea.buffer.header.amend
-side right
3448 textframe .vpane.lower.commarea.buffer.frame
3453 -autoseparators true \
3455 -highlightthickness 1 \
3457 -width $repo_config(gui.commitmsgwidth
) -height 9 -wrap none \
3459 -xscrollcommand {.vpane.lower.commarea.buffer.frame.sbx
set} \
3460 -yscrollcommand {.vpane.lower.commarea.buffer.frame.sby
set}
3461 ${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sbx \
3462 -orient horizontal \
3463 -command [list
$ui_comm xview
]
3464 ${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sby \
3466 -command [list
$ui_comm yview
]
3468 pack .vpane.lower.commarea.buffer.frame.sbx
-side bottom
-fill x
3469 pack .vpane.lower.commarea.buffer.frame.sby
-side right
-fill y
3470 pack
$ui_comm -side left
-fill y
3471 pack .vpane.lower.commarea.buffer.header
-side top
-fill x
3472 pack .vpane.lower.commarea.buffer.frame
-side left
-fill y
3473 pack .vpane.lower.commarea.buffer
-side left
-fill y
3475 # -- Commit Message Buffer Context Menu
3477 set ctxm .vpane.lower.commarea.buffer.ctxm
3478 menu
$ctxm -tearoff 0
3481 -command {tk_textCut
$ui_comm}
3484 -command {tk_textCopy
$ui_comm}
3487 -command {tk_textPaste
$ui_comm}
3489 -label [mc Delete
] \
3490 -command {catch
{$ui_comm delete sel.first sel.last
}}
3493 -label [mc
"Select All"] \
3494 -command {focus
$ui_comm;$ui_comm tag add sel
0.0 end
}
3496 -label [mc
"Copy All"] \
3498 $ui_comm tag add sel
0.0 end
3499 tk_textCopy
$ui_comm
3500 $ui_comm tag remove sel
0.0 end
3504 -label [mc
"Sign Off"] \
3506 set ui_comm_ctxm
$ctxm
3510 proc trace_current_diff_path
{varname args
} {
3511 global current_diff_path diff_actions file_states
3512 if {$current_diff_path eq
{}} {
3518 set p
$current_diff_path
3519 set s
[mapdesc
[lindex
$file_states($p) 0] $p]
3521 set p
[escape_path
$p]
3525 .vpane.lower.
diff.header.status configure
-text $s
3526 .vpane.lower.
diff.header.
file configure
-text $f
3527 .vpane.lower.
diff.header.path configure
-text $p
3528 foreach w
$diff_actions {
3532 trace add variable current_diff_path
write trace_current_diff_path
3534 gold_frame .vpane.lower.
diff.header
3535 tlabel .vpane.lower.
diff.header.status \
3538 -width $max_status_desc \
3541 tlabel .vpane.lower.
diff.header.
file \
3546 tlabel .vpane.lower.
diff.header.path \
3551 -font [eval font create
[font configure font_ui
] -underline 1] \
3553 pack .vpane.lower.
diff.header.status
-side left
3554 pack .vpane.lower.
diff.header.
file -side left
3555 pack .vpane.lower.
diff.header.path
-fill x
3556 set ctxm .vpane.lower.
diff.header.ctxm
3557 menu
$ctxm -tearoff 0
3565 -- $current_diff_path
3569 -command {do_file_open
$current_diff_path}
3570 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3571 bind_button3 .vpane.lower.
diff.header.path
"tk_popup $ctxm %X %Y"
3572 bind .vpane.lower.
diff.header.path
<Button-1
> {do_file_open
$current_diff_path}
3576 textframe .vpane.lower.
diff.body
3577 set ui_diff .vpane.lower.
diff.body.t
3580 -width 80 -height 5 -wrap none \
3582 -takefocus 1 -highlightthickness 1 \
3583 -xscrollcommand {.vpane.lower.
diff.body.sbx
set} \
3584 -yscrollcommand {.vpane.lower.
diff.body.sby
set} \
3586 catch
{$ui_diff configure
-tabstyle wordprocessor
}
3587 ${NS}::scrollbar .vpane.lower.
diff.body.sbx
-orient horizontal \
3588 -command [list
$ui_diff xview
]
3589 ${NS}::scrollbar .vpane.lower.
diff.body.sby
-orient vertical \
3590 -command [list
$ui_diff yview
]
3591 pack .vpane.lower.
diff.body.sbx
-side bottom
-fill x
3592 pack .vpane.lower.
diff.body.sby
-side right
-fill y
3593 pack
$ui_diff -side left
-fill both
-expand 1
3594 pack .vpane.lower.
diff.header
-side top
-fill x
3595 pack .vpane.lower.
diff.body
-side bottom
-fill both
-expand 1
3597 foreach
{n c
} {0 black
1 red4
2 green4
3 yellow4
4 blue4
5 magenta4
6 cyan4
7 grey60
} {
3598 $ui_diff tag configure clr4
$n -background $c
3599 $ui_diff tag configure clri4
$n -foreground $c
3600 $ui_diff tag configure clr3
$n -foreground $c
3601 $ui_diff tag configure clri3
$n -background $c
3603 $ui_diff tag configure clr1
-font font_diffbold
3604 $ui_diff tag configure clr4
-underline 1
3606 $ui_diff tag conf d_info
-foreground blue
-font font_diffbold
3608 $ui_diff tag conf d_cr
-elide true
3609 $ui_diff tag conf d_@
-font font_diffbold
3610 $ui_diff tag conf d_
+ -foreground {#00a000}
3611 $ui_diff tag conf d_-
-foreground red
3613 $ui_diff tag conf d_
++ -foreground {#00a000}
3614 $ui_diff tag conf d_--
-foreground red
3615 $ui_diff tag conf d_
+s \
3616 -foreground {#00a000} \
3617 -background {#e2effa}
3618 $ui_diff tag conf d_-s \
3620 -background {#e2effa}
3621 $ui_diff tag conf d_s
+ \
3622 -foreground {#00a000} \
3624 $ui_diff tag conf d_s- \
3628 $ui_diff tag conf d
< \
3629 -foreground orange \
3631 $ui_diff tag conf d| \
3632 -foreground orange \
3634 $ui_diff tag conf d
= \
3635 -foreground orange \
3637 $ui_diff tag conf d
> \
3638 -foreground orange \
3641 $ui_diff tag raise sel
3643 # -- Diff Body Context Menu
3646 proc create_common_diff_popup
{ctxm
} {
3648 -label [mc Refresh
] \
3649 -command reshow_diff
3650 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3653 -command {tk_textCopy
$ui_diff}
3654 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3656 -label [mc
"Select All"] \
3657 -command {focus
$ui_diff;$ui_diff tag add sel
0.0 end
}
3658 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3660 -label [mc
"Copy All"] \
3662 $ui_diff tag add sel
0.0 end
3663 tk_textCopy
$ui_diff
3664 $ui_diff tag remove sel
0.0 end
3666 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3669 -label [mc
"Decrease Font Size"] \
3670 -command {incr_font_size font_diff
-1}
3671 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3673 -label [mc
"Increase Font Size"] \
3674 -command {incr_font_size font_diff
1}
3675 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3679 build_encoding_menu
$emenu [list force_diff_encoding
]
3681 -label [mc
"Encoding"] \
3683 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3685 $ctxm add
command -label [mc
"Options..."] \
3689 set ctxm .vpane.lower.
diff.body.ctxm
3690 menu
$ctxm -tearoff 0
3692 -label [mc
"Apply/Reverse Hunk"] \
3693 -command {apply_or_revert_hunk
$cursorX $cursorY 0}
3694 set ui_diff_applyhunk
[$ctxm index last
]
3695 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyhunk -state]
3697 -label [mc
"Apply/Reverse Line"] \
3698 -command {apply_or_revert_range_or_line
$cursorX $cursorY 0; do_rescan
}
3699 set ui_diff_applyline
[$ctxm index last
]
3700 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyline -state]
3703 -label [mc
"Revert Hunk"] \
3704 -command {apply_or_revert_hunk
$cursorX $cursorY 1}
3705 set ui_diff_reverthunk
[$ctxm index last
]
3706 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_reverthunk -state]
3708 -label [mc
"Revert Line"] \
3709 -command {apply_or_revert_range_or_line
$cursorX $cursorY 1; do_rescan
}
3710 set ui_diff_revertline
[$ctxm index last
]
3711 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_revertline -state]
3713 -label [mc
"Undo Last Revert"] \
3714 -command {undo_last_revert
; do_rescan
}
3715 set ui_diff_undorevert
[$ctxm index last
]
3716 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_undorevert -state]
3719 -label [mc
"Show Less Context"] \
3720 -command show_less_context
3721 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3723 -label [mc
"Show More Context"] \
3724 -command show_more_context
3725 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3727 create_common_diff_popup
$ctxm
3729 set ctxmmg .vpane.lower.
diff.body.ctxmmg
3730 menu
$ctxmmg -tearoff 0
3731 $ctxmmg add
command \
3732 -label [mc
"Run Merge Tool"] \
3733 -command {merge_resolve_tool
}
3734 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3735 $ctxmmg add separator
3736 $ctxmmg add
command \
3737 -label [mc
"Use Remote Version"] \
3738 -command {merge_resolve_one
3}
3739 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3740 $ctxmmg add
command \
3741 -label [mc
"Use Local Version"] \
3742 -command {merge_resolve_one
2}
3743 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3744 $ctxmmg add
command \
3745 -label [mc
"Revert To Base"] \
3746 -command {merge_resolve_one
1}
3747 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3748 $ctxmmg add separator
3749 $ctxmmg add
command \
3750 -label [mc
"Show Less Context"] \
3751 -command show_less_context
3752 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3753 $ctxmmg add
command \
3754 -label [mc
"Show More Context"] \
3755 -command show_more_context
3756 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3757 $ctxmmg add separator
3758 create_common_diff_popup
$ctxmmg
3760 set ctxmsm .vpane.lower.
diff.body.ctxmsm
3761 menu
$ctxmsm -tearoff 0
3762 $ctxmsm add
command \
3763 -label [mc
"Visualize These Changes In The Submodule"] \
3764 -command {do_gitk
-- true
}
3765 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3766 $ctxmsm add
command \
3767 -label [mc
"Visualize Current Branch History In The Submodule"] \
3768 -command {do_gitk
{} true
}
3769 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3770 $ctxmsm add
command \
3771 -label [mc
"Visualize All Branch History In The Submodule"] \
3772 -command {do_gitk
--all true
}
3773 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3774 $ctxmsm add separator
3775 $ctxmsm add
command \
3776 -label [mc
"Start git gui In The Submodule"] \
3777 -command {do_git_gui
}
3778 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3779 $ctxmsm add separator
3780 create_common_diff_popup
$ctxmsm
3782 proc has_textconv
{path
} {
3783 if {[is_config_false gui.textconv
]} {
3786 set filter
[gitattr
$path diff set]
3787 set textconv
[get_config
[join [list
diff $filter textconv
] .
]]
3788 if {$filter ne
{set} && $textconv ne
{}} {
3795 proc popup_diff_menu
{ctxm ctxmmg ctxmsm x y X Y
} {
3796 global current_diff_path file_states last_revert
3799 if {[info exists file_states
($current_diff_path)]} {
3800 set state
[lindex
$file_states($current_diff_path) 0]
3804 if {[string first
{U
} $state] >= 0} {
3805 tk_popup
$ctxmmg $X $Y
3806 } elseif
{$
::is_submodule_diff
} {
3807 tk_popup
$ctxmsm $X $Y
3809 set has_range
[expr {[$
::ui_diff tag nextrange sel
0.0] != {}}]
3810 set u
[mc
"Undo Last Revert"]
3811 if {$
::ui_index eq $
::current_diff_side
} {
3812 set l
[mc
"Unstage Hunk From Commit"]
3813 set h
[mc
"Revert Hunk"]
3816 set t
[mc
"Unstage Lines From Commit"]
3817 set r
[mc
"Revert Lines"]
3819 set t
[mc
"Unstage Line From Commit"]
3820 set r
[mc
"Revert Line"]
3823 set l
[mc
"Stage Hunk For Commit"]
3824 set h
[mc
"Revert Hunk"]
3827 set t
[mc
"Stage Lines For Commit"]
3828 set r
[mc
"Revert Lines"]
3830 set t
[mc
"Stage Line For Commit"]
3831 set r
[mc
"Revert Line"]
3835 ||
$current_diff_path eq
{}
3838 ||
[string match
{?T
} $state]
3839 ||
[string match
{T?
} $state]
3840 ||
[has_textconv
$current_diff_path]} {
3842 set revert_state disabled
3846 # Only allow reverting changes in the working tree. If
3847 # the user wants to revert changes in the index, they
3848 # need to unstage those first.
3849 if {$
::ui_workdir eq $
::current_diff_side
} {
3850 set revert_state normal
3852 set revert_state disabled
3856 if {$last_revert eq
{}} {
3857 set undo_state disabled
3859 set undo_state normal
3862 $ctxm entryconf $
::ui_diff_applyhunk
-state $s -label $l
3863 $ctxm entryconf $
::ui_diff_applyline
-state $s -label $t
3864 $ctxm entryconf $
::ui_diff_revertline
-state $revert_state \
3866 $ctxm entryconf $
::ui_diff_reverthunk
-state $revert_state \
3868 $ctxm entryconf $
::ui_diff_undorevert
-state $undo_state \
3871 tk_popup
$ctxm $X $Y
3874 bind_button3
$ui_diff [list popup_diff_menu
$ctxm $ctxmmg $ctxmsm %x
%y
%X
%Y
]
3878 set main_status
[::status_bar
::new .status
]
3879 pack .status
-anchor w
-side bottom
-fill x
3880 $main_status show
[mc
"Initializing..."]
3884 proc on_ttk_pane_mapped
{w pane pos
} {
3886 after
0 [list after idle
[list
$w sashpos
$pane $pos]]
3888 proc on_tk_pane_mapped
{w pane x y
} {
3890 after
0 [list after idle
[list
$w sash place
$pane $x $y]]
3892 proc on_application_mapped
{} {
3893 global repo_config use_ttk
3895 set gm
$repo_config(gui.geometry
)
3898 [list on_ttk_pane_mapped
%W
0 [lindex
$gm 1]]
3899 bind .vpane.files
<Map
> \
3900 [list on_ttk_pane_mapped
%W
0 [lindex
$gm 2]]
3903 [list on_tk_pane_mapped
%W
0 \
3905 [lindex
[.vpane sash coord
0] 1]]
3906 bind .vpane.files
<Map
> \
3907 [list on_tk_pane_mapped
%W
0 \
3908 [lindex
[.vpane.files sash coord
0] 0] \
3911 wm geometry .
[lindex
$gm 0]
3913 if {[info exists repo_config
(gui.geometry
)]} {
3914 bind .
<Map
> [list on_application_mapped
]
3915 wm geometry .
[lindex
$repo_config(gui.geometry
) 0]
3918 # -- Load window state
3920 if {[info exists repo_config
(gui.wmstate
)]} {
3921 catch
{wm state .
$repo_config(gui.wmstate
)}
3926 bind $ui_comm <$M1B-Key-Return> {do_commit
;break}
3927 bind $ui_comm <$M1B-Key-t> {do_add_selection
;break}
3928 bind $ui_comm <$M1B-Key-T> {do_add_selection
;break}
3929 bind $ui_comm <$M1B-Key-u> {do_unstage_selection
;break}
3930 bind $ui_comm <$M1B-Key-U> {do_unstage_selection
;break}
3931 bind $ui_comm <$M1B-Key-j> {do_revert_selection
;break}
3932 bind $ui_comm <$M1B-Key-J> {do_revert_selection
;break}
3933 bind $ui_comm <$M1B-Key-i> {do_add_all
;break}
3934 bind $ui_comm <$M1B-Key-I> {do_add_all
;break}
3935 bind $ui_comm <$M1B-Key-x> {tk_textCut
%W
;break}
3936 bind $ui_comm <$M1B-Key-X> {tk_textCut
%W
;break}
3937 bind $ui_comm <$M1B-Key-c> {tk_textCopy
%W
;break}
3938 bind $ui_comm <$M1B-Key-C> {tk_textCopy
%W
;break}
3939 bind $ui_comm <$M1B-Key-v> {tk_textPaste
%W
; %W see insert
; break}
3940 bind $ui_comm <$M1B-Key-V> {tk_textPaste
%W
; %W see insert
; break}
3941 bind $ui_comm <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3942 bind $ui_comm <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3943 bind $ui_comm <$M1B-Key-minus> {show_less_context
;break}
3944 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context
;break}
3945 bind $ui_comm <$M1B-Key-equal> {show_more_context
;break}
3946 bind $ui_comm <$M1B-Key-plus> {show_more_context
;break}
3947 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context
;break}
3948 bind $ui_comm <$M1B-Key-BackSpace> {event generate
%W
<Meta-Delete
>;break}
3949 bind $ui_comm <$M1B-Key-Delete> {event generate
%W
<Meta-d
>;break}
3951 bind $ui_diff <$M1B-Key-x> {tk_textCopy
%W
;break}
3952 bind $ui_diff <$M1B-Key-X> {tk_textCopy
%W
;break}
3953 bind $ui_diff <$M1B-Key-c> {tk_textCopy
%W
;break}
3954 bind $ui_diff <$M1B-Key-C> {tk_textCopy
%W
;break}
3955 bind $ui_diff <$M1B-Key-v> {break}
3956 bind $ui_diff <$M1B-Key-V> {break}
3957 bind $ui_diff <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3958 bind $ui_diff <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3959 bind $ui_diff <$M1B-Key-j> {do_revert_selection
;break}
3960 bind $ui_diff <$M1B-Key-J> {do_revert_selection
;break}
3961 bind $ui_diff <Key-Up
> {catch
{%W yview scroll
-1 units
};break}
3962 bind $ui_diff <Key-Down
> {catch
{%W yview scroll
1 units
};break}
3963 bind $ui_diff <Key-Left
> {catch
{%W xview scroll
-1 units
};break}
3964 bind $ui_diff <Key-Right
> {catch
{%W xview scroll
1 units
};break}
3965 bind $ui_diff <Key-k
> {catch
{%W yview scroll
-1 units
};break}
3966 bind $ui_diff <Key-j
> {catch
{%W yview scroll
1 units
};break}
3967 bind $ui_diff <Key-h
> {catch
{%W xview scroll
-1 units
};break}
3968 bind $ui_diff <Key-l
> {catch
{%W xview scroll
1 units
};break}
3969 bind $ui_diff <Control-Key-b
> {catch
{%W yview scroll
-1 pages
};break}
3970 bind $ui_diff <Control-Key-f
> {catch
{%W yview scroll
1 pages
};break}
3971 bind $ui_diff <Button-1
> {focus
%W
}
3973 if {[is_enabled branch
]} {
3974 bind .
<$M1B-Key-n> branch_create
::dialog
3975 bind .
<$M1B-Key-N> branch_create
::dialog
3976 bind .
<$M1B-Key-o> branch_checkout
::dialog
3977 bind .
<$M1B-Key-O> branch_checkout
::dialog
3978 bind .
<$M1B-Key-m> merge
::dialog
3979 bind .
<$M1B-Key-M> merge
::dialog
3981 if {[is_enabled transport
]} {
3982 bind .
<$M1B-Key-p> do_push_anywhere
3983 bind .
<$M1B-Key-P> do_push_anywhere
3986 bind .
<Key-F5
> ui_do_rescan
3987 bind .
<$M1B-Key-r> ui_do_rescan
3988 bind .
<$M1B-Key-R> ui_do_rescan
3989 bind .
<$M1B-Key-s> do_signoff
3990 bind .
<$M1B-Key-S> do_signoff
3991 bind .
<$M1B-Key-t> { toggle_or_diff toggle
%W
}
3992 bind .
<$M1B-Key-T> { toggle_or_diff toggle
%W
}
3993 bind .
<$M1B-Key-u> { toggle_or_diff toggle
%W
}
3994 bind .
<$M1B-Key-U> { toggle_or_diff toggle
%W
}
3995 bind .
<$M1B-Key-j> do_revert_selection
3996 bind .
<$M1B-Key-J> do_revert_selection
3997 bind .
<$M1B-Key-i> do_add_all
3998 bind .
<$M1B-Key-I> do_add_all
3999 bind .
<$M1B-Key-e> toggle_commit_type
4000 bind .
<$M1B-Key-E> toggle_commit_type
4001 bind .
<$M1B-Key-minus> {show_less_context
;break}
4002 bind .
<$M1B-Key-KP_Subtract> {show_less_context
;break}
4003 bind .
<$M1B-Key-equal> {show_more_context
;break}
4004 bind .
<$M1B-Key-plus> {show_more_context
;break}
4005 bind .
<$M1B-Key-KP_Add> {show_more_context
;break}
4006 bind .
<$M1B-Key-Return> do_commit
4007 bind .
<$M1B-Key-KP_Enter> do_commit
4008 foreach i
[list
$ui_index $ui_workdir] {
4009 bind $i <Button-1
> { toggle_or_diff click
%W
%x
%y
; break }
4010 bind $i <$M1B-Button-1> { add_one_to_selection
%W
%x
%y
; break }
4011 bind $i <Shift-Button-1
> { add_range_to_selection
%W
%x
%y
; break }
4012 bind $i <Key-Up
> { toggle_or_diff up
%W
; break }
4013 bind $i <Key-Down
> { toggle_or_diff down
%W
; break }
4017 bind .
<Alt-Key-1
> {focus_widget $
::ui_workdir
}
4018 bind .
<Alt-Key-2
> {focus_widget $
::ui_index
}
4019 bind .
<Alt-Key-3
> {focus $
::ui_diff
}
4020 bind .
<Alt-Key-4
> {focus $
::ui_comm
}
4022 set file_lists_last_clicked
($ui_index) {}
4023 set file_lists_last_clicked
($ui_workdir) {}
4025 set file_lists
($ui_index) [list
]
4026 set file_lists
($ui_workdir) [list
]
4028 wm title .
"[appname] ([reponame]) [file normalize $_gitworktree]"
4029 focus
-force $ui_comm
4031 # -- Warn the user about environmental problems. Cygwin's Tcl
4032 # does *not* pass its env array onto any processes it spawns.
4033 # This means that git processes get none of our environment.
4038 set msg
[mc
"Possible environment issues exist.
4040 The following environment variables are probably
4041 going to be ignored by any Git subprocess run
4045 foreach name
[array names env
] {
4046 switch
-regexp -- $name {
4047 {^GIT_INDEX_FILE$
} -
4048 {^GIT_OBJECT_DIRECTORY$
} -
4049 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$
} -
4051 {^GIT_EXTERNAL_DIFF$
} -
4055 {^GIT_
(AUTHOR|COMMITTER
)_DATE$
} {
4056 append msg
" - $name\n"
4059 {^GIT_
(AUTHOR|COMMITTER
)_
(NAME|EMAIL
)$
} {
4060 append msg
" - $name\n"
4062 set suggest_user
$name
4066 if {$ignored_env > 0} {
4068 This is due to a known issue with the
4069 Tcl binary distributed by Cygwin."]
4071 if {$suggest_user ne
{}} {
4074 A good replacement for %s
4075 is placing values for the user.name and
4076 user.email settings into your personal
4082 unset ignored_env msg suggest_user name
4085 # -- Only initialize complex UI if we are going to stay running.
4087 if {[is_enabled transport
]} {
4090 set n
[.mbar.remote index end
]
4091 populate_remotes_menu
4092 set n
[expr {[.mbar.remote index end
] - $n}]
4094 if {[.mbar.remote
type 0] eq
"tearoff"} { incr n
}
4095 .mbar.remote insert
$n separator
4100 if {[winfo exists
$ui_comm]} {
4101 set GITGUI_BCK_exists
[load_message GITGUI_BCK utf-8
]
4103 # -- If both our backup and message files exist use the
4104 # newer of the two files to initialize the buffer.
4106 if {$GITGUI_BCK_exists} {
4107 set m
[gitdir GITGUI_MSG
]
4108 if {[file isfile
$m]} {
4109 if {[file mtime
[gitdir GITGUI_BCK
]] > [file mtime
$m]} {
4110 catch
{file delete
[gitdir GITGUI_MSG
]}
4112 $ui_comm delete
0.0 end
4114 $ui_comm edit modified false
4115 catch
{file delete
[gitdir GITGUI_BCK
]}
4116 set GITGUI_BCK_exists
0
4122 proc backup_commit_buffer
{} {
4123 global ui_comm GITGUI_BCK_exists
4125 set m
[$ui_comm edit modified
]
4126 if {$m ||
$GITGUI_BCK_exists} {
4127 set msg
[string trim
[$ui_comm get
0.0 end
]]
4128 regsub
-all -line {[ \r\t]+$
} $msg {} msg
4131 if {$GITGUI_BCK_exists} {
4132 catch
{file delete
[gitdir GITGUI_BCK
]}
4133 set GITGUI_BCK_exists
0
4137 set fd
[open
[gitdir GITGUI_BCK
] w
]
4138 fconfigure
$fd -encoding utf-8
4139 puts
-nonewline $fd $msg
4141 set GITGUI_BCK_exists
1
4145 $ui_comm edit modified false
4148 set ::GITGUI_BCK_i
[after
2000 backup_commit_buffer
]
4151 backup_commit_buffer
4153 # -- If the user has aspell available we can drive it
4154 # in pipe mode to spellcheck the commit message.
4156 set spell_cmd
[list |
]
4157 set spell_dict
[get_config gui.spellingdictionary
]
4158 lappend spell_cmd aspell
4159 if {$spell_dict ne
{}} {
4160 lappend spell_cmd
--master=$spell_dict
4162 lappend spell_cmd
--mode=none
4163 lappend spell_cmd
--encoding=utf-8
4164 lappend spell_cmd pipe
4165 if {$spell_dict eq
{none
}
4166 ||
[catch
{set spell_fd
[open
$spell_cmd r
+]} spell_err
]} {
4167 bind_button3
$ui_comm [list tk_popup
$ui_comm_ctxm %X
%Y
]
4169 set ui_comm_spell
[spellcheck
::init \
4175 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
4178 lock_index begin-read
4179 if {![winfo ismapped .
]} {
4183 if {[is_enabled initialamend
]} {
4189 if {[is_enabled nocommitmsg
]} {
4190 $ui_comm configure
-state disabled
-background gray
4193 if {[is_enabled multicommit
] && ![is_config_false gui.gcwarning
]} {
4196 if {[is_enabled retcode
]} {
4197 bind .
<Destroy
> {+terminate_me
%W
}
4199 if {$picked && [is_config_true gui.autoexplore
]} {
4203 # Clear "Initializing..." status
4204 after
500 {$main_status show
""}
4208 # indent-tabs-mode: t