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
[encoding convertfrom utf-8
{
14 Copyright ©
2006, 2007 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 [mc
"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
88 ######################################################################
90 ## Internationalization (i18n) through msgcat and gettext. See
91 ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
93 package require msgcat
96 set cmk
[string first @@
$fmt]
98 return [string range
$fmt 0 [expr {$cmk - 1}]]
103 proc mc
{en_fmt args
} {
104 set fmt [_mc_trim
[::msgcat
::mc
$en_fmt]]
105 if {[catch
{set msg
[eval [list format
$fmt] $args]} err
]} {
106 set msg
[eval [list format
[_mc_trim
$en_fmt]] $args]
112 return [join $args {}]
115 ::msgcat
::mcload
$oguimsg
118 ######################################################################
122 set _appname
{Git Gui
}
129 set _trace
[lsearch
-exact $argv --trace]
131 set argv
[lreplace
$argv $_trace $_trace]
147 return [eval [list
file join $_gitdir] $args]
150 proc gitexec
{args
} {
152 if {$_gitexec eq
{}} {
153 if {[catch
{set _gitexec
[git
--exec-path]} err
]} {
154 error
"Git not installed?\n\n$err"
157 set _gitexec
[exec cygpath \
162 set _gitexec
[file normalize
$_gitexec]
168 return [eval [list
file join $_gitexec] $args]
176 if {[tk windowingsystem
] eq
{aqua
}} {
183 if {$
::tcl_platform
(platform
) eq
{windows
}} {
191 if {$_iscygwin eq
{}} {
192 if {$
::tcl_platform
(platform
) eq
{windows
}} {
193 if {[catch
{set p
[exec cygpath
--windir]} err
]} {
205 proc is_enabled
{option
} {
206 global enabled_options
207 if {[catch
{set on
$enabled_options($option)}]} {return 0}
211 proc enable_option
{option
} {
212 global enabled_options
213 set enabled_options
($option) 1
216 proc disable_option
{option
} {
217 global enabled_options
218 set enabled_options
($option) 0
221 ######################################################################
225 proc is_many_config
{name
} {
226 switch
-glob -- $name {
236 proc is_config_true
{name
} {
238 if {[catch
{set v
$repo_config($name)}]} {
240 } elseif
{$v eq
{true
} ||
$v eq
{1} ||
$v eq
{yes}} {
247 proc get_config
{name
} {
249 if {[catch
{set v
$repo_config($name)}]} {
256 ######################################################################
260 proc _trace_exec
{cmd
} {
261 if {!$
::_trace
} return
267 if {[regexp
{[ \t\r\n'"$?*]} $v]} {
275 proc _git_cmd {name} {
278 if {[catch {set v $_git_cmd_path($name)}]} {
282 --exec-path { return [list $::_git $name] }
285 set p [gitexec git-$name$::_search_exe]
286 if {[file exists $p]} {
288 } elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
289 # Try to determine what sort of magic will make
290 # git-$name go and do its thing, because native
291 # Tcl on Windows doesn't know it.
293 set p
[gitexec git-
$name]
298 switch
-glob -- [lindex
$s 0] {
300 #!*perl { set i perl }
301 #!*python { set i python }
302 default
{ error
"git-$name is not supported: $s" }
306 if {![info exists interp
]} {
307 set interp
[_which
$i]
310 error
"git-$name requires $i (not in PATH)"
312 set v
[concat
[list
$interp] [lrange
$s 1 end
] [list
$p]]
314 # Assume it is builtin to git somehow and we
315 # aren't actually able to see a file for it.
317 set v
[list $
::_git
$name]
319 set _git_cmd_path
($name) $v
324 proc _which
{what args
} {
325 global env _search_exe _search_path
327 if {$_search_path eq
{}} {
328 if {[is_Cygwin
] && [regexp
{^
(/|\.
:)} $env(PATH
)]} {
329 set _search_path
[split [exec cygpath \
335 } elseif
{[is_Windows
]} {
336 set gitguidir
[file dirname [info
script]]
337 regsub
-all ";" $gitguidir "\\;" gitguidir
338 set env
(PATH
) "$gitguidir;$env(PATH)"
339 set _search_path
[split $env(PATH
) {;}]
342 set _search_path
[split $env(PATH
) :]
347 if {[is_Windows
] && [lsearch
-exact $args -script] >= 0} {
350 set suffix
$_search_exe
353 foreach p
$_search_path {
354 set p
[file join $p $what$suffix]
355 if {[file exists
$p]} {
356 return [file normalize
$p]
362 proc _lappend_nice
{cmd_var
} {
366 if {![info exists _nice
]} {
367 set _nice
[_which nice
]
378 switch
-- [lindex
$args 0] {
389 set args
[lrange
$args 1 end
]
392 set cmdp
[_git_cmd
[lindex
$args 0]]
393 set args
[lrange
$args 1 end
]
395 _trace_exec
[concat
$opt $cmdp $args]
396 set result
[eval exec $opt $cmdp $args]
398 puts stderr
"< $result"
403 proc _open_stdout_stderr
{cmd
} {
406 set fd
[open
[concat
[list |
] $cmd] r
]
408 if { [lindex
$cmd end
] eq
{2>@
1}
409 && $err eq
{can not
find channel named
"1"}
411 # Older versions of Tcl 8.4 don't have this 2>@1 IO
412 # redirect operator. Fallback to |& cat for those.
413 # The command was not actually started, so its safe
414 # to try to start it a second time.
416 set fd
[open
[concat \
418 [lrange
$cmd 0 end-1
] \
425 fconfigure
$fd -eofchar {}
429 proc git_read
{args
} {
433 switch
-- [lindex
$args 0] {
448 set args
[lrange
$args 1 end
]
451 set cmdp
[_git_cmd
[lindex
$args 0]]
452 set args
[lrange
$args 1 end
]
454 return [_open_stdout_stderr
[concat
$opt $cmdp $args]]
457 proc git_write
{args
} {
461 switch
-- [lindex
$args 0] {
472 set args
[lrange
$args 1 end
]
475 set cmdp
[_git_cmd
[lindex
$args 0]]
476 set args
[lrange
$args 1 end
]
478 _trace_exec
[concat
$opt $cmdp $args]
479 return [open
[concat
[list |
] $opt $cmdp $args] w
]
482 proc githook_read
{hook_name args
} {
483 set pchook
[gitdir hooks
$hook_name]
486 # On Windows [file executable] might lie so we need to ask
487 # the shell if the hook is executable. Yes that's annoying.
491 if {![info exists interp
]} {
492 set interp
[_which sh
]
495 error
"hook execution requires sh (not in PATH)"
498 set scr
{if test -x "$1";then exec "$@";fi}
499 set sh_c
[list
$interp -c $scr $interp $pchook]
500 return [_open_stdout_stderr
[concat
$sh_c $args]]
503 if {[file executable
$pchook]} {
504 return [_open_stdout_stderr
[concat
[list
$pchook] $args]]
510 proc kill_file_process
{fd
} {
511 set process
[pid
$fd]
515 # Use a Cygwin-specific flag to allow killing
516 # native Windows processes
517 exec kill -f $process
524 proc gitattr
{path attr default
} {
525 if {[catch
{set r
[git check-attr
$attr -- $path]}]} {
528 set r
[join [lrange
[split $r :] 2 end
] :]
531 if {$r eq
{unspecified
}} {
538 regsub
-all ' $value "'\\''" value
542 proc load_current_branch {} {
543 global current_branch is_detached
545 set fd [open [gitdir HEAD] r]
546 if {[gets $fd ref] < 1} {
551 set pfx {ref: refs/heads/}
552 set len [string length $pfx]
553 if {[string equal -length $len $pfx $ref]} {
554 # We're on a branch. It might not exist. But
555 # HEAD looks good enough to be a branch.
557 set current_branch [string range $ref $len end]
560 # Assume this is a detached head.
562 set current_branch HEAD
567 auto_load tk_optionMenu
568 rename tk_optionMenu real__tkOptionMenu
569 proc tk_optionMenu {w varName args} {
570 set m [eval real__tkOptionMenu $w $varName $args]
571 $m configure -font font_ui
572 $w configure -font font_ui
576 proc rmsel_tag {text} {
578 -background [$text cget -background] \
579 -foreground [$text cget -foreground] \
581 $text tag conf in_sel -background lightgray
582 bind $text <Motion> break
587 bind . <Visibility> {
588 bind . <Visibility> {}
593 wm iconbitmap . -default $oguilib/git-gui.ico
596 ######################################################################
601 font create font_diff -family Courier -size 10
605 eval font configure font_ui [font actual [.dummy cget -font]]
609 font create font_uiitalic
610 font create font_uibold
611 font create font_diffbold
612 font create font_diffitalic
614 foreach class {Button Checkbutton Entry Label
615 Labelframe Listbox Menu Message
616 Radiobutton Spinbox Text} {
617 option add *$class.font font_ui
621 if {[is_Windows] || [is_MacOSX]} {
622 option add *Menu.tearOff 0
633 proc bind_button3 {w cmd} {
634 bind $w <Any-Button-3> $cmd
636 # Mac OS X sends Button-2 on right click through three-button mouse,
637 # or through trackpad right-clicking (two-finger touch + click).
638 bind $w <Any-Button-2> $cmd
639 bind $w <Control-Button-1> $cmd
643 proc apply_config {} {
644 global repo_config font_descs
646 foreach option $font_descs {
647 set name [lindex $option 0]
648 set font [lindex $option 1]
651 foreach {cn cv} $repo_config(gui.$name) {
652 if {$cn eq {-weight}} {
655 font configure $font $cn $cv
658 font configure $font -weight normal
661 error_popup [strcat [mc "Invalid font specified
in %s
:" "gui.
$name"] "\n\n$err"]
663 foreach {cn cv} [font configure $font] {
664 font configure ${font}bold $cn $cv
665 font configure ${font}italic $cn $cv
667 font configure ${font}bold -weight bold
668 font configure ${font}italic -slant italic
672 set default_config(branch.autosetupmerge) true
673 set default_config(merge.tool) {}
674 set default_config(merge.keepbackup) true
675 set default_config(merge.diffstat) true
676 set default_config(merge.summary) false
677 set default_config(merge.verbosity) 2
678 set default_config(user.name) {}
679 set default_config(user.email) {}
681 set default_config(gui.encoding) [encoding system]
682 set default_config(gui.matchtrackingbranch) false
683 set default_config(gui.pruneduringfetch) false
684 set default_config(gui.trustmtime) false
685 set default_config(gui.fastcopyblame) false
686 set default_config(gui.copyblamethreshold) 40
687 set default_config(gui.blamehistoryctx) 7
688 set default_config(gui.diffcontext) 5
689 set default_config(gui.commitmsgwidth) 75
690 set default_config(gui.newbranchtemplate) {}
691 set default_config(gui.spellingdictionary) {}
692 set default_config(gui.fontui) [font configure font_ui]
693 set default_config(gui.fontdiff) [font configure font_diff]
695 {fontui font_ui {mc "Main Font
"}}
696 {fontdiff font_diff {mc "Diff
/Console Font
"}}
699 ######################################################################
703 set _git [_which git]
705 catch {wm withdraw .}
709 -title [mc "git-gui
: fatal error
"] \
710 -message [mc "Cannot
find git
in PATH.
"]
714 ######################################################################
718 if {[catch {set _git_version [git --version]} err]} {
719 catch {wm withdraw .}
723 -title [mc "git-gui
: fatal error
"] \
724 -message "Cannot determine Git version
:
728 [appname
] requires Git
1.5.0 or later.
"
731 if {![regsub {^git version } $_git_version {} _git_version]} {
732 catch {wm withdraw .}
736 -title [mc "git-gui
: fatal error
"] \
737 -message [strcat [mc "Cannot parse Git version string
:"] "\n\n$_git_version"]
741 set _real_git_version $_git_version
742 regsub -- {[\-\.]dirty$} $_git_version {} _git_version
743 regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
744 regsub {\.rc[0-9]+$} $_git_version {} _git_version
745 regsub {\.GIT$} $_git_version {} _git_version
746 regsub {\.[a-zA-Z]+\.[0-9]+$} $_git_version {} _git_version
748 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
749 catch {wm withdraw .}
754 -title "[appname
]: warning
" \
755 -message [mc "Git version cannot be determined.
757 %s claims it is version
'%s'.
759 %s requires
at least Git
1.5.0 or later.
761 Assume
'%s' is version
1.5.0?
762 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
763 set _git_version 1.5.0
768 unset _real_git_version
770 proc git-version {args} {
773 switch [llength $args] {
779 set op [lindex $args 0]
780 set vr [lindex $args 1]
781 set cm [package vcompare $_git_version $vr]
782 return [expr $cm $op 0]
786 set type [lindex $args 0]
787 set name [lindex $args 1]
788 set parm [lindex $args 2]
789 set body [lindex $args 3]
791 if {($type ne {proc} && $type ne {method})} {
792 error "Invalid arguments to git-version
"
794 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
795 error "Last arm of
$type $name must be default
"
798 foreach {op vr cb} [lrange $body 0 end-2] {
799 if {[git-version $op $vr]} {
800 return [uplevel [list $type $name $parm $cb]]
804 return [uplevel [list $type $name $parm [lindex $body end]]]
808 error "git-version
>= x
"
814 if {[git-version < 1.5]} {
815 catch {wm withdraw .}
819 -title [mc "git-gui
: fatal error
"] \
820 -message "[appname
] requires Git
1.5.0 or later.
822 You are using
[git-version
]:
828 ######################################################################
830 ## configure our library
832 set idx [file join $oguilib tclIndex]
833 if {[catch {set fd [open $idx r]} err]} {
834 catch {wm withdraw .}
838 -title [mc "git-gui
: fatal error
"] \
842 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
844 while {[gets $fd n] >= 0} {
845 if {$n ne {} && ![string match #* $n]} {
857 if {[lsearch -exact $loaded $p] >= 0} continue
858 source [file join $oguilib $p]
863 set auto_path [concat [list $oguilib] $auto_path]
865 unset -nocomplain idx fd
867 ######################################################################
869 ## config file parsing
871 git-version proc _parse_config {arr_name args} {
878 [list git_read config] \
880 [list --null --list]]
881 fconfigure $fd_rc -translation binary
882 set buf [read $fd_rc]
885 foreach line [split $buf "\
0"] {
886 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
887 if {[is_many_config $name]} {
888 lappend arr($name) $value
890 set arr($name) $value
899 set fd_rc [eval [list git_read config --list] $args]
900 while {[gets $fd_rc line] >= 0} {
901 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
902 if {[is_many_config $name]} {
903 lappend arr($name) $value
905 set arr($name) $value
914 proc load_config {include_global} {
915 global repo_config global_config default_config
917 if {$include_global} {
918 _parse_config global_config --global
920 _parse_config repo_config
922 foreach name [array names default_config] {
923 if {[catch {set v $global_config($name)}]} {
924 set global_config($name) $default_config($name)
926 if {[catch {set v $repo_config($name)}]} {
927 set repo_config($name) $default_config($name)
932 ######################################################################
934 ## feature option selection
936 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
941 if {$subcommand eq {gui.sh}} {
944 if {$subcommand eq {gui} && [llength $argv] > 0} {
945 set subcommand [lindex $argv 0]
946 set argv [lrange $argv 1 end]
949 enable_option multicommit
951 enable_option transport
954 switch -- $subcommand {
959 disable_option multicommit
960 disable_option branch
961 disable_option transport
964 enable_option singlecommit
965 enable_option retcode
967 disable_option multicommit
968 disable_option branch
969 disable_option transport
971 while {[llength $argv] > 0} {
972 set a [lindex $argv 0]
975 enable_option initialamend
978 enable_option nocommit
979 enable_option nocommitmsg
982 disable_option nocommitmsg
989 set argv [lrange $argv 1 end]
994 ######################################################################
1000 set _gitdir $env(GIT_DIR)
1004 set _gitdir [git rev-parse --git-dir]
1005 set _prefix [git rev-parse --show-prefix]
1009 choose_repository::pick
1012 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
1013 catch {set _gitdir [exec cygpath --windows $_gitdir]}
1015 if {![file isdirectory $_gitdir]} {
1016 catch {wm withdraw .}
1017 error_popup [strcat [mc "Git directory not found
:"] "\n\n$_gitdir"]
1020 if {$_prefix ne {}} {
1021 regsub -all {[^/]+/} $_prefix ../ cdup
1022 if {[catch {cd $cdup} err]} {
1023 catch {wm withdraw .}
1024 error_popup [strcat [mc "Cannot move to top of working directory
:"] "\n\n$err"]
1028 } elseif {![is_enabled bare]} {
1029 if {[lindex [file split $_gitdir] end] ne {.git}} {
1030 catch {wm withdraw .}
1031 error_popup [strcat [mc "Cannot use funny .git directory
:"] "\n\n$_gitdir"]
1034 if {[catch {cd [file dirname $_gitdir]} err]} {
1035 catch {wm withdraw .}
1036 error_popup [strcat [mc "No working directory
"] " [file dirname $_gitdir]:\n\n$err"]
1040 set _reponame [file split [file normalize $_gitdir]]
1041 if {[lindex $_reponame end] eq {.git}} {
1042 set _reponame [lindex $_reponame end-1]
1044 set _reponame [lindex $_reponame end]
1047 ######################################################################
1051 set current_diff_path {}
1052 set current_diff_side {}
1053 set diff_actions [list]
1057 set MERGE_HEAD [list]
1060 set current_branch {}
1062 set current_diff_path {}
1064 set is_conflict_diff 0
1065 set selected_commit_type new
1067 set nullid "0000000000000000000000000000000000000000"
1068 set nullid2 "0000000000000000000000000000000000000001"
1070 ######################################################################
1078 set disable_on_lock [list]
1079 set index_lock_type none
1081 proc lock_index {type} {
1082 global index_lock_type disable_on_lock
1084 if {$index_lock_type eq {none}} {
1085 set index_lock_type $type
1086 foreach w $disable_on_lock {
1087 uplevel #0 $w disabled
1090 } elseif {$index_lock_type eq "begin-
$type"} {
1091 set index_lock_type $type
1097 proc unlock_index {} {
1098 global index_lock_type disable_on_lock
1100 set index_lock_type none
1101 foreach w $disable_on_lock {
1102 uplevel #0 $w normal
1106 ######################################################################
1110 proc repository_state {ctvar hdvar mhvar} {
1111 global current_branch
1112 upvar $ctvar ct $hdvar hd $mhvar mh
1117 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1123 set merge_head [gitdir MERGE_HEAD]
1124 if {[file exists $merge_head]} {
1126 set fd_mh [open $merge_head r]
1127 while {[gets $fd_mh line] >= 0} {
1138 global PARENT empty_tree
1140 set p [lindex $PARENT 0]
1144 if {$empty_tree eq {}} {
1145 set empty_tree [git mktree << {}]
1150 proc force_amend {} {
1151 global selected_commit_type
1152 global HEAD PARENT MERGE_HEAD commit_type
1154 repository_state newType newHEAD newMERGE_HEAD
1157 set MERGE_HEAD $newMERGE_HEAD
1158 set commit_type $newType
1160 set selected_commit_type amend
1161 do_select_commit_type
1164 proc rescan {after {honor_trustmtime 1}} {
1165 global HEAD PARENT MERGE_HEAD commit_type
1166 global ui_index ui_workdir ui_comm
1167 global rescan_active file_states
1170 if {$rescan_active > 0 || ![lock_index read]} return
1172 repository_state newType newHEAD newMERGE_HEAD
1173 if {[string match amend* $commit_type]
1174 && $newType eq {normal}
1175 && $newHEAD eq $HEAD} {
1179 set MERGE_HEAD $newMERGE_HEAD
1180 set commit_type $newType
1183 array unset file_states
1185 if {!$::GITGUI_BCK_exists &&
1186 (![$ui_comm edit modified]
1187 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1188 if {[string match amend* $commit_type]} {
1189 } elseif {[load_message GITGUI_MSG]} {
1190 } elseif {[run_prepare_commit_msg_hook]} {
1191 } elseif {[load_message MERGE_MSG]} {
1192 } elseif {[load_message SQUASH_MSG]} {
1195 $ui_comm edit modified false
1198 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1199 rescan_stage2 {} $after
1202 ui_status [mc "Refreshing
file status...
"]
1203 set fd_rf [git_read update-index \
1209 fconfigure $fd_rf -blocking 0 -translation binary
1210 fileevent $fd_rf readable \
1211 [list rescan_stage2 $fd_rf $after]
1216 set is_git_info_exclude {}
1217 proc have_info_exclude {} {
1218 global is_git_info_exclude
1220 if {$is_git_info_exclude eq {}} {
1221 if {[catch {exec test -f [gitdir info exclude]}]} {
1222 set is_git_info_exclude 0
1224 set is_git_info_exclude 1
1227 return $is_git_info_exclude
1230 proc have_info_exclude {} {
1231 return [file readable [gitdir info exclude]]
1235 proc rescan_stage2 {fd after} {
1236 global rescan_active buf_rdi buf_rdf buf_rlo
1240 if {![eof $fd]} return
1244 set ls_others [list --exclude-per-directory=.gitignore]
1245 if {[have_info_exclude]} {
1246 lappend ls_others "--exclude-from=[gitdir info exclude
]"
1248 set user_exclude [get_config core.excludesfile]
1249 if {$user_exclude ne {} && [file readable $user_exclude]} {
1250 lappend ls_others "--exclude-from=$user_exclude"
1258 ui_status [mc "Scanning
for modified files ...
"]
1259 set fd_di [git_read diff-index --cached -z [PARENT]]
1260 set fd_df [git_read diff-files -z]
1261 set fd_lo [eval git_read ls-files --others -z $ls_others]
1263 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1264 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1265 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1266 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1267 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1268 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1271 proc load_message {file} {
1274 set f [gitdir $file]
1275 if {[file isfile $f]} {
1276 if {[catch {set fd [open $f r]}]} {
1279 fconfigure $fd -eofchar {}
1280 set content [string trim [read $fd]]
1282 regsub -all -line {[ \r\t]+$} $content {} content
1283 $ui_comm delete 0.0 end
1284 $ui_comm insert end $content
1290 proc run_prepare_commit_msg_hook {} {
1293 # prepare-commit-msg requires PREPARE_COMMIT_MSG exist. From git-gui
1294 # it will be .git/MERGE_MSG (merge), .git/SQUASH_MSG (squash), or an
1295 # empty file but existant file.
1297 set fd_pcm [open [gitdir PREPARE_COMMIT_MSG] a]
1299 if {[file isfile [gitdir MERGE_MSG]]} {
1300 set pcm_source "merge
"
1301 set fd_mm [open [gitdir MERGE_MSG] r]
1302 puts -nonewline $fd_pcm [read $fd_mm]
1304 } elseif {[file isfile [gitdir SQUASH_MSG]]} {
1305 set pcm_source "squash
"
1306 set fd_sm [open [gitdir SQUASH_MSG] r]
1307 puts -nonewline $fd_pcm [read $fd_sm]
1315 set fd_ph [githook_read prepare-commit-msg \
1316 [gitdir PREPARE_COMMIT_MSG] $pcm_source]
1318 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1322 ui_status [mc "Calling prepare-commit-msg hook...
"]
1325 fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
1326 fileevent $fd_ph readable \
1327 [list prepare_commit_msg_hook_wait $fd_ph]
1332 proc prepare_commit_msg_hook_wait {fd_ph} {
1335 append pch_error [read $fd_ph]
1336 fconfigure $fd_ph -blocking 1
1338 if {[catch {close $fd_ph}]} {
1339 ui_status [mc "Commit declined by prepare-commit-msg hook.
"]
1340 hook_failed_popup prepare-commit-msg $pch_error
1341 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1344 load_message PREPARE_COMMIT_MSG
1347 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1350 fconfigure $fd_ph -blocking 0
1351 catch {file delete [gitdir PREPARE_COMMIT_MSG]}
1354 proc read_diff_index {fd after} {
1357 append buf_rdi [read $fd]
1359 set n [string length $buf_rdi]
1361 set z1 [string first "\
0" $buf_rdi $c]
1362 if {$z1 == -1} break
1364 set z2 [string first "\
0" $buf_rdi $z1]
1365 if {$z2 == -1} break
1368 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1369 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1371 [encoding convertfrom $p] \
1373 [list [lindex $i 0] [lindex $i 2]] \
1379 set buf_rdi [string range $buf_rdi $c end]
1384 rescan_done $fd buf_rdi $after
1387 proc read_diff_files {fd after} {
1390 append buf_rdf [read $fd]
1392 set n [string length $buf_rdf]
1394 set z1 [string first "\
0" $buf_rdf $c]
1395 if {$z1 == -1} break
1397 set z2 [string first "\
0" $buf_rdf $z1]
1398 if {$z2 == -1} break
1401 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1402 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1404 [encoding convertfrom $p] \
1407 [list [lindex $i 0] [lindex $i 2]]
1412 set buf_rdf [string range $buf_rdf $c end]
1417 rescan_done $fd buf_rdf $after
1420 proc read_ls_others {fd after} {
1423 append buf_rlo [read $fd]
1424 set pck [split $buf_rlo "\
0"]
1425 set buf_rlo [lindex $pck end]
1426 foreach p [lrange $pck 0 end-1] {
1427 set p [encoding convertfrom $p]
1428 if {[string index $p end] eq {/}} {
1429 set p [string range $p 0 end-1]
1433 rescan_done $fd buf_rlo $after
1436 proc rescan_done {fd buf after} {
1437 global rescan_active current_diff_path
1438 global file_states repo_config
1441 if {![eof $fd]} return
1444 if {[incr rescan_active -1] > 0} return
1449 if {$current_diff_path ne {}} reshow_diff
1450 if {$current_diff_path eq {}} select_first_diff
1455 proc prune_selection {} {
1456 global file_states selected_paths
1458 foreach path [array names selected_paths] {
1459 if {[catch {set still_here $file_states($path)}]} {
1460 unset selected_paths($path)
1465 ######################################################################
1469 proc mapicon {w state path} {
1472 if {[catch {set r $all_icons($state$w)}]} {
1473 puts "error
: no icon
for $w state
={$state} $path"
1479 proc mapdesc {state path} {
1482 if {[catch {set r $all_descs($state)}]} {
1483 puts "error
: no desc
for state
={$state} $path"
1489 proc ui_status {msg} {
1491 if {[info exists main_status]} {
1492 $main_status show $msg
1496 proc ui_ready {{test {}}} {
1498 if {[info exists main_status]} {
1499 $main_status show [mc "Ready.
"] $test
1503 proc escape_path {path} {
1504 regsub -all {\\} $path "\\\\" path
1505 regsub -all "\n" $path "\\n
" path
1509 proc short_path {path} {
1510 return [escape_path [lindex [file split $path] end]]
1514 set null_sha1 [string repeat 0 40]
1516 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1517 global file_states next_icon_id null_sha1
1519 set s0 [string index $new_state 0]
1520 set s1 [string index $new_state 1]
1522 if {[catch {set info $file_states($path)}]} {
1524 set icon n[incr next_icon_id]
1526 set state [lindex $info 0]
1527 set icon [lindex $info 1]
1528 if {$head_info eq {}} {set head_info [lindex $info 2]}
1529 if {$index_info eq {}} {set index_info [lindex $info 3]}
1532 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1533 elseif {$s0 eq {_}} {set s0 _}
1535 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1536 elseif {$s1 eq {_}} {set s1 _}
1538 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1539 set head_info [list 0 $null_sha1]
1540 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1541 && $head_info eq {}} {
1542 set head_info $index_info
1545 set file_states($path) [list $s0$s1 $icon \
1546 $head_info $index_info \
1551 proc display_file_helper {w path icon_name old_m new_m} {
1554 if {$new_m eq {_}} {
1555 set lno [lsearch -sorted -exact $file_lists($w) $path]
1557 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1559 $w conf -state normal
1560 $w delete $lno.0 [expr {$lno + 1}].0
1561 $w conf -state disabled
1563 } elseif {$old_m eq {_} && $new_m ne {_}} {
1564 lappend file_lists($w) $path
1565 set file_lists($w) [lsort -unique $file_lists($w)]
1566 set lno [lsearch -sorted -exact $file_lists($w) $path]
1568 $w conf -state normal
1569 $w image create $lno.0 \
1570 -align center -padx 5 -pady 1 \
1572 -image [mapicon $w $new_m $path]
1573 $w insert $lno.1 "[escape_path
$path]\n"
1574 $w conf -state disabled
1575 } elseif {$old_m ne $new_m} {
1576 $w conf -state normal
1577 $w image conf $icon_name -image [mapicon $w $new_m $path]
1578 $w conf -state disabled
1582 proc display_file {path state} {
1583 global file_states selected_paths
1584 global ui_index ui_workdir
1586 set old_m [merge_state $path $state]
1587 set s $file_states($path)
1588 set new_m [lindex $s 0]
1589 set icon_name [lindex $s 1]
1591 set o [string index $old_m 0]
1592 set n [string index $new_m 0]
1599 display_file_helper $ui_index $path $icon_name $o $n
1601 if {[string index $old_m 0] eq {U}} {
1604 set o [string index $old_m 1]
1606 if {[string index $new_m 0] eq {U}} {
1609 set n [string index $new_m 1]
1611 display_file_helper $ui_workdir $path $icon_name $o $n
1613 if {$new_m eq {__}} {
1614 unset file_states($path)
1615 catch {unset selected_paths($path)}
1619 proc display_all_files_helper {w path icon_name m} {
1622 lappend file_lists($w) $path
1623 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1624 $w image create end \
1625 -align center -padx 5 -pady 1 \
1627 -image [mapicon $w $m $path]
1628 $w insert end "[escape_path
$path]\n"
1631 proc display_all_files {} {
1632 global ui_index ui_workdir
1633 global file_states file_lists
1636 $ui_index conf -state normal
1637 $ui_workdir conf -state normal
1639 $ui_index delete 0.0 end
1640 $ui_workdir delete 0.0 end
1643 set file_lists($ui_index) [list]
1644 set file_lists($ui_workdir) [list]
1646 foreach path [lsort [array names file_states]] {
1647 set s $file_states($path)
1649 set icon_name [lindex $s 1]
1651 set s [string index $m 0]
1652 if {$s ne {U} && $s ne {_}} {
1653 display_all_files_helper $ui_index $path \
1657 if {[string index $m 0] eq {U}} {
1660 set s [string index $m 1]
1663 display_all_files_helper $ui_workdir $path \
1668 $ui_index conf -state disabled
1669 $ui_workdir conf -state disabled
1672 ######################################################################
1677 #define mask_width 14
1678 #define mask_height 15
1679 static unsigned char mask_bits[] = {
1680 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1681 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1682 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1685 image create bitmap file_plain -background white -foreground black -data {
1686 #define plain_width 14
1687 #define plain_height 15
1688 static unsigned char plain_bits[] = {
1689 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1690 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1691 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1692 } -maskdata $filemask
1694 image create bitmap file_mod -background white -foreground blue -data {
1695 #define mod_width 14
1696 #define mod_height 15
1697 static unsigned char mod_bits[] = {
1698 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1699 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1700 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1701 } -maskdata $filemask
1703 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1704 #define file_fulltick_width 14
1705 #define file_fulltick_height 15
1706 static unsigned char file_fulltick_bits
[] = {
1707 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1708 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1709 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1710 } -maskdata $filemask
1712 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
1713 #define parttick_width 14
1714 #define parttick_height 15
1715 static unsigned char parttick_bits
[] = {
1716 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1717 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1718 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1719 } -maskdata $filemask
1721 image create bitmap file_question
-background white
-foreground black
-data {
1722 #define file_question_width 14
1723 #define file_question_height 15
1724 static unsigned char file_question_bits
[] = {
1725 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1726 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1727 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1728 } -maskdata $filemask
1730 image create bitmap file_removed
-background white
-foreground red
-data {
1731 #define file_removed_width 14
1732 #define file_removed_height 15
1733 static unsigned char file_removed_bits
[] = {
1734 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1735 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1736 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1737 } -maskdata $filemask
1739 image create bitmap file_merge
-background white
-foreground blue
-data {
1740 #define file_merge_width 14
1741 #define file_merge_height 15
1742 static unsigned char file_merge_bits
[] = {
1743 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1744 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1745 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1746 } -maskdata $filemask
1748 image create bitmap file_statechange
-background white
-foreground green
-data {
1749 #define file_merge_width 14
1750 #define file_merge_height 15
1751 static unsigned char file_statechange_bits
[] = {
1752 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
1753 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
1754 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1755 } -maskdata $filemask
1757 set ui_index .vpane.files.index.list
1758 set ui_workdir .vpane.files.workdir.list
1760 set all_icons
(_
$ui_index) file_plain
1761 set all_icons
(A
$ui_index) file_fulltick
1762 set all_icons
(M
$ui_index) file_fulltick
1763 set all_icons
(D
$ui_index) file_removed
1764 set all_icons
(U
$ui_index) file_merge
1765 set all_icons
(T
$ui_index) file_statechange
1767 set all_icons
(_
$ui_workdir) file_plain
1768 set all_icons
(M
$ui_workdir) file_mod
1769 set all_icons
(D
$ui_workdir) file_question
1770 set all_icons
(U
$ui_workdir) file_merge
1771 set all_icons
(O
$ui_workdir) file_plain
1772 set all_icons
(T
$ui_workdir) file_statechange
1774 set max_status_desc
0
1776 {__
{mc
"Unmodified"}}
1778 {_M
{mc
"Modified, not staged"}}
1779 {M_
{mc
"Staged for commit"}}
1780 {MM
{mc
"Portions staged for commit"}}
1781 {MD
{mc
"Staged for commit, missing"}}
1783 {_T
{mc
"File type changed, not staged"}}
1784 {T_
{mc
"File type changed, staged"}}
1786 {_O
{mc
"Untracked, not staged"}}
1787 {A_
{mc
"Staged for commit"}}
1788 {AM
{mc
"Portions staged for commit"}}
1789 {AD
{mc
"Staged for commit, missing"}}
1792 {D_
{mc
"Staged for removal"}}
1793 {DO
{mc
"Staged for removal, still present"}}
1795 {_U
{mc
"Requires merge resolution"}}
1796 {U_
{mc
"Requires merge resolution"}}
1797 {UU
{mc
"Requires merge resolution"}}
1798 {UM
{mc
"Requires merge resolution"}}
1799 {UD
{mc
"Requires merge resolution"}}
1800 {UT
{mc
"Requires merge resolution"}}
1802 set text
[eval [lindex
$i 1]]
1803 if {$max_status_desc < [string length
$text]} {
1804 set max_status_desc
[string length
$text]
1806 set all_descs
([lindex
$i 0]) $text
1810 ######################################################################
1814 proc scrollbar2many
{list mode args
} {
1815 foreach w
$list {eval $w $mode $args}
1818 proc many2scrollbar
{list mode sb top bottom
} {
1819 $sb set $top $bottom
1820 foreach w
$list {$w $mode moveto
$top}
1823 proc incr_font_size
{font
{amt
1}} {
1824 set sz
[font configure
$font -size]
1826 font configure
$font -size $sz
1827 font configure
${font}bold
-size $sz
1828 font configure
${font}italic
-size $sz
1831 ######################################################################
1835 set starting_gitk_msg
[mc
"Starting gitk... please wait..."]
1837 proc do_gitk
{revs
} {
1838 # -- Always start gitk through whatever we were loaded with. This
1839 # lets us bypass using shell process on Windows systems.
1841 set exe
[_which gitk
-script]
1842 set cmd
[list
[info nameofexecutable
] $exe]
1844 error_popup
[mc
"Couldn't find gitk in PATH"]
1848 if {[info exists env
(GIT_DIR
)]} {
1849 set old_GIT_DIR
$env(GIT_DIR
)
1855 cd [file dirname [gitdir
]]
1856 set env
(GIT_DIR
) [file tail [gitdir
]]
1858 eval exec $cmd $revs &
1860 if {$old_GIT_DIR eq
{}} {
1863 set env
(GIT_DIR
) $old_GIT_DIR
1867 ui_status $
::starting_gitk_msg
1869 ui_ready
$starting_gitk_msg
1874 proc do_explore
{} {
1876 if {[is_Cygwin
] ||
[is_Windows
]} {
1877 set explorer
"explorer.exe"
1878 } elseif
{[is_MacOSX
]} {
1881 # freedesktop.org-conforming system is our best shot
1882 set explorer
"xdg-open"
1884 eval exec $explorer [file dirname [gitdir
]] &
1890 proc terminate_me
{win
} {
1892 if {$win ne
{.
}} return
1896 proc do_quit
{{rc
{1}}} {
1897 global ui_comm is_quitting repo_config commit_type
1898 global GITGUI_BCK_exists GITGUI_BCK_i
1899 global ui_comm_spell
1902 if {$is_quitting} return
1905 if {[winfo exists
$ui_comm]} {
1906 # -- Stash our current commit buffer.
1908 set save
[gitdir GITGUI_MSG
]
1909 if {$GITGUI_BCK_exists && ![$ui_comm edit modified
]} {
1910 file rename
-force [gitdir GITGUI_BCK
] $save
1911 set GITGUI_BCK_exists
0
1913 set msg
[string trim
[$ui_comm get
0.0 end
]]
1914 regsub
-all -line {[ \r\t]+$
} $msg {} msg
1915 if {(![string match amend
* $commit_type]
1916 ||
[$ui_comm edit modified
])
1919 set fd
[open
$save w
]
1920 puts
-nonewline $fd $msg
1924 catch
{file delete
$save}
1928 # -- Cancel our spellchecker if its running.
1930 if {[info exists ui_comm_spell
]} {
1934 # -- Remove our editor backup, its not needed.
1936 after cancel
$GITGUI_BCK_i
1937 if {$GITGUI_BCK_exists} {
1938 catch
{file delete
[gitdir GITGUI_BCK
]}
1941 # -- Stash our current window geometry into this repository.
1943 set cfg_geometry
[list
]
1944 lappend cfg_geometry
[wm geometry .
]
1945 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 0]
1946 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 1]
1947 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
1950 if {$cfg_geometry ne
$rc_geometry} {
1951 catch
{git config gui.geometry
$cfg_geometry}
1963 proc ui_do_rescan
{} {
1964 rescan
{force_first_diff
; ui_ready
}
1972 global next_diff_p next_diff_w next_diff_i
1973 show_diff
$next_diff_p $next_diff_w {}
1976 proc find_anchor_pos
{lst name
} {
1977 set lid
[lsearch
-sorted -exact $lst $name]
1981 foreach lname
$lst {
1982 if {$lname >= $name} break
1990 proc find_file_from
{flist idx delta path mmask
} {
1993 set len
[llength
$flist]
1994 while {$idx >= 0 && $idx < $len} {
1995 set name
[lindex
$flist $idx]
1997 if {$name ne
$path && [info exists file_states
($name)]} {
1998 set state
[lindex
$file_states($name) 0]
2000 if {$mmask eq
{} ||
[regexp
$mmask $state]} {
2011 proc find_next_diff
{w path
{lno
{}} {mmask
{}}} {
2012 global next_diff_p next_diff_w next_diff_i
2013 global file_lists ui_index ui_workdir
2015 set flist
$file_lists($w)
2017 set lno
[find_anchor_pos
$flist $path]
2022 if {$mmask ne
{} && ![regexp
{(^\^
)|
(\$$
)} $mmask]} {
2023 if {$w eq
$ui_index} {
2026 set mmask
"$mmask\$"
2030 set idx
[find_file_from
$flist $lno 1 $path $mmask]
2033 set idx
[find_file_from
$flist $lno -1 $path $mmask]
2038 set next_diff_p
[lindex
$flist $idx]
2039 set next_diff_i
[expr {$idx+1}]
2046 proc next_diff_after_action
{w path
{lno
{}} {mmask
{}}} {
2047 global current_diff_path
2049 if {$path ne
$current_diff_path} {
2051 } elseif
{[find_next_diff
$w $path $lno $mmask]} {
2054 return {reshow_diff
;}
2058 proc select_first_diff
{} {
2061 if {[find_next_diff
$ui_workdir {} 1 {^_?U
}] ||
2062 [find_next_diff
$ui_workdir {} 1 {[^O
]$
}]} {
2067 proc force_first_diff
{} {
2068 global current_diff_path
2070 if {[info exists file_states
($current_diff_path)]} {
2071 set state
[lindex
$file_states($current_diff_path) 0]
2073 if {[string index
$state 1] ne
{O
}} return
2079 proc toggle_or_diff
{w x y
} {
2080 global file_states file_lists current_diff_path ui_index ui_workdir
2081 global last_clicked selected_paths
2083 set pos
[split [$w index @
$x,$y] .
]
2084 set lno
[lindex
$pos 0]
2085 set col [lindex
$pos 1]
2086 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2092 set last_clicked
[list
$w $lno]
2093 array
unset selected_paths
2094 $ui_index tag remove in_sel
0.0 end
2095 $ui_workdir tag remove in_sel
0.0 end
2097 # Determine the state of the file
2098 if {[info exists file_states
($path)]} {
2099 set state
[lindex
$file_states($path) 0]
2104 # Restage the file, or simply show the diff
2105 if {$col == 0 && $y > 1} {
2106 # Conflicts need special handling
2107 if {[string first
{U
} $state] >= 0} {
2108 # $w must always be $ui_workdir, but...
2109 if {$w ne
$ui_workdir} { set lno
{} }
2110 merge_stage_workdir
$path $lno
2114 if {[string index
$state 1] eq
{O
}} {
2120 set after
[next_diff_after_action
$w $path $lno $mmask]
2122 if {$w eq
$ui_index} {
2124 "Unstaging [short_path $path] from commit" \
2126 [concat
$after [list ui_ready
]]
2127 } elseif
{$w eq
$ui_workdir} {
2129 "Adding [short_path $path]" \
2131 [concat
$after [list ui_ready
]]
2134 show_diff
$path $w $lno
2138 proc add_one_to_selection
{w x y
} {
2139 global file_lists last_clicked selected_paths
2141 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2142 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
2148 if {$last_clicked ne
{}
2149 && [lindex
$last_clicked 0] ne
$w} {
2150 array
unset selected_paths
2151 [lindex
$last_clicked 0] tag remove in_sel
0.0 end
2154 set last_clicked
[list
$w $lno]
2155 if {[catch
{set in_sel
$selected_paths($path)}]} {
2159 unset selected_paths
($path)
2160 $w tag remove in_sel
$lno.0 [expr {$lno + 1}].0
2162 set selected_paths
($path) 1
2163 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
2167 proc add_range_to_selection
{w x y
} {
2168 global file_lists last_clicked selected_paths
2170 if {[lindex
$last_clicked 0] ne
$w} {
2171 toggle_or_diff
$w $x $y
2175 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2176 set lc
[lindex
$last_clicked 1]
2185 foreach path
[lrange
$file_lists($w) \
2186 [expr {$begin - 1}] \
2187 [expr {$end - 1}]] {
2188 set selected_paths
($path) 1
2190 $w tag add in_sel
$begin.0 [expr {$end + 1}].0
2193 proc show_more_context
{} {
2195 if {$repo_config(gui.diffcontext
) < 99} {
2196 incr repo_config
(gui.diffcontext
)
2201 proc show_less_context
{} {
2203 if {$repo_config(gui.diffcontext
) > 1} {
2204 incr repo_config
(gui.diffcontext
) -1
2209 ######################################################################
2219 menu .mbar
-tearoff 0
2220 .mbar add cascade
-label [mc Repository
] -menu .mbar.repository
2221 .mbar add cascade
-label [mc Edit
] -menu .mbar.edit
2222 if {[is_enabled branch
]} {
2223 .mbar add cascade
-label [mc Branch
] -menu .mbar.branch
2225 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2226 .mbar add cascade
-label [mc Commit@@noun
] -menu .mbar.commit
2228 if {[is_enabled transport
]} {
2229 .mbar add cascade
-label [mc Merge
] -menu .mbar.merge
2230 .mbar add cascade
-label [mc Remote
] -menu .mbar.remote
2232 . configure
-menu .mbar
2234 # -- Repository Menu
2236 menu .mbar.repository
2238 .mbar.repository add
command \
2239 -label [mc
"Explore Working Copy"] \
2240 -command {do_explore
}
2241 .mbar.repository add separator
2243 .mbar.repository add
command \
2244 -label [mc
"Browse Current Branch's Files"] \
2245 -command {browser
::new
$current_branch}
2246 set ui_browse_current
[.mbar.repository index last
]
2247 .mbar.repository add
command \
2248 -label [mc
"Browse Branch Files..."] \
2249 -command browser_open
::dialog
2250 .mbar.repository add separator
2252 .mbar.repository add
command \
2253 -label [mc
"Visualize Current Branch's History"] \
2254 -command {do_gitk
$current_branch}
2255 set ui_visualize_current
[.mbar.repository index last
]
2256 .mbar.repository add
command \
2257 -label [mc
"Visualize All Branch History"] \
2258 -command {do_gitk
--all}
2259 .mbar.repository add separator
2261 proc current_branch_write
{args
} {
2262 global current_branch
2263 .mbar.repository entryconf $
::ui_browse_current \
2264 -label [mc
"Browse %s's Files" $current_branch]
2265 .mbar.repository entryconf $
::ui_visualize_current \
2266 -label [mc
"Visualize %s's History" $current_branch]
2268 trace add variable current_branch
write current_branch_write
2270 if {[is_enabled multicommit
]} {
2271 .mbar.repository add
command -label [mc
"Database Statistics"] \
2274 .mbar.repository add
command -label [mc
"Compress Database"] \
2277 .mbar.repository add
command -label [mc
"Verify Database"] \
2278 -command do_fsck_objects
2280 .mbar.repository add separator
2283 .mbar.repository add
command \
2284 -label [mc
"Create Desktop Icon"] \
2285 -command do_cygwin_shortcut
2286 } elseif
{[is_Windows
]} {
2287 .mbar.repository add
command \
2288 -label [mc
"Create Desktop Icon"] \
2289 -command do_windows_shortcut
2290 } elseif
{[is_MacOSX
]} {
2291 .mbar.repository add
command \
2292 -label [mc
"Create Desktop Icon"] \
2293 -command do_macosx_app
2298 proc
::tk
::mac
::Quit
{args
} { do_quit
}
2300 .mbar.repository add
command -label [mc Quit
] \
2308 .mbar.edit add
command -label [mc Undo
] \
2309 -command {catch
{[focus
] edit undo
}} \
2311 .mbar.edit add
command -label [mc Redo
] \
2312 -command {catch
{[focus
] edit redo
}} \
2314 .mbar.edit add separator
2315 .mbar.edit add
command -label [mc Cut
] \
2316 -command {catch
{tk_textCut
[focus
]}} \
2318 .mbar.edit add
command -label [mc Copy
] \
2319 -command {catch
{tk_textCopy
[focus
]}} \
2321 .mbar.edit add
command -label [mc Paste
] \
2322 -command {catch
{tk_textPaste
[focus
]; [focus
] see insert
}} \
2324 .mbar.edit add
command -label [mc Delete
] \
2325 -command {catch
{[focus
] delete sel.first sel.last
}} \
2327 .mbar.edit add separator
2328 .mbar.edit add
command -label [mc
"Select All"] \
2329 -command {catch
{[focus
] tag add sel
0.0 end
}} \
2334 if {[is_enabled branch
]} {
2337 .mbar.branch add
command -label [mc
"Create..."] \
2338 -command branch_create
::dialog \
2340 lappend disable_on_lock
[list .mbar.branch entryconf \
2341 [.mbar.branch index last
] -state]
2343 .mbar.branch add
command -label [mc
"Checkout..."] \
2344 -command branch_checkout
::dialog \
2346 lappend disable_on_lock
[list .mbar.branch entryconf \
2347 [.mbar.branch index last
] -state]
2349 .mbar.branch add
command -label [mc
"Rename..."] \
2350 -command branch_rename
::dialog
2351 lappend disable_on_lock
[list .mbar.branch entryconf \
2352 [.mbar.branch index last
] -state]
2354 .mbar.branch add
command -label [mc
"Delete..."] \
2355 -command branch_delete
::dialog
2356 lappend disable_on_lock
[list .mbar.branch entryconf \
2357 [.mbar.branch index last
] -state]
2359 .mbar.branch add
command -label [mc
"Reset..."] \
2360 -command merge
::reset_hard
2361 lappend disable_on_lock
[list .mbar.branch entryconf \
2362 [.mbar.branch index last
] -state]
2367 proc commit_btn_caption
{} {
2368 if {[is_enabled nocommit
]} {
2371 return [mc Commit@@verb
]
2375 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2378 if {![is_enabled nocommit
]} {
2379 .mbar.commit add radiobutton \
2380 -label [mc
"New Commit"] \
2381 -command do_select_commit_type \
2382 -variable selected_commit_type \
2384 lappend disable_on_lock \
2385 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2387 .mbar.commit add radiobutton \
2388 -label [mc
"Amend Last Commit"] \
2389 -command do_select_commit_type \
2390 -variable selected_commit_type \
2392 lappend disable_on_lock \
2393 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2395 .mbar.commit add separator
2398 .mbar.commit add
command -label [mc Rescan
] \
2399 -command ui_do_rescan \
2401 lappend disable_on_lock \
2402 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2404 .mbar.commit add
command -label [mc
"Stage To Commit"] \
2405 -command do_add_selection \
2407 lappend disable_on_lock \
2408 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2410 .mbar.commit add
command -label [mc
"Stage Changed Files To Commit"] \
2411 -command do_add_all \
2413 lappend disable_on_lock \
2414 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2416 .mbar.commit add
command -label [mc
"Unstage From Commit"] \
2417 -command do_unstage_selection
2418 lappend disable_on_lock \
2419 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2421 .mbar.commit add
command -label [mc
"Revert Changes"] \
2422 -command do_revert_selection
2423 lappend disable_on_lock \
2424 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2426 .mbar.commit add separator
2428 .mbar.commit add
command -label [mc
"Show Less Context"] \
2429 -command show_less_context \
2430 -accelerator $M1T-\
-
2432 .mbar.commit add
command -label [mc
"Show More Context"] \
2433 -command show_more_context \
2436 .mbar.commit add separator
2438 if {![is_enabled nocommitmsg
]} {
2439 .mbar.commit add
command -label [mc
"Sign Off"] \
2440 -command do_signoff \
2444 .mbar.commit add
command -label [commit_btn_caption
] \
2445 -command do_commit \
2446 -accelerator $M1T-Return
2447 lappend disable_on_lock \
2448 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2453 if {[is_enabled branch
]} {
2455 .mbar.merge add
command -label [mc
"Local Merge..."] \
2456 -command merge
::dialog \
2458 lappend disable_on_lock \
2459 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2460 .mbar.merge add
command -label [mc
"Abort Merge..."] \
2461 -command merge
::reset_hard
2462 lappend disable_on_lock \
2463 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2468 if {[is_enabled transport
]} {
2471 .mbar.remote add
command \
2472 -label [mc
"Add..."] \
2473 -command remote_add
::dialog \
2475 .mbar.remote add
command \
2476 -label [mc
"Push..."] \
2477 -command do_push_anywhere \
2479 .mbar.remote add
command \
2480 -label [mc
"Delete Branch..."] \
2481 -command remote_branch_delete
::dialog
2485 # -- Apple Menu (Mac OS X only)
2487 .mbar add cascade
-label Apple
-menu .mbar.apple
2490 .mbar.apple add
command -label [mc
"About %s" [appname
]] \
2492 .mbar.apple add separator
2493 .mbar.apple add
command \
2494 -label [mc
"Preferences..."] \
2495 -command do_options \
2497 bind .
<$M1B-,> do_options
2501 .mbar.edit add separator
2502 .mbar.edit add
command -label [mc
"Options..."] \
2508 .mbar add cascade
-label [mc Help
] -menu .mbar.
help
2512 .mbar.
help add
command -label [mc
"About %s" [appname
]] \
2517 set doc_path
[file dirname [gitexec
]]
2518 set doc_path
[file join $doc_path Documentation index.html
]
2521 set doc_path
[exec cygpath
--mixed $doc_path]
2524 if {[file isfile
$doc_path]} {
2525 set doc_url
"file:$doc_path"
2527 set doc_url
{http
://www.kernel.org
/pub
/software
/scm
/git
/docs
/}
2530 proc start_browser
{url
} {
2531 git
"web--browse" $url
2534 .mbar.
help add
command -label [mc
"Online Documentation"] \
2535 -command [list start_browser
$doc_url]
2536 unset doc_path doc_url
2538 # -- Standard bindings
2540 wm protocol . WM_DELETE_WINDOW do_quit
2541 bind all
<$M1B-Key-q> do_quit
2542 bind all
<$M1B-Key-Q> do_quit
2543 bind all
<$M1B-Key-w> {destroy
[winfo toplevel
%W
]}
2544 bind all
<$M1B-Key-W> {destroy
[winfo toplevel
%W
]}
2546 set subcommand_args
{}
2548 puts stderr
"usage: $::argv0 $::subcommand $::subcommand_args"
2552 # -- Not a normal commit type invocation? Do that instead!
2554 switch
-- $subcommand {
2557 if {$subcommand eq
"blame"} {
2558 set subcommand_args
{[--line=<num
>] rev? path
}
2560 set subcommand_args
{rev? path
}
2562 if {$argv eq
{}} usage
2568 if {$is_path ||
[file exists
$_prefix$a]} {
2569 if {$path ne
{}} usage
2572 } elseif
{$a eq
{--}} {
2574 if {$head ne
{}} usage
2579 } elseif
{[regexp
{^
--line=(\d
+)$
} $a a lnum
]} {
2580 if {$jump_spec ne
{} ||
$head ne
{}} usage
2581 set jump_spec
[list
$lnum]
2582 } elseif
{$head eq
{}} {
2583 if {$head ne
{}} usage
2592 if {$head ne
{} && $path eq
{}} {
2593 set path
$_prefix$head
2600 if {[regexp
{^
[0-9a-f]{1,39}$
} $head]} {
2602 set head [git rev-parse
--verify $head]
2608 set current_branch
$head
2611 switch
-- $subcommand {
2613 if {$jump_spec ne
{}} usage
2615 if {$path ne
{} && [file isdirectory
$path]} {
2616 set head $current_branch
2622 browser
::new
$head $path
2625 if {$head eq
{} && ![file exists
$path]} {
2626 puts stderr
[mc
"fatal: cannot stat path %s: No such file or directory" $path]
2629 blame
::new
$head $path $jump_spec
2636 if {[llength
$argv] != 0} {
2637 puts
-nonewline stderr
"usage: $argv0"
2638 if {$subcommand ne
{gui
}
2639 && [file tail $argv0] ne
"git-$subcommand"} {
2640 puts
-nonewline stderr
" $subcommand"
2645 # fall through to setup UI for commits
2648 puts stderr
"usage: $argv0 \[{blame|browser|citool}\]"
2659 -text [mc
"Current Branch:"] \
2663 -textvariable current_branch \
2666 pack .branch.l1
-side left
2667 pack .branch.cb
-side left
-fill x
2668 pack .branch
-side top
-fill x
2670 # -- Main Window Layout
2672 panedwindow .vpane
-orient horizontal
2673 panedwindow .vpane.files
-orient vertical
2674 .vpane add .vpane.files
-sticky nsew
-height 100 -width 200
2675 pack .vpane
-anchor n
-side top
-fill both
-expand 1
2677 # -- Index File List
2679 frame .vpane.files.index
-height 100 -width 200
2680 label .vpane.files.index.title
-text [mc
"Staged Changes (Will Commit)"] \
2681 -background lightgreen
-foreground black
2682 text
$ui_index -background white
-foreground black \
2684 -width 20 -height 10 \
2686 -cursor $cursor_ptr \
2687 -xscrollcommand {.vpane.files.index.sx
set} \
2688 -yscrollcommand {.vpane.files.index.sy
set} \
2690 scrollbar .vpane.files.index.sx
-orient h
-command [list
$ui_index xview
]
2691 scrollbar .vpane.files.index.sy
-orient v
-command [list
$ui_index yview
]
2692 pack .vpane.files.index.title
-side top
-fill x
2693 pack .vpane.files.index.sx
-side bottom
-fill x
2694 pack .vpane.files.index.sy
-side right
-fill y
2695 pack
$ui_index -side left
-fill both
-expand 1
2697 # -- Working Directory File List
2699 frame .vpane.files.workdir
-height 100 -width 200
2700 label .vpane.files.workdir.title
-text [mc
"Unstaged Changes"] \
2701 -background lightsalmon
-foreground black
2702 text
$ui_workdir -background white
-foreground black \
2704 -width 20 -height 10 \
2706 -cursor $cursor_ptr \
2707 -xscrollcommand {.vpane.files.workdir.sx
set} \
2708 -yscrollcommand {.vpane.files.workdir.sy
set} \
2710 scrollbar .vpane.files.workdir.sx
-orient h
-command [list
$ui_workdir xview
]
2711 scrollbar .vpane.files.workdir.sy
-orient v
-command [list
$ui_workdir yview
]
2712 pack .vpane.files.workdir.title
-side top
-fill x
2713 pack .vpane.files.workdir.sx
-side bottom
-fill x
2714 pack .vpane.files.workdir.sy
-side right
-fill y
2715 pack
$ui_workdir -side left
-fill both
-expand 1
2717 .vpane.files add .vpane.files.workdir
-sticky nsew
2718 .vpane.files add .vpane.files.index
-sticky nsew
2720 foreach i
[list
$ui_index $ui_workdir] {
2722 $i tag conf in_diff
-background [$i tag cget in_sel
-background]
2726 # -- Diff and Commit Area
2728 frame .vpane.lower
-height 300 -width 400
2729 frame .vpane.lower.commarea
2730 frame .vpane.lower.
diff -relief sunken
-borderwidth 1
2731 pack .vpane.lower.
diff -fill both
-expand 1
2732 pack .vpane.lower.commarea
-side bottom
-fill x
2733 .vpane add .vpane.lower
-sticky nsew
2735 # -- Commit Area Buttons
2737 frame .vpane.lower.commarea.buttons
2738 label .vpane.lower.commarea.buttons.l
-text {} \
2741 pack .vpane.lower.commarea.buttons.l
-side top
-fill x
2742 pack .vpane.lower.commarea.buttons
-side left
-fill y
2744 button .vpane.lower.commarea.buttons.rescan
-text [mc Rescan
] \
2745 -command ui_do_rescan
2746 pack .vpane.lower.commarea.buttons.rescan
-side top
-fill x
2747 lappend disable_on_lock \
2748 {.vpane.lower.commarea.buttons.rescan conf
-state}
2750 button .vpane.lower.commarea.buttons.incall
-text [mc
"Stage Changed"] \
2752 pack .vpane.lower.commarea.buttons.incall
-side top
-fill x
2753 lappend disable_on_lock \
2754 {.vpane.lower.commarea.buttons.incall conf
-state}
2756 if {![is_enabled nocommitmsg
]} {
2757 button .vpane.lower.commarea.buttons.signoff
-text [mc
"Sign Off"] \
2759 pack .vpane.lower.commarea.buttons.signoff
-side top
-fill x
2762 button .vpane.lower.commarea.buttons.commit
-text [commit_btn_caption
] \
2764 pack .vpane.lower.commarea.buttons.commit
-side top
-fill x
2765 lappend disable_on_lock \
2766 {.vpane.lower.commarea.buttons.commit conf
-state}
2768 if {![is_enabled nocommit
]} {
2769 button .vpane.lower.commarea.buttons.push
-text [mc Push
] \
2770 -command do_push_anywhere
2771 pack .vpane.lower.commarea.buttons.push
-side top
-fill x
2774 # -- Commit Message Buffer
2776 frame .vpane.lower.commarea.buffer
2777 frame .vpane.lower.commarea.buffer.header
2778 set ui_comm .vpane.lower.commarea.buffer.t
2779 set ui_coml .vpane.lower.commarea.buffer.header.l
2781 if {![is_enabled nocommit
]} {
2782 radiobutton .vpane.lower.commarea.buffer.header.new \
2783 -text [mc
"New Commit"] \
2784 -command do_select_commit_type \
2785 -variable selected_commit_type \
2787 lappend disable_on_lock \
2788 [list .vpane.lower.commarea.buffer.header.new conf
-state]
2789 radiobutton .vpane.lower.commarea.buffer.header.amend \
2790 -text [mc
"Amend Last Commit"] \
2791 -command do_select_commit_type \
2792 -variable selected_commit_type \
2794 lappend disable_on_lock \
2795 [list .vpane.lower.commarea.buffer.header.amend conf
-state]
2801 proc trace_commit_type
{varname args
} {
2802 global ui_coml commit_type
2803 switch
-glob -- $commit_type {
2804 initial
{set txt
[mc
"Initial Commit Message:"]}
2805 amend
{set txt
[mc
"Amended Commit Message:"]}
2806 amend-initial
{set txt
[mc
"Amended Initial Commit Message:"]}
2807 amend-merge
{set txt
[mc
"Amended Merge Commit Message:"]}
2808 merge
{set txt
[mc
"Merge Commit Message:"]}
2809 * {set txt
[mc
"Commit Message:"]}
2811 $ui_coml conf
-text $txt
2813 trace add variable commit_type
write trace_commit_type
2814 pack
$ui_coml -side left
-fill x
2816 if {![is_enabled nocommit
]} {
2817 pack .vpane.lower.commarea.buffer.header.amend
-side right
2818 pack .vpane.lower.commarea.buffer.header.new
-side right
2821 text
$ui_comm -background white
-foreground black \
2825 -autoseparators true \
2827 -width $repo_config(gui.commitmsgwidth
) -height 9 -wrap none \
2829 -yscrollcommand {.vpane.lower.commarea.buffer.sby
set}
2830 scrollbar .vpane.lower.commarea.buffer.sby \
2831 -command [list
$ui_comm yview
]
2832 pack .vpane.lower.commarea.buffer.header
-side top
-fill x
2833 pack .vpane.lower.commarea.buffer.sby
-side right
-fill y
2834 pack
$ui_comm -side left
-fill y
2835 pack .vpane.lower.commarea.buffer
-side left
-fill y
2837 # -- Commit Message Buffer Context Menu
2839 set ctxm .vpane.lower.commarea.buffer.ctxm
2840 menu
$ctxm -tearoff 0
2843 -command {tk_textCut
$ui_comm}
2846 -command {tk_textCopy
$ui_comm}
2849 -command {tk_textPaste
$ui_comm}
2851 -label [mc Delete
] \
2852 -command {$ui_comm delete sel.first sel.last
}
2855 -label [mc
"Select All"] \
2856 -command {focus
$ui_comm;$ui_comm tag add sel
0.0 end
}
2858 -label [mc
"Copy All"] \
2860 $ui_comm tag add sel
0.0 end
2861 tk_textCopy
$ui_comm
2862 $ui_comm tag remove sel
0.0 end
2866 -label [mc
"Sign Off"] \
2868 set ui_comm_ctxm
$ctxm
2872 proc trace_current_diff_path
{varname args
} {
2873 global current_diff_path diff_actions file_states
2874 if {$current_diff_path eq
{}} {
2880 set p
$current_diff_path
2881 set s
[mapdesc
[lindex
$file_states($p) 0] $p]
2883 set p
[escape_path
$p]
2887 .vpane.lower.
diff.header.status configure
-text $s
2888 .vpane.lower.
diff.header.
file configure
-text $f
2889 .vpane.lower.
diff.header.path configure
-text $p
2890 foreach w
$diff_actions {
2894 trace add variable current_diff_path
write trace_current_diff_path
2896 frame .vpane.lower.
diff.header
-background gold
2897 label .vpane.lower.
diff.header.status \
2900 -width $max_status_desc \
2903 label .vpane.lower.
diff.header.
file \
2908 label .vpane.lower.
diff.header.path \
2913 pack .vpane.lower.
diff.header.status
-side left
2914 pack .vpane.lower.
diff.header.
file -side left
2915 pack .vpane.lower.
diff.header.path
-fill x
2916 set ctxm .vpane.lower.
diff.header.ctxm
2917 menu
$ctxm -tearoff 0
2925 -- $current_diff_path
2927 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2928 bind_button3 .vpane.lower.
diff.header.path
"tk_popup $ctxm %X %Y"
2932 frame .vpane.lower.
diff.body
2933 set ui_diff .vpane.lower.
diff.body.t
2934 text
$ui_diff -background white
-foreground black \
2936 -width 80 -height 15 -wrap none \
2938 -xscrollcommand {.vpane.lower.
diff.body.sbx
set} \
2939 -yscrollcommand {.vpane.lower.
diff.body.sby
set} \
2941 scrollbar .vpane.lower.
diff.body.sbx
-orient horizontal \
2942 -command [list
$ui_diff xview
]
2943 scrollbar .vpane.lower.
diff.body.sby
-orient vertical \
2944 -command [list
$ui_diff yview
]
2945 pack .vpane.lower.
diff.body.sbx
-side bottom
-fill x
2946 pack .vpane.lower.
diff.body.sby
-side right
-fill y
2947 pack
$ui_diff -side left
-fill both
-expand 1
2948 pack .vpane.lower.
diff.header
-side top
-fill x
2949 pack .vpane.lower.
diff.body
-side bottom
-fill both
-expand 1
2951 $ui_diff tag conf d_cr
-elide true
2952 $ui_diff tag conf d_@
-foreground blue
-font font_diffbold
2953 $ui_diff tag conf d_
+ -foreground {#00a000}
2954 $ui_diff tag conf d_-
-foreground red
2956 $ui_diff tag conf d_
++ -foreground {#00a000}
2957 $ui_diff tag conf d_--
-foreground red
2958 $ui_diff tag conf d_
+s \
2959 -foreground {#00a000} \
2960 -background {#e2effa}
2961 $ui_diff tag conf d_-s \
2963 -background {#e2effa}
2964 $ui_diff tag conf d_s
+ \
2965 -foreground {#00a000} \
2967 $ui_diff tag conf d_s- \
2971 $ui_diff tag conf d
<<<<<<< \
2972 -foreground orange \
2974 $ui_diff tag conf d
======= \
2975 -foreground orange \
2977 $ui_diff tag conf d
>>>>>>> \
2978 -foreground orange \
2981 $ui_diff tag raise sel
2983 # -- Diff Body Context Menu
2986 proc create_common_diff_popup
{ctxm
} {
2988 -label [mc
"Show Less Context"] \
2989 -command show_less_context
2990 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2992 -label [mc
"Show More Context"] \
2993 -command show_more_context
2994 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2997 -label [mc Refresh
] \
2998 -command reshow_diff
2999 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3002 -command {tk_textCopy
$ui_diff}
3003 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3005 -label [mc
"Select All"] \
3006 -command {focus
$ui_diff;$ui_diff tag add sel
0.0 end
}
3007 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3009 -label [mc
"Copy All"] \
3011 $ui_diff tag add sel
0.0 end
3012 tk_textCopy
$ui_diff
3013 $ui_diff tag remove sel
0.0 end
3015 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3018 -label [mc
"Decrease Font Size"] \
3019 -command {incr_font_size font_diff
-1}
3020 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3022 -label [mc
"Increase Font Size"] \
3023 -command {incr_font_size font_diff
1}
3024 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3028 build_encoding_menu
$emenu [list force_diff_encoding
]
3030 -label [mc
"Encoding"] \
3032 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
3034 $ctxm add
command -label [mc
"Options..."] \
3038 set ctxm .vpane.lower.
diff.body.ctxm
3039 menu
$ctxm -tearoff 0
3041 -label [mc
"Apply/Reverse Hunk"] \
3042 -command {apply_hunk
$cursorX $cursorY}
3043 set ui_diff_applyhunk
[$ctxm index last
]
3044 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyhunk -state]
3046 -label [mc
"Apply/Reverse Line"] \
3047 -command {apply_line
$cursorX $cursorY; do_rescan
}
3048 set ui_diff_applyline
[$ctxm index last
]
3049 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyline -state]
3051 create_common_diff_popup
$ctxm
3053 set ctxmmg .vpane.lower.
diff.body.ctxmmg
3054 menu
$ctxmmg -tearoff 0
3055 $ctxmmg add
command \
3056 -label [mc
"Run Merge Tool"] \
3057 -command {merge_resolve_tool
}
3058 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3059 $ctxmmg add separator
3060 $ctxmmg add
command \
3061 -label [mc
"Use Remote Version"] \
3062 -command {merge_resolve_one
3}
3063 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3064 $ctxmmg add
command \
3065 -label [mc
"Use Local Version"] \
3066 -command {merge_resolve_one
2}
3067 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3068 $ctxmmg add
command \
3069 -label [mc
"Revert To Base"] \
3070 -command {merge_resolve_one
1}
3071 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
3072 $ctxmmg add separator
3073 create_common_diff_popup
$ctxmmg
3075 proc popup_diff_menu
{ctxm ctxmmg x y X Y
} {
3076 global current_diff_path file_states
3079 if {[info exists file_states
($current_diff_path)]} {
3080 set state
[lindex
$file_states($current_diff_path) 0]
3084 if {[string first
{U
} $state] >= 0} {
3085 tk_popup
$ctxmmg $X $Y
3087 if {$
::ui_index eq $
::current_diff_side
} {
3088 set l
[mc
"Unstage Hunk From Commit"]
3089 set t
[mc
"Unstage Line From Commit"]
3091 set l
[mc
"Stage Hunk For Commit"]
3092 set t
[mc
"Stage Line For Commit"]
3095 ||
$current_diff_path eq
{}
3099 ||
{T_
} eq
$state} {
3104 $ctxm entryconf $
::ui_diff_applyhunk
-state $s -label $l
3105 $ctxm entryconf $
::ui_diff_applyline
-state $s -label $t
3106 tk_popup
$ctxm $X $Y
3109 bind_button3
$ui_diff [list popup_diff_menu
$ctxm $ctxmmg %x
%y
%X
%Y
]
3113 set main_status
[::status_bar
::new .status
]
3114 pack .status
-anchor w
-side bottom
-fill x
3115 $main_status show
[mc
"Initializing..."]
3120 set gm
$repo_config(gui.geometry
)
3121 wm geometry .
[lindex
$gm 0]
3122 .vpane sash place
0 \
3124 [lindex
[.vpane sash coord
0] 1]
3125 .vpane.files sash place
0 \
3126 [lindex
[.vpane.files sash coord
0] 0] \
3133 bind $ui_comm <$M1B-Key-Return> {do_commit
;break}
3134 bind $ui_comm <$M1B-Key-t> {do_add_selection
;break}
3135 bind $ui_comm <$M1B-Key-T> {do_add_selection
;break}
3136 bind $ui_comm <$M1B-Key-i> {do_add_all
;break}
3137 bind $ui_comm <$M1B-Key-I> {do_add_all
;break}
3138 bind $ui_comm <$M1B-Key-x> {tk_textCut
%W
;break}
3139 bind $ui_comm <$M1B-Key-X> {tk_textCut
%W
;break}
3140 bind $ui_comm <$M1B-Key-c> {tk_textCopy
%W
;break}
3141 bind $ui_comm <$M1B-Key-C> {tk_textCopy
%W
;break}
3142 bind $ui_comm <$M1B-Key-v> {tk_textPaste
%W
; %W see insert
; break}
3143 bind $ui_comm <$M1B-Key-V> {tk_textPaste
%W
; %W see insert
; break}
3144 bind $ui_comm <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3145 bind $ui_comm <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3146 bind $ui_comm <$M1B-Key-minus> {show_less_context
;break}
3147 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context
;break}
3148 bind $ui_comm <$M1B-Key-equal> {show_more_context
;break}
3149 bind $ui_comm <$M1B-Key-plus> {show_more_context
;break}
3150 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context
;break}
3152 bind $ui_diff <$M1B-Key-x> {tk_textCopy
%W
;break}
3153 bind $ui_diff <$M1B-Key-X> {tk_textCopy
%W
;break}
3154 bind $ui_diff <$M1B-Key-c> {tk_textCopy
%W
;break}
3155 bind $ui_diff <$M1B-Key-C> {tk_textCopy
%W
;break}
3156 bind $ui_diff <$M1B-Key-v> {break}
3157 bind $ui_diff <$M1B-Key-V> {break}
3158 bind $ui_diff <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
3159 bind $ui_diff <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
3160 bind $ui_diff <Key-Up
> {catch
{%W yview scroll
-1 units
};break}
3161 bind $ui_diff <Key-Down
> {catch
{%W yview scroll
1 units
};break}
3162 bind $ui_diff <Key-Left
> {catch
{%W xview scroll
-1 units
};break}
3163 bind $ui_diff <Key-Right
> {catch
{%W xview scroll
1 units
};break}
3164 bind $ui_diff <Key-k
> {catch
{%W yview scroll
-1 units
};break}
3165 bind $ui_diff <Key-j
> {catch
{%W yview scroll
1 units
};break}
3166 bind $ui_diff <Key-h
> {catch
{%W xview scroll
-1 units
};break}
3167 bind $ui_diff <Key-l
> {catch
{%W xview scroll
1 units
};break}
3168 bind $ui_diff <Control-Key-b
> {catch
{%W yview scroll
-1 pages
};break}
3169 bind $ui_diff <Control-Key-f
> {catch
{%W yview scroll
1 pages
};break}
3170 bind $ui_diff <Button-1
> {focus
%W
}
3172 if {[is_enabled branch
]} {
3173 bind .
<$M1B-Key-n> branch_create
::dialog
3174 bind .
<$M1B-Key-N> branch_create
::dialog
3175 bind .
<$M1B-Key-o> branch_checkout
::dialog
3176 bind .
<$M1B-Key-O> branch_checkout
::dialog
3177 bind .
<$M1B-Key-m> merge
::dialog
3178 bind .
<$M1B-Key-M> merge
::dialog
3180 if {[is_enabled transport
]} {
3181 bind .
<$M1B-Key-p> do_push_anywhere
3182 bind .
<$M1B-Key-P> do_push_anywhere
3185 bind .
<Key-F5
> ui_do_rescan
3186 bind .
<$M1B-Key-r> ui_do_rescan
3187 bind .
<$M1B-Key-R> ui_do_rescan
3188 bind .
<$M1B-Key-s> do_signoff
3189 bind .
<$M1B-Key-S> do_signoff
3190 bind .
<$M1B-Key-t> do_add_selection
3191 bind .
<$M1B-Key-T> do_add_selection
3192 bind .
<$M1B-Key-i> do_add_all
3193 bind .
<$M1B-Key-I> do_add_all
3194 bind .
<$M1B-Key-minus> {show_less_context
;break}
3195 bind .
<$M1B-Key-KP_Subtract> {show_less_context
;break}
3196 bind .
<$M1B-Key-equal> {show_more_context
;break}
3197 bind .
<$M1B-Key-plus> {show_more_context
;break}
3198 bind .
<$M1B-Key-KP_Add> {show_more_context
;break}
3199 bind .
<$M1B-Key-Return> do_commit
3200 foreach i
[list
$ui_index $ui_workdir] {
3201 bind $i <Button-1
> "toggle_or_diff $i %x %y; break"
3202 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3203 bind $i <Shift-Button-1
> "add_range_to_selection $i %x %y; break"
3207 set file_lists
($ui_index) [list
]
3208 set file_lists
($ui_workdir) [list
]
3210 wm title .
"[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
3211 focus
-force $ui_comm
3213 # -- Warn the user about environmental problems. Cygwin's Tcl
3214 # does *not* pass its env array onto any processes it spawns.
3215 # This means that git processes get none of our environment.
3220 set msg
[mc
"Possible environment issues exist.
3222 The following environment variables are probably
3223 going to be ignored by any Git subprocess run
3227 foreach name
[array names env
] {
3228 switch
-regexp -- $name {
3229 {^GIT_INDEX_FILE$
} -
3230 {^GIT_OBJECT_DIRECTORY$
} -
3231 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$
} -
3233 {^GIT_EXTERNAL_DIFF$
} -
3237 {^GIT_CONFIG_LOCAL$
} -
3238 {^GIT_
(AUTHOR|COMMITTER
)_DATE$
} {
3239 append msg
" - $name\n"
3242 {^GIT_
(AUTHOR|COMMITTER
)_
(NAME|EMAIL
)$
} {
3243 append msg
" - $name\n"
3245 set suggest_user
$name
3249 if {$ignored_env > 0} {
3251 This is due to a known issue with the
3252 Tcl binary distributed by Cygwin."]
3254 if {$suggest_user ne
{}} {
3257 A good replacement for %s
3258 is placing values for the user.name and
3259 user.email settings into your personal
3265 unset ignored_env msg suggest_user name
3268 # -- Only initialize complex UI if we are going to stay running.
3270 if {[is_enabled transport
]} {
3273 set n
[.mbar.remote index end
]
3274 populate_remotes_menu
3275 set n
[expr {[.mbar.remote index end
] - $n}]
3277 if {[.mbar.remote
type 0] eq
"tearoff"} { incr n
}
3278 .mbar.remote insert
$n separator
3283 if {[winfo exists
$ui_comm]} {
3284 set GITGUI_BCK_exists
[load_message GITGUI_BCK
]
3286 # -- If both our backup and message files exist use the
3287 # newer of the two files to initialize the buffer.
3289 if {$GITGUI_BCK_exists} {
3290 set m
[gitdir GITGUI_MSG
]
3291 if {[file isfile
$m]} {
3292 if {[file mtime
[gitdir GITGUI_BCK
]] > [file mtime
$m]} {
3293 catch
{file delete
[gitdir GITGUI_MSG
]}
3295 $ui_comm delete
0.0 end
3297 $ui_comm edit modified false
3298 catch
{file delete
[gitdir GITGUI_BCK
]}
3299 set GITGUI_BCK_exists
0
3305 proc backup_commit_buffer
{} {
3306 global ui_comm GITGUI_BCK_exists
3308 set m
[$ui_comm edit modified
]
3309 if {$m ||
$GITGUI_BCK_exists} {
3310 set msg
[string trim
[$ui_comm get
0.0 end
]]
3311 regsub
-all -line {[ \r\t]+$
} $msg {} msg
3314 if {$GITGUI_BCK_exists} {
3315 catch
{file delete
[gitdir GITGUI_BCK
]}
3316 set GITGUI_BCK_exists
0
3320 set fd
[open
[gitdir GITGUI_BCK
] w
]
3321 puts
-nonewline $fd $msg
3323 set GITGUI_BCK_exists
1
3327 $ui_comm edit modified false
3330 set ::GITGUI_BCK_i
[after
2000 backup_commit_buffer
]
3333 backup_commit_buffer
3335 # -- If the user has aspell available we can drive it
3336 # in pipe mode to spellcheck the commit message.
3338 set spell_cmd
[list |
]
3339 set spell_dict
[get_config gui.spellingdictionary
]
3340 lappend spell_cmd aspell
3341 if {$spell_dict ne
{}} {
3342 lappend spell_cmd
--master=$spell_dict
3344 lappend spell_cmd
--mode=none
3345 lappend spell_cmd
--encoding=utf-8
3346 lappend spell_cmd pipe
3347 if {$spell_dict eq
{none
}
3348 ||
[catch
{set spell_fd
[open
$spell_cmd r
+]} spell_err
]} {
3349 bind_button3
$ui_comm [list tk_popup
$ui_comm_ctxm %X
%Y
]
3351 set ui_comm_spell
[spellcheck
::init \
3357 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
3360 lock_index begin-read
3361 if {![winfo ismapped .
]} {
3365 if {[is_enabled initialamend
]} {
3371 if {[is_enabled nocommitmsg
]} {
3372 $ui_comm configure
-state disabled
-background gray
3375 if {[is_enabled multicommit
]} {
3378 if {[is_enabled retcode
]} {
3379 bind .
<Destroy
> {+terminate_me
%W
}
3381 if {$picked && [is_config_true gui.autoexplore
]} {