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 $text tag conf in_sel -background lightgray
724 bind $text <Motion> break
730 bind . <Visibility> {
731 bind . <Visibility> {}
736 wm iconbitmap . -default $oguilib/git-gui.ico
737 set ::tk::AlwaysShowSelection 1
738 bind . <Control-F2> {console show}
740 # Spoof an X11 display for SSH
741 if {![info exists env(DISPLAY)]} {
742 set env(DISPLAY) :9999
746 image create photo gitlogo -width 16 -height 16
748 gitlogo put #33CC33 -to 7 0 9 2
749 gitlogo put #33CC33 -to 4 2 12 4
750 gitlogo put #33CC33 -to 7 4 9 6
751 gitlogo put #CC3333 -to 4 6 12 8
752 gitlogo put gray26 -to 4 9 6 10
753 gitlogo put gray26 -to 3 10 6 12
754 gitlogo put gray26 -to 8 9 13 11
755 gitlogo put gray26 -to 8 11 10 12
756 gitlogo put gray26 -to 11 11 13 14
757 gitlogo put gray26 -to 3 12 5 14
758 gitlogo put gray26 -to 5 13
759 gitlogo put gray26 -to 10 13
760 gitlogo put gray26 -to 4 14 12 15
761 gitlogo put gray26 -to 5 15 11 16
764 image create photo gitlogo32 -width 32 -height 32
765 gitlogo32 copy gitlogo -zoom 2 2
767 wm iconphoto . -default gitlogo gitlogo32
771 ######################################################################
777 if {[lsearch -exact [font names] TkDefaultFont] != -1} {
778 eval [linsert [font actual TkDefaultFont] 0 font configure font_ui]
779 eval [linsert [font actual TkFixedFont] 0 font create font_diff]
781 font create font_diff -family Courier -size 10
784 eval font configure font_ui [font actual [.dummy cget -font]]
789 font create font_uiitalic
790 font create font_uibold
791 font create font_diffbold
792 font create font_diffitalic
794 foreach class {Button Checkbutton Entry Label
795 Labelframe Listbox Message
796 Radiobutton Spinbox Text} {
797 option add *$class.font font_ui
800 option add *Menu.font font_ui
801 option add *Entry.borderWidth 1 startupFile
802 option add *Entry.relief sunken startupFile
803 option add *RadioButton.anchor w startupFile
807 if {[is_Windows] || [is_MacOSX]} {
808 option add *Menu.tearOff 0
819 proc bind_button3 {w cmd} {
820 bind $w <Any-Button-3> $cmd
822 # Mac OS X sends Button-2 on right click through three-button mouse,
823 # or through trackpad right-clicking (two-finger touch + click).
824 bind $w <Any-Button-2> $cmd
825 bind $w <Control-Button-1> $cmd
829 proc apply_config {} {
830 global repo_config font_descs
832 foreach option $font_descs {
833 set name [lindex $option 0]
834 set font [lindex $option 1]
837 foreach {cn cv} $repo_config(gui.$name) {
838 if {$cn eq {-weight}} {
841 font configure $font $cn $cv
844 font configure $font -weight normal
847 error_popup [strcat [mc "Invalid font specified
in %s
:" "gui.
$name"] "\n\n$err"]
849 foreach {cn cv} [font configure $font] {
850 font configure ${font}bold $cn $cv
851 font configure ${font}italic $cn $cv
853 font configure ${font}bold -weight bold
854 font configure ${font}italic -slant italic
860 if {$repo_config(gui.usettk)} {
861 set use_ttk [package vsatisfies [package provide Tk] 8.5]
864 bind [winfo class .] <<ThemeChanged>> [list InitTheme]
870 set default_config(branch.autosetupmerge) true
871 set default_config(merge.tool) {}
872 set default_config(mergetool.keepbackup) true
873 set default_config(merge.diffstat) true
874 set default_config(merge.summary) false
875 set default_config(merge.verbosity) 2
876 set default_config(user.name) {}
877 set default_config(user.email) {}
879 set default_config(gui.encoding) [encoding system]
880 set default_config(gui.matchtrackingbranch) false
881 set default_config(gui.textconv) true
882 set default_config(gui.pruneduringfetch) false
883 set default_config(gui.trustmtime) false
884 set default_config(gui.fastcopyblame) false
885 set default_config(gui.maxrecentrepo) 10
886 set default_config(gui.copyblamethreshold) 40
887 set default_config(gui.blamehistoryctx) 7
888 set default_config(gui.diffcontext) 5
889 set default_config(gui.diffopts) {}
890 set default_config(gui.commitmsgwidth) 75
891 set default_config(gui.newbranchtemplate) {}
892 set default_config(gui.spellingdictionary) {}
893 set default_config(gui.fontui) [font configure font_ui]
894 set default_config(gui.fontdiff) [font configure font_diff]
895 # TODO: this option should be added to the git-config documentation
896 set default_config(gui.maxfilesdisplayed) 5000
897 set default_config(gui.usettk) 1
898 set default_config(gui.warndetachedcommit) 1
899 set default_config(gui.tabsize) 8
901 {fontui font_ui {mc "Main Font
"}}
902 {fontdiff font_diff {mc "Diff
/Console Font
"}}
904 set default_config(gui.stageuntracked) ask
905 set default_config(gui.displayuntracked) true
907 ######################################################################
911 set _git [_which git]
913 catch {wm withdraw .}
917 -title [mc "git-gui
: fatal error
"] \
918 -message [mc "Cannot
find git
in PATH.
"]
922 ######################################################################
926 if {[catch {set _git_version [git --version]} err]} {
927 catch {wm withdraw .}
931 -title [mc "git-gui
: fatal error
"] \
932 -message "Cannot determine Git version
:
936 [appname
] requires Git
1.5.0 or later.
"
939 if {![regsub {^git version } $_git_version {} _git_version]} {
940 catch {wm withdraw .}
944 -title [mc "git-gui
: fatal error
"] \
945 -message [strcat [mc "Cannot parse Git version string
:"] "\n\n$_git_version"]
949 proc get_trimmed_version {s} {
951 foreach x [split $s -._] {
952 if {[string is integer -strict $x]} {
960 set _real_git_version $_git_version
961 set _git_version [get_trimmed_version $_git_version]
963 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
964 catch {wm withdraw .}
969 -title "[appname
]: warning
" \
970 -message [mc "Git version cannot be determined.
972 %s claims it is version
'%s'.
974 %s requires
at least Git
1.5.0 or later.
976 Assume
'%s' is version
1.5.0?
977 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
978 set _git_version 1.5.0
983 unset _real_git_version
985 proc git-version {args} {
988 switch [llength $args] {
994 set op [lindex $args 0]
995 set vr [lindex $args 1]
996 set cm [package vcompare $_git_version $vr]
997 return [expr $cm $op 0]
1001 set type [lindex $args 0]
1002 set name [lindex $args 1]
1003 set parm [lindex $args 2]
1004 set body [lindex $args 3]
1006 if {($type ne {proc} && $type ne {method})} {
1007 error "Invalid arguments to git-version
"
1009 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
1010 error "Last arm of
$type $name must be default
"
1013 foreach {op vr cb} [lrange $body 0 end-2] {
1014 if {[git-version $op $vr]} {
1015 return [uplevel [list $type $name $parm $cb]]
1019 return [uplevel [list $type $name $parm [lindex $body end]]]
1023 error "git-version
>= x
"
1029 if {[git-version < 1.5]} {
1030 catch {wm withdraw .}
1034 -title [mc "git-gui
: fatal error
"] \
1035 -message "[appname
] requires Git
1.5.0 or later.
1037 You are using
[git-version
]:
1043 ######################################################################
1045 ## configure our library
1047 set idx [file join $oguilib tclIndex]
1048 if {[catch {set fd [open $idx r]} err]} {
1049 catch {wm withdraw .}
1053 -title [mc "git-gui
: fatal error
"] \
1057 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
1059 while {[gets $fd n] >= 0} {
1060 if {$n ne {} && ![string match #* $n]} {
1072 if {[lsearch -exact $loaded $p] >= 0} continue
1073 source [file join $oguilib $p]
1078 set auto_path [concat [list $oguilib] $auto_path]
1080 unset -nocomplain idx fd
1082 ######################################################################
1084 ## config file parsing
1086 git-version proc _parse_config {arr_name args} {
1093 [list git_read config] \
1095 [list --null --list]]
1096 fconfigure $fd_rc -translation binary -encoding utf-8
1097 set buf [read $fd_rc]
1100 foreach line [split $buf "\
0"] {
1101 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
1102 if {[is_many_config $name]} {
1103 lappend arr($name) $value
1105 set arr($name) $value
1107 } elseif {[regexp {^([^\n]+)$} $line line name]} {
1108 # no value given, but interpreting them as
1109 # boolean will be handled as true
1118 set fd_rc [eval [list git_read config --list] $args]
1119 while {[gets $fd_rc line] >= 0} {
1120 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
1121 if {[is_many_config $name]} {
1122 lappend arr($name) $value
1124 set arr($name) $value
1126 } elseif {[regexp {^([^=]+)$} $line line name]} {
1127 # no value given, but interpreting them as
1128 # boolean will be handled as true
1137 proc load_config {include_global} {
1138 global repo_config global_config system_config default_config
1140 if {$include_global} {
1141 _parse_config system_config --system
1142 _parse_config global_config --global
1144 _parse_config repo_config
1146 foreach name [array names default_config] {
1147 if {[catch {set v $system_config($name)}]} {
1148 set system_config($name) $default_config($name)
1151 foreach name [array names system_config] {
1152 if {[catch {set v $global_config($name)}]} {
1153 set global_config($name) $system_config($name)
1155 if {[catch {set v $repo_config($name)}]} {
1156 set repo_config($name) $system_config($name)
1161 ######################################################################
1163 ## feature option selection
1165 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
1170 if {$subcommand eq {gui.sh}} {
1173 if {$subcommand eq {gui} && [llength $argv] > 0} {
1174 set subcommand [lindex $argv 0]
1175 set argv [lrange $argv 1 end]
1178 enable_option multicommit
1179 enable_option branch
1180 enable_option transport
1183 switch -- $subcommand {
1188 disable_option multicommit
1189 disable_option branch
1190 disable_option transport
1193 enable_option singlecommit
1194 enable_option retcode
1196 disable_option multicommit
1197 disable_option branch
1198 disable_option transport
1200 while {[llength $argv] > 0} {
1201 set a [lindex $argv 0]
1204 enable_option initialamend
1207 enable_option nocommit
1208 enable_option nocommitmsg
1211 disable_option nocommitmsg
1218 set argv [lrange $argv 1 end]
1223 ######################################################################
1225 ## execution environment
1227 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
1229 # Suggest our implementation of askpass, if none is set
1230 if {![info exists env(SSH_ASKPASS)]} {
1231 set env(SSH_ASKPASS) [gitexec git-gui--askpass]
1234 ######################################################################
1240 set _gitdir $env(GIT_DIR)
1244 # beware that from the .git dir this sets _gitdir to .
1245 # and _prefix to the empty string
1246 set _gitdir [git rev-parse --git-dir]
1247 set _prefix [git rev-parse --show-prefix]
1251 choose_repository::pick
1255 # we expand the _gitdir when it's just a single dot (i.e. when we're being
1256 # run from the .git dir itself) lest the routines to find the worktree
1258 if {$_gitdir eq ".
"} {
1262 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1263 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1265 if {![file isdirectory $_gitdir]} {
1266 catch {wm withdraw .}
1267 error_popup [strcat [mc "Git directory not found
:"] "\n\n$_gitdir"]
1270 # _gitdir exists, so try loading the config
1274 # v1.7.0 introduced --show-toplevel to return the canonical work-tree
1275 if {[package vcompare $_git_version 1.7.0] >= 0} {
1276 if { [is_Cygwin] } {
1277 catch {set _gitworktree [exec cygpath --windows [git rev-parse --show-toplevel]]}
1279 set _gitworktree [git rev-parse --show-toplevel]
1282 # try to set work tree from environment, core.worktree or use
1283 # cdup to obtain a relative path to the top of the worktree. If
1284 # run from the top, the ./ prefix ensures normalize expands pwd.
1285 if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {
1286 set _gitworktree [get_config core.worktree]
1287 if {$_gitworktree eq ""} {
1288 set _gitworktree [file normalize ./[git rev-parse --show-cdup]]
1293 if {$_prefix ne {}} {
1294 if {$_gitworktree eq {}} {
1295 regsub -all {[^/]+/} $_prefix ../ cdup
1297 set cdup $_gitworktree
1299 if {[catch {cd $cdup} err]} {
1300 catch {wm withdraw .}
1301 error_popup [strcat [mc "Cannot move to top of working directory
:"] "\n\n$err"]
1304 set _gitworktree [pwd]
1306 } elseif {![is_enabled bare]} {
1308 catch {wm withdraw .}
1309 error_popup [strcat [mc "Cannot use bare repository
:"] "\n\n$_gitdir"]
1312 if {$_gitworktree eq {}} {
1313 set _gitworktree [file dirname $_gitdir]
1315 if {[catch {cd $_gitworktree} err]} {
1316 catch {wm withdraw .}
1317 error_popup [strcat [mc "No working directory
"] " $_gitworktree:\n\n$err"]
1320 set _gitworktree [pwd]
1322 set _reponame [file split [file normalize $_gitdir]]
1323 if {[lindex $_reponame end] eq {.git}} {
1324 set _reponame [lindex $_reponame end-1]
1326 set _reponame [lindex $_reponame end]
1329 set env(GIT_DIR) $_gitdir
1330 set env(GIT_WORK_TREE) $_gitworktree
1332 ######################################################################
1336 set current_diff_path {}
1337 set current_diff_side {}
1338 set diff_actions [list]
1342 set MERGE_HEAD [list]
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]} {
1484 $ui_comm edit modified false
1487 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1488 rescan_stage2 {} $after
1491 ui_status [mc "Refreshing
file status...
"]
1492 set fd_rf [git_read update-index \
1498 fconfigure $fd_rf -blocking 0 -translation binary
1499 fileevent $fd_rf readable \
1500 [list rescan_stage2 $fd_rf $after]
1505 set is_git_info_exclude {}
1506 proc have_info_exclude {} {
1507 global is_git_info_exclude
1509 if {$is_git_info_exclude eq {}} {
1510 if {[catch {exec test -f [gitdir info exclude]}]} {
1511 set is_git_info_exclude 0
1513 set is_git_info_exclude 1
1516 return $is_git_info_exclude
1519 proc have_info_exclude {} {
1520 return [file readable [gitdir info exclude]]
1524 proc rescan_stage2 {fd after} {
1525 global rescan_active buf_rdi buf_rdf buf_rlo
1529 if {![eof $fd]} return
1533 if {[package vcompare $::_git_version 1.6.3] >= 0} {
1534 set ls_others [list --exclude-standard]
1536 set ls_others [list --exclude-per-directory=.gitignore]
1537 if {[have_info_exclude]} {
1538 lappend ls_others "--exclude-from=[gitdir info exclude
]"
1540 set user_exclude [get_config core.excludesfile]
1541 if {$user_exclude ne {} && [file readable $user_exclude]} {
1542 lappend ls_others "--exclude-from=[file normalize
$user_exclude]"
1551 ui_status [mc "Scanning
for modified files ...
"]
1552 if {[git-version >= "1.7.2"]} {
1553 set fd_di [git_read diff-index --cached --ignore-submodules=dirty -z [PARENT]]
1555 set fd_di [git_read diff-index --cached -z [PARENT]]
1557 set fd_df [git_read diff-files -z]
1559 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1560 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1562 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1563 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1565 if {[is_config_true gui.displayuntracked]} {
1566 set fd_lo [eval git_read ls-files --others -z $ls_others]
1567 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1568 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1573 proc load_message {file {encoding {}}} {
1576 set f [gitdir $file]
1577 if {[file isfile $f]} {
1578 if {[catch {set fd [open $f r]}]} {
1581 fconfigure $fd -eofchar {}
1582 if {$encoding ne {}} {
1583 fconfigure $fd -encoding $encoding
1585 set content [string trim [read $fd]]
1587 regsub -all -line {[ \r\t]+$} $content {} content
1588 $ui_comm delete 0.0 end
1589 $ui_comm insert end $content
1595 proc run_prepare_commit_msg_hook {} {
1598 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1599 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1600 # empty file but existent file.
1602 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1604 if {[file isfile [gitdir MERGE_MSG]]} {
1605 set pcm_source "merge
"
1606 set fd_mm [open [gitdir MERGE_MSG] r]
1607 fconfigure $fd_mm -encoding utf-8
1608 puts -nonewline $fd_pcm [read $fd_mm]
1610 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1611 set pcm_source "squash
"
1612 set fd_sm [open [gitdir SQUASH_MSG] r]
1613 fconfigure $fd_sm -encoding utf-8
1614 puts -nonewline $fd_pcm [read $fd_sm]
1622 set fd_ph [githook_read prepare-commit-msg \
1623 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1625 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1629 ui_status [mc "Calling prepare-commit-msg hook...
"]
1632 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1633 fileevent $fd_ph readable \
1634 [list prepare_commit_msg_hook_wait $fd_ph]
1639 proc prepare_commit_msg_hook_wait {fd_ph} {
1642 append pch_error [read $fd_ph]
1643 fconfigure $fd_ph -blocking 1
1645 if {[catch {close $fd_ph}]} {
1646 ui_status [mc "Commit declined by prepare-commit-msg hook.
"]
1647 hook_failed_popup prepare-commit-msg $pch_error
1648 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1651 load_message PREPARE_COMMIT_MSG
1654 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1657 fconfigure $fd_ph -blocking 0
1658 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1661 proc read_diff_index {fd after} {
1664 append buf_rdi [read $fd]
1666 set n [string length $buf_rdi]
1668 set z1 [string first "\
0" $buf_rdi $c]
1669 if {$z1 == -1} break
1671 set z2 [string first "\
0" $buf_rdi $z1]
1672 if {$z2 == -1} break
1675 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1676 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1678 [encoding convertfrom utf-8 $p] \
1680 [list [lindex $i 0] [lindex $i 2]] \
1686 set buf_rdi [string range $buf_rdi $c end]
1691 rescan_done $fd buf_rdi $after
1694 proc read_diff_files {fd after} {
1697 append buf_rdf [read $fd]
1699 set n [string length $buf_rdf]
1701 set z1 [string first "\
0" $buf_rdf $c]
1702 if {$z1 == -1} break
1704 set z2 [string first "\
0" $buf_rdf $z1]
1705 if {$z2 == -1} break
1708 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1709 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1711 [encoding convertfrom utf-8 $p] \
1714 [list [lindex $i 0] [lindex $i 2]]
1719 set buf_rdf [string range $buf_rdf $c end]
1724 rescan_done $fd buf_rdf $after
1727 proc read_ls_others {fd after} {
1730 append buf_rlo [read $fd]
1731 set pck [split $buf_rlo "\
0"]
1732 set buf_rlo [lindex $pck end]
1733 foreach p [lrange $pck 0 end-1] {
1734 set p [encoding convertfrom utf-8 $p]
1735 if {[string index $p end] eq {/}} {
1736 set p [string range $p 0 end-1]
1740 rescan_done $fd buf_rlo $after
1743 proc rescan_done {fd buf after} {
1744 global rescan_active current_diff_path
1745 global file_states repo_config
1748 if {![eof $fd]} return
1751 if {[incr rescan_active -1] > 0} return
1756 if {$current_diff_path ne {}} { reshow_diff $after }
1757 if {$current_diff_path eq {}} { select_first_diff $after }
1760 proc prune_selection {} {
1761 global file_states selected_paths
1763 foreach path [array names selected_paths] {
1764 if {[catch {set still_here $file_states($path)}]} {
1765 unset selected_paths($path)
1770 ######################################################################
1774 proc mapicon {w state path} {
1777 if {[catch {set r $all_icons($state$w)}]} {
1778 puts "error
: no icon
for $w state
={$state} $path"
1784 proc mapdesc {state path} {
1787 if {[catch {set r $all_descs($state)}]} {
1788 puts "error
: no desc
for state
={$state} $path"
1794 proc ui_status {msg} {
1796 if {[info exists main_status]} {
1797 $main_status show $msg
1803 if {[info exists main_status]} {
1804 $main_status show [mc "Ready.
"]
1808 proc escape_path {path} {
1809 regsub -all {\\} $path "\\\\" path
1810 regsub -all "\n" $path "\\n
" path
1814 proc short_path {path} {
1815 return [escape_path [lindex [file split $path] end]]
1819 set null_sha1 [string repeat 0 40]
1821 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1822 global file_states next_icon_id null_sha1
1824 set s0 [string index $new_state 0]
1825 set s1 [string index $new_state 1]
1827 if {[catch {set info $file_states($path)}]} {
1829 set icon n[incr next_icon_id]
1831 set state [lindex $info 0]
1832 set icon [lindex $info 1]
1833 if {$head_info eq {}} {set head_info [lindex $info 2]}
1834 if {$index_info eq {}} {set index_info [lindex $info 3]}
1837 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1838 elseif {$s0 eq {_}} {set s0 _}
1840 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1841 elseif {$s1 eq {_}} {set s1 _}
1843 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1844 set head_info [list 0 $null_sha1]
1845 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1846 && $head_info eq {}} {
1847 set head_info $index_info
1848 } elseif {$s0 eq {_} && [string index $state 0] ne {_}} {
1849 set index_info $head_info
1853 set file_states($path) [list $s0$s1 $icon \
1854 $head_info $index_info \
1859 proc display_file_helper {w path icon_name old_m new_m} {
1862 if {$new_m eq {_}} {
1863 set lno [lsearch -sorted -exact $file_lists($w) $path]
1865 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1867 $w conf -state normal
1868 $w delete $lno.0 [expr {$lno + 1}].0
1869 $w conf -state disabled
1871 } elseif {$old_m eq {_} && $new_m ne {_}} {
1872 lappend file_lists($w) $path
1873 set file_lists($w) [lsort -unique $file_lists($w)]
1874 set lno [lsearch -sorted -exact $file_lists($w) $path]
1876 $w conf -state normal
1877 $w image create $lno.0 \
1878 -align center -padx 5 -pady 1 \
1880 -image [mapicon $w $new_m $path]
1881 $w insert $lno.1 "[escape_path
$path]\n"
1882 $w conf -state disabled
1883 } elseif {$old_m ne $new_m} {
1884 $w conf -state normal
1885 $w image conf $icon_name -image [mapicon $w $new_m $path]
1886 $w conf -state disabled
1890 proc display_file {path state} {
1891 global file_states selected_paths
1892 global ui_index ui_workdir
1894 set old_m [merge_state $path $state]
1895 set s $file_states($path)
1896 set new_m [lindex $s 0]
1897 set icon_name [lindex $s 1]
1899 set o [string index $old_m 0]
1900 set n [string index $new_m 0]
1907 display_file_helper $ui_index $path $icon_name $o $n
1909 if {[string index $old_m 0] eq {U}} {
1912 set o [string index $old_m 1]
1914 if {[string index $new_m 0] eq {U}} {
1917 set n [string index $new_m 1]
1919 display_file_helper $ui_workdir $path $icon_name $o $n
1921 if {$new_m eq {__}} {
1922 unset file_states($path)
1923 catch {unset selected_paths($path)}
1927 proc display_all_files_helper {w path icon_name m} {
1930 lappend file_lists($w) $path
1931 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1932 $w image create end \
1933 -align center -padx 5 -pady 1 \
1935 -image [mapicon $w $m $path]
1936 $w insert end "[escape_path
$path]\n"
1940 proc display_all_files {} {
1941 global ui_index ui_workdir
1942 global file_states file_lists
1944 global files_warning
1946 $ui_index conf -state normal
1947 $ui_workdir conf -state normal
1949 $ui_index delete 0.0 end
1950 $ui_workdir delete 0.0 end
1953 set file_lists($ui_index) [list]
1954 set file_lists($ui_workdir) [list]
1956 set to_display [lsort [array names file_states]]
1957 set display_limit [get_config gui.maxfilesdisplayed]
1959 foreach path $to_display {
1960 set s $file_states($path)
1962 set icon_name [lindex $s 1]
1964 if {$displayed > $display_limit && [string index $m 1] eq {O} } {
1965 if {!$files_warning} {
1966 # do not repeatedly warn:
1968 info_popup [mc "Display limit
(gui.maxfilesdisplayed
= %s
) reached
, not showing all
%s files.
" \
1969 $display_limit [llength $to_display]]
1974 set s [string index $m 0]
1975 if {$s ne {U} && $s ne {_}} {
1976 display_all_files_helper $ui_index $path \
1980 if {[string index $m 0] eq {U}} {
1983 set s [string index $m 1]
1986 display_all_files_helper $ui_workdir $path \
1992 $ui_index conf -state disabled
1993 $ui_workdir conf -state disabled
1996 ######################################################################
2001 #define mask_width 14
2002 #define mask_height 15
2003 static unsigned char mask_bits[] = {
2004 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2005 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2006 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2009 image create bitmap file_plain -background white -foreground black -data {
2010 #define plain_width 14
2011 #define plain_height 15
2012 static unsigned char plain_bits[] = {
2013 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2014 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2015 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2016 } -maskdata $filemask
2018 image create bitmap file_mod -background white -foreground blue -data {
2019 #define mod_width 14
2020 #define mod_height 15
2021 static unsigned char mod_bits[] = {
2022 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2023 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2024 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2025 } -maskdata $filemask
2027 image create bitmap file_fulltick -background white -foreground "#007000" -data {
2028 #define file_fulltick_width 14
2029 #define file_fulltick_height 15
2030 static unsigned char file_fulltick_bits
[] = {
2031 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2032 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2033 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2034 } -maskdata $filemask
2036 image create bitmap file_question
-background white
-foreground black
-data {
2037 #define file_question_width 14
2038 #define file_question_height 15
2039 static unsigned char file_question_bits
[] = {
2040 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2041 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2042 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2043 } -maskdata $filemask
2045 image create bitmap file_removed
-background white
-foreground red
-data {
2046 #define file_removed_width 14
2047 #define file_removed_height 15
2048 static unsigned char file_removed_bits
[] = {
2049 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2050 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2051 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2052 } -maskdata $filemask
2054 image create bitmap file_merge
-background white
-foreground blue
-data {
2055 #define file_merge_width 14
2056 #define file_merge_height 15
2057 static unsigned char file_merge_bits
[] = {
2058 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2059 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2060 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2061 } -maskdata $filemask
2063 image create bitmap file_statechange
-background white
-foreground green
-data {
2064 #define file_statechange_width 14
2065 #define file_statechange_height 15
2066 static unsigned char file_statechange_bits
[] = {
2067 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
2068 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
2069 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2070 } -maskdata $filemask
2072 set ui_index .vpane.files.index.list
2073 set ui_workdir .vpane.files.workdir.list
2075 set all_icons
(_
$ui_index) file_plain
2076 set all_icons
(A
$ui_index) file_plain
2077 set all_icons
(M
$ui_index) file_fulltick
2078 set all_icons
(D
$ui_index) file_removed
2079 set all_icons
(U
$ui_index) file_merge
2080 set all_icons
(T
$ui_index) file_statechange
2082 set all_icons
(_
$ui_workdir) file_plain
2083 set all_icons
(M
$ui_workdir) file_mod
2084 set all_icons
(D
$ui_workdir) file_question
2085 set all_icons
(U
$ui_workdir) file_merge
2086 set all_icons
(O
$ui_workdir) file_plain
2087 set all_icons
(T
$ui_workdir) file_statechange
2089 set max_status_desc
0
2091 {__
{mc
"Unmodified"}}
2093 {_M
{mc
"Modified, not staged"}}
2094 {M_
{mc
"Staged for commit"}}
2095 {MM
{mc
"Portions staged for commit"}}
2096 {MD
{mc
"Staged for commit, missing"}}
2098 {_T
{mc
"File type changed, not staged"}}
2099 {MT
{mc
"File type changed, old type staged for commit"}}
2100 {AT
{mc
"File type changed, old type staged for commit"}}
2101 {T_
{mc
"File type changed, staged"}}
2102 {TM
{mc
"File type change staged, modification not staged"}}
2103 {TD
{mc
"File type change staged, file missing"}}
2105 {_O
{mc
"Untracked, not staged"}}
2106 {A_
{mc
"Staged for commit"}}
2107 {AM
{mc
"Portions staged for commit"}}
2108 {AD
{mc
"Staged for commit, missing"}}
2111 {D_
{mc
"Staged for removal"}}
2112 {DO
{mc
"Staged for removal, still present"}}
2114 {_U
{mc
"Requires merge resolution"}}
2115 {U_
{mc
"Requires merge resolution"}}
2116 {UU
{mc
"Requires merge resolution"}}
2117 {UM
{mc
"Requires merge resolution"}}
2118 {UD
{mc
"Requires merge resolution"}}
2119 {UT
{mc
"Requires merge resolution"}}
2121 set text
[eval [lindex
$i 1]]
2122 if {$max_status_desc < [string length
$text]} {
2123 set max_status_desc
[string length
$text]
2125 set all_descs
([lindex
$i 0]) $text
2129 ######################################################################
2133 proc scrollbar2many
{list mode args
} {
2134 foreach w
$list {eval $w $mode $args}
2137 proc many2scrollbar
{list mode sb top bottom
} {
2138 $sb set $top $bottom
2139 foreach w
$list {$w $mode moveto
$top}
2142 proc incr_font_size
{font
{amt
1}} {
2143 set sz
[font configure
$font -size]
2145 font configure
$font -size $sz
2146 font configure
${font}bold
-size $sz
2147 font configure
${font}italic
-size $sz
2150 ######################################################################
2154 proc do_gitk
{revs
{is_submodule false
}} {
2155 global current_diff_path file_states current_diff_side ui_index
2156 global _gitdir _gitworktree
2158 # -- Always start gitk through whatever we were loaded with. This
2159 # lets us bypass using shell process on Windows systems.
2161 set exe
[_which gitk
-script]
2162 set cmd
[list
[info nameofexecutable
] $exe]
2164 error_popup
[mc
"Couldn't find gitk in PATH"]
2170 if {!$is_submodule} {
2175 cd $current_diff_path
2176 if {$revs eq
{--}} {
2177 set s
$file_states($current_diff_path)
2180 switch
-glob -- [lindex
$s 0] {
2181 M_
{ set old_sha1
[lindex
[lindex
$s 2] 1] }
2182 _M
{ set old_sha1
[lindex
[lindex
$s 3] 1] }
2184 if {$current_diff_side eq
$ui_index} {
2185 set old_sha1
[lindex
[lindex
$s 2] 1]
2186 set new_sha1
[lindex
[lindex
$s 3] 1]
2188 set old_sha1
[lindex
[lindex
$s 3] 1]
2192 set revs
$old_sha1...
$new_sha1
2194 # GIT_DIR and GIT_WORK_TREE for the submodule are not the ones
2195 # we've been using for the main repository, so unset them.
2196 # TODO we could make life easier (start up faster?) for gitk
2197 # by setting these to the appropriate values to allow gitk
2198 # to skip the heuristics to find their proper value
2200 unset env
(GIT_WORK_TREE
)
2202 eval exec $cmd $revs "--" "--" &
2204 set env
(GIT_DIR
) $_gitdir
2205 set env
(GIT_WORK_TREE
) $_gitworktree
2208 if {[info exists main_status
]} {
2209 set status_operation
[$
::main_status \
2211 [mc
"Starting %s... please wait..." "gitk"]]
2213 after
3500 [list
$status_operation stop
]
2218 proc do_git_gui
{} {
2219 global current_diff_path
2221 # -- Always start git gui through whatever we were loaded with. This
2222 # lets us bypass using shell process on Windows systems.
2224 set exe
[list
[_which git
]]
2226 error_popup
[mc
"Couldn't find git gui in PATH"]
2229 global _gitdir _gitworktree
2231 # see note in do_gitk about unsetting these vars when
2232 # running tools in a submodule
2234 unset env
(GIT_WORK_TREE
)
2237 cd $current_diff_path
2239 eval exec $exe gui
&
2241 set env
(GIT_DIR
) $_gitdir
2242 set env
(GIT_WORK_TREE
) $_gitworktree
2245 set status_operation
[$
::main_status \
2247 [mc
"Starting %s... please wait..." "git-gui"]]
2249 after
3500 [list
$status_operation stop
]
2253 # Get the system-specific explorer app/command.
2254 proc get_explorer
{} {
2255 if {[is_Cygwin
] ||
[is_Windows
]} {
2256 set explorer
"explorer.exe"
2257 } elseif
{[is_MacOSX
]} {
2260 # freedesktop.org-conforming system is our best shot
2261 set explorer
"xdg-open"
2266 proc do_explore
{} {
2268 set explorer
[get_explorer
]
2269 eval exec $explorer [list
[file nativename
$_gitworktree]] &
2272 # Open file relative to the working tree by the default associated app.
2273 proc do_file_open
{file} {
2275 set explorer
[get_explorer
]
2276 set full_file_path
[file join $_gitworktree $file]
2277 exec $explorer [file nativename
$full_file_path] &
2283 proc terminate_me
{win
} {
2285 if {$win ne
{.
}} return
2289 proc do_quit
{{rc
{1}}} {
2290 global ui_comm is_quitting repo_config commit_type
2291 global GITGUI_BCK_exists GITGUI_BCK_i
2292 global ui_comm_spell
2293 global ret_code use_ttk
2295 if {$is_quitting} return
2298 if {[winfo exists
$ui_comm]} {
2299 # -- Stash our current commit buffer.
2301 set save
[gitdir GITGUI_MSG
]
2302 if {$GITGUI_BCK_exists && ![$ui_comm edit modified
]} {
2303 file rename
-force [gitdir GITGUI_BCK
] $save
2304 set GITGUI_BCK_exists
0
2306 set msg
[string trim
[$ui_comm get
0.0 end
]]
2307 regsub
-all -line {[ \r\t]+$
} $msg {} msg
2308 if {(![string match amend
* $commit_type]
2309 ||
[$ui_comm edit modified
])
2312 set fd
[open
$save w
]
2313 fconfigure
$fd -encoding utf-8
2314 puts
-nonewline $fd $msg
2318 catch
{file delete
$save}
2322 # -- Cancel our spellchecker if its running.
2324 if {[info exists ui_comm_spell
]} {
2328 # -- Remove our editor backup, its not needed.
2330 after cancel
$GITGUI_BCK_i
2331 if {$GITGUI_BCK_exists} {
2332 catch
{file delete
[gitdir GITGUI_BCK
]}
2335 # -- Stash our current window geometry into this repository.
2337 set cfg_wmstate
[wm state .
]
2338 if {[catch
{set rc_wmstate
$repo_config(gui.wmstate
)}]} {
2341 if {$cfg_wmstate ne
$rc_wmstate} {
2342 catch
{git config gui.wmstate
$cfg_wmstate}
2344 if {$cfg_wmstate eq
{zoomed
}} {
2345 # on Windows wm geometry will lie about window
2346 # position (but not size) when window is zoomed
2347 # restore the window before querying wm geometry
2350 set cfg_geometry
[list
]
2351 lappend cfg_geometry
[wm geometry .
]
2353 lappend cfg_geometry
[.vpane sashpos
0]
2354 lappend cfg_geometry
[.vpane.files sashpos
0]
2356 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 0]
2357 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 1]
2359 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
2362 if {$cfg_geometry ne
$rc_geometry} {
2363 catch
{git config gui.geometry
$cfg_geometry}
2369 # Briefly enable send again, working around Tk bug
2370 # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
2371 tk appname
[appname
]
2380 proc ui_do_rescan
{} {
2381 rescan
{force_first_diff ui_ready
}
2388 proc next_diff
{{after
{}}} {
2389 global next_diff_p next_diff_w next_diff_i
2390 show_diff
$next_diff_p $next_diff_w {} {} $after
2393 proc find_anchor_pos
{lst name
} {
2394 set lid
[lsearch
-sorted -exact $lst $name]
2398 foreach lname
$lst {
2399 if {$lname >= $name} break
2407 proc find_file_from
{flist idx delta path mmask
} {
2410 set len
[llength
$flist]
2411 while {$idx >= 0 && $idx < $len} {
2412 set name
[lindex
$flist $idx]
2414 if {$name ne
$path && [info exists file_states
($name)]} {
2415 set state
[lindex
$file_states($name) 0]
2417 if {$mmask eq
{} ||
[regexp
$mmask $state]} {
2428 proc find_next_diff
{w path
{lno
{}} {mmask
{}}} {
2429 global next_diff_p next_diff_w next_diff_i
2430 global file_lists ui_index ui_workdir
2432 set flist
$file_lists($w)
2434 set lno
[find_anchor_pos
$flist $path]
2439 if {$mmask ne
{} && ![regexp
{(^\^
)|
(\$$
)} $mmask]} {
2440 if {$w eq
$ui_index} {
2443 set mmask
"$mmask\$"
2447 set idx
[find_file_from
$flist $lno 1 $path $mmask]
2450 set idx
[find_file_from
$flist $lno -1 $path $mmask]
2455 set next_diff_p
[lindex
$flist $idx]
2456 set next_diff_i
[expr {$idx+1}]
2463 proc next_diff_after_action
{w path
{lno
{}} {mmask
{}}} {
2464 global current_diff_path
2466 if {$path ne
$current_diff_path} {
2468 } elseif
{[find_next_diff
$w $path $lno $mmask]} {
2471 return {reshow_diff
;}
2475 proc select_first_diff
{after
} {
2478 if {[find_next_diff
$ui_workdir {} 1 {^_?U
}] ||
2479 [find_next_diff
$ui_workdir {} 1 {[^O
]$
}]} {
2486 proc force_first_diff
{after
} {
2487 global ui_workdir current_diff_path file_states
2489 if {[info exists file_states
($current_diff_path)]} {
2490 set state
[lindex
$file_states($current_diff_path) 0]
2496 if {[string first
{U
} $state] >= 0} {
2497 # Already a conflict, do nothing
2498 } elseif
{[find_next_diff
$ui_workdir $current_diff_path {} {^_?U
}]} {
2500 } elseif
{[string index
$state 1] ne
{O
}} {
2501 # Already a diff & no conflicts, do nothing
2502 } elseif
{[find_next_diff
$ui_workdir $current_diff_path {} {[^O
]$
}]} {
2513 proc toggle_or_diff
{mode w args
} {
2514 global file_states file_lists current_diff_path ui_index ui_workdir
2515 global last_clicked selected_paths file_lists_last_clicked
2517 if {$mode eq
"click"} {
2518 foreach
{x y
} $args break
2519 set pos
[split [$w index @
$x,$y] .
]
2520 foreach
{lno
col} $pos break
2522 if {$mode eq
"toggle"} {
2523 if {$w eq
$ui_workdir} {
2528 if {$w eq
$ui_index} {
2529 do_unstage_selection
2535 if {$last_clicked ne
{}} {
2536 set lno
[lindex
$last_clicked 1]
2538 if {![info exists file_lists
]
2539 ||
![info exists file_lists
($w)]
2540 ||
[llength
$file_lists($w)] == 0} {
2544 set lno
[expr {int
([lindex
[$w tag ranges in_diff
] 0])}]
2546 if {$mode eq
"toggle"} {
2549 incr lno
[expr {$mode eq
"up" ?
-1 : 1}]
2554 if {![info exists file_lists
]
2555 ||
![info exists file_lists
($w)]
2556 ||
[llength
$file_lists($w)] < $lno - 1} {
2559 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2566 set last_clicked
[list
$w $lno]
2568 array
unset selected_paths
2569 $ui_index tag remove in_sel
0.0 end
2570 $ui_workdir tag remove in_sel
0.0 end
2572 set file_lists_last_clicked
($w) $path
2574 # Determine the state of the file
2575 if {[info exists file_states
($path)]} {
2576 set state
[lindex
$file_states($path) 0]
2581 # Restage the file, or simply show the diff
2582 if {$col == 0 && $y > 1} {
2583 # Conflicts need special handling
2584 if {[string first
{U
} $state] >= 0} {
2585 # $w must always be $ui_workdir, but...
2586 if {$w ne
$ui_workdir} { set lno
{} }
2587 merge_stage_workdir
$path $lno
2591 if {[string index
$state 1] eq
{O
}} {
2597 set after
[next_diff_after_action
$w $path $lno $mmask]
2599 if {$w eq
$ui_index} {
2601 "Unstaging [short_path $path] from commit" \
2603 [concat
$after [list ui_ready
]]
2604 } elseif
{$w eq
$ui_workdir} {
2606 "Adding [short_path $path]" \
2608 [concat
$after [list ui_ready
]]
2611 set selected_paths
($path) 1
2612 show_diff
$path $w $lno
2616 proc add_one_to_selection
{w x y
} {
2617 global file_lists last_clicked selected_paths
2619 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2620 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2626 if {$last_clicked ne
{}
2627 && [lindex
$last_clicked 0] ne
$w} {
2628 array
unset selected_paths
2629 [lindex
$last_clicked 0] tag remove in_sel
0.0 end
2632 set last_clicked
[list
$w $lno]
2633 if {[catch
{set in_sel
$selected_paths($path)}]} {
2637 unset selected_paths
($path)
2638 $w tag remove in_sel
$lno.0 [expr {$lno + 1}].0
2640 set selected_paths
($path) 1
2641 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
2645 proc add_range_to_selection
{w x y
} {
2646 global file_lists last_clicked selected_paths
2648 if {[lindex
$last_clicked 0] ne
$w} {
2649 toggle_or_diff click
$w $x $y
2653 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2654 set lc
[lindex
$last_clicked 1]
2663 foreach path
[lrange
$file_lists($w) \
2664 [expr {$begin - 1}] \
2665 [expr {$end - 1}]] {
2666 set selected_paths
($path) 1
2668 $w tag add in_sel
$begin.0 [expr {$end + 1}].0
2671 proc show_more_context
{} {
2673 if {$repo_config(gui.diffcontext
) < 99} {
2674 incr repo_config
(gui.diffcontext
)
2679 proc show_less_context
{} {
2681 if {$repo_config(gui.diffcontext
) > 1} {
2682 incr repo_config
(gui.diffcontext
) -1
2687 proc focus_widget
{widget
} {
2688 global file_lists last_clicked selected_paths
2689 global file_lists_last_clicked
2691 if {[llength
$file_lists($widget)] > 0} {
2692 set path
$file_lists_last_clicked($widget)
2693 set index
[lsearch
-sorted -exact $file_lists($widget) $path]
2696 set path
[lindex
$file_lists($widget) $index]
2700 set last_clicked
[list
$widget [expr $index + 1]]
2701 array
unset selected_paths
2702 set selected_paths
($path) 1
2703 show_diff
$path $widget
2707 proc toggle_commit_type
{} {
2708 global commit_type_is_amend
2709 set commit_type_is_amend
[expr !$commit_type_is_amend]
2710 do_select_commit_type
2713 ######################################################################
2721 menu .mbar
-tearoff 0
2723 # -- Apple Menu (Mac OS X only)
2725 .mbar add cascade
-label Apple
-menu .mbar.apple
2728 .mbar add cascade
-label [mc Repository
] -menu .mbar.repository
2729 .mbar add cascade
-label [mc Edit
] -menu .mbar.edit
2730 if {[is_enabled branch
]} {
2731 .mbar add cascade
-label [mc Branch
] -menu .mbar.branch
2733 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2734 .mbar add cascade
-label [mc Commit@@noun
] -menu .mbar.commit
2736 if {[is_enabled transport
]} {
2737 .mbar add cascade
-label [mc Merge
] -menu .mbar.merge
2738 .mbar add cascade
-label [mc Remote
] -menu .mbar.remote
2740 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2741 .mbar add cascade
-label [mc Tools
] -menu .mbar.tools
2744 # -- Repository Menu
2746 menu .mbar.repository
2749 .mbar.repository add
command \
2750 -label [mc
"Explore Working Copy"] \
2751 -command {do_explore
}
2755 # Use /git-bash.exe if available
2756 set normalized
[file normalize $
::argv0
]
2757 regsub
"/mingw../libexec/git-core/git-gui$" \
2758 $normalized "/git-bash.exe" cmdLine
2759 if {$cmdLine != $normalized && [file exists
$cmdLine]} {
2760 set cmdLine
[list
"Git Bash" $cmdLine &]
2762 set cmdLine
[list
"Git Bash" bash
--login -l &]
2764 .mbar.repository add
command \
2765 -label [mc
"Git Bash"] \
2766 -command {eval exec [auto_execok start
] $cmdLine}
2769 if {[is_Windows
] ||
![is_bare
]} {
2770 .mbar.repository add separator
2773 .mbar.repository add
command \
2774 -label [mc
"Browse Current Branch's Files"] \
2775 -command {browser
::new
$current_branch}
2776 set ui_browse_current
[.mbar.repository index last
]
2777 .mbar.repository add
command \
2778 -label [mc
"Browse Branch Files..."] \
2779 -command browser_open
::dialog
2780 .mbar.repository add separator
2782 .mbar.repository add
command \
2783 -label [mc
"Visualize Current Branch's History"] \
2784 -command {do_gitk
$current_branch}
2785 set ui_visualize_current
[.mbar.repository index last
]
2786 .mbar.repository add
command \
2787 -label [mc
"Visualize All Branch History"] \
2788 -command {do_gitk
--all}
2789 .mbar.repository add separator
2791 proc current_branch_write
{args
} {
2792 global current_branch
2793 .mbar.repository entryconf $
::ui_browse_current \
2794 -label [mc
"Browse %s's Files" $current_branch]
2795 .mbar.repository entryconf $
::ui_visualize_current \
2796 -label [mc
"Visualize %s's History" $current_branch]
2798 trace add variable current_branch
write current_branch_write
2800 if {[is_enabled multicommit
]} {
2801 .mbar.repository add
command -label [mc
"Database Statistics"] \
2804 .mbar.repository add
command -label [mc
"Compress Database"] \
2807 .mbar.repository add
command -label [mc
"Verify Database"] \
2808 -command do_fsck_objects
2810 .mbar.repository add separator
2813 .mbar.repository add
command \
2814 -label [mc
"Create Desktop Icon"] \
2815 -command do_cygwin_shortcut
2816 } elseif
{[is_Windows
]} {
2817 .mbar.repository add
command \
2818 -label [mc
"Create Desktop Icon"] \
2819 -command do_windows_shortcut
2820 } elseif
{[is_MacOSX
]} {
2821 .mbar.repository add
command \
2822 -label [mc
"Create Desktop Icon"] \
2823 -command do_macosx_app
2828 proc
::tk
::mac
::Quit
{args
} { do_quit
}
2830 .mbar.repository add
command -label [mc Quit
] \
2838 .mbar.edit add
command -label [mc Undo
] \
2839 -command {catch
{[focus
] edit undo
}} \
2841 .mbar.edit add
command -label [mc Redo
] \
2842 -command {catch
{[focus
] edit redo
}} \
2844 .mbar.edit add separator
2845 .mbar.edit add
command -label [mc Cut
] \
2846 -command {catch
{tk_textCut
[focus
]}} \
2848 .mbar.edit add
command -label [mc Copy
] \
2849 -command {catch
{tk_textCopy
[focus
]}} \
2851 .mbar.edit add
command -label [mc Paste
] \
2852 -command {catch
{tk_textPaste
[focus
]; [focus
] see insert
}} \
2854 .mbar.edit add
command -label [mc Delete
] \
2855 -command {catch
{[focus
] delete sel.first sel.last
}} \
2857 .mbar.edit add separator
2858 .mbar.edit add
command -label [mc
"Select All"] \
2859 -command {catch
{[focus
] tag add sel
0.0 end
}} \
2864 if {[is_enabled branch
]} {
2867 .mbar.branch add
command -label [mc
"Create..."] \
2868 -command branch_create
::dialog \
2870 lappend disable_on_lock
[list .mbar.branch entryconf \
2871 [.mbar.branch index last
] -state]
2873 .mbar.branch add
command -label [mc
"Checkout..."] \
2874 -command branch_checkout
::dialog \
2876 lappend disable_on_lock
[list .mbar.branch entryconf \
2877 [.mbar.branch index last
] -state]
2879 .mbar.branch add
command -label [mc
"Rename..."] \
2880 -command branch_rename
::dialog
2881 lappend disable_on_lock
[list .mbar.branch entryconf \
2882 [.mbar.branch index last
] -state]
2884 .mbar.branch add
command -label [mc
"Delete..."] \
2885 -command branch_delete
::dialog
2886 lappend disable_on_lock
[list .mbar.branch entryconf \
2887 [.mbar.branch index last
] -state]
2889 .mbar.branch add
command -label [mc
"Reset..."] \
2890 -command merge
::reset_hard
2891 lappend disable_on_lock
[list .mbar.branch entryconf \
2892 [.mbar.branch index last
] -state]
2897 proc commit_btn_caption
{} {
2898 if {[is_enabled nocommit
]} {
2901 return [mc Commit@@verb
]
2905 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2908 if {![is_enabled nocommit
]} {
2909 .mbar.commit add checkbutton \
2910 -label [mc
"Amend Last Commit"] \
2911 -accelerator $M1T-E \
2912 -variable commit_type_is_amend \
2913 -command do_select_commit_type
2914 lappend disable_on_lock \
2915 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2917 .mbar.commit add separator
2920 .mbar.commit add
command -label [mc Rescan
] \
2921 -command ui_do_rescan \
2923 lappend disable_on_lock \
2924 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2926 .mbar.commit add
command -label [mc
"Stage To Commit"] \
2927 -command do_add_selection \
2929 lappend disable_on_lock \
2930 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2932 .mbar.commit add
command -label [mc
"Stage Changed Files To Commit"] \
2933 -command do_add_all \
2935 lappend disable_on_lock \
2936 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2938 .mbar.commit add
command -label [mc
"Unstage From Commit"] \
2939 -command do_unstage_selection \
2941 lappend disable_on_lock \
2942 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2944 .mbar.commit add
command -label [mc
"Revert Changes"] \
2945 -command do_revert_selection \
2947 lappend disable_on_lock \
2948 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2950 .mbar.commit add separator
2952 .mbar.commit add
command -label [mc
"Show Less Context"] \
2953 -command show_less_context \
2954 -accelerator $M1T-\
-
2956 .mbar.commit add
command -label [mc
"Show More Context"] \
2957 -command show_more_context \
2960 .mbar.commit add separator
2962 if {![is_enabled nocommitmsg
]} {
2963 .mbar.commit add
command -label [mc
"Sign Off"] \
2964 -command do_signoff \
2968 .mbar.commit add
command -label [commit_btn_caption
] \
2969 -command do_commit \
2970 -accelerator $M1T-Return
2971 lappend disable_on_lock \
2972 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2977 if {[is_enabled branch
]} {
2979 .mbar.merge add
command -label [mc
"Local Merge..."] \
2980 -command merge
::dialog \
2982 lappend disable_on_lock \
2983 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2984 .mbar.merge add
command -label [mc
"Abort Merge..."] \
2985 -command merge
::reset_hard
2986 lappend disable_on_lock \
2987 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2992 if {[is_enabled transport
]} {
2995 .mbar.remote add
command \
2996 -label [mc
"Add..."] \
2997 -command remote_add
::dialog \
2999 .mbar.remote add
command \
3000 -label [mc
"Push..."] \
3001 -command do_push_anywhere \
3003 .mbar.remote add
command \
3004 -label [mc
"Delete Branch..."] \
3005 -command remote_branch_delete
::dialog
3009 proc
::tk
::mac
::ShowPreferences
{} {do_options
}
3013 .mbar.edit add separator
3014 .mbar.edit add
command -label [mc
"Options..."] \
3020 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
3021 set tools_menubar .mbar.tools
3023 $tools_menubar add separator
3024 $tools_menubar add
command -label [mc
"Add..."] -command tools_add
::dialog
3025 $tools_menubar add
command -label [mc
"Remove..."] -command tools_remove
::dialog
3027 if {[array names repo_config guitool.
*.cmd
] ne
{}} {
3034 .mbar add cascade
-label [mc Help
] -menu .mbar.
help
3038 .mbar.apple add
command -label [mc
"About %s" [appname
]] \
3040 .mbar.apple add separator
3042 .mbar.
help add
command -label [mc
"About %s" [appname
]] \
3045 . configure
-menu .mbar
3047 set doc_path
[githtmldir
]
3048 if {$doc_path ne
{}} {
3049 set doc_path
[file join $doc_path index.html
]
3052 set doc_path
[exec cygpath
--mixed $doc_path]
3056 if {[file isfile
$doc_path]} {
3057 set doc_url
"file:$doc_path"
3059 set doc_url
{http
://www.kernel.org
/pub
/software
/scm
/git
/docs
/}
3062 proc start_browser
{url
} {
3063 git
"web--browse" $url
3066 .mbar.
help add
command -label [mc
"Online Documentation"] \
3067 -command [list start_browser
$doc_url]
3069 .mbar.
help add
command -label [mc
"Show SSH Key"] \
3072 unset doc_path doc_url
3074 # -- Standard bindings
3076 wm protocol . WM_DELETE_WINDOW do_quit
3077 bind all
<$M1B-Key-q> do_quit
3078 bind all
<$M1B-Key-Q> do_quit
3081 set toplvl_win
[winfo toplevel
%W
]
3083 # If we are destroying the main window, we should call do_quit to take
3084 # care of cleanup before exiting the program.
3085 if {$toplvl_win eq
"."} {
3092 bind all
<$M1B-Key-w> $m1b_w_script
3093 bind all
<$M1B-Key-W> $m1b_w_script
3097 set subcommand_args
{}
3099 set s
"[mc usage:] $::argv0 $::subcommand $::subcommand_args"
3100 if {[tk windowingsystem
] eq
"win32"} {
3102 tk_messageBox
-icon info
-message $s \
3110 proc normalize_relpath
{path
} {
3112 foreach item
[file split $path] {
3113 if {$item eq
{.
}} continue
3114 if {$item eq
{..
} && [llength
$elements] > 0
3115 && [lindex
$elements end
] ne
{..
}} {
3116 set elements
[lrange
$elements 0 end-1
]
3119 lappend elements
$item
3121 return [eval file join $elements]
3124 # -- Not a normal commit type invocation? Do that instead!
3126 switch
-- $subcommand {
3129 if {$subcommand eq
"blame"} {
3130 set subcommand_args
{[--line=<num
>] rev? path
}
3132 set subcommand_args
{rev? path
}
3134 if {$argv eq
{}} usage
3140 set p
[file join $_prefix $a]
3142 if {$is_path ||
[file exists
$p]} {
3143 if {$path ne
{}} usage
3144 set path
[normalize_relpath
$p]
3146 } elseif
{$a eq
{--}} {
3148 if {$head ne
{}} usage
3153 } elseif
{[regexp
{^
--line=(\d
+)$
} $a a lnum
]} {
3154 if {$jump_spec ne
{} ||
$head ne
{}} usage
3155 set jump_spec
[list
$lnum]
3156 } elseif
{$head eq
{}} {
3157 if {$head ne
{}} usage
3166 if {$head ne
{} && $path eq
{}} {
3167 if {[string index
$head 0] eq
{/}} {
3168 set path
[normalize_relpath
$head]
3171 set path
[normalize_relpath
$_prefix$head]
3179 if {[regexp
{^
[0-9a-f]{1,39}$
} $head]} {
3181 set head [git rev-parse
--verify $head]
3183 if {[tk windowingsystem
] eq
"win32"} {
3184 tk_messageBox
-icon error
-title [mc Error
] -message $err
3191 set current_branch
$head
3195 switch
-- $subcommand {
3197 if {$jump_spec ne
{}} usage
3199 if {$path ne
{} && [file isdirectory
$path]} {
3200 set head $current_branch
3206 browser
::new
$head $path
3209 if {$head eq
{} && ![file exists
$path]} {
3210 catch
{wm withdraw .
}
3214 -title [mc
"git-gui: fatal error"] \
3215 -message [mc
"fatal: cannot stat path %s: No such file or directory" $path]
3218 blame
::new
$head $path $jump_spec
3225 if {[llength
$argv] != 0} {
3228 # fall through to setup UI for commits
3231 set err
"[mc usage:] $argv0 \[{blame|browser|citool}\]"
3232 if {[tk windowingsystem
] eq
"win32"} {
3234 tk_messageBox
-icon error
-message $err \
3245 ${NS}::frame .branch
3246 if {!$use_ttk} {.branch configure
-borderwidth 1 -relief sunken
}
3247 ${NS}::label .branch.l1 \
3248 -text [mc
"Current Branch:"] \
3251 ${NS}::label .branch.cb \
3252 -textvariable current_branch \
3255 pack .branch.l1
-side left
3256 pack .branch.cb
-side left
-fill x
3257 pack .branch
-side top
-fill x
3259 # -- Main Window Layout
3261 ${NS}::panedwindow .vpane
-orient horizontal
3262 ${NS}::panedwindow .vpane.files
-orient vertical
3264 .vpane add .vpane.files
3266 .vpane add .vpane.files
-sticky nsew
-height 100 -width 200
3268 pack .vpane
-anchor n
-side top
-fill both
-expand 1
3270 # -- Working Directory File List
3272 textframe .vpane.files.workdir
-height 100 -width 200
3273 tlabel .vpane.files.workdir.title
-text [mc
"Unstaged Changes"] \
3274 -background lightsalmon
-foreground black
3275 ttext
$ui_workdir -background white
-foreground black \
3277 -width 20 -height 10 \
3279 -takefocus 1 -highlightthickness 1\
3280 -cursor $cursor_ptr \
3281 -xscrollcommand {.vpane.files.workdir.sx
set} \
3282 -yscrollcommand {.vpane.files.workdir.sy
set} \
3284 ${NS}::scrollbar .vpane.files.workdir.sx
-orient h
-command [list
$ui_workdir xview
]
3285 ${NS}::scrollbar .vpane.files.workdir.sy
-orient v
-command [list
$ui_workdir yview
]
3286 pack .vpane.files.workdir.title
-side top
-fill x
3287 pack .vpane.files.workdir.sx
-side bottom
-fill x
3288 pack .vpane.files.workdir.sy
-side right
-fill y
3289 pack
$ui_workdir -side left
-fill both
-expand 1
3291 # -- Index File List
3293 textframe .vpane.files.index
-height 100 -width 200
3294 tlabel .vpane.files.index.title \
3295 -text [mc
"Staged Changes (Will Commit)"] \
3296 -background lightgreen
-foreground black
3297 ttext
$ui_index -background white
-foreground black \
3299 -width 20 -height 10 \
3301 -takefocus 1 -highlightthickness 1\
3302 -cursor $cursor_ptr \
3303 -xscrollcommand {.vpane.files.index.sx
set} \
3304 -yscrollcommand {.vpane.files.index.sy
set} \
3306 ${NS}::scrollbar .vpane.files.index.sx
-orient h
-command [list
$ui_index xview
]
3307 ${NS}::scrollbar .vpane.files.index.sy
-orient v
-command [list
$ui_index yview
]
3308 pack .vpane.files.index.title
-side top
-fill x
3309 pack .vpane.files.index.sx
-side bottom
-fill x
3310 pack .vpane.files.index.sy
-side right
-fill y
3311 pack
$ui_index -side left
-fill both
-expand 1
3313 # -- Insert the workdir and index into the panes
3315 .vpane.files add .vpane.files.workdir
3316 .vpane.files add .vpane.files.index
3318 .vpane.files paneconfigure .vpane.files.workdir
-sticky news
3319 .vpane.files paneconfigure .vpane.files.index
-sticky news
3322 foreach i
[list
$ui_index $ui_workdir] {
3324 $i tag conf in_diff
-background [$i tag cget in_sel
-background]
3328 # -- Diff and Commit Area
3331 ${NS}::panedwindow .vpane.lower
-orient vertical
3332 ${NS}::frame .vpane.lower.commarea
3333 ${NS}::frame .vpane.lower.
diff -relief sunken
-borderwidth 1 -height 500
3334 .vpane.lower add .vpane.lower.
diff
3335 .vpane.lower add .vpane.lower.commarea
3336 .vpane add .vpane.lower
3338 .vpane.lower pane .vpane.lower.
diff -weight 1
3339 .vpane.lower pane .vpane.lower.commarea
-weight 0
3341 .vpane.lower paneconfigure .vpane.lower.
diff -stretch always
3342 .vpane.lower paneconfigure .vpane.lower.commarea
-stretch never
3345 frame .vpane.lower
-height 300 -width 400
3346 frame .vpane.lower.commarea
3347 frame .vpane.lower.
diff -relief sunken
-borderwidth 1
3348 pack .vpane.lower.
diff -fill both
-expand 1
3349 pack .vpane.lower.commarea
-side bottom
-fill x
3350 .vpane add .vpane.lower
3351 .vpane paneconfigure .vpane.lower
-sticky nsew
3354 # -- Commit Area Buttons
3356 ${NS}::frame .vpane.lower.commarea.buttons
3357 ${NS}::label .vpane.lower.commarea.buttons.l
-text {} \
3360 pack .vpane.lower.commarea.buttons.l
-side top
-fill x
3361 pack .vpane.lower.commarea.buttons
-side left
-fill y
3363 ${NS}::button .vpane.lower.commarea.buttons.rescan
-text [mc Rescan
] \
3364 -command ui_do_rescan
3365 pack .vpane.lower.commarea.buttons.rescan
-side top
-fill x
3366 lappend disable_on_lock \
3367 {.vpane.lower.commarea.buttons.rescan conf
-state}
3369 ${NS}::button .vpane.lower.commarea.buttons.incall
-text [mc
"Stage Changed"] \
3371 pack .vpane.lower.commarea.buttons.incall
-side top
-fill x
3372 lappend disable_on_lock \
3373 {.vpane.lower.commarea.buttons.incall conf
-state}
3375 if {![is_enabled nocommitmsg
]} {
3376 ${NS}::button .vpane.lower.commarea.buttons.signoff
-text [mc
"Sign Off"] \
3378 pack .vpane.lower.commarea.buttons.signoff
-side top
-fill x
3381 ${NS}::button .vpane.lower.commarea.buttons.commit
-text [commit_btn_caption
] \
3383 pack .vpane.lower.commarea.buttons.commit
-side top
-fill x
3384 lappend disable_on_lock \
3385 {.vpane.lower.commarea.buttons.commit conf
-state}
3387 if {![is_enabled nocommit
]} {
3388 ${NS}::button .vpane.lower.commarea.buttons.push
-text [mc Push
] \
3389 -command do_push_anywhere
3390 pack .vpane.lower.commarea.buttons.push
-side top
-fill x
3393 # -- Commit Message Buffer
3395 ${NS}::frame .vpane.lower.commarea.buffer
3396 ${NS}::frame .vpane.lower.commarea.buffer.header
3397 set ui_comm .vpane.lower.commarea.buffer.frame.t
3398 set ui_coml .vpane.lower.commarea.buffer.header.l
3400 if {![is_enabled nocommit
]} {
3401 ${NS}::checkbutton .vpane.lower.commarea.buffer.header.amend \
3402 -text [mc
"Amend Last Commit"] \
3403 -variable commit_type_is_amend \
3404 -command do_select_commit_type
3405 lappend disable_on_lock \
3406 [list .vpane.lower.commarea.buffer.header.amend conf
-state]
3409 ${NS}::label
$ui_coml \
3412 proc trace_commit_type
{varname args
} {
3413 global ui_coml commit_type
3414 switch
-glob -- $commit_type {
3415 initial
{set txt
[mc
"Initial Commit Message:"]}
3416 amend
{set txt
[mc
"Amended Commit Message:"]}
3417 amend-initial
{set txt
[mc
"Amended Initial Commit Message:"]}
3418 amend-merge
{set txt
[mc
"Amended Merge Commit Message:"]}
3419 merge
{set txt
[mc
"Merge Commit Message:"]}
3420 * {set txt
[mc
"Commit Message:"]}
3422 $ui_coml conf
-text $txt
3424 trace add variable commit_type
write trace_commit_type
3425 pack
$ui_coml -side left
-fill x
3427 if {![is_enabled nocommit
]} {
3428 pack .vpane.lower.commarea.buffer.header.amend
-side right
3431 textframe .vpane.lower.commarea.buffer.frame
3432 ttext
$ui_comm -background white
-foreground black \
3436 -autoseparators true \
3438 -highlightthickness 1 \
3440 -width $repo_config(gui.commitmsgwidth
) -height 9 -wrap none \
3442 -xscrollcommand {.vpane.lower.commarea.buffer.frame.sbx
set} \
3443 -yscrollcommand {.vpane.lower.commarea.buffer.frame.sby
set}
3444 ${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sbx \
3445 -orient horizontal \
3446 -command [list
$ui_comm xview
]
3447 ${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sby \
3449 -command [list
$ui_comm yview
]
3451 pack .vpane.lower.commarea.buffer.frame.sbx
-side bottom
-fill x
3452 pack .vpane.lower.commarea.buffer.frame.sby
-side right
-fill y
3453 pack
$ui_comm -side left
-fill y
3454 pack .vpane.lower.commarea.buffer.header
-side top
-fill x
3455 pack .vpane.lower.commarea.buffer.frame
-side left
-fill y
3456 pack .vpane.lower.commarea.buffer
-side left
-fill y
3458 # -- Commit Message Buffer Context Menu
3460 set ctxm .vpane.lower.commarea.buffer.ctxm
3461 menu
$ctxm -tearoff 0
3464 -command {tk_textCut
$ui_comm}
3467 -command {tk_textCopy
$ui_comm}
3470 -command {tk_textPaste
$ui_comm}
3472 -label [mc Delete
] \
3473 -command {catch
{$ui_comm delete sel.first sel.last
}}
3476 -label [mc
"Select All"] \
3477 -command {focus
$ui_comm;$ui_comm tag add sel
0.0 end
}
3479 -label [mc
"Copy All"] \
3481 $ui_comm tag add sel
0.0 end
3482 tk_textCopy
$ui_comm
3483 $ui_comm tag remove sel
0.0 end
3487 -label [mc
"Sign Off"] \
3489 set ui_comm_ctxm
$ctxm
3493 proc trace_current_diff_path
{varname args
} {
3494 global current_diff_path diff_actions file_states
3495 if {$current_diff_path eq
{}} {
3501 set p
$current_diff_path
3502 set s
[mapdesc
[lindex
$file_states($p) 0] $p]
3504 set p
[escape_path
$p]
3508 .vpane.lower.
diff.header.status configure
-text $s
3509 .vpane.lower.
diff.header.
file configure
-text $f
3510 .vpane.lower.
diff.header.path configure
-text $p
3511 foreach w
$diff_actions {
3515 trace add variable current_diff_path
write trace_current_diff_path
3517 gold_frame .vpane.lower.
diff.header
3518 tlabel .vpane.lower.
diff.header.status \
3521 -width $max_status_desc \
3524 tlabel .vpane.lower.
diff.header.
file \
3529 tlabel .vpane.lower.
diff.header.path \
3534 -font [eval font create
[font configure font_ui
] -underline 1] \
3536 pack .vpane.lower.
diff.header.status
-side left
3537 pack .vpane.lower.
diff.header.
file -side left
3538 pack .vpane.lower.
diff.header.path
-fill x
3539 set ctxm .vpane.lower.
diff.header.ctxm
3540 menu
$ctxm -tearoff 0
3548 -- $current_diff_path
3552 -command {do_file_open
$current_diff_path}
3553 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3554 bind_button3 .vpane.lower.
diff.header.path
"tk_popup $ctxm %X %Y"
3555 bind .vpane.lower.
diff.header.path
<Button-1
> {do_file_open
$current_diff_path}
3559 textframe .vpane.lower.
diff.body
3560 set ui_diff .vpane.lower.
diff.body.t
3561 ttext
$ui_diff -background white
-foreground black \
3563 -width 80 -height 5 -wrap none \
3565 -takefocus 1 -highlightthickness 1 \
3566 -xscrollcommand {.vpane.lower.
diff.body.sbx
set} \
3567 -yscrollcommand {.vpane.lower.
diff.body.sby
set} \
3569 catch
{$ui_diff configure
-tabstyle wordprocessor
}
3570 ${NS}::scrollbar .vpane.lower.
diff.body.sbx
-orient horizontal \
3571 -command [list
$ui_diff xview
]
3572 ${NS}::scrollbar .vpane.lower.
diff.body.sby
-orient vertical \
3573 -command [list
$ui_diff yview
]
3574 pack .vpane.lower.
diff.body.sbx
-side bottom
-fill x
3575 pack .vpane.lower.
diff.body.sby
-side right
-fill y
3576 pack
$ui_diff -side left
-fill both
-expand 1
3577 pack .vpane.lower.
diff.header
-side top
-fill x
3578 pack .vpane.lower.
diff.body
-side bottom
-fill both
-expand 1
3580 foreach
{n c
} {0 black
1 red4
2 green4
3 yellow4
4 blue4
5 magenta4
6 cyan4
7 grey60
} {
3581 $ui_diff tag configure clr4
$n -background $c
3582 $ui_diff tag configure clri4
$n -foreground $c
3583 $ui_diff tag configure clr3
$n -foreground $c
3584 $ui_diff tag configure clri3
$n -background $c
3586 $ui_diff tag configure clr1
-font font_diffbold
3587 $ui_diff tag configure clr4
-underline 1
3589 $ui_diff tag conf d_info
-foreground blue
-font font_diffbold
3591 $ui_diff tag conf d_cr
-elide true
3592 $ui_diff tag conf d_@
-font font_diffbold
3593 $ui_diff tag conf d_
+ -foreground {#00a000}
3594 $ui_diff tag conf d_-
-foreground red
3596 $ui_diff tag conf d_
++ -foreground {#00a000}
3597 $ui_diff tag conf d_--
-foreground red
3598 $ui_diff tag conf d_
+s \
3599 -foreground {#00a000} \
3600 -background {#e2effa}
3601 $ui_diff tag conf d_-s \
3603 -background {#e2effa}
3604 $ui_diff tag conf d_s
+ \
3605 -foreground {#00a000} \
3607 $ui_diff tag conf d_s- \
3611 $ui_diff tag conf d
< \
3612 -foreground orange \
3614 $ui_diff tag conf d| \
3615 -foreground orange \
3617 $ui_diff tag conf d
= \
3618 -foreground orange \
3620 $ui_diff tag conf d
> \
3621 -foreground orange \
3624 $ui_diff tag raise sel
3626 # -- Diff Body Context Menu
3629 proc create_common_diff_popup
{ctxm
} {
3631 -label [mc Refresh
] \
3632 -command reshow_diff
3633 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3636 -command {tk_textCopy
$ui_diff}
3637 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3639 -label [mc
"Select All"] \
3640 -command {focus
$ui_diff;$ui_diff tag add sel
0.0 end
}
3641 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3643 -label [mc
"Copy All"] \
3645 $ui_diff tag add sel
0.0 end
3646 tk_textCopy
$ui_diff
3647 $ui_diff tag remove sel
0.0 end
3649 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3652 -label [mc
"Decrease Font Size"] \
3653 -command {incr_font_size font_diff
-1}
3654 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3656 -label [mc
"Increase Font Size"] \
3657 -command {incr_font_size font_diff
1}
3658 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3662 build_encoding_menu
$emenu [list force_diff_encoding
]
3664 -label [mc
"Encoding"] \
3666 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3668 $ctxm add
command -label [mc
"Options..."] \
3672 set ctxm .vpane.lower.
diff.body.ctxm
3673 menu
$ctxm -tearoff 0
3675 -label [mc
"Apply/Reverse Hunk"] \
3676 -command {apply_or_revert_hunk
$cursorX $cursorY 0}
3677 set ui_diff_applyhunk
[$ctxm index last
]
3678 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyhunk -state]
3680 -label [mc
"Apply/Reverse Line"] \
3681 -command {apply_or_revert_range_or_line
$cursorX $cursorY 0; do_rescan
}
3682 set ui_diff_applyline
[$ctxm index last
]
3683 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyline -state]
3686 -label [mc
"Revert Hunk"] \
3687 -command {apply_or_revert_hunk
$cursorX $cursorY 1}
3688 set ui_diff_reverthunk
[$ctxm index last
]
3689 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_reverthunk -state]
3691 -label [mc
"Revert Line"] \
3692 -command {apply_or_revert_range_or_line
$cursorX $cursorY 1; do_rescan
}
3693 set ui_diff_revertline
[$ctxm index last
]
3694 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_revertline -state]
3696 -label [mc
"Undo Last Revert"] \
3697 -command {undo_last_revert
; do_rescan
}
3698 set ui_diff_undorevert
[$ctxm index last
]
3699 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_undorevert -state]
3702 -label [mc
"Show Less Context"] \
3703 -command show_less_context
3704 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3706 -label [mc
"Show More Context"] \
3707 -command show_more_context
3708 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3710 create_common_diff_popup
$ctxm
3712 set ctxmmg .vpane.lower.
diff.body.ctxmmg
3713 menu
$ctxmmg -tearoff 0
3714 $ctxmmg add
command \
3715 -label [mc
"Run Merge Tool"] \
3716 -command {merge_resolve_tool
}
3717 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3718 $ctxmmg add separator
3719 $ctxmmg add
command \
3720 -label [mc
"Use Remote Version"] \
3721 -command {merge_resolve_one
3}
3722 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3723 $ctxmmg add
command \
3724 -label [mc
"Use Local Version"] \
3725 -command {merge_resolve_one
2}
3726 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3727 $ctxmmg add
command \
3728 -label [mc
"Revert To Base"] \
3729 -command {merge_resolve_one
1}
3730 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3731 $ctxmmg add separator
3732 $ctxmmg add
command \
3733 -label [mc
"Show Less Context"] \
3734 -command show_less_context
3735 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3736 $ctxmmg add
command \
3737 -label [mc
"Show More Context"] \
3738 -command show_more_context
3739 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3740 $ctxmmg add separator
3741 create_common_diff_popup
$ctxmmg
3743 set ctxmsm .vpane.lower.
diff.body.ctxmsm
3744 menu
$ctxmsm -tearoff 0
3745 $ctxmsm add
command \
3746 -label [mc
"Visualize These Changes In The Submodule"] \
3747 -command {do_gitk
-- true
}
3748 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3749 $ctxmsm add
command \
3750 -label [mc
"Visualize Current Branch History In The Submodule"] \
3751 -command {do_gitk
{} true
}
3752 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3753 $ctxmsm add
command \
3754 -label [mc
"Visualize All Branch History In The Submodule"] \
3755 -command {do_gitk
--all true
}
3756 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3757 $ctxmsm add separator
3758 $ctxmsm add
command \
3759 -label [mc
"Start git gui In The Submodule"] \
3760 -command {do_git_gui
}
3761 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3762 $ctxmsm add separator
3763 create_common_diff_popup
$ctxmsm
3765 proc has_textconv
{path
} {
3766 if {[is_config_false gui.textconv
]} {
3769 set filter
[gitattr
$path diff set]
3770 set textconv
[get_config
[join [list
diff $filter textconv
] .
]]
3771 if {$filter ne
{set} && $textconv ne
{}} {
3778 proc popup_diff_menu
{ctxm ctxmmg ctxmsm x y X Y
} {
3779 global current_diff_path file_states last_revert
3782 if {[info exists file_states
($current_diff_path)]} {
3783 set state
[lindex
$file_states($current_diff_path) 0]
3787 if {[string first
{U
} $state] >= 0} {
3788 tk_popup
$ctxmmg $X $Y
3789 } elseif
{$
::is_submodule_diff
} {
3790 tk_popup
$ctxmsm $X $Y
3792 set has_range
[expr {[$
::ui_diff tag nextrange sel
0.0] != {}}]
3793 set u
[mc
"Undo Last Revert"]
3794 if {$
::ui_index eq $
::current_diff_side
} {
3795 set l
[mc
"Unstage Hunk From Commit"]
3796 set h
[mc
"Revert Hunk"]
3799 set t
[mc
"Unstage Lines From Commit"]
3800 set r
[mc
"Revert Lines"]
3802 set t
[mc
"Unstage Line From Commit"]
3803 set r
[mc
"Revert Line"]
3806 set l
[mc
"Stage Hunk For Commit"]
3807 set h
[mc
"Revert Hunk"]
3810 set t
[mc
"Stage Lines For Commit"]
3811 set r
[mc
"Revert Lines"]
3813 set t
[mc
"Stage Line For Commit"]
3814 set r
[mc
"Revert Line"]
3818 ||
$current_diff_path eq
{}
3821 ||
[string match
{?T
} $state]
3822 ||
[string match
{T?
} $state]
3823 ||
[has_textconv
$current_diff_path]} {
3825 set revert_state disabled
3829 # Only allow reverting changes in the working tree. If
3830 # the user wants to revert changes in the index, they
3831 # need to unstage those first.
3832 if {$
::ui_workdir eq $
::current_diff_side
} {
3833 set revert_state normal
3835 set revert_state disabled
3839 if {$last_revert eq
{}} {
3840 set undo_state disabled
3842 set undo_state normal
3845 $ctxm entryconf $
::ui_diff_applyhunk
-state $s -label $l
3846 $ctxm entryconf $
::ui_diff_applyline
-state $s -label $t
3847 $ctxm entryconf $
::ui_diff_revertline
-state $revert_state \
3849 $ctxm entryconf $
::ui_diff_reverthunk
-state $revert_state \
3851 $ctxm entryconf $
::ui_diff_undorevert
-state $undo_state \
3854 tk_popup
$ctxm $X $Y
3857 bind_button3
$ui_diff [list popup_diff_menu
$ctxm $ctxmmg $ctxmsm %x
%y
%X
%Y
]
3861 set main_status
[::status_bar
::new .status
]
3862 pack .status
-anchor w
-side bottom
-fill x
3863 $main_status show
[mc
"Initializing..."]
3867 proc on_ttk_pane_mapped
{w pane pos
} {
3869 after
0 [list after idle
[list
$w sashpos
$pane $pos]]
3871 proc on_tk_pane_mapped
{w pane x y
} {
3873 after
0 [list after idle
[list
$w sash place
$pane $x $y]]
3875 proc on_application_mapped
{} {
3876 global repo_config use_ttk
3878 set gm
$repo_config(gui.geometry
)
3881 [list on_ttk_pane_mapped
%W
0 [lindex
$gm 1]]
3882 bind .vpane.files
<Map
> \
3883 [list on_ttk_pane_mapped
%W
0 [lindex
$gm 2]]
3886 [list on_tk_pane_mapped
%W
0 \
3888 [lindex
[.vpane sash coord
0] 1]]
3889 bind .vpane.files
<Map
> \
3890 [list on_tk_pane_mapped
%W
0 \
3891 [lindex
[.vpane.files sash coord
0] 0] \
3894 wm geometry .
[lindex
$gm 0]
3896 if {[info exists repo_config
(gui.geometry
)]} {
3897 bind .
<Map
> [list on_application_mapped
]
3898 wm geometry .
[lindex
$repo_config(gui.geometry
) 0]
3901 # -- Load window state
3903 if {[info exists repo_config
(gui.wmstate
)]} {
3904 catch
{wm state .
$repo_config(gui.wmstate
)}
3909 bind $ui_comm <$M1B-Key-Return> {do_commit
;break}
3910 bind $ui_comm <$M1B-Key-t> {do_add_selection
;break}
3911 bind $ui_comm <$M1B-Key-T> {do_add_selection
;break}
3912 bind $ui_comm <$M1B-Key-u> {do_unstage_selection
;break}
3913 bind $ui_comm <$M1B-Key-U> {do_unstage_selection
;break}
3914 bind $ui_comm <$M1B-Key-j> {do_revert_selection
;break}
3915 bind $ui_comm <$M1B-Key-J> {do_revert_selection
;break}
3916 bind $ui_comm <$M1B-Key-i> {do_add_all
;break}
3917 bind $ui_comm <$M1B-Key-I> {do_add_all
;break}
3918 bind $ui_comm <$M1B-Key-x> {tk_textCut
%W
;break}
3919 bind $ui_comm <$M1B-Key-X> {tk_textCut
%W
;break}
3920 bind $ui_comm <$M1B-Key-c> {tk_textCopy
%W
;break}
3921 bind $ui_comm <$M1B-Key-C> {tk_textCopy
%W
;break}
3922 bind $ui_comm <$M1B-Key-v> {tk_textPaste
%W
; %W see insert
; break}
3923 bind $ui_comm <$M1B-Key-V> {tk_textPaste
%W
; %W see insert
; break}
3924 bind $ui_comm <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3925 bind $ui_comm <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3926 bind $ui_comm <$M1B-Key-minus> {show_less_context
;break}
3927 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context
;break}
3928 bind $ui_comm <$M1B-Key-equal> {show_more_context
;break}
3929 bind $ui_comm <$M1B-Key-plus> {show_more_context
;break}
3930 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context
;break}
3932 bind $ui_diff <$M1B-Key-x> {tk_textCopy
%W
;break}
3933 bind $ui_diff <$M1B-Key-X> {tk_textCopy
%W
;break}
3934 bind $ui_diff <$M1B-Key-c> {tk_textCopy
%W
;break}
3935 bind $ui_diff <$M1B-Key-C> {tk_textCopy
%W
;break}
3936 bind $ui_diff <$M1B-Key-v> {break}
3937 bind $ui_diff <$M1B-Key-V> {break}
3938 bind $ui_diff <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3939 bind $ui_diff <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3940 bind $ui_diff <$M1B-Key-j> {do_revert_selection
;break}
3941 bind $ui_diff <$M1B-Key-J> {do_revert_selection
;break}
3942 bind $ui_diff <Key-Up
> {catch
{%W yview scroll
-1 units
};break}
3943 bind $ui_diff <Key-Down
> {catch
{%W yview scroll
1 units
};break}
3944 bind $ui_diff <Key-Left
> {catch
{%W xview scroll
-1 units
};break}
3945 bind $ui_diff <Key-Right
> {catch
{%W xview scroll
1 units
};break}
3946 bind $ui_diff <Key-k
> {catch
{%W yview scroll
-1 units
};break}
3947 bind $ui_diff <Key-j
> {catch
{%W yview scroll
1 units
};break}
3948 bind $ui_diff <Key-h
> {catch
{%W xview scroll
-1 units
};break}
3949 bind $ui_diff <Key-l
> {catch
{%W xview scroll
1 units
};break}
3950 bind $ui_diff <Control-Key-b
> {catch
{%W yview scroll
-1 pages
};break}
3951 bind $ui_diff <Control-Key-f
> {catch
{%W yview scroll
1 pages
};break}
3952 bind $ui_diff <Button-1
> {focus
%W
}
3954 if {[is_enabled branch
]} {
3955 bind .
<$M1B-Key-n> branch_create
::dialog
3956 bind .
<$M1B-Key-N> branch_create
::dialog
3957 bind .
<$M1B-Key-o> branch_checkout
::dialog
3958 bind .
<$M1B-Key-O> branch_checkout
::dialog
3959 bind .
<$M1B-Key-m> merge
::dialog
3960 bind .
<$M1B-Key-M> merge
::dialog
3962 if {[is_enabled transport
]} {
3963 bind .
<$M1B-Key-p> do_push_anywhere
3964 bind .
<$M1B-Key-P> do_push_anywhere
3967 bind .
<Key-F5
> ui_do_rescan
3968 bind .
<$M1B-Key-r> ui_do_rescan
3969 bind .
<$M1B-Key-R> ui_do_rescan
3970 bind .
<$M1B-Key-s> do_signoff
3971 bind .
<$M1B-Key-S> do_signoff
3972 bind .
<$M1B-Key-t> { toggle_or_diff toggle
%W
}
3973 bind .
<$M1B-Key-T> { toggle_or_diff toggle
%W
}
3974 bind .
<$M1B-Key-u> { toggle_or_diff toggle
%W
}
3975 bind .
<$M1B-Key-U> { toggle_or_diff toggle
%W
}
3976 bind .
<$M1B-Key-j> do_revert_selection
3977 bind .
<$M1B-Key-J> do_revert_selection
3978 bind .
<$M1B-Key-i> do_add_all
3979 bind .
<$M1B-Key-I> do_add_all
3980 bind .
<$M1B-Key-e> toggle_commit_type
3981 bind .
<$M1B-Key-E> toggle_commit_type
3982 bind .
<$M1B-Key-minus> {show_less_context
;break}
3983 bind .
<$M1B-Key-KP_Subtract> {show_less_context
;break}
3984 bind .
<$M1B-Key-equal> {show_more_context
;break}
3985 bind .
<$M1B-Key-plus> {show_more_context
;break}
3986 bind .
<$M1B-Key-KP_Add> {show_more_context
;break}
3987 bind .
<$M1B-Key-Return> do_commit
3988 bind .
<$M1B-Key-KP_Enter> do_commit
3989 foreach i
[list
$ui_index $ui_workdir] {
3990 bind $i <Button-1
> { toggle_or_diff click
%W
%x
%y
; break }
3991 bind $i <$M1B-Button-1> { add_one_to_selection
%W
%x
%y
; break }
3992 bind $i <Shift-Button-1
> { add_range_to_selection
%W
%x
%y
; break }
3993 bind $i <Key-Up
> { toggle_or_diff up
%W
; break }
3994 bind $i <Key-Down
> { toggle_or_diff down
%W
; break }
3998 bind .
<Alt-Key-1
> {focus_widget $
::ui_workdir
}
3999 bind .
<Alt-Key-2
> {focus_widget $
::ui_index
}
4000 bind .
<Alt-Key-3
> {focus $
::ui_diff
}
4001 bind .
<Alt-Key-4
> {focus $
::ui_comm
}
4003 set file_lists_last_clicked
($ui_index) {}
4004 set file_lists_last_clicked
($ui_workdir) {}
4006 set file_lists
($ui_index) [list
]
4007 set file_lists
($ui_workdir) [list
]
4009 wm title .
"[appname] ([reponame]) [file normalize $_gitworktree]"
4010 focus
-force $ui_comm
4012 # -- Warn the user about environmental problems. Cygwin's Tcl
4013 # does *not* pass its env array onto any processes it spawns.
4014 # This means that git processes get none of our environment.
4019 set msg
[mc
"Possible environment issues exist.
4021 The following environment variables are probably
4022 going to be ignored by any Git subprocess run
4026 foreach name
[array names env
] {
4027 switch
-regexp -- $name {
4028 {^GIT_INDEX_FILE$
} -
4029 {^GIT_OBJECT_DIRECTORY$
} -
4030 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$
} -
4032 {^GIT_EXTERNAL_DIFF$
} -
4036 {^GIT_
(AUTHOR|COMMITTER
)_DATE$
} {
4037 append msg
" - $name\n"
4040 {^GIT_
(AUTHOR|COMMITTER
)_
(NAME|EMAIL
)$
} {
4041 append msg
" - $name\n"
4043 set suggest_user
$name
4047 if {$ignored_env > 0} {
4049 This is due to a known issue with the
4050 Tcl binary distributed by Cygwin."]
4052 if {$suggest_user ne
{}} {
4055 A good replacement for %s
4056 is placing values for the user.name and
4057 user.email settings into your personal
4063 unset ignored_env msg suggest_user name
4066 # -- Only initialize complex UI if we are going to stay running.
4068 if {[is_enabled transport
]} {
4071 set n
[.mbar.remote index end
]
4072 populate_remotes_menu
4073 set n
[expr {[.mbar.remote index end
] - $n}]
4075 if {[.mbar.remote
type 0] eq
"tearoff"} { incr n
}
4076 .mbar.remote insert
$n separator
4081 if {[winfo exists
$ui_comm]} {
4082 set GITGUI_BCK_exists
[load_message GITGUI_BCK utf-8
]
4084 # -- If both our backup and message files exist use the
4085 # newer of the two files to initialize the buffer.
4087 if {$GITGUI_BCK_exists} {
4088 set m
[gitdir GITGUI_MSG
]
4089 if {[file isfile
$m]} {
4090 if {[file mtime
[gitdir GITGUI_BCK
]] > [file mtime
$m]} {
4091 catch
{file delete
[gitdir GITGUI_MSG
]}
4093 $ui_comm delete
0.0 end
4095 $ui_comm edit modified false
4096 catch
{file delete
[gitdir GITGUI_BCK
]}
4097 set GITGUI_BCK_exists
0
4103 proc backup_commit_buffer
{} {
4104 global ui_comm GITGUI_BCK_exists
4106 set m
[$ui_comm edit modified
]
4107 if {$m ||
$GITGUI_BCK_exists} {
4108 set msg
[string trim
[$ui_comm get
0.0 end
]]
4109 regsub
-all -line {[ \r\t]+$
} $msg {} msg
4112 if {$GITGUI_BCK_exists} {
4113 catch
{file delete
[gitdir GITGUI_BCK
]}
4114 set GITGUI_BCK_exists
0
4118 set fd
[open
[gitdir GITGUI_BCK
] w
]
4119 fconfigure
$fd -encoding utf-8
4120 puts
-nonewline $fd $msg
4122 set GITGUI_BCK_exists
1
4126 $ui_comm edit modified false
4129 set ::GITGUI_BCK_i
[after
2000 backup_commit_buffer
]
4132 backup_commit_buffer
4134 # -- If the user has aspell available we can drive it
4135 # in pipe mode to spellcheck the commit message.
4137 set spell_cmd
[list |
]
4138 set spell_dict
[get_config gui.spellingdictionary
]
4139 lappend spell_cmd aspell
4140 if {$spell_dict ne
{}} {
4141 lappend spell_cmd
--master=$spell_dict
4143 lappend spell_cmd
--mode=none
4144 lappend spell_cmd
--encoding=utf-8
4145 lappend spell_cmd pipe
4146 if {$spell_dict eq
{none
}
4147 ||
[catch
{set spell_fd
[open
$spell_cmd r
+]} spell_err
]} {
4148 bind_button3
$ui_comm [list tk_popup
$ui_comm_ctxm %X
%Y
]
4150 set ui_comm_spell
[spellcheck
::init \
4156 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
4159 lock_index begin-read
4160 if {![winfo ismapped .
]} {
4164 if {[is_enabled initialamend
]} {
4170 if {[is_enabled nocommitmsg
]} {
4171 $ui_comm configure
-state disabled
-background gray
4174 if {[is_enabled multicommit
] && ![is_config_false gui.gcwarning
]} {
4177 if {[is_enabled retcode
]} {
4178 bind .
<Destroy
> {+terminate_me
%W
}
4180 if {$picked && [is_config_true gui.autoexplore
]} {
4184 # Clear "Initializing..." status
4185 after
500 {$main_status show
""}
4189 # indent-tabs-mode: t