2 # Tcl ignores the next line -*- tcl -*- \
3 if test "z$*" = zversion \
4 ||
test "z$*" = z--version
; \
6 echo 'git-gui version @@GITGUI_VERSION@@'; \
10 exec wish
"$argv0" -- "$@"
12 set appvers
{@@GITGUI_VERSION@@
}
13 set copyright
[string map
[list
(c
) \u00a9] {
14 Copyright
(c
) 2006-2010 Shawn Pearce
, et. al.
16 This program is free software
; you can redistribute it and
/or modify
17 it under the terms of the GNU General Public License as published by
18 the Free Software Foundation
; either version
2 of the License
, or
19 (at your option
) any later version.
21 This program is distributed
in the hope that it will be useful
,
22 but WITHOUT ANY WARRANTY
; without even the implied warranty of
23 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24 GNU General Public License
for more details.
26 You should have received a copy of the GNU General Public License
27 along with this program
; if not
, write to the Free Software
28 Foundation
, Inc.
, 59 Temple Place
, Suite
330, Boston
, MA
02111-1307 USA
}]
30 ######################################################################
32 ## Tcl/Tk sanity check
34 if {[catch
{package require Tcl
8.4} err
]
35 ||
[catch
{package require Tk
8.4} err
]
41 -title "git-gui: fatal error" \
46 catch
{rename send
{}} ; # What an evil concept...
48 ######################################################################
52 if { [info exists
::env
(GIT_GUI_LIB_DIR
) ] } {
53 set oguilib $
::env
(GIT_GUI_LIB_DIR
)
55 set oguilib
{@@GITGUI_LIBDIR@@
}
57 set oguirel
{@@GITGUI_RELATIVE@@
}
58 if {$oguirel eq
{1}} {
59 set oguilib
[file dirname [file normalize
$argv0]]
60 if {[file tail $oguilib] eq
{git-core
}} {
61 set oguilib
[file dirname $oguilib]
63 set oguilib
[file dirname $oguilib]
64 set oguilib
[file join $oguilib share git-gui lib
]
65 set oguimsg
[file join $oguilib msgs
]
66 } elseif
{[string match @@
* $oguirel]} {
67 set oguilib
[file join [file dirname [file normalize
$argv0]] lib
]
68 set oguimsg
[file join [file dirname [file normalize
$argv0]] po
]
70 set oguimsg
[file join $oguilib msgs
]
74 ######################################################################
76 ## enable verbose loading?
78 if {![catch
{set _verbose
$env(GITGUI_VERBOSE
)}]} {
80 rename auto_load real__auto_load
81 proc auto_load
{name args
} {
82 puts stderr
"auto_load $name"
83 return [uplevel
1 real__auto_load
$name $args]
85 rename
source real__source
87 puts stderr
"source $args"
88 uplevel
1 [linsert
$args 0 real__source
]
90 if {[tk windowingsystem
] eq
"win32"} { console show
}
93 ######################################################################
95 ## Internationalization (i18n) through msgcat and gettext. See
96 ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
98 package require msgcat
100 # Check for Windows 7 MUI language pack (missed by msgcat < 1.4.4)
101 if {[tk windowingsystem
] eq
"win32"
102 && [package vcompare
[package provide msgcat
] 1.4.4] < 0
104 proc _mc_update_locale
{} {
105 set key
{HKEY_CURRENT_USER\Control Panel\Desktop
}
107 package require registry
108 set uilocale
[registry get
$key "PreferredUILanguages"]
109 msgcat
::ConvertLocale
[string map
{- _
} [lindex
$uilocale 0]]
111 if {[string length
$uilocale] > 0} {
112 msgcat
::mclocale
$uilocale
119 proc _mc_trim
{fmt} {
120 set cmk
[string first @@
$fmt]
122 return [string range
$fmt 0 [expr {$cmk - 1}]]
127 proc mc
{en_fmt args
} {
128 set fmt [_mc_trim
[::msgcat
::mc
$en_fmt]]
129 if {[catch
{set msg
[eval [list format
$fmt] $args]} err
]} {
130 set msg
[eval [list format
[_mc_trim
$en_fmt]] $args]
136 return [join $args {}]
139 ::msgcat
::mcload
$oguimsg
142 ######################################################################
144 ## On Mac, bring the current Wish process window to front
146 if {[tk windowingsystem
] eq
"aqua"} {
148 exec osascript
-e [format
{
149 tell application
"System Events"
150 set frontmost of processes whose unix id is
%d to true
156 ######################################################################
160 set _appname
{Git Gui
}
169 set _shellpath
{@@SHELL_PATH@@
}
171 set _trace
[lsearch
-exact $argv --trace]
173 set argv
[lreplace
$argv $_trace $_trace]
175 if {[tk windowingsystem
] eq
"win32"} { console show
}
180 # variable for the last merged branch (useful for a default when deleting
182 set _last_merged_branch
{}
185 global _shellpath env
186 if {[string match @@
* $_shellpath]} {
187 if {[info exists env
(SHELL
)]} {
206 return [eval [list
file join $_gitdir] $args]
209 proc gitexec
{args
} {
211 if {$_gitexec eq
{}} {
212 if {[catch
{set _gitexec
[git
--exec-path]} err
]} {
213 error
"Git not installed?\n\n$err"
216 set _gitexec
[exec cygpath \
221 set _gitexec
[file normalize
$_gitexec]
227 return [eval [list
file join $_gitexec] $args]
230 proc githtmldir
{args
} {
232 if {$_githtmldir eq
{}} {
233 if {[catch
{set _githtmldir
[git
--html-path]}]} {
234 # Git not installed or option not yet supported
238 set _githtmldir
[exec cygpath \
243 set _githtmldir
[file normalize
$_githtmldir]
249 return [eval [list
file join $_githtmldir] $args]
257 if {[tk windowingsystem
] eq
{aqua
}} {
264 if {$
::tcl_platform
(platform
) eq
{windows
}} {
272 if {$_iscygwin eq
{}} {
273 if {$
::tcl_platform
(platform
) eq
{windows
}} {
274 if {[catch
{set p
[exec cygpath
--windir]} err
]} {
286 proc is_enabled
{option
} {
287 global enabled_options
288 if {[catch
{set on
$enabled_options($option)}]} {return 0}
292 proc enable_option
{option
} {
293 global enabled_options
294 set enabled_options
($option) 1
297 proc disable_option
{option
} {
298 global enabled_options
299 set enabled_options
($option) 0
302 ######################################################################
306 proc is_many_config
{name
} {
307 switch
-glob -- $name {
317 proc is_config_true
{name
} {
319 if {[catch
{set v
$repo_config($name)}]} {
322 set v
[string tolower
$v]
323 if {$v eq
{} ||
$v eq
{true
} ||
$v eq
{1} ||
$v eq
{yes} ||
$v eq
{on
}} {
330 proc is_config_false
{name
} {
332 if {[catch
{set v
$repo_config($name)}]} {
335 set v
[string tolower
$v]
336 if {$v eq
{false
} ||
$v eq
{0} ||
$v eq
{no
} ||
$v eq
{off
}} {
343 proc get_config
{name
} {
345 if {[catch
{set v
$repo_config($name)}]} {
357 if {$_isbare eq
{}} {
359 set _bare
[git rev-parse
--is-bare-repository]
361 true
{ set _isbare
1 }
362 false
{ set _isbare
0}
366 if {[is_config_true core.bare
]
367 ||
($_gitworktree eq
{}
368 && [lindex
[file split $_gitdir] end
] ne
{.git
})} {
378 ######################################################################
382 proc _trace_exec
{cmd
} {
383 if {!$
::_trace
} return
389 if {[regexp
{[ \t\r\n'"$?*]} $v]} {
397 #'" fix poor old emacs font-lock mode
399 proc _git_cmd {name} {
402 if {[catch {set v $_git_cmd_path($name)}]} {
406 --exec-path { return [list $::_git $name] }
409 set p [gitexec git-$name$::_search_exe]
410 if {[file exists $p]} {
412 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
413 # Try to determine what sort of magic will make
414 # git-$name go and do its thing, because native
415 # Tcl on Windows doesn't know it.
417 set p [gitexec git-$name]
422 switch -glob -- [lindex $s 0] {
424 #!*perl { set i perl }
425 #!*python { set i python }
426 default { error "git-
$name is not supported
: $s" }
430 if {![info exists interp]} {
431 set interp [_which $i]
434 error "git-
$name requires
$i (not
in PATH
)"
436 set v [concat [list $interp] [lrange $s 1 end] [list $p]]
438 # Assume it is builtin to git somehow and we
439 # aren't actually able to see a file for it.
441 set v [list $::_git $name]
443 set _git_cmd_path($name) $v
448 proc _which {what args} {
449 global env _search_exe _search_path
451 if {$_search_path eq {}} {
452 if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
453 set _search_path [split [exec cygpath \
459 } elseif {[is_Windows]} {
460 set gitguidir [file dirname [info script]]
461 regsub -all ";" $gitguidir "\\;" gitguidir
462 set env(PATH) "$gitguidir;$env(PATH
)"
463 set _search_path [split $env(PATH) {;}]
466 set _search_path [split $env(PATH) :]
471 if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
474 set suffix $_search_exe
477 foreach p $_search_path {
478 set p [file join $p $what$suffix]
479 if {[file exists $p]} {
480 return [file normalize $p]
486 # Test a file for a hashbang to identify executable scripts on Windows.
487 proc is_shellscript {filename} {
488 if {![file exists $filename]} {return 0}
489 set f [open $filename r]
490 fconfigure $f -encoding binary
491 set magic [read $f 2]
493 return [expr {$magic eq "#!"}]
496 # Run a command connected via pipes on stdout.
497 # This is for use with textconv filters and uses sh -c "..." to allow it to
498 # contain a command with arguments. On windows we must check for shell
499 # scripts specifically otherwise just call the filter command.
500 proc open_cmd_pipe
{cmd path
} {
502 if {![file executable
[shellpath
]]} {
503 set exe
[auto_execok
[lindex
$cmd 0]]
504 if {[is_shellscript
[lindex
$exe 0]]} {
505 set run
[linsert
[auto_execok sh
] end
-c "$cmd \"\$0\"" $path]
507 set run
[concat
$exe [lrange
$cmd 1 end
] $path]
510 set run
[list
[shellpath
] -c "$cmd \"\$0\"" $path]
512 return [open |
$run r
]
515 proc _lappend_nice
{cmd_var
} {
519 if {![info exists _nice
]} {
520 set _nice
[_which nice
]
521 if {[catch
{exec $_nice git version
}]} {
523 } elseif
{[is_Windows
] && [file dirname $_nice] ne
[file dirname $
::_git
]} {
536 switch
-- [lindex
$args 0] {
547 set args
[lrange
$args 1 end
]
550 set cmdp
[_git_cmd
[lindex
$args 0]]
551 set args
[lrange
$args 1 end
]
553 _trace_exec
[concat
$opt $cmdp $args]
554 set result
[eval exec $opt $cmdp $args]
556 puts stderr
"< $result"
561 proc _open_stdout_stderr
{cmd
} {
564 set fd
[open
[concat
[list |
] $cmd] r
]
566 if { [lindex
$cmd end
] eq
{2>@
1}
567 && $err eq
{can not
find channel named
"1"}
569 # Older versions of Tcl 8.4 don't have this 2>@1 IO
570 # redirect operator. Fallback to |& cat for those.
571 # The command was not actually started, so its safe
572 # to try to start it a second time.
574 set fd
[open
[concat \
576 [lrange
$cmd 0 end-1
] \
583 fconfigure
$fd -eofchar {}
587 proc git_read
{args
} {
591 switch
-- [lindex
$args 0] {
606 set args
[lrange
$args 1 end
]
609 set cmdp
[_git_cmd
[lindex
$args 0]]
610 set args
[lrange
$args 1 end
]
612 return [_open_stdout_stderr
[concat
$opt $cmdp $args]]
615 proc git_write
{args
} {
619 switch
-- [lindex
$args 0] {
630 set args
[lrange
$args 1 end
]
633 set cmdp
[_git_cmd
[lindex
$args 0]]
634 set args
[lrange
$args 1 end
]
636 _trace_exec
[concat
$opt $cmdp $args]
637 return [open
[concat
[list |
] $opt $cmdp $args] w
]
640 proc githook_read
{hook_name args
} {
641 set pchook
[gitdir hooks
$hook_name]
644 # On Windows [file executable] might lie so we need to ask
645 # the shell if the hook is executable. Yes that's annoying.
649 if {![info exists interp
]} {
650 set interp
[_which sh
]
653 error
"hook execution requires sh (not in PATH)"
656 set scr
{if test -x "$1";then exec "$@";fi}
657 set sh_c
[list
$interp -c $scr $interp $pchook]
658 return [_open_stdout_stderr
[concat
$sh_c $args]]
661 if {[file executable
$pchook]} {
662 return [_open_stdout_stderr
[concat
[list
$pchook] $args]]
668 proc kill_file_process
{fd
} {
669 set process
[pid
$fd]
673 exec taskkill
/pid
$process
680 proc gitattr
{path attr default
} {
681 if {[catch
{set r
[git check-attr
$attr -- $path]}]} {
684 set r
[join [lrange
[split $r :] 2 end
] :]
687 if {$r eq
{unspecified
}} {
694 regsub
-all ' $value "'\\''" value
698 proc load_current_branch {} {
699 global current_branch is_detached
701 set fd [open [gitdir HEAD] r]
702 if {[gets $fd ref] < 1} {
707 set pfx {ref: refs/heads/}
708 set len [string length $pfx]
709 if {[string equal -length $len $pfx $ref]} {
710 # We're on a branch. It might not exist. But
711 # HEAD looks good enough to be a branch.
713 set current_branch [string range $ref $len end]
716 # Assume this is a detached head.
718 set current_branch HEAD
723 auto_load tk_optionMenu
724 rename tk_optionMenu real__tkOptionMenu
725 proc tk_optionMenu {w varName args} {
726 set m [eval real__tkOptionMenu $w $varName $args]
727 $m configure -font font_ui
728 $w configure -font font_ui
732 proc rmsel_tag {text} {
734 -background [$text cget -background] \
735 -foreground [$text cget -foreground] \
737 $text tag conf in_sel -background lightgray
738 bind $text <Motion> break
744 bind . <Visibility> {
745 bind . <Visibility> {}
750 wm iconbitmap . -default $oguilib/git-gui.ico
751 set ::tk::AlwaysShowSelection 1
752 bind . <Control-F2> {console show}
754 # Spoof an X11 display for SSH
755 if {![info exists env(DISPLAY)]} {
756 set env(DISPLAY) :9999
760 image create photo gitlogo -width 16 -height 16
762 gitlogo put #33CC33 -to 7 0 9 2
763 gitlogo put #33CC33 -to 4 2 12 4
764 gitlogo put #33CC33 -to 7 4 9 6
765 gitlogo put #CC3333 -to 4 6 12 8
766 gitlogo put gray26 -to 4 9 6 10
767 gitlogo put gray26 -to 3 10 6 12
768 gitlogo put gray26 -to 8 9 13 11
769 gitlogo put gray26 -to 8 11 10 12
770 gitlogo put gray26 -to 11 11 13 14
771 gitlogo put gray26 -to 3 12 5 14
772 gitlogo put gray26 -to 5 13
773 gitlogo put gray26 -to 10 13
774 gitlogo put gray26 -to 4 14 12 15
775 gitlogo put gray26 -to 5 15 11 16
778 image create photo gitlogo32 -width 32 -height 32
779 gitlogo32 copy gitlogo -zoom 2 2
781 wm iconphoto . -default gitlogo gitlogo32
785 ######################################################################
791 if {[lsearch -exact [font names] TkDefaultFont] != -1} {
792 eval [linsert [font actual TkDefaultFont] 0 font configure font_ui]
793 eval [linsert [font actual TkFixedFont] 0 font create font_diff]
795 font create font_diff -family Courier -size 10
798 eval font configure font_ui [font actual [.dummy cget -font]]
803 font create font_uiitalic
804 font create font_uibold
805 font create font_diffbold
806 font create font_diffitalic
808 foreach class {Button Checkbutton Entry Label
809 Labelframe Listbox Message
810 Radiobutton Spinbox Text} {
811 option add *$class.font font_ui
814 option add *Menu.font font_ui
815 option add *Entry.borderWidth 1 startupFile
816 option add *Entry.relief sunken startupFile
817 option add *RadioButton.anchor w startupFile
821 if {[is_Windows] || [is_MacOSX]} {
822 option add *Menu.tearOff 0
833 proc bind_button3 {w cmd} {
834 bind $w <Any-Button-3> $cmd
836 # Mac OS X sends Button-2 on right click through three-button mouse,
837 # or through trackpad right-clicking (two-finger touch + click).
838 bind $w <Any-Button-2> $cmd
839 bind $w <Control-Button-1> $cmd
843 proc apply_config {} {
844 global repo_config font_descs
846 foreach option $font_descs {
847 set name [lindex $option 0]
848 set font [lindex $option 1]
851 foreach {cn cv} $repo_config(gui.$name) {
852 if {$cn eq {-weight}} {
855 font configure $font $cn $cv
858 font configure $font -weight normal
861 error_popup [strcat [mc "Invalid font specified
in %s
:" "gui.
$name"] "\n\n$err"]
863 foreach {cn cv} [font configure $font] {
864 font configure ${font}bold $cn $cv
865 font configure ${font}italic $cn $cv
867 font configure ${font}bold -weight bold
868 font configure ${font}italic -slant italic
874 if {$repo_config(gui.usettk)} {
875 set use_ttk [package vsatisfies [package provide Tk] 8.5]
878 bind [winfo class .] <<ThemeChanged>> [list InitTheme]
884 set default_config(branch.autosetupmerge) true
885 set default_config(merge.tool) {}
886 set default_config(mergetool.keepbackup) true
887 set default_config(merge.diffstat) true
888 set default_config(merge.summary) false
889 set default_config(merge.verbosity) 2
890 set default_config(user.name) {}
891 set default_config(user.email) {}
893 set default_config(gui.encoding) [encoding system]
894 set default_config(gui.matchtrackingbranch) false
895 set default_config(gui.textconv) true
896 set default_config(gui.pruneduringfetch) false
897 set default_config(gui.trustmtime) false
898 set default_config(gui.fastcopyblame) false
899 set default_config(gui.maxrecentrepo) 10
900 set default_config(gui.copyblamethreshold) 40
901 set default_config(gui.blamehistoryctx) 7
902 set default_config(gui.diffcontext) 5
903 set default_config(gui.diffopts) {}
904 set default_config(gui.commitmsgwidth) 75
905 set default_config(gui.newbranchtemplate) {}
906 set default_config(gui.spellingdictionary) {}
907 set default_config(gui.fontui) [font configure font_ui]
908 set default_config(gui.fontdiff) [font configure font_diff]
909 # TODO: this option should be added to the git-config documentation
910 set default_config(gui.maxfilesdisplayed) 5000
911 set default_config(gui.usettk) 1
912 set default_config(gui.warndetachedcommit) 1
913 set default_config(gui.tabsize) 8
915 {fontui font_ui {mc "Main Font
"}}
916 {fontdiff font_diff {mc "Diff
/Console Font
"}}
918 set default_config(gui.stageuntracked) ask
919 set default_config(gui.displayuntracked) true
921 ######################################################################
925 set _git [_which git]
927 catch {wm withdraw .}
931 -title [mc "git-gui
: fatal error
"] \
932 -message [mc "Cannot
find git
in PATH.
"]
936 ######################################################################
940 if {[catch {set _git_version [git --version]} err]} {
941 catch {wm withdraw .}
945 -title [mc "git-gui
: fatal error
"] \
946 -message "Cannot determine Git version
:
950 [appname
] requires Git
1.5.0 or later.
"
953 if {![regsub {^git version } $_git_version {} _git_version]} {
954 catch {wm withdraw .}
958 -title [mc "git-gui
: fatal error
"] \
959 -message [strcat [mc "Cannot parse Git version string
:"] "\n\n$_git_version"]
963 proc get_trimmed_version {s} {
965 foreach x [split $s -._] {
966 if {[string is integer -strict $x]} {
974 set _real_git_version $_git_version
975 set _git_version [get_trimmed_version $_git_version]
977 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
978 catch {wm withdraw .}
983 -title "[appname
]: warning
" \
984 -message [mc "Git version cannot be determined.
986 %s claims it is version
'%s'.
988 %s requires
at least Git
1.5.0 or later.
990 Assume
'%s' is version
1.5.0?
991 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
992 set _git_version 1.5.0
997 unset _real_git_version
999 proc git-version {args} {
1002 switch [llength $args] {
1004 return $_git_version
1008 set op [lindex $args 0]
1009 set vr [lindex $args 1]
1010 set cm [package vcompare $_git_version $vr]
1011 return [expr $cm $op 0]
1015 set type [lindex $args 0]
1016 set name [lindex $args 1]
1017 set parm [lindex $args 2]
1018 set body [lindex $args 3]
1020 if {($type ne {proc} && $type ne {method})} {
1021 error "Invalid arguments to git-version
"
1023 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
1024 error "Last arm of
$type $name must be default
"
1027 foreach {op vr cb} [lrange $body 0 end-2] {
1028 if {[git-version $op $vr]} {
1029 return [uplevel [list $type $name $parm $cb]]
1033 return [uplevel [list $type $name $parm [lindex $body end]]]
1037 error "git-version
>= x
"
1043 if {[git-version < 1.5]} {
1044 catch {wm withdraw .}
1048 -title [mc "git-gui
: fatal error
"] \
1049 -message "[appname
] requires Git
1.5.0 or later.
1051 You are using
[git-version
]:
1057 ######################################################################
1059 ## configure our library
1061 set idx [file join $oguilib tclIndex]
1062 if {[catch {set fd [open $idx r]} err]} {
1063 catch {wm withdraw .}
1067 -title [mc "git-gui
: fatal error
"] \
1071 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
1073 while {[gets $fd n] >= 0} {
1074 if {$n ne {} && ![string match #* $n]} {
1086 if {[lsearch -exact $loaded $p] >= 0} continue
1087 source [file join $oguilib $p]
1092 set auto_path [concat [list $oguilib] $auto_path]
1094 unset -nocomplain idx fd
1096 ######################################################################
1098 ## config file parsing
1100 git-version proc _parse_config {arr_name args} {
1107 [list git_read config] \
1109 [list --null --list]]
1110 fconfigure $fd_rc -translation binary
1111 set buf [read $fd_rc]
1114 foreach line [split $buf "\
0"] {
1115 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
1116 if {[is_many_config $name]} {
1117 lappend arr($name) $value
1119 set arr($name) $value
1121 } elseif {[regexp {^([^\n]+)$} $line line name]} {
1122 # no value given, but interpreting them as
1123 # boolean will be handled as true
1132 set fd_rc [eval [list git_read config --list] $args]
1133 while {[gets $fd_rc line] >= 0} {
1134 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
1135 if {[is_many_config $name]} {
1136 lappend arr($name) $value
1138 set arr($name) $value
1140 } elseif {[regexp {^([^=]+)$} $line line name]} {
1141 # no value given, but interpreting them as
1142 # boolean will be handled as true
1151 proc load_config {include_global} {
1152 global repo_config global_config system_config default_config
1154 if {$include_global} {
1155 _parse_config system_config --system
1156 _parse_config global_config --global
1158 _parse_config repo_config
1160 foreach name [array names default_config] {
1161 if {[catch {set v $system_config($name)}]} {
1162 set system_config($name) $default_config($name)
1165 foreach name [array names system_config] {
1166 if {[catch {set v $global_config($name)}]} {
1167 set global_config($name) $system_config($name)
1169 if {[catch {set v $repo_config($name)}]} {
1170 set repo_config($name) $system_config($name)
1175 ######################################################################
1177 ## feature option selection
1179 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
1184 if {$subcommand eq {gui.sh}} {
1187 if {$subcommand eq {gui} && [llength $argv] > 0} {
1188 set subcommand [lindex $argv 0]
1189 set argv [lrange $argv 1 end]
1192 enable_option multicommit
1193 enable_option branch
1194 enable_option transport
1197 switch -- $subcommand {
1202 disable_option multicommit
1203 disable_option branch
1204 disable_option transport
1207 enable_option singlecommit
1208 enable_option retcode
1210 disable_option multicommit
1211 disable_option branch
1212 disable_option transport
1214 while {[llength $argv] > 0} {
1215 set a [lindex $argv 0]
1218 enable_option initialamend
1221 enable_option nocommit
1222 enable_option nocommitmsg
1225 disable_option nocommitmsg
1232 set argv [lrange $argv 1 end]
1237 ######################################################################
1239 ## execution environment
1241 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
1243 # Suggest our implementation of askpass, if none is set
1244 if {![info exists env(SSH_ASKPASS)]} {
1245 set env(SSH_ASKPASS) [gitexec git-gui--askpass]
1248 ######################################################################
1254 set _gitdir $env(GIT_DIR)
1258 # beware that from the .git dir this sets _gitdir to .
1259 # and _prefix to the empty string
1260 set _gitdir [git rev-parse --git-dir]
1261 set _prefix [git rev-parse --show-prefix]
1265 choose_repository::pick
1269 # we expand the _gitdir when it's just a single dot (i.e. when we're being
1270 # run from the .git dir itself) lest the routines to find the worktree
1272 if {$_gitdir eq ".
"} {
1276 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1277 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1279 if {![file isdirectory $_gitdir]} {
1280 catch {wm withdraw .}
1281 error_popup [strcat [mc "Git directory not found
:"] "\n\n$_gitdir"]
1284 # _gitdir exists, so try loading the config
1288 # v1.7.0 introduced --show-toplevel to return the canonical work-tree
1289 if {[package vcompare $_git_version 1.7.0] >= 0} {
1290 if { [is_Cygwin] } {
1291 catch {set _gitworktree [exec cygpath --windows [git rev-parse --show-toplevel]]}
1293 set _gitworktree [git rev-parse --show-toplevel]
1296 # try to set work tree from environment, core.worktree or use
1297 # cdup to obtain a relative path to the top of the worktree. If
1298 # run from the top, the ./ prefix ensures normalize expands pwd.
1299 if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {
1300 set _gitworktree [get_config core.worktree]
1301 if {$_gitworktree eq ""} {
1302 set _gitworktree [file normalize ./[git rev-parse --show-cdup]]
1307 if {$_prefix ne {}} {
1308 if {$_gitworktree eq {}} {
1309 regsub -all {[^/]+/} $_prefix ../ cdup
1311 set cdup $_gitworktree
1313 if {[catch {cd $cdup} err]} {
1314 catch {wm withdraw .}
1315 error_popup [strcat [mc "Cannot move to top of working directory
:"] "\n\n$err"]
1318 set _gitworktree [pwd]
1320 } elseif {![is_enabled bare]} {
1322 catch {wm withdraw .}
1323 error_popup [strcat [mc "Cannot use bare repository
:"] "\n\n$_gitdir"]
1326 if {$_gitworktree eq {}} {
1327 set _gitworktree [file dirname $_gitdir]
1329 if {[catch {cd $_gitworktree} err]} {
1330 catch {wm withdraw .}
1331 error_popup [strcat [mc "No working directory
"] " $_gitworktree:\n\n$err"]
1334 set _gitworktree [pwd]
1336 set _reponame [file split [file normalize $_gitdir]]
1337 if {[lindex $_reponame end] eq {.git}} {
1338 set _reponame [lindex $_reponame end-1]
1340 set _reponame [lindex $_reponame end]
1343 set env(GIT_DIR) $_gitdir
1344 set env(GIT_WORK_TREE) $_gitworktree
1346 ######################################################################
1350 set current_diff_path {}
1351 set current_diff_side {}
1352 set diff_actions [list]
1356 set MERGE_HEAD [list]
1359 set current_branch {}
1361 set current_diff_path {}
1363 set is_submodule_diff 0
1364 set is_conflict_diff 0
1365 set selected_commit_type new
1366 set diff_empty_count 0
1368 set nullid "0000000000000000000000000000000000000000"
1369 set nullid2 "0000000000000000000000000000000000000001"
1371 ######################################################################
1379 set disable_on_lock [list]
1380 set index_lock_type none
1382 proc lock_index {type} {
1383 global index_lock_type disable_on_lock
1385 if {$index_lock_type eq {none}} {
1386 set index_lock_type $type
1387 foreach w $disable_on_lock {
1388 uplevel #0 $w disabled
1391 } elseif {$index_lock_type eq "begin-
$type"} {
1392 set index_lock_type $type
1398 proc unlock_index {} {
1399 global index_lock_type disable_on_lock
1401 set index_lock_type none
1402 foreach w $disable_on_lock {
1403 uplevel #0 $w normal
1407 ######################################################################
1411 proc repository_state {ctvar hdvar mhvar} {
1412 global current_branch
1413 upvar $ctvar ct $hdvar hd $mhvar mh
1418 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1424 set merge_head [gitdir MERGE_HEAD]
1425 if {[file exists $merge_head]} {
1427 set fd_mh [open $merge_head r]
1428 while {[gets $fd_mh line] >= 0} {
1439 global PARENT empty_tree
1441 set p [lindex $PARENT 0]
1445 if {$empty_tree eq {}} {
1446 set empty_tree [git mktree << {}]
1451 proc force_amend {} {
1452 global selected_commit_type
1453 global HEAD PARENT MERGE_HEAD commit_type
1455 repository_state newType newHEAD newMERGE_HEAD
1458 set MERGE_HEAD $newMERGE_HEAD
1459 set commit_type $newType
1461 set selected_commit_type amend
1462 do_select_commit_type
1465 proc rescan {after {honor_trustmtime 1}} {
1466 global HEAD PARENT MERGE_HEAD commit_type
1467 global ui_index ui_workdir ui_comm
1468 global rescan_active file_states
1471 if {$rescan_active > 0 || ![lock_index read]} return
1473 repository_state newType newHEAD newMERGE_HEAD
1474 if {[string match amend* $commit_type]
1475 && $newType eq {normal}
1476 && $newHEAD eq $HEAD} {
1480 set MERGE_HEAD $newMERGE_HEAD
1481 set commit_type $newType
1484 array unset file_states
1486 if {!$::GITGUI_BCK_exists &&
1487 (![$ui_comm edit modified]
1488 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1489 if {[string match amend* $commit_type]} {
1490 } elseif {[load_message GITGUI_MSG utf-8]} {
1491 } elseif {[run_prepare_commit_msg_hook]} {
1492 } elseif {[load_message MERGE_MSG]} {
1493 } elseif {[load_message SQUASH_MSG]} {
1496 $ui_comm edit modified false
1499 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1500 rescan_stage2 {} $after
1503 ui_status [mc "Refreshing
file status...
"]
1504 set fd_rf [git_read update-index \
1510 fconfigure $fd_rf -blocking 0 -translation binary
1511 fileevent $fd_rf readable \
1512 [list rescan_stage2 $fd_rf $after]
1517 set is_git_info_exclude {}
1518 proc have_info_exclude {} {
1519 global is_git_info_exclude
1521 if {$is_git_info_exclude eq {}} {
1522 if {[catch {exec test -f [gitdir info exclude]}]} {
1523 set is_git_info_exclude 0
1525 set is_git_info_exclude 1
1528 return $is_git_info_exclude
1531 proc have_info_exclude {} {
1532 return [file readable [gitdir info exclude]]
1536 proc rescan_stage2 {fd after} {
1537 global rescan_active buf_rdi buf_rdf buf_rlo
1541 if {![eof $fd]} return
1545 if {[package vcompare $::_git_version 1.6.3] >= 0} {
1546 set ls_others [list --exclude-standard]
1548 set ls_others [list --exclude-per-directory=.gitignore]
1549 if {[have_info_exclude]} {
1550 lappend ls_others "--exclude-from=[gitdir info exclude
]"
1552 set user_exclude [get_config core.excludesfile]
1553 if {$user_exclude ne {} && [file readable $user_exclude]} {
1554 lappend ls_others "--exclude-from=[file normalize
$user_exclude]"
1563 ui_status [mc "Scanning
for modified files ...
"]
1564 if {[git-version >= "1.7.2"]} {
1565 set fd_di [git_read diff-index --cached --ignore-submodules=dirty -z [PARENT]]
1567 set fd_di [git_read diff-index --cached -z [PARENT]]
1569 set fd_df [git_read diff-files -z]
1571 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1572 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1574 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1575 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1577 if {[is_config_true gui.displayuntracked]} {
1578 set fd_lo [eval git_read ls-files --others -z $ls_others]
1579 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1580 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1585 proc load_message {file {encoding {}}} {
1588 set f [gitdir $file]
1589 if {[file isfile $f]} {
1590 if {[catch {set fd [open $f r]}]} {
1593 fconfigure $fd -eofchar {}
1594 if {$encoding ne {}} {
1595 fconfigure $fd -encoding $encoding
1597 set content [string trim [read $fd]]
1599 regsub -all -line {[ \r\t]+$} $content {} content
1600 $ui_comm delete 0.0 end
1601 $ui_comm insert end $content
1607 proc run_prepare_commit_msg_hook {} {
1610 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1611 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1612 # empty file but existent file.
1614 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1616 if {[file isfile [gitdir MERGE_MSG]]} {
1617 set pcm_source "merge
"
1618 set fd_mm [open [gitdir MERGE_MSG] r]
1619 puts -nonewline $fd_pcm [read $fd_mm]
1621 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1622 set pcm_source "squash
"
1623 set fd_sm [open [gitdir SQUASH_MSG] r]
1624 puts -nonewline $fd_pcm [read $fd_sm]
1632 set fd_ph [githook_read prepare-commit-msg \
1633 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1635 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1639 ui_status [mc "Calling prepare-commit-msg hook...
"]
1642 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1643 fileevent $fd_ph readable \
1644 [list prepare_commit_msg_hook_wait $fd_ph]
1649 proc prepare_commit_msg_hook_wait {fd_ph} {
1652 append pch_error [read $fd_ph]
1653 fconfigure $fd_ph -blocking 1
1655 if {[catch {close $fd_ph}]} {
1656 ui_status [mc "Commit declined by prepare-commit-msg hook.
"]
1657 hook_failed_popup prepare-commit-msg $pch_error
1658 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1661 load_message PREPARE_COMMIT_MSG
1664 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1667 fconfigure $fd_ph -blocking 0
1668 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1671 proc read_diff_index {fd after} {
1674 append buf_rdi [read $fd]
1676 set n [string length $buf_rdi]
1678 set z1 [string first "\
0" $buf_rdi $c]
1679 if {$z1 == -1} break
1681 set z2 [string first "\
0" $buf_rdi $z1]
1682 if {$z2 == -1} break
1685 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1686 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1688 [encoding convertfrom $p] \
1690 [list [lindex $i 0] [lindex $i 2]] \
1696 set buf_rdi [string range $buf_rdi $c end]
1701 rescan_done $fd buf_rdi $after
1704 proc read_diff_files {fd after} {
1707 append buf_rdf [read $fd]
1709 set n [string length $buf_rdf]
1711 set z1 [string first "\
0" $buf_rdf $c]
1712 if {$z1 == -1} break
1714 set z2 [string first "\
0" $buf_rdf $z1]
1715 if {$z2 == -1} break
1718 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1719 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1721 [encoding convertfrom $p] \
1724 [list [lindex $i 0] [lindex $i 2]]
1729 set buf_rdf [string range $buf_rdf $c end]
1734 rescan_done $fd buf_rdf $after
1737 proc read_ls_others {fd after} {
1740 append buf_rlo [read $fd]
1741 set pck [split $buf_rlo "\
0"]
1742 set buf_rlo [lindex $pck end]
1743 foreach p [lrange $pck 0 end-1] {
1744 set p [encoding convertfrom $p]
1745 if {[string index $p end] eq {/}} {
1746 set p [string range $p 0 end-1]
1750 rescan_done $fd buf_rlo $after
1753 proc rescan_done {fd buf after} {
1754 global rescan_active current_diff_path
1755 global file_states repo_config
1758 if {![eof $fd]} return
1761 if {[incr rescan_active -1] > 0} return
1766 if {$current_diff_path ne {}} { reshow_diff $after }
1767 if {$current_diff_path eq {}} { select_first_diff $after }
1770 proc prune_selection {} {
1771 global file_states selected_paths
1773 foreach path [array names selected_paths] {
1774 if {[catch {set still_here $file_states($path)}]} {
1775 unset selected_paths($path)
1780 ######################################################################
1784 proc mapicon {w state path} {
1787 if {[catch {set r $all_icons($state$w)}]} {
1788 puts "error
: no icon
for $w state
={$state} $path"
1794 proc mapdesc {state path} {
1797 if {[catch {set r $all_descs($state)}]} {
1798 puts "error
: no desc
for state
={$state} $path"
1804 proc ui_status {msg} {
1806 if {[info exists main_status]} {
1807 $main_status show $msg
1811 proc ui_ready {{test {}}} {
1813 if {[info exists main_status]} {
1814 $main_status show [mc "Ready.
"] $test
1818 proc escape_path {path} {
1819 regsub -all {\\} $path "\\\\" path
1820 regsub -all "\n" $path "\\n
" path
1824 proc short_path {path} {
1825 return [escape_path [lindex [file split $path] end]]
1829 set null_sha1 [string repeat 0 40]
1831 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1832 global file_states next_icon_id null_sha1
1834 set s0 [string index $new_state 0]
1835 set s1 [string index $new_state 1]
1837 if {[catch {set info $file_states($path)}]} {
1839 set icon n[incr next_icon_id]
1841 set state [lindex $info 0]
1842 set icon [lindex $info 1]
1843 if {$head_info eq {}} {set head_info [lindex $info 2]}
1844 if {$index_info eq {}} {set index_info [lindex $info 3]}
1847 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1848 elseif {$s0 eq {_}} {set s0 _}
1850 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1851 elseif {$s1 eq {_}} {set s1 _}
1853 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1854 set head_info [list 0 $null_sha1]
1855 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1856 && $head_info eq {}} {
1857 set head_info $index_info
1858 } elseif {$s0 eq {_} && [string index $state 0] ne {_}} {
1859 set index_info $head_info
1863 set file_states($path) [list $s0$s1 $icon \
1864 $head_info $index_info \
1869 proc display_file_helper {w path icon_name old_m new_m} {
1872 if {$new_m eq {_}} {
1873 set lno [lsearch -sorted -exact $file_lists($w) $path]
1875 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1877 $w conf -state normal
1878 $w delete $lno.0 [expr {$lno + 1}].0
1879 $w conf -state disabled
1881 } elseif {$old_m eq {_} && $new_m ne {_}} {
1882 lappend file_lists($w) $path
1883 set file_lists($w) [lsort -unique $file_lists($w)]
1884 set lno [lsearch -sorted -exact $file_lists($w) $path]
1886 $w conf -state normal
1887 $w image create $lno.0 \
1888 -align center -padx 5 -pady 1 \
1890 -image [mapicon $w $new_m $path]
1891 $w insert $lno.1 "[escape_path
$path]\n"
1892 $w conf -state disabled
1893 } elseif {$old_m ne $new_m} {
1894 $w conf -state normal
1895 $w image conf $icon_name -image [mapicon $w $new_m $path]
1896 $w conf -state disabled
1900 proc display_file {path state} {
1901 global file_states selected_paths
1902 global ui_index ui_workdir
1904 set old_m [merge_state $path $state]
1905 set s $file_states($path)
1906 set new_m [lindex $s 0]
1907 set icon_name [lindex $s 1]
1909 set o [string index $old_m 0]
1910 set n [string index $new_m 0]
1917 display_file_helper $ui_index $path $icon_name $o $n
1919 if {[string index $old_m 0] eq {U}} {
1922 set o [string index $old_m 1]
1924 if {[string index $new_m 0] eq {U}} {
1927 set n [string index $new_m 1]
1929 display_file_helper $ui_workdir $path $icon_name $o $n
1931 if {$new_m eq {__}} {
1932 unset file_states($path)
1933 catch {unset selected_paths($path)}
1937 proc display_all_files_helper {w path icon_name m} {
1940 lappend file_lists($w) $path
1941 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1942 $w image create end \
1943 -align center -padx 5 -pady 1 \
1945 -image [mapicon $w $m $path]
1946 $w insert end "[escape_path
$path]\n"
1950 proc display_all_files {} {
1951 global ui_index ui_workdir
1952 global file_states file_lists
1954 global files_warning
1956 $ui_index conf -state normal
1957 $ui_workdir conf -state normal
1959 $ui_index delete 0.0 end
1960 $ui_workdir delete 0.0 end
1963 set file_lists($ui_index) [list]
1964 set file_lists($ui_workdir) [list]
1966 set to_display [lsort [array names file_states]]
1967 set display_limit [get_config gui.maxfilesdisplayed]
1969 foreach path $to_display {
1970 set s $file_states($path)
1972 set icon_name [lindex $s 1]
1974 if {$displayed > $display_limit && [string index $m 1] eq {O} } {
1975 if {!$files_warning} {
1976 # do not repeatedly warn:
1978 info_popup [mc "Display limit
(gui.maxfilesdisplayed
= %s
) reached
, not showing all
%s files.
" \
1979 $display_limit [llength $to_display]]
1984 set s [string index $m 0]
1985 if {$s ne {U} && $s ne {_}} {
1986 display_all_files_helper $ui_index $path \
1990 if {[string index $m 0] eq {U}} {
1993 set s [string index $m 1]
1996 display_all_files_helper $ui_workdir $path \
2002 $ui_index conf -state disabled
2003 $ui_workdir conf -state disabled
2006 ######################################################################
2011 #define mask_width 14
2012 #define mask_height 15
2013 static unsigned char mask_bits[] = {
2014 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2015 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
2016 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
2019 image create bitmap file_plain -background white -foreground black -data {
2020 #define plain_width 14
2021 #define plain_height 15
2022 static unsigned char plain_bits[] = {
2023 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2024 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
2025 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2026 } -maskdata $filemask
2028 image create bitmap file_mod -background white -foreground blue -data {
2029 #define mod_width 14
2030 #define mod_height 15
2031 static unsigned char mod_bits[] = {
2032 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
2033 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2034 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2035 } -maskdata $filemask
2037 image create bitmap file_fulltick -background white -foreground "#007000" -data {
2038 #define file_fulltick_width 14
2039 #define file_fulltick_height 15
2040 static unsigned char file_fulltick_bits
[] = {
2041 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2042 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2043 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2044 } -maskdata $filemask
2046 image create bitmap file_question
-background white
-foreground black
-data {
2047 #define file_question_width 14
2048 #define file_question_height 15
2049 static unsigned char file_question_bits
[] = {
2050 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2051 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2052 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2053 } -maskdata $filemask
2055 image create bitmap file_removed
-background white
-foreground red
-data {
2056 #define file_removed_width 14
2057 #define file_removed_height 15
2058 static unsigned char file_removed_bits
[] = {
2059 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2060 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2061 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2062 } -maskdata $filemask
2064 image create bitmap file_merge
-background white
-foreground blue
-data {
2065 #define file_merge_width 14
2066 #define file_merge_height 15
2067 static unsigned char file_merge_bits
[] = {
2068 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2069 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2070 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2071 } -maskdata $filemask
2073 image create bitmap file_statechange
-background white
-foreground green
-data {
2074 #define file_statechange_width 14
2075 #define file_statechange_height 15
2076 static unsigned char file_statechange_bits
[] = {
2077 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
2078 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
2079 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2080 } -maskdata $filemask
2082 set ui_index .vpane.files.index.list
2083 set ui_workdir .vpane.files.workdir.list
2085 set all_icons
(_
$ui_index) file_plain
2086 set all_icons
(A
$ui_index) file_plain
2087 set all_icons
(M
$ui_index) file_fulltick
2088 set all_icons
(D
$ui_index) file_removed
2089 set all_icons
(U
$ui_index) file_merge
2090 set all_icons
(T
$ui_index) file_statechange
2092 set all_icons
(_
$ui_workdir) file_plain
2093 set all_icons
(M
$ui_workdir) file_mod
2094 set all_icons
(D
$ui_workdir) file_question
2095 set all_icons
(U
$ui_workdir) file_merge
2096 set all_icons
(O
$ui_workdir) file_plain
2097 set all_icons
(T
$ui_workdir) file_statechange
2099 set max_status_desc
0
2101 {__
{mc
"Unmodified"}}
2103 {_M
{mc
"Modified, not staged"}}
2104 {M_
{mc
"Staged for commit"}}
2105 {MM
{mc
"Portions staged for commit"}}
2106 {MD
{mc
"Staged for commit, missing"}}
2108 {_T
{mc
"File type changed, not staged"}}
2109 {MT
{mc
"File type changed, old type staged for commit"}}
2110 {AT
{mc
"File type changed, old type staged for commit"}}
2111 {T_
{mc
"File type changed, staged"}}
2112 {TM
{mc
"File type change staged, modification not staged"}}
2113 {TD
{mc
"File type change staged, file missing"}}
2115 {_O
{mc
"Untracked, not staged"}}
2116 {A_
{mc
"Staged for commit"}}
2117 {AM
{mc
"Portions staged for commit"}}
2118 {AD
{mc
"Staged for commit, missing"}}
2121 {D_
{mc
"Staged for removal"}}
2122 {DO
{mc
"Staged for removal, still present"}}
2124 {_U
{mc
"Requires merge resolution"}}
2125 {U_
{mc
"Requires merge resolution"}}
2126 {UU
{mc
"Requires merge resolution"}}
2127 {UM
{mc
"Requires merge resolution"}}
2128 {UD
{mc
"Requires merge resolution"}}
2129 {UT
{mc
"Requires merge resolution"}}
2131 set text
[eval [lindex
$i 1]]
2132 if {$max_status_desc < [string length
$text]} {
2133 set max_status_desc
[string length
$text]
2135 set all_descs
([lindex
$i 0]) $text
2139 ######################################################################
2143 proc scrollbar2many
{list mode args
} {
2144 foreach w
$list {eval $w $mode $args}
2147 proc many2scrollbar
{list mode sb top bottom
} {
2148 $sb set $top $bottom
2149 foreach w
$list {$w $mode moveto
$top}
2152 proc incr_font_size
{font
{amt
1}} {
2153 set sz
[font configure
$font -size]
2155 font configure
$font -size $sz
2156 font configure
${font}bold
-size $sz
2157 font configure
${font}italic
-size $sz
2160 ######################################################################
2164 set starting_gitk_msg
[mc
"Starting gitk... please wait..."]
2166 proc do_gitk
{revs
{is_submodule false
}} {
2167 global current_diff_path file_states current_diff_side ui_index
2168 global _gitdir _gitworktree
2170 # -- Always start gitk through whatever we were loaded with. This
2171 # lets us bypass using shell process on Windows systems.
2173 set exe
[_which gitk
-script]
2174 set cmd
[list
[info nameofexecutable
] $exe]
2176 error_popup
[mc
"Couldn't find gitk in PATH"]
2182 if {!$is_submodule} {
2187 cd $current_diff_path
2188 if {$revs eq
{--}} {
2189 set s
$file_states($current_diff_path)
2192 switch
-glob -- [lindex
$s 0] {
2193 M_
{ set old_sha1
[lindex
[lindex
$s 2] 1] }
2194 _M
{ set old_sha1
[lindex
[lindex
$s 3] 1] }
2196 if {$current_diff_side eq
$ui_index} {
2197 set old_sha1
[lindex
[lindex
$s 2] 1]
2198 set new_sha1
[lindex
[lindex
$s 3] 1]
2200 set old_sha1
[lindex
[lindex
$s 3] 1]
2204 set revs
$old_sha1...
$new_sha1
2206 # GIT_DIR and GIT_WORK_TREE for the submodule are not the ones
2207 # we've been using for the main repository, so unset them.
2208 # TODO we could make life easier (start up faster?) for gitk
2209 # by setting these to the appropriate values to allow gitk
2210 # to skip the heuristics to find their proper value
2212 unset env
(GIT_WORK_TREE
)
2214 eval exec $cmd $revs "--" "--" &
2216 set env
(GIT_DIR
) $_gitdir
2217 set env
(GIT_WORK_TREE
) $_gitworktree
2220 ui_status $
::starting_gitk_msg
2222 ui_ready
$starting_gitk_msg
2227 proc do_git_gui
{} {
2228 global current_diff_path
2230 # -- Always start git gui through whatever we were loaded with. This
2231 # lets us bypass using shell process on Windows systems.
2233 set exe
[list
[_which git
]]
2235 error_popup
[mc
"Couldn't find git gui in PATH"]
2238 global _gitdir _gitworktree
2240 # see note in do_gitk about unsetting these vars when
2241 # running tools in a submodule
2243 unset env
(GIT_WORK_TREE
)
2246 cd $current_diff_path
2248 eval exec $exe gui
&
2250 set env
(GIT_DIR
) $_gitdir
2251 set env
(GIT_WORK_TREE
) $_gitworktree
2254 ui_status $
::starting_gitk_msg
2256 ui_ready
$starting_gitk_msg
2261 proc do_explore
{} {
2264 if {[is_Cygwin
] ||
[is_Windows
]} {
2265 set explorer
"explorer.exe"
2266 } elseif
{[is_MacOSX
]} {
2269 # freedesktop.org-conforming system is our best shot
2270 set explorer
"xdg-open"
2272 eval exec $explorer [list
[file nativename
$_gitworktree]] &
2278 proc terminate_me
{win
} {
2280 if {$win ne
{.
}} return
2284 proc do_quit
{{rc
{1}}} {
2285 global ui_comm is_quitting repo_config commit_type
2286 global GITGUI_BCK_exists GITGUI_BCK_i
2287 global ui_comm_spell
2288 global ret_code use_ttk
2290 if {$is_quitting} return
2293 if {[winfo exists
$ui_comm]} {
2294 # -- Stash our current commit buffer.
2296 set save
[gitdir GITGUI_MSG
]
2297 if {$GITGUI_BCK_exists && ![$ui_comm edit modified
]} {
2298 file rename
-force [gitdir GITGUI_BCK
] $save
2299 set GITGUI_BCK_exists
0
2301 set msg
[string trim
[$ui_comm get
0.0 end
]]
2302 regsub
-all -line {[ \r\t]+$
} $msg {} msg
2303 if {(![string match amend
* $commit_type]
2304 ||
[$ui_comm edit modified
])
2307 set fd
[open
$save w
]
2308 fconfigure
$fd -encoding utf-8
2309 puts
-nonewline $fd $msg
2313 catch
{file delete
$save}
2317 # -- Cancel our spellchecker if its running.
2319 if {[info exists ui_comm_spell
]} {
2323 # -- Remove our editor backup, its not needed.
2325 after cancel
$GITGUI_BCK_i
2326 if {$GITGUI_BCK_exists} {
2327 catch
{file delete
[gitdir GITGUI_BCK
]}
2330 # -- Stash our current window geometry into this repository.
2332 set cfg_wmstate
[wm state .
]
2333 if {[catch
{set rc_wmstate
$repo_config(gui.wmstate
)}]} {
2336 if {$cfg_wmstate ne
$rc_wmstate} {
2337 catch
{git config gui.wmstate
$cfg_wmstate}
2339 if {$cfg_wmstate eq
{zoomed
}} {
2340 # on Windows wm geometry will lie about window
2341 # position (but not size) when window is zoomed
2342 # restore the window before querying wm geometry
2345 set cfg_geometry
[list
]
2346 lappend cfg_geometry
[wm geometry .
]
2348 lappend cfg_geometry
[.vpane sashpos
0]
2349 lappend cfg_geometry
[.vpane.files sashpos
0]
2351 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 0]
2352 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 1]
2354 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
2357 if {$cfg_geometry ne
$rc_geometry} {
2358 catch
{git config gui.geometry
$cfg_geometry}
2364 # Briefly enable send again, working around Tk bug
2365 # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
2366 tk appname
[appname
]
2375 proc ui_do_rescan
{} {
2376 rescan
{force_first_diff ui_ready
}
2383 proc next_diff
{{after
{}}} {
2384 global next_diff_p next_diff_w next_diff_i
2385 show_diff
$next_diff_p $next_diff_w {} {} $after
2388 proc find_anchor_pos
{lst name
} {
2389 set lid
[lsearch
-sorted -exact $lst $name]
2393 foreach lname
$lst {
2394 if {$lname >= $name} break
2402 proc find_file_from
{flist idx delta path mmask
} {
2405 set len
[llength
$flist]
2406 while {$idx >= 0 && $idx < $len} {
2407 set name
[lindex
$flist $idx]
2409 if {$name ne
$path && [info exists file_states
($name)]} {
2410 set state
[lindex
$file_states($name) 0]
2412 if {$mmask eq
{} ||
[regexp
$mmask $state]} {
2423 proc find_next_diff
{w path
{lno
{}} {mmask
{}}} {
2424 global next_diff_p next_diff_w next_diff_i
2425 global file_lists ui_index ui_workdir
2427 set flist
$file_lists($w)
2429 set lno
[find_anchor_pos
$flist $path]
2434 if {$mmask ne
{} && ![regexp
{(^\^
)|
(\$$
)} $mmask]} {
2435 if {$w eq
$ui_index} {
2438 set mmask
"$mmask\$"
2442 set idx
[find_file_from
$flist $lno 1 $path $mmask]
2445 set idx
[find_file_from
$flist $lno -1 $path $mmask]
2450 set next_diff_p
[lindex
$flist $idx]
2451 set next_diff_i
[expr {$idx+1}]
2458 proc next_diff_after_action
{w path
{lno
{}} {mmask
{}}} {
2459 global current_diff_path
2461 if {$path ne
$current_diff_path} {
2463 } elseif
{[find_next_diff
$w $path $lno $mmask]} {
2466 return {reshow_diff
;}
2470 proc select_first_diff
{after
} {
2473 if {[find_next_diff
$ui_workdir {} 1 {^_?U
}] ||
2474 [find_next_diff
$ui_workdir {} 1 {[^O
]$
}]} {
2481 proc force_first_diff
{after
} {
2482 global ui_workdir current_diff_path file_states
2484 if {[info exists file_states
($current_diff_path)]} {
2485 set state
[lindex
$file_states($current_diff_path) 0]
2491 if {[string first
{U
} $state] >= 0} {
2492 # Already a conflict, do nothing
2493 } elseif
{[find_next_diff
$ui_workdir $current_diff_path {} {^_?U
}]} {
2495 } elseif
{[string index
$state 1] ne
{O
}} {
2496 # Already a diff & no conflicts, do nothing
2497 } elseif
{[find_next_diff
$ui_workdir $current_diff_path {} {[^O
]$
}]} {
2508 proc toggle_or_diff
{mode w args
} {
2509 global file_states file_lists current_diff_path ui_index ui_workdir
2510 global last_clicked selected_paths
2512 if {$mode eq
"click"} {
2513 foreach
{x y
} $args break
2514 set pos
[split [$w index @
$x,$y] .
]
2515 foreach
{lno
col} $pos break
2517 if {$last_clicked ne
{}} {
2518 set lno
[lindex
$last_clicked 1]
2520 set lno
[expr {int
([lindex
[$w tag ranges in_diff
] 0])}]
2522 if {$mode eq
"toggle"} {
2525 incr lno
[expr {$mode eq
"up" ?
-1 : 1}]
2530 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2536 set last_clicked
[list
$w $lno]
2538 array
unset selected_paths
2539 $ui_index tag remove in_sel
0.0 end
2540 $ui_workdir tag remove in_sel
0.0 end
2542 # Determine the state of the file
2543 if {[info exists file_states
($path)]} {
2544 set state
[lindex
$file_states($path) 0]
2549 # Restage the file, or simply show the diff
2550 if {$col == 0 && $y > 1} {
2551 # Conflicts need special handling
2552 if {[string first
{U
} $state] >= 0} {
2553 # $w must always be $ui_workdir, but...
2554 if {$w ne
$ui_workdir} { set lno
{} }
2555 merge_stage_workdir
$path $lno
2559 if {[string index
$state 1] eq
{O
}} {
2565 set after
[next_diff_after_action
$w $path $lno $mmask]
2567 if {$w eq
$ui_index} {
2569 "Unstaging [short_path $path] from commit" \
2571 [concat
$after [list ui_ready
]]
2572 } elseif
{$w eq
$ui_workdir} {
2574 "Adding [short_path $path]" \
2576 [concat
$after [list ui_ready
]]
2579 set selected_paths
($path) 1
2580 show_diff
$path $w $lno
2584 proc add_one_to_selection
{w x y
} {
2585 global file_lists last_clicked selected_paths
2587 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2588 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2594 if {$last_clicked ne
{}
2595 && [lindex
$last_clicked 0] ne
$w} {
2596 array
unset selected_paths
2597 [lindex
$last_clicked 0] tag remove in_sel
0.0 end
2600 set last_clicked
[list
$w $lno]
2601 if {[catch
{set in_sel
$selected_paths($path)}]} {
2605 unset selected_paths
($path)
2606 $w tag remove in_sel
$lno.0 [expr {$lno + 1}].0
2608 set selected_paths
($path) 1
2609 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
2613 proc add_range_to_selection
{w x y
} {
2614 global file_lists last_clicked selected_paths
2616 if {[lindex
$last_clicked 0] ne
$w} {
2617 toggle_or_diff click
$w $x $y
2621 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2622 set lc
[lindex
$last_clicked 1]
2631 foreach path
[lrange
$file_lists($w) \
2632 [expr {$begin - 1}] \
2633 [expr {$end - 1}]] {
2634 set selected_paths
($path) 1
2636 $w tag add in_sel
$begin.0 [expr {$end + 1}].0
2639 proc show_more_context
{} {
2641 if {$repo_config(gui.diffcontext
) < 99} {
2642 incr repo_config
(gui.diffcontext
)
2647 proc show_less_context
{} {
2649 if {$repo_config(gui.diffcontext
) > 1} {
2650 incr repo_config
(gui.diffcontext
) -1
2655 ######################################################################
2663 menu .mbar
-tearoff 0
2665 # -- Apple Menu (Mac OS X only)
2667 .mbar add cascade
-label Apple
-menu .mbar.apple
2670 .mbar add cascade
-label [mc Repository
] -menu .mbar.repository
2671 .mbar add cascade
-label [mc Edit
] -menu .mbar.edit
2672 if {[is_enabled branch
]} {
2673 .mbar add cascade
-label [mc Branch
] -menu .mbar.branch
2675 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2676 .mbar add cascade
-label [mc Commit@@noun
] -menu .mbar.commit
2678 if {[is_enabled transport
]} {
2679 .mbar add cascade
-label [mc Merge
] -menu .mbar.merge
2680 .mbar add cascade
-label [mc Remote
] -menu .mbar.remote
2682 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2683 .mbar add cascade
-label [mc Tools
] -menu .mbar.tools
2686 # -- Repository Menu
2688 menu .mbar.repository
2691 .mbar.repository add
command \
2692 -label [mc
"Explore Working Copy"] \
2693 -command {do_explore
}
2697 .mbar.repository add
command \
2698 -label [mc
"Git Bash"] \
2699 -command {eval exec [auto_execok start
] \
2700 [list
"Git Bash" bash
--login -l &]}
2703 if {[is_Windows
] ||
![is_bare
]} {
2704 .mbar.repository add separator
2707 .mbar.repository add
command \
2708 -label [mc
"Browse Current Branch's Files"] \
2709 -command {browser
::new
$current_branch}
2710 set ui_browse_current
[.mbar.repository index last
]
2711 .mbar.repository add
command \
2712 -label [mc
"Browse Branch Files..."] \
2713 -command browser_open
::dialog
2714 .mbar.repository add separator
2716 .mbar.repository add
command \
2717 -label [mc
"Visualize Current Branch's History"] \
2718 -command {do_gitk
$current_branch}
2719 set ui_visualize_current
[.mbar.repository index last
]
2720 .mbar.repository add
command \
2721 -label [mc
"Visualize All Branch History"] \
2722 -command {do_gitk
--all}
2723 .mbar.repository add separator
2725 proc current_branch_write
{args
} {
2726 global current_branch
2727 .mbar.repository entryconf $
::ui_browse_current \
2728 -label [mc
"Browse %s's Files" $current_branch]
2729 .mbar.repository entryconf $
::ui_visualize_current \
2730 -label [mc
"Visualize %s's History" $current_branch]
2732 trace add variable current_branch
write current_branch_write
2734 if {[is_enabled multicommit
]} {
2735 .mbar.repository add
command -label [mc
"Database Statistics"] \
2738 .mbar.repository add
command -label [mc
"Compress Database"] \
2741 .mbar.repository add
command -label [mc
"Verify Database"] \
2742 -command do_fsck_objects
2744 .mbar.repository add separator
2747 .mbar.repository add
command \
2748 -label [mc
"Create Desktop Icon"] \
2749 -command do_cygwin_shortcut
2750 } elseif
{[is_Windows
]} {
2751 .mbar.repository add
command \
2752 -label [mc
"Create Desktop Icon"] \
2753 -command do_windows_shortcut
2754 } elseif
{[is_MacOSX
]} {
2755 .mbar.repository add
command \
2756 -label [mc
"Create Desktop Icon"] \
2757 -command do_macosx_app
2762 proc
::tk
::mac
::Quit
{args
} { do_quit
}
2764 .mbar.repository add
command -label [mc Quit
] \
2772 .mbar.edit add
command -label [mc Undo
] \
2773 -command {catch
{[focus
] edit undo
}} \
2775 .mbar.edit add
command -label [mc Redo
] \
2776 -command {catch
{[focus
] edit redo
}} \
2778 .mbar.edit add separator
2779 .mbar.edit add
command -label [mc Cut
] \
2780 -command {catch
{tk_textCut
[focus
]}} \
2782 .mbar.edit add
command -label [mc Copy
] \
2783 -command {catch
{tk_textCopy
[focus
]}} \
2785 .mbar.edit add
command -label [mc Paste
] \
2786 -command {catch
{tk_textPaste
[focus
]; [focus
] see insert
}} \
2788 .mbar.edit add
command -label [mc Delete
] \
2789 -command {catch
{[focus
] delete sel.first sel.last
}} \
2791 .mbar.edit add separator
2792 .mbar.edit add
command -label [mc
"Select All"] \
2793 -command {catch
{[focus
] tag add sel
0.0 end
}} \
2798 if {[is_enabled branch
]} {
2801 .mbar.branch add
command -label [mc
"Create..."] \
2802 -command branch_create
::dialog \
2804 lappend disable_on_lock
[list .mbar.branch entryconf \
2805 [.mbar.branch index last
] -state]
2807 .mbar.branch add
command -label [mc
"Checkout..."] \
2808 -command branch_checkout
::dialog \
2810 lappend disable_on_lock
[list .mbar.branch entryconf \
2811 [.mbar.branch index last
] -state]
2813 .mbar.branch add
command -label [mc
"Rename..."] \
2814 -command branch_rename
::dialog
2815 lappend disable_on_lock
[list .mbar.branch entryconf \
2816 [.mbar.branch index last
] -state]
2818 .mbar.branch add
command -label [mc
"Delete..."] \
2819 -command branch_delete
::dialog
2820 lappend disable_on_lock
[list .mbar.branch entryconf \
2821 [.mbar.branch index last
] -state]
2823 .mbar.branch add
command -label [mc
"Reset..."] \
2824 -command merge
::reset_hard
2825 lappend disable_on_lock
[list .mbar.branch entryconf \
2826 [.mbar.branch index last
] -state]
2831 proc commit_btn_caption
{} {
2832 if {[is_enabled nocommit
]} {
2835 return [mc Commit@@verb
]
2839 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2842 if {![is_enabled nocommit
]} {
2843 .mbar.commit add radiobutton \
2844 -label [mc
"New Commit"] \
2845 -command do_select_commit_type \
2846 -variable selected_commit_type \
2848 lappend disable_on_lock \
2849 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2851 .mbar.commit add radiobutton \
2852 -label [mc
"Amend Last Commit"] \
2853 -command do_select_commit_type \
2854 -variable selected_commit_type \
2856 lappend disable_on_lock \
2857 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2859 .mbar.commit add separator
2862 .mbar.commit add
command -label [mc Rescan
] \
2863 -command ui_do_rescan \
2865 lappend disable_on_lock \
2866 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2868 .mbar.commit add
command -label [mc
"Stage To Commit"] \
2869 -command do_add_selection \
2871 lappend disable_on_lock \
2872 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2874 .mbar.commit add
command -label [mc
"Stage Changed Files To Commit"] \
2875 -command do_add_all \
2877 lappend disable_on_lock \
2878 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2880 .mbar.commit add
command -label [mc
"Unstage From Commit"] \
2881 -command do_unstage_selection \
2883 lappend disable_on_lock \
2884 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2886 .mbar.commit add
command -label [mc
"Revert Changes"] \
2887 -command do_revert_selection \
2889 lappend disable_on_lock \
2890 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2892 .mbar.commit add separator
2894 .mbar.commit add
command -label [mc
"Show Less Context"] \
2895 -command show_less_context \
2896 -accelerator $M1T-\
-
2898 .mbar.commit add
command -label [mc
"Show More Context"] \
2899 -command show_more_context \
2902 .mbar.commit add separator
2904 if {![is_enabled nocommitmsg
]} {
2905 .mbar.commit add
command -label [mc
"Sign Off"] \
2906 -command do_signoff \
2910 .mbar.commit add
command -label [commit_btn_caption
] \
2911 -command do_commit \
2912 -accelerator $M1T-Return
2913 lappend disable_on_lock \
2914 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2919 if {[is_enabled branch
]} {
2921 .mbar.merge add
command -label [mc
"Local Merge..."] \
2922 -command merge
::dialog \
2924 lappend disable_on_lock \
2925 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2926 .mbar.merge add
command -label [mc
"Abort Merge..."] \
2927 -command merge
::reset_hard
2928 lappend disable_on_lock \
2929 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2934 if {[is_enabled transport
]} {
2937 .mbar.remote add
command \
2938 -label [mc
"Add..."] \
2939 -command remote_add
::dialog \
2941 .mbar.remote add
command \
2942 -label [mc
"Push..."] \
2943 -command do_push_anywhere \
2945 .mbar.remote add
command \
2946 -label [mc
"Delete Branch..."] \
2947 -command remote_branch_delete
::dialog
2951 proc
::tk
::mac
::ShowPreferences
{} {do_options
}
2955 .mbar.edit add separator
2956 .mbar.edit add
command -label [mc
"Options..."] \
2962 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2963 set tools_menubar .mbar.tools
2965 $tools_menubar add separator
2966 $tools_menubar add
command -label [mc
"Add..."] -command tools_add
::dialog
2967 $tools_menubar add
command -label [mc
"Remove..."] -command tools_remove
::dialog
2969 if {[array names repo_config guitool.
*.cmd
] ne
{}} {
2976 .mbar add cascade
-label [mc Help
] -menu .mbar.
help
2980 .mbar.apple add
command -label [mc
"About %s" [appname
]] \
2982 .mbar.apple add separator
2984 .mbar.
help add
command -label [mc
"About %s" [appname
]] \
2987 . configure
-menu .mbar
2989 set doc_path
[githtmldir
]
2990 if {$doc_path ne
{}} {
2991 set doc_path
[file join $doc_path index.html
]
2994 set doc_path
[exec cygpath
--mixed $doc_path]
2998 if {[file isfile
$doc_path]} {
2999 set doc_url
"file:$doc_path"
3001 set doc_url
{http
://www.kernel.org
/pub
/software
/scm
/git
/docs
/}
3004 proc start_browser
{url
} {
3005 git
"web--browse" $url
3008 .mbar.
help add
command -label [mc
"Online Documentation"] \
3009 -command [list start_browser
$doc_url]
3011 .mbar.
help add
command -label [mc
"Show SSH Key"] \
3014 unset doc_path doc_url
3016 # -- Standard bindings
3018 wm protocol . WM_DELETE_WINDOW do_quit
3019 bind all
<$M1B-Key-q> do_quit
3020 bind all
<$M1B-Key-Q> do_quit
3021 bind all
<$M1B-Key-w> {destroy
[winfo toplevel
%W
]}
3022 bind all
<$M1B-Key-W> {destroy
[winfo toplevel
%W
]}
3024 set subcommand_args
{}
3026 set s
"usage: $::argv0 $::subcommand $::subcommand_args"
3027 if {[tk windowingsystem
] eq
"win32"} {
3029 tk_messageBox
-icon info
-message $s \
3037 proc normalize_relpath
{path
} {
3039 foreach item
[file split $path] {
3040 if {$item eq
{.
}} continue
3041 if {$item eq
{..
} && [llength
$elements] > 0
3042 && [lindex
$elements end
] ne
{..
}} {
3043 set elements
[lrange
$elements 0 end-1
]
3046 lappend elements
$item
3048 return [eval file join $elements]
3051 # -- Not a normal commit type invocation? Do that instead!
3053 switch
-- $subcommand {
3056 if {$subcommand eq
"blame"} {
3057 set subcommand_args
{[--line=<num
>] rev? path
}
3059 set subcommand_args
{rev? path
}
3061 if {$argv eq
{}} usage
3067 set p
[file join $_prefix $a]
3069 if {$is_path ||
[file exists
$p]} {
3070 if {$path ne
{}} usage
3071 set path
[normalize_relpath
$p]
3073 } elseif
{$a eq
{--}} {
3075 if {$head ne
{}} usage
3080 } elseif
{[regexp
{^
--line=(\d
+)$
} $a a lnum
]} {
3081 if {$jump_spec ne
{} ||
$head ne
{}} usage
3082 set jump_spec
[list
$lnum]
3083 } elseif
{$head eq
{}} {
3084 if {$head ne
{}} usage
3093 if {$head ne
{} && $path eq
{}} {
3094 if {[string index
$head 0] eq
{/}} {
3095 set path
[normalize_relpath
$head]
3098 set path
[normalize_relpath
$_prefix$head]
3106 if {[regexp
{^
[0-9a-f]{1,39}$
} $head]} {
3108 set head [git rev-parse
--verify $head]
3110 if {[tk windowingsystem
] eq
"win32"} {
3111 tk_messageBox
-icon error
-title [mc Error
] -message $err
3118 set current_branch
$head
3122 switch
-- $subcommand {
3124 if {$jump_spec ne
{}} usage
3126 if {$path ne
{} && [file isdirectory
$path]} {
3127 set head $current_branch
3133 browser
::new
$head $path
3136 if {$head eq
{} && ![file exists
$path]} {
3137 catch
{wm withdraw .
}
3141 -title [mc
"git-gui: fatal error"] \
3142 -message [mc
"fatal: cannot stat path %s: No such file or directory" $path]
3145 blame
::new
$head $path $jump_spec
3152 if {[llength
$argv] != 0} {
3155 # fall through to setup UI for commits
3158 set err
"usage: $argv0 \[{blame|browser|citool}\]"
3159 if {[tk windowingsystem
] eq
"win32"} {
3161 tk_messageBox
-icon error
-message $err \
3172 ${NS}::frame .branch
3173 if {!$use_ttk} {.branch configure
-borderwidth 1 -relief sunken
}
3174 ${NS}::label .branch.l1 \
3175 -text [mc
"Current Branch:"] \
3178 ${NS}::label .branch.cb \
3179 -textvariable current_branch \
3182 pack .branch.l1
-side left
3183 pack .branch.cb
-side left
-fill x
3184 pack .branch
-side top
-fill x
3186 # -- Main Window Layout
3188 ${NS}::panedwindow .vpane
-orient horizontal
3189 ${NS}::panedwindow .vpane.files
-orient vertical
3191 .vpane add .vpane.files
3193 .vpane add .vpane.files
-sticky nsew
-height 100 -width 200
3195 pack .vpane
-anchor n
-side top
-fill both
-expand 1
3197 # -- Index File List
3199 ${NS}::frame .vpane.files.index
-height 100 -width 200
3200 tlabel .vpane.files.index.title \
3201 -text [mc
"Staged Changes (Will Commit)"] \
3202 -background lightgreen
-foreground black
3203 text
$ui_index -background white
-foreground black \
3205 -width 20 -height 10 \
3207 -takefocus 1 -highlightthickness 1\
3208 -cursor $cursor_ptr \
3209 -xscrollcommand {.vpane.files.index.sx
set} \
3210 -yscrollcommand {.vpane.files.index.sy
set} \
3212 ${NS}::scrollbar .vpane.files.index.sx
-orient h
-command [list
$ui_index xview
]
3213 ${NS}::scrollbar .vpane.files.index.sy
-orient v
-command [list
$ui_index yview
]
3214 pack .vpane.files.index.title
-side top
-fill x
3215 pack .vpane.files.index.sx
-side bottom
-fill x
3216 pack .vpane.files.index.sy
-side right
-fill y
3217 pack
$ui_index -side left
-fill both
-expand 1
3219 # -- Working Directory File List
3221 ${NS}::frame .vpane.files.workdir
-height 100 -width 200
3222 tlabel .vpane.files.workdir.title
-text [mc
"Unstaged Changes"] \
3223 -background lightsalmon
-foreground black
3224 text
$ui_workdir -background white
-foreground black \
3226 -width 20 -height 10 \
3228 -takefocus 1 -highlightthickness 1\
3229 -cursor $cursor_ptr \
3230 -xscrollcommand {.vpane.files.workdir.sx
set} \
3231 -yscrollcommand {.vpane.files.workdir.sy
set} \
3233 ${NS}::scrollbar .vpane.files.workdir.sx
-orient h
-command [list
$ui_workdir xview
]
3234 ${NS}::scrollbar .vpane.files.workdir.sy
-orient v
-command [list
$ui_workdir yview
]
3235 pack .vpane.files.workdir.title
-side top
-fill x
3236 pack .vpane.files.workdir.sx
-side bottom
-fill x
3237 pack .vpane.files.workdir.sy
-side right
-fill y
3238 pack
$ui_workdir -side left
-fill both
-expand 1
3240 .vpane.files add .vpane.files.workdir
3241 .vpane.files add .vpane.files.index
3243 .vpane.files paneconfigure .vpane.files.workdir
-sticky news
3244 .vpane.files paneconfigure .vpane.files.index
-sticky news
3247 foreach i
[list
$ui_index $ui_workdir] {
3249 $i tag conf in_diff
-background [$i tag cget in_sel
-background]
3253 # -- Diff and Commit Area
3256 ${NS}::panedwindow .vpane.lower
-orient vertical
3257 ${NS}::frame .vpane.lower.commarea
3258 ${NS}::frame .vpane.lower.
diff -relief sunken
-borderwidth 1 -height 500
3259 .vpane.lower add .vpane.lower.
diff
3260 .vpane.lower add .vpane.lower.commarea
3261 .vpane add .vpane.lower
3263 .vpane.lower pane .vpane.lower.
diff -weight 1
3264 .vpane.lower pane .vpane.lower.commarea
-weight 0
3266 .vpane.lower paneconfigure .vpane.lower.
diff -stretch always
3267 .vpane.lower paneconfigure .vpane.lower.commarea
-stretch never
3270 frame .vpane.lower
-height 300 -width 400
3271 frame .vpane.lower.commarea
3272 frame .vpane.lower.
diff -relief sunken
-borderwidth 1
3273 pack .vpane.lower.
diff -fill both
-expand 1
3274 pack .vpane.lower.commarea
-side bottom
-fill x
3275 .vpane add .vpane.lower
3276 .vpane paneconfigure .vpane.lower
-sticky nsew
3279 # -- Commit Area Buttons
3281 ${NS}::frame .vpane.lower.commarea.buttons
3282 ${NS}::label .vpane.lower.commarea.buttons.l
-text {} \
3285 pack .vpane.lower.commarea.buttons.l
-side top
-fill x
3286 pack .vpane.lower.commarea.buttons
-side left
-fill y
3288 ${NS}::button .vpane.lower.commarea.buttons.rescan
-text [mc Rescan
] \
3289 -command ui_do_rescan
3290 pack .vpane.lower.commarea.buttons.rescan
-side top
-fill x
3291 lappend disable_on_lock \
3292 {.vpane.lower.commarea.buttons.rescan conf
-state}
3294 ${NS}::button .vpane.lower.commarea.buttons.incall
-text [mc
"Stage Changed"] \
3296 pack .vpane.lower.commarea.buttons.incall
-side top
-fill x
3297 lappend disable_on_lock \
3298 {.vpane.lower.commarea.buttons.incall conf
-state}
3300 if {![is_enabled nocommitmsg
]} {
3301 ${NS}::button .vpane.lower.commarea.buttons.signoff
-text [mc
"Sign Off"] \
3303 pack .vpane.lower.commarea.buttons.signoff
-side top
-fill x
3306 ${NS}::button .vpane.lower.commarea.buttons.commit
-text [commit_btn_caption
] \
3308 pack .vpane.lower.commarea.buttons.commit
-side top
-fill x
3309 lappend disable_on_lock \
3310 {.vpane.lower.commarea.buttons.commit conf
-state}
3312 if {![is_enabled nocommit
]} {
3313 ${NS}::button .vpane.lower.commarea.buttons.push
-text [mc Push
] \
3314 -command do_push_anywhere
3315 pack .vpane.lower.commarea.buttons.push
-side top
-fill x
3318 # -- Commit Message Buffer
3320 ${NS}::frame .vpane.lower.commarea.buffer
3321 ${NS}::frame .vpane.lower.commarea.buffer.header
3322 set ui_comm .vpane.lower.commarea.buffer.t
3323 set ui_coml .vpane.lower.commarea.buffer.header.l
3325 if {![is_enabled nocommit
]} {
3326 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.new \
3327 -text [mc
"New Commit"] \
3328 -command do_select_commit_type \
3329 -variable selected_commit_type \
3331 lappend disable_on_lock \
3332 [list .vpane.lower.commarea.buffer.header.new conf
-state]
3333 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.amend \
3334 -text [mc
"Amend Last Commit"] \
3335 -command do_select_commit_type \
3336 -variable selected_commit_type \
3338 lappend disable_on_lock \
3339 [list .vpane.lower.commarea.buffer.header.amend conf
-state]
3342 ${NS}::label
$ui_coml \
3345 proc trace_commit_type
{varname args
} {
3346 global ui_coml commit_type
3347 switch
-glob -- $commit_type {
3348 initial
{set txt
[mc
"Initial Commit Message:"]}
3349 amend
{set txt
[mc
"Amended Commit Message:"]}
3350 amend-initial
{set txt
[mc
"Amended Initial Commit Message:"]}
3351 amend-merge
{set txt
[mc
"Amended Merge Commit Message:"]}
3352 merge
{set txt
[mc
"Merge Commit Message:"]}
3353 * {set txt
[mc
"Commit Message:"]}
3355 $ui_coml conf
-text $txt
3357 trace add variable commit_type
write trace_commit_type
3358 pack
$ui_coml -side left
-fill x
3360 if {![is_enabled nocommit
]} {
3361 pack .vpane.lower.commarea.buffer.header.amend
-side right
3362 pack .vpane.lower.commarea.buffer.header.new
-side right
3365 text
$ui_comm -background white
-foreground black \
3369 -autoseparators true \
3371 -width $repo_config(gui.commitmsgwidth
) -height 9 -wrap none \
3373 -yscrollcommand {.vpane.lower.commarea.buffer.sby
set}
3374 ${NS}::scrollbar .vpane.lower.commarea.buffer.sby \
3375 -command [list
$ui_comm yview
]
3376 pack .vpane.lower.commarea.buffer.header
-side top
-fill x
3377 pack .vpane.lower.commarea.buffer.sby
-side right
-fill y
3378 pack
$ui_comm -side left
-fill y
3379 pack .vpane.lower.commarea.buffer
-side left
-fill y
3381 # -- Commit Message Buffer Context Menu
3383 set ctxm .vpane.lower.commarea.buffer.ctxm
3384 menu
$ctxm -tearoff 0
3387 -command {tk_textCut
$ui_comm}
3390 -command {tk_textCopy
$ui_comm}
3393 -command {tk_textPaste
$ui_comm}
3395 -label [mc Delete
] \
3396 -command {catch
{$ui_comm delete sel.first sel.last
}}
3399 -label [mc
"Select All"] \
3400 -command {focus
$ui_comm;$ui_comm tag add sel
0.0 end
}
3402 -label [mc
"Copy All"] \
3404 $ui_comm tag add sel
0.0 end
3405 tk_textCopy
$ui_comm
3406 $ui_comm tag remove sel
0.0 end
3410 -label [mc
"Sign Off"] \
3412 set ui_comm_ctxm
$ctxm
3416 proc trace_current_diff_path
{varname args
} {
3417 global current_diff_path diff_actions file_states
3418 if {$current_diff_path eq
{}} {
3424 set p
$current_diff_path
3425 set s
[mapdesc
[lindex
$file_states($p) 0] $p]
3427 set p
[escape_path
$p]
3431 .vpane.lower.
diff.header.status configure
-text $s
3432 .vpane.lower.
diff.header.
file configure
-text $f
3433 .vpane.lower.
diff.header.path configure
-text $p
3434 foreach w
$diff_actions {
3438 trace add variable current_diff_path
write trace_current_diff_path
3440 gold_frame .vpane.lower.
diff.header
3441 tlabel .vpane.lower.
diff.header.status \
3444 -width $max_status_desc \
3447 tlabel .vpane.lower.
diff.header.
file \
3452 tlabel .vpane.lower.
diff.header.path \
3457 pack .vpane.lower.
diff.header.status
-side left
3458 pack .vpane.lower.
diff.header.
file -side left
3459 pack .vpane.lower.
diff.header.path
-fill x
3460 set ctxm .vpane.lower.
diff.header.ctxm
3461 menu
$ctxm -tearoff 0
3469 -- $current_diff_path
3471 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3472 bind_button3 .vpane.lower.
diff.header.path
"tk_popup $ctxm %X %Y"
3476 ${NS}::frame .vpane.lower.
diff.body
3477 set ui_diff .vpane.lower.
diff.body.t
3478 text
$ui_diff -background white
-foreground black \
3480 -width 80 -height 5 -wrap none \
3482 -xscrollcommand {.vpane.lower.
diff.body.sbx
set} \
3483 -yscrollcommand {.vpane.lower.
diff.body.sby
set} \
3485 catch
{$ui_diff configure
-tabstyle wordprocessor
}
3486 ${NS}::scrollbar .vpane.lower.
diff.body.sbx
-orient horizontal \
3487 -command [list
$ui_diff xview
]
3488 ${NS}::scrollbar .vpane.lower.
diff.body.sby
-orient vertical \
3489 -command [list
$ui_diff yview
]
3490 pack .vpane.lower.
diff.body.sbx
-side bottom
-fill x
3491 pack .vpane.lower.
diff.body.sby
-side right
-fill y
3492 pack
$ui_diff -side left
-fill both
-expand 1
3493 pack .vpane.lower.
diff.header
-side top
-fill x
3494 pack .vpane.lower.
diff.body
-side bottom
-fill both
-expand 1
3496 foreach
{n c
} {0 black
1 red4
2 green4
3 yellow4
4 blue4
5 magenta4
6 cyan4
7 grey60
} {
3497 $ui_diff tag configure clr4
$n -background $c
3498 $ui_diff tag configure clri4
$n -foreground $c
3499 $ui_diff tag configure clr3
$n -foreground $c
3500 $ui_diff tag configure clri3
$n -background $c
3502 $ui_diff tag configure clr1
-font font_diffbold
3503 $ui_diff tag configure clr4
-underline 1
3505 $ui_diff tag conf d_info
-foreground blue
-font font_diffbold
3507 $ui_diff tag conf d_cr
-elide true
3508 $ui_diff tag conf d_@
-font font_diffbold
3509 $ui_diff tag conf d_
+ -foreground {#00a000}
3510 $ui_diff tag conf d_-
-foreground red
3512 $ui_diff tag conf d_
++ -foreground {#00a000}
3513 $ui_diff tag conf d_--
-foreground red
3514 $ui_diff tag conf d_
+s \
3515 -foreground {#00a000} \
3516 -background {#e2effa}
3517 $ui_diff tag conf d_-s \
3519 -background {#e2effa}
3520 $ui_diff tag conf d_s
+ \
3521 -foreground {#00a000} \
3523 $ui_diff tag conf d_s- \
3527 $ui_diff tag conf d
< \
3528 -foreground orange \
3530 $ui_diff tag conf d
= \
3531 -foreground orange \
3533 $ui_diff tag conf d
> \
3534 -foreground orange \
3537 $ui_diff tag raise sel
3539 # -- Diff Body Context Menu
3542 proc create_common_diff_popup
{ctxm
} {
3544 -label [mc Refresh
] \
3545 -command reshow_diff
3546 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3549 -command {tk_textCopy
$ui_diff}
3550 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3552 -label [mc
"Select All"] \
3553 -command {focus
$ui_diff;$ui_diff tag add sel
0.0 end
}
3554 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3556 -label [mc
"Copy All"] \
3558 $ui_diff tag add sel
0.0 end
3559 tk_textCopy
$ui_diff
3560 $ui_diff tag remove sel
0.0 end
3562 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3565 -label [mc
"Decrease Font Size"] \
3566 -command {incr_font_size font_diff
-1}
3567 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3569 -label [mc
"Increase Font Size"] \
3570 -command {incr_font_size font_diff
1}
3571 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3575 build_encoding_menu
$emenu [list force_diff_encoding
]
3577 -label [mc
"Encoding"] \
3579 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3581 $ctxm add
command -label [mc
"Options..."] \
3585 set ctxm .vpane.lower.
diff.body.ctxm
3586 menu
$ctxm -tearoff 0
3588 -label [mc
"Apply/Reverse Hunk"] \
3589 -command {apply_hunk
$cursorX $cursorY}
3590 set ui_diff_applyhunk
[$ctxm index last
]
3591 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyhunk -state]
3593 -label [mc
"Apply/Reverse Line"] \
3594 -command {apply_range_or_line
$cursorX $cursorY; do_rescan
}
3595 set ui_diff_applyline
[$ctxm index last
]
3596 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyline -state]
3599 -label [mc
"Show Less Context"] \
3600 -command show_less_context
3601 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3603 -label [mc
"Show More Context"] \
3604 -command show_more_context
3605 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3607 create_common_diff_popup
$ctxm
3609 set ctxmmg .vpane.lower.
diff.body.ctxmmg
3610 menu
$ctxmmg -tearoff 0
3611 $ctxmmg add
command \
3612 -label [mc
"Run Merge Tool"] \
3613 -command {merge_resolve_tool
}
3614 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3615 $ctxmmg add separator
3616 $ctxmmg add
command \
3617 -label [mc
"Use Remote Version"] \
3618 -command {merge_resolve_one
3}
3619 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3620 $ctxmmg add
command \
3621 -label [mc
"Use Local Version"] \
3622 -command {merge_resolve_one
2}
3623 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3624 $ctxmmg add
command \
3625 -label [mc
"Revert To Base"] \
3626 -command {merge_resolve_one
1}
3627 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3628 $ctxmmg add separator
3629 $ctxmmg add
command \
3630 -label [mc
"Show Less Context"] \
3631 -command show_less_context
3632 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3633 $ctxmmg add
command \
3634 -label [mc
"Show More Context"] \
3635 -command show_more_context
3636 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3637 $ctxmmg add separator
3638 create_common_diff_popup
$ctxmmg
3640 set ctxmsm .vpane.lower.
diff.body.ctxmsm
3641 menu
$ctxmsm -tearoff 0
3642 $ctxmsm add
command \
3643 -label [mc
"Visualize These Changes In The Submodule"] \
3644 -command {do_gitk
-- true
}
3645 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3646 $ctxmsm add
command \
3647 -label [mc
"Visualize Current Branch History In The Submodule"] \
3648 -command {do_gitk
{} true
}
3649 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3650 $ctxmsm add
command \
3651 -label [mc
"Visualize All Branch History In The Submodule"] \
3652 -command {do_gitk
--all true
}
3653 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3654 $ctxmsm add separator
3655 $ctxmsm add
command \
3656 -label [mc
"Start git gui In The Submodule"] \
3657 -command {do_git_gui
}
3658 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3659 $ctxmsm add separator
3660 create_common_diff_popup
$ctxmsm
3662 proc has_textconv
{path
} {
3663 if {[is_config_false gui.textconv
]} {
3666 set filter
[gitattr
$path diff set]
3667 set textconv
[get_config
[join [list
diff $filter textconv
] .
]]
3668 if {$filter ne
{set} && $textconv ne
{}} {
3675 proc popup_diff_menu
{ctxm ctxmmg ctxmsm x y X Y
} {
3676 global current_diff_path file_states
3679 if {[info exists file_states
($current_diff_path)]} {
3680 set state
[lindex
$file_states($current_diff_path) 0]
3684 if {[string first
{U
} $state] >= 0} {
3685 tk_popup
$ctxmmg $X $Y
3686 } elseif
{$
::is_submodule_diff
} {
3687 tk_popup
$ctxmsm $X $Y
3689 set has_range
[expr {[$
::ui_diff tag nextrange sel
0.0] != {}}]
3690 if {$
::ui_index eq $
::current_diff_side
} {
3691 set l
[mc
"Unstage Hunk From Commit"]
3693 set t
[mc
"Unstage Lines From Commit"]
3695 set t
[mc
"Unstage Line From Commit"]
3698 set l
[mc
"Stage Hunk For Commit"]
3700 set t
[mc
"Stage Lines For Commit"]
3702 set t
[mc
"Stage Line For Commit"]
3706 ||
$current_diff_path eq
{}
3709 ||
[string match
{?T
} $state]
3710 ||
[string match
{T?
} $state]
3711 ||
[has_textconv
$current_diff_path]} {
3716 $ctxm entryconf $
::ui_diff_applyhunk
-state $s -label $l
3717 $ctxm entryconf $
::ui_diff_applyline
-state $s -label $t
3718 tk_popup
$ctxm $X $Y
3721 bind_button3
$ui_diff [list popup_diff_menu
$ctxm $ctxmmg $ctxmsm %x
%y
%X
%Y
]
3725 set main_status
[::status_bar
::new .status
]
3726 pack .status
-anchor w
-side bottom
-fill x
3727 $main_status show
[mc
"Initializing..."]
3731 proc on_ttk_pane_mapped
{w pane pos
} {
3733 after
0 [list after idle
[list
$w sashpos
$pane $pos]]
3735 proc on_tk_pane_mapped
{w pane x y
} {
3737 after
0 [list after idle
[list
$w sash place
$pane $x $y]]
3739 proc on_application_mapped
{} {
3740 global repo_config use_ttk
3742 set gm
$repo_config(gui.geometry
)
3745 [list on_ttk_pane_mapped
%W
0 [lindex
$gm 1]]
3746 bind .vpane.files
<Map
> \
3747 [list on_ttk_pane_mapped
%W
0 [lindex
$gm 2]]
3750 [list on_tk_pane_mapped
%W
0 \
3752 [lindex
[.vpane sash coord
0] 1]]
3753 bind .vpane.files
<Map
> \
3754 [list on_tk_pane_mapped
%W
0 \
3755 [lindex
[.vpane.files sash coord
0] 0] \
3758 wm geometry .
[lindex
$gm 0]
3760 if {[info exists repo_config
(gui.geometry
)]} {
3761 bind .
<Map
> [list on_application_mapped
]
3762 wm geometry .
[lindex
$repo_config(gui.geometry
) 0]
3765 # -- Load window state
3767 if {[info exists repo_config
(gui.wmstate
)]} {
3768 catch
{wm state .
$repo_config(gui.wmstate
)}
3773 bind $ui_comm <$M1B-Key-Return> {do_commit
;break}
3774 bind $ui_comm <$M1B-Key-t> {do_add_selection
;break}
3775 bind $ui_comm <$M1B-Key-T> {do_add_selection
;break}
3776 bind $ui_comm <$M1B-Key-u> {do_unstage_selection
;break}
3777 bind $ui_comm <$M1B-Key-U> {do_unstage_selection
;break}
3778 bind $ui_comm <$M1B-Key-j> {do_revert_selection
;break}
3779 bind $ui_comm <$M1B-Key-J> {do_revert_selection
;break}
3780 bind $ui_comm <$M1B-Key-i> {do_add_all
;break}
3781 bind $ui_comm <$M1B-Key-I> {do_add_all
;break}
3782 bind $ui_comm <$M1B-Key-x> {tk_textCut
%W
;break}
3783 bind $ui_comm <$M1B-Key-X> {tk_textCut
%W
;break}
3784 bind $ui_comm <$M1B-Key-c> {tk_textCopy
%W
;break}
3785 bind $ui_comm <$M1B-Key-C> {tk_textCopy
%W
;break}
3786 bind $ui_comm <$M1B-Key-v> {tk_textPaste
%W
; %W see insert
; break}
3787 bind $ui_comm <$M1B-Key-V> {tk_textPaste
%W
; %W see insert
; break}
3788 bind $ui_comm <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3789 bind $ui_comm <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3790 bind $ui_comm <$M1B-Key-minus> {show_less_context
;break}
3791 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context
;break}
3792 bind $ui_comm <$M1B-Key-equal> {show_more_context
;break}
3793 bind $ui_comm <$M1B-Key-plus> {show_more_context
;break}
3794 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context
;break}
3796 bind $ui_diff <$M1B-Key-x> {tk_textCopy
%W
;break}
3797 bind $ui_diff <$M1B-Key-X> {tk_textCopy
%W
;break}
3798 bind $ui_diff <$M1B-Key-c> {tk_textCopy
%W
;break}
3799 bind $ui_diff <$M1B-Key-C> {tk_textCopy
%W
;break}
3800 bind $ui_diff <$M1B-Key-v> {break}
3801 bind $ui_diff <$M1B-Key-V> {break}
3802 bind $ui_diff <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3803 bind $ui_diff <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3804 bind $ui_diff <$M1B-Key-j> {do_revert_selection
;break}
3805 bind $ui_diff <$M1B-Key-J> {do_revert_selection
;break}
3806 bind $ui_diff <Key-Up
> {catch
{%W yview scroll
-1 units
};break}
3807 bind $ui_diff <Key-Down
> {catch
{%W yview scroll
1 units
};break}
3808 bind $ui_diff <Key-Left
> {catch
{%W xview scroll
-1 units
};break}
3809 bind $ui_diff <Key-Right
> {catch
{%W xview scroll
1 units
};break}
3810 bind $ui_diff <Key-k
> {catch
{%W yview scroll
-1 units
};break}
3811 bind $ui_diff <Key-j
> {catch
{%W yview scroll
1 units
};break}
3812 bind $ui_diff <Key-h
> {catch
{%W xview scroll
-1 units
};break}
3813 bind $ui_diff <Key-l
> {catch
{%W xview scroll
1 units
};break}
3814 bind $ui_diff <Control-Key-b
> {catch
{%W yview scroll
-1 pages
};break}
3815 bind $ui_diff <Control-Key-f
> {catch
{%W yview scroll
1 pages
};break}
3816 bind $ui_diff <Button-1
> {focus
%W
}
3818 if {[is_enabled branch
]} {
3819 bind .
<$M1B-Key-n> branch_create
::dialog
3820 bind .
<$M1B-Key-N> branch_create
::dialog
3821 bind .
<$M1B-Key-o> branch_checkout
::dialog
3822 bind .
<$M1B-Key-O> branch_checkout
::dialog
3823 bind .
<$M1B-Key-m> merge
::dialog
3824 bind .
<$M1B-Key-M> merge
::dialog
3826 if {[is_enabled transport
]} {
3827 bind .
<$M1B-Key-p> do_push_anywhere
3828 bind .
<$M1B-Key-P> do_push_anywhere
3831 bind .
<Key-F5
> ui_do_rescan
3832 bind .
<$M1B-Key-r> ui_do_rescan
3833 bind .
<$M1B-Key-R> ui_do_rescan
3834 bind .
<$M1B-Key-s> do_signoff
3835 bind .
<$M1B-Key-S> do_signoff
3836 bind .
<$M1B-Key-t> { toggle_or_diff toggle
%W
}
3837 bind .
<$M1B-Key-T> { toggle_or_diff toggle
%W
}
3838 bind .
<$M1B-Key-u> { toggle_or_diff toggle
%W
}
3839 bind .
<$M1B-Key-U> { toggle_or_diff toggle
%W
}
3840 bind .
<$M1B-Key-j> do_revert_selection
3841 bind .
<$M1B-Key-J> do_revert_selection
3842 bind .
<$M1B-Key-i> do_add_all
3843 bind .
<$M1B-Key-I> do_add_all
3844 bind .
<$M1B-Key-minus> {show_less_context
;break}
3845 bind .
<$M1B-Key-KP_Subtract> {show_less_context
;break}
3846 bind .
<$M1B-Key-equal> {show_more_context
;break}
3847 bind .
<$M1B-Key-plus> {show_more_context
;break}
3848 bind .
<$M1B-Key-KP_Add> {show_more_context
;break}
3849 bind .
<$M1B-Key-Return> do_commit
3850 foreach i
[list
$ui_index $ui_workdir] {
3851 bind $i <Button-1
> { toggle_or_diff click
%W
%x
%y
; break }
3852 bind $i <$M1B-Button-1> { add_one_to_selection
%W
%x
%y
; break }
3853 bind $i <Shift-Button-1
> { add_range_to_selection
%W
%x
%y
; break }
3854 bind $i <Key-Up
> { toggle_or_diff up
%W
; break }
3855 bind $i <Key-Down
> { toggle_or_diff down
%W
; break }
3859 set file_lists
($ui_index) [list
]
3860 set file_lists
($ui_workdir) [list
]
3862 wm title .
"[appname] ([reponame]) [file normalize $_gitworktree]"
3863 focus
-force $ui_comm
3865 # -- Warn the user about environmental problems. Cygwin's Tcl
3866 # does *not* pass its env array onto any processes it spawns.
3867 # This means that git processes get none of our environment.
3872 set msg
[mc
"Possible environment issues exist.
3874 The following environment variables are probably
3875 going to be ignored by any Git subprocess run
3879 foreach name
[array names env
] {
3880 switch
-regexp -- $name {
3881 {^GIT_INDEX_FILE$
} -
3882 {^GIT_OBJECT_DIRECTORY$
} -
3883 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$
} -
3885 {^GIT_EXTERNAL_DIFF$
} -
3889 {^GIT_
(AUTHOR|COMMITTER
)_DATE$
} {
3890 append msg
" - $name\n"
3893 {^GIT_
(AUTHOR|COMMITTER
)_
(NAME|EMAIL
)$
} {
3894 append msg
" - $name\n"
3896 set suggest_user
$name
3900 if {$ignored_env > 0} {
3902 This is due to a known issue with the
3903 Tcl binary distributed by Cygwin."]
3905 if {$suggest_user ne
{}} {
3908 A good replacement for %s
3909 is placing values for the user.name and
3910 user.email settings into your personal
3916 unset ignored_env msg suggest_user name
3919 # -- Only initialize complex UI if we are going to stay running.
3921 if {[is_enabled transport
]} {
3924 set n
[.mbar.remote index end
]
3925 populate_remotes_menu
3926 set n
[expr {[.mbar.remote index end
] - $n}]
3928 if {[.mbar.remote
type 0] eq
"tearoff"} { incr n
}
3929 .mbar.remote insert
$n separator
3934 if {[winfo exists
$ui_comm]} {
3935 set GITGUI_BCK_exists
[load_message GITGUI_BCK utf-8
]
3937 # -- If both our backup and message files exist use the
3938 # newer of the two files to initialize the buffer.
3940 if {$GITGUI_BCK_exists} {
3941 set m
[gitdir GITGUI_MSG
]
3942 if {[file isfile
$m]} {
3943 if {[file mtime
[gitdir GITGUI_BCK
]] > [file mtime
$m]} {
3944 catch
{file delete
[gitdir GITGUI_MSG
]}
3946 $ui_comm delete
0.0 end
3948 $ui_comm edit modified false
3949 catch
{file delete
[gitdir GITGUI_BCK
]}
3950 set GITGUI_BCK_exists
0
3956 proc backup_commit_buffer
{} {
3957 global ui_comm GITGUI_BCK_exists
3959 set m
[$ui_comm edit modified
]
3960 if {$m ||
$GITGUI_BCK_exists} {
3961 set msg
[string trim
[$ui_comm get
0.0 end
]]
3962 regsub
-all -line {[ \r\t]+$
} $msg {} msg
3965 if {$GITGUI_BCK_exists} {
3966 catch
{file delete
[gitdir GITGUI_BCK
]}
3967 set GITGUI_BCK_exists
0
3971 set fd
[open
[gitdir GITGUI_BCK
] w
]
3972 fconfigure
$fd -encoding utf-8
3973 puts
-nonewline $fd $msg
3975 set GITGUI_BCK_exists
1
3979 $ui_comm edit modified false
3982 set ::GITGUI_BCK_i
[after
2000 backup_commit_buffer
]
3985 backup_commit_buffer
3987 # -- If the user has aspell available we can drive it
3988 # in pipe mode to spellcheck the commit message.
3990 set spell_cmd
[list |
]
3991 set spell_dict
[get_config gui.spellingdictionary
]
3992 lappend spell_cmd aspell
3993 if {$spell_dict ne
{}} {
3994 lappend spell_cmd
--master=$spell_dict
3996 lappend spell_cmd
--mode=none
3997 lappend spell_cmd
--encoding=utf-8
3998 lappend spell_cmd pipe
3999 if {$spell_dict eq
{none
}
4000 ||
[catch
{set spell_fd
[open
$spell_cmd r
+]} spell_err
]} {
4001 bind_button3
$ui_comm [list tk_popup
$ui_comm_ctxm %X
%Y
]
4003 set ui_comm_spell
[spellcheck
::init \
4009 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
4012 lock_index begin-read
4013 if {![winfo ismapped .
]} {
4017 if {[is_enabled initialamend
]} {
4023 if {[is_enabled nocommitmsg
]} {
4024 $ui_comm configure
-state disabled
-background gray
4027 if {[is_enabled multicommit
] && ![is_config_false gui.gcwarning
]} {
4030 if {[is_enabled retcode
]} {
4031 bind .
<Destroy
> {+terminate_me
%W
}
4033 if {$picked && [is_config_true gui.autoexplore
]} {
4039 # indent-tabs-mode: t