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
525 regsub
-all ' $value "'\\''" value
529 proc load_current_branch {} {
530 global current_branch is_detached
532 set fd [open [gitdir HEAD] r]
533 if {[gets $fd ref] < 1} {
538 set pfx {ref: refs/heads/}
539 set len [string length $pfx]
540 if {[string equal -length $len $pfx $ref]} {
541 # We're on a branch. It might not exist. But
542 # HEAD looks good enough to be a branch.
544 set current_branch [string range $ref $len end]
547 # Assume this is a detached head.
549 set current_branch HEAD
554 auto_load tk_optionMenu
555 rename tk_optionMenu real__tkOptionMenu
556 proc tk_optionMenu {w varName args} {
557 set m [eval real__tkOptionMenu $w $varName $args]
558 $m configure -font font_ui
559 $w configure -font font_ui
563 proc rmsel_tag {text} {
565 -background [$text cget -background] \
566 -foreground [$text cget -foreground] \
568 $text tag conf in_sel -background lightgray
569 bind $text <Motion> break
574 bind . <Visibility> {
575 bind . <Visibility> {}
580 wm iconbitmap . -default $oguilib/git-gui.ico
583 ######################################################################
588 font create font_diff -family Courier -size 10
592 eval font configure font_ui [font actual [.dummy cget -font]]
596 font create font_uiitalic
597 font create font_uibold
598 font create font_diffbold
599 font create font_diffitalic
601 foreach class {Button Checkbutton Entry Label
602 Labelframe Listbox Menu Message
603 Radiobutton Spinbox Text} {
604 option add *$class.font font_ui
608 if {[is_Windows] || [is_MacOSX]} {
609 option add *Menu.tearOff 0
620 proc bind_button3 {w cmd} {
621 bind $w <Any-Button-3> $cmd
623 # Mac OS X sends Button-2 on right click through three-button mouse,
624 # or through trackpad right-clicking (two-finger touch + click).
625 bind $w <Any-Button-2> $cmd
626 bind $w <Control-Button-1> $cmd
630 proc apply_config {} {
631 global repo_config font_descs
633 foreach option $font_descs {
634 set name [lindex $option 0]
635 set font [lindex $option 1]
638 foreach {cn cv} $repo_config(gui.$name) {
639 if {$cn eq {-weight}} {
642 font configure $font $cn $cv
645 font configure $font -weight normal
648 error_popup [strcat [mc "Invalid font specified
in %s
:" "gui.
$name"] "\n\n$err"]
650 foreach {cn cv} [font configure $font] {
651 font configure ${font}bold $cn $cv
652 font configure ${font}italic $cn $cv
654 font configure ${font}bold -weight bold
655 font configure ${font}italic -slant italic
659 set default_config(branch.autosetupmerge) true
660 set default_config(merge.tool) {}
661 set default_config(merge.keepbackup) true
662 set default_config(merge.diffstat) true
663 set default_config(merge.summary) false
664 set default_config(merge.verbosity) 2
665 set default_config(user.name) {}
666 set default_config(user.email) {}
668 set default_config(gui.matchtrackingbranch) false
669 set default_config(gui.pruneduringfetch) false
670 set default_config(gui.trustmtime) false
671 set default_config(gui.fastcopyblame) false
672 set default_config(gui.copyblamethreshold) 40
673 set default_config(gui.blamehistoryctx) 7
674 set default_config(gui.diffcontext) 5
675 set default_config(gui.commitmsgwidth) 75
676 set default_config(gui.newbranchtemplate) {}
677 set default_config(gui.spellingdictionary) {}
678 set default_config(gui.fontui) [font configure font_ui]
679 set default_config(gui.fontdiff) [font configure font_diff]
681 {fontui font_ui {mc "Main Font
"}}
682 {fontdiff font_diff {mc "Diff
/Console Font
"}}
685 ######################################################################
689 set _git [_which git]
691 catch {wm withdraw .}
695 -title [mc "git-gui
: fatal error
"] \
696 -message [mc "Cannot
find git
in PATH.
"]
700 ######################################################################
704 if {[catch {set _git_version [git --version]} err]} {
705 catch {wm withdraw .}
709 -title [mc "git-gui
: fatal error
"] \
710 -message "Cannot determine Git version
:
714 [appname
] requires Git
1.5.0 or later.
"
717 if {![regsub {^git version } $_git_version {} _git_version]} {
718 catch {wm withdraw .}
722 -title [mc "git-gui
: fatal error
"] \
723 -message [strcat [mc "Cannot parse Git version string
:"] "\n\n$_git_version"]
727 set _real_git_version $_git_version
728 regsub -- {[\-\.]dirty$} $_git_version {} _git_version
729 regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
730 regsub {\.rc[0-9]+$} $_git_version {} _git_version
731 regsub {\.GIT$} $_git_version {} _git_version
732 regsub {\.[a-zA-Z]+\.[0-9]+$} $_git_version {} _git_version
734 if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
735 catch {wm withdraw .}
740 -title "[appname
]: warning
" \
741 -message [mc "Git version cannot be determined.
743 %s claims it is version
'%s'.
745 %s requires
at least Git
1.5.0 or later.
747 Assume
'%s' is version
1.5.0?
748 " $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
749 set _git_version 1.5.0
754 unset _real_git_version
756 proc git-version {args} {
759 switch [llength $args] {
765 set op [lindex $args 0]
766 set vr [lindex $args 1]
767 set cm [package vcompare $_git_version $vr]
768 return [expr $cm $op 0]
772 set type [lindex $args 0]
773 set name [lindex $args 1]
774 set parm [lindex $args 2]
775 set body [lindex $args 3]
777 if {($type ne {proc} && $type ne {method})} {
778 error "Invalid arguments to git-version
"
780 if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
781 error "Last arm of
$type $name must be default
"
784 foreach {op vr cb} [lrange $body 0 end-2] {
785 if {[git-version $op $vr]} {
786 return [uplevel [list $type $name $parm $cb]]
790 return [uplevel [list $type $name $parm [lindex $body end]]]
794 error "git-version
>= x
"
800 if {[git-version < 1.5]} {
801 catch {wm withdraw .}
805 -title [mc "git-gui
: fatal error
"] \
806 -message "[appname
] requires Git
1.5.0 or later.
808 You are using
[git-version
]:
814 ######################################################################
816 ## configure our library
818 set idx [file join $oguilib tclIndex]
819 if {[catch {set fd [open $idx r]} err]} {
820 catch {wm withdraw .}
824 -title [mc "git-gui
: fatal error
"] \
828 if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} {
830 while {[gets $fd n] >= 0} {
831 if {$n ne {} && ![string match #* $n]} {
843 if {[lsearch -exact $loaded $p] >= 0} continue
844 source [file join $oguilib $p]
849 set auto_path [concat [list $oguilib] $auto_path]
851 unset -nocomplain idx fd
853 ######################################################################
855 ## config file parsing
857 git-version proc _parse_config {arr_name args} {
864 [list git_read config] \
866 [list --null --list]]
867 fconfigure $fd_rc -translation binary
868 set buf [read $fd_rc]
871 foreach line [split $buf "\
0"] {
872 if {[regexp {^([^\n]+)\n(.*)$} $line line name value]} {
873 if {[is_many_config $name]} {
874 lappend arr($name) $value
876 set arr($name) $value
885 set fd_rc [eval [list git_read config --list] $args]
886 while {[gets $fd_rc line] >= 0} {
887 if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
888 if {[is_many_config $name]} {
889 lappend arr($name) $value
891 set arr($name) $value
900 proc load_config {include_global} {
901 global repo_config global_config default_config
903 if {$include_global} {
904 _parse_config global_config --global
906 _parse_config repo_config
908 foreach name [array names default_config] {
909 if {[catch {set v $global_config($name)}]} {
910 set global_config($name) $default_config($name)
912 if {[catch {set v $repo_config($name)}]} {
913 set repo_config($name) $default_config($name)
918 ######################################################################
920 ## feature option selection
922 if {[regexp {^git-(.+)$} [file tail $argv0] _junk subcommand]} {
927 if {$subcommand eq {gui.sh}} {
930 if {$subcommand eq {gui} && [llength $argv] > 0} {
931 set subcommand [lindex $argv 0]
932 set argv [lrange $argv 1 end]
935 enable_option multicommit
937 enable_option transport
940 switch -- $subcommand {
945 disable_option multicommit
946 disable_option branch
947 disable_option transport
950 enable_option singlecommit
952 disable_option multicommit
953 disable_option branch
954 disable_option transport
958 ######################################################################
963 set _gitdir $env(GIT_DIR)
967 set _gitdir [git rev-parse --git-dir]
968 set _prefix [git rev-parse --show-prefix]
972 choose_repository::pick
974 if {![file isdirectory $_gitdir] && [is_Cygwin]} {
975 catch {set _gitdir [exec cygpath --windows $_gitdir]}
977 if {![file isdirectory $_gitdir]} {
978 catch {wm withdraw .}
979 error_popup [strcat [mc "Git directory not found
:"] "\n\n$_gitdir"]
982 if {$_prefix ne {}} {
983 regsub -all {[^/]+/} $_prefix ../ cdup
984 if {[catch {cd $cdup} err]} {
985 catch {wm withdraw .}
986 error_popup [strcat [mc "Cannot move to top of working directory
:"] "\n\n$err"]
990 } elseif {![is_enabled bare]} {
991 if {[lindex [file split $_gitdir] end] ne {.git}} {
992 catch {wm withdraw .}
993 error_popup [strcat [mc "Cannot use funny .git directory
:"] "\n\n$_gitdir"]
996 if {[catch {cd [file dirname $_gitdir]} err]} {
997 catch {wm withdraw .}
998 error_popup [strcat [mc "No working directory
"] " [file dirname $_gitdir]:\n\n$err"]
1002 set _reponame [file split [file normalize $_gitdir]]
1003 if {[lindex $_reponame end] eq {.git}} {
1004 set _reponame [lindex $_reponame end-1]
1006 set _reponame [lindex $_reponame end]
1009 ######################################################################
1013 set current_diff_path {}
1014 set current_diff_side {}
1015 set diff_actions [list]
1019 set MERGE_HEAD [list]
1022 set current_branch {}
1024 set current_diff_path {}
1026 set selected_commit_type new
1028 ######################################################################
1036 set disable_on_lock [list]
1037 set index_lock_type none
1039 proc lock_index {type} {
1040 global index_lock_type disable_on_lock
1042 if {$index_lock_type eq {none}} {
1043 set index_lock_type $type
1044 foreach w $disable_on_lock {
1045 uplevel #0 $w disabled
1048 } elseif {$index_lock_type eq "begin-
$type"} {
1049 set index_lock_type $type
1055 proc unlock_index {} {
1056 global index_lock_type disable_on_lock
1058 set index_lock_type none
1059 foreach w $disable_on_lock {
1060 uplevel #0 $w normal
1064 ######################################################################
1068 proc repository_state {ctvar hdvar mhvar} {
1069 global current_branch
1070 upvar $ctvar ct $hdvar hd $mhvar mh
1075 if {[catch {set hd [git rev-parse --verify HEAD]}]} {
1081 set merge_head [gitdir MERGE_HEAD]
1082 if {[file exists $merge_head]} {
1084 set fd_mh [open $merge_head r]
1085 while {[gets $fd_mh line] >= 0} {
1096 global PARENT empty_tree
1098 set p [lindex $PARENT 0]
1102 if {$empty_tree eq {}} {
1103 set empty_tree [git mktree << {}]
1108 proc rescan {after {honor_trustmtime 1}} {
1109 global HEAD PARENT MERGE_HEAD commit_type
1110 global ui_index ui_workdir ui_comm
1111 global rescan_active file_states
1114 if {$rescan_active > 0 || ![lock_index read]} return
1116 repository_state newType newHEAD newMERGE_HEAD
1117 if {[string match amend* $commit_type]
1118 && $newType eq {normal}
1119 && $newHEAD eq $HEAD} {
1123 set MERGE_HEAD $newMERGE_HEAD
1124 set commit_type $newType
1127 array unset file_states
1129 if {!$::GITGUI_BCK_exists &&
1130 (![$ui_comm edit modified]
1131 || [string trim [$ui_comm get 0.0 end]] eq {})} {
1132 if {[string match amend* $commit_type]} {
1133 } elseif {[load_message GITGUI_MSG]} {
1134 } elseif {[load_message MERGE_MSG]} {
1135 } elseif {[load_message SQUASH_MSG]} {
1138 $ui_comm edit modified false
1141 if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
1142 rescan_stage2 {} $after
1145 ui_status [mc "Refreshing
file status...
"]
1146 set fd_rf [git_read update-index \
1152 fconfigure $fd_rf -blocking 0 -translation binary
1153 fileevent $fd_rf readable \
1154 [list rescan_stage2 $fd_rf $after]
1159 set is_git_info_exclude {}
1160 proc have_info_exclude {} {
1161 global is_git_info_exclude
1163 if {$is_git_info_exclude eq {}} {
1164 if {[catch {exec test -f [gitdir info exclude]}]} {
1165 set is_git_info_exclude 0
1167 set is_git_info_exclude 1
1170 return $is_git_info_exclude
1173 proc have_info_exclude {} {
1174 return [file readable [gitdir info exclude]]
1178 proc rescan_stage2 {fd after} {
1179 global rescan_active buf_rdi buf_rdf buf_rlo
1183 if {![eof $fd]} return
1187 set ls_others [list --exclude-per-directory=.gitignore]
1188 if {[have_info_exclude]} {
1189 lappend ls_others "--exclude-from=[gitdir info exclude
]"
1191 set user_exclude [get_config core.excludesfile]
1192 if {$user_exclude ne {} && [file readable $user_exclude]} {
1193 lappend ls_others "--exclude-from=$user_exclude"
1201 ui_status [mc "Scanning
for modified files ...
"]
1202 set fd_di [git_read diff-index --cached -z [PARENT]]
1203 set fd_df [git_read diff-files -z]
1204 set fd_lo [eval git_read ls-files --others -z $ls_others]
1206 fconfigure $fd_di -blocking 0 -translation binary -encoding binary
1207 fconfigure $fd_df -blocking 0 -translation binary -encoding binary
1208 fconfigure $fd_lo -blocking 0 -translation binary -encoding binary
1209 fileevent $fd_di readable [list read_diff_index $fd_di $after]
1210 fileevent $fd_df readable [list read_diff_files $fd_df $after]
1211 fileevent $fd_lo readable [list read_ls_others $fd_lo $after]
1214 proc load_message {file} {
1217 set f [gitdir $file]
1218 if {[file isfile $f]} {
1219 if {[catch {set fd [open $f r]}]} {
1222 fconfigure $fd -eofchar {}
1223 set content [string trim [read $fd]]
1225 regsub -all -line {[ \r\t]+$} $content {} content
1226 $ui_comm delete 0.0 end
1227 $ui_comm insert end $content
1233 proc read_diff_index {fd after} {
1236 append buf_rdi [read $fd]
1238 set n [string length $buf_rdi]
1240 set z1 [string first "\
0" $buf_rdi $c]
1241 if {$z1 == -1} break
1243 set z2 [string first "\
0" $buf_rdi $z1]
1244 if {$z2 == -1} break
1247 set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
1248 set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
1250 [encoding convertfrom $p] \
1252 [list [lindex $i 0] [lindex $i 2]] \
1258 set buf_rdi [string range $buf_rdi $c end]
1263 rescan_done $fd buf_rdi $after
1266 proc read_diff_files {fd after} {
1269 append buf_rdf [read $fd]
1271 set n [string length $buf_rdf]
1273 set z1 [string first "\
0" $buf_rdf $c]
1274 if {$z1 == -1} break
1276 set z2 [string first "\
0" $buf_rdf $z1]
1277 if {$z2 == -1} break
1280 set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
1281 set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
1283 [encoding convertfrom $p] \
1286 [list [lindex $i 0] [lindex $i 2]]
1291 set buf_rdf [string range $buf_rdf $c end]
1296 rescan_done $fd buf_rdf $after
1299 proc read_ls_others {fd after} {
1302 append buf_rlo [read $fd]
1303 set pck [split $buf_rlo "\
0"]
1304 set buf_rlo [lindex $pck end]
1305 foreach p [lrange $pck 0 end-1] {
1306 set p [encoding convertfrom $p]
1307 if {[string index $p end] eq {/}} {
1308 set p [string range $p 0 end-1]
1312 rescan_done $fd buf_rlo $after
1315 proc rescan_done {fd buf after} {
1316 global rescan_active current_diff_path
1317 global file_states repo_config
1320 if {![eof $fd]} return
1323 if {[incr rescan_active -1] > 0} return
1328 if {$current_diff_path ne {}} reshow_diff
1329 if {$current_diff_path eq {}} select_first_diff
1334 proc prune_selection {} {
1335 global file_states selected_paths
1337 foreach path [array names selected_paths] {
1338 if {[catch {set still_here $file_states($path)}]} {
1339 unset selected_paths($path)
1344 ######################################################################
1348 proc mapicon {w state path} {
1351 if {[catch {set r $all_icons($state$w)}]} {
1352 puts "error
: no icon
for $w state
={$state} $path"
1358 proc mapdesc {state path} {
1361 if {[catch {set r $all_descs($state)}]} {
1362 puts "error
: no desc
for state
={$state} $path"
1368 proc ui_status {msg} {
1370 if {[info exists main_status]} {
1371 $main_status show $msg
1375 proc ui_ready {{test {}}} {
1377 if {[info exists main_status]} {
1378 $main_status show [mc "Ready.
"] $test
1382 proc escape_path {path} {
1383 regsub -all {\\} $path "\\\\" path
1384 regsub -all "\n" $path "\\n
" path
1388 proc short_path {path} {
1389 return [escape_path [lindex [file split $path] end]]
1393 set null_sha1 [string repeat 0 40]
1395 proc merge_state {path new_state {head_info {}} {index_info {}}} {
1396 global file_states next_icon_id null_sha1
1398 set s0 [string index $new_state 0]
1399 set s1 [string index $new_state 1]
1401 if {[catch {set info $file_states($path)}]} {
1403 set icon n[incr next_icon_id]
1405 set state [lindex $info 0]
1406 set icon [lindex $info 1]
1407 if {$head_info eq {}} {set head_info [lindex $info 2]}
1408 if {$index_info eq {}} {set index_info [lindex $info 3]}
1411 if {$s0 eq {?}} {set s0 [string index $state 0]} \
1412 elseif {$s0 eq {_}} {set s0 _}
1414 if {$s1 eq {?}} {set s1 [string index $state 1]} \
1415 elseif {$s1 eq {_}} {set s1 _}
1417 if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
1418 set head_info [list 0 $null_sha1]
1419 } elseif {$s0 ne {_} && [string index $state 0] eq {_}
1420 && $head_info eq {}} {
1421 set head_info $index_info
1424 set file_states($path) [list $s0$s1 $icon \
1425 $head_info $index_info \
1430 proc display_file_helper {w path icon_name old_m new_m} {
1433 if {$new_m eq {_}} {
1434 set lno [lsearch -sorted -exact $file_lists($w) $path]
1436 set file_lists($w) [lreplace $file_lists($w) $lno $lno]
1438 $w conf -state normal
1439 $w delete $lno.0 [expr {$lno + 1}].0
1440 $w conf -state disabled
1442 } elseif {$old_m eq {_} && $new_m ne {_}} {
1443 lappend file_lists($w) $path
1444 set file_lists($w) [lsort -unique $file_lists($w)]
1445 set lno [lsearch -sorted -exact $file_lists($w) $path]
1447 $w conf -state normal
1448 $w image create $lno.0 \
1449 -align center -padx 5 -pady 1 \
1451 -image [mapicon $w $new_m $path]
1452 $w insert $lno.1 "[escape_path
$path]\n"
1453 $w conf -state disabled
1454 } elseif {$old_m ne $new_m} {
1455 $w conf -state normal
1456 $w image conf $icon_name -image [mapicon $w $new_m $path]
1457 $w conf -state disabled
1461 proc display_file {path state} {
1462 global file_states selected_paths
1463 global ui_index ui_workdir
1465 set old_m [merge_state $path $state]
1466 set s $file_states($path)
1467 set new_m [lindex $s 0]
1468 set icon_name [lindex $s 1]
1470 set o [string index $old_m 0]
1471 set n [string index $new_m 0]
1478 display_file_helper $ui_index $path $icon_name $o $n
1480 if {[string index $old_m 0] eq {U}} {
1483 set o [string index $old_m 1]
1485 if {[string index $new_m 0] eq {U}} {
1488 set n [string index $new_m 1]
1490 display_file_helper $ui_workdir $path $icon_name $o $n
1492 if {$new_m eq {__}} {
1493 unset file_states($path)
1494 catch {unset selected_paths($path)}
1498 proc display_all_files_helper {w path icon_name m} {
1501 lappend file_lists($w) $path
1502 set lno [expr {[lindex [split [$w index end] .] 0] - 1}]
1503 $w image create end \
1504 -align center -padx 5 -pady 1 \
1506 -image [mapicon $w $m $path]
1507 $w insert end "[escape_path
$path]\n"
1510 proc display_all_files {} {
1511 global ui_index ui_workdir
1512 global file_states file_lists
1515 $ui_index conf -state normal
1516 $ui_workdir conf -state normal
1518 $ui_index delete 0.0 end
1519 $ui_workdir delete 0.0 end
1522 set file_lists($ui_index) [list]
1523 set file_lists($ui_workdir) [list]
1525 foreach path [lsort [array names file_states]] {
1526 set s $file_states($path)
1528 set icon_name [lindex $s 1]
1530 set s [string index $m 0]
1531 if {$s ne {U} && $s ne {_}} {
1532 display_all_files_helper $ui_index $path \
1536 if {[string index $m 0] eq {U}} {
1539 set s [string index $m 1]
1542 display_all_files_helper $ui_workdir $path \
1547 $ui_index conf -state disabled
1548 $ui_workdir conf -state disabled
1551 ######################################################################
1556 #define mask_width 14
1557 #define mask_height 15
1558 static unsigned char mask_bits[] = {
1559 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1560 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
1561 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
1564 image create bitmap file_plain -background white -foreground black -data {
1565 #define plain_width 14
1566 #define plain_height 15
1567 static unsigned char plain_bits[] = {
1568 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1569 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
1570 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1571 } -maskdata $filemask
1573 image create bitmap file_mod -background white -foreground blue -data {
1574 #define mod_width 14
1575 #define mod_height 15
1576 static unsigned char mod_bits[] = {
1577 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1578 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1579 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1580 } -maskdata $filemask
1582 image create bitmap file_fulltick -background white -foreground "#007000" -data {
1583 #define file_fulltick_width 14
1584 #define file_fulltick_height 15
1585 static unsigned char file_fulltick_bits
[] = {
1586 0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
1587 0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
1588 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1589 } -maskdata $filemask
1591 image create bitmap file_parttick
-background white
-foreground "#005050" -data {
1592 #define parttick_width 14
1593 #define parttick_height 15
1594 static unsigned char parttick_bits
[] = {
1595 0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
1596 0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10,
1597 0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1598 } -maskdata $filemask
1600 image create bitmap file_question
-background white
-foreground black
-data {
1601 #define file_question_width 14
1602 #define file_question_height 15
1603 static unsigned char file_question_bits
[] = {
1604 0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
1605 0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
1606 0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1607 } -maskdata $filemask
1609 image create bitmap file_removed
-background white
-foreground red
-data {
1610 #define file_removed_width 14
1611 #define file_removed_height 15
1612 static unsigned char file_removed_bits
[] = {
1613 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
1614 0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
1615 0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
1616 } -maskdata $filemask
1618 image create bitmap file_merge
-background white
-foreground blue
-data {
1619 #define file_merge_width 14
1620 #define file_merge_height 15
1621 static unsigned char file_merge_bits
[] = {
1622 0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
1623 0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
1624 0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
1625 } -maskdata $filemask
1627 image create bitmap file_statechange
-background white
-foreground green
-data {
1628 #define file_merge_width 14
1629 #define file_merge_height 15
1630 static unsigned char file_statechange_bits
[] = {
1631 0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
1632 0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
1633 0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
1634 } -maskdata $filemask
1636 set ui_index .vpane.files.index.list
1637 set ui_workdir .vpane.files.workdir.list
1639 set all_icons
(_
$ui_index) file_plain
1640 set all_icons
(A
$ui_index) file_fulltick
1641 set all_icons
(M
$ui_index) file_fulltick
1642 set all_icons
(D
$ui_index) file_removed
1643 set all_icons
(U
$ui_index) file_merge
1644 set all_icons
(T
$ui_index) file_statechange
1646 set all_icons
(_
$ui_workdir) file_plain
1647 set all_icons
(M
$ui_workdir) file_mod
1648 set all_icons
(D
$ui_workdir) file_question
1649 set all_icons
(U
$ui_workdir) file_merge
1650 set all_icons
(O
$ui_workdir) file_plain
1651 set all_icons
(T
$ui_workdir) file_statechange
1653 set max_status_desc
0
1655 {__
{mc
"Unmodified"}}
1657 {_M
{mc
"Modified, not staged"}}
1658 {M_
{mc
"Staged for commit"}}
1659 {MM
{mc
"Portions staged for commit"}}
1660 {MD
{mc
"Staged for commit, missing"}}
1662 {_T
{mc
"File type changed, not staged"}}
1663 {T_
{mc
"File type changed, staged"}}
1665 {_O
{mc
"Untracked, not staged"}}
1666 {A_
{mc
"Staged for commit"}}
1667 {AM
{mc
"Portions staged for commit"}}
1668 {AD
{mc
"Staged for commit, missing"}}
1671 {D_
{mc
"Staged for removal"}}
1672 {DO
{mc
"Staged for removal, still present"}}
1674 {_U
{mc
"Requires merge resolution"}}
1675 {U_
{mc
"Requires merge resolution"}}
1676 {UU
{mc
"Requires merge resolution"}}
1677 {UM
{mc
"Requires merge resolution"}}
1678 {UD
{mc
"Requires merge resolution"}}
1679 {UT
{mc
"Requires merge resolution"}}
1681 set text
[eval [lindex
$i 1]]
1682 if {$max_status_desc < [string length
$text]} {
1683 set max_status_desc
[string length
$text]
1685 set all_descs
([lindex
$i 0]) $text
1689 ######################################################################
1693 proc scrollbar2many
{list mode args
} {
1694 foreach w
$list {eval $w $mode $args}
1697 proc many2scrollbar
{list mode sb top bottom
} {
1698 $sb set $top $bottom
1699 foreach w
$list {$w $mode moveto
$top}
1702 proc incr_font_size
{font
{amt
1}} {
1703 set sz
[font configure
$font -size]
1705 font configure
$font -size $sz
1706 font configure
${font}bold
-size $sz
1707 font configure
${font}italic
-size $sz
1710 ######################################################################
1714 set starting_gitk_msg
[mc
"Starting gitk... please wait..."]
1716 proc do_gitk
{revs
} {
1717 # -- Always start gitk through whatever we were loaded with. This
1718 # lets us bypass using shell process on Windows systems.
1720 set exe
[_which gitk
-script]
1721 set cmd
[list
[info nameofexecutable
] $exe]
1723 error_popup
[mc
"Couldn't find gitk in PATH"]
1727 if {[info exists env
(GIT_DIR
)]} {
1728 set old_GIT_DIR
$env(GIT_DIR
)
1734 cd [file dirname [gitdir
]]
1735 set env
(GIT_DIR
) [file tail [gitdir
]]
1737 eval exec $cmd $revs &
1739 if {$old_GIT_DIR eq
{}} {
1742 set env
(GIT_DIR
) $old_GIT_DIR
1746 ui_status $
::starting_gitk_msg
1748 ui_ready
$starting_gitk_msg
1756 global ui_comm is_quitting repo_config commit_type
1757 global GITGUI_BCK_exists GITGUI_BCK_i
1758 global ui_comm_spell
1760 if {$is_quitting} return
1763 if {[winfo exists
$ui_comm]} {
1764 # -- Stash our current commit buffer.
1766 set save
[gitdir GITGUI_MSG
]
1767 if {$GITGUI_BCK_exists && ![$ui_comm edit modified
]} {
1768 file rename
-force [gitdir GITGUI_BCK
] $save
1769 set GITGUI_BCK_exists
0
1771 set msg
[string trim
[$ui_comm get
0.0 end
]]
1772 regsub
-all -line {[ \r\t]+$
} $msg {} msg
1773 if {(![string match amend
* $commit_type]
1774 ||
[$ui_comm edit modified
])
1777 set fd
[open
$save w
]
1778 puts
-nonewline $fd $msg
1782 catch
{file delete
$save}
1786 # -- Cancel our spellchecker if its running.
1788 if {[info exists ui_comm_spell
]} {
1792 # -- Remove our editor backup, its not needed.
1794 after cancel
$GITGUI_BCK_i
1795 if {$GITGUI_BCK_exists} {
1796 catch
{file delete
[gitdir GITGUI_BCK
]}
1799 # -- Stash our current window geometry into this repository.
1801 set cfg_geometry
[list
]
1802 lappend cfg_geometry
[wm geometry .
]
1803 lappend cfg_geometry
[lindex
[.vpane sash coord
0] 0]
1804 lappend cfg_geometry
[lindex
[.vpane.files sash coord
0] 1]
1805 if {[catch
{set rc_geometry
$repo_config(gui.geometry
)}]} {
1808 if {$cfg_geometry ne
$rc_geometry} {
1809 catch
{git config gui.geometry
$cfg_geometry}
1825 global next_diff_p next_diff_w next_diff_i
1826 show_diff
$next_diff_p $next_diff_w {}
1829 proc find_anchor_pos
{lst name
} {
1830 set lid
[lsearch
-sorted -exact $lst $name]
1834 foreach lname
$lst {
1835 if {$lname >= $name} break
1843 proc find_file_from
{flist idx delta path mmask
} {
1846 set len
[llength
$flist]
1847 while {$idx >= 0 && $idx < $len} {
1848 set name
[lindex
$flist $idx]
1850 if {$name ne
$path && [info exists file_states
($name)]} {
1851 set state
[lindex
$file_states($name) 0]
1853 if {$mmask eq
{} ||
[regexp
$mmask $state]} {
1864 proc find_next_diff
{w path
{lno
{}} {mmask
{}}} {
1865 global next_diff_p next_diff_w next_diff_i
1866 global file_lists ui_index ui_workdir
1868 set flist
$file_lists($w)
1870 set lno
[find_anchor_pos
$flist $path]
1875 if {$mmask ne
{} && ![regexp
{(^\^
)|
(\$$
)} $mmask]} {
1876 if {$w eq
$ui_index} {
1879 set mmask
"$mmask\$"
1883 set idx
[find_file_from
$flist $lno 1 $path $mmask]
1886 set idx
[find_file_from
$flist $lno -1 $path $mmask]
1891 set next_diff_p
[lindex
$flist $idx]
1892 set next_diff_i
[expr {$idx+1}]
1899 proc next_diff_after_action
{w path
{lno
{}} {mmask
{}}} {
1900 global current_diff_path
1902 if {$path ne
$current_diff_path} {
1904 } elseif
{[find_next_diff
$w $path $lno $mmask]} {
1907 return {reshow_diff
;}
1911 proc select_first_diff
{} {
1914 if {[find_next_diff
$ui_workdir {} 1 {^_?U
}] ||
1915 [find_next_diff
$ui_workdir {} 1 {[^O
]$
}]} {
1920 proc toggle_or_diff
{w x y
} {
1921 global file_states file_lists current_diff_path ui_index ui_workdir
1922 global last_clicked selected_paths
1924 set pos
[split [$w index @
$x,$y] .
]
1925 set lno
[lindex
$pos 0]
1926 set col [lindex
$pos 1]
1927 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
1933 set last_clicked
[list
$w $lno]
1934 array
unset selected_paths
1935 $ui_index tag remove in_sel
0.0 end
1936 $ui_workdir tag remove in_sel
0.0 end
1938 # Do not stage files with conflicts
1939 if {[info exists file_states
($path)]} {
1940 set state
[lindex
$file_states($path) 0]
1941 if {[string first
{U
} $state] >= 0} {
1946 if {$col == 0 && $y > 1} {
1947 set after
[next_diff_after_action
$w $path $lno]
1949 if {$w eq
$ui_index} {
1951 "Unstaging [short_path $path] from commit" \
1953 [concat
$after [list ui_ready
]]
1954 } elseif
{$w eq
$ui_workdir} {
1956 "Adding [short_path $path]" \
1958 [concat
$after [list ui_ready
]]
1961 show_diff
$path $w $lno
1965 proc add_one_to_selection
{w x y
} {
1966 global file_lists last_clicked selected_paths
1968 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
1969 set path
[lindex
$file_lists($w) [expr {$lno - 1}]]
1975 if {$last_clicked ne
{}
1976 && [lindex
$last_clicked 0] ne
$w} {
1977 array
unset selected_paths
1978 [lindex
$last_clicked 0] tag remove in_sel
0.0 end
1981 set last_clicked
[list
$w $lno]
1982 if {[catch
{set in_sel
$selected_paths($path)}]} {
1986 unset selected_paths
($path)
1987 $w tag remove in_sel
$lno.0 [expr {$lno + 1}].0
1989 set selected_paths
($path) 1
1990 $w tag add in_sel
$lno.0 [expr {$lno + 1}].0
1994 proc add_range_to_selection
{w x y
} {
1995 global file_lists last_clicked selected_paths
1997 if {[lindex
$last_clicked 0] ne
$w} {
1998 toggle_or_diff
$w $x $y
2002 set lno
[lindex
[split [$w index @
$x,$y] .
] 0]
2003 set lc
[lindex
$last_clicked 1]
2012 foreach path
[lrange
$file_lists($w) \
2013 [expr {$begin - 1}] \
2014 [expr {$end - 1}]] {
2015 set selected_paths
($path) 1
2017 $w tag add in_sel
$begin.0 [expr {$end + 1}].0
2020 proc show_more_context
{} {
2022 if {$repo_config(gui.diffcontext
) < 99} {
2023 incr repo_config
(gui.diffcontext
)
2028 proc show_less_context
{} {
2030 if {$repo_config(gui.diffcontext
) > 1} {
2031 incr repo_config
(gui.diffcontext
) -1
2036 ######################################################################
2046 menu .mbar
-tearoff 0
2047 .mbar add cascade
-label [mc Repository
] -menu .mbar.repository
2048 .mbar add cascade
-label [mc Edit
] -menu .mbar.edit
2049 if {[is_enabled branch
]} {
2050 .mbar add cascade
-label [mc Branch
] -menu .mbar.branch
2052 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2053 .mbar add cascade
-label [mc Commit@@noun
] -menu .mbar.commit
2055 if {[is_enabled transport
]} {
2056 .mbar add cascade
-label [mc Merge
] -menu .mbar.merge
2057 .mbar add cascade
-label [mc Remote
] -menu .mbar.remote
2059 . configure
-menu .mbar
2061 # -- Repository Menu
2063 menu .mbar.repository
2065 .mbar.repository add
command \
2066 -label [mc
"Browse Current Branch's Files"] \
2067 -command {browser
::new
$current_branch}
2068 set ui_browse_current
[.mbar.repository index last
]
2069 .mbar.repository add
command \
2070 -label [mc
"Browse Branch Files..."] \
2071 -command browser_open
::dialog
2072 .mbar.repository add separator
2074 .mbar.repository add
command \
2075 -label [mc
"Visualize Current Branch's History"] \
2076 -command {do_gitk
$current_branch}
2077 set ui_visualize_current
[.mbar.repository index last
]
2078 .mbar.repository add
command \
2079 -label [mc
"Visualize All Branch History"] \
2080 -command {do_gitk
--all}
2081 .mbar.repository add separator
2083 proc current_branch_write
{args
} {
2084 global current_branch
2085 .mbar.repository entryconf $
::ui_browse_current \
2086 -label [mc
"Browse %s's Files" $current_branch]
2087 .mbar.repository entryconf $
::ui_visualize_current \
2088 -label [mc
"Visualize %s's History" $current_branch]
2090 trace add variable current_branch
write current_branch_write
2092 if {[is_enabled multicommit
]} {
2093 .mbar.repository add
command -label [mc
"Database Statistics"] \
2096 .mbar.repository add
command -label [mc
"Compress Database"] \
2099 .mbar.repository add
command -label [mc
"Verify Database"] \
2100 -command do_fsck_objects
2102 .mbar.repository add separator
2105 .mbar.repository add
command \
2106 -label [mc
"Create Desktop Icon"] \
2107 -command do_cygwin_shortcut
2108 } elseif
{[is_Windows
]} {
2109 .mbar.repository add
command \
2110 -label [mc
"Create Desktop Icon"] \
2111 -command do_windows_shortcut
2112 } elseif
{[is_MacOSX
]} {
2113 .mbar.repository add
command \
2114 -label [mc
"Create Desktop Icon"] \
2115 -command do_macosx_app
2120 proc
::tk
::mac
::Quit
{args
} { do_quit
}
2122 .mbar.repository add
command -label [mc Quit
] \
2130 .mbar.edit add
command -label [mc Undo
] \
2131 -command {catch
{[focus
] edit undo
}} \
2133 .mbar.edit add
command -label [mc Redo
] \
2134 -command {catch
{[focus
] edit redo
}} \
2136 .mbar.edit add separator
2137 .mbar.edit add
command -label [mc Cut
] \
2138 -command {catch
{tk_textCut
[focus
]}} \
2140 .mbar.edit add
command -label [mc Copy
] \
2141 -command {catch
{tk_textCopy
[focus
]}} \
2143 .mbar.edit add
command -label [mc Paste
] \
2144 -command {catch
{tk_textPaste
[focus
]; [focus
] see insert
}} \
2146 .mbar.edit add
command -label [mc Delete
] \
2147 -command {catch
{[focus
] delete sel.first sel.last
}} \
2149 .mbar.edit add separator
2150 .mbar.edit add
command -label [mc
"Select All"] \
2151 -command {catch
{[focus
] tag add sel
0.0 end
}} \
2156 if {[is_enabled branch
]} {
2159 .mbar.branch add
command -label [mc
"Create..."] \
2160 -command branch_create
::dialog \
2162 lappend disable_on_lock
[list .mbar.branch entryconf \
2163 [.mbar.branch index last
] -state]
2165 .mbar.branch add
command -label [mc
"Checkout..."] \
2166 -command branch_checkout
::dialog \
2168 lappend disable_on_lock
[list .mbar.branch entryconf \
2169 [.mbar.branch index last
] -state]
2171 .mbar.branch add
command -label [mc
"Rename..."] \
2172 -command branch_rename
::dialog
2173 lappend disable_on_lock
[list .mbar.branch entryconf \
2174 [.mbar.branch index last
] -state]
2176 .mbar.branch add
command -label [mc
"Delete..."] \
2177 -command branch_delete
::dialog
2178 lappend disable_on_lock
[list .mbar.branch entryconf \
2179 [.mbar.branch index last
] -state]
2181 .mbar.branch add
command -label [mc
"Reset..."] \
2182 -command merge
::reset_hard
2183 lappend disable_on_lock
[list .mbar.branch entryconf \
2184 [.mbar.branch index last
] -state]
2189 if {[is_enabled multicommit
] ||
[is_enabled singlecommit
]} {
2192 .mbar.commit add radiobutton \
2193 -label [mc
"New Commit"] \
2194 -command do_select_commit_type \
2195 -variable selected_commit_type \
2197 lappend disable_on_lock \
2198 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2200 .mbar.commit add radiobutton \
2201 -label [mc
"Amend Last Commit"] \
2202 -command do_select_commit_type \
2203 -variable selected_commit_type \
2205 lappend disable_on_lock \
2206 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2208 .mbar.commit add separator
2210 .mbar.commit add
command -label [mc Rescan
] \
2211 -command do_rescan \
2213 lappend disable_on_lock \
2214 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2216 .mbar.commit add
command -label [mc
"Stage To Commit"] \
2217 -command do_add_selection \
2219 lappend disable_on_lock \
2220 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2222 .mbar.commit add
command -label [mc
"Stage Changed Files To Commit"] \
2223 -command do_add_all \
2225 lappend disable_on_lock \
2226 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2228 .mbar.commit add
command -label [mc
"Unstage From Commit"] \
2229 -command do_unstage_selection
2230 lappend disable_on_lock \
2231 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2233 .mbar.commit add
command -label [mc
"Revert Changes"] \
2234 -command do_revert_selection
2235 lappend disable_on_lock \
2236 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2238 .mbar.commit add separator
2240 .mbar.commit add
command -label [mc
"Show Less Context"] \
2241 -command show_less_context \
2242 -accelerator $M1T-\
-
2244 .mbar.commit add
command -label [mc
"Show More Context"] \
2245 -command show_more_context \
2248 .mbar.commit add separator
2250 .mbar.commit add
command -label [mc
"Sign Off"] \
2251 -command do_signoff \
2254 .mbar.commit add
command -label [mc Commit@@verb
] \
2255 -command do_commit \
2256 -accelerator $M1T-Return
2257 lappend disable_on_lock \
2258 [list .mbar.commit entryconf
[.mbar.commit index last
] -state]
2263 if {[is_enabled branch
]} {
2265 .mbar.merge add
command -label [mc
"Local Merge..."] \
2266 -command merge
::dialog \
2268 lappend disable_on_lock \
2269 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2270 .mbar.merge add
command -label [mc
"Abort Merge..."] \
2271 -command merge
::reset_hard
2272 lappend disable_on_lock \
2273 [list .mbar.merge entryconf
[.mbar.merge index last
] -state]
2278 if {[is_enabled transport
]} {
2281 .mbar.remote add
command \
2282 -label [mc
"Push..."] \
2283 -command do_push_anywhere \
2285 .mbar.remote add
command \
2286 -label [mc
"Delete..."] \
2287 -command remote_branch_delete
::dialog
2291 # -- Apple Menu (Mac OS X only)
2293 .mbar add cascade
-label Apple
-menu .mbar.apple
2296 .mbar.apple add
command -label [mc
"About %s" [appname
]] \
2298 .mbar.apple add separator
2299 .mbar.apple add
command \
2300 -label [mc
"Preferences..."] \
2301 -command do_options \
2303 bind .
<$M1B-,> do_options
2307 .mbar.edit add separator
2308 .mbar.edit add
command -label [mc
"Options..."] \
2314 .mbar add cascade
-label [mc Help
] -menu .mbar.
help
2318 .mbar.
help add
command -label [mc
"About %s" [appname
]] \
2323 catch
{set browser
$repo_config(instaweb.browser
)}
2324 set doc_path
[file dirname [gitexec
]]
2325 set doc_path
[file join $doc_path Documentation index.html
]
2328 set doc_path
[exec cygpath
--mixed $doc_path]
2331 if {$browser eq
{}} {
2334 } elseif
{[is_Cygwin
]} {
2335 set program_files
[file dirname [exec cygpath
--windir]]
2336 set program_files
[file join $program_files {Program Files
}]
2337 set firefox
[file join $program_files {Mozilla Firefox
} firefox.exe
]
2338 set ie
[file join $program_files {Internet Explorer
} IEXPLORE.EXE
]
2339 if {[file exists
$firefox]} {
2340 set browser
$firefox
2341 } elseif
{[file exists
$ie]} {
2344 unset program_files firefox ie
2348 if {[file isfile
$doc_path]} {
2349 set doc_url
"file:$doc_path"
2351 set doc_url
{http
://www.kernel.org
/pub
/software
/scm
/git
/docs
/}
2354 if {$browser ne
{}} {
2355 .mbar.
help add
command -label [mc
"Online Documentation"] \
2356 -command [list
exec $browser $doc_url &]
2358 unset browser doc_path doc_url
2360 # -- Standard bindings
2362 wm protocol . WM_DELETE_WINDOW do_quit
2363 bind all
<$M1B-Key-q> do_quit
2364 bind all
<$M1B-Key-Q> do_quit
2365 bind all
<$M1B-Key-w> {destroy
[winfo toplevel
%W
]}
2366 bind all
<$M1B-Key-W> {destroy
[winfo toplevel
%W
]}
2368 set subcommand_args
{}
2370 puts stderr
"usage: $::argv0 $::subcommand $::subcommand_args"
2374 # -- Not a normal commit type invocation? Do that instead!
2376 switch
-- $subcommand {
2379 if {$subcommand eq
"blame"} {
2380 set subcommand_args
{[--line=<num
>] rev? path
}
2382 set subcommand_args
{rev? path
}
2384 if {$argv eq
{}} usage
2390 if {$is_path ||
[file exists
$_prefix$a]} {
2391 if {$path ne
{}} usage
2394 } elseif
{$a eq
{--}} {
2396 if {$head ne
{}} usage
2401 } elseif
{[regexp
{^
--line=(\d
+)$
} $a a lnum
]} {
2402 if {$jump_spec ne
{} ||
$head ne
{}} usage
2403 set jump_spec
[list
$lnum]
2404 } elseif
{$head eq
{}} {
2405 if {$head ne
{}} usage
2414 if {$head ne
{} && $path eq
{}} {
2415 set path
$_prefix$head
2422 if {[regexp
{^
[0-9a-f]{1,39}$
} $head]} {
2424 set head [git rev-parse
--verify $head]
2430 set current_branch
$head
2433 switch
-- $subcommand {
2435 if {$jump_spec ne
{}} usage
2437 if {$path ne
{} && [file isdirectory
$path]} {
2438 set head $current_branch
2444 browser
::new
$head $path
2447 if {$head eq
{} && ![file exists
$path]} {
2448 puts stderr
[mc
"fatal: cannot stat path %s: No such file or directory" $path]
2451 blame
::new
$head $path $jump_spec
2458 if {[llength
$argv] != 0} {
2459 puts
-nonewline stderr
"usage: $argv0"
2460 if {$subcommand ne
{gui
}
2461 && [file tail $argv0] ne
"git-$subcommand"} {
2462 puts
-nonewline stderr
" $subcommand"
2467 # fall through to setup UI for commits
2470 puts stderr
"usage: $argv0 \[{blame|browser|citool}\]"
2481 -text [mc
"Current Branch:"] \
2485 -textvariable current_branch \
2488 pack .branch.l1
-side left
2489 pack .branch.cb
-side left
-fill x
2490 pack .branch
-side top
-fill x
2492 # -- Main Window Layout
2494 panedwindow .vpane
-orient horizontal
2495 panedwindow .vpane.files
-orient vertical
2496 .vpane add .vpane.files
-sticky nsew
-height 100 -width 200
2497 pack .vpane
-anchor n
-side top
-fill both
-expand 1
2499 # -- Index File List
2501 frame .vpane.files.index
-height 100 -width 200
2502 label .vpane.files.index.title
-text [mc
"Staged Changes (Will Commit)"] \
2503 -background lightgreen
-foreground black
2504 text
$ui_index -background white
-foreground black \
2506 -width 20 -height 10 \
2508 -cursor $cursor_ptr \
2509 -xscrollcommand {.vpane.files.index.sx
set} \
2510 -yscrollcommand {.vpane.files.index.sy
set} \
2512 scrollbar .vpane.files.index.sx
-orient h
-command [list
$ui_index xview
]
2513 scrollbar .vpane.files.index.sy
-orient v
-command [list
$ui_index yview
]
2514 pack .vpane.files.index.title
-side top
-fill x
2515 pack .vpane.files.index.sx
-side bottom
-fill x
2516 pack .vpane.files.index.sy
-side right
-fill y
2517 pack
$ui_index -side left
-fill both
-expand 1
2519 # -- Working Directory File List
2521 frame .vpane.files.workdir
-height 100 -width 200
2522 label .vpane.files.workdir.title
-text [mc
"Unstaged Changes"] \
2523 -background lightsalmon
-foreground black
2524 text
$ui_workdir -background white
-foreground black \
2526 -width 20 -height 10 \
2528 -cursor $cursor_ptr \
2529 -xscrollcommand {.vpane.files.workdir.sx
set} \
2530 -yscrollcommand {.vpane.files.workdir.sy
set} \
2532 scrollbar .vpane.files.workdir.sx
-orient h
-command [list
$ui_workdir xview
]
2533 scrollbar .vpane.files.workdir.sy
-orient v
-command [list
$ui_workdir yview
]
2534 pack .vpane.files.workdir.title
-side top
-fill x
2535 pack .vpane.files.workdir.sx
-side bottom
-fill x
2536 pack .vpane.files.workdir.sy
-side right
-fill y
2537 pack
$ui_workdir -side left
-fill both
-expand 1
2539 .vpane.files add .vpane.files.workdir
-sticky nsew
2540 .vpane.files add .vpane.files.index
-sticky nsew
2542 foreach i
[list
$ui_index $ui_workdir] {
2544 $i tag conf in_diff
-background [$i tag cget in_sel
-background]
2548 # -- Diff and Commit Area
2550 frame .vpane.lower
-height 300 -width 400
2551 frame .vpane.lower.commarea
2552 frame .vpane.lower.
diff -relief sunken
-borderwidth 1
2553 pack .vpane.lower.
diff -fill both
-expand 1
2554 pack .vpane.lower.commarea
-side bottom
-fill x
2555 .vpane add .vpane.lower
-sticky nsew
2557 # -- Commit Area Buttons
2559 frame .vpane.lower.commarea.buttons
2560 label .vpane.lower.commarea.buttons.l
-text {} \
2563 pack .vpane.lower.commarea.buttons.l
-side top
-fill x
2564 pack .vpane.lower.commarea.buttons
-side left
-fill y
2566 button .vpane.lower.commarea.buttons.rescan
-text [mc Rescan
] \
2568 pack .vpane.lower.commarea.buttons.rescan
-side top
-fill x
2569 lappend disable_on_lock \
2570 {.vpane.lower.commarea.buttons.rescan conf
-state}
2572 button .vpane.lower.commarea.buttons.incall
-text [mc
"Stage Changed"] \
2574 pack .vpane.lower.commarea.buttons.incall
-side top
-fill x
2575 lappend disable_on_lock \
2576 {.vpane.lower.commarea.buttons.incall conf
-state}
2578 button .vpane.lower.commarea.buttons.signoff
-text [mc
"Sign Off"] \
2580 pack .vpane.lower.commarea.buttons.signoff
-side top
-fill x
2582 button .vpane.lower.commarea.buttons.commit
-text [mc Commit@@verb
] \
2584 pack .vpane.lower.commarea.buttons.commit
-side top
-fill x
2585 lappend disable_on_lock \
2586 {.vpane.lower.commarea.buttons.commit conf
-state}
2588 button .vpane.lower.commarea.buttons.push
-text [mc Push
] \
2589 -command do_push_anywhere
2590 pack .vpane.lower.commarea.buttons.push
-side top
-fill x
2592 # -- Commit Message Buffer
2594 frame .vpane.lower.commarea.buffer
2595 frame .vpane.lower.commarea.buffer.header
2596 set ui_comm .vpane.lower.commarea.buffer.t
2597 set ui_coml .vpane.lower.commarea.buffer.header.l
2598 radiobutton .vpane.lower.commarea.buffer.header.new \
2599 -text [mc
"New Commit"] \
2600 -command do_select_commit_type \
2601 -variable selected_commit_type \
2603 lappend disable_on_lock \
2604 [list .vpane.lower.commarea.buffer.header.new conf
-state]
2605 radiobutton .vpane.lower.commarea.buffer.header.amend \
2606 -text [mc
"Amend Last Commit"] \
2607 -command do_select_commit_type \
2608 -variable selected_commit_type \
2610 lappend disable_on_lock \
2611 [list .vpane.lower.commarea.buffer.header.amend conf
-state]
2615 proc trace_commit_type
{varname args
} {
2616 global ui_coml commit_type
2617 switch
-glob -- $commit_type {
2618 initial
{set txt
[mc
"Initial Commit Message:"]}
2619 amend
{set txt
[mc
"Amended Commit Message:"]}
2620 amend-initial
{set txt
[mc
"Amended Initial Commit Message:"]}
2621 amend-merge
{set txt
[mc
"Amended Merge Commit Message:"]}
2622 merge
{set txt
[mc
"Merge Commit Message:"]}
2623 * {set txt
[mc
"Commit Message:"]}
2625 $ui_coml conf
-text $txt
2627 trace add variable commit_type
write trace_commit_type
2628 pack
$ui_coml -side left
-fill x
2629 pack .vpane.lower.commarea.buffer.header.amend
-side right
2630 pack .vpane.lower.commarea.buffer.header.new
-side right
2632 text
$ui_comm -background white
-foreground black \
2636 -autoseparators true \
2638 -width $repo_config(gui.commitmsgwidth
) -height 9 -wrap none \
2640 -yscrollcommand {.vpane.lower.commarea.buffer.sby
set}
2641 scrollbar .vpane.lower.commarea.buffer.sby \
2642 -command [list
$ui_comm yview
]
2643 pack .vpane.lower.commarea.buffer.header
-side top
-fill x
2644 pack .vpane.lower.commarea.buffer.sby
-side right
-fill y
2645 pack
$ui_comm -side left
-fill y
2646 pack .vpane.lower.commarea.buffer
-side left
-fill y
2648 # -- Commit Message Buffer Context Menu
2650 set ctxm .vpane.lower.commarea.buffer.ctxm
2651 menu
$ctxm -tearoff 0
2654 -command {tk_textCut
$ui_comm}
2657 -command {tk_textCopy
$ui_comm}
2660 -command {tk_textPaste
$ui_comm}
2662 -label [mc Delete
] \
2663 -command {$ui_comm delete sel.first sel.last
}
2666 -label [mc
"Select All"] \
2667 -command {focus
$ui_comm;$ui_comm tag add sel
0.0 end
}
2669 -label [mc
"Copy All"] \
2671 $ui_comm tag add sel
0.0 end
2672 tk_textCopy
$ui_comm
2673 $ui_comm tag remove sel
0.0 end
2677 -label [mc
"Sign Off"] \
2679 set ui_comm_ctxm
$ctxm
2683 proc trace_current_diff_path
{varname args
} {
2684 global current_diff_path diff_actions file_states
2685 if {$current_diff_path eq
{}} {
2691 set p
$current_diff_path
2692 set s
[mapdesc
[lindex
$file_states($p) 0] $p]
2694 set p
[escape_path
$p]
2698 .vpane.lower.
diff.header.status configure
-text $s
2699 .vpane.lower.
diff.header.
file configure
-text $f
2700 .vpane.lower.
diff.header.path configure
-text $p
2701 foreach w
$diff_actions {
2705 trace add variable current_diff_path
write trace_current_diff_path
2707 frame .vpane.lower.
diff.header
-background gold
2708 label .vpane.lower.
diff.header.status \
2711 -width $max_status_desc \
2714 label .vpane.lower.
diff.header.
file \
2719 label .vpane.lower.
diff.header.path \
2724 pack .vpane.lower.
diff.header.status
-side left
2725 pack .vpane.lower.
diff.header.
file -side left
2726 pack .vpane.lower.
diff.header.path
-fill x
2727 set ctxm .vpane.lower.
diff.header.ctxm
2728 menu
$ctxm -tearoff 0
2736 -- $current_diff_path
2738 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2739 bind_button3 .vpane.lower.
diff.header.path
"tk_popup $ctxm %X %Y"
2743 frame .vpane.lower.
diff.body
2744 set ui_diff .vpane.lower.
diff.body.t
2745 text
$ui_diff -background white
-foreground black \
2747 -width 80 -height 15 -wrap none \
2749 -xscrollcommand {.vpane.lower.
diff.body.sbx
set} \
2750 -yscrollcommand {.vpane.lower.
diff.body.sby
set} \
2752 scrollbar .vpane.lower.
diff.body.sbx
-orient horizontal \
2753 -command [list
$ui_diff xview
]
2754 scrollbar .vpane.lower.
diff.body.sby
-orient vertical \
2755 -command [list
$ui_diff yview
]
2756 pack .vpane.lower.
diff.body.sbx
-side bottom
-fill x
2757 pack .vpane.lower.
diff.body.sby
-side right
-fill y
2758 pack
$ui_diff -side left
-fill both
-expand 1
2759 pack .vpane.lower.
diff.header
-side top
-fill x
2760 pack .vpane.lower.
diff.body
-side bottom
-fill both
-expand 1
2762 $ui_diff tag conf d_cr
-elide true
2763 $ui_diff tag conf d_@
-foreground blue
-font font_diffbold
2764 $ui_diff tag conf d_
+ -foreground {#00a000}
2765 $ui_diff tag conf d_-
-foreground red
2767 $ui_diff tag conf d_
++ -foreground {#00a000}
2768 $ui_diff tag conf d_--
-foreground red
2769 $ui_diff tag conf d_
+s \
2770 -foreground {#00a000} \
2771 -background {#e2effa}
2772 $ui_diff tag conf d_-s \
2774 -background {#e2effa}
2775 $ui_diff tag conf d_s
+ \
2776 -foreground {#00a000} \
2778 $ui_diff tag conf d_s- \
2782 $ui_diff tag conf d
<<<<<<< \
2783 -foreground orange \
2785 $ui_diff tag conf d
======= \
2786 -foreground orange \
2788 $ui_diff tag conf d
>>>>>>> \
2789 -foreground orange \
2792 $ui_diff tag raise sel
2794 # -- Diff Body Context Menu
2797 proc create_common_diff_popup
{ctxm
} {
2799 -label [mc
"Show Less Context"] \
2800 -command show_less_context
2801 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2803 -label [mc
"Show More Context"] \
2804 -command show_more_context
2805 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2808 -label [mc Refresh
] \
2809 -command reshow_diff
2810 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2813 -command {tk_textCopy
$ui_diff}
2814 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2816 -label [mc
"Select All"] \
2817 -command {focus
$ui_diff;$ui_diff tag add sel
0.0 end
}
2818 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2820 -label [mc
"Copy All"] \
2822 $ui_diff tag add sel
0.0 end
2823 tk_textCopy
$ui_diff
2824 $ui_diff tag remove sel
0.0 end
2826 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2829 -label [mc
"Decrease Font Size"] \
2830 -command {incr_font_size font_diff
-1}
2831 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2833 -label [mc
"Increase Font Size"] \
2834 -command {incr_font_size font_diff
1}
2835 lappend diff_actions
[list
$ctxm entryconf
[$ctxm index last
] -state]
2837 $ctxm add
command -label [mc
"Options..."] \
2841 set ctxm .vpane.lower.
diff.body.ctxm
2842 menu
$ctxm -tearoff 0
2844 -label [mc
"Apply/Reverse Hunk"] \
2845 -command {apply_hunk
$cursorX $cursorY}
2846 set ui_diff_applyhunk
[$ctxm index last
]
2847 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyhunk -state]
2849 -label [mc
"Apply/Reverse Line"] \
2850 -command {apply_line
$cursorX $cursorY; do_rescan
}
2851 set ui_diff_applyline
[$ctxm index last
]
2852 lappend diff_actions
[list
$ctxm entryconf
$ui_diff_applyline -state]
2854 create_common_diff_popup
$ctxm
2856 set ctxmmg .vpane.lower.
diff.body.ctxmmg
2857 menu
$ctxmmg -tearoff 0
2858 $ctxmmg add
command \
2859 -label [mc
"Run Merge Tool"] \
2860 -command {merge_resolve_tool
}
2861 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
2862 $ctxmmg add separator
2863 $ctxmmg add
command \
2864 -label [mc
"Use Remote Version"] \
2865 -command {merge_resolve_one
3}
2866 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
2867 $ctxmmg add
command \
2868 -label [mc
"Use Local Version"] \
2869 -command {merge_resolve_one
2}
2870 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
2871 $ctxmmg add
command \
2872 -label [mc
"Revert To Base"] \
2873 -command {merge_resolve_one
1}
2874 lappend diff_actions
[list
$ctxmmg entryconf
[$ctxmmg index last
] -state]
2875 $ctxmmg add separator
2876 create_common_diff_popup
$ctxmmg
2878 proc popup_diff_menu
{ctxm ctxmmg x y X Y
} {
2879 global current_diff_path file_states
2882 if {[info exists file_states
($current_diff_path)]} {
2883 set state
[lindex
$file_states($current_diff_path) 0]
2887 if {[string first
{U
} $state] >= 0} {
2888 tk_popup
$ctxmmg $X $Y
2890 if {$
::ui_index eq $
::current_diff_side
} {
2891 set l
[mc
"Unstage Hunk From Commit"]
2892 set t
[mc
"Unstage Line From Commit"]
2894 set l
[mc
"Stage Hunk For Commit"]
2895 set t
[mc
"Stage Line For Commit"]
2898 ||
$current_diff_path eq
{}
2902 ||
{T_
} eq
$state} {
2907 $ctxm entryconf $
::ui_diff_applyhunk
-state $s -label $l
2908 $ctxm entryconf $
::ui_diff_applyline
-state $s -label $t
2909 tk_popup
$ctxm $X $Y
2912 bind_button3
$ui_diff [list popup_diff_menu
$ctxm $ctxmmg %x
%y
%X
%Y
]
2916 set main_status
[::status_bar
::new .status
]
2917 pack .status
-anchor w
-side bottom
-fill x
2918 $main_status show
[mc
"Initializing..."]
2923 set gm
$repo_config(gui.geometry
)
2924 wm geometry .
[lindex
$gm 0]
2925 .vpane sash place
0 \
2927 [lindex
[.vpane sash coord
0] 1]
2928 .vpane.files sash place
0 \
2929 [lindex
[.vpane.files sash coord
0] 0] \
2936 bind $ui_comm <$M1B-Key-Return> {do_commit
;break}
2937 bind $ui_comm <$M1B-Key-t> {do_add_selection
;break}
2938 bind $ui_comm <$M1B-Key-T> {do_add_selection
;break}
2939 bind $ui_comm <$M1B-Key-i> {do_add_all
;break}
2940 bind $ui_comm <$M1B-Key-I> {do_add_all
;break}
2941 bind $ui_comm <$M1B-Key-x> {tk_textCut
%W
;break}
2942 bind $ui_comm <$M1B-Key-X> {tk_textCut
%W
;break}
2943 bind $ui_comm <$M1B-Key-c> {tk_textCopy
%W
;break}
2944 bind $ui_comm <$M1B-Key-C> {tk_textCopy
%W
;break}
2945 bind $ui_comm <$M1B-Key-v> {tk_textPaste
%W
; %W see insert
; break}
2946 bind $ui_comm <$M1B-Key-V> {tk_textPaste
%W
; %W see insert
; break}
2947 bind $ui_comm <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
2948 bind $ui_comm <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
2949 bind $ui_comm <$M1B-Key-minus> {show_less_context
;break}
2950 bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context
;break}
2951 bind $ui_comm <$M1B-Key-equal> {show_more_context
;break}
2952 bind $ui_comm <$M1B-Key-plus> {show_more_context
;break}
2953 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context
;break}
2955 bind $ui_diff <$M1B-Key-x> {tk_textCopy
%W
;break}
2956 bind $ui_diff <$M1B-Key-X> {tk_textCopy
%W
;break}
2957 bind $ui_diff <$M1B-Key-c> {tk_textCopy
%W
;break}
2958 bind $ui_diff <$M1B-Key-C> {tk_textCopy
%W
;break}
2959 bind $ui_diff <$M1B-Key-v> {break}
2960 bind $ui_diff <$M1B-Key-V> {break}
2961 bind $ui_diff <$M1B-Key-a> {%W tag add sel
0.0 end
;break}
2962 bind $ui_diff <$M1B-Key-A> {%W tag add sel
0.0 end
;break}
2963 bind $ui_diff <Key-Up
> {catch
{%W yview scroll
-1 units
};break}
2964 bind $ui_diff <Key-Down
> {catch
{%W yview scroll
1 units
};break}
2965 bind $ui_diff <Key-Left
> {catch
{%W xview scroll
-1 units
};break}
2966 bind $ui_diff <Key-Right
> {catch
{%W xview scroll
1 units
};break}
2967 bind $ui_diff <Key-k
> {catch
{%W yview scroll
-1 units
};break}
2968 bind $ui_diff <Key-j
> {catch
{%W yview scroll
1 units
};break}
2969 bind $ui_diff <Key-h
> {catch
{%W xview scroll
-1 units
};break}
2970 bind $ui_diff <Key-l
> {catch
{%W xview scroll
1 units
};break}
2971 bind $ui_diff <Control-Key-b
> {catch
{%W yview scroll
-1 pages
};break}
2972 bind $ui_diff <Control-Key-f
> {catch
{%W yview scroll
1 pages
};break}
2973 bind $ui_diff <Button-1
> {focus
%W
}
2975 if {[is_enabled branch
]} {
2976 bind .
<$M1B-Key-n> branch_create
::dialog
2977 bind .
<$M1B-Key-N> branch_create
::dialog
2978 bind .
<$M1B-Key-o> branch_checkout
::dialog
2979 bind .
<$M1B-Key-O> branch_checkout
::dialog
2980 bind .
<$M1B-Key-m> merge
::dialog
2981 bind .
<$M1B-Key-M> merge
::dialog
2983 if {[is_enabled transport
]} {
2984 bind .
<$M1B-Key-p> do_push_anywhere
2985 bind .
<$M1B-Key-P> do_push_anywhere
2988 bind .
<Key-F5
> do_rescan
2989 bind .
<$M1B-Key-r> do_rescan
2990 bind .
<$M1B-Key-R> do_rescan
2991 bind .
<$M1B-Key-s> do_signoff
2992 bind .
<$M1B-Key-S> do_signoff
2993 bind .
<$M1B-Key-t> do_add_selection
2994 bind .
<$M1B-Key-T> do_add_selection
2995 bind .
<$M1B-Key-i> do_add_all
2996 bind .
<$M1B-Key-I> do_add_all
2997 bind .
<$M1B-Key-minus> {show_less_context
;break}
2998 bind .
<$M1B-Key-KP_Subtract> {show_less_context
;break}
2999 bind .
<$M1B-Key-equal> {show_more_context
;break}
3000 bind .
<$M1B-Key-plus> {show_more_context
;break}
3001 bind .
<$M1B-Key-KP_Add> {show_more_context
;break}
3002 bind .
<$M1B-Key-Return> do_commit
3003 foreach i
[list
$ui_index $ui_workdir] {
3004 bind $i <Button-1
> "toggle_or_diff $i %x %y; break"
3005 bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break"
3006 bind $i <Shift-Button-1
> "add_range_to_selection $i %x %y; break"
3010 set file_lists
($ui_index) [list
]
3011 set file_lists
($ui_workdir) [list
]
3013 wm title .
"[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
3014 focus
-force $ui_comm
3016 # -- Warn the user about environmental problems. Cygwin's Tcl
3017 # does *not* pass its env array onto any processes it spawns.
3018 # This means that git processes get none of our environment.
3023 set msg
[mc
"Possible environment issues exist.
3025 The following environment variables are probably
3026 going to be ignored by any Git subprocess run
3030 foreach name
[array names env
] {
3031 switch
-regexp -- $name {
3032 {^GIT_INDEX_FILE$
} -
3033 {^GIT_OBJECT_DIRECTORY$
} -
3034 {^GIT_ALTERNATE_OBJECT_DIRECTORIES$
} -
3036 {^GIT_EXTERNAL_DIFF$
} -
3040 {^GIT_CONFIG_LOCAL$
} -
3041 {^GIT_
(AUTHOR|COMMITTER
)_DATE$
} {
3042 append msg
" - $name\n"
3045 {^GIT_
(AUTHOR|COMMITTER
)_
(NAME|EMAIL
)$
} {
3046 append msg
" - $name\n"
3048 set suggest_user
$name
3052 if {$ignored_env > 0} {
3054 This is due to a known issue with the
3055 Tcl binary distributed by Cygwin."]
3057 if {$suggest_user ne
{}} {
3060 A good replacement for %s
3061 is placing values for the user.name and
3062 user.email settings into your personal
3068 unset ignored_env msg suggest_user name
3071 # -- Only initialize complex UI if we are going to stay running.
3073 if {[is_enabled transport
]} {
3076 set n
[.mbar.remote index end
]
3079 set n
[expr {[.mbar.remote index end
] - $n}]
3081 if {[.mbar.remote
type 0] eq
"tearoff"} { incr n
}
3082 .mbar.remote insert
$n separator
3087 if {[winfo exists
$ui_comm]} {
3088 set GITGUI_BCK_exists
[load_message GITGUI_BCK
]
3090 # -- If both our backup and message files exist use the
3091 # newer of the two files to initialize the buffer.
3093 if {$GITGUI_BCK_exists} {
3094 set m
[gitdir GITGUI_MSG
]
3095 if {[file isfile
$m]} {
3096 if {[file mtime
[gitdir GITGUI_BCK
]] > [file mtime
$m]} {
3097 catch
{file delete
[gitdir GITGUI_MSG
]}
3099 $ui_comm delete
0.0 end
3101 $ui_comm edit modified false
3102 catch
{file delete
[gitdir GITGUI_BCK
]}
3103 set GITGUI_BCK_exists
0
3109 proc backup_commit_buffer
{} {
3110 global ui_comm GITGUI_BCK_exists
3112 set m
[$ui_comm edit modified
]
3113 if {$m ||
$GITGUI_BCK_exists} {
3114 set msg
[string trim
[$ui_comm get
0.0 end
]]
3115 regsub
-all -line {[ \r\t]+$
} $msg {} msg
3118 if {$GITGUI_BCK_exists} {
3119 catch
{file delete
[gitdir GITGUI_BCK
]}
3120 set GITGUI_BCK_exists
0
3124 set fd
[open
[gitdir GITGUI_BCK
] w
]
3125 puts
-nonewline $fd $msg
3127 set GITGUI_BCK_exists
1
3131 $ui_comm edit modified false
3134 set ::GITGUI_BCK_i
[after
2000 backup_commit_buffer
]
3137 backup_commit_buffer
3139 # -- If the user has aspell available we can drive it
3140 # in pipe mode to spellcheck the commit message.
3142 set spell_cmd
[list |
]
3143 set spell_dict
[get_config gui.spellingdictionary
]
3144 lappend spell_cmd aspell
3145 if {$spell_dict ne
{}} {
3146 lappend spell_cmd
--master=$spell_dict
3148 lappend spell_cmd
--mode=none
3149 lappend spell_cmd
--encoding=utf-8
3150 lappend spell_cmd pipe
3151 if {$spell_dict eq
{none
}
3152 ||
[catch
{set spell_fd
[open
$spell_cmd r
+]} spell_err
]} {
3153 bind_button3
$ui_comm [list tk_popup
$ui_comm_ctxm %X
%Y
]
3155 set ui_comm_spell
[spellcheck
::init \
3161 unset -nocomplain spell_cmd spell_fd spell_err spell_dict
3164 lock_index begin-read
3165 if {![winfo ismapped .
]} {
3169 if {[is_enabled multicommit
]} {