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 set oguilib
{@@GITGUI_LIBDIR@@
}
53 set oguirel
{@@GITGUI_RELATIVE@@
}
54 if {$oguirel eq
{1}} {
55 set oguilib
[file dirname [file normalize
$argv0]]
56 if {[file tail $oguilib] eq
{git-core
}} {
57 set oguilib
[file dirname $oguilib]
59 set oguilib
[file dirname $oguilib]
60 set oguilib
[file join $oguilib share git-gui lib
]
61 set oguimsg
[file join $oguilib msgs
]
62 } elseif
{[string match @@
* $oguirel]} {
63 set oguilib
[file join [file dirname [file normalize
$argv0]] lib
]
64 set oguimsg
[file join [file dirname [file normalize
$argv0]] po
]
66 set oguimsg
[file join $oguilib msgs
]
70 ######################################################################
72 ## enable verbose loading?
74 if {![catch
{set _verbose
$env(GITGUI_VERBOSE
)}]} {
76 rename auto_load real__auto_load
77 proc auto_load
{name args
} {
78 puts stderr
"auto_load $name"
79 return [uplevel
1 real__auto_load
$name $args]
81 rename
source real__source
83 puts stderr
"source $name"
84 uplevel
1 real__source
$name
86 if {[tk windowingsystem
] eq
"win32"} { console show
}
89 ######################################################################
91 ## Internationalization (i18n) through msgcat and gettext. See
92 ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
94 package require msgcat
96 # Check for Windows 7 MUI language pack (missed by msgcat < 1.4.4)
97 if {[tk windowingsystem
] eq
"win32"
98 && [package vcompare
[package provide msgcat
] 1.4.4] < 0
100 proc _mc_update_locale
{} {
101 set key
{HKEY_CURRENT_USER\Control Panel\Desktop
}
103 package require registry
104 set uilocale
[registry get
$key "PreferredUILanguages"]
105 msgcat
::ConvertLocale
[string map
{- _
} [lindex
$uilocale 0]]
107 if {[string length
$uilocale] > 0} {
108 msgcat
::mclocale
$uilocale
115 proc _mc_trim
{fmt} {
116 set cmk
[string first @@
$fmt]
118 return [string range
$fmt 0 [expr {$cmk - 1}]]
123 proc mc
{en_fmt args
} {
124 set fmt [_mc_trim
[::msgcat
::mc
$en_fmt]]
125 if {[catch
{set msg
[eval [list format
$fmt] $args]} err
]} {
126 set msg
[eval [list format
[_mc_trim
$en_fmt]] $args]
132 return [join $args {}]
135 ::msgcat
::mcload
$oguimsg
138 ######################################################################
142 set _appname
{Git Gui
}
151 set _shellpath
{@@SHELL_PATH@@
}
153 set _trace
[lsearch
-exact $argv --trace]
155 set argv
[lreplace
$argv $_trace $_trace]
161 # variable for the last merged branch (useful for a default when deleting
163 set _last_merged_branch
{}
166 global _shellpath env
167 if {[string match @@
* $_shellpath]} {
168 if {[info exists env
(SHELL
)]} {
187 return [eval [list
file join $_gitdir] $args]
190 proc gitexec
{args
} {
192 if {$_gitexec eq
{}} {
193 if {[catch
{set _gitexec
[git
--exec-path]} err
]} {
194 error
"Git not installed?\n\n$err"
197 set _gitexec
[exec cygpath \
202 set _gitexec
[file normalize
$_gitexec]
208 return [eval [list
file join $_gitexec] $args]
211 proc githtmldir
{args
} {
213 if {$_githtmldir eq
{}} {
214 if {[catch
{set _githtmldir
[git
--html-path]}]} {
215 # Git not installed or option not yet supported
219 set _githtmldir
[exec cygpath \
224 set _githtmldir
[file normalize
$_githtmldir]
230 return [eval [list
file join $_githtmldir] $args]
238 if {[tk windowingsystem
] eq
{aqua
}} {
245 if {$
::tcl_platform
(platform
) eq
{windows
}} {
253 if {$_iscygwin eq
{}} {
254 if {$
::tcl_platform
(platform
) eq
{windows
}} {
255 if {[catch
{set p
[exec cygpath
--windir]} err
]} {
267 proc is_enabled
{option
} {
268 global enabled_options
269 if {[catch
{set on
$enabled_options($option)}]} {return 0}
273 proc enable_option
{option
} {
274 global enabled_options
275 set enabled_options
($option) 1
278 proc disable_option
{option
} {
279 global enabled_options
280 set enabled_options
($option) 0
283 ######################################################################
287 proc is_many_config
{name
} {
288 switch
-glob -- $name {
298 proc is_config_true
{name
} {
300 if {[catch
{set v
$repo_config($name)}]} {
303 set v
[string tolower
$v]
304 if {$v eq
{} ||
$v eq
{true
} ||
$v eq
{1} ||
$v eq
{yes} ||
$v eq
{on
}} {
311 proc is_config_false
{name
} {
313 if {[catch
{set v
$repo_config($name)}]} {
316 set v
[string tolower
$v]
317 if {$v eq
{false
} ||
$v eq
{0} ||
$v eq
{no
} ||
$v eq
{off
}} {
324 proc get_config
{name
} {
326 if {[catch
{set v
$repo_config($name)}]} {
338 if {$_isbare eq
{}} {
340 set _bare
[git rev-parse
--is-bare-repository]
342 true
{ set _isbare
1 }
343 false
{ set _isbare
0}
347 if {[is_config_true core.bare
]
348 ||
($_gitworktree eq
{}
349 && [lindex
[file split $_gitdir] end
] ne
{.git
})} {
359 ######################################################################
363 proc _trace_exec
{cmd
} {
364 if {!$
::_trace
} return
370 if {[regexp
{[ \t\r\n'"$?*]} $v]} {
378 #'" fix poor old emacs font-lock mode
380 proc _git_cmd {name} {
383 if {[catch {set v $_git_cmd_path($name)}]} {
387 --exec-path { return [list $::_git $name] }
390 set p [gitexec git-$name$::_search_exe]
391 if {[file exists $p]} {
393 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
394 # Try to determine what sort of magic will make
395 # git-$name go and do its thing, because native
396 # Tcl on Windows doesn't know it.
398 set p [gitexec git-$name]
403 switch -glob -- [lindex $s 0] {
405 #!*perl { set i perl }
406 #!*python { set i python }
407 default { error "git-
$name is not supported
: $s" }
411 if {![info exists interp]} {
412 set interp [_which $i]
415 error "git-
$name requires
$i (not
in PATH
)"
417 set v [concat [list $interp] [lrange $s 1 end] [list $p]]
419 # Assume it is builtin to git somehow and we
420 # aren't actually able to see a file for it.
422 set v [list $::_git $name]
424 set _git_cmd_path($name) $v
429 proc _which {what args} {
430 global env _search_exe _search_path
432 if {$_search_path eq {}} {
433 if {[is_Cygwin] && [regexp {^(/|\.:)} $env(PATH)]} {
434 set _search_path [split [exec cygpath \
440 } elseif {[is_Windows]} {
441 set gitguidir [file dirname [info script]]
442 regsub -all ";" $gitguidir "\\;" gitguidir
443 set env(PATH) "$gitguidir;$env(PATH
)"
444 set _search_path [split $env(PATH) {;}]
447 set _search_path [split $env(PATH) :]
452 if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
455 set suffix $_search_exe
458 foreach p $_search_path {
459 set p [file join $p $what$suffix]
460 if {[file exists $p]} {
461 return [file normalize $p]
467 # Test a file for a hashbang to identify executable scripts on Windows.
468 proc is_shellscript {filename} {
469 if {![file exists $filename]} {return 0}
470 set f [open $filename r]
471 fconfigure $f -encoding binary
472 set magic [read $f 2]
474 return [expr {$magic eq "#!"}]
477 # Run a command connected via pipes on stdout.
478 # This is for use with textconv filters and uses sh -c "..." to allow it to
479 # contain a command with arguments. On windows we must check for shell
480 # scripts specifically otherwise just call the filter command.
481 proc open_cmd_pipe
{cmd path
} {
483 if {![file executable
[shellpath
]]} {
484 set exe
[auto_execok
[lindex
$cmd 0]]
485 if {[is_shellscript
[lindex
$exe 0]]} {
486 set run
[linsert
[auto_execok sh
] end
-c "$cmd \"\$0\"" $path]
488 set run
[concat
$exe [lrange
$cmd 1 end
] $path]
491 set run
[list
[shellpath
] -c "$cmd \"\$0\"" $path]
493 return [open |
$run r
]
496 proc _lappend_nice
{cmd_var
} {
500 if {![info exists _nice
]} {
501 set _nice
[_which nice
]
502 if {[catch
{exec $_nice git version
}]} {
504 } elseif
{[is_Windows
] && [file dirname $_nice] ne
[file dirname $
::_git
]} {
517 switch
-- [lindex
$args 0] {
528 set args
[lrange
$args 1 end
]
531 set cmdp
[_git_cmd
[lindex
$args 0]]
532 set args
[lrange
$args 1 end
]
534 _trace_exec
[concat
$opt $cmdp $args]
535 set result
[eval exec $opt $cmdp $args]
537 puts stderr
"< $result"
542 proc _open_stdout_stderr
{cmd
} {
545 set fd
[open
[concat
[list |
] $cmd] r
]
547 if { [lindex
$cmd end
] eq
{2>@
1}
548 && $err eq
{can not
find channel named
"1"}
550 # Older versions of Tcl 8.4 don't have this 2>@1 IO
551 # redirect operator. Fallback to |& cat for those.
552 # The command was not actually started, so its safe
553 # to try to start it a second time.
555 set fd
[open
[concat \
557 [lrange
$cmd 0 end-1
] \
564 fconfigure
$fd -eofchar {}
568 proc git_read
{args
} {
572 switch
-- [lindex
$args 0] {
587 set args
[lrange
$args 1 end
]
590 set cmdp
[_git_cmd
[lindex
$args 0]]
591 set args
[lrange
$args 1 end
]
593 return [_open_stdout_stderr
[concat
$opt $cmdp $args]]
596 proc git_write
{args
} {
600 switch
-- [lindex
$args 0] {
611 set args
[lrange
$args 1 end
]
614 set cmdp
[_git_cmd
[lindex
$args 0]]
615 set args
[lrange
$args 1 end
]
617 _trace_exec
[concat
$opt $cmdp $args]
618 return [open
[concat
[list |
] $opt $cmdp $args] w
]
621 proc githook_read
{hook_name args
} {
622 set pchook
[gitdir hooks
$hook_name]
625 # On Windows [file executable] might lie so we need to ask
626 # the shell if the hook is executable. Yes that's annoying.
630 if {![info exists interp
]} {
631 set interp
[_which sh
]
634 error
"hook execution requires sh (not in PATH)"
637 set scr
{if test -x "$1";then exec "$@";fi}
638 set sh_c
[list
$interp -c $scr $interp $pchook]
639 return [_open_stdout_stderr
[concat
$sh_c $args]]
642 if {[file executable
$pchook]} {
643 return [_open_stdout_stderr
[concat
[list
$pchook] $args]]
649 proc kill_file_process
{fd
} {
650 set process
[pid
$fd]
654 # Use a Cygwin-specific flag to allow killing
655 # native Windows processes
656 exec kill -f $process
663 proc gitattr
{path attr default
} {
664 if {[catch
{set r
[git check-attr
$attr -- $path]}]} {
667 set r
[join [lrange
[split $r :] 2 end
] :]
670 if {$r eq
{unspecified
}} {
677 regsub
-all ' $value "'\\''" value
681 proc load_current_branch {} {
682 global current_branch is_detached
684 set fd [open [gitdir HEAD] r]
685 if {[gets $fd ref] < 1} {
690 set pfx {ref: refs/heads/}
691 set len [string length $pfx]
692 if {[string equal -length $len $pfx $ref]} {
693 # We're on a branch. It might not exist. But
694 # HEAD looks good enough to be a branch.
696 set current_branch [string range $ref $len end]
699 # Assume this is a detached head.
701 set current_branch HEAD
706 auto_load tk_optionMenu
707 rename tk_optionMenu real__tkOptionMenu
708 proc tk_optionMenu {w varName args} {
709 set m [eval real__tkOptionMenu $w $varName $args]
710 $m configure -font font_ui
711 $w configure -font font_ui
715 proc rmsel_tag {text} {
717 -background [$text cget -background] \
718 -foreground [$text cget -foreground] \
720 $text tag conf in_sel -background lightgray
721 bind $text <Motion> break
727 bind . <Visibility> {
728 bind . <Visibility> {}
733 wm iconbitmap . -default $oguilib/git-gui.ico
734 set ::tk::AlwaysShowSelection 1
735 bind . <Control-F2> {console show}
737 # Spoof an X11 display for SSH
738 if {![info exists env(DISPLAY)]} {
739 set env(DISPLAY) :9999
743 image create photo gitlogo -width 16 -height 16
745 gitlogo put #33CC33 -to 7 0 9 2
746 gitlogo put #33CC33 -to 4 2 12 4
747 gitlogo put #33CC33 -to 7 4 9 6
748 gitlogo put #CC3333 -to 4 6 12 8
749 gitlogo put gray26 -to 4 9 6 10
750 gitlogo put gray26 -to 3 10 6 12
751 gitlogo put gray26 -to 8 9 13 11
752 gitlogo put gray26 -to 8 11 10 12
753 gitlogo put gray26 -to 11 11 13 14
754 gitlogo put gray26 -to 3 12 5 14
755 gitlogo put gray26 -to 5 13
756 gitlogo put gray26 -to 10 13
757 gitlogo put gray26 -to 4 14 12 15
758 gitlogo put gray26 -to 5 15 11 16
761 image create photo gitlogo32 -width 32 -height 32
762 gitlogo32 copy gitlogo -zoom 2 2
764 wm iconphoto . -default gitlogo gitlogo32
768 ######################################################################
774 if {[lsearch -exact [font names] TkDefaultFont] != -1} {
775 eval [linsert [font actual TkDefaultFont] 0 font configure font_ui]
776 eval [linsert [font actual TkFixedFont] 0 font create font_diff]
778 font create font_diff -family Courier -size 10
781 eval font configure font_ui [font actual [.dummy cget -font]]
786 font create font_uiitalic
787 font create font_uibold
788 font create font_diffbold
789 font create font_diffitalic
791 foreach class {Button Checkbutton Entry Label
792 Labelframe Listbox Message
793 Radiobutton Spinbox Text} {
794 option add *$class.font font_ui
797 option add *Menu.font font_ui
798 option add *Entry.borderWidth 1 startupFile
799 option add *Entry.relief sunken startupFile
800 option add *RadioButton.anchor w startupFile
804 if {[is_Windows] || [is_MacOSX]} {
805 option add *Menu.tearOff 0
816 proc bind_button3 {w cmd} {
817 bind $w <Any-Button-3> $cmd
819 # Mac OS X sends Button-2 on right click through three-button mouse,
820 # or through trackpad right-clicking (two-finger touch + click).
821 bind $w <Any-Button-2> $cmd
822 bind $w <Control-Button-1> $cmd
826 proc apply_config {} {
827 global repo_config font_descs
829 foreach option $font_descs {
830 set name [lindex $option 0]
831 set font [lindex $option 1]
834 foreach {cn cv} $repo_config(gui.$name) {
835 if {$cn eq {-weight}} {
838 font configure $font $cn $cv
841 font configure $font -weight normal
844 error_popup [strcat [mc "Invalid font specified
in %s
:" "gui.
$name"] "\n\n$err"]
846 foreach {cn cv} [font configure $font] {
847 font configure ${font}bold $cn $cv
848 font configure ${font}italic $cn $cv
850 font configure ${font}bold -weight bold
851 font configure ${font}italic -slant italic
857 if {$repo_config(gui.usettk)} {
858 set use_ttk [package vsatisfies [package provide Tk] 8.5]
861 bind [winfo class .] <<ThemeChanged>> [list InitTheme]
867 set default_config(branch.autosetupmerge) true
868 set default_config(merge.tool) {}
869 set default_config(mergetool.keepbackup) true
870 set default_config(merge.diffstat) true
871 set default_config(merge.summary) false
872 set default_config(merge.verbosity) 2
873 set default_config(user.name) {}
874 set default_config(user.email) {}
876 set default_config(gui.encoding) [encoding system]
877 set default_config(gui.matchtrackingbranch) false
878 set default_config(gui.textconv) true
879 set default_config(gui.pruneduringfetch) false
880 set default_config(gui.trustmtime) false
881 set default_config(gui.fastcopyblame) false
882 set default_config(gui.copyblamethreshold) 40
883 set default_config(gui.blamehistoryctx) 7
884 set default_config(gui.diffcontext) 5
885 set default_config(gui.diffopts) {}
886 set default_config(gui.commitmsgwidth) 75
887 set default_config(gui.newbranchtemplate) {}
888 set default_config(gui.spellingdictionary) {}
889 set default_config(gui.fontui) [font configure font_ui]
890 set default_config(gui.fontdiff) [font configure font_diff]
891 # TODO: this option should be added to the git-config documentation
892 set default_config(gui.maxfilesdisplayed) 5000
893 set default_config(gui.usettk) 1
894 set default_config(gui.warndetachedcommit) 1
896 {fontui font_ui {mc "Main Font
"}}
897 {fontdiff font_diff {mc "Diff
/Console Font
"}}
899 set default_config(gui.stageuntracked) ask
901 ######################################################################
905 set _git [_which git]
907 catch {wm withdraw .}
911 -title [mc "git-gui
: fatal error
"] \
912 -message [mc "Cannot
find git
in PATH.
"]
916 ######################################################################
920 if {[catch {set _git_version [git --version]} err]} {
921 catch {wm withdraw .}
925 -title [mc "git-gui
: fatal error
"] \
926 -message "Cannot determine Git version
:
930 [appname
] requires Git
1.5.0 or later.
"
933 if {![regsub {^git version } $_git_version {} _git_version]} {
934 catch {wm withdraw .}
938 -title [mc "git-gui
: fatal error
"] \
939 -message [strcat [mc "Cannot parse Git version string
:"] "\n\n$_git_version"]
943 proc get_trimmed_version {s} {
945 foreach x [split $s -._] {
946 if {[string is integer -strict $x]} {
954 set _real_git_version $_git_version
955 set _git_version [get_trimmed_version $_git_version]
957 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
958 catch {wm withdraw .}
963 -title "[appname
]: warning
" \
964 -message [mc "Git version cannot be determined.
966 %s claims it is version
'%s'.
968 %s requires
at least Git
1.5.0 or later.
970 Assume
'%s' is version
1.5.0?
971 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
972 set _git_version 1.5.0
977 unset _real_git_version
979 proc git-version {args} {
982 switch [llength $args] {
988 set op [lindex $args 0]
989 set vr [lindex $args 1]
990 set cm [package vcompare $_git_version $vr]
991 return [expr $cm $op 0]
995 set type [lindex $args 0]
996 set name [lindex $args 1]
997 set parm [lindex $args 2]
998 set body [lindex $args 3]
1000 if {($type ne {proc} && $type ne {method})} {
1001 error "Invalid arguments to git-version
"
1003 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
1004 error "Last arm of
$type $name must be default
"
1007 foreach {op vr cb} [lrange $body 0 end-2] {
1008 if {[git-version $op $vr]} {
1009 return [uplevel [list $type $name $parm $cb]]
1013 return [uplevel [list $type $name $parm [lindex $body end]]]
1017 error "git-version
>= x
"
1023 if {[git-version < 1.5]} {
1024 catch {wm withdraw .}
1028 -title [mc "git-gui
: fatal error
"] \
1029 -message "[appname
] requires Git
1.5.0 or later.
1031 You are using
[git-version
]:
1037 ######################################################################
1039 ## configure our library
1041 set idx [file join $oguilib tclIndex]
1042 if {[catch {set fd [open $idx r]} err]} {
1043 catch {wm withdraw .}
1047 -title [mc "git-gui
: fatal error
"] \
1051 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
1053 while {[gets $fd n] >= 0} {
1054 if {$n ne {} && ![string match #* $n]} {
1066 if {[lsearch -exact $loaded $p] >= 0} continue
1067 source [file join $oguilib $p]
1072 set auto_path [concat [list $oguilib] $auto_path]
1074 unset -nocomplain idx fd
1076 ######################################################################
1078 ## config file parsing
1080 git-version proc _parse_config {arr_name args} {
1087 [list git_read config] \
1089 [list --null --list]]
1090 fconfigure $fd_rc -translation binary
1091 set buf [read $fd_rc]
1094 foreach line [split $buf "\
0"] {
1095 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
1096 if {[is_many_config $name]} {
1097 lappend arr($name) $value
1099 set arr($name) $value
1101 } elseif {[regexp {^([^\n]+)$} $line line name]} {
1102 # no value given, but interpreting them as
1103 # boolean will be handled as true
1112 set fd_rc [eval [list git_read config --list] $args]
1113 while {[gets $fd_rc line] >= 0} {
1114 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
1115 if {[is_many_config $name]} {
1116 lappend arr($name) $value
1118 set arr($name) $value
1120 } elseif {[regexp {^([^=]+)$} $line line name]} {
1121 # no value given, but interpreting them as
1122 # boolean will be handled as true
1131 proc load_config {include_global} {
1132 global repo_config global_config system_config default_config
1134 if {$include_global} {
1135 _parse_config system_config --system
1136 _parse_config global_config --global
1138 _parse_config repo_config
1140 foreach name [array names default_config] {
1141 if {[catch {set v $system_config($name)}]} {
1142 set system_config($name) $default_config($name)
1145 foreach name [array names system_config] {
1146 if {[catch {set v $global_config($name)}]} {
1147 set global_config($name) $system_config($name)
1149 if {[catch {set v $repo_config($name)}]} {
1150 set repo_config($name) $system_config($name)
1155 ######################################################################
1157 ## feature option selection
1159 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
1164 if {$subcommand eq {gui.sh}} {
1167 if {$subcommand eq {gui} && [llength $argv] > 0} {
1168 set subcommand [lindex $argv 0]
1169 set argv [lrange $argv 1 end]
1172 enable_option multicommit
1173 enable_option branch
1174 enable_option transport
1177 switch -- $subcommand {
1182 disable_option multicommit
1183 disable_option branch
1184 disable_option transport
1187 enable_option singlecommit
1188 enable_option retcode
1190 disable_option multicommit
1191 disable_option branch
1192 disable_option transport
1194 while {[llength $argv] > 0} {
1195 set a [lindex $argv 0]
1198 enable_option initialamend
1201 enable_option nocommit
1202 enable_option nocommitmsg
1205 disable_option nocommitmsg
1212 set argv [lrange $argv 1 end]
1217 ######################################################################
1219 ## execution environment
1221 set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
1223 # Suggest our implementation of askpass, if none is set
1224 if {![info exists env(SSH_ASKPASS)]} {
1225 set env(SSH_ASKPASS) [gitexec git-gui--askpass]
1228 ######################################################################
1234 set _gitdir $env(GIT_DIR)
1238 # beware that from the .git dir this sets _gitdir to .
1239 # and _prefix to the empty string
1240 set _gitdir [git rev-parse --git-dir]
1241 set _prefix [git rev-parse --show-prefix]
1245 choose_repository::pick
1249 # we expand the _gitdir when it's just a single dot (i.e. when we're being
1250 # run from the .git dir itself) lest the routines to find the worktree
1252 if {$_gitdir eq ".
"} {
1256 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1257 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1259 if {![file isdirectory $_gitdir]} {
1260 catch {wm withdraw .}
1261 error_popup [strcat [mc "Git directory not found
:"] "\n\n$_gitdir"]
1264 # _gitdir exists, so try loading the config
1268 # v1.7.0 introduced --show-toplevel to return the canonical work-tree
1269 if {[package vsatisfies $_git_version 1.7.0]} {
1270 set _gitworktree [git rev-parse --show-toplevel]
1272 # try to set work tree from environment, core.worktree or use
1273 # cdup to obtain a relative path to the top of the worktree. If
1274 # run from the top, the ./ prefix ensures normalize expands pwd.
1275 if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {
1276 set _gitworktree [get_config core.worktree]
1277 if {$_gitworktree eq ""} {
1278 set _gitworktree [file normalize ./[git rev-parse --show-cdup]]
1283 if {$_prefix ne {}} {
1284 if {$_gitworktree eq {}} {
1285 regsub -all {[^/]+/} $_prefix ../ cdup
1287 set cdup $_gitworktree
1289 if {[catch {cd $cdup} err]} {
1290 catch {wm withdraw .}
1291 error_popup [strcat [mc "Cannot move to top of working directory
:"] "\n\n$err"]
1294 set _gitworktree [pwd]
1296 } elseif {![is_enabled bare]} {
1298 catch {wm withdraw .}
1299 error_popup [strcat [mc "Cannot use bare repository
:"] "\n\n$_gitdir"]
1302 if {$_gitworktree eq {}} {
1303 set _gitworktree [file dirname $_gitdir]
1305 if {[catch {cd $_gitworktree} err]} {
1306 catch {wm withdraw .}
1307 error_popup [strcat [mc "No working directory
"] " $_gitworktree:\n\n$err"]
1310 set _gitworktree [pwd]
1312 set _reponame [file split [file normalize $_gitdir]]
1313 if {[lindex $_reponame end] eq {.git}} {
1314 set _reponame [lindex $_reponame end-1]
1316 set _reponame [lindex $_reponame end]
1319 set env(GIT_DIR) $_gitdir
1320 set env(GIT_WORK_TREE) $_gitworktree
1322 ######################################################################
1326 set current_diff_path {}
1327 set current_diff_side {}
1328 set diff_actions [list]
1332 set MERGE_HEAD [list]
1335 set current_branch {}
1337 set current_diff_path {}
1339 set is_submodule_diff 0
1340 set is_conflict_diff 0
1341 set selected_commit_type new
1342 set diff_empty_count 0
1344 set nullid "0000000000000000000000000000000000000000"
1345 set nullid2 "0000000000000000000000000000000000000001"
1347 ######################################################################
1355 set disable_on_lock [list]
1356 set index_lock_type none
1358 proc lock_index {type} {
1359 global index_lock_type disable_on_lock
1361 if {$index_lock_type eq {none}} {
1362 set index_lock_type $type
1363 foreach w $disable_on_lock {
1364 uplevel #0 $w disabled
1367 } elseif {$index_lock_type eq "begin-
$type"} {
1368 set index_lock_type $type
1374 proc unlock_index {} {
1375 global index_lock_type disable_on_lock
1377 set index_lock_type none
1378 foreach w $disable_on_lock {
1379 uplevel #0 $w normal
1383 ######################################################################
1387 proc repository_state {ctvar hdvar mhvar} {
1388 global current_branch
1389 upvar $ctvar ct $hdvar hd $mhvar mh
1394 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1400 set merge_head [gitdir MERGE_HEAD]
1401 if {[file exists $merge_head]} {
1403 set fd_mh [open $merge_head r]
1404 while {[gets $fd_mh line] >= 0} {
1415 global PARENT empty_tree
1417 set p [lindex $PARENT 0]
1421 if {$empty_tree eq {}} {
1422 set empty_tree [git mktree << {}]
1427 proc force_amend {} {
1428 global selected_commit_type
1429 global HEAD PARENT MERGE_HEAD commit_type
1431 repository_state newType newHEAD newMERGE_HEAD
1434 set MERGE_HEAD $newMERGE_HEAD
1435 set commit_type $newType
1437 set selected_commit_type amend
1438 do_select_commit_type
1441 proc rescan {after {honor_trustmtime 1}} {
1442 global HEAD PARENT MERGE_HEAD commit_type
1443 global ui_index ui_workdir ui_comm
1444 global rescan_active file_states
1447 if {$rescan_active > 0 || ![lock_index read]} return
1449 repository_state newType newHEAD newMERGE_HEAD
1450 if {[string match amend* $commit_type]
1451 && $newType eq {normal}
1452 && $newHEAD eq $HEAD} {
1456 set MERGE_HEAD $newMERGE_HEAD
1457 set commit_type $newType
1460 array unset file_states
1462 if {!$::GITGUI_BCK_exists &&
1463 (![$ui_comm edit modified]
1464 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1465 if {[string match amend* $commit_type]} {
1466 } elseif {[load_message GITGUI_MSG]} {
1467 } elseif {[run_prepare_commit_msg_hook]} {
1468 } elseif {[load_message MERGE_MSG]} {
1469 } elseif {[load_message SQUASH_MSG]} {
1472 $ui_comm edit modified false
1475 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1476 rescan_stage2 {} $after
1479 ui_status [mc "Refreshing
file status...
"]
1480 set fd_rf [git_read update-index \
1486 fconfigure $fd_rf -blocking 0 -translation binary
1487 fileevent $fd_rf readable \
1488 [list rescan_stage2 $fd_rf $after]
1493 set is_git_info_exclude {}
1494 proc have_info_exclude {} {
1495 global is_git_info_exclude
1497 if {$is_git_info_exclude eq {}} {
1498 if {[catch {exec test -f [gitdir info exclude]}]} {
1499 set is_git_info_exclude 0
1501 set is_git_info_exclude 1
1504 return $is_git_info_exclude
1507 proc have_info_exclude {} {
1508 return [file readable [gitdir info exclude]]
1512 proc rescan_stage2 {fd after} {
1513 global rescan_active buf_rdi buf_rdf buf_rlo
1517 if {![eof $fd]} return
1521 if {[package vsatisfies $::_git_version 1.6.3]} {
1522 set ls_others [list --exclude-standard]
1524 set ls_others [list --exclude-per-directory=.gitignore]
1525 if {[have_info_exclude]} {
1526 lappend ls_others "--exclude-from=[gitdir info exclude
]"
1528 set user_exclude [get_config core.excludesfile]
1529 if {$user_exclude ne {} && [file readable $user_exclude]} {
1530 lappend ls_others "--exclude-from=[file normalize
$user_exclude]"
1539 ui_status [mc "Scanning
for modified files ...
"]
1540 set fd_di [git_read diff-index --cached -z [PARENT]]
1541 set fd_df [git_read diff-files -z]
1542 set fd_lo [eval git_read ls-files --others -z $ls_others]
1544 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1545 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1546 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1547 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1548 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1549 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1552 proc load_message {file} {
1555 set f [gitdir $file]
1556 if {[file isfile $f]} {
1557 if {[catch {set fd [open $f r]}]} {
1560 fconfigure $fd -eofchar {}
1561 set content [string trim [read $fd]]
1563 regsub -all -line {[ \r\t]+$} $content {} content
1564 $ui_comm delete 0.0 end
1565 $ui_comm insert end $content
1571 proc run_prepare_commit_msg_hook {} {
1574 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1575 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1576 # empty file but existent file.
1578 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1580 if {[file isfile [gitdir MERGE_MSG]]} {
1581 set pcm_source "merge
"
1582 set fd_mm [open [gitdir MERGE_MSG] r]
1583 puts -nonewline $fd_pcm [read $fd_mm]
1585 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1586 set pcm_source "squash
"
1587 set fd_sm [open [gitdir SQUASH_MSG] r]
1588 puts -nonewline $fd_pcm [read $fd_sm]
1596 set fd_ph [githook_read prepare-commit-msg \
1597 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1599 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1603 ui_status [mc "Calling prepare-commit-msg hook...
"]
1606 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1607 fileevent $fd_ph readable \
1608 [list prepare_commit_msg_hook_wait $fd_ph]
1613 proc prepare_commit_msg_hook_wait {fd_ph} {
1616 append pch_error [read $fd_ph]
1617 fconfigure $fd_ph -blocking 1
1619 if {[catch {close $fd_ph}]} {
1620 ui_status [mc "Commit declined by prepare-commit-msg hook.
"]
1621 hook_failed_popup prepare-commit-msg $pch_error
1622 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1625 load_message PREPARE_COMMIT_MSG
1628 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1631 fconfigure $fd_ph -blocking 0
1632 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1635 proc read_diff_index {fd after} {
1638 append buf_rdi [read $fd]
1640 set n [string length $buf_rdi]
1642 set z1 [string first "\
0" $buf_rdi $c]
1643 if {$z1 == -1} break
1645 set z2 [string first "\
0" $buf_rdi $z1]
1646 if {$z2 == -1} break
1649 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1650 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1652 [encoding convertfrom $p] \
1654 [list [lindex $i 0] [lindex $i 2]] \
1660 set buf_rdi [string range $buf_rdi $c end]
1665 rescan_done $fd buf_rdi $after
1668 proc read_diff_files {fd after} {
1671 append buf_rdf [read $fd]
1673 set n [string length $buf_rdf]
1675 set z1 [string first "\
0" $buf_rdf $c]
1676 if {$z1 == -1} break
1678 set z2 [string first "\
0" $buf_rdf $z1]
1679 if {$z2 == -1} break
1682 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1683 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1685 [encoding convertfrom $p] \
1688 [list [lindex $i 0] [lindex $i 2]]
1693 set buf_rdf [string range $buf_rdf $c end]
1698 rescan_done $fd buf_rdf $after
1701 proc read_ls_others {fd after} {
1704 append buf_rlo [read $fd]
1705 set pck [split $buf_rlo "\
0"]
1706 set buf_rlo [lindex $pck end]
1707 foreach p [lrange $pck 0 end-1] {
1708 set p [encoding convertfrom $p]
1709 if {[string index $p end] eq {/}} {
1710 set p [string range $p 0 end-1]
1714 rescan_done $fd buf_rlo $after
1717 proc rescan_done {fd buf after} {
1718 global rescan_active current_diff_path
1719 global file_states repo_config
1722 if {![eof $fd]} return
1725 if {[incr rescan_active -1] > 0} return
1730 if {$current_diff_path ne {}} { reshow_diff $after }
1731 if {$current_diff_path eq {}} { select_first_diff $after }
1734 proc prune_selection {} {
1735 global file_states selected_paths
1737 foreach path [array names selected_paths] {
1738 if {[catch {set still_here $file_states($path)}]} {
1739 unset selected_paths($path)
1744 ######################################################################
1748 proc mapicon {w state path} {
1751 if {[catch {set r $all_icons($state$w)}]} {
1752 puts "error
: no icon
for $w state
={$state} $path"
1758 proc mapdesc {state path} {
1761 if {[catch {set r $all_descs($state)}]} {
1762 puts "error
: no desc
for state
={$state} $path"
1768 proc ui_status {msg} {
1770 if {[info exists main_status]} {
1771 $main_status show $msg
1775 proc ui_ready {{test {}}} {
1777 if {[info exists main_status]} {
1778 $main_status show [mc "Ready.
"] $test
1782 proc escape_path {path} {
1783 regsub -all {\\} $path "\\\\" path
1784 regsub -all "\n" $path "\\n
" path
1788 proc short_path {path} {
1789 return [escape_path [lindex [file split $path] end]]
1793 set null_sha1 [string repeat 0 40]
1795 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1796 global file_states next_icon_id null_sha1
1798 set s0 [string index $new_state 0]
1799 set s1 [string index $new_state 1]
1801 if {[catch {set info $file_states($path)}]} {
1803 set icon n[incr next_icon_id]
1805 set state [lindex $info 0]
1806 set icon [lindex $info 1]
1807 if {$head_info eq {}} {set head_info [lindex $info 2]}
1808 if {$index_info eq {}} {set index_info [lindex $info 3]}
1811 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1812 elseif {$s0 eq {_}} {set s0 _}
1814 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1815 elseif {$s1 eq {_}} {set s1 _}
1817 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1818 set head_info [list 0 $null_sha1]
1819 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1820 && $head_info eq {}} {
1821 set head_info $index_info
1822 } elseif {$s0 eq {_} && [string index $state 0] ne {_}} {
1823 set index_info $head_info
1827 set file_states($path) [list $s0$s1 $icon \
1828 $head_info $index_info \
1833 proc display_file_helper {w path icon_name old_m new_m} {
1836 if {$new_m eq {_}} {
1837 set lno [lsearch -sorted -exact $file_lists($w) $path]
1839 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1841 $w conf -state normal
1842 $w delete $lno.0 [expr {$lno + 1}].0
1843 $w conf -state disabled
1845 } elseif {$old_m eq {_} && $new_m ne {_}} {
1846 lappend file_lists($w) $path
1847 set file_lists($w) [lsort -unique $file_lists($w)]
1848 set lno [lsearch -sorted -exact $file_lists($w) $path]
1850 $w conf -state normal
1851 $w image create $lno.0 \
1852 -align center -padx 5 -pady 1 \
1854 -image [mapicon $w $new_m $path]
1855 $w insert $lno.1 "[escape_path
$path]\n"
1856 $w conf -state disabled
1857 } elseif {$old_m ne $new_m} {
1858 $w conf -state normal
1859 $w image conf $icon_name -image [mapicon $w $new_m $path]
1860 $w conf -state disabled
1864 proc display_file {path state} {
1865 global file_states selected_paths
1866 global ui_index ui_workdir
1868 set old_m [merge_state $path $state]
1869 set s $file_states($path)
1870 set new_m [lindex $s 0]
1871 set icon_name [lindex $s 1]
1873 set o [string index $old_m 0]
1874 set n [string index $new_m 0]
1881 display_file_helper $ui_index $path $icon_name $o $n
1883 if {[string index $old_m 0] eq {U}} {
1886 set o [string index $old_m 1]
1888 if {[string index $new_m 0] eq {U}} {
1891 set n [string index $new_m 1]
1893 display_file_helper $ui_workdir $path $icon_name $o $n
1895 if {$new_m eq {__}} {
1896 unset file_states($path)
1897 catch {unset selected_paths($path)}
1901 proc display_all_files_helper {w path icon_name m} {
1904 lappend file_lists($w) $path
1905 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1906 $w image create end \
1907 -align center -padx 5 -pady 1 \
1909 -image [mapicon $w $m $path]
1910 $w insert end "[escape_path
$path]\n"
1914 proc display_all_files {} {
1915 global ui_index ui_workdir
1916 global file_states file_lists
1918 global files_warning
1920 $ui_index conf -state normal
1921 $ui_workdir conf -state normal
1923 $ui_index delete 0.0 end
1924 $ui_workdir delete 0.0 end
1927 set file_lists($ui_index) [list]
1928 set file_lists($ui_workdir) [list]
1930 set to_display [lsort [array names file_states]]
1931 set display_limit [get_config gui.maxfilesdisplayed]
1932 if {[llength $to_display] > $display_limit} {
1933 if {!$files_warning} {
1934 # do not repeatedly warn:
1936 info_popup [mc "Displaying only
%s of
%s files.
" \
1937 $display_limit [llength $to_display]]
1939 set to_display [lrange $to_display 0 [expr {$display_limit-1}]]
1941 foreach path $to_display {
1942 set s $file_states($path)
1944 set icon_name [lindex $s 1]
1946 set s [string index $m 0]
1947 if {$s ne {U} && $s ne {_}} {
1948 display_all_files_helper $ui_index $path \
1952 if {[string index $m 0] eq {U}} {
1955 set s [string index $m 1]
1958 display_all_files_helper $ui_workdir $path \
1963 $ui_index conf -state disabled
1964 $ui_workdir conf -state disabled
1967 ######################################################################
1972 #define mask_width 14
1973 #define mask_height 15
1974 static unsigned char mask_bits[] = {
1975 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1976 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1977 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1980 image create bitmap file_plain -background white -foreground black -data {
1981 #define plain_width 14
1982 #define plain_height 15
1983 static unsigned char plain_bits[] = {
1984 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1985 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1986 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1987 } -maskdata $filemask
1989 image create bitmap file_mod -background white -foreground blue -data {
1990 #define mod_width 14
1991 #define mod_height 15
1992 static unsigned char mod_bits[] = {
1993 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1994 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1995 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1996 } -maskdata $filemask
1998 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1999 #define file_fulltick_width 14
2000 #define file_fulltick_height 15
2001 static unsigned char file_fulltick_bits
[] = {
2002 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2003 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2004 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2005 } -maskdata $filemask
2007 image create bitmap file_question
-background white
-foreground black
-data {
2008 #define file_question_width 14
2009 #define file_question_height 15
2010 static unsigned char file_question_bits
[] = {
2011 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2012 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2013 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2014 } -maskdata $filemask
2016 image create bitmap file_removed
-background white
-foreground red
-data {
2017 #define file_removed_width 14
2018 #define file_removed_height 15
2019 static unsigned char file_removed_bits
[] = {
2020 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2021 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2022 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2023 } -maskdata $filemask
2025 image create bitmap file_merge
-background white
-foreground blue
-data {
2026 #define file_merge_width 14
2027 #define file_merge_height 15
2028 static unsigned char file_merge_bits
[] = {
2029 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2030 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2031 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2032 } -maskdata $filemask
2034 image create bitmap file_statechange
-background white
-foreground green
-data {
2035 #define file_statechange_width 14
2036 #define file_statechange_height 15
2037 static unsigned char file_statechange_bits
[] = {
2038 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
2039 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
2040 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2041 } -maskdata $filemask
2043 set ui_index .vpane.files.index.list
2044 set ui_workdir .vpane.files.workdir.list
2046 set all_icons
(_
$ui_index) file_plain
2047 set all_icons
(A
$ui_index) file_plain
2048 set all_icons
(M
$ui_index) file_fulltick
2049 set all_icons
(D
$ui_index) file_removed
2050 set all_icons
(U
$ui_index) file_merge
2051 set all_icons
(T
$ui_index) file_statechange
2053 set all_icons
(_
$ui_workdir) file_plain
2054 set all_icons
(M
$ui_workdir) file_mod
2055 set all_icons
(D
$ui_workdir) file_question
2056 set all_icons
(U
$ui_workdir) file_merge
2057 set all_icons
(O
$ui_workdir) file_plain
2058 set all_icons
(T
$ui_workdir) file_statechange
2060 set max_status_desc
0
2062 {__
{mc
"Unmodified"}}
2064 {_M
{mc
"Modified, not staged"}}
2065 {M_
{mc
"Staged for commit"}}
2066 {MM
{mc
"Portions staged for commit"}}
2067 {MD
{mc
"Staged for commit, missing"}}
2069 {_T
{mc
"File type changed, not staged"}}
2070 {MT
{mc
"File type changed, old type staged for commit"}}
2071 {AT
{mc
"File type changed, old type staged for commit"}}
2072 {T_
{mc
"File type changed, staged"}}
2073 {TM
{mc
"File type change staged, modification not staged"}}
2074 {TD
{mc
"File type change staged, file missing"}}
2076 {_O
{mc
"Untracked, not staged"}}
2077 {A_
{mc
"Staged for commit"}}
2078 {AM
{mc
"Portions staged for commit"}}
2079 {AD
{mc
"Staged for commit, missing"}}
2082 {D_
{mc
"Staged for removal"}}
2083 {DO
{mc
"Staged for removal, still present"}}
2085 {_U
{mc
"Requires merge resolution"}}
2086 {U_
{mc
"Requires merge resolution"}}
2087 {UU
{mc
"Requires merge resolution"}}
2088 {UM
{mc
"Requires merge resolution"}}
2089 {UD
{mc
"Requires merge resolution"}}
2090 {UT
{mc
"Requires merge resolution"}}
2092 set text
[eval [lindex
$i 1]]
2093 if {$max_status_desc < [string length
$text]} {
2094 set max_status_desc
[string length
$text]
2096 set all_descs
([lindex
$i 0]) $text
2100 ######################################################################
2104 proc scrollbar2many
{list mode args
} {
2105 foreach w
$list {eval $w $mode $args}
2108 proc many2scrollbar
{list mode sb top bottom
} {
2109 $sb set $top $bottom
2110 foreach w
$list {$w $mode moveto
$top}
2113 proc incr_font_size
{font
{amt
1}} {
2114 set sz
[font configure
$font -size]
2116 font configure
$font -size $sz
2117 font configure
${font}bold
-size $sz
2118 font configure
${font}italic
-size $sz
2121 ######################################################################
2125 set starting_gitk_msg
[mc
"Starting gitk... please wait..."]
2127 proc do_gitk
{revs
{is_submodule false
}} {
2128 global current_diff_path file_states current_diff_side ui_index
2129 global _gitdir _gitworktree
2131 # -- Always start gitk through whatever we were loaded with. This
2132 # lets us bypass using shell process on Windows systems.
2134 set exe
[_which gitk
-script]
2135 set cmd
[list
[info nameofexecutable
] $exe]
2137 error_popup
[mc
"Couldn't find gitk in PATH"]
2143 if {!$is_submodule} {
2148 cd $current_diff_path
2149 if {$revs eq
{--}} {
2150 set s
$file_states($current_diff_path)
2153 switch
-glob -- [lindex
$s 0] {
2154 M_
{ set old_sha1
[lindex
[lindex
$s 2] 1] }
2155 _M
{ set old_sha1
[lindex
[lindex
$s 3] 1] }
2157 if {$current_diff_side eq
$ui_index} {
2158 set old_sha1
[lindex
[lindex
$s 2] 1]
2159 set new_sha1
[lindex
[lindex
$s 3] 1]
2161 set old_sha1
[lindex
[lindex
$s 3] 1]
2165 set revs
$old_sha1...
$new_sha1
2167 # GIT_DIR and GIT_WORK_TREE for the submodule are not the ones
2168 # we've been using for the main repository, so unset them.
2169 # TODO we could make life easier (start up faster?) for gitk
2170 # by setting these to the appropriate values to allow gitk
2171 # to skip the heuristics to find their proper value
2173 unset env
(GIT_WORK_TREE
)
2175 eval exec $cmd $revs "--" "--" &
2177 set env
(GIT_DIR
) $_gitdir
2178 set env
(GIT_WORK_TREE
) $_gitworktree
2181 ui_status $
::starting_gitk_msg
2183 ui_ready
$starting_gitk_msg
2188 proc do_git_gui
{} {
2189 global current_diff_path
2191 # -- Always start git gui through whatever we were loaded with. This
2192 # lets us bypass using shell process on Windows systems.
2194 set exe
[list
[_which git
]]
2196 error_popup
[mc
"Couldn't find git gui in PATH"]
2199 global _gitdir _gitworktree
2201 # see note in do_gitk about unsetting these vars when
2202 # running tools in a submodule
2204 unset env
(GIT_WORK_TREE
)
2207 cd $current_diff_path
2209 eval exec $exe gui
&
2211 set env
(GIT_DIR
) $_gitdir
2212 set env
(GIT_WORK_TREE
) $_gitworktree
2215 ui_status $
::starting_gitk_msg
2217 ui_ready
$starting_gitk_msg
2222 proc do_explore
{} {
2225 if {[is_Cygwin
] ||
[is_Windows
]} {
2226 set explorer
"explorer.exe"
2227 } elseif
{[is_MacOSX
]} {
2230 # freedesktop.org-conforming system is our best shot
2231 set explorer
"xdg-open"
2233 eval exec $explorer [list
[file nativename
$_gitworktree]] &
2239 proc terminate_me
{win
} {
2241 if {$win ne
{.
}} return
2245 proc do_quit
{{rc
{1}}} {
2246 global ui_comm is_quitting repo_config commit_type
2247 global GITGUI_BCK_exists GITGUI_BCK_i
2248 global ui_comm_spell
2249 global ret_code use_ttk
2251 if {$is_quitting} return
2254 if {[winfo exists
$ui_comm]} {
2255 # -- Stash our current commit buffer.
2257 set save
[gitdir GITGUI_MSG
]
2258 if {$GITGUI_BCK_exists && ![$ui_comm edit modified
]} {
2259 file rename
-force [gitdir GITGUI_BCK
] $save
2260 set GITGUI_BCK_exists
0
2262 set msg
[string trim
[$ui_comm get
0.0 end
]]
2263 regsub
-all -line {[ \r\t]+$
} $msg {} msg
2264 if {(![string match amend
* $commit_type]
2265 ||
[$ui_comm edit modified
])
2268 set fd
[open
$save w
]
2269 puts
-nonewline $fd $msg
2273 catch
{file delete
$save}
2277 # -- Cancel our spellchecker if its running.
2279 if {[info exists ui_comm_spell
]} {
2283 # -- Remove our editor backup, its not needed.
2285 after cancel
$GITGUI_BCK_i
2286 if {$GITGUI_BCK_exists} {
2287 catch
{file delete
[gitdir GITGUI_BCK
]}
2290 # -- Stash our current window geometry into this repository.
2292 set cfg_wmstate
[wm state .
]
2293 if {[catch
{set rc_wmstate
$repo_config(gui.wmstate
)}]} {
2296 if {$cfg_wmstate ne
$rc_wmstate} {
2297 catch
{git config gui.wmstate
$cfg_wmstate}
2299 if {$cfg_wmstate eq
{zoomed
}} {
2300 # on Windows wm geometry will lie about window
2301 # position (but not size) when window is zoomed
2302 # restore the window before querying wm geometry
2305 set cfg_geometry
[list
]
2306 lappend cfg_geometry
[wm geometry .
]
2308 lappend cfg_geometry
[.vpane sashpos
0]
2309 lappend cfg_geometry
[.vpane.files sashpos
0]
2311 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 0]
2312 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 1]
2314 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
2317 if {$cfg_geometry ne
$rc_geometry} {
2318 catch
{git config gui.geometry
$cfg_geometry}
2324 # Briefly enable send again, working around Tk bug
2325 # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
2326 tk appname
[appname
]
2335 proc ui_do_rescan
{} {
2336 rescan
{force_first_diff ui_ready
}
2343 proc next_diff
{{after
{}}} {
2344 global next_diff_p next_diff_w next_diff_i
2345 show_diff
$next_diff_p $next_diff_w {} {} $after
2348 proc find_anchor_pos
{lst name
} {
2349 set lid
[lsearch
-sorted -exact $lst $name]
2353 foreach lname
$lst {
2354 if {$lname >= $name} break
2362 proc find_file_from
{flist idx delta path mmask
} {
2365 set len
[llength
$flist]
2366 while {$idx >= 0 && $idx < $len} {
2367 set name
[lindex
$flist $idx]
2369 if {$name ne
$path && [info exists file_states
($name)]} {
2370 set state
[lindex
$file_states($name) 0]
2372 if {$mmask eq
{} ||
[regexp
$mmask $state]} {
2383 proc find_next_diff
{w path
{lno
{}} {mmask
{}}} {
2384 global next_diff_p next_diff_w next_diff_i
2385 global file_lists ui_index ui_workdir
2387 set flist
$file_lists($w)
2389 set lno
[find_anchor_pos
$flist $path]
2394 if {$mmask ne
{} && ![regexp
{(^\^
)|
(\$$
)} $mmask]} {
2395 if {$w eq
$ui_index} {
2398 set mmask
"$mmask\$"
2402 set idx
[find_file_from
$flist $lno 1 $path $mmask]
2405 set idx
[find_file_from
$flist $lno -1 $path $mmask]
2410 set next_diff_p
[lindex
$flist $idx]
2411 set next_diff_i
[expr {$idx+1}]
2418 proc next_diff_after_action
{w path
{lno
{}} {mmask
{}}} {
2419 global current_diff_path
2421 if {$path ne
$current_diff_path} {
2423 } elseif
{[find_next_diff
$w $path $lno $mmask]} {
2426 return {reshow_diff
;}
2430 proc select_first_diff
{after
} {
2433 if {[find_next_diff
$ui_workdir {} 1 {^_?U
}] ||
2434 [find_next_diff
$ui_workdir {} 1 {[^O
]$
}]} {
2441 proc force_first_diff
{after
} {
2442 global ui_workdir current_diff_path file_states
2444 if {[info exists file_states
($current_diff_path)]} {
2445 set state
[lindex
$file_states($current_diff_path) 0]
2451 if {[string first
{U
} $state] >= 0} {
2452 # Already a conflict, do nothing
2453 } elseif
{[find_next_diff
$ui_workdir $current_diff_path {} {^_?U
}]} {
2455 } elseif
{[string index
$state 1] ne
{O
}} {
2456 # Already a diff & no conflicts, do nothing
2457 } elseif
{[find_next_diff
$ui_workdir $current_diff_path {} {[^O
]$
}]} {
2468 proc toggle_or_diff
{w x y
} {
2469 global file_states file_lists current_diff_path ui_index ui_workdir
2470 global last_clicked selected_paths
2472 set pos
[split [$w index @
$x,$y] .
]
2473 set lno
[lindex
$pos 0]
2474 set col [lindex
$pos 1]
2475 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2481 set last_clicked
[list
$w $lno]
2482 array
unset selected_paths
2483 $ui_index tag remove in_sel
0.0 end
2484 $ui_workdir tag remove in_sel
0.0 end
2486 # Determine the state of the file
2487 if {[info exists file_states
($path)]} {
2488 set state
[lindex
$file_states($path) 0]
2493 # Restage the file, or simply show the diff
2494 if {$col == 0 && $y > 1} {
2495 # Conflicts need special handling
2496 if {[string first
{U
} $state] >= 0} {
2497 # $w must always be $ui_workdir, but...
2498 if {$w ne
$ui_workdir} { set lno
{} }
2499 merge_stage_workdir
$path $lno
2503 if {[string index
$state 1] eq
{O
}} {
2509 set after
[next_diff_after_action
$w $path $lno $mmask]
2511 if {$w eq
$ui_index} {
2513 "Unstaging [short_path $path] from commit" \
2515 [concat
$after [list ui_ready
]]
2516 } elseif
{$w eq
$ui_workdir} {
2518 "Adding [short_path $path]" \
2520 [concat
$after [list ui_ready
]]
2523 set selected_paths
($path) 1
2524 show_diff
$path $w $lno
2528 proc add_one_to_selection
{w x y
} {
2529 global file_lists last_clicked selected_paths
2531 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2532 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2538 if {$last_clicked ne
{}
2539 && [lindex
$last_clicked 0] ne
$w} {
2540 array
unset selected_paths
2541 [lindex
$last_clicked 0] tag remove in_sel
0.0 end
2544 set last_clicked
[list
$w $lno]
2545 if {[catch
{set in_sel
$selected_paths($path)}]} {
2549 unset selected_paths
($path)
2550 $w tag remove in_sel
$lno.0 [expr {$lno + 1}].0
2552 set selected_paths
($path) 1
2553 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
2557 proc add_range_to_selection
{w x y
} {
2558 global file_lists last_clicked selected_paths
2560 if {[lindex
$last_clicked 0] ne
$w} {
2561 toggle_or_diff
$w $x $y
2565 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2566 set lc
[lindex
$last_clicked 1]
2575 foreach path
[lrange
$file_lists($w) \
2576 [expr {$begin - 1}] \
2577 [expr {$end - 1}]] {
2578 set selected_paths
($path) 1
2580 $w tag add in_sel
$begin.0 [expr {$end + 1}].0
2583 proc show_more_context
{} {
2585 if {$repo_config(gui.diffcontext
) < 99} {
2586 incr repo_config
(gui.diffcontext
)
2591 proc show_less_context
{} {
2593 if {$repo_config(gui.diffcontext
) > 1} {
2594 incr repo_config
(gui.diffcontext
) -1
2599 ######################################################################
2607 menu .mbar
-tearoff 0
2609 # -- Apple Menu (Mac OS X only)
2611 .mbar add cascade
-label Apple
-menu .mbar.apple
2614 .mbar add cascade
-label [mc Repository
] -menu .mbar.repository
2615 .mbar add cascade
-label [mc Edit
] -menu .mbar.edit
2616 if {[is_enabled branch
]} {
2617 .mbar add cascade
-label [mc Branch
] -menu .mbar.branch
2619 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2620 .mbar add cascade
-label [mc Commit@@noun
] -menu .mbar.commit
2622 if {[is_enabled transport
]} {
2623 .mbar add cascade
-label [mc Merge
] -menu .mbar.merge
2624 .mbar add cascade
-label [mc Remote
] -menu .mbar.remote
2626 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2627 .mbar add cascade
-label [mc Tools
] -menu .mbar.tools
2630 # -- Repository Menu
2632 menu .mbar.repository
2635 .mbar.repository add
command \
2636 -label [mc
"Explore Working Copy"] \
2637 -command {do_explore
}
2638 .mbar.repository add separator
2641 .mbar.repository add
command \
2642 -label [mc
"Browse Current Branch's Files"] \
2643 -command {browser
::new
$current_branch}
2644 set ui_browse_current
[.mbar.repository index last
]
2645 .mbar.repository add
command \
2646 -label [mc
"Browse Branch Files..."] \
2647 -command browser_open
::dialog
2648 .mbar.repository add separator
2650 .mbar.repository add
command \
2651 -label [mc
"Visualize Current Branch's History"] \
2652 -command {do_gitk
$current_branch}
2653 set ui_visualize_current
[.mbar.repository index last
]
2654 .mbar.repository add
command \
2655 -label [mc
"Visualize All Branch History"] \
2656 -command {do_gitk
--all}
2657 .mbar.repository add separator
2659 proc current_branch_write
{args
} {
2660 global current_branch
2661 .mbar.repository entryconf $
::ui_browse_current \
2662 -label [mc
"Browse %s's Files" $current_branch]
2663 .mbar.repository entryconf $
::ui_visualize_current \
2664 -label [mc
"Visualize %s's History" $current_branch]
2666 trace add variable current_branch
write current_branch_write
2668 if {[is_enabled multicommit
]} {
2669 .mbar.repository add
command -label [mc
"Database Statistics"] \
2672 .mbar.repository add
command -label [mc
"Compress Database"] \
2675 .mbar.repository add
command -label [mc
"Verify Database"] \
2676 -command do_fsck_objects
2678 .mbar.repository add separator
2681 .mbar.repository add
command \
2682 -label [mc
"Create Desktop Icon"] \
2683 -command do_cygwin_shortcut
2684 } elseif
{[is_Windows
]} {
2685 .mbar.repository add
command \
2686 -label [mc
"Create Desktop Icon"] \
2687 -command do_windows_shortcut
2688 } elseif
{[is_MacOSX
]} {
2689 .mbar.repository add
command \
2690 -label [mc
"Create Desktop Icon"] \
2691 -command do_macosx_app
2696 proc
::tk
::mac
::Quit
{args
} { do_quit
}
2698 .mbar.repository add
command -label [mc Quit
] \
2706 .mbar.edit add
command -label [mc Undo
] \
2707 -command {catch
{[focus
] edit undo
}} \
2709 .mbar.edit add
command -label [mc Redo
] \
2710 -command {catch
{[focus
] edit redo
}} \
2712 .mbar.edit add separator
2713 .mbar.edit add
command -label [mc Cut
] \
2714 -command {catch
{tk_textCut
[focus
]}} \
2716 .mbar.edit add
command -label [mc Copy
] \
2717 -command {catch
{tk_textCopy
[focus
]}} \
2719 .mbar.edit add
command -label [mc Paste
] \
2720 -command {catch
{tk_textPaste
[focus
]; [focus
] see insert
}} \
2722 .mbar.edit add
command -label [mc Delete
] \
2723 -command {catch
{[focus
] delete sel.first sel.last
}} \
2725 .mbar.edit add separator
2726 .mbar.edit add
command -label [mc
"Select All"] \
2727 -command {catch
{[focus
] tag add sel
0.0 end
}} \
2732 if {[is_enabled branch
]} {
2735 .mbar.branch add
command -label [mc
"Create..."] \
2736 -command branch_create
::dialog \
2738 lappend disable_on_lock
[list .mbar.branch entryconf \
2739 [.mbar.branch index last
] -state]
2741 .mbar.branch add
command -label [mc
"Checkout..."] \
2742 -command branch_checkout
::dialog \
2744 lappend disable_on_lock
[list .mbar.branch entryconf \
2745 [.mbar.branch index last
] -state]
2747 .mbar.branch add
command -label [mc
"Rename..."] \
2748 -command branch_rename
::dialog
2749 lappend disable_on_lock
[list .mbar.branch entryconf \
2750 [.mbar.branch index last
] -state]
2752 .mbar.branch add
command -label [mc
"Delete..."] \
2753 -command branch_delete
::dialog
2754 lappend disable_on_lock
[list .mbar.branch entryconf \
2755 [.mbar.branch index last
] -state]
2757 .mbar.branch add
command -label [mc
"Reset..."] \
2758 -command merge
::reset_hard
2759 lappend disable_on_lock
[list .mbar.branch entryconf \
2760 [.mbar.branch index last
] -state]
2765 proc commit_btn_caption
{} {
2766 if {[is_enabled nocommit
]} {
2769 return [mc Commit@@verb
]
2773 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2776 if {![is_enabled nocommit
]} {
2777 .mbar.commit add radiobutton \
2778 -label [mc
"New Commit"] \
2779 -command do_select_commit_type \
2780 -variable selected_commit_type \
2782 lappend disable_on_lock \
2783 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2785 .mbar.commit add radiobutton \
2786 -label [mc
"Amend Last Commit"] \
2787 -command do_select_commit_type \
2788 -variable selected_commit_type \
2790 lappend disable_on_lock \
2791 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2793 .mbar.commit add separator
2796 .mbar.commit add
command -label [mc Rescan
] \
2797 -command ui_do_rescan \
2799 lappend disable_on_lock \
2800 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2802 .mbar.commit add
command -label [mc
"Stage To Commit"] \
2803 -command do_add_selection \
2805 lappend disable_on_lock \
2806 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2808 .mbar.commit add
command -label [mc
"Stage Changed Files To Commit"] \
2809 -command do_add_all \
2811 lappend disable_on_lock \
2812 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2814 .mbar.commit add
command -label [mc
"Unstage From Commit"] \
2815 -command do_unstage_selection \
2817 lappend disable_on_lock \
2818 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2820 .mbar.commit add
command -label [mc
"Revert Changes"] \
2821 -command do_revert_selection \
2823 lappend disable_on_lock \
2824 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2826 .mbar.commit add separator
2828 .mbar.commit add
command -label [mc
"Show Less Context"] \
2829 -command show_less_context \
2830 -accelerator $M1T-\
-
2832 .mbar.commit add
command -label [mc
"Show More Context"] \
2833 -command show_more_context \
2836 .mbar.commit add separator
2838 if {![is_enabled nocommitmsg
]} {
2839 .mbar.commit add
command -label [mc
"Sign Off"] \
2840 -command do_signoff \
2844 .mbar.commit add
command -label [commit_btn_caption
] \
2845 -command do_commit \
2846 -accelerator $M1T-Return
2847 lappend disable_on_lock \
2848 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2853 if {[is_enabled branch
]} {
2855 .mbar.merge add
command -label [mc
"Local Merge..."] \
2856 -command merge
::dialog \
2858 lappend disable_on_lock \
2859 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2860 .mbar.merge add
command -label [mc
"Abort Merge..."] \
2861 -command merge
::reset_hard
2862 lappend disable_on_lock \
2863 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2868 if {[is_enabled transport
]} {
2871 .mbar.remote add
command \
2872 -label [mc
"Add..."] \
2873 -command remote_add
::dialog \
2875 .mbar.remote add
command \
2876 -label [mc
"Push..."] \
2877 -command do_push_anywhere \
2879 .mbar.remote add
command \
2880 -label [mc
"Delete Branch..."] \
2881 -command remote_branch_delete
::dialog
2885 proc
::tk
::mac
::ShowPreferences
{} {do_options
}
2889 .mbar.edit add separator
2890 .mbar.edit add
command -label [mc
"Options..."] \
2896 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2897 set tools_menubar .mbar.tools
2899 $tools_menubar add separator
2900 $tools_menubar add
command -label [mc
"Add..."] -command tools_add
::dialog
2901 $tools_menubar add
command -label [mc
"Remove..."] -command tools_remove
::dialog
2903 if {[array names repo_config guitool.
*.cmd
] ne
{}} {
2910 .mbar add cascade
-label [mc Help
] -menu .mbar.
help
2914 .mbar.apple add
command -label [mc
"About %s" [appname
]] \
2916 .mbar.apple add separator
2918 .mbar.
help add
command -label [mc
"About %s" [appname
]] \
2921 . configure
-menu .mbar
2923 set doc_path
[githtmldir
]
2924 if {$doc_path ne
{}} {
2925 set doc_path
[file join $doc_path index.html
]
2928 set doc_path
[exec cygpath
--mixed $doc_path]
2932 if {[file isfile
$doc_path]} {
2933 set doc_url
"file:$doc_path"
2935 set doc_url
{http
://www.kernel.org
/pub
/software
/scm
/git
/docs
/}
2938 proc start_browser
{url
} {
2939 git
"web--browse" $url
2942 .mbar.
help add
command -label [mc
"Online Documentation"] \
2943 -command [list start_browser
$doc_url]
2945 .mbar.
help add
command -label [mc
"Show SSH Key"] \
2948 unset doc_path doc_url
2950 # -- Standard bindings
2952 wm protocol . WM_DELETE_WINDOW do_quit
2953 bind all
<$M1B-Key-q> do_quit
2954 bind all
<$M1B-Key-Q> do_quit
2955 bind all
<$M1B-Key-w> {destroy
[winfo toplevel
%W
]}
2956 bind all
<$M1B-Key-W> {destroy
[winfo toplevel
%W
]}
2958 set subcommand_args
{}
2960 set s
"usage: $::argv0 $::subcommand $::subcommand_args"
2961 if {[tk windowingsystem
] eq
"win32"} {
2963 tk_messageBox
-icon info
-message $s \
2971 proc normalize_relpath
{path
} {
2973 foreach item
[file split $path] {
2974 if {$item eq
{.
}} continue
2975 if {$item eq
{..
} && [llength
$elements] > 0
2976 && [lindex
$elements end
] ne
{..
}} {
2977 set elements
[lrange
$elements 0 end-1
]
2980 lappend elements
$item
2982 return [eval file join $elements]
2985 # -- Not a normal commit type invocation? Do that instead!
2987 switch
-- $subcommand {
2990 if {$subcommand eq
"blame"} {
2991 set subcommand_args
{[--line=<num
>] rev? path
}
2993 set subcommand_args
{rev? path
}
2995 if {$argv eq
{}} usage
3001 if {$is_path ||
[file exists
$_prefix$a]} {
3002 if {$path ne
{}} usage
3003 set path
[normalize_relpath
$_prefix$a]
3005 } elseif
{$a eq
{--}} {
3007 if {$head ne
{}} usage
3012 } elseif
{[regexp
{^
--line=(\d
+)$
} $a a lnum
]} {
3013 if {$jump_spec ne
{} ||
$head ne
{}} usage
3014 set jump_spec
[list
$lnum]
3015 } elseif
{$head eq
{}} {
3016 if {$head ne
{}} usage
3025 if {$head ne
{} && $path eq
{}} {
3026 set path
[normalize_relpath
$_prefix$head]
3033 if {[regexp
{^
[0-9a-f]{1,39}$
} $head]} {
3035 set head [git rev-parse
--verify $head]
3037 if {[tk windowingsystem
] eq
"win32"} {
3038 tk_messageBox
-icon error
-title [mc Error
] -message $err
3045 set current_branch
$head
3049 switch
-- $subcommand {
3051 if {$jump_spec ne
{}} usage
3053 if {$path ne
{} && [file isdirectory
$path]} {
3054 set head $current_branch
3060 browser
::new
$head $path
3063 if {$head eq
{} && ![file exists
$path]} {
3064 catch
{wm withdraw .
}
3068 -title [mc
"git-gui: fatal error"] \
3069 -message [mc
"fatal: cannot stat path %s: No such file or directory" $path]
3072 blame
::new
$head $path $jump_spec
3079 if {[llength
$argv] != 0} {
3082 # fall through to setup UI for commits
3085 set err
"usage: $argv0 \[{blame|browser|citool}\]"
3086 if {[tk windowingsystem
] eq
"win32"} {
3088 tk_messageBox
-icon error
-message $err \
3099 ${NS}::frame .branch
3100 if {!$use_ttk} {.branch configure
-borderwidth 1 -relief sunken
}
3101 ${NS}::label .branch.l1 \
3102 -text [mc
"Current Branch:"] \
3105 ${NS}::label .branch.cb \
3106 -textvariable current_branch \
3109 pack .branch.l1
-side left
3110 pack .branch.cb
-side left
-fill x
3111 pack .branch
-side top
-fill x
3113 # -- Main Window Layout
3115 ${NS}::panedwindow .vpane
-orient horizontal
3116 ${NS}::panedwindow .vpane.files
-orient vertical
3118 .vpane add .vpane.files
3120 .vpane add .vpane.files
-sticky nsew
-height 100 -width 200
3122 pack .vpane
-anchor n
-side top
-fill both
-expand 1
3124 # -- Index File List
3126 ${NS}::frame .vpane.files.index
-height 100 -width 200
3127 tlabel .vpane.files.index.title \
3128 -text [mc
"Staged Changes (Will Commit)"] \
3129 -background lightgreen
-foreground black
3130 text
$ui_index -background white
-foreground black \
3132 -width 20 -height 10 \
3134 -cursor $cursor_ptr \
3135 -xscrollcommand {.vpane.files.index.sx
set} \
3136 -yscrollcommand {.vpane.files.index.sy
set} \
3138 ${NS}::scrollbar .vpane.files.index.sx
-orient h
-command [list
$ui_index xview
]
3139 ${NS}::scrollbar .vpane.files.index.sy
-orient v
-command [list
$ui_index yview
]
3140 pack .vpane.files.index.title
-side top
-fill x
3141 pack .vpane.files.index.sx
-side bottom
-fill x
3142 pack .vpane.files.index.sy
-side right
-fill y
3143 pack
$ui_index -side left
-fill both
-expand 1
3145 # -- Working Directory File List
3147 ${NS}::frame .vpane.files.workdir
-height 100 -width 200
3148 tlabel .vpane.files.workdir.title
-text [mc
"Unstaged Changes"] \
3149 -background lightsalmon
-foreground black
3150 text
$ui_workdir -background white
-foreground black \
3152 -width 20 -height 10 \
3154 -cursor $cursor_ptr \
3155 -xscrollcommand {.vpane.files.workdir.sx
set} \
3156 -yscrollcommand {.vpane.files.workdir.sy
set} \
3158 ${NS}::scrollbar .vpane.files.workdir.sx
-orient h
-command [list
$ui_workdir xview
]
3159 ${NS}::scrollbar .vpane.files.workdir.sy
-orient v
-command [list
$ui_workdir yview
]
3160 pack .vpane.files.workdir.title
-side top
-fill x
3161 pack .vpane.files.workdir.sx
-side bottom
-fill x
3162 pack .vpane.files.workdir.sy
-side right
-fill y
3163 pack
$ui_workdir -side left
-fill both
-expand 1
3165 .vpane.files add .vpane.files.workdir
3166 .vpane.files add .vpane.files.index
3168 .vpane.files paneconfigure .vpane.files.workdir
-sticky news
3169 .vpane.files paneconfigure .vpane.files.index
-sticky news
3172 foreach i
[list
$ui_index $ui_workdir] {
3174 $i tag conf in_diff
-background [$i tag cget in_sel
-background]
3178 # -- Diff and Commit Area
3180 ${NS}::frame .vpane.lower
-height 300 -width 400
3181 ${NS}::frame .vpane.lower.commarea
3182 ${NS}::frame .vpane.lower.
diff -relief sunken
-borderwidth 1
3183 pack .vpane.lower.
diff -fill both
-expand 1
3184 pack .vpane.lower.commarea
-side bottom
-fill x
3185 .vpane add .vpane.lower
3186 if {!$use_ttk} {.vpane paneconfigure .vpane.lower
-sticky nsew
}
3188 # -- Commit Area Buttons
3190 ${NS}::frame .vpane.lower.commarea.buttons
3191 ${NS}::label .vpane.lower.commarea.buttons.l
-text {} \
3194 pack .vpane.lower.commarea.buttons.l
-side top
-fill x
3195 pack .vpane.lower.commarea.buttons
-side left
-fill y
3197 ${NS}::button .vpane.lower.commarea.buttons.rescan
-text [mc Rescan
] \
3198 -command ui_do_rescan
3199 pack .vpane.lower.commarea.buttons.rescan
-side top
-fill x
3200 lappend disable_on_lock \
3201 {.vpane.lower.commarea.buttons.rescan conf
-state}
3203 ${NS}::button .vpane.lower.commarea.buttons.incall
-text [mc
"Stage Changed"] \
3205 pack .vpane.lower.commarea.buttons.incall
-side top
-fill x
3206 lappend disable_on_lock \
3207 {.vpane.lower.commarea.buttons.incall conf
-state}
3209 if {![is_enabled nocommitmsg
]} {
3210 ${NS}::button .vpane.lower.commarea.buttons.signoff
-text [mc
"Sign Off"] \
3212 pack .vpane.lower.commarea.buttons.signoff
-side top
-fill x
3215 ${NS}::button .vpane.lower.commarea.buttons.commit
-text [commit_btn_caption
] \
3217 pack .vpane.lower.commarea.buttons.commit
-side top
-fill x
3218 lappend disable_on_lock \
3219 {.vpane.lower.commarea.buttons.commit conf
-state}
3221 if {![is_enabled nocommit
]} {
3222 ${NS}::button .vpane.lower.commarea.buttons.push
-text [mc Push
] \
3223 -command do_push_anywhere
3224 pack .vpane.lower.commarea.buttons.push
-side top
-fill x
3227 # -- Commit Message Buffer
3229 ${NS}::frame .vpane.lower.commarea.buffer
3230 ${NS}::frame .vpane.lower.commarea.buffer.header
3231 set ui_comm .vpane.lower.commarea.buffer.t
3232 set ui_coml .vpane.lower.commarea.buffer.header.l
3234 if {![is_enabled nocommit
]} {
3235 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.new \
3236 -text [mc
"New Commit"] \
3237 -command do_select_commit_type \
3238 -variable selected_commit_type \
3240 lappend disable_on_lock \
3241 [list .vpane.lower.commarea.buffer.header.new conf
-state]
3242 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.amend \
3243 -text [mc
"Amend Last Commit"] \
3244 -command do_select_commit_type \
3245 -variable selected_commit_type \
3247 lappend disable_on_lock \
3248 [list .vpane.lower.commarea.buffer.header.amend conf
-state]
3251 ${NS}::label
$ui_coml \
3254 proc trace_commit_type
{varname args
} {
3255 global ui_coml commit_type
3256 switch
-glob -- $commit_type {
3257 initial
{set txt
[mc
"Initial Commit Message:"]}
3258 amend
{set txt
[mc
"Amended Commit Message:"]}
3259 amend-initial
{set txt
[mc
"Amended Initial Commit Message:"]}
3260 amend-merge
{set txt
[mc
"Amended Merge Commit Message:"]}
3261 merge
{set txt
[mc
"Merge Commit Message:"]}
3262 * {set txt
[mc
"Commit Message:"]}
3264 $ui_coml conf
-text $txt
3266 trace add variable commit_type
write trace_commit_type
3267 pack
$ui_coml -side left
-fill x
3269 if {![is_enabled nocommit
]} {
3270 pack .vpane.lower.commarea.buffer.header.amend
-side right
3271 pack .vpane.lower.commarea.buffer.header.new
-side right
3274 text
$ui_comm -background white
-foreground black \
3278 -autoseparators true \
3280 -width $repo_config(gui.commitmsgwidth
) -height 9 -wrap none \
3282 -yscrollcommand {.vpane.lower.commarea.buffer.sby
set}
3283 ${NS}::scrollbar .vpane.lower.commarea.buffer.sby \
3284 -command [list
$ui_comm yview
]
3285 pack .vpane.lower.commarea.buffer.header
-side top
-fill x
3286 pack .vpane.lower.commarea.buffer.sby
-side right
-fill y
3287 pack
$ui_comm -side left
-fill y
3288 pack .vpane.lower.commarea.buffer
-side left
-fill y
3290 # -- Commit Message Buffer Context Menu
3292 set ctxm .vpane.lower.commarea.buffer.ctxm
3293 menu
$ctxm -tearoff 0
3296 -command {tk_textCut
$ui_comm}
3299 -command {tk_textCopy
$ui_comm}
3302 -command {tk_textPaste
$ui_comm}
3304 -label [mc Delete
] \
3305 -command {catch
{$ui_comm delete sel.first sel.last
}}
3308 -label [mc
"Select All"] \
3309 -command {focus
$ui_comm;$ui_comm tag add sel
0.0 end
}
3311 -label [mc
"Copy All"] \
3313 $ui_comm tag add sel
0.0 end
3314 tk_textCopy
$ui_comm
3315 $ui_comm tag remove sel
0.0 end
3319 -label [mc
"Sign Off"] \
3321 set ui_comm_ctxm
$ctxm
3325 proc trace_current_diff_path
{varname args
} {
3326 global current_diff_path diff_actions file_states
3327 if {$current_diff_path eq
{}} {
3333 set p
$current_diff_path
3334 set s
[mapdesc
[lindex
$file_states($p) 0] $p]
3336 set p
[escape_path
$p]
3340 .vpane.lower.
diff.header.status configure
-text $s
3341 .vpane.lower.
diff.header.
file configure
-text $f
3342 .vpane.lower.
diff.header.path configure
-text $p
3343 foreach w
$diff_actions {
3347 trace add variable current_diff_path
write trace_current_diff_path
3349 gold_frame .vpane.lower.
diff.header
3350 tlabel .vpane.lower.
diff.header.status \
3353 -width $max_status_desc \
3356 tlabel .vpane.lower.
diff.header.
file \
3361 tlabel .vpane.lower.
diff.header.path \
3366 pack .vpane.lower.
diff.header.status
-side left
3367 pack .vpane.lower.
diff.header.
file -side left
3368 pack .vpane.lower.
diff.header.path
-fill x
3369 set ctxm .vpane.lower.
diff.header.ctxm
3370 menu
$ctxm -tearoff 0
3378 -- $current_diff_path
3380 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3381 bind_button3 .vpane.lower.
diff.header.path
"tk_popup $ctxm %X %Y"
3385 ${NS}::frame .vpane.lower.
diff.body
3386 set ui_diff .vpane.lower.
diff.body.t
3387 text
$ui_diff -background white
-foreground black \
3389 -width 80 -height 5 -wrap none \
3391 -xscrollcommand {.vpane.lower.
diff.body.sbx
set} \
3392 -yscrollcommand {.vpane.lower.
diff.body.sby
set} \
3394 catch
{$ui_diff configure
-tabstyle wordprocessor
}
3395 ${NS}::scrollbar .vpane.lower.
diff.body.sbx
-orient horizontal \
3396 -command [list
$ui_diff xview
]
3397 ${NS}::scrollbar .vpane.lower.
diff.body.sby
-orient vertical \
3398 -command [list
$ui_diff yview
]
3399 pack .vpane.lower.
diff.body.sbx
-side bottom
-fill x
3400 pack .vpane.lower.
diff.body.sby
-side right
-fill y
3401 pack
$ui_diff -side left
-fill both
-expand 1
3402 pack .vpane.lower.
diff.header
-side top
-fill x
3403 pack .vpane.lower.
diff.body
-side bottom
-fill both
-expand 1
3405 foreach
{n c
} {0 black
1 red4
2 green4
3 yellow4
4 blue4
5 magenta4
6 cyan4
7 grey60
} {
3406 $ui_diff tag configure clr4
$n -background $c
3407 $ui_diff tag configure clri4
$n -foreground $c
3408 $ui_diff tag configure clr3
$n -foreground $c
3409 $ui_diff tag configure clri3
$n -background $c
3411 $ui_diff tag configure clr1
-font font_diffbold
3412 $ui_diff tag configure clr4
-underline 1
3414 $ui_diff tag conf d_info
-foreground blue
-font font_diffbold
3416 $ui_diff tag conf d_cr
-elide true
3417 $ui_diff tag conf d_@
-font font_diffbold
3418 $ui_diff tag conf d_
+ -foreground {#00a000}
3419 $ui_diff tag conf d_-
-foreground red
3421 $ui_diff tag conf d_
++ -foreground {#00a000}
3422 $ui_diff tag conf d_--
-foreground red
3423 $ui_diff tag conf d_
+s \
3424 -foreground {#00a000} \
3425 -background {#e2effa}
3426 $ui_diff tag conf d_-s \
3428 -background {#e2effa}
3429 $ui_diff tag conf d_s
+ \
3430 -foreground {#00a000} \
3432 $ui_diff tag conf d_s- \
3436 $ui_diff tag conf d
< \
3437 -foreground orange \
3439 $ui_diff tag conf d
= \
3440 -foreground orange \
3442 $ui_diff tag conf d
> \
3443 -foreground orange \
3446 $ui_diff tag raise sel
3448 # -- Diff Body Context Menu
3451 proc create_common_diff_popup
{ctxm
} {
3453 -label [mc Refresh
] \
3454 -command reshow_diff
3455 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3458 -command {tk_textCopy
$ui_diff}
3459 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3461 -label [mc
"Select All"] \
3462 -command {focus
$ui_diff;$ui_diff tag add sel
0.0 end
}
3463 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3465 -label [mc
"Copy All"] \
3467 $ui_diff tag add sel
0.0 end
3468 tk_textCopy
$ui_diff
3469 $ui_diff tag remove sel
0.0 end
3471 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3474 -label [mc
"Decrease Font Size"] \
3475 -command {incr_font_size font_diff
-1}
3476 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3478 -label [mc
"Increase Font Size"] \
3479 -command {incr_font_size font_diff
1}
3480 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3484 build_encoding_menu
$emenu [list force_diff_encoding
]
3486 -label [mc
"Encoding"] \
3488 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3490 $ctxm add
command -label [mc
"Options..."] \
3494 set ctxm .vpane.lower.
diff.body.ctxm
3495 menu
$ctxm -tearoff 0
3497 -label [mc
"Apply/Reverse Hunk"] \
3498 -command {apply_hunk
$cursorX $cursorY}
3499 set ui_diff_applyhunk
[$ctxm index last
]
3500 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyhunk -state]
3502 -label [mc
"Apply/Reverse Line"] \
3503 -command {apply_range_or_line
$cursorX $cursorY; do_rescan
}
3504 set ui_diff_applyline
[$ctxm index last
]
3505 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyline -state]
3508 -label [mc
"Show Less Context"] \
3509 -command show_less_context
3510 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3512 -label [mc
"Show More Context"] \
3513 -command show_more_context
3514 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3516 create_common_diff_popup
$ctxm
3518 set ctxmmg .vpane.lower.
diff.body.ctxmmg
3519 menu
$ctxmmg -tearoff 0
3520 $ctxmmg add
command \
3521 -label [mc
"Run Merge Tool"] \
3522 -command {merge_resolve_tool
}
3523 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3524 $ctxmmg add separator
3525 $ctxmmg add
command \
3526 -label [mc
"Use Remote Version"] \
3527 -command {merge_resolve_one
3}
3528 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3529 $ctxmmg add
command \
3530 -label [mc
"Use Local Version"] \
3531 -command {merge_resolve_one
2}
3532 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3533 $ctxmmg add
command \
3534 -label [mc
"Revert To Base"] \
3535 -command {merge_resolve_one
1}
3536 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3537 $ctxmmg add separator
3538 $ctxmmg add
command \
3539 -label [mc
"Show Less Context"] \
3540 -command show_less_context
3541 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3542 $ctxmmg add
command \
3543 -label [mc
"Show More Context"] \
3544 -command show_more_context
3545 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3546 $ctxmmg add separator
3547 create_common_diff_popup
$ctxmmg
3549 set ctxmsm .vpane.lower.
diff.body.ctxmsm
3550 menu
$ctxmsm -tearoff 0
3551 $ctxmsm add
command \
3552 -label [mc
"Visualize These Changes In The Submodule"] \
3553 -command {do_gitk
-- true
}
3554 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3555 $ctxmsm add
command \
3556 -label [mc
"Visualize Current Branch History In The Submodule"] \
3557 -command {do_gitk
{} true
}
3558 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3559 $ctxmsm add
command \
3560 -label [mc
"Visualize All Branch History In The Submodule"] \
3561 -command {do_gitk
--all true
}
3562 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3563 $ctxmsm add separator
3564 $ctxmsm add
command \
3565 -label [mc
"Start git gui In The Submodule"] \
3566 -command {do_git_gui
}
3567 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3568 $ctxmsm add separator
3569 create_common_diff_popup
$ctxmsm
3571 proc has_textconv
{path
} {
3572 if {[is_config_false gui.textconv
]} {
3575 set filter
[gitattr
$path diff set]
3576 set textconv
[get_config
[join [list
diff $filter textconv
] .
]]
3577 if {$filter ne
{set} && $textconv ne
{}} {
3584 proc popup_diff_menu
{ctxm ctxmmg ctxmsm x y X Y
} {
3585 global current_diff_path file_states
3588 if {[info exists file_states
($current_diff_path)]} {
3589 set state
[lindex
$file_states($current_diff_path) 0]
3593 if {[string first
{U
} $state] >= 0} {
3594 tk_popup
$ctxmmg $X $Y
3595 } elseif
{$
::is_submodule_diff
} {
3596 tk_popup
$ctxmsm $X $Y
3598 set has_range
[expr {[$
::ui_diff tag nextrange sel
0.0] != {}}]
3599 if {$
::ui_index eq $
::current_diff_side
} {
3600 set l
[mc
"Unstage Hunk From Commit"]
3602 set t
[mc
"Unstage Lines From Commit"]
3604 set t
[mc
"Unstage Line From Commit"]
3607 set l
[mc
"Stage Hunk For Commit"]
3609 set t
[mc
"Stage Lines For Commit"]
3611 set t
[mc
"Stage Line For Commit"]
3615 ||
$current_diff_path eq
{}
3618 ||
[string match
{?T
} $state]
3619 ||
[string match
{T?
} $state]
3620 ||
[has_textconv
$current_diff_path]} {
3625 $ctxm entryconf $
::ui_diff_applyhunk
-state $s -label $l
3626 $ctxm entryconf $
::ui_diff_applyline
-state $s -label $t
3627 tk_popup
$ctxm $X $Y
3630 bind_button3
$ui_diff [list popup_diff_menu
$ctxm $ctxmmg $ctxmsm %x
%y
%X
%Y
]
3634 set main_status
[::status_bar
::new .status
]
3635 pack .status
-anchor w
-side bottom
-fill x
3636 $main_status show
[mc
"Initializing..."]
3640 proc on_ttk_pane_mapped
{w pane pos
} {
3642 after
0 [list after idle
[list
$w sashpos
$pane $pos]]
3644 proc on_tk_pane_mapped
{w pane x y
} {
3646 after
0 [list after idle
[list
$w sash place
$pane $x $y]]
3648 proc on_application_mapped
{} {
3649 global repo_config use_ttk
3651 set gm
$repo_config(gui.geometry
)
3654 [list on_ttk_pane_mapped
%W
0 [lindex
$gm 1]]
3655 bind .vpane.files
<Map
> \
3656 [list on_ttk_pane_mapped
%W
0 [lindex
$gm 2]]
3659 [list on_tk_pane_mapped
%W
0 \
3661 [lindex
[.vpane sash coord
0] 1]]
3662 bind .vpane.files
<Map
> \
3663 [list on_tk_pane_mapped
%W
0 \
3664 [lindex
[.vpane.files sash coord
0] 0] \
3667 wm geometry .
[lindex
$gm 0]
3669 if {[info exists repo_config
(gui.geometry
)]} {
3670 bind .
<Map
> [list on_application_mapped
]
3671 wm geometry .
[lindex
$repo_config(gui.geometry
) 0]
3674 # -- Load window state
3676 if {[info exists repo_config
(gui.wmstate
)]} {
3677 catch
{wm state .
$repo_config(gui.wmstate
)}
3682 bind $ui_comm <$M1B-Key-Return> {do_commit
;break}
3683 bind $ui_comm <$M1B-Key-t> {do_add_selection
;break}
3684 bind $ui_comm <$M1B-Key-T> {do_add_selection
;break}
3685 bind $ui_comm <$M1B-Key-u> {do_unstage_selection
;break}
3686 bind $ui_comm <$M1B-Key-U> {do_unstage_selection
;break}
3687 bind $ui_comm <$M1B-Key-j> {do_revert_selection
;break}
3688 bind $ui_comm <$M1B-Key-J> {do_revert_selection
;break}
3689 bind $ui_comm <$M1B-Key-i> {do_add_all
;break}
3690 bind $ui_comm <$M1B-Key-I> {do_add_all
;break}
3691 bind $ui_comm <$M1B-Key-x> {tk_textCut
%W
;break}
3692 bind $ui_comm <$M1B-Key-X> {tk_textCut
%W
;break}
3693 bind $ui_comm <$M1B-Key-c> {tk_textCopy
%W
;break}
3694 bind $ui_comm <$M1B-Key-C> {tk_textCopy
%W
;break}
3695 bind $ui_comm <$M1B-Key-v> {tk_textPaste
%W
; %W see insert
; break}
3696 bind $ui_comm <$M1B-Key-V> {tk_textPaste
%W
; %W see insert
; break}
3697 bind $ui_comm <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3698 bind $ui_comm <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3699 bind $ui_comm <$M1B-Key-minus> {show_less_context
;break}
3700 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context
;break}
3701 bind $ui_comm <$M1B-Key-equal> {show_more_context
;break}
3702 bind $ui_comm <$M1B-Key-plus> {show_more_context
;break}
3703 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context
;break}
3705 bind $ui_diff <$M1B-Key-x> {tk_textCopy
%W
;break}
3706 bind $ui_diff <$M1B-Key-X> {tk_textCopy
%W
;break}
3707 bind $ui_diff <$M1B-Key-c> {tk_textCopy
%W
;break}
3708 bind $ui_diff <$M1B-Key-C> {tk_textCopy
%W
;break}
3709 bind $ui_diff <$M1B-Key-v> {break}
3710 bind $ui_diff <$M1B-Key-V> {break}
3711 bind $ui_diff <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3712 bind $ui_diff <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3713 bind $ui_diff <Key-Up
> {catch
{%W yview scroll
-1 units
};break}
3714 bind $ui_diff <Key-Down
> {catch
{%W yview scroll
1 units
};break}
3715 bind $ui_diff <Key-Left
> {catch
{%W xview scroll
-1 units
};break}
3716 bind $ui_diff <Key-Right
> {catch
{%W xview scroll
1 units
};break}
3717 bind $ui_diff <Key-k
> {catch
{%W yview scroll
-1 units
};break}
3718 bind $ui_diff <Key-j
> {catch
{%W yview scroll
1 units
};break}
3719 bind $ui_diff <Key-h
> {catch
{%W xview scroll
-1 units
};break}
3720 bind $ui_diff <Key-l
> {catch
{%W xview scroll
1 units
};break}
3721 bind $ui_diff <Control-Key-b
> {catch
{%W yview scroll
-1 pages
};break}
3722 bind $ui_diff <Control-Key-f
> {catch
{%W yview scroll
1 pages
};break}
3723 bind $ui_diff <Button-1
> {focus
%W
}
3725 if {[is_enabled branch
]} {
3726 bind .
<$M1B-Key-n> branch_create
::dialog
3727 bind .
<$M1B-Key-N> branch_create
::dialog
3728 bind .
<$M1B-Key-o> branch_checkout
::dialog
3729 bind .
<$M1B-Key-O> branch_checkout
::dialog
3730 bind .
<$M1B-Key-m> merge
::dialog
3731 bind .
<$M1B-Key-M> merge
::dialog
3733 if {[is_enabled transport
]} {
3734 bind .
<$M1B-Key-p> do_push_anywhere
3735 bind .
<$M1B-Key-P> do_push_anywhere
3738 bind .
<Key-F5
> ui_do_rescan
3739 bind .
<$M1B-Key-r> ui_do_rescan
3740 bind .
<$M1B-Key-R> ui_do_rescan
3741 bind .
<$M1B-Key-s> do_signoff
3742 bind .
<$M1B-Key-S> do_signoff
3743 bind .
<$M1B-Key-t> do_add_selection
3744 bind .
<$M1B-Key-T> do_add_selection
3745 bind .
<$M1B-Key-j> do_revert_selection
3746 bind .
<$M1B-Key-J> do_revert_selection
3747 bind .
<$M1B-Key-i> do_add_all
3748 bind .
<$M1B-Key-I> do_add_all
3749 bind .
<$M1B-Key-minus> {show_less_context
;break}
3750 bind .
<$M1B-Key-KP_Subtract> {show_less_context
;break}
3751 bind .
<$M1B-Key-equal> {show_more_context
;break}
3752 bind .
<$M1B-Key-plus> {show_more_context
;break}
3753 bind .
<$M1B-Key-KP_Add> {show_more_context
;break}
3754 bind .
<$M1B-Key-Return> do_commit
3755 foreach i
[list
$ui_index $ui_workdir] {
3756 bind $i <Button-1
> "toggle_or_diff $i %x %y; break"
3757 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3758 bind $i <Shift-Button-1
> "add_range_to_selection $i %x %y; break"
3762 set file_lists
($ui_index) [list
]
3763 set file_lists
($ui_workdir) [list
]
3765 wm title .
"[appname] ([reponame]) [file normalize $_gitworktree]"
3766 focus
-force $ui_comm
3768 # -- Warn the user about environmental problems. Cygwin's Tcl
3769 # does *not* pass its env array onto any processes it spawns.
3770 # This means that git processes get none of our environment.
3775 set msg
[mc
"Possible environment issues exist.
3777 The following environment variables are probably
3778 going to be ignored by any Git subprocess run
3782 foreach name
[array names env
] {
3783 switch
-regexp -- $name {
3784 {^GIT_INDEX_FILE$
} -
3785 {^GIT_OBJECT_DIRECTORY$
} -
3786 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$
} -
3788 {^GIT_EXTERNAL_DIFF$
} -
3792 {^GIT_
(AUTHOR|COMMITTER
)_DATE$
} {
3793 append msg
" - $name\n"
3796 {^GIT_
(AUTHOR|COMMITTER
)_
(NAME|EMAIL
)$
} {
3797 append msg
" - $name\n"
3799 set suggest_user
$name
3803 if {$ignored_env > 0} {
3805 This is due to a known issue with the
3806 Tcl binary distributed by Cygwin."]
3808 if {$suggest_user ne
{}} {
3811 A good replacement for %s
3812 is placing values for the user.name and
3813 user.email settings into your personal
3819 unset ignored_env msg suggest_user name
3822 # -- Only initialize complex UI if we are going to stay running.
3824 if {[is_enabled transport
]} {
3827 set n
[.mbar.remote index end
]
3828 populate_remotes_menu
3829 set n
[expr {[.mbar.remote index end
] - $n}]
3831 if {[.mbar.remote
type 0] eq
"tearoff"} { incr n
}
3832 .mbar.remote insert
$n separator
3837 if {[winfo exists
$ui_comm]} {
3838 set GITGUI_BCK_exists
[load_message GITGUI_BCK
]
3840 # -- If both our backup and message files exist use the
3841 # newer of the two files to initialize the buffer.
3843 if {$GITGUI_BCK_exists} {
3844 set m
[gitdir GITGUI_MSG
]
3845 if {[file isfile
$m]} {
3846 if {[file mtime
[gitdir GITGUI_BCK
]] > [file mtime
$m]} {
3847 catch
{file delete
[gitdir GITGUI_MSG
]}
3849 $ui_comm delete
0.0 end
3851 $ui_comm edit modified false
3852 catch
{file delete
[gitdir GITGUI_BCK
]}
3853 set GITGUI_BCK_exists
0
3859 proc backup_commit_buffer
{} {
3860 global ui_comm GITGUI_BCK_exists
3862 set m
[$ui_comm edit modified
]
3863 if {$m ||
$GITGUI_BCK_exists} {
3864 set msg
[string trim
[$ui_comm get
0.0 end
]]
3865 regsub
-all -line {[ \r\t]+$
} $msg {} msg
3868 if {$GITGUI_BCK_exists} {
3869 catch
{file delete
[gitdir GITGUI_BCK
]}
3870 set GITGUI_BCK_exists
0
3874 set fd
[open
[gitdir GITGUI_BCK
] w
]
3875 puts
-nonewline $fd $msg
3877 set GITGUI_BCK_exists
1
3881 $ui_comm edit modified false
3884 set ::GITGUI_BCK_i
[after
2000 backup_commit_buffer
]
3887 backup_commit_buffer
3889 # -- If the user has aspell available we can drive it
3890 # in pipe mode to spellcheck the commit message.
3892 set spell_cmd
[list |
]
3893 set spell_dict
[get_config gui.spellingdictionary
]
3894 lappend spell_cmd aspell
3895 if {$spell_dict ne
{}} {
3896 lappend spell_cmd
--master=$spell_dict
3898 lappend spell_cmd
--mode=none
3899 lappend spell_cmd
--encoding=utf-8
3900 lappend spell_cmd pipe
3901 if {$spell_dict eq
{none
}
3902 ||
[catch
{set spell_fd
[open
$spell_cmd r
+]} spell_err
]} {
3903 bind_button3
$ui_comm [list tk_popup
$ui_comm_ctxm %X
%Y
]
3905 set ui_comm_spell
[spellcheck
::init \
3911 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
3914 lock_index begin-read
3915 if {![winfo ismapped .
]} {
3919 if {[is_enabled initialamend
]} {
3925 if {[is_enabled nocommitmsg
]} {
3926 $ui_comm configure
-state disabled
-background gray
3929 if {[is_enabled multicommit
] && ![is_config_false gui.gcwarning
]} {
3932 if {[is_enabled retcode
]} {
3933 bind .
<Destroy
> {+terminate_me
%W
}
3935 if {$picked && [is_config_true gui.autoexplore
]} {
3941 # indent-tabs-mode: t