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.4} err
]
34 ||
[catch
{package require Tk
8.4} 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 if {[gets $fd ref] < 1} {
692 set pfx {ref: refs/heads/}
693 set len [string length $pfx]
694 if {[string equal -length $len $pfx $ref]} {
695 # We're on a branch. It might not exist. But
696 # HEAD looks good enough to be a branch.
698 set current_branch [string range $ref $len end]
701 # Assume this is a detached head.
703 set current_branch HEAD
708 auto_load tk_optionMenu
709 rename tk_optionMenu real__tkOptionMenu
710 proc tk_optionMenu {w varName args} {
711 set m [eval real__tkOptionMenu $w $varName $args]
712 $m configure -font font_ui
713 $w configure -font font_ui
717 proc rmsel_tag {text} {
719 -background [$text cget -background] \
720 -foreground [$text cget -foreground] \
722 $text tag conf in_sel -background lightgray
723 bind $text <Motion> break
729 bind . <Visibility> {
730 bind . <Visibility> {}
735 wm iconbitmap . -default $oguilib/git-gui.ico
736 set ::tk::AlwaysShowSelection 1
737 bind . <Control-F2> {console show}
739 # Spoof an X11 display for SSH
740 if {![info exists env(DISPLAY)]} {
741 set env(DISPLAY) :9999
745 image create photo gitlogo -width 16 -height 16
747 gitlogo put #33CC33 -to 7 0 9 2
748 gitlogo put #33CC33 -to 4 2 12 4
749 gitlogo put #33CC33 -to 7 4 9 6
750 gitlogo put #CC3333 -to 4 6 12 8
751 gitlogo put gray26 -to 4 9 6 10
752 gitlogo put gray26 -to 3 10 6 12
753 gitlogo put gray26 -to 8 9 13 11
754 gitlogo put gray26 -to 8 11 10 12
755 gitlogo put gray26 -to 11 11 13 14
756 gitlogo put gray26 -to 3 12 5 14
757 gitlogo put gray26 -to 5 13
758 gitlogo put gray26 -to 10 13
759 gitlogo put gray26 -to 4 14 12 15
760 gitlogo put gray26 -to 5 15 11 16
763 image create photo gitlogo32 -width 32 -height 32
764 gitlogo32 copy gitlogo -zoom 2 2
766 wm iconphoto . -default gitlogo gitlogo32
770 ######################################################################
776 if {[lsearch -exact [font names] TkDefaultFont] != -1} {
777 eval [linsert [font actual TkDefaultFont] 0 font configure font_ui]
778 eval [linsert [font actual TkFixedFont] 0 font create font_diff]
780 font create font_diff -family Courier -size 10
783 eval font configure font_ui [font actual [.dummy cget -font]]
788 font create font_uiitalic
789 font create font_uibold
790 font create font_diffbold
791 font create font_diffitalic
793 foreach class {Button Checkbutton Entry Label
794 Labelframe Listbox Message
795 Radiobutton Spinbox Text} {
796 option add *$class.font font_ui
799 option add *Menu.font font_ui
800 option add *Entry.borderWidth 1 startupFile
801 option add *Entry.relief sunken startupFile
802 option add *RadioButton.anchor w startupFile
806 if {[is_Windows] || [is_MacOSX]} {
807 option add *Menu.tearOff 0
818 proc bind_button3 {w cmd} {
819 bind $w <Any-Button-3> $cmd
821 # Mac OS X sends Button-2 on right click through three-button mouse,
822 # or through trackpad right-clicking (two-finger touch + click).
823 bind $w <Any-Button-2> $cmd
824 bind $w <Control-Button-1> $cmd
828 proc apply_config {} {
829 global repo_config font_descs
831 foreach option $font_descs {
832 set name [lindex $option 0]
833 set font [lindex $option 1]
836 foreach {cn cv} $repo_config(gui.$name) {
837 if {$cn eq {-weight}} {
840 font configure $font $cn $cv
843 font configure $font -weight normal
846 error_popup [strcat [mc "Invalid font specified
in %s
:" "gui.
$name"] "\n\n$err"]
848 foreach {cn cv} [font configure $font] {
849 font configure ${font}bold $cn $cv
850 font configure ${font}italic $cn $cv
852 font configure ${font}bold -weight bold
853 font configure ${font}italic -slant italic
859 if {$repo_config(gui.usettk)} {
860 set use_ttk [package vsatisfies [package provide Tk] 8.5]
863 bind [winfo class .] <<ThemeChanged>> [list InitTheme]
869 set default_config(branch.autosetupmerge) true
870 set default_config(merge.tool) {}
871 set default_config(mergetool.keepbackup) true
872 set default_config(merge.diffstat) true
873 set default_config(merge.summary) false
874 set default_config(merge.verbosity) 2
875 set default_config(user.name) {}
876 set default_config(user.email) {}
878 set default_config(gui.encoding) [encoding system]
879 set default_config(gui.matchtrackingbranch) false
880 set default_config(gui.textconv) true
881 set default_config(gui.pruneduringfetch) false
882 set default_config(gui.trustmtime) false
883 set default_config(gui.fastcopyblame) false
884 set default_config(gui.maxrecentrepo) 10
885 set default_config(gui.copyblamethreshold) 40
886 set default_config(gui.blamehistoryctx) 7
887 set default_config(gui.diffcontext) 5
888 set default_config(gui.diffopts) {}
889 set default_config(gui.commitmsgwidth) 75
890 set default_config(gui.newbranchtemplate) {}
891 set default_config(gui.spellingdictionary) {}
892 set default_config(gui.fontui) [font configure font_ui]
893 set default_config(gui.fontdiff) [font configure font_diff]
894 # TODO: this option should be added to the git-config documentation
895 set default_config(gui.maxfilesdisplayed) 5000
896 set default_config(gui.usettk) 1
897 set default_config(gui.warndetachedcommit) 1
898 set default_config(gui.tabsize) 8
900 {fontui font_ui {mc "Main Font
"}}
901 {fontdiff font_diff {mc "Diff
/Console Font
"}}
903 set default_config(gui.stageuntracked) ask
904 set default_config(gui.displayuntracked) true
906 ######################################################################
910 set _git [_which git]
912 catch {wm withdraw .}
916 -title [mc "git-gui
: fatal error
"] \
917 -message [mc "Cannot
find git
in PATH.
"]
921 ######################################################################
925 if {[catch {set _git_version [git --version]} err]} {
926 catch {wm withdraw .}
930 -title [mc "git-gui
: fatal error
"] \
931 -message "Cannot determine Git version
:
935 [appname
] requires Git
1.5.0 or later.
"
938 if {![regsub {^git version } $_git_version {} _git_version]} {
939 catch {wm withdraw .}
943 -title [mc "git-gui
: fatal error
"] \
944 -message [strcat [mc "Cannot parse Git version string
:"] "\n\n$_git_version"]
948 proc get_trimmed_version {s} {
950 foreach x [split $s -._] {
951 if {[string is integer -strict $x]} {
959 set _real_git_version $_git_version
960 set _git_version [get_trimmed_version $_git_version]
962 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
963 catch {wm withdraw .}
968 -title "[appname
]: warning
" \
969 -message [mc "Git version cannot be determined.
971 %s claims it is version
'%s'.
973 %s requires
at least Git
1.5.0 or later.
975 Assume
'%s' is version
1.5.0?
976 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
977 set _git_version 1.5.0
982 unset _real_git_version
984 proc git-version {args} {
987 switch [llength $args] {
993 set op [lindex $args 0]
994 set vr [lindex $args 1]
995 set cm [package vcompare $_git_version $vr]
996 return [expr $cm $op 0]
1000 set type [lindex $args 0]
1001 set name [lindex $args 1]
1002 set parm [lindex $args 2]
1003 set body [lindex $args 3]
1005 if {($type ne {proc} && $type ne {method})} {
1006 error "Invalid arguments to git-version
"
1008 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
1009 error "Last arm of
$type $name must be default
"
1012 foreach {op vr cb} [lrange $body 0 end-2] {
1013 if {[git-version $op $vr]} {
1014 return [uplevel [list $type $name $parm $cb]]
1018 return [uplevel [list $type $name $parm [lindex $body end]]]
1022 error "git-version
>= x
"
1028 if {[git-version < 1.5]} {
1029 catch {wm withdraw .}
1033 -title [mc "git-gui
: fatal error
"] \
1034 -message "[appname
] requires Git
1.5.0 or later.
1036 You are using
[git-version
]:
1042 ######################################################################
1044 ## configure our library
1046 set idx [file join $oguilib tclIndex]
1047 if {[catch {set fd [open $idx r]} err]} {
1048 catch {wm withdraw .}
1052 -title [mc "git-gui
: fatal error
"] \
1056 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
1058 while {[gets $fd n] >= 0} {
1059 if {$n ne {} && ![string match #* $n]} {
1071 if {[lsearch -exact $loaded $p] >= 0} continue
1072 source [file join $oguilib $p]
1077 set auto_path [concat [list $oguilib] $auto_path]
1079 unset -nocomplain idx fd
1081 ######################################################################
1083 ## config file parsing
1085 git-version proc _parse_config {arr_name args} {
1092 [list git_read config] \
1094 [list --null --list]]
1095 fconfigure $fd_rc -translation binary -encoding utf-8
1096 set buf [read $fd_rc]
1099 foreach line [split $buf "\
0"] {
1100 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
1101 if {[is_many_config $name]} {
1102 lappend arr($name) $value
1104 set arr($name) $value
1106 } elseif {[regexp {^([^\n]+)$} $line line name]} {
1107 # no value given, but interpreting them as
1108 # boolean will be handled as true
1117 set fd_rc [eval [list git_read config --list] $args]
1118 while {[gets $fd_rc line] >= 0} {
1119 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
1120 if {[is_many_config $name]} {
1121 lappend arr($name) $value
1123 set arr($name) $value
1125 } elseif {[regexp {^([^=]+)$} $line line name]} {
1126 # no value given, but interpreting them as
1127 # boolean will be handled as true
1136 proc load_config {include_global} {
1137 global repo_config global_config system_config default_config
1139 if {$include_global} {
1140 _parse_config system_config --system
1141 _parse_config global_config --global
1143 _parse_config repo_config
1145 foreach name [array names default_config] {
1146 if {[catch {set v $system_config($name)}]} {
1147 set system_config($name) $default_config($name)
1150 foreach name [array names system_config] {
1151 if {[catch {set v $global_config($name)}]} {
1152 set global_config($name) $system_config($name)
1154 if {[catch {set v $repo_config($name)}]} {
1155 set repo_config($name) $system_config($name)
1160 ######################################################################
1162 ## feature option selection
1164 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
1169 if {$subcommand eq {gui.sh}} {
1172 if {$subcommand eq {gui} && [llength $argv] > 0} {
1173 set subcommand [lindex $argv 0]
1174 set argv [lrange $argv 1 end]
1177 enable_option multicommit
1178 enable_option branch
1179 enable_option transport
1182 switch -- $subcommand {
1187 disable_option multicommit
1188 disable_option branch
1189 disable_option transport
1192 enable_option singlecommit
1193 enable_option retcode
1195 disable_option multicommit
1196 disable_option branch
1197 disable_option transport
1199 while {[llength $argv] > 0} {
1200 set a [lindex $argv 0]
1203 enable_option initialamend
1206 enable_option nocommit
1207 enable_option nocommitmsg
1210 disable_option nocommitmsg
1217 set argv [lrange $argv 1 end]
1222 ######################################################################
1224 ## execution environment
1226 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
1228 # Suggest our implementation of askpass, if none is set
1229 if {![info exists env(SSH_ASKPASS)]} {
1230 set env(SSH_ASKPASS) [gitexec git-gui--askpass]
1233 ######################################################################
1239 set _gitdir $env(GIT_DIR)
1243 # beware that from the .git dir this sets _gitdir to .
1244 # and _prefix to the empty string
1245 set _gitdir [git rev-parse --git-dir]
1246 set _prefix [git rev-parse --show-prefix]
1250 choose_repository::pick
1254 # we expand the _gitdir when it's just a single dot (i.e. when we're being
1255 # run from the .git dir itself) lest the routines to find the worktree
1257 if {$_gitdir eq ".
"} {
1261 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1262 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1264 if {![file isdirectory $_gitdir]} {
1265 catch {wm withdraw .}
1266 error_popup [strcat [mc "Git directory not found
:"] "\n\n$_gitdir"]
1269 # _gitdir exists, so try loading the config
1273 # v1.7.0 introduced --show-toplevel to return the canonical work-tree
1274 if {[package vcompare $_git_version 1.7.0] >= 0} {
1275 if { [is_Cygwin] } {
1276 catch {set _gitworktree [exec cygpath --windows [git rev-parse --show-toplevel]]}
1278 set _gitworktree [git rev-parse --show-toplevel]
1281 # try to set work tree from environment, core.worktree or use
1282 # cdup to obtain a relative path to the top of the worktree. If
1283 # run from the top, the ./ prefix ensures normalize expands pwd.
1284 if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {
1285 set _gitworktree [get_config core.worktree]
1286 if {$_gitworktree eq ""} {
1287 set _gitworktree [file normalize ./[git rev-parse --show-cdup]]
1292 if {$_prefix ne {}} {
1293 if {$_gitworktree eq {}} {
1294 regsub -all {[^/]+/} $_prefix ../ cdup
1296 set cdup $_gitworktree
1298 if {[catch {cd $cdup} err]} {
1299 catch {wm withdraw .}
1300 error_popup [strcat [mc "Cannot move to top of working directory
:"] "\n\n$err"]
1303 set _gitworktree [pwd]
1305 } elseif {![is_enabled bare]} {
1307 catch {wm withdraw .}
1308 error_popup [strcat [mc "Cannot use bare repository
:"] "\n\n$_gitdir"]
1311 if {$_gitworktree eq {}} {
1312 set _gitworktree [file dirname $_gitdir]
1314 if {[catch {cd $_gitworktree} err]} {
1315 catch {wm withdraw .}
1316 error_popup [strcat [mc "No working directory
"] " $_gitworktree:\n\n$err"]
1319 set _gitworktree [pwd]
1321 set _reponame [file split [file normalize $_gitdir]]
1322 if {[lindex $_reponame end] eq {.git}} {
1323 set _reponame [lindex $_reponame end-1]
1325 set _reponame [lindex $_reponame end]
1328 set env(GIT_DIR) $_gitdir
1329 set env(GIT_WORK_TREE) $_gitworktree
1331 ######################################################################
1335 set current_diff_path {}
1336 set current_diff_side {}
1337 set diff_actions [list]
1341 set MERGE_HEAD [list]
1343 set commit_type_is_amend 0
1345 set current_branch {}
1347 set current_diff_path {}
1349 set is_submodule_diff 0
1350 set is_conflict_diff 0
1351 set diff_empty_count 0
1353 set last_revert_enc {}
1355 set nullid "0000000000000000000000000000000000000000"
1356 set nullid2 "0000000000000000000000000000000000000001"
1358 ######################################################################
1366 set disable_on_lock [list]
1367 set index_lock_type none
1369 proc lock_index {type} {
1370 global index_lock_type disable_on_lock
1372 if {$index_lock_type eq {none}} {
1373 set index_lock_type $type
1374 foreach w $disable_on_lock {
1375 uplevel #0 $w disabled
1378 } elseif {$index_lock_type eq "begin-
$type"} {
1379 set index_lock_type $type
1385 proc unlock_index {} {
1386 global index_lock_type disable_on_lock
1388 set index_lock_type none
1389 foreach w $disable_on_lock {
1390 uplevel #0 $w normal
1394 ######################################################################
1398 proc repository_state {ctvar hdvar mhvar} {
1399 global current_branch
1400 upvar $ctvar ct $hdvar hd $mhvar mh
1405 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1411 set merge_head [gitdir MERGE_HEAD]
1412 if {[file exists $merge_head]} {
1414 set fd_mh [open $merge_head r]
1415 while {[gets $fd_mh line] >= 0} {
1426 global PARENT empty_tree
1428 set p [lindex $PARENT 0]
1432 if {$empty_tree eq {}} {
1433 set empty_tree [git mktree << {}]
1438 proc force_amend {} {
1439 global commit_type_is_amend
1440 global HEAD PARENT MERGE_HEAD commit_type
1442 repository_state newType newHEAD newMERGE_HEAD
1445 set MERGE_HEAD $newMERGE_HEAD
1446 set commit_type $newType
1448 set commit_type_is_amend 1
1449 do_select_commit_type
1452 proc rescan {after {honor_trustmtime 1}} {
1453 global HEAD PARENT MERGE_HEAD commit_type
1454 global ui_index ui_workdir ui_comm
1455 global rescan_active file_states
1458 if {$rescan_active > 0 || ![lock_index read]} return
1460 repository_state newType newHEAD newMERGE_HEAD
1461 if {[string match amend* $commit_type]
1462 && $newType eq {normal}
1463 && $newHEAD eq $HEAD} {
1467 set MERGE_HEAD $newMERGE_HEAD
1468 set commit_type $newType
1471 array unset file_states
1473 if {!$::GITGUI_BCK_exists &&
1474 (![$ui_comm edit modified]
1475 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1476 if {[string match amend* $commit_type]} {
1477 } elseif {[load_message GITGUI_MSG utf-8]} {
1478 } elseif {[run_prepare_commit_msg_hook]} {
1479 } elseif {[load_message MERGE_MSG]} {
1480 } elseif {[load_message SQUASH_MSG]} {
1483 $ui_comm edit modified false
1486 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1487 rescan_stage2 {} $after
1490 ui_status [mc "Refreshing
file status...
"]
1491 set fd_rf [git_read update-index \
1497 fconfigure $fd_rf -blocking 0 -translation binary
1498 fileevent $fd_rf readable \
1499 [list rescan_stage2 $fd_rf $after]
1504 set is_git_info_exclude {}
1505 proc have_info_exclude {} {
1506 global is_git_info_exclude
1508 if {$is_git_info_exclude eq {}} {
1509 if {[catch {exec test -f [gitdir info exclude]}]} {
1510 set is_git_info_exclude 0
1512 set is_git_info_exclude 1
1515 return $is_git_info_exclude
1518 proc have_info_exclude {} {
1519 return [file readable [gitdir info exclude]]
1523 proc rescan_stage2 {fd after} {
1524 global rescan_active buf_rdi buf_rdf buf_rlo
1528 if {![eof $fd]} return
1532 if {[package vcompare $::_git_version 1.6.3] >= 0} {
1533 set ls_others [list --exclude-standard]
1535 set ls_others [list --exclude-per-directory=.gitignore]
1536 if {[have_info_exclude]} {
1537 lappend ls_others "--exclude-from=[gitdir info exclude
]"
1539 set user_exclude [get_config core.excludesfile]
1540 if {$user_exclude ne {} && [file readable $user_exclude]} {
1541 lappend ls_others "--exclude-from=[file normalize
$user_exclude]"
1550 ui_status [mc "Scanning
for modified files ...
"]
1551 if {[git-version >= "1.7.2"]} {
1552 set fd_di [git_read diff-index --cached --ignore-submodules=dirty -z [PARENT]]
1554 set fd_di [git_read diff-index --cached -z [PARENT]]
1556 set fd_df [git_read diff-files -z]
1558 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1559 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1561 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1562 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1564 if {[is_config_true gui.displayuntracked]} {
1565 set fd_lo [eval git_read ls-files --others -z $ls_others]
1566 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1567 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1572 proc load_message {file {encoding {}}} {
1575 set f [gitdir $file]
1576 if {[file isfile $f]} {
1577 if {[catch {set fd [open $f r]}]} {
1580 fconfigure $fd -eofchar {}
1581 if {$encoding ne {}} {
1582 fconfigure $fd -encoding $encoding
1584 set content [string trim [read $fd]]
1586 regsub -all -line {[ \r\t]+$} $content {} content
1587 $ui_comm delete 0.0 end
1588 $ui_comm insert end $content
1594 proc run_prepare_commit_msg_hook {} {
1597 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1598 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1599 # empty file but existent file.
1601 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1603 if {[file isfile [gitdir MERGE_MSG]]} {
1604 set pcm_source "merge
"
1605 set fd_mm [open [gitdir MERGE_MSG] r]
1606 fconfigure $fd_mm -encoding utf-8
1607 puts -nonewline $fd_pcm [read $fd_mm]
1609 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1610 set pcm_source "squash
"
1611 set fd_sm [open [gitdir SQUASH_MSG] r]
1612 fconfigure $fd_sm -encoding utf-8
1613 puts -nonewline $fd_pcm [read $fd_sm]
1621 set fd_ph [githook_read prepare-commit-msg \
1622 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1624 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1628 ui_status [mc "Calling prepare-commit-msg hook...
"]
1631 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1632 fileevent $fd_ph readable \
1633 [list prepare_commit_msg_hook_wait $fd_ph]
1638 proc prepare_commit_msg_hook_wait {fd_ph} {
1641 append pch_error [read $fd_ph]
1642 fconfigure $fd_ph -blocking 1
1644 if {[catch {close $fd_ph}]} {
1645 ui_status [mc "Commit declined by prepare-commit-msg hook.
"]
1646 hook_failed_popup prepare-commit-msg $pch_error
1647 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1650 load_message PREPARE_COMMIT_MSG
1653 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1656 fconfigure $fd_ph -blocking 0
1657 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1660 proc read_diff_index {fd after} {
1663 append buf_rdi [read $fd]
1665 set n [string length $buf_rdi]
1667 set z1 [string first "\
0" $buf_rdi $c]
1668 if {$z1 == -1} break
1670 set z2 [string first "\
0" $buf_rdi $z1]
1671 if {$z2 == -1} break
1674 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1675 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1677 [encoding convertfrom utf-8 $p] \
1679 [list [lindex $i 0] [lindex $i 2]] \
1685 set buf_rdi [string range $buf_rdi $c end]
1690 rescan_done $fd buf_rdi $after
1693 proc read_diff_files {fd after} {
1696 append buf_rdf [read $fd]
1698 set n [string length $buf_rdf]
1700 set z1 [string first "\
0" $buf_rdf $c]
1701 if {$z1 == -1} break
1703 set z2 [string first "\
0" $buf_rdf $z1]
1704 if {$z2 == -1} break
1707 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1708 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1710 [encoding convertfrom utf-8 $p] \
1713 [list [lindex $i 0] [lindex $i 2]]
1718 set buf_rdf [string range $buf_rdf $c end]
1723 rescan_done $fd buf_rdf $after
1726 proc read_ls_others {fd after} {
1729 append buf_rlo [read $fd]
1730 set pck [split $buf_rlo "\
0"]
1731 set buf_rlo [lindex $pck end]
1732 foreach p [lrange $pck 0 end-1] {
1733 set p [encoding convertfrom utf-8 $p]
1734 if {[string index $p end] eq {/}} {
1735 set p [string range $p 0 end-1]
1739 rescan_done $fd buf_rlo $after
1742 proc rescan_done {fd buf after} {
1743 global rescan_active current_diff_path
1744 global file_states repo_config
1747 if {![eof $fd]} return
1750 if {[incr rescan_active -1] > 0} return
1755 if {$current_diff_path ne {}} { reshow_diff $after }
1756 if {$current_diff_path eq {}} { select_first_diff $after }
1759 proc prune_selection {} {
1760 global file_states selected_paths
1762 foreach path [array names selected_paths] {
1763 if {[catch {set still_here $file_states($path)}]} {
1764 unset selected_paths($path)
1769 ######################################################################
1773 proc mapicon {w state path} {
1776 if {[catch {set r $all_icons($state$w)}]} {
1777 puts "error
: no icon
for $w state
={$state} $path"
1783 proc mapdesc {state path} {
1786 if {[catch {set r $all_descs($state)}]} {
1787 puts "error
: no desc
for state
={$state} $path"
1793 proc ui_status {msg} {
1795 if {[info exists main_status]} {
1796 $main_status show $msg
1800 proc ui_ready {{test {}}} {
1802 if {[info exists main_status]} {
1803 $main_status show [mc "Ready.
"] $test
1807 proc escape_path {path} {
1808 regsub -all {\\} $path "\\\\" path
1809 regsub -all "\n" $path "\\n
" path
1813 proc short_path {path} {
1814 return [escape_path [lindex [file split $path] end]]
1818 set null_sha1 [string repeat 0 40]
1820 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1821 global file_states next_icon_id null_sha1
1823 set s0 [string index $new_state 0]
1824 set s1 [string index $new_state 1]
1826 if {[catch {set info $file_states($path)}]} {
1828 set icon n[incr next_icon_id]
1830 set state [lindex $info 0]
1831 set icon [lindex $info 1]
1832 if {$head_info eq {}} {set head_info [lindex $info 2]}
1833 if {$index_info eq {}} {set index_info [lindex $info 3]}
1836 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1837 elseif {$s0 eq {_}} {set s0 _}
1839 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1840 elseif {$s1 eq {_}} {set s1 _}
1842 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1843 set head_info [list 0 $null_sha1]
1844 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1845 && $head_info eq {}} {
1846 set head_info $index_info
1847 } elseif {$s0 eq {_} && [string index $state 0] ne {_}} {
1848 set index_info $head_info
1852 set file_states($path) [list $s0$s1 $icon \
1853 $head_info $index_info \
1858 proc display_file_helper {w path icon_name old_m new_m} {
1861 if {$new_m eq {_}} {
1862 set lno [lsearch -sorted -exact $file_lists($w) $path]
1864 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1866 $w conf -state normal
1867 $w delete $lno.0 [expr {$lno + 1}].0
1868 $w conf -state disabled
1870 } elseif {$old_m eq {_} && $new_m ne {_}} {
1871 lappend file_lists($w) $path
1872 set file_lists($w) [lsort -unique $file_lists($w)]
1873 set lno [lsearch -sorted -exact $file_lists($w) $path]
1875 $w conf -state normal
1876 $w image create $lno.0 \
1877 -align center -padx 5 -pady 1 \
1879 -image [mapicon $w $new_m $path]
1880 $w insert $lno.1 "[escape_path
$path]\n"
1881 $w conf -state disabled
1882 } elseif {$old_m ne $new_m} {
1883 $w conf -state normal
1884 $w image conf $icon_name -image [mapicon $w $new_m $path]
1885 $w conf -state disabled
1889 proc display_file {path state} {
1890 global file_states selected_paths
1891 global ui_index ui_workdir
1893 set old_m [merge_state $path $state]
1894 set s $file_states($path)
1895 set new_m [lindex $s 0]
1896 set icon_name [lindex $s 1]
1898 set o [string index $old_m 0]
1899 set n [string index $new_m 0]
1906 display_file_helper $ui_index $path $icon_name $o $n
1908 if {[string index $old_m 0] eq {U}} {
1911 set o [string index $old_m 1]
1913 if {[string index $new_m 0] eq {U}} {
1916 set n [string index $new_m 1]
1918 display_file_helper $ui_workdir $path $icon_name $o $n
1920 if {$new_m eq {__}} {
1921 unset file_states($path)
1922 catch {unset selected_paths($path)}
1926 proc display_all_files_helper {w path icon_name m} {
1929 lappend file_lists($w) $path
1930 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1931 $w image create end \
1932 -align center -padx 5 -pady 1 \
1934 -image [mapicon $w $m $path]
1935 $w insert end "[escape_path
$path]\n"
1939 proc display_all_files {} {
1940 global ui_index ui_workdir
1941 global file_states file_lists
1943 global files_warning
1945 $ui_index conf -state normal
1946 $ui_workdir conf -state normal
1948 $ui_index delete 0.0 end
1949 $ui_workdir delete 0.0 end
1952 set file_lists($ui_index) [list]
1953 set file_lists($ui_workdir) [list]
1955 set to_display [lsort [array names file_states]]
1956 set display_limit [get_config gui.maxfilesdisplayed]
1958 foreach path $to_display {
1959 set s $file_states($path)
1961 set icon_name [lindex $s 1]
1963 if {$displayed > $display_limit && [string index $m 1] eq {O} } {
1964 if {!$files_warning} {
1965 # do not repeatedly warn:
1967 info_popup [mc "Display limit
(gui.maxfilesdisplayed
= %s
) reached
, not showing all
%s files.
" \
1968 $display_limit [llength $to_display]]
1973 set s [string index $m 0]
1974 if {$s ne {U} && $s ne {_}} {
1975 display_all_files_helper $ui_index $path \
1979 if {[string index $m 0] eq {U}} {
1982 set s [string index $m 1]
1985 display_all_files_helper $ui_workdir $path \
1991 $ui_index conf -state disabled
1992 $ui_workdir conf -state disabled
1995 ######################################################################
2000 #define mask_width 14
2001 #define mask_height 15
2002 static unsigned char mask_bits[] = {
2003 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2004 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2005 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2008 image create bitmap file_plain -background white -foreground black -data {
2009 #define plain_width 14
2010 #define plain_height 15
2011 static unsigned char plain_bits[] = {
2012 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2013 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2014 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2015 } -maskdata $filemask
2017 image create bitmap file_mod -background white -foreground blue -data {
2018 #define mod_width 14
2019 #define mod_height 15
2020 static unsigned char mod_bits[] = {
2021 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2022 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2023 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2024 } -maskdata $filemask
2026 image create bitmap file_fulltick -background white -foreground "#007000" -data {
2027 #define file_fulltick_width 14
2028 #define file_fulltick_height 15
2029 static unsigned char file_fulltick_bits
[] = {
2030 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2031 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2032 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2033 } -maskdata $filemask
2035 image create bitmap file_question
-background white
-foreground black
-data {
2036 #define file_question_width 14
2037 #define file_question_height 15
2038 static unsigned char file_question_bits
[] = {
2039 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2040 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2041 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2042 } -maskdata $filemask
2044 image create bitmap file_removed
-background white
-foreground red
-data {
2045 #define file_removed_width 14
2046 #define file_removed_height 15
2047 static unsigned char file_removed_bits
[] = {
2048 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2049 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2050 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2051 } -maskdata $filemask
2053 image create bitmap file_merge
-background white
-foreground blue
-data {
2054 #define file_merge_width 14
2055 #define file_merge_height 15
2056 static unsigned char file_merge_bits
[] = {
2057 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2058 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2059 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2060 } -maskdata $filemask
2062 image create bitmap file_statechange
-background white
-foreground green
-data {
2063 #define file_statechange_width 14
2064 #define file_statechange_height 15
2065 static unsigned char file_statechange_bits
[] = {
2066 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
2067 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
2068 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2069 } -maskdata $filemask
2071 set ui_index .vpane.files.index.list
2072 set ui_workdir .vpane.files.workdir.list
2074 set all_icons
(_
$ui_index) file_plain
2075 set all_icons
(A
$ui_index) file_plain
2076 set all_icons
(M
$ui_index) file_fulltick
2077 set all_icons
(D
$ui_index) file_removed
2078 set all_icons
(U
$ui_index) file_merge
2079 set all_icons
(T
$ui_index) file_statechange
2081 set all_icons
(_
$ui_workdir) file_plain
2082 set all_icons
(M
$ui_workdir) file_mod
2083 set all_icons
(D
$ui_workdir) file_question
2084 set all_icons
(U
$ui_workdir) file_merge
2085 set all_icons
(O
$ui_workdir) file_plain
2086 set all_icons
(T
$ui_workdir) file_statechange
2088 set max_status_desc
0
2090 {__
{mc
"Unmodified"}}
2092 {_M
{mc
"Modified, not staged"}}
2093 {M_
{mc
"Staged for commit"}}
2094 {MM
{mc
"Portions staged for commit"}}
2095 {MD
{mc
"Staged for commit, missing"}}
2097 {_T
{mc
"File type changed, not staged"}}
2098 {MT
{mc
"File type changed, old type staged for commit"}}
2099 {AT
{mc
"File type changed, old type staged for commit"}}
2100 {T_
{mc
"File type changed, staged"}}
2101 {TM
{mc
"File type change staged, modification not staged"}}
2102 {TD
{mc
"File type change staged, file missing"}}
2104 {_O
{mc
"Untracked, not staged"}}
2105 {A_
{mc
"Staged for commit"}}
2106 {AM
{mc
"Portions staged for commit"}}
2107 {AD
{mc
"Staged for commit, missing"}}
2110 {D_
{mc
"Staged for removal"}}
2111 {DO
{mc
"Staged for removal, still present"}}
2113 {_U
{mc
"Requires merge resolution"}}
2114 {U_
{mc
"Requires merge resolution"}}
2115 {UU
{mc
"Requires merge resolution"}}
2116 {UM
{mc
"Requires merge resolution"}}
2117 {UD
{mc
"Requires merge resolution"}}
2118 {UT
{mc
"Requires merge resolution"}}
2120 set text
[eval [lindex
$i 1]]
2121 if {$max_status_desc < [string length
$text]} {
2122 set max_status_desc
[string length
$text]
2124 set all_descs
([lindex
$i 0]) $text
2128 ######################################################################
2132 proc scrollbar2many
{list mode args
} {
2133 foreach w
$list {eval $w $mode $args}
2136 proc many2scrollbar
{list mode sb top bottom
} {
2137 $sb set $top $bottom
2138 foreach w
$list {$w $mode moveto
$top}
2141 proc incr_font_size
{font
{amt
1}} {
2142 set sz
[font configure
$font -size]
2144 font configure
$font -size $sz
2145 font configure
${font}bold
-size $sz
2146 font configure
${font}italic
-size $sz
2149 ######################################################################
2153 set starting_gitk_msg
[mc
"Starting gitk... please wait..."]
2155 proc do_gitk
{revs
{is_submodule false
}} {
2156 global current_diff_path file_states current_diff_side ui_index
2157 global _gitdir _gitworktree
2159 # -- Always start gitk through whatever we were loaded with. This
2160 # lets us bypass using shell process on Windows systems.
2162 set exe
[_which gitk
-script]
2163 set cmd
[list
[info nameofexecutable
] $exe]
2165 error_popup
[mc
"Couldn't find gitk in PATH"]
2171 if {!$is_submodule} {
2176 cd $current_diff_path
2177 if {$revs eq
{--}} {
2178 set s
$file_states($current_diff_path)
2181 switch
-glob -- [lindex
$s 0] {
2182 M_
{ set old_sha1
[lindex
[lindex
$s 2] 1] }
2183 _M
{ set old_sha1
[lindex
[lindex
$s 3] 1] }
2185 if {$current_diff_side eq
$ui_index} {
2186 set old_sha1
[lindex
[lindex
$s 2] 1]
2187 set new_sha1
[lindex
[lindex
$s 3] 1]
2189 set old_sha1
[lindex
[lindex
$s 3] 1]
2193 set revs
$old_sha1...
$new_sha1
2195 # GIT_DIR and GIT_WORK_TREE for the submodule are not the ones
2196 # we've been using for the main repository, so unset them.
2197 # TODO we could make life easier (start up faster?) for gitk
2198 # by setting these to the appropriate values to allow gitk
2199 # to skip the heuristics to find their proper value
2201 unset env
(GIT_WORK_TREE
)
2203 eval exec $cmd $revs "--" "--" &
2205 set env
(GIT_DIR
) $_gitdir
2206 set env
(GIT_WORK_TREE
) $_gitworktree
2209 ui_status $
::starting_gitk_msg
2211 ui_ready
$starting_gitk_msg
2216 proc do_git_gui
{} {
2217 global current_diff_path
2219 # -- Always start git gui through whatever we were loaded with. This
2220 # lets us bypass using shell process on Windows systems.
2222 set exe
[list
[_which git
]]
2224 error_popup
[mc
"Couldn't find git gui in PATH"]
2227 global _gitdir _gitworktree
2229 # see note in do_gitk about unsetting these vars when
2230 # running tools in a submodule
2232 unset env
(GIT_WORK_TREE
)
2235 cd $current_diff_path
2237 eval exec $exe gui
&
2239 set env
(GIT_DIR
) $_gitdir
2240 set env
(GIT_WORK_TREE
) $_gitworktree
2243 ui_status $
::starting_gitk_msg
2245 ui_ready
$starting_gitk_msg
2250 proc do_explore
{} {
2253 if {[is_Cygwin
] ||
[is_Windows
]} {
2254 set explorer
"explorer.exe"
2255 } elseif
{[is_MacOSX
]} {
2258 # freedesktop.org-conforming system is our best shot
2259 set explorer
"xdg-open"
2261 eval exec $explorer [list
[file nativename
$_gitworktree]] &
2267 proc terminate_me
{win
} {
2269 if {$win ne
{.
}} return
2273 proc do_quit
{{rc
{1}}} {
2274 global ui_comm is_quitting repo_config commit_type
2275 global GITGUI_BCK_exists GITGUI_BCK_i
2276 global ui_comm_spell
2277 global ret_code use_ttk
2279 if {$is_quitting} return
2282 if {[winfo exists
$ui_comm]} {
2283 # -- Stash our current commit buffer.
2285 set save
[gitdir GITGUI_MSG
]
2286 if {$GITGUI_BCK_exists && ![$ui_comm edit modified
]} {
2287 file rename
-force [gitdir GITGUI_BCK
] $save
2288 set GITGUI_BCK_exists
0
2290 set msg
[string trim
[$ui_comm get
0.0 end
]]
2291 regsub
-all -line {[ \r\t]+$
} $msg {} msg
2292 if {(![string match amend
* $commit_type]
2293 ||
[$ui_comm edit modified
])
2296 set fd
[open
$save w
]
2297 fconfigure
$fd -encoding utf-8
2298 puts
-nonewline $fd $msg
2302 catch
{file delete
$save}
2306 # -- Cancel our spellchecker if its running.
2308 if {[info exists ui_comm_spell
]} {
2312 # -- Remove our editor backup, its not needed.
2314 after cancel
$GITGUI_BCK_i
2315 if {$GITGUI_BCK_exists} {
2316 catch
{file delete
[gitdir GITGUI_BCK
]}
2319 # -- Stash our current window geometry into this repository.
2321 set cfg_wmstate
[wm state .
]
2322 if {[catch
{set rc_wmstate
$repo_config(gui.wmstate
)}]} {
2325 if {$cfg_wmstate ne
$rc_wmstate} {
2326 catch
{git config gui.wmstate
$cfg_wmstate}
2328 if {$cfg_wmstate eq
{zoomed
}} {
2329 # on Windows wm geometry will lie about window
2330 # position (but not size) when window is zoomed
2331 # restore the window before querying wm geometry
2334 set cfg_geometry
[list
]
2335 lappend cfg_geometry
[wm geometry .
]
2337 lappend cfg_geometry
[.vpane sashpos
0]
2338 lappend cfg_geometry
[.vpane.files sashpos
0]
2340 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 0]
2341 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 1]
2343 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
2346 if {$cfg_geometry ne
$rc_geometry} {
2347 catch
{git config gui.geometry
$cfg_geometry}
2353 # Briefly enable send again, working around Tk bug
2354 # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
2355 tk appname
[appname
]
2364 proc ui_do_rescan
{} {
2365 rescan
{force_first_diff ui_ready
}
2372 proc next_diff
{{after
{}}} {
2373 global next_diff_p next_diff_w next_diff_i
2374 show_diff
$next_diff_p $next_diff_w {} {} $after
2377 proc find_anchor_pos
{lst name
} {
2378 set lid
[lsearch
-sorted -exact $lst $name]
2382 foreach lname
$lst {
2383 if {$lname >= $name} break
2391 proc find_file_from
{flist idx delta path mmask
} {
2394 set len
[llength
$flist]
2395 while {$idx >= 0 && $idx < $len} {
2396 set name
[lindex
$flist $idx]
2398 if {$name ne
$path && [info exists file_states
($name)]} {
2399 set state
[lindex
$file_states($name) 0]
2401 if {$mmask eq
{} ||
[regexp
$mmask $state]} {
2412 proc find_next_diff
{w path
{lno
{}} {mmask
{}}} {
2413 global next_diff_p next_diff_w next_diff_i
2414 global file_lists ui_index ui_workdir
2416 set flist
$file_lists($w)
2418 set lno
[find_anchor_pos
$flist $path]
2423 if {$mmask ne
{} && ![regexp
{(^\^
)|
(\$$
)} $mmask]} {
2424 if {$w eq
$ui_index} {
2427 set mmask
"$mmask\$"
2431 set idx
[find_file_from
$flist $lno 1 $path $mmask]
2434 set idx
[find_file_from
$flist $lno -1 $path $mmask]
2439 set next_diff_p
[lindex
$flist $idx]
2440 set next_diff_i
[expr {$idx+1}]
2447 proc next_diff_after_action
{w path
{lno
{}} {mmask
{}}} {
2448 global current_diff_path
2450 if {$path ne
$current_diff_path} {
2452 } elseif
{[find_next_diff
$w $path $lno $mmask]} {
2455 return {reshow_diff
;}
2459 proc select_first_diff
{after
} {
2462 if {[find_next_diff
$ui_workdir {} 1 {^_?U
}] ||
2463 [find_next_diff
$ui_workdir {} 1 {[^O
]$
}]} {
2470 proc force_first_diff
{after
} {
2471 global ui_workdir current_diff_path file_states
2473 if {[info exists file_states
($current_diff_path)]} {
2474 set state
[lindex
$file_states($current_diff_path) 0]
2480 if {[string first
{U
} $state] >= 0} {
2481 # Already a conflict, do nothing
2482 } elseif
{[find_next_diff
$ui_workdir $current_diff_path {} {^_?U
}]} {
2484 } elseif
{[string index
$state 1] ne
{O
}} {
2485 # Already a diff & no conflicts, do nothing
2486 } elseif
{[find_next_diff
$ui_workdir $current_diff_path {} {[^O
]$
}]} {
2497 proc toggle_or_diff
{mode w args
} {
2498 global file_states file_lists current_diff_path ui_index ui_workdir
2499 global last_clicked selected_paths file_lists_last_clicked
2501 if {$mode eq
"click"} {
2502 foreach
{x y
} $args break
2503 set pos
[split [$w index @
$x,$y] .
]
2504 foreach
{lno
col} $pos break
2506 if {$mode eq
"toggle"} {
2507 if {$w eq
$ui_workdir} {
2512 if {$w eq
$ui_index} {
2513 do_unstage_selection
2519 if {$last_clicked ne
{}} {
2520 set lno
[lindex
$last_clicked 1]
2522 if {![info exists file_lists
]
2523 ||
![info exists file_lists
($w)]
2524 ||
[llength
$file_lists($w)] == 0} {
2528 set lno
[expr {int
([lindex
[$w tag ranges in_diff
] 0])}]
2530 if {$mode eq
"toggle"} {
2533 incr lno
[expr {$mode eq
"up" ?
-1 : 1}]
2538 if {![info exists file_lists
]
2539 ||
![info exists file_lists
($w)]
2540 ||
[llength
$file_lists($w)] < $lno - 1} {
2543 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2550 set last_clicked
[list
$w $lno]
2552 array
unset selected_paths
2553 $ui_index tag remove in_sel
0.0 end
2554 $ui_workdir tag remove in_sel
0.0 end
2556 set file_lists_last_clicked
($w) $path
2558 # Determine the state of the file
2559 if {[info exists file_states
($path)]} {
2560 set state
[lindex
$file_states($path) 0]
2565 # Restage the file, or simply show the diff
2566 if {$col == 0 && $y > 1} {
2567 # Conflicts need special handling
2568 if {[string first
{U
} $state] >= 0} {
2569 # $w must always be $ui_workdir, but...
2570 if {$w ne
$ui_workdir} { set lno
{} }
2571 merge_stage_workdir
$path $lno
2575 if {[string index
$state 1] eq
{O
}} {
2581 set after
[next_diff_after_action
$w $path $lno $mmask]
2583 if {$w eq
$ui_index} {
2585 "Unstaging [short_path $path] from commit" \
2587 [concat
$after [list ui_ready
]]
2588 } elseif
{$w eq
$ui_workdir} {
2590 "Adding [short_path $path]" \
2592 [concat
$after [list ui_ready
]]
2595 set selected_paths
($path) 1
2596 show_diff
$path $w $lno
2600 proc add_one_to_selection
{w x y
} {
2601 global file_lists last_clicked selected_paths
2603 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2604 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2610 if {$last_clicked ne
{}
2611 && [lindex
$last_clicked 0] ne
$w} {
2612 array
unset selected_paths
2613 [lindex
$last_clicked 0] tag remove in_sel
0.0 end
2616 set last_clicked
[list
$w $lno]
2617 if {[catch
{set in_sel
$selected_paths($path)}]} {
2621 unset selected_paths
($path)
2622 $w tag remove in_sel
$lno.0 [expr {$lno + 1}].0
2624 set selected_paths
($path) 1
2625 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
2629 proc add_range_to_selection
{w x y
} {
2630 global file_lists last_clicked selected_paths
2632 if {[lindex
$last_clicked 0] ne
$w} {
2633 toggle_or_diff click
$w $x $y
2637 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2638 set lc
[lindex
$last_clicked 1]
2647 foreach path
[lrange
$file_lists($w) \
2648 [expr {$begin - 1}] \
2649 [expr {$end - 1}]] {
2650 set selected_paths
($path) 1
2652 $w tag add in_sel
$begin.0 [expr {$end + 1}].0
2655 proc show_more_context
{} {
2657 if {$repo_config(gui.diffcontext
) < 99} {
2658 incr repo_config
(gui.diffcontext
)
2663 proc show_less_context
{} {
2665 if {$repo_config(gui.diffcontext
) > 1} {
2666 incr repo_config
(gui.diffcontext
) -1
2671 proc focus_widget
{widget
} {
2672 global file_lists last_clicked selected_paths
2673 global file_lists_last_clicked
2675 if {[llength
$file_lists($widget)] > 0} {
2676 set path
$file_lists_last_clicked($widget)
2677 set index
[lsearch
-sorted -exact $file_lists($widget) $path]
2680 set path
[lindex
$file_lists($widget) $index]
2684 set last_clicked
[list
$widget [expr $index + 1]]
2685 array
unset selected_paths
2686 set selected_paths
($path) 1
2687 show_diff
$path $widget
2691 proc toggle_commit_type
{} {
2692 global commit_type_is_amend
2693 set commit_type_is_amend
[expr !$commit_type_is_amend]
2694 do_select_commit_type
2697 ######################################################################
2705 menu .mbar
-tearoff 0
2707 # -- Apple Menu (Mac OS X only)
2709 .mbar add cascade
-label Apple
-menu .mbar.apple
2712 .mbar add cascade
-label [mc Repository
] -menu .mbar.repository
2713 .mbar add cascade
-label [mc Edit
] -menu .mbar.edit
2714 if {[is_enabled branch
]} {
2715 .mbar add cascade
-label [mc Branch
] -menu .mbar.branch
2717 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2718 .mbar add cascade
-label [mc Commit@@noun
] -menu .mbar.commit
2720 if {[is_enabled transport
]} {
2721 .mbar add cascade
-label [mc Merge
] -menu .mbar.merge
2722 .mbar add cascade
-label [mc Remote
] -menu .mbar.remote
2724 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2725 .mbar add cascade
-label [mc Tools
] -menu .mbar.tools
2728 # -- Repository Menu
2730 menu .mbar.repository
2733 .mbar.repository add
command \
2734 -label [mc
"Explore Working Copy"] \
2735 -command {do_explore
}
2739 .mbar.repository add
command \
2740 -label [mc
"Git Bash"] \
2741 -command {eval exec [auto_execok start
] \
2742 [list
"Git Bash" bash
--login -l &]}
2745 if {[is_Windows
] ||
![is_bare
]} {
2746 .mbar.repository add separator
2749 .mbar.repository add
command \
2750 -label [mc
"Browse Current Branch's Files"] \
2751 -command {browser
::new
$current_branch}
2752 set ui_browse_current
[.mbar.repository index last
]
2753 .mbar.repository add
command \
2754 -label [mc
"Browse Branch Files..."] \
2755 -command browser_open
::dialog
2756 .mbar.repository add separator
2758 .mbar.repository add
command \
2759 -label [mc
"Visualize Current Branch's History"] \
2760 -command {do_gitk
$current_branch}
2761 set ui_visualize_current
[.mbar.repository index last
]
2762 .mbar.repository add
command \
2763 -label [mc
"Visualize All Branch History"] \
2764 -command {do_gitk
--all}
2765 .mbar.repository add separator
2767 proc current_branch_write
{args
} {
2768 global current_branch
2769 .mbar.repository entryconf $
::ui_browse_current \
2770 -label [mc
"Browse %s's Files" $current_branch]
2771 .mbar.repository entryconf $
::ui_visualize_current \
2772 -label [mc
"Visualize %s's History" $current_branch]
2774 trace add variable current_branch
write current_branch_write
2776 if {[is_enabled multicommit
]} {
2777 .mbar.repository add
command -label [mc
"Database Statistics"] \
2780 .mbar.repository add
command -label [mc
"Compress Database"] \
2783 .mbar.repository add
command -label [mc
"Verify Database"] \
2784 -command do_fsck_objects
2786 .mbar.repository add separator
2789 .mbar.repository add
command \
2790 -label [mc
"Create Desktop Icon"] \
2791 -command do_cygwin_shortcut
2792 } elseif
{[is_Windows
]} {
2793 .mbar.repository add
command \
2794 -label [mc
"Create Desktop Icon"] \
2795 -command do_windows_shortcut
2796 } elseif
{[is_MacOSX
]} {
2797 .mbar.repository add
command \
2798 -label [mc
"Create Desktop Icon"] \
2799 -command do_macosx_app
2804 proc
::tk
::mac
::Quit
{args
} { do_quit
}
2806 .mbar.repository add
command -label [mc Quit
] \
2814 .mbar.edit add
command -label [mc Undo
] \
2815 -command {catch
{[focus
] edit undo
}} \
2817 .mbar.edit add
command -label [mc Redo
] \
2818 -command {catch
{[focus
] edit redo
}} \
2820 .mbar.edit add separator
2821 .mbar.edit add
command -label [mc Cut
] \
2822 -command {catch
{tk_textCut
[focus
]}} \
2824 .mbar.edit add
command -label [mc Copy
] \
2825 -command {catch
{tk_textCopy
[focus
]}} \
2827 .mbar.edit add
command -label [mc Paste
] \
2828 -command {catch
{tk_textPaste
[focus
]; [focus
] see insert
}} \
2830 .mbar.edit add
command -label [mc Delete
] \
2831 -command {catch
{[focus
] delete sel.first sel.last
}} \
2833 .mbar.edit add separator
2834 .mbar.edit add
command -label [mc
"Select All"] \
2835 -command {catch
{[focus
] tag add sel
0.0 end
}} \
2840 if {[is_enabled branch
]} {
2843 .mbar.branch add
command -label [mc
"Create..."] \
2844 -command branch_create
::dialog \
2846 lappend disable_on_lock
[list .mbar.branch entryconf \
2847 [.mbar.branch index last
] -state]
2849 .mbar.branch add
command -label [mc
"Checkout..."] \
2850 -command branch_checkout
::dialog \
2852 lappend disable_on_lock
[list .mbar.branch entryconf \
2853 [.mbar.branch index last
] -state]
2855 .mbar.branch add
command -label [mc
"Rename..."] \
2856 -command branch_rename
::dialog
2857 lappend disable_on_lock
[list .mbar.branch entryconf \
2858 [.mbar.branch index last
] -state]
2860 .mbar.branch add
command -label [mc
"Delete..."] \
2861 -command branch_delete
::dialog
2862 lappend disable_on_lock
[list .mbar.branch entryconf \
2863 [.mbar.branch index last
] -state]
2865 .mbar.branch add
command -label [mc
"Reset..."] \
2866 -command merge
::reset_hard
2867 lappend disable_on_lock
[list .mbar.branch entryconf \
2868 [.mbar.branch index last
] -state]
2873 proc commit_btn_caption
{} {
2874 if {[is_enabled nocommit
]} {
2877 return [mc Commit@@verb
]
2881 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2884 if {![is_enabled nocommit
]} {
2885 .mbar.commit add checkbutton \
2886 -label [mc
"Amend Last Commit"] \
2887 -accelerator $M1T-E \
2888 -variable commit_type_is_amend \
2889 -command do_select_commit_type
2890 lappend disable_on_lock \
2891 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2893 .mbar.commit add separator
2896 .mbar.commit add
command -label [mc Rescan
] \
2897 -command ui_do_rescan \
2899 lappend disable_on_lock \
2900 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2902 .mbar.commit add
command -label [mc
"Stage To Commit"] \
2903 -command do_add_selection \
2905 lappend disable_on_lock \
2906 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2908 .mbar.commit add
command -label [mc
"Stage Changed Files To Commit"] \
2909 -command do_add_all \
2911 lappend disable_on_lock \
2912 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2914 .mbar.commit add
command -label [mc
"Unstage From Commit"] \
2915 -command do_unstage_selection \
2917 lappend disable_on_lock \
2918 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2920 .mbar.commit add
command -label [mc
"Revert Changes"] \
2921 -command do_revert_selection \
2923 lappend disable_on_lock \
2924 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2926 .mbar.commit add separator
2928 .mbar.commit add
command -label [mc
"Show Less Context"] \
2929 -command show_less_context \
2930 -accelerator $M1T-\
-
2932 .mbar.commit add
command -label [mc
"Show More Context"] \
2933 -command show_more_context \
2936 .mbar.commit add separator
2938 if {![is_enabled nocommitmsg
]} {
2939 .mbar.commit add
command -label [mc
"Sign Off"] \
2940 -command do_signoff \
2944 .mbar.commit add
command -label [commit_btn_caption
] \
2945 -command do_commit \
2946 -accelerator $M1T-Return
2947 lappend disable_on_lock \
2948 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2953 if {[is_enabled branch
]} {
2955 .mbar.merge add
command -label [mc
"Local Merge..."] \
2956 -command merge
::dialog \
2958 lappend disable_on_lock \
2959 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2960 .mbar.merge add
command -label [mc
"Abort Merge..."] \
2961 -command merge
::reset_hard
2962 lappend disable_on_lock \
2963 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2968 if {[is_enabled transport
]} {
2971 .mbar.remote add
command \
2972 -label [mc
"Add..."] \
2973 -command remote_add
::dialog \
2975 .mbar.remote add
command \
2976 -label [mc
"Push..."] \
2977 -command do_push_anywhere \
2979 .mbar.remote add
command \
2980 -label [mc
"Delete Branch..."] \
2981 -command remote_branch_delete
::dialog
2985 proc
::tk
::mac
::ShowPreferences
{} {do_options
}
2989 .mbar.edit add separator
2990 .mbar.edit add
command -label [mc
"Options..."] \
2996 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2997 set tools_menubar .mbar.tools
2999 $tools_menubar add separator
3000 $tools_menubar add
command -label [mc
"Add..."] -command tools_add
::dialog
3001 $tools_menubar add
command -label [mc
"Remove..."] -command tools_remove
::dialog
3003 if {[array names repo_config guitool.
*.cmd
] ne
{}} {
3010 .mbar add cascade
-label [mc Help
] -menu .mbar.
help
3014 .mbar.apple add
command -label [mc
"About %s" [appname
]] \
3016 .mbar.apple add separator
3018 .mbar.
help add
command -label [mc
"About %s" [appname
]] \
3021 . configure
-menu .mbar
3023 set doc_path
[githtmldir
]
3024 if {$doc_path ne
{}} {
3025 set doc_path
[file join $doc_path index.html
]
3028 set doc_path
[exec cygpath
--mixed $doc_path]
3032 if {[file isfile
$doc_path]} {
3033 set doc_url
"file:$doc_path"
3035 set doc_url
{http
://www.kernel.org
/pub
/software
/scm
/git
/docs
/}
3038 proc start_browser
{url
} {
3039 git
"web--browse" $url
3042 .mbar.
help add
command -label [mc
"Online Documentation"] \
3043 -command [list start_browser
$doc_url]
3045 .mbar.
help add
command -label [mc
"Show SSH Key"] \
3048 unset doc_path doc_url
3050 # -- Standard bindings
3052 wm protocol . WM_DELETE_WINDOW do_quit
3053 bind all
<$M1B-Key-q> do_quit
3054 bind all
<$M1B-Key-Q> do_quit
3057 set toplvl_win
[winfo toplevel
%W
]
3059 # If we are destroying the main window, we should call do_quit to take
3060 # care of cleanup before exiting the program.
3061 if {$toplvl_win eq
"."} {
3068 bind all
<$M1B-Key-w> $m1b_w_script
3069 bind all
<$M1B-Key-W> $m1b_w_script
3073 set subcommand_args
{}
3075 set s
"[mc usage:] $::argv0 $::subcommand $::subcommand_args"
3076 if {[tk windowingsystem
] eq
"win32"} {
3078 tk_messageBox
-icon info
-message $s \
3086 proc normalize_relpath
{path
} {
3088 foreach item
[file split $path] {
3089 if {$item eq
{.
}} continue
3090 if {$item eq
{..
} && [llength
$elements] > 0
3091 && [lindex
$elements end
] ne
{..
}} {
3092 set elements
[lrange
$elements 0 end-1
]
3095 lappend elements
$item
3097 return [eval file join $elements]
3100 # -- Not a normal commit type invocation? Do that instead!
3102 switch
-- $subcommand {
3105 if {$subcommand eq
"blame"} {
3106 set subcommand_args
{[--line=<num
>] rev? path
}
3108 set subcommand_args
{rev? path
}
3110 if {$argv eq
{}} usage
3116 set p
[file join $_prefix $a]
3118 if {$is_path ||
[file exists
$p]} {
3119 if {$path ne
{}} usage
3120 set path
[normalize_relpath
$p]
3122 } elseif
{$a eq
{--}} {
3124 if {$head ne
{}} usage
3129 } elseif
{[regexp
{^
--line=(\d
+)$
} $a a lnum
]} {
3130 if {$jump_spec ne
{} ||
$head ne
{}} usage
3131 set jump_spec
[list
$lnum]
3132 } elseif
{$head eq
{}} {
3133 if {$head ne
{}} usage
3142 if {$head ne
{} && $path eq
{}} {
3143 if {[string index
$head 0] eq
{/}} {
3144 set path
[normalize_relpath
$head]
3147 set path
[normalize_relpath
$_prefix$head]
3155 if {[regexp
{^
[0-9a-f]{1,39}$
} $head]} {
3157 set head [git rev-parse
--verify $head]
3159 if {[tk windowingsystem
] eq
"win32"} {
3160 tk_messageBox
-icon error
-title [mc Error
] -message $err
3167 set current_branch
$head
3171 switch
-- $subcommand {
3173 if {$jump_spec ne
{}} usage
3175 if {$path ne
{} && [file isdirectory
$path]} {
3176 set head $current_branch
3182 browser
::new
$head $path
3185 if {$head eq
{} && ![file exists
$path]} {
3186 catch
{wm withdraw .
}
3190 -title [mc
"git-gui: fatal error"] \
3191 -message [mc
"fatal: cannot stat path %s: No such file or directory" $path]
3194 blame
::new
$head $path $jump_spec
3201 if {[llength
$argv] != 0} {
3204 # fall through to setup UI for commits
3207 set err
"[mc usage:] $argv0 \[{blame|browser|citool}\]"
3208 if {[tk windowingsystem
] eq
"win32"} {
3210 tk_messageBox
-icon error
-message $err \
3221 ${NS}::frame .branch
3222 if {!$use_ttk} {.branch configure
-borderwidth 1 -relief sunken
}
3223 ${NS}::label .branch.l1 \
3224 -text [mc
"Current Branch:"] \
3227 ${NS}::label .branch.cb \
3228 -textvariable current_branch \
3231 pack .branch.l1
-side left
3232 pack .branch.cb
-side left
-fill x
3233 pack .branch
-side top
-fill x
3235 # -- Main Window Layout
3237 ${NS}::panedwindow .vpane
-orient horizontal
3238 ${NS}::panedwindow .vpane.files
-orient vertical
3240 .vpane add .vpane.files
3242 .vpane add .vpane.files
-sticky nsew
-height 100 -width 200
3244 pack .vpane
-anchor n
-side top
-fill both
-expand 1
3246 # -- Working Directory File List
3248 textframe .vpane.files.workdir
-height 100 -width 200
3249 tlabel .vpane.files.workdir.title
-text [mc
"Unstaged Changes"] \
3250 -background lightsalmon
-foreground black
3251 ttext
$ui_workdir -background white
-foreground black \
3253 -width 20 -height 10 \
3255 -takefocus 1 -highlightthickness 1\
3256 -cursor $cursor_ptr \
3257 -xscrollcommand {.vpane.files.workdir.sx
set} \
3258 -yscrollcommand {.vpane.files.workdir.sy
set} \
3260 ${NS}::scrollbar .vpane.files.workdir.sx
-orient h
-command [list
$ui_workdir xview
]
3261 ${NS}::scrollbar .vpane.files.workdir.sy
-orient v
-command [list
$ui_workdir yview
]
3262 pack .vpane.files.workdir.title
-side top
-fill x
3263 pack .vpane.files.workdir.sx
-side bottom
-fill x
3264 pack .vpane.files.workdir.sy
-side right
-fill y
3265 pack
$ui_workdir -side left
-fill both
-expand 1
3267 # -- Index File List
3269 textframe .vpane.files.index
-height 100 -width 200
3270 tlabel .vpane.files.index.title \
3271 -text [mc
"Staged Changes (Will Commit)"] \
3272 -background lightgreen
-foreground black
3273 ttext
$ui_index -background white
-foreground black \
3275 -width 20 -height 10 \
3277 -takefocus 1 -highlightthickness 1\
3278 -cursor $cursor_ptr \
3279 -xscrollcommand {.vpane.files.index.sx
set} \
3280 -yscrollcommand {.vpane.files.index.sy
set} \
3282 ${NS}::scrollbar .vpane.files.index.sx
-orient h
-command [list
$ui_index xview
]
3283 ${NS}::scrollbar .vpane.files.index.sy
-orient v
-command [list
$ui_index yview
]
3284 pack .vpane.files.index.title
-side top
-fill x
3285 pack .vpane.files.index.sx
-side bottom
-fill x
3286 pack .vpane.files.index.sy
-side right
-fill y
3287 pack
$ui_index -side left
-fill both
-expand 1
3289 # -- Insert the workdir and index into the panes
3291 .vpane.files add .vpane.files.workdir
3292 .vpane.files add .vpane.files.index
3294 .vpane.files paneconfigure .vpane.files.workdir
-sticky news
3295 .vpane.files paneconfigure .vpane.files.index
-sticky news
3298 foreach i
[list
$ui_index $ui_workdir] {
3300 $i tag conf in_diff
-background [$i tag cget in_sel
-background]
3304 # -- Diff and Commit Area
3307 ${NS}::panedwindow .vpane.lower
-orient vertical
3308 ${NS}::frame .vpane.lower.commarea
3309 ${NS}::frame .vpane.lower.
diff -relief sunken
-borderwidth 1 -height 500
3310 .vpane.lower add .vpane.lower.
diff
3311 .vpane.lower add .vpane.lower.commarea
3312 .vpane add .vpane.lower
3314 .vpane.lower pane .vpane.lower.
diff -weight 1
3315 .vpane.lower pane .vpane.lower.commarea
-weight 0
3317 .vpane.lower paneconfigure .vpane.lower.
diff -stretch always
3318 .vpane.lower paneconfigure .vpane.lower.commarea
-stretch never
3321 frame .vpane.lower
-height 300 -width 400
3322 frame .vpane.lower.commarea
3323 frame .vpane.lower.
diff -relief sunken
-borderwidth 1
3324 pack .vpane.lower.
diff -fill both
-expand 1
3325 pack .vpane.lower.commarea
-side bottom
-fill x
3326 .vpane add .vpane.lower
3327 .vpane paneconfigure .vpane.lower
-sticky nsew
3330 # -- Commit Area Buttons
3332 ${NS}::frame .vpane.lower.commarea.buttons
3333 ${NS}::label .vpane.lower.commarea.buttons.l
-text {} \
3336 pack .vpane.lower.commarea.buttons.l
-side top
-fill x
3337 pack .vpane.lower.commarea.buttons
-side left
-fill y
3339 ${NS}::button .vpane.lower.commarea.buttons.rescan
-text [mc Rescan
] \
3340 -command ui_do_rescan
3341 pack .vpane.lower.commarea.buttons.rescan
-side top
-fill x
3342 lappend disable_on_lock \
3343 {.vpane.lower.commarea.buttons.rescan conf
-state}
3345 ${NS}::button .vpane.lower.commarea.buttons.incall
-text [mc
"Stage Changed"] \
3347 pack .vpane.lower.commarea.buttons.incall
-side top
-fill x
3348 lappend disable_on_lock \
3349 {.vpane.lower.commarea.buttons.incall conf
-state}
3351 if {![is_enabled nocommitmsg
]} {
3352 ${NS}::button .vpane.lower.commarea.buttons.signoff
-text [mc
"Sign Off"] \
3354 pack .vpane.lower.commarea.buttons.signoff
-side top
-fill x
3357 ${NS}::button .vpane.lower.commarea.buttons.commit
-text [commit_btn_caption
] \
3359 pack .vpane.lower.commarea.buttons.commit
-side top
-fill x
3360 lappend disable_on_lock \
3361 {.vpane.lower.commarea.buttons.commit conf
-state}
3363 if {![is_enabled nocommit
]} {
3364 ${NS}::button .vpane.lower.commarea.buttons.push
-text [mc Push
] \
3365 -command do_push_anywhere
3366 pack .vpane.lower.commarea.buttons.push
-side top
-fill x
3369 # -- Commit Message Buffer
3371 ${NS}::frame .vpane.lower.commarea.buffer
3372 ${NS}::frame .vpane.lower.commarea.buffer.header
3373 set ui_comm .vpane.lower.commarea.buffer.frame.t
3374 set ui_coml .vpane.lower.commarea.buffer.header.l
3376 if {![is_enabled nocommit
]} {
3377 ${NS}::checkbutton .vpane.lower.commarea.buffer.header.amend \
3378 -text [mc
"Amend Last Commit"] \
3379 -variable commit_type_is_amend \
3380 -command do_select_commit_type
3381 lappend disable_on_lock \
3382 [list .vpane.lower.commarea.buffer.header.amend conf
-state]
3385 ${NS}::label
$ui_coml \
3388 proc trace_commit_type
{varname args
} {
3389 global ui_coml commit_type
3390 switch
-glob -- $commit_type {
3391 initial
{set txt
[mc
"Initial Commit Message:"]}
3392 amend
{set txt
[mc
"Amended Commit Message:"]}
3393 amend-initial
{set txt
[mc
"Amended Initial Commit Message:"]}
3394 amend-merge
{set txt
[mc
"Amended Merge Commit Message:"]}
3395 merge
{set txt
[mc
"Merge Commit Message:"]}
3396 * {set txt
[mc
"Commit Message:"]}
3398 $ui_coml conf
-text $txt
3400 trace add variable commit_type
write trace_commit_type
3401 pack
$ui_coml -side left
-fill x
3403 if {![is_enabled nocommit
]} {
3404 pack .vpane.lower.commarea.buffer.header.amend
-side right
3407 textframe .vpane.lower.commarea.buffer.frame
3408 ttext
$ui_comm -background white
-foreground black \
3412 -autoseparators true \
3414 -highlightthickness 1 \
3416 -width $repo_config(gui.commitmsgwidth
) -height 9 -wrap none \
3418 -xscrollcommand {.vpane.lower.commarea.buffer.frame.sbx
set} \
3419 -yscrollcommand {.vpane.lower.commarea.buffer.frame.sby
set}
3420 ${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sbx \
3421 -orient horizontal \
3422 -command [list
$ui_comm xview
]
3423 ${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sby \
3425 -command [list
$ui_comm yview
]
3427 pack .vpane.lower.commarea.buffer.frame.sbx
-side bottom
-fill x
3428 pack .vpane.lower.commarea.buffer.frame.sby
-side right
-fill y
3429 pack
$ui_comm -side left
-fill y
3430 pack .vpane.lower.commarea.buffer.header
-side top
-fill x
3431 pack .vpane.lower.commarea.buffer.frame
-side left
-fill y
3432 pack .vpane.lower.commarea.buffer
-side left
-fill y
3434 # -- Commit Message Buffer Context Menu
3436 set ctxm .vpane.lower.commarea.buffer.ctxm
3437 menu
$ctxm -tearoff 0
3440 -command {tk_textCut
$ui_comm}
3443 -command {tk_textCopy
$ui_comm}
3446 -command {tk_textPaste
$ui_comm}
3448 -label [mc Delete
] \
3449 -command {catch
{$ui_comm delete sel.first sel.last
}}
3452 -label [mc
"Select All"] \
3453 -command {focus
$ui_comm;$ui_comm tag add sel
0.0 end
}
3455 -label [mc
"Copy All"] \
3457 $ui_comm tag add sel
0.0 end
3458 tk_textCopy
$ui_comm
3459 $ui_comm tag remove sel
0.0 end
3463 -label [mc
"Sign Off"] \
3465 set ui_comm_ctxm
$ctxm
3469 proc trace_current_diff_path
{varname args
} {
3470 global current_diff_path diff_actions file_states
3471 if {$current_diff_path eq
{}} {
3477 set p
$current_diff_path
3478 set s
[mapdesc
[lindex
$file_states($p) 0] $p]
3480 set p
[escape_path
$p]
3484 .vpane.lower.
diff.header.status configure
-text $s
3485 .vpane.lower.
diff.header.
file configure
-text $f
3486 .vpane.lower.
diff.header.path configure
-text $p
3487 foreach w
$diff_actions {
3491 trace add variable current_diff_path
write trace_current_diff_path
3493 gold_frame .vpane.lower.
diff.header
3494 tlabel .vpane.lower.
diff.header.status \
3497 -width $max_status_desc \
3500 tlabel .vpane.lower.
diff.header.
file \
3505 tlabel .vpane.lower.
diff.header.path \
3510 pack .vpane.lower.
diff.header.status
-side left
3511 pack .vpane.lower.
diff.header.
file -side left
3512 pack .vpane.lower.
diff.header.path
-fill x
3513 set ctxm .vpane.lower.
diff.header.ctxm
3514 menu
$ctxm -tearoff 0
3522 -- $current_diff_path
3524 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3525 bind_button3 .vpane.lower.
diff.header.path
"tk_popup $ctxm %X %Y"
3529 textframe .vpane.lower.
diff.body
3530 set ui_diff .vpane.lower.
diff.body.t
3531 ttext
$ui_diff -background white
-foreground black \
3533 -width 80 -height 5 -wrap none \
3535 -takefocus 1 -highlightthickness 1 \
3536 -xscrollcommand {.vpane.lower.
diff.body.sbx
set} \
3537 -yscrollcommand {.vpane.lower.
diff.body.sby
set} \
3539 catch
{$ui_diff configure
-tabstyle wordprocessor
}
3540 ${NS}::scrollbar .vpane.lower.
diff.body.sbx
-orient horizontal \
3541 -command [list
$ui_diff xview
]
3542 ${NS}::scrollbar .vpane.lower.
diff.body.sby
-orient vertical \
3543 -command [list
$ui_diff yview
]
3544 pack .vpane.lower.
diff.body.sbx
-side bottom
-fill x
3545 pack .vpane.lower.
diff.body.sby
-side right
-fill y
3546 pack
$ui_diff -side left
-fill both
-expand 1
3547 pack .vpane.lower.
diff.header
-side top
-fill x
3548 pack .vpane.lower.
diff.body
-side bottom
-fill both
-expand 1
3550 foreach
{n c
} {0 black
1 red4
2 green4
3 yellow4
4 blue4
5 magenta4
6 cyan4
7 grey60
} {
3551 $ui_diff tag configure clr4
$n -background $c
3552 $ui_diff tag configure clri4
$n -foreground $c
3553 $ui_diff tag configure clr3
$n -foreground $c
3554 $ui_diff tag configure clri3
$n -background $c
3556 $ui_diff tag configure clr1
-font font_diffbold
3557 $ui_diff tag configure clr4
-underline 1
3559 $ui_diff tag conf d_info
-foreground blue
-font font_diffbold
3561 $ui_diff tag conf d_cr
-elide true
3562 $ui_diff tag conf d_@
-font font_diffbold
3563 $ui_diff tag conf d_
+ -foreground {#00a000}
3564 $ui_diff tag conf d_-
-foreground red
3566 $ui_diff tag conf d_
++ -foreground {#00a000}
3567 $ui_diff tag conf d_--
-foreground red
3568 $ui_diff tag conf d_
+s \
3569 -foreground {#00a000} \
3570 -background {#e2effa}
3571 $ui_diff tag conf d_-s \
3573 -background {#e2effa}
3574 $ui_diff tag conf d_s
+ \
3575 -foreground {#00a000} \
3577 $ui_diff tag conf d_s- \
3581 $ui_diff tag conf d
< \
3582 -foreground orange \
3584 $ui_diff tag conf d
= \
3585 -foreground orange \
3587 $ui_diff tag conf d
> \
3588 -foreground orange \
3591 $ui_diff tag raise sel
3593 # -- Diff Body Context Menu
3596 proc create_common_diff_popup
{ctxm
} {
3598 -label [mc Refresh
] \
3599 -command reshow_diff
3600 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3603 -command {tk_textCopy
$ui_diff}
3604 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3606 -label [mc
"Select All"] \
3607 -command {focus
$ui_diff;$ui_diff tag add sel
0.0 end
}
3608 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3610 -label [mc
"Copy All"] \
3612 $ui_diff tag add sel
0.0 end
3613 tk_textCopy
$ui_diff
3614 $ui_diff tag remove sel
0.0 end
3616 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3619 -label [mc
"Decrease Font Size"] \
3620 -command {incr_font_size font_diff
-1}
3621 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3623 -label [mc
"Increase Font Size"] \
3624 -command {incr_font_size font_diff
1}
3625 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3629 build_encoding_menu
$emenu [list force_diff_encoding
]
3631 -label [mc
"Encoding"] \
3633 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3635 $ctxm add
command -label [mc
"Options..."] \
3639 set ctxm .vpane.lower.
diff.body.ctxm
3640 menu
$ctxm -tearoff 0
3642 -label [mc
"Apply/Reverse Hunk"] \
3643 -command {apply_or_revert_hunk
$cursorX $cursorY 0}
3644 set ui_diff_applyhunk
[$ctxm index last
]
3645 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyhunk -state]
3647 -label [mc
"Apply/Reverse Line"] \
3648 -command {apply_or_revert_range_or_line
$cursorX $cursorY 0; do_rescan
}
3649 set ui_diff_applyline
[$ctxm index last
]
3650 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyline -state]
3653 -label [mc
"Revert Hunk"] \
3654 -command {apply_or_revert_hunk
$cursorX $cursorY 1}
3655 set ui_diff_reverthunk
[$ctxm index last
]
3656 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_reverthunk -state]
3658 -label [mc
"Revert Line"] \
3659 -command {apply_or_revert_range_or_line
$cursorX $cursorY 1; do_rescan
}
3660 set ui_diff_revertline
[$ctxm index last
]
3661 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_revertline -state]
3663 -label [mc
"Undo Last Revert"] \
3664 -command {undo_last_revert
; do_rescan
}
3665 set ui_diff_undorevert
[$ctxm index last
]
3666 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_undorevert -state]
3669 -label [mc
"Show Less Context"] \
3670 -command show_less_context
3671 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3673 -label [mc
"Show More Context"] \
3674 -command show_more_context
3675 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3677 create_common_diff_popup
$ctxm
3679 set ctxmmg .vpane.lower.
diff.body.ctxmmg
3680 menu
$ctxmmg -tearoff 0
3681 $ctxmmg add
command \
3682 -label [mc
"Run Merge Tool"] \
3683 -command {merge_resolve_tool
}
3684 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3685 $ctxmmg add separator
3686 $ctxmmg add
command \
3687 -label [mc
"Use Remote Version"] \
3688 -command {merge_resolve_one
3}
3689 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3690 $ctxmmg add
command \
3691 -label [mc
"Use Local Version"] \
3692 -command {merge_resolve_one
2}
3693 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3694 $ctxmmg add
command \
3695 -label [mc
"Revert To Base"] \
3696 -command {merge_resolve_one
1}
3697 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3698 $ctxmmg add separator
3699 $ctxmmg add
command \
3700 -label [mc
"Show Less Context"] \
3701 -command show_less_context
3702 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3703 $ctxmmg add
command \
3704 -label [mc
"Show More Context"] \
3705 -command show_more_context
3706 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3707 $ctxmmg add separator
3708 create_common_diff_popup
$ctxmmg
3710 set ctxmsm .vpane.lower.
diff.body.ctxmsm
3711 menu
$ctxmsm -tearoff 0
3712 $ctxmsm add
command \
3713 -label [mc
"Visualize These Changes In The Submodule"] \
3714 -command {do_gitk
-- true
}
3715 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3716 $ctxmsm add
command \
3717 -label [mc
"Visualize Current Branch History In The Submodule"] \
3718 -command {do_gitk
{} true
}
3719 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3720 $ctxmsm add
command \
3721 -label [mc
"Visualize All Branch History In The Submodule"] \
3722 -command {do_gitk
--all true
}
3723 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3724 $ctxmsm add separator
3725 $ctxmsm add
command \
3726 -label [mc
"Start git gui In The Submodule"] \
3727 -command {do_git_gui
}
3728 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3729 $ctxmsm add separator
3730 create_common_diff_popup
$ctxmsm
3732 proc has_textconv
{path
} {
3733 if {[is_config_false gui.textconv
]} {
3736 set filter
[gitattr
$path diff set]
3737 set textconv
[get_config
[join [list
diff $filter textconv
] .
]]
3738 if {$filter ne
{set} && $textconv ne
{}} {
3745 proc popup_diff_menu
{ctxm ctxmmg ctxmsm x y X Y
} {
3746 global current_diff_path file_states last_revert
3749 if {[info exists file_states
($current_diff_path)]} {
3750 set state
[lindex
$file_states($current_diff_path) 0]
3754 if {[string first
{U
} $state] >= 0} {
3755 tk_popup
$ctxmmg $X $Y
3756 } elseif
{$
::is_submodule_diff
} {
3757 tk_popup
$ctxmsm $X $Y
3759 set has_range
[expr {[$
::ui_diff tag nextrange sel
0.0] != {}}]
3760 set u
[mc
"Undo Last Revert"]
3761 if {$
::ui_index eq $
::current_diff_side
} {
3762 set l
[mc
"Unstage Hunk From Commit"]
3763 set h
[mc
"Revert Hunk"]
3766 set t
[mc
"Unstage Lines From Commit"]
3767 set r
[mc
"Revert Lines"]
3769 set t
[mc
"Unstage Line From Commit"]
3770 set r
[mc
"Revert Line"]
3773 set l
[mc
"Stage Hunk For Commit"]
3774 set h
[mc
"Revert Hunk"]
3777 set t
[mc
"Stage Lines For Commit"]
3778 set r
[mc
"Revert Lines"]
3780 set t
[mc
"Stage Line For Commit"]
3781 set r
[mc
"Revert Line"]
3785 ||
$current_diff_path eq
{}
3788 ||
[string match
{?T
} $state]
3789 ||
[string match
{T?
} $state]
3790 ||
[has_textconv
$current_diff_path]} {
3792 set revert_state disabled
3796 # Only allow reverting changes in the working tree. If
3797 # the user wants to revert changes in the index, they
3798 # need to unstage those first.
3799 if {$
::ui_workdir eq $
::current_diff_side
} {
3800 set revert_state normal
3802 set revert_state disabled
3806 if {$last_revert eq
{}} {
3807 set undo_state disabled
3809 set undo_state normal
3812 $ctxm entryconf $
::ui_diff_applyhunk
-state $s -label $l
3813 $ctxm entryconf $
::ui_diff_applyline
-state $s -label $t
3814 $ctxm entryconf $
::ui_diff_revertline
-state $revert_state \
3816 $ctxm entryconf $
::ui_diff_reverthunk
-state $revert_state \
3818 $ctxm entryconf $
::ui_diff_undorevert
-state $undo_state \
3821 tk_popup
$ctxm $X $Y
3824 bind_button3
$ui_diff [list popup_diff_menu
$ctxm $ctxmmg $ctxmsm %x
%y
%X
%Y
]
3828 set main_status
[::status_bar
::new .status
]
3829 pack .status
-anchor w
-side bottom
-fill x
3830 $main_status show
[mc
"Initializing..."]
3834 proc on_ttk_pane_mapped
{w pane pos
} {
3836 after
0 [list after idle
[list
$w sashpos
$pane $pos]]
3838 proc on_tk_pane_mapped
{w pane x y
} {
3840 after
0 [list after idle
[list
$w sash place
$pane $x $y]]
3842 proc on_application_mapped
{} {
3843 global repo_config use_ttk
3845 set gm
$repo_config(gui.geometry
)
3848 [list on_ttk_pane_mapped
%W
0 [lindex
$gm 1]]
3849 bind .vpane.files
<Map
> \
3850 [list on_ttk_pane_mapped
%W
0 [lindex
$gm 2]]
3853 [list on_tk_pane_mapped
%W
0 \
3855 [lindex
[.vpane sash coord
0] 1]]
3856 bind .vpane.files
<Map
> \
3857 [list on_tk_pane_mapped
%W
0 \
3858 [lindex
[.vpane.files sash coord
0] 0] \
3861 wm geometry .
[lindex
$gm 0]
3863 if {[info exists repo_config
(gui.geometry
)]} {
3864 bind .
<Map
> [list on_application_mapped
]
3865 wm geometry .
[lindex
$repo_config(gui.geometry
) 0]
3868 # -- Load window state
3870 if {[info exists repo_config
(gui.wmstate
)]} {
3871 catch
{wm state .
$repo_config(gui.wmstate
)}
3876 bind $ui_comm <$M1B-Key-Return> {do_commit
;break}
3877 bind $ui_comm <$M1B-Key-t> {do_add_selection
;break}
3878 bind $ui_comm <$M1B-Key-T> {do_add_selection
;break}
3879 bind $ui_comm <$M1B-Key-u> {do_unstage_selection
;break}
3880 bind $ui_comm <$M1B-Key-U> {do_unstage_selection
;break}
3881 bind $ui_comm <$M1B-Key-j> {do_revert_selection
;break}
3882 bind $ui_comm <$M1B-Key-J> {do_revert_selection
;break}
3883 bind $ui_comm <$M1B-Key-i> {do_add_all
;break}
3884 bind $ui_comm <$M1B-Key-I> {do_add_all
;break}
3885 bind $ui_comm <$M1B-Key-x> {tk_textCut
%W
;break}
3886 bind $ui_comm <$M1B-Key-X> {tk_textCut
%W
;break}
3887 bind $ui_comm <$M1B-Key-c> {tk_textCopy
%W
;break}
3888 bind $ui_comm <$M1B-Key-C> {tk_textCopy
%W
;break}
3889 bind $ui_comm <$M1B-Key-v> {tk_textPaste
%W
; %W see insert
; break}
3890 bind $ui_comm <$M1B-Key-V> {tk_textPaste
%W
; %W see insert
; break}
3891 bind $ui_comm <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3892 bind $ui_comm <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3893 bind $ui_comm <$M1B-Key-minus> {show_less_context
;break}
3894 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context
;break}
3895 bind $ui_comm <$M1B-Key-equal> {show_more_context
;break}
3896 bind $ui_comm <$M1B-Key-plus> {show_more_context
;break}
3897 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context
;break}
3899 bind $ui_diff <$M1B-Key-x> {tk_textCopy
%W
;break}
3900 bind $ui_diff <$M1B-Key-X> {tk_textCopy
%W
;break}
3901 bind $ui_diff <$M1B-Key-c> {tk_textCopy
%W
;break}
3902 bind $ui_diff <$M1B-Key-C> {tk_textCopy
%W
;break}
3903 bind $ui_diff <$M1B-Key-v> {break}
3904 bind $ui_diff <$M1B-Key-V> {break}
3905 bind $ui_diff <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3906 bind $ui_diff <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3907 bind $ui_diff <$M1B-Key-j> {do_revert_selection
;break}
3908 bind $ui_diff <$M1B-Key-J> {do_revert_selection
;break}
3909 bind $ui_diff <Key-Up
> {catch
{%W yview scroll
-1 units
};break}
3910 bind $ui_diff <Key-Down
> {catch
{%W yview scroll
1 units
};break}
3911 bind $ui_diff <Key-Left
> {catch
{%W xview scroll
-1 units
};break}
3912 bind $ui_diff <Key-Right
> {catch
{%W xview scroll
1 units
};break}
3913 bind $ui_diff <Key-k
> {catch
{%W yview scroll
-1 units
};break}
3914 bind $ui_diff <Key-j
> {catch
{%W yview scroll
1 units
};break}
3915 bind $ui_diff <Key-h
> {catch
{%W xview scroll
-1 units
};break}
3916 bind $ui_diff <Key-l
> {catch
{%W xview scroll
1 units
};break}
3917 bind $ui_diff <Control-Key-b
> {catch
{%W yview scroll
-1 pages
};break}
3918 bind $ui_diff <Control-Key-f
> {catch
{%W yview scroll
1 pages
};break}
3919 bind $ui_diff <Button-1
> {focus
%W
}
3921 if {[is_enabled branch
]} {
3922 bind .
<$M1B-Key-n> branch_create
::dialog
3923 bind .
<$M1B-Key-N> branch_create
::dialog
3924 bind .
<$M1B-Key-o> branch_checkout
::dialog
3925 bind .
<$M1B-Key-O> branch_checkout
::dialog
3926 bind .
<$M1B-Key-m> merge
::dialog
3927 bind .
<$M1B-Key-M> merge
::dialog
3929 if {[is_enabled transport
]} {
3930 bind .
<$M1B-Key-p> do_push_anywhere
3931 bind .
<$M1B-Key-P> do_push_anywhere
3934 bind .
<Key-F5
> ui_do_rescan
3935 bind .
<$M1B-Key-r> ui_do_rescan
3936 bind .
<$M1B-Key-R> ui_do_rescan
3937 bind .
<$M1B-Key-s> do_signoff
3938 bind .
<$M1B-Key-S> do_signoff
3939 bind .
<$M1B-Key-t> { toggle_or_diff toggle
%W
}
3940 bind .
<$M1B-Key-T> { toggle_or_diff toggle
%W
}
3941 bind .
<$M1B-Key-u> { toggle_or_diff toggle
%W
}
3942 bind .
<$M1B-Key-U> { toggle_or_diff toggle
%W
}
3943 bind .
<$M1B-Key-j> do_revert_selection
3944 bind .
<$M1B-Key-J> do_revert_selection
3945 bind .
<$M1B-Key-i> do_add_all
3946 bind .
<$M1B-Key-I> do_add_all
3947 bind .
<$M1B-Key-e> toggle_commit_type
3948 bind .
<$M1B-Key-E> toggle_commit_type
3949 bind .
<$M1B-Key-minus> {show_less_context
;break}
3950 bind .
<$M1B-Key-KP_Subtract> {show_less_context
;break}
3951 bind .
<$M1B-Key-equal> {show_more_context
;break}
3952 bind .
<$M1B-Key-plus> {show_more_context
;break}
3953 bind .
<$M1B-Key-KP_Add> {show_more_context
;break}
3954 bind .
<$M1B-Key-Return> do_commit
3955 bind .
<$M1B-Key-KP_Enter> do_commit
3956 foreach i
[list
$ui_index $ui_workdir] {
3957 bind $i <Button-1
> { toggle_or_diff click
%W
%x
%y
; break }
3958 bind $i <$M1B-Button-1> { add_one_to_selection
%W
%x
%y
; break }
3959 bind $i <Shift-Button-1
> { add_range_to_selection
%W
%x
%y
; break }
3960 bind $i <Key-Up
> { toggle_or_diff up
%W
; break }
3961 bind $i <Key-Down
> { toggle_or_diff down
%W
; break }
3965 bind .
<Alt-Key-1
> {focus_widget $
::ui_workdir
}
3966 bind .
<Alt-Key-2
> {focus_widget $
::ui_index
}
3967 bind .
<Alt-Key-3
> {focus $
::ui_diff
}
3968 bind .
<Alt-Key-4
> {focus $
::ui_comm
}
3970 set file_lists_last_clicked
($ui_index) {}
3971 set file_lists_last_clicked
($ui_workdir) {}
3973 set file_lists
($ui_index) [list
]
3974 set file_lists
($ui_workdir) [list
]
3976 wm title .
"[appname] ([reponame]) [file normalize $_gitworktree]"
3977 focus
-force $ui_comm
3979 # -- Warn the user about environmental problems. Cygwin's Tcl
3980 # does *not* pass its env array onto any processes it spawns.
3981 # This means that git processes get none of our environment.
3986 set msg
[mc
"Possible environment issues exist.
3988 The following environment variables are probably
3989 going to be ignored by any Git subprocess run
3993 foreach name
[array names env
] {
3994 switch
-regexp -- $name {
3995 {^GIT_INDEX_FILE$
} -
3996 {^GIT_OBJECT_DIRECTORY$
} -
3997 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$
} -
3999 {^GIT_EXTERNAL_DIFF$
} -
4003 {^GIT_
(AUTHOR|COMMITTER
)_DATE$
} {
4004 append msg
" - $name\n"
4007 {^GIT_
(AUTHOR|COMMITTER
)_
(NAME|EMAIL
)$
} {
4008 append msg
" - $name\n"
4010 set suggest_user
$name
4014 if {$ignored_env > 0} {
4016 This is due to a known issue with the
4017 Tcl binary distributed by Cygwin."]
4019 if {$suggest_user ne
{}} {
4022 A good replacement for %s
4023 is placing values for the user.name and
4024 user.email settings into your personal
4030 unset ignored_env msg suggest_user name
4033 # -- Only initialize complex UI if we are going to stay running.
4035 if {[is_enabled transport
]} {
4038 set n
[.mbar.remote index end
]
4039 populate_remotes_menu
4040 set n
[expr {[.mbar.remote index end
] - $n}]
4042 if {[.mbar.remote
type 0] eq
"tearoff"} { incr n
}
4043 .mbar.remote insert
$n separator
4048 if {[winfo exists
$ui_comm]} {
4049 set GITGUI_BCK_exists
[load_message GITGUI_BCK utf-8
]
4051 # -- If both our backup and message files exist use the
4052 # newer of the two files to initialize the buffer.
4054 if {$GITGUI_BCK_exists} {
4055 set m
[gitdir GITGUI_MSG
]
4056 if {[file isfile
$m]} {
4057 if {[file mtime
[gitdir GITGUI_BCK
]] > [file mtime
$m]} {
4058 catch
{file delete
[gitdir GITGUI_MSG
]}
4060 $ui_comm delete
0.0 end
4062 $ui_comm edit modified false
4063 catch
{file delete
[gitdir GITGUI_BCK
]}
4064 set GITGUI_BCK_exists
0
4070 proc backup_commit_buffer
{} {
4071 global ui_comm GITGUI_BCK_exists
4073 set m
[$ui_comm edit modified
]
4074 if {$m ||
$GITGUI_BCK_exists} {
4075 set msg
[string trim
[$ui_comm get
0.0 end
]]
4076 regsub
-all -line {[ \r\t]+$
} $msg {} msg
4079 if {$GITGUI_BCK_exists} {
4080 catch
{file delete
[gitdir GITGUI_BCK
]}
4081 set GITGUI_BCK_exists
0
4085 set fd
[open
[gitdir GITGUI_BCK
] w
]
4086 fconfigure
$fd -encoding utf-8
4087 puts
-nonewline $fd $msg
4089 set GITGUI_BCK_exists
1
4093 $ui_comm edit modified false
4096 set ::GITGUI_BCK_i
[after
2000 backup_commit_buffer
]
4099 backup_commit_buffer
4101 # -- If the user has aspell available we can drive it
4102 # in pipe mode to spellcheck the commit message.
4104 set spell_cmd
[list |
]
4105 set spell_dict
[get_config gui.spellingdictionary
]
4106 lappend spell_cmd aspell
4107 if {$spell_dict ne
{}} {
4108 lappend spell_cmd
--master=$spell_dict
4110 lappend spell_cmd
--mode=none
4111 lappend spell_cmd
--encoding=utf-8
4112 lappend spell_cmd pipe
4113 if {$spell_dict eq
{none
}
4114 ||
[catch
{set spell_fd
[open
$spell_cmd r
+]} spell_err
]} {
4115 bind_button3
$ui_comm [list tk_popup
$ui_comm_ctxm %X
%Y
]
4117 set ui_comm_spell
[spellcheck
::init \
4123 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
4126 lock_index begin-read
4127 if {![winfo ismapped .
]} {
4131 if {[is_enabled initialamend
]} {
4137 if {[is_enabled nocommitmsg
]} {
4138 $ui_comm configure
-state disabled
-background gray
4141 if {[is_enabled multicommit
] && ![is_config_false gui.gcwarning
]} {
4144 if {[is_enabled retcode
]} {
4145 bind .
<Destroy
> {+terminate_me
%W
}
4147 if {$picked && [is_config_true gui.autoexplore
]} {
4153 # indent-tabs-mode: t