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 ######################################################################
1323 set current_diff_path {}
1324 set current_diff_side {}
1325 set diff_actions [list]
1329 set MERGE_HEAD [list]
1332 set current_branch {}
1334 set current_diff_path {}
1336 set is_submodule_diff 0
1337 set is_conflict_diff 0
1338 set selected_commit_type new
1339 set diff_empty_count 0
1341 set nullid "0000000000000000000000000000000000000000"
1342 set nullid2 "0000000000000000000000000000000000000001"
1344 ######################################################################
1352 set disable_on_lock [list]
1353 set index_lock_type none
1355 proc lock_index {type} {
1356 global index_lock_type disable_on_lock
1358 if {$index_lock_type eq {none}} {
1359 set index_lock_type $type
1360 foreach w $disable_on_lock {
1361 uplevel #0 $w disabled
1364 } elseif {$index_lock_type eq "begin-
$type"} {
1365 set index_lock_type $type
1371 proc unlock_index {} {
1372 global index_lock_type disable_on_lock
1374 set index_lock_type none
1375 foreach w $disable_on_lock {
1376 uplevel #0 $w normal
1380 ######################################################################
1384 proc repository_state {ctvar hdvar mhvar} {
1385 global current_branch
1386 upvar $ctvar ct $hdvar hd $mhvar mh
1391 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1397 set merge_head [gitdir MERGE_HEAD]
1398 if {[file exists $merge_head]} {
1400 set fd_mh [open $merge_head r]
1401 while {[gets $fd_mh line] >= 0} {
1412 global PARENT empty_tree
1414 set p [lindex $PARENT 0]
1418 if {$empty_tree eq {}} {
1419 set empty_tree [git mktree << {}]
1424 proc force_amend {} {
1425 global selected_commit_type
1426 global HEAD PARENT MERGE_HEAD commit_type
1428 repository_state newType newHEAD newMERGE_HEAD
1431 set MERGE_HEAD $newMERGE_HEAD
1432 set commit_type $newType
1434 set selected_commit_type amend
1435 do_select_commit_type
1438 proc rescan {after {honor_trustmtime 1}} {
1439 global HEAD PARENT MERGE_HEAD commit_type
1440 global ui_index ui_workdir ui_comm
1441 global rescan_active file_states
1444 if {$rescan_active > 0 || ![lock_index read]} return
1446 repository_state newType newHEAD newMERGE_HEAD
1447 if {[string match amend* $commit_type]
1448 && $newType eq {normal}
1449 && $newHEAD eq $HEAD} {
1453 set MERGE_HEAD $newMERGE_HEAD
1454 set commit_type $newType
1457 array unset file_states
1459 if {!$::GITGUI_BCK_exists &&
1460 (![$ui_comm edit modified]
1461 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1462 if {[string match amend* $commit_type]} {
1463 } elseif {[load_message GITGUI_MSG]} {
1464 } elseif {[run_prepare_commit_msg_hook]} {
1465 } elseif {[load_message MERGE_MSG]} {
1466 } elseif {[load_message SQUASH_MSG]} {
1469 $ui_comm edit modified false
1472 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1473 rescan_stage2 {} $after
1476 ui_status [mc "Refreshing
file status...
"]
1477 set fd_rf [git_read update-index \
1483 fconfigure $fd_rf -blocking 0 -translation binary
1484 fileevent $fd_rf readable \
1485 [list rescan_stage2 $fd_rf $after]
1490 set is_git_info_exclude {}
1491 proc have_info_exclude {} {
1492 global is_git_info_exclude
1494 if {$is_git_info_exclude eq {}} {
1495 if {[catch {exec test -f [gitdir info exclude]}]} {
1496 set is_git_info_exclude 0
1498 set is_git_info_exclude 1
1501 return $is_git_info_exclude
1504 proc have_info_exclude {} {
1505 return [file readable [gitdir info exclude]]
1509 proc rescan_stage2 {fd after} {
1510 global rescan_active buf_rdi buf_rdf buf_rlo
1514 if {![eof $fd]} return
1518 if {[package vsatisfies $::_git_version 1.6.3]} {
1519 set ls_others [list --exclude-standard]
1521 set ls_others [list --exclude-per-directory=.gitignore]
1522 if {[have_info_exclude]} {
1523 lappend ls_others "--exclude-from=[gitdir info exclude
]"
1525 set user_exclude [get_config core.excludesfile]
1526 if {$user_exclude ne {} && [file readable $user_exclude]} {
1527 lappend ls_others "--exclude-from=[file normalize
$user_exclude]"
1536 ui_status [mc "Scanning
for modified files ...
"]
1537 set fd_di [git_read diff-index --cached -z [PARENT]]
1538 set fd_df [git_read diff-files -z]
1539 set fd_lo [eval git_read ls-files --others -z $ls_others]
1541 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1542 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1543 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1544 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1545 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1546 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1549 proc load_message {file} {
1552 set f [gitdir $file]
1553 if {[file isfile $f]} {
1554 if {[catch {set fd [open $f r]}]} {
1557 fconfigure $fd -eofchar {}
1558 set content [string trim [read $fd]]
1560 regsub -all -line {[ \r\t]+$} $content {} content
1561 $ui_comm delete 0.0 end
1562 $ui_comm insert end $content
1568 proc run_prepare_commit_msg_hook {} {
1571 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1572 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1573 # empty file but existent file.
1575 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1577 if {[file isfile [gitdir MERGE_MSG]]} {
1578 set pcm_source "merge
"
1579 set fd_mm [open [gitdir MERGE_MSG] r]
1580 puts -nonewline $fd_pcm [read $fd_mm]
1582 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1583 set pcm_source "squash
"
1584 set fd_sm [open [gitdir SQUASH_MSG] r]
1585 puts -nonewline $fd_pcm [read $fd_sm]
1593 set fd_ph [githook_read prepare-commit-msg \
1594 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1596 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1600 ui_status [mc "Calling prepare-commit-msg hook...
"]
1603 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1604 fileevent $fd_ph readable \
1605 [list prepare_commit_msg_hook_wait $fd_ph]
1610 proc prepare_commit_msg_hook_wait {fd_ph} {
1613 append pch_error [read $fd_ph]
1614 fconfigure $fd_ph -blocking 1
1616 if {[catch {close $fd_ph}]} {
1617 ui_status [mc "Commit declined by prepare-commit-msg hook.
"]
1618 hook_failed_popup prepare-commit-msg $pch_error
1619 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1622 load_message PREPARE_COMMIT_MSG
1625 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1628 fconfigure $fd_ph -blocking 0
1629 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1632 proc read_diff_index {fd after} {
1635 append buf_rdi [read $fd]
1637 set n [string length $buf_rdi]
1639 set z1 [string first "\
0" $buf_rdi $c]
1640 if {$z1 == -1} break
1642 set z2 [string first "\
0" $buf_rdi $z1]
1643 if {$z2 == -1} break
1646 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1647 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1649 [encoding convertfrom $p] \
1651 [list [lindex $i 0] [lindex $i 2]] \
1657 set buf_rdi [string range $buf_rdi $c end]
1662 rescan_done $fd buf_rdi $after
1665 proc read_diff_files {fd after} {
1668 append buf_rdf [read $fd]
1670 set n [string length $buf_rdf]
1672 set z1 [string first "\
0" $buf_rdf $c]
1673 if {$z1 == -1} break
1675 set z2 [string first "\
0" $buf_rdf $z1]
1676 if {$z2 == -1} break
1679 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1680 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1682 [encoding convertfrom $p] \
1685 [list [lindex $i 0] [lindex $i 2]]
1690 set buf_rdf [string range $buf_rdf $c end]
1695 rescan_done $fd buf_rdf $after
1698 proc read_ls_others {fd after} {
1701 append buf_rlo [read $fd]
1702 set pck [split $buf_rlo "\
0"]
1703 set buf_rlo [lindex $pck end]
1704 foreach p [lrange $pck 0 end-1] {
1705 set p [encoding convertfrom $p]
1706 if {[string index $p end] eq {/}} {
1707 set p [string range $p 0 end-1]
1711 rescan_done $fd buf_rlo $after
1714 proc rescan_done {fd buf after} {
1715 global rescan_active current_diff_path
1716 global file_states repo_config
1719 if {![eof $fd]} return
1722 if {[incr rescan_active -1] > 0} return
1727 if {$current_diff_path ne {}} { reshow_diff $after }
1728 if {$current_diff_path eq {}} { select_first_diff $after }
1731 proc prune_selection {} {
1732 global file_states selected_paths
1734 foreach path [array names selected_paths] {
1735 if {[catch {set still_here $file_states($path)}]} {
1736 unset selected_paths($path)
1741 ######################################################################
1745 proc mapicon {w state path} {
1748 if {[catch {set r $all_icons($state$w)}]} {
1749 puts "error
: no icon
for $w state
={$state} $path"
1755 proc mapdesc {state path} {
1758 if {[catch {set r $all_descs($state)}]} {
1759 puts "error
: no desc
for state
={$state} $path"
1765 proc ui_status {msg} {
1767 if {[info exists main_status]} {
1768 $main_status show $msg
1772 proc ui_ready {{test {}}} {
1774 if {[info exists main_status]} {
1775 $main_status show [mc "Ready.
"] $test
1779 proc escape_path {path} {
1780 regsub -all {\\} $path "\\\\" path
1781 regsub -all "\n" $path "\\n
" path
1785 proc short_path {path} {
1786 return [escape_path [lindex [file split $path] end]]
1790 set null_sha1 [string repeat 0 40]
1792 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1793 global file_states next_icon_id null_sha1
1795 set s0 [string index $new_state 0]
1796 set s1 [string index $new_state 1]
1798 if {[catch {set info $file_states($path)}]} {
1800 set icon n[incr next_icon_id]
1802 set state [lindex $info 0]
1803 set icon [lindex $info 1]
1804 if {$head_info eq {}} {set head_info [lindex $info 2]}
1805 if {$index_info eq {}} {set index_info [lindex $info 3]}
1808 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1809 elseif {$s0 eq {_}} {set s0 _}
1811 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1812 elseif {$s1 eq {_}} {set s1 _}
1814 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1815 set head_info [list 0 $null_sha1]
1816 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1817 && $head_info eq {}} {
1818 set head_info $index_info
1819 } elseif {$s0 eq {_} && [string index $state 0] ne {_}} {
1820 set index_info $head_info
1824 set file_states($path) [list $s0$s1 $icon \
1825 $head_info $index_info \
1830 proc display_file_helper {w path icon_name old_m new_m} {
1833 if {$new_m eq {_}} {
1834 set lno [lsearch -sorted -exact $file_lists($w) $path]
1836 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1838 $w conf -state normal
1839 $w delete $lno.0 [expr {$lno + 1}].0
1840 $w conf -state disabled
1842 } elseif {$old_m eq {_} && $new_m ne {_}} {
1843 lappend file_lists($w) $path
1844 set file_lists($w) [lsort -unique $file_lists($w)]
1845 set lno [lsearch -sorted -exact $file_lists($w) $path]
1847 $w conf -state normal
1848 $w image create $lno.0 \
1849 -align center -padx 5 -pady 1 \
1851 -image [mapicon $w $new_m $path]
1852 $w insert $lno.1 "[escape_path
$path]\n"
1853 $w conf -state disabled
1854 } elseif {$old_m ne $new_m} {
1855 $w conf -state normal
1856 $w image conf $icon_name -image [mapicon $w $new_m $path]
1857 $w conf -state disabled
1861 proc display_file {path state} {
1862 global file_states selected_paths
1863 global ui_index ui_workdir
1865 set old_m [merge_state $path $state]
1866 set s $file_states($path)
1867 set new_m [lindex $s 0]
1868 set icon_name [lindex $s 1]
1870 set o [string index $old_m 0]
1871 set n [string index $new_m 0]
1878 display_file_helper $ui_index $path $icon_name $o $n
1880 if {[string index $old_m 0] eq {U}} {
1883 set o [string index $old_m 1]
1885 if {[string index $new_m 0] eq {U}} {
1888 set n [string index $new_m 1]
1890 display_file_helper $ui_workdir $path $icon_name $o $n
1892 if {$new_m eq {__}} {
1893 unset file_states($path)
1894 catch {unset selected_paths($path)}
1898 proc display_all_files_helper {w path icon_name m} {
1901 lappend file_lists($w) $path
1902 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1903 $w image create end \
1904 -align center -padx 5 -pady 1 \
1906 -image [mapicon $w $m $path]
1907 $w insert end "[escape_path
$path]\n"
1911 proc display_all_files {} {
1912 global ui_index ui_workdir
1913 global file_states file_lists
1915 global files_warning
1917 $ui_index conf -state normal
1918 $ui_workdir conf -state normal
1920 $ui_index delete 0.0 end
1921 $ui_workdir delete 0.0 end
1924 set file_lists($ui_index) [list]
1925 set file_lists($ui_workdir) [list]
1927 set to_display [lsort [array names file_states]]
1928 set display_limit [get_config gui.maxfilesdisplayed]
1929 if {[llength $to_display] > $display_limit} {
1930 if {!$files_warning} {
1931 # do not repeatedly warn:
1933 info_popup [mc "Displaying only
%s of
%s files.
" \
1934 $display_limit [llength $to_display]]
1936 set to_display [lrange $to_display 0 [expr {$display_limit-1}]]
1938 foreach path $to_display {
1939 set s $file_states($path)
1941 set icon_name [lindex $s 1]
1943 set s [string index $m 0]
1944 if {$s ne {U} && $s ne {_}} {
1945 display_all_files_helper $ui_index $path \
1949 if {[string index $m 0] eq {U}} {
1952 set s [string index $m 1]
1955 display_all_files_helper $ui_workdir $path \
1960 $ui_index conf -state disabled
1961 $ui_workdir conf -state disabled
1964 ######################################################################
1969 #define mask_width 14
1970 #define mask_height 15
1971 static unsigned char mask_bits[] = {
1972 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1973 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1974 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1977 image create bitmap file_plain -background white -foreground black -data {
1978 #define plain_width 14
1979 #define plain_height 15
1980 static unsigned char plain_bits[] = {
1981 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1982 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1983 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1984 } -maskdata $filemask
1986 image create bitmap file_mod -background white -foreground blue -data {
1987 #define mod_width 14
1988 #define mod_height 15
1989 static unsigned char mod_bits[] = {
1990 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1991 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1992 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1993 } -maskdata $filemask
1995 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1996 #define file_fulltick_width 14
1997 #define file_fulltick_height 15
1998 static unsigned char file_fulltick_bits
[] = {
1999 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
2000 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
2001 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2002 } -maskdata $filemask
2004 image create bitmap file_question
-background white
-foreground black
-data {
2005 #define file_question_width 14
2006 #define file_question_height 15
2007 static unsigned char file_question_bits
[] = {
2008 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
2009 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
2010 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2011 } -maskdata $filemask
2013 image create bitmap file_removed
-background white
-foreground red
-data {
2014 #define file_removed_width 14
2015 #define file_removed_height 15
2016 static unsigned char file_removed_bits
[] = {
2017 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
2018 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
2019 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
2020 } -maskdata $filemask
2022 image create bitmap file_merge
-background white
-foreground blue
-data {
2023 #define file_merge_width 14
2024 #define file_merge_height 15
2025 static unsigned char file_merge_bits
[] = {
2026 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
2027 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
2028 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
2029 } -maskdata $filemask
2031 image create bitmap file_statechange
-background white
-foreground green
-data {
2032 #define file_statechange_width 14
2033 #define file_statechange_height 15
2034 static unsigned char file_statechange_bits
[] = {
2035 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
2036 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
2037 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
2038 } -maskdata $filemask
2040 set ui_index .vpane.files.index.list
2041 set ui_workdir .vpane.files.workdir.list
2043 set all_icons
(_
$ui_index) file_plain
2044 set all_icons
(A
$ui_index) file_plain
2045 set all_icons
(M
$ui_index) file_fulltick
2046 set all_icons
(D
$ui_index) file_removed
2047 set all_icons
(U
$ui_index) file_merge
2048 set all_icons
(T
$ui_index) file_statechange
2050 set all_icons
(_
$ui_workdir) file_plain
2051 set all_icons
(M
$ui_workdir) file_mod
2052 set all_icons
(D
$ui_workdir) file_question
2053 set all_icons
(U
$ui_workdir) file_merge
2054 set all_icons
(O
$ui_workdir) file_plain
2055 set all_icons
(T
$ui_workdir) file_statechange
2057 set max_status_desc
0
2059 {__
{mc
"Unmodified"}}
2061 {_M
{mc
"Modified, not staged"}}
2062 {M_
{mc
"Staged for commit"}}
2063 {MM
{mc
"Portions staged for commit"}}
2064 {MD
{mc
"Staged for commit, missing"}}
2066 {_T
{mc
"File type changed, not staged"}}
2067 {MT
{mc
"File type changed, old type staged for commit"}}
2068 {AT
{mc
"File type changed, old type staged for commit"}}
2069 {T_
{mc
"File type changed, staged"}}
2070 {TM
{mc
"File type change staged, modification not staged"}}
2071 {TD
{mc
"File type change staged, file missing"}}
2073 {_O
{mc
"Untracked, not staged"}}
2074 {A_
{mc
"Staged for commit"}}
2075 {AM
{mc
"Portions staged for commit"}}
2076 {AD
{mc
"Staged for commit, missing"}}
2079 {D_
{mc
"Staged for removal"}}
2080 {DO
{mc
"Staged for removal, still present"}}
2082 {_U
{mc
"Requires merge resolution"}}
2083 {U_
{mc
"Requires merge resolution"}}
2084 {UU
{mc
"Requires merge resolution"}}
2085 {UM
{mc
"Requires merge resolution"}}
2086 {UD
{mc
"Requires merge resolution"}}
2087 {UT
{mc
"Requires merge resolution"}}
2089 set text
[eval [lindex
$i 1]]
2090 if {$max_status_desc < [string length
$text]} {
2091 set max_status_desc
[string length
$text]
2093 set all_descs
([lindex
$i 0]) $text
2097 ######################################################################
2101 proc scrollbar2many
{list mode args
} {
2102 foreach w
$list {eval $w $mode $args}
2105 proc many2scrollbar
{list mode sb top bottom
} {
2106 $sb set $top $bottom
2107 foreach w
$list {$w $mode moveto
$top}
2110 proc incr_font_size
{font
{amt
1}} {
2111 set sz
[font configure
$font -size]
2113 font configure
$font -size $sz
2114 font configure
${font}bold
-size $sz
2115 font configure
${font}italic
-size $sz
2118 ######################################################################
2122 set starting_gitk_msg
[mc
"Starting gitk... please wait..."]
2124 proc do_gitk
{revs
{is_submodule false
}} {
2125 global current_diff_path file_states current_diff_side ui_index
2128 # -- Always start gitk through whatever we were loaded with. This
2129 # lets us bypass using shell process on Windows systems.
2131 set exe
[_which gitk
-script]
2132 set cmd
[list
[info nameofexecutable
] $exe]
2134 error_popup
[mc
"Couldn't find gitk in PATH"]
2138 if {[info exists env
(GIT_DIR
)]} {
2139 set old_GIT_DIR
$env(GIT_DIR
)
2146 if {!$is_submodule} {
2150 set env
(GIT_DIR
) [file normalize
[gitdir
]]
2152 cd $current_diff_path
2153 if {$revs eq
{--}} {
2154 set s
$file_states($current_diff_path)
2157 switch
-glob -- [lindex
$s 0] {
2158 M_
{ set old_sha1
[lindex
[lindex
$s 2] 1] }
2159 _M
{ set old_sha1
[lindex
[lindex
$s 3] 1] }
2161 if {$current_diff_side eq
$ui_index} {
2162 set old_sha1
[lindex
[lindex
$s 2] 1]
2163 set new_sha1
[lindex
[lindex
$s 3] 1]
2165 set old_sha1
[lindex
[lindex
$s 3] 1]
2169 set revs
$old_sha1...
$new_sha1
2171 if {[info exists env
(GIT_DIR
)]} {
2175 eval exec $cmd $revs "--" "--" &
2177 if {$old_GIT_DIR ne
{}} {
2178 set env
(GIT_DIR
) $old_GIT_DIR
2182 ui_status $
::starting_gitk_msg
2184 ui_ready
$starting_gitk_msg
2189 proc do_git_gui
{} {
2190 global current_diff_path
2192 # -- Always start git gui through whatever we were loaded with. This
2193 # lets us bypass using shell process on Windows systems.
2195 set exe
[list
[_which git
]]
2197 error_popup
[mc
"Couldn't find git gui in PATH"]
2201 if {[info exists env
(GIT_DIR
)]} {
2202 set old_GIT_DIR
$env(GIT_DIR
)
2209 cd $current_diff_path
2211 eval exec $exe gui
&
2213 if {$old_GIT_DIR ne
{}} {
2214 set env
(GIT_DIR
) $old_GIT_DIR
2218 ui_status $
::starting_gitk_msg
2220 ui_ready
$starting_gitk_msg
2225 proc do_explore
{} {
2228 if {[is_Cygwin
] ||
[is_Windows
]} {
2229 set explorer
"explorer.exe"
2230 } elseif
{[is_MacOSX
]} {
2233 # freedesktop.org-conforming system is our best shot
2234 set explorer
"xdg-open"
2236 eval exec $explorer [list
[file nativename
$_gitworktree]] &
2242 proc terminate_me
{win
} {
2244 if {$win ne
{.
}} return
2248 proc do_quit
{{rc
{1}}} {
2249 global ui_comm is_quitting repo_config commit_type
2250 global GITGUI_BCK_exists GITGUI_BCK_i
2251 global ui_comm_spell
2252 global ret_code use_ttk
2254 if {$is_quitting} return
2257 if {[winfo exists
$ui_comm]} {
2258 # -- Stash our current commit buffer.
2260 set save
[gitdir GITGUI_MSG
]
2261 if {$GITGUI_BCK_exists && ![$ui_comm edit modified
]} {
2262 file rename
-force [gitdir GITGUI_BCK
] $save
2263 set GITGUI_BCK_exists
0
2265 set msg
[string trim
[$ui_comm get
0.0 end
]]
2266 regsub
-all -line {[ \r\t]+$
} $msg {} msg
2267 if {(![string match amend
* $commit_type]
2268 ||
[$ui_comm edit modified
])
2271 set fd
[open
$save w
]
2272 puts
-nonewline $fd $msg
2276 catch
{file delete
$save}
2280 # -- Cancel our spellchecker if its running.
2282 if {[info exists ui_comm_spell
]} {
2286 # -- Remove our editor backup, its not needed.
2288 after cancel
$GITGUI_BCK_i
2289 if {$GITGUI_BCK_exists} {
2290 catch
{file delete
[gitdir GITGUI_BCK
]}
2293 # -- Stash our current window geometry into this repository.
2295 set cfg_wmstate
[wm state .
]
2296 if {[catch
{set rc_wmstate
$repo_config(gui.wmstate
)}]} {
2299 if {$cfg_wmstate ne
$rc_wmstate} {
2300 catch
{git config gui.wmstate
$cfg_wmstate}
2302 if {$cfg_wmstate eq
{zoomed
}} {
2303 # on Windows wm geometry will lie about window
2304 # position (but not size) when window is zoomed
2305 # restore the window before querying wm geometry
2308 set cfg_geometry
[list
]
2309 lappend cfg_geometry
[wm geometry .
]
2311 lappend cfg_geometry
[.vpane sashpos
0]
2312 lappend cfg_geometry
[.vpane.files sashpos
0]
2314 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 0]
2315 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 1]
2317 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
2320 if {$cfg_geometry ne
$rc_geometry} {
2321 catch
{git config gui.geometry
$cfg_geometry}
2327 # Briefly enable send again, working around Tk bug
2328 # http://sourceforge.net/tracker/?func=detail&atid=112997&aid=1821174&group_id=12997
2329 tk appname
[appname
]
2338 proc ui_do_rescan
{} {
2339 rescan
{force_first_diff ui_ready
}
2346 proc next_diff
{{after
{}}} {
2347 global next_diff_p next_diff_w next_diff_i
2348 show_diff
$next_diff_p $next_diff_w {} {} $after
2351 proc find_anchor_pos
{lst name
} {
2352 set lid
[lsearch
-sorted -exact $lst $name]
2356 foreach lname
$lst {
2357 if {$lname >= $name} break
2365 proc find_file_from
{flist idx delta path mmask
} {
2368 set len
[llength
$flist]
2369 while {$idx >= 0 && $idx < $len} {
2370 set name
[lindex
$flist $idx]
2372 if {$name ne
$path && [info exists file_states
($name)]} {
2373 set state
[lindex
$file_states($name) 0]
2375 if {$mmask eq
{} ||
[regexp
$mmask $state]} {
2386 proc find_next_diff
{w path
{lno
{}} {mmask
{}}} {
2387 global next_diff_p next_diff_w next_diff_i
2388 global file_lists ui_index ui_workdir
2390 set flist
$file_lists($w)
2392 set lno
[find_anchor_pos
$flist $path]
2397 if {$mmask ne
{} && ![regexp
{(^\^
)|
(\$$
)} $mmask]} {
2398 if {$w eq
$ui_index} {
2401 set mmask
"$mmask\$"
2405 set idx
[find_file_from
$flist $lno 1 $path $mmask]
2408 set idx
[find_file_from
$flist $lno -1 $path $mmask]
2413 set next_diff_p
[lindex
$flist $idx]
2414 set next_diff_i
[expr {$idx+1}]
2421 proc next_diff_after_action
{w path
{lno
{}} {mmask
{}}} {
2422 global current_diff_path
2424 if {$path ne
$current_diff_path} {
2426 } elseif
{[find_next_diff
$w $path $lno $mmask]} {
2429 return {reshow_diff
;}
2433 proc select_first_diff
{after
} {
2436 if {[find_next_diff
$ui_workdir {} 1 {^_?U
}] ||
2437 [find_next_diff
$ui_workdir {} 1 {[^O
]$
}]} {
2444 proc force_first_diff
{after
} {
2445 global ui_workdir current_diff_path file_states
2447 if {[info exists file_states
($current_diff_path)]} {
2448 set state
[lindex
$file_states($current_diff_path) 0]
2454 if {[string first
{U
} $state] >= 0} {
2455 # Already a conflict, do nothing
2456 } elseif
{[find_next_diff
$ui_workdir $current_diff_path {} {^_?U
}]} {
2458 } elseif
{[string index
$state 1] ne
{O
}} {
2459 # Already a diff & no conflicts, do nothing
2460 } elseif
{[find_next_diff
$ui_workdir $current_diff_path {} {[^O
]$
}]} {
2471 proc toggle_or_diff
{w x y
} {
2472 global file_states file_lists current_diff_path ui_index ui_workdir
2473 global last_clicked selected_paths
2475 set pos
[split [$w index @
$x,$y] .
]
2476 set lno
[lindex
$pos 0]
2477 set col [lindex
$pos 1]
2478 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2484 set last_clicked
[list
$w $lno]
2485 array
unset selected_paths
2486 $ui_index tag remove in_sel
0.0 end
2487 $ui_workdir tag remove in_sel
0.0 end
2489 # Determine the state of the file
2490 if {[info exists file_states
($path)]} {
2491 set state
[lindex
$file_states($path) 0]
2496 # Restage the file, or simply show the diff
2497 if {$col == 0 && $y > 1} {
2498 # Conflicts need special handling
2499 if {[string first
{U
} $state] >= 0} {
2500 # $w must always be $ui_workdir, but...
2501 if {$w ne
$ui_workdir} { set lno
{} }
2502 merge_stage_workdir
$path $lno
2506 if {[string index
$state 1] eq
{O
}} {
2512 set after
[next_diff_after_action
$w $path $lno $mmask]
2514 if {$w eq
$ui_index} {
2516 "Unstaging [short_path $path] from commit" \
2518 [concat
$after [list ui_ready
]]
2519 } elseif
{$w eq
$ui_workdir} {
2521 "Adding [short_path $path]" \
2523 [concat
$after [list ui_ready
]]
2526 set selected_paths
($path) 1
2527 show_diff
$path $w $lno
2531 proc add_one_to_selection
{w x y
} {
2532 global file_lists last_clicked selected_paths
2534 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2535 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2541 if {$last_clicked ne
{}
2542 && [lindex
$last_clicked 0] ne
$w} {
2543 array
unset selected_paths
2544 [lindex
$last_clicked 0] tag remove in_sel
0.0 end
2547 set last_clicked
[list
$w $lno]
2548 if {[catch
{set in_sel
$selected_paths($path)}]} {
2552 unset selected_paths
($path)
2553 $w tag remove in_sel
$lno.0 [expr {$lno + 1}].0
2555 set selected_paths
($path) 1
2556 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
2560 proc add_range_to_selection
{w x y
} {
2561 global file_lists last_clicked selected_paths
2563 if {[lindex
$last_clicked 0] ne
$w} {
2564 toggle_or_diff
$w $x $y
2568 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2569 set lc
[lindex
$last_clicked 1]
2578 foreach path
[lrange
$file_lists($w) \
2579 [expr {$begin - 1}] \
2580 [expr {$end - 1}]] {
2581 set selected_paths
($path) 1
2583 $w tag add in_sel
$begin.0 [expr {$end + 1}].0
2586 proc show_more_context
{} {
2588 if {$repo_config(gui.diffcontext
) < 99} {
2589 incr repo_config
(gui.diffcontext
)
2594 proc show_less_context
{} {
2596 if {$repo_config(gui.diffcontext
) > 1} {
2597 incr repo_config
(gui.diffcontext
) -1
2602 ######################################################################
2610 menu .mbar
-tearoff 0
2612 # -- Apple Menu (Mac OS X only)
2614 .mbar add cascade
-label Apple
-menu .mbar.apple
2617 .mbar add cascade
-label [mc Repository
] -menu .mbar.repository
2618 .mbar add cascade
-label [mc Edit
] -menu .mbar.edit
2619 if {[is_enabled branch
]} {
2620 .mbar add cascade
-label [mc Branch
] -menu .mbar.branch
2622 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2623 .mbar add cascade
-label [mc Commit@@noun
] -menu .mbar.commit
2625 if {[is_enabled transport
]} {
2626 .mbar add cascade
-label [mc Merge
] -menu .mbar.merge
2627 .mbar add cascade
-label [mc Remote
] -menu .mbar.remote
2629 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2630 .mbar add cascade
-label [mc Tools
] -menu .mbar.tools
2633 # -- Repository Menu
2635 menu .mbar.repository
2638 .mbar.repository add
command \
2639 -label [mc
"Explore Working Copy"] \
2640 -command {do_explore
}
2641 .mbar.repository add separator
2644 .mbar.repository add
command \
2645 -label [mc
"Browse Current Branch's Files"] \
2646 -command {browser
::new
$current_branch}
2647 set ui_browse_current
[.mbar.repository index last
]
2648 .mbar.repository add
command \
2649 -label [mc
"Browse Branch Files..."] \
2650 -command browser_open
::dialog
2651 .mbar.repository add separator
2653 .mbar.repository add
command \
2654 -label [mc
"Visualize Current Branch's History"] \
2655 -command {do_gitk
$current_branch}
2656 set ui_visualize_current
[.mbar.repository index last
]
2657 .mbar.repository add
command \
2658 -label [mc
"Visualize All Branch History"] \
2659 -command {do_gitk
--all}
2660 .mbar.repository add separator
2662 proc current_branch_write
{args
} {
2663 global current_branch
2664 .mbar.repository entryconf $
::ui_browse_current \
2665 -label [mc
"Browse %s's Files" $current_branch]
2666 .mbar.repository entryconf $
::ui_visualize_current \
2667 -label [mc
"Visualize %s's History" $current_branch]
2669 trace add variable current_branch
write current_branch_write
2671 if {[is_enabled multicommit
]} {
2672 .mbar.repository add
command -label [mc
"Database Statistics"] \
2675 .mbar.repository add
command -label [mc
"Compress Database"] \
2678 .mbar.repository add
command -label [mc
"Verify Database"] \
2679 -command do_fsck_objects
2681 .mbar.repository add separator
2684 .mbar.repository add
command \
2685 -label [mc
"Create Desktop Icon"] \
2686 -command do_cygwin_shortcut
2687 } elseif
{[is_Windows
]} {
2688 .mbar.repository add
command \
2689 -label [mc
"Create Desktop Icon"] \
2690 -command do_windows_shortcut
2691 } elseif
{[is_MacOSX
]} {
2692 .mbar.repository add
command \
2693 -label [mc
"Create Desktop Icon"] \
2694 -command do_macosx_app
2699 proc
::tk
::mac
::Quit
{args
} { do_quit
}
2701 .mbar.repository add
command -label [mc Quit
] \
2709 .mbar.edit add
command -label [mc Undo
] \
2710 -command {catch
{[focus
] edit undo
}} \
2712 .mbar.edit add
command -label [mc Redo
] \
2713 -command {catch
{[focus
] edit redo
}} \
2715 .mbar.edit add separator
2716 .mbar.edit add
command -label [mc Cut
] \
2717 -command {catch
{tk_textCut
[focus
]}} \
2719 .mbar.edit add
command -label [mc Copy
] \
2720 -command {catch
{tk_textCopy
[focus
]}} \
2722 .mbar.edit add
command -label [mc Paste
] \
2723 -command {catch
{tk_textPaste
[focus
]; [focus
] see insert
}} \
2725 .mbar.edit add
command -label [mc Delete
] \
2726 -command {catch
{[focus
] delete sel.first sel.last
}} \
2728 .mbar.edit add separator
2729 .mbar.edit add
command -label [mc
"Select All"] \
2730 -command {catch
{[focus
] tag add sel
0.0 end
}} \
2735 if {[is_enabled branch
]} {
2738 .mbar.branch add
command -label [mc
"Create..."] \
2739 -command branch_create
::dialog \
2741 lappend disable_on_lock
[list .mbar.branch entryconf \
2742 [.mbar.branch index last
] -state]
2744 .mbar.branch add
command -label [mc
"Checkout..."] \
2745 -command branch_checkout
::dialog \
2747 lappend disable_on_lock
[list .mbar.branch entryconf \
2748 [.mbar.branch index last
] -state]
2750 .mbar.branch add
command -label [mc
"Rename..."] \
2751 -command branch_rename
::dialog
2752 lappend disable_on_lock
[list .mbar.branch entryconf \
2753 [.mbar.branch index last
] -state]
2755 .mbar.branch add
command -label [mc
"Delete..."] \
2756 -command branch_delete
::dialog
2757 lappend disable_on_lock
[list .mbar.branch entryconf \
2758 [.mbar.branch index last
] -state]
2760 .mbar.branch add
command -label [mc
"Reset..."] \
2761 -command merge
::reset_hard
2762 lappend disable_on_lock
[list .mbar.branch entryconf \
2763 [.mbar.branch index last
] -state]
2768 proc commit_btn_caption
{} {
2769 if {[is_enabled nocommit
]} {
2772 return [mc Commit@@verb
]
2776 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2779 if {![is_enabled nocommit
]} {
2780 .mbar.commit add radiobutton \
2781 -label [mc
"New Commit"] \
2782 -command do_select_commit_type \
2783 -variable selected_commit_type \
2785 lappend disable_on_lock \
2786 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2788 .mbar.commit add radiobutton \
2789 -label [mc
"Amend Last Commit"] \
2790 -command do_select_commit_type \
2791 -variable selected_commit_type \
2793 lappend disable_on_lock \
2794 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2796 .mbar.commit add separator
2799 .mbar.commit add
command -label [mc Rescan
] \
2800 -command ui_do_rescan \
2802 lappend disable_on_lock \
2803 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2805 .mbar.commit add
command -label [mc
"Stage To Commit"] \
2806 -command do_add_selection \
2808 lappend disable_on_lock \
2809 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2811 .mbar.commit add
command -label [mc
"Stage Changed Files To Commit"] \
2812 -command do_add_all \
2814 lappend disable_on_lock \
2815 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2817 .mbar.commit add
command -label [mc
"Unstage From Commit"] \
2818 -command do_unstage_selection \
2820 lappend disable_on_lock \
2821 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2823 .mbar.commit add
command -label [mc
"Revert Changes"] \
2824 -command do_revert_selection \
2826 lappend disable_on_lock \
2827 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2829 .mbar.commit add separator
2831 .mbar.commit add
command -label [mc
"Show Less Context"] \
2832 -command show_less_context \
2833 -accelerator $M1T-\
-
2835 .mbar.commit add
command -label [mc
"Show More Context"] \
2836 -command show_more_context \
2839 .mbar.commit add separator
2841 if {![is_enabled nocommitmsg
]} {
2842 .mbar.commit add
command -label [mc
"Sign Off"] \
2843 -command do_signoff \
2847 .mbar.commit add
command -label [commit_btn_caption
] \
2848 -command do_commit \
2849 -accelerator $M1T-Return
2850 lappend disable_on_lock \
2851 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2856 if {[is_enabled branch
]} {
2858 .mbar.merge add
command -label [mc
"Local Merge..."] \
2859 -command merge
::dialog \
2861 lappend disable_on_lock \
2862 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2863 .mbar.merge add
command -label [mc
"Abort Merge..."] \
2864 -command merge
::reset_hard
2865 lappend disable_on_lock \
2866 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2871 if {[is_enabled transport
]} {
2874 .mbar.remote add
command \
2875 -label [mc
"Add..."] \
2876 -command remote_add
::dialog \
2878 .mbar.remote add
command \
2879 -label [mc
"Push..."] \
2880 -command do_push_anywhere \
2882 .mbar.remote add
command \
2883 -label [mc
"Delete Branch..."] \
2884 -command remote_branch_delete
::dialog
2888 proc
::tk
::mac
::ShowPreferences
{} {do_options
}
2892 .mbar.edit add separator
2893 .mbar.edit add
command -label [mc
"Options..."] \
2899 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2900 set tools_menubar .mbar.tools
2902 $tools_menubar add separator
2903 $tools_menubar add
command -label [mc
"Add..."] -command tools_add
::dialog
2904 $tools_menubar add
command -label [mc
"Remove..."] -command tools_remove
::dialog
2906 if {[array names repo_config guitool.
*.cmd
] ne
{}} {
2913 .mbar add cascade
-label [mc Help
] -menu .mbar.
help
2917 .mbar.apple add
command -label [mc
"About %s" [appname
]] \
2919 .mbar.apple add separator
2921 .mbar.
help add
command -label [mc
"About %s" [appname
]] \
2924 . configure
-menu .mbar
2926 set doc_path
[githtmldir
]
2927 if {$doc_path ne
{}} {
2928 set doc_path
[file join $doc_path index.html
]
2931 set doc_path
[exec cygpath
--mixed $doc_path]
2935 if {[file isfile
$doc_path]} {
2936 set doc_url
"file:$doc_path"
2938 set doc_url
{http
://www.kernel.org
/pub
/software
/scm
/git
/docs
/}
2941 proc start_browser
{url
} {
2942 git
"web--browse" $url
2945 .mbar.
help add
command -label [mc
"Online Documentation"] \
2946 -command [list start_browser
$doc_url]
2948 .mbar.
help add
command -label [mc
"Show SSH Key"] \
2951 unset doc_path doc_url
2953 # -- Standard bindings
2955 wm protocol . WM_DELETE_WINDOW do_quit
2956 bind all
<$M1B-Key-q> do_quit
2957 bind all
<$M1B-Key-Q> do_quit
2958 bind all
<$M1B-Key-w> {destroy
[winfo toplevel
%W
]}
2959 bind all
<$M1B-Key-W> {destroy
[winfo toplevel
%W
]}
2961 set subcommand_args
{}
2963 set s
"usage: $::argv0 $::subcommand $::subcommand_args"
2964 if {[tk windowingsystem
] eq
"win32"} {
2966 tk_messageBox
-icon info
-message $s \
2974 proc normalize_relpath
{path
} {
2976 foreach item
[file split $path] {
2977 if {$item eq
{.
}} continue
2978 if {$item eq
{..
} && [llength
$elements] > 0
2979 && [lindex
$elements end
] ne
{..
}} {
2980 set elements
[lrange
$elements 0 end-1
]
2983 lappend elements
$item
2985 return [eval file join $elements]
2988 # -- Not a normal commit type invocation? Do that instead!
2990 switch
-- $subcommand {
2993 if {$subcommand eq
"blame"} {
2994 set subcommand_args
{[--line=<num
>] rev? path
}
2996 set subcommand_args
{rev? path
}
2998 if {$argv eq
{}} usage
3004 if {$is_path ||
[file exists
$_prefix$a]} {
3005 if {$path ne
{}} usage
3006 set path
[normalize_relpath
$_prefix$a]
3008 } elseif
{$a eq
{--}} {
3010 if {$head ne
{}} usage
3015 } elseif
{[regexp
{^
--line=(\d
+)$
} $a a lnum
]} {
3016 if {$jump_spec ne
{} ||
$head ne
{}} usage
3017 set jump_spec
[list
$lnum]
3018 } elseif
{$head eq
{}} {
3019 if {$head ne
{}} usage
3028 if {$head ne
{} && $path eq
{}} {
3029 set path
[normalize_relpath
$_prefix$head]
3036 if {[regexp
{^
[0-9a-f]{1,39}$
} $head]} {
3038 set head [git rev-parse
--verify $head]
3040 if {[tk windowingsystem
] eq
"win32"} {
3041 tk_messageBox
-icon error
-title [mc Error
] -message $err
3048 set current_branch
$head
3052 switch
-- $subcommand {
3054 if {$jump_spec ne
{}} usage
3056 if {$path ne
{} && [file isdirectory
$path]} {
3057 set head $current_branch
3063 browser
::new
$head $path
3066 if {$head eq
{} && ![file exists
$path]} {
3067 catch
{wm withdraw .
}
3071 -title [mc
"git-gui: fatal error"] \
3072 -message [mc
"fatal: cannot stat path %s: No such file or directory" $path]
3075 blame
::new
$head $path $jump_spec
3082 if {[llength
$argv] != 0} {
3085 # fall through to setup UI for commits
3088 set err
"usage: $argv0 \[{blame|browser|citool}\]"
3089 if {[tk windowingsystem
] eq
"win32"} {
3091 tk_messageBox
-icon error
-message $err \
3102 ${NS}::frame .branch
3103 if {!$use_ttk} {.branch configure
-borderwidth 1 -relief sunken
}
3104 ${NS}::label .branch.l1 \
3105 -text [mc
"Current Branch:"] \
3108 ${NS}::label .branch.cb \
3109 -textvariable current_branch \
3112 pack .branch.l1
-side left
3113 pack .branch.cb
-side left
-fill x
3114 pack .branch
-side top
-fill x
3116 # -- Main Window Layout
3118 ${NS}::panedwindow .vpane
-orient horizontal
3119 ${NS}::panedwindow .vpane.files
-orient vertical
3121 .vpane add .vpane.files
3123 .vpane add .vpane.files
-sticky nsew
-height 100 -width 200
3125 pack .vpane
-anchor n
-side top
-fill both
-expand 1
3127 # -- Index File List
3129 ${NS}::frame .vpane.files.index
-height 100 -width 200
3130 tlabel .vpane.files.index.title \
3131 -text [mc
"Staged Changes (Will Commit)"] \
3132 -background lightgreen
-foreground black
3133 text
$ui_index -background white
-foreground black \
3135 -width 20 -height 10 \
3137 -cursor $cursor_ptr \
3138 -xscrollcommand {.vpane.files.index.sx
set} \
3139 -yscrollcommand {.vpane.files.index.sy
set} \
3141 ${NS}::scrollbar .vpane.files.index.sx
-orient h
-command [list
$ui_index xview
]
3142 ${NS}::scrollbar .vpane.files.index.sy
-orient v
-command [list
$ui_index yview
]
3143 pack .vpane.files.index.title
-side top
-fill x
3144 pack .vpane.files.index.sx
-side bottom
-fill x
3145 pack .vpane.files.index.sy
-side right
-fill y
3146 pack
$ui_index -side left
-fill both
-expand 1
3148 # -- Working Directory File List
3150 ${NS}::frame .vpane.files.workdir
-height 100 -width 200
3151 tlabel .vpane.files.workdir.title
-text [mc
"Unstaged Changes"] \
3152 -background lightsalmon
-foreground black
3153 text
$ui_workdir -background white
-foreground black \
3155 -width 20 -height 10 \
3157 -cursor $cursor_ptr \
3158 -xscrollcommand {.vpane.files.workdir.sx
set} \
3159 -yscrollcommand {.vpane.files.workdir.sy
set} \
3161 ${NS}::scrollbar .vpane.files.workdir.sx
-orient h
-command [list
$ui_workdir xview
]
3162 ${NS}::scrollbar .vpane.files.workdir.sy
-orient v
-command [list
$ui_workdir yview
]
3163 pack .vpane.files.workdir.title
-side top
-fill x
3164 pack .vpane.files.workdir.sx
-side bottom
-fill x
3165 pack .vpane.files.workdir.sy
-side right
-fill y
3166 pack
$ui_workdir -side left
-fill both
-expand 1
3168 .vpane.files add .vpane.files.workdir
3169 .vpane.files add .vpane.files.index
3171 .vpane.files paneconfigure .vpane.files.workdir
-sticky news
3172 .vpane.files paneconfigure .vpane.files.index
-sticky news
3175 foreach i
[list
$ui_index $ui_workdir] {
3177 $i tag conf in_diff
-background [$i tag cget in_sel
-background]
3181 # -- Diff and Commit Area
3183 ${NS}::frame .vpane.lower
-height 300 -width 400
3184 ${NS}::frame .vpane.lower.commarea
3185 ${NS}::frame .vpane.lower.
diff -relief sunken
-borderwidth 1
3186 pack .vpane.lower.
diff -fill both
-expand 1
3187 pack .vpane.lower.commarea
-side bottom
-fill x
3188 .vpane add .vpane.lower
3189 if {!$use_ttk} {.vpane paneconfigure .vpane.lower
-sticky nsew
}
3191 # -- Commit Area Buttons
3193 ${NS}::frame .vpane.lower.commarea.buttons
3194 ${NS}::label .vpane.lower.commarea.buttons.l
-text {} \
3197 pack .vpane.lower.commarea.buttons.l
-side top
-fill x
3198 pack .vpane.lower.commarea.buttons
-side left
-fill y
3200 ${NS}::button .vpane.lower.commarea.buttons.rescan
-text [mc Rescan
] \
3201 -command ui_do_rescan
3202 pack .vpane.lower.commarea.buttons.rescan
-side top
-fill x
3203 lappend disable_on_lock \
3204 {.vpane.lower.commarea.buttons.rescan conf
-state}
3206 ${NS}::button .vpane.lower.commarea.buttons.incall
-text [mc
"Stage Changed"] \
3208 pack .vpane.lower.commarea.buttons.incall
-side top
-fill x
3209 lappend disable_on_lock \
3210 {.vpane.lower.commarea.buttons.incall conf
-state}
3212 if {![is_enabled nocommitmsg
]} {
3213 ${NS}::button .vpane.lower.commarea.buttons.signoff
-text [mc
"Sign Off"] \
3215 pack .vpane.lower.commarea.buttons.signoff
-side top
-fill x
3218 ${NS}::button .vpane.lower.commarea.buttons.commit
-text [commit_btn_caption
] \
3220 pack .vpane.lower.commarea.buttons.commit
-side top
-fill x
3221 lappend disable_on_lock \
3222 {.vpane.lower.commarea.buttons.commit conf
-state}
3224 if {![is_enabled nocommit
]} {
3225 ${NS}::button .vpane.lower.commarea.buttons.push
-text [mc Push
] \
3226 -command do_push_anywhere
3227 pack .vpane.lower.commarea.buttons.push
-side top
-fill x
3230 # -- Commit Message Buffer
3232 ${NS}::frame .vpane.lower.commarea.buffer
3233 ${NS}::frame .vpane.lower.commarea.buffer.header
3234 set ui_comm .vpane.lower.commarea.buffer.t
3235 set ui_coml .vpane.lower.commarea.buffer.header.l
3237 if {![is_enabled nocommit
]} {
3238 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.new \
3239 -text [mc
"New Commit"] \
3240 -command do_select_commit_type \
3241 -variable selected_commit_type \
3243 lappend disable_on_lock \
3244 [list .vpane.lower.commarea.buffer.header.new conf
-state]
3245 ${NS}::radiobutton .vpane.lower.commarea.buffer.header.amend \
3246 -text [mc
"Amend Last Commit"] \
3247 -command do_select_commit_type \
3248 -variable selected_commit_type \
3250 lappend disable_on_lock \
3251 [list .vpane.lower.commarea.buffer.header.amend conf
-state]
3254 ${NS}::label
$ui_coml \
3257 proc trace_commit_type
{varname args
} {
3258 global ui_coml commit_type
3259 switch
-glob -- $commit_type {
3260 initial
{set txt
[mc
"Initial Commit Message:"]}
3261 amend
{set txt
[mc
"Amended Commit Message:"]}
3262 amend-initial
{set txt
[mc
"Amended Initial Commit Message:"]}
3263 amend-merge
{set txt
[mc
"Amended Merge Commit Message:"]}
3264 merge
{set txt
[mc
"Merge Commit Message:"]}
3265 * {set txt
[mc
"Commit Message:"]}
3267 $ui_coml conf
-text $txt
3269 trace add variable commit_type
write trace_commit_type
3270 pack
$ui_coml -side left
-fill x
3272 if {![is_enabled nocommit
]} {
3273 pack .vpane.lower.commarea.buffer.header.amend
-side right
3274 pack .vpane.lower.commarea.buffer.header.new
-side right
3277 text
$ui_comm -background white
-foreground black \
3281 -autoseparators true \
3283 -width $repo_config(gui.commitmsgwidth
) -height 9 -wrap none \
3285 -yscrollcommand {.vpane.lower.commarea.buffer.sby
set}
3286 ${NS}::scrollbar .vpane.lower.commarea.buffer.sby \
3287 -command [list
$ui_comm yview
]
3288 pack .vpane.lower.commarea.buffer.header
-side top
-fill x
3289 pack .vpane.lower.commarea.buffer.sby
-side right
-fill y
3290 pack
$ui_comm -side left
-fill y
3291 pack .vpane.lower.commarea.buffer
-side left
-fill y
3293 # -- Commit Message Buffer Context Menu
3295 set ctxm .vpane.lower.commarea.buffer.ctxm
3296 menu
$ctxm -tearoff 0
3299 -command {tk_textCut
$ui_comm}
3302 -command {tk_textCopy
$ui_comm}
3305 -command {tk_textPaste
$ui_comm}
3307 -label [mc Delete
] \
3308 -command {catch
{$ui_comm delete sel.first sel.last
}}
3311 -label [mc
"Select All"] \
3312 -command {focus
$ui_comm;$ui_comm tag add sel
0.0 end
}
3314 -label [mc
"Copy All"] \
3316 $ui_comm tag add sel
0.0 end
3317 tk_textCopy
$ui_comm
3318 $ui_comm tag remove sel
0.0 end
3322 -label [mc
"Sign Off"] \
3324 set ui_comm_ctxm
$ctxm
3328 proc trace_current_diff_path
{varname args
} {
3329 global current_diff_path diff_actions file_states
3330 if {$current_diff_path eq
{}} {
3336 set p
$current_diff_path
3337 set s
[mapdesc
[lindex
$file_states($p) 0] $p]
3339 set p
[escape_path
$p]
3343 .vpane.lower.
diff.header.status configure
-text $s
3344 .vpane.lower.
diff.header.
file configure
-text $f
3345 .vpane.lower.
diff.header.path configure
-text $p
3346 foreach w
$diff_actions {
3350 trace add variable current_diff_path
write trace_current_diff_path
3352 gold_frame .vpane.lower.
diff.header
3353 tlabel .vpane.lower.
diff.header.status \
3356 -width $max_status_desc \
3359 tlabel .vpane.lower.
diff.header.
file \
3364 tlabel .vpane.lower.
diff.header.path \
3369 pack .vpane.lower.
diff.header.status
-side left
3370 pack .vpane.lower.
diff.header.
file -side left
3371 pack .vpane.lower.
diff.header.path
-fill x
3372 set ctxm .vpane.lower.
diff.header.ctxm
3373 menu
$ctxm -tearoff 0
3381 -- $current_diff_path
3383 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3384 bind_button3 .vpane.lower.
diff.header.path
"tk_popup $ctxm %X %Y"
3388 ${NS}::frame .vpane.lower.
diff.body
3389 set ui_diff .vpane.lower.
diff.body.t
3390 text
$ui_diff -background white
-foreground black \
3392 -width 80 -height 5 -wrap none \
3394 -xscrollcommand {.vpane.lower.
diff.body.sbx
set} \
3395 -yscrollcommand {.vpane.lower.
diff.body.sby
set} \
3397 catch
{$ui_diff configure
-tabstyle wordprocessor
}
3398 ${NS}::scrollbar .vpane.lower.
diff.body.sbx
-orient horizontal \
3399 -command [list
$ui_diff xview
]
3400 ${NS}::scrollbar .vpane.lower.
diff.body.sby
-orient vertical \
3401 -command [list
$ui_diff yview
]
3402 pack .vpane.lower.
diff.body.sbx
-side bottom
-fill x
3403 pack .vpane.lower.
diff.body.sby
-side right
-fill y
3404 pack
$ui_diff -side left
-fill both
-expand 1
3405 pack .vpane.lower.
diff.header
-side top
-fill x
3406 pack .vpane.lower.
diff.body
-side bottom
-fill both
-expand 1
3408 foreach
{n c
} {0 black
1 red4
2 green4
3 yellow4
4 blue4
5 magenta4
6 cyan4
7 grey60
} {
3409 $ui_diff tag configure clr4
$n -background $c
3410 $ui_diff tag configure clri4
$n -foreground $c
3411 $ui_diff tag configure clr3
$n -foreground $c
3412 $ui_diff tag configure clri3
$n -background $c
3414 $ui_diff tag configure clr1
-font font_diffbold
3415 $ui_diff tag configure clr4
-underline 1
3417 $ui_diff tag conf d_info
-foreground blue
-font font_diffbold
3419 $ui_diff tag conf d_cr
-elide true
3420 $ui_diff tag conf d_@
-font font_diffbold
3421 $ui_diff tag conf d_
+ -foreground {#00a000}
3422 $ui_diff tag conf d_-
-foreground red
3424 $ui_diff tag conf d_
++ -foreground {#00a000}
3425 $ui_diff tag conf d_--
-foreground red
3426 $ui_diff tag conf d_
+s \
3427 -foreground {#00a000} \
3428 -background {#e2effa}
3429 $ui_diff tag conf d_-s \
3431 -background {#e2effa}
3432 $ui_diff tag conf d_s
+ \
3433 -foreground {#00a000} \
3435 $ui_diff tag conf d_s- \
3439 $ui_diff tag conf d
< \
3440 -foreground orange \
3442 $ui_diff tag conf d
= \
3443 -foreground orange \
3445 $ui_diff tag conf d
> \
3446 -foreground orange \
3449 $ui_diff tag raise sel
3451 # -- Diff Body Context Menu
3454 proc create_common_diff_popup
{ctxm
} {
3456 -label [mc Refresh
] \
3457 -command reshow_diff
3458 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3461 -command {tk_textCopy
$ui_diff}
3462 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3464 -label [mc
"Select All"] \
3465 -command {focus
$ui_diff;$ui_diff tag add sel
0.0 end
}
3466 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3468 -label [mc
"Copy All"] \
3470 $ui_diff tag add sel
0.0 end
3471 tk_textCopy
$ui_diff
3472 $ui_diff tag remove sel
0.0 end
3474 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3477 -label [mc
"Decrease Font Size"] \
3478 -command {incr_font_size font_diff
-1}
3479 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3481 -label [mc
"Increase Font Size"] \
3482 -command {incr_font_size font_diff
1}
3483 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3487 build_encoding_menu
$emenu [list force_diff_encoding
]
3489 -label [mc
"Encoding"] \
3491 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3493 $ctxm add
command -label [mc
"Options..."] \
3497 set ctxm .vpane.lower.
diff.body.ctxm
3498 menu
$ctxm -tearoff 0
3500 -label [mc
"Apply/Reverse Hunk"] \
3501 -command {apply_hunk
$cursorX $cursorY}
3502 set ui_diff_applyhunk
[$ctxm index last
]
3503 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyhunk -state]
3505 -label [mc
"Apply/Reverse Line"] \
3506 -command {apply_range_or_line
$cursorX $cursorY; do_rescan
}
3507 set ui_diff_applyline
[$ctxm index last
]
3508 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyline -state]
3511 -label [mc
"Show Less Context"] \
3512 -command show_less_context
3513 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3515 -label [mc
"Show More Context"] \
3516 -command show_more_context
3517 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3519 create_common_diff_popup
$ctxm
3521 set ctxmmg .vpane.lower.
diff.body.ctxmmg
3522 menu
$ctxmmg -tearoff 0
3523 $ctxmmg add
command \
3524 -label [mc
"Run Merge Tool"] \
3525 -command {merge_resolve_tool
}
3526 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3527 $ctxmmg add separator
3528 $ctxmmg add
command \
3529 -label [mc
"Use Remote Version"] \
3530 -command {merge_resolve_one
3}
3531 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3532 $ctxmmg add
command \
3533 -label [mc
"Use Local Version"] \
3534 -command {merge_resolve_one
2}
3535 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3536 $ctxmmg add
command \
3537 -label [mc
"Revert To Base"] \
3538 -command {merge_resolve_one
1}
3539 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3540 $ctxmmg add separator
3541 $ctxmmg add
command \
3542 -label [mc
"Show Less Context"] \
3543 -command show_less_context
3544 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3545 $ctxmmg add
command \
3546 -label [mc
"Show More Context"] \
3547 -command show_more_context
3548 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3549 $ctxmmg add separator
3550 create_common_diff_popup
$ctxmmg
3552 set ctxmsm .vpane.lower.
diff.body.ctxmsm
3553 menu
$ctxmsm -tearoff 0
3554 $ctxmsm add
command \
3555 -label [mc
"Visualize These Changes In The Submodule"] \
3556 -command {do_gitk
-- true
}
3557 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3558 $ctxmsm add
command \
3559 -label [mc
"Visualize Current Branch History In The Submodule"] \
3560 -command {do_gitk
{} true
}
3561 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3562 $ctxmsm add
command \
3563 -label [mc
"Visualize All Branch History In The Submodule"] \
3564 -command {do_gitk
--all true
}
3565 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3566 $ctxmsm add separator
3567 $ctxmsm add
command \
3568 -label [mc
"Start git gui In The Submodule"] \
3569 -command {do_git_gui
}
3570 lappend diff_actions
[list
$ctxmsm entryconf
[$ctxmsm index last
] -state]
3571 $ctxmsm add separator
3572 create_common_diff_popup
$ctxmsm
3574 proc has_textconv
{path
} {
3575 if {[is_config_false gui.textconv
]} {
3578 set filter
[gitattr
$path diff set]
3579 set textconv
[get_config
[join [list
diff $filter textconv
] .
]]
3580 if {$filter ne
{set} && $textconv ne
{}} {
3587 proc popup_diff_menu
{ctxm ctxmmg ctxmsm x y X Y
} {
3588 global current_diff_path file_states
3591 if {[info exists file_states
($current_diff_path)]} {
3592 set state
[lindex
$file_states($current_diff_path) 0]
3596 if {[string first
{U
} $state] >= 0} {
3597 tk_popup
$ctxmmg $X $Y
3598 } elseif
{$
::is_submodule_diff
} {
3599 tk_popup
$ctxmsm $X $Y
3601 set has_range
[expr {[$
::ui_diff tag nextrange sel
0.0] != {}}]
3602 if {$
::ui_index eq $
::current_diff_side
} {
3603 set l
[mc
"Unstage Hunk From Commit"]
3605 set t
[mc
"Unstage Lines From Commit"]
3607 set t
[mc
"Unstage Line From Commit"]
3610 set l
[mc
"Stage Hunk For Commit"]
3612 set t
[mc
"Stage Lines For Commit"]
3614 set t
[mc
"Stage Line For Commit"]
3618 ||
$current_diff_path eq
{}
3621 ||
[string match
{?T
} $state]
3622 ||
[string match
{T?
} $state]
3623 ||
[has_textconv
$current_diff_path]} {
3628 $ctxm entryconf $
::ui_diff_applyhunk
-state $s -label $l
3629 $ctxm entryconf $
::ui_diff_applyline
-state $s -label $t
3630 tk_popup
$ctxm $X $Y
3633 bind_button3
$ui_diff [list popup_diff_menu
$ctxm $ctxmmg $ctxmsm %x
%y
%X
%Y
]
3637 set main_status
[::status_bar
::new .status
]
3638 pack .status
-anchor w
-side bottom
-fill x
3639 $main_status show
[mc
"Initializing..."]
3643 proc on_ttk_pane_mapped
{w pane pos
} {
3645 after
0 [list after idle
[list
$w sashpos
$pane $pos]]
3647 proc on_tk_pane_mapped
{w pane x y
} {
3649 after
0 [list after idle
[list
$w sash place
$pane $x $y]]
3651 proc on_application_mapped
{} {
3652 global repo_config use_ttk
3654 set gm
$repo_config(gui.geometry
)
3657 [list on_ttk_pane_mapped
%W
0 [lindex
$gm 1]]
3658 bind .vpane.files
<Map
> \
3659 [list on_ttk_pane_mapped
%W
0 [lindex
$gm 2]]
3662 [list on_tk_pane_mapped
%W
0 \
3664 [lindex
[.vpane sash coord
0] 1]]
3665 bind .vpane.files
<Map
> \
3666 [list on_tk_pane_mapped
%W
0 \
3667 [lindex
[.vpane.files sash coord
0] 0] \
3670 wm geometry .
[lindex
$gm 0]
3672 if {[info exists repo_config
(gui.geometry
)]} {
3673 bind .
<Map
> [list on_application_mapped
]
3674 wm geometry .
[lindex
$repo_config(gui.geometry
) 0]
3677 # -- Load window state
3679 if {[info exists repo_config
(gui.wmstate
)]} {
3680 catch
{wm state .
$repo_config(gui.wmstate
)}
3685 bind $ui_comm <$M1B-Key-Return> {do_commit
;break}
3686 bind $ui_comm <$M1B-Key-t> {do_add_selection
;break}
3687 bind $ui_comm <$M1B-Key-T> {do_add_selection
;break}
3688 bind $ui_comm <$M1B-Key-u> {do_unstage_selection
;break}
3689 bind $ui_comm <$M1B-Key-U> {do_unstage_selection
;break}
3690 bind $ui_comm <$M1B-Key-j> {do_revert_selection
;break}
3691 bind $ui_comm <$M1B-Key-J> {do_revert_selection
;break}
3692 bind $ui_comm <$M1B-Key-i> {do_add_all
;break}
3693 bind $ui_comm <$M1B-Key-I> {do_add_all
;break}
3694 bind $ui_comm <$M1B-Key-x> {tk_textCut
%W
;break}
3695 bind $ui_comm <$M1B-Key-X> {tk_textCut
%W
;break}
3696 bind $ui_comm <$M1B-Key-c> {tk_textCopy
%W
;break}
3697 bind $ui_comm <$M1B-Key-C> {tk_textCopy
%W
;break}
3698 bind $ui_comm <$M1B-Key-v> {tk_textPaste
%W
; %W see insert
; break}
3699 bind $ui_comm <$M1B-Key-V> {tk_textPaste
%W
; %W see insert
; break}
3700 bind $ui_comm <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3701 bind $ui_comm <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3702 bind $ui_comm <$M1B-Key-minus> {show_less_context
;break}
3703 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context
;break}
3704 bind $ui_comm <$M1B-Key-equal> {show_more_context
;break}
3705 bind $ui_comm <$M1B-Key-plus> {show_more_context
;break}
3706 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context
;break}
3708 bind $ui_diff <$M1B-Key-x> {tk_textCopy
%W
;break}
3709 bind $ui_diff <$M1B-Key-X> {tk_textCopy
%W
;break}
3710 bind $ui_diff <$M1B-Key-c> {tk_textCopy
%W
;break}
3711 bind $ui_diff <$M1B-Key-C> {tk_textCopy
%W
;break}
3712 bind $ui_diff <$M1B-Key-v> {break}
3713 bind $ui_diff <$M1B-Key-V> {break}
3714 bind $ui_diff <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3715 bind $ui_diff <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3716 bind $ui_diff <Key-Up
> {catch
{%W yview scroll
-1 units
};break}
3717 bind $ui_diff <Key-Down
> {catch
{%W yview scroll
1 units
};break}
3718 bind $ui_diff <Key-Left
> {catch
{%W xview scroll
-1 units
};break}
3719 bind $ui_diff <Key-Right
> {catch
{%W xview scroll
1 units
};break}
3720 bind $ui_diff <Key-k
> {catch
{%W yview scroll
-1 units
};break}
3721 bind $ui_diff <Key-j
> {catch
{%W yview scroll
1 units
};break}
3722 bind $ui_diff <Key-h
> {catch
{%W xview scroll
-1 units
};break}
3723 bind $ui_diff <Key-l
> {catch
{%W xview scroll
1 units
};break}
3724 bind $ui_diff <Control-Key-b
> {catch
{%W yview scroll
-1 pages
};break}
3725 bind $ui_diff <Control-Key-f
> {catch
{%W yview scroll
1 pages
};break}
3726 bind $ui_diff <Button-1
> {focus
%W
}
3728 if {[is_enabled branch
]} {
3729 bind .
<$M1B-Key-n> branch_create
::dialog
3730 bind .
<$M1B-Key-N> branch_create
::dialog
3731 bind .
<$M1B-Key-o> branch_checkout
::dialog
3732 bind .
<$M1B-Key-O> branch_checkout
::dialog
3733 bind .
<$M1B-Key-m> merge
::dialog
3734 bind .
<$M1B-Key-M> merge
::dialog
3736 if {[is_enabled transport
]} {
3737 bind .
<$M1B-Key-p> do_push_anywhere
3738 bind .
<$M1B-Key-P> do_push_anywhere
3741 bind .
<Key-F5
> ui_do_rescan
3742 bind .
<$M1B-Key-r> ui_do_rescan
3743 bind .
<$M1B-Key-R> ui_do_rescan
3744 bind .
<$M1B-Key-s> do_signoff
3745 bind .
<$M1B-Key-S> do_signoff
3746 bind .
<$M1B-Key-t> do_add_selection
3747 bind .
<$M1B-Key-T> do_add_selection
3748 bind .
<$M1B-Key-j> do_revert_selection
3749 bind .
<$M1B-Key-J> do_revert_selection
3750 bind .
<$M1B-Key-i> do_add_all
3751 bind .
<$M1B-Key-I> do_add_all
3752 bind .
<$M1B-Key-minus> {show_less_context
;break}
3753 bind .
<$M1B-Key-KP_Subtract> {show_less_context
;break}
3754 bind .
<$M1B-Key-equal> {show_more_context
;break}
3755 bind .
<$M1B-Key-plus> {show_more_context
;break}
3756 bind .
<$M1B-Key-KP_Add> {show_more_context
;break}
3757 bind .
<$M1B-Key-Return> do_commit
3758 foreach i
[list
$ui_index $ui_workdir] {
3759 bind $i <Button-1
> "toggle_or_diff $i %x %y; break"
3760 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3761 bind $i <Shift-Button-1
> "add_range_to_selection $i %x %y; break"
3765 set file_lists
($ui_index) [list
]
3766 set file_lists
($ui_workdir) [list
]
3768 wm title .
"[appname] ([reponame]) [file normalize $_gitworktree]"
3769 focus
-force $ui_comm
3771 # -- Warn the user about environmental problems. Cygwin's Tcl
3772 # does *not* pass its env array onto any processes it spawns.
3773 # This means that git processes get none of our environment.
3778 set msg
[mc
"Possible environment issues exist.
3780 The following environment variables are probably
3781 going to be ignored by any Git subprocess run
3785 foreach name
[array names env
] {
3786 switch
-regexp -- $name {
3787 {^GIT_INDEX_FILE$
} -
3788 {^GIT_OBJECT_DIRECTORY$
} -
3789 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$
} -
3791 {^GIT_EXTERNAL_DIFF$
} -
3795 {^GIT_
(AUTHOR|COMMITTER
)_DATE$
} {
3796 append msg
" - $name\n"
3799 {^GIT_
(AUTHOR|COMMITTER
)_
(NAME|EMAIL
)$
} {
3800 append msg
" - $name\n"
3802 set suggest_user
$name
3806 if {$ignored_env > 0} {
3808 This is due to a known issue with the
3809 Tcl binary distributed by Cygwin."]
3811 if {$suggest_user ne
{}} {
3814 A good replacement for %s
3815 is placing values for the user.name and
3816 user.email settings into your personal
3822 unset ignored_env msg suggest_user name
3825 # -- Only initialize complex UI if we are going to stay running.
3827 if {[is_enabled transport
]} {
3830 set n
[.mbar.remote index end
]
3831 populate_remotes_menu
3832 set n
[expr {[.mbar.remote index end
] - $n}]
3834 if {[.mbar.remote
type 0] eq
"tearoff"} { incr n
}
3835 .mbar.remote insert
$n separator
3840 if {[winfo exists
$ui_comm]} {
3841 set GITGUI_BCK_exists
[load_message GITGUI_BCK
]
3843 # -- If both our backup and message files exist use the
3844 # newer of the two files to initialize the buffer.
3846 if {$GITGUI_BCK_exists} {
3847 set m
[gitdir GITGUI_MSG
]
3848 if {[file isfile
$m]} {
3849 if {[file mtime
[gitdir GITGUI_BCK
]] > [file mtime
$m]} {
3850 catch
{file delete
[gitdir GITGUI_MSG
]}
3852 $ui_comm delete
0.0 end
3854 $ui_comm edit modified false
3855 catch
{file delete
[gitdir GITGUI_BCK
]}
3856 set GITGUI_BCK_exists
0
3862 proc backup_commit_buffer
{} {
3863 global ui_comm GITGUI_BCK_exists
3865 set m
[$ui_comm edit modified
]
3866 if {$m ||
$GITGUI_BCK_exists} {
3867 set msg
[string trim
[$ui_comm get
0.0 end
]]
3868 regsub
-all -line {[ \r\t]+$
} $msg {} msg
3871 if {$GITGUI_BCK_exists} {
3872 catch
{file delete
[gitdir GITGUI_BCK
]}
3873 set GITGUI_BCK_exists
0
3877 set fd
[open
[gitdir GITGUI_BCK
] w
]
3878 puts
-nonewline $fd $msg
3880 set GITGUI_BCK_exists
1
3884 $ui_comm edit modified false
3887 set ::GITGUI_BCK_i
[after
2000 backup_commit_buffer
]
3890 backup_commit_buffer
3892 # -- If the user has aspell available we can drive it
3893 # in pipe mode to spellcheck the commit message.
3895 set spell_cmd
[list |
]
3896 set spell_dict
[get_config gui.spellingdictionary
]
3897 lappend spell_cmd aspell
3898 if {$spell_dict ne
{}} {
3899 lappend spell_cmd
--master=$spell_dict
3901 lappend spell_cmd
--mode=none
3902 lappend spell_cmd
--encoding=utf-8
3903 lappend spell_cmd pipe
3904 if {$spell_dict eq
{none
}
3905 ||
[catch
{set spell_fd
[open
$spell_cmd r
+]} spell_err
]} {
3906 bind_button3
$ui_comm [list tk_popup
$ui_comm_ctxm %X
%Y
]
3908 set ui_comm_spell
[spellcheck
::init \
3914 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
3917 lock_index begin-read
3918 if {![winfo ismapped .
]} {
3922 if {[is_enabled initialamend
]} {
3928 if {[is_enabled nocommitmsg
]} {
3929 $ui_comm configure
-state disabled
-background gray
3932 if {[is_enabled multicommit
] && ![is_config_false gui.gcwarning
]} {
3935 if {[is_enabled retcode
]} {
3936 bind .
<Destroy
> {+terminate_me
%W
}
3938 if {$picked && [is_config_true gui.autoexplore
]} {
3944 # indent-tabs-mode: t