You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
2676 lines
64 KiB
2676 lines
64 KiB
#!/bin/sh |
|
# Tcl ignores the next line -*- tcl -*- \ |
|
if test "z$*" = zversion \ |
|
|| test "z$*" = z--version; \ |
|
then \ |
|
echo 'git-gui version @@GITGUI_VERSION@@'; \ |
|
exit; \ |
|
fi; \ |
|
exec wish "$0" -- "$@" |
|
|
|
set appvers {@@GITGUI_VERSION@@} |
|
set copyright { |
|
Copyright © 2006, 2007 Shawn Pearce, et. al. |
|
|
|
This program is free software; you can redistribute it and/or modify |
|
it under the terms of the GNU General Public License as published by |
|
the Free Software Foundation; either version 2 of the License, or |
|
(at your option) any later version. |
|
|
|
This program is distributed in the hope that it will be useful, |
|
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
GNU General Public License for more details. |
|
|
|
You should have received a copy of the GNU General Public License |
|
along with this program; if not, write to the Free Software |
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA} |
|
|
|
###################################################################### |
|
## |
|
## Tcl/Tk sanity check |
|
|
|
if {[catch {package require Tcl 8.4} err] |
|
|| [catch {package require Tk 8.4} err] |
|
} { |
|
catch {wm withdraw .} |
|
tk_messageBox \ |
|
-icon error \ |
|
-type ok \ |
|
-title "git-gui: fatal error" \ |
|
-message $err |
|
exit 1 |
|
} |
|
|
|
###################################################################### |
|
## |
|
## enable verbose loading? |
|
|
|
if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} { |
|
unset _verbose |
|
rename auto_load real__auto_load |
|
proc auto_load {name args} { |
|
puts stderr "auto_load $name" |
|
return [uplevel 1 real__auto_load $name $args] |
|
} |
|
rename source real__source |
|
proc source {name} { |
|
puts stderr "source $name" |
|
uplevel 1 real__source $name |
|
} |
|
} |
|
|
|
###################################################################### |
|
## |
|
## read only globals |
|
|
|
set _appname [lindex [file split $argv0] end] |
|
set _gitdir {} |
|
set _gitexec {} |
|
set _reponame {} |
|
set _iscygwin {} |
|
set _search_path {} |
|
|
|
proc appname {} { |
|
global _appname |
|
return $_appname |
|
} |
|
|
|
proc gitdir {args} { |
|
global _gitdir |
|
if {$args eq {}} { |
|
return $_gitdir |
|
} |
|
return [eval [list file join $_gitdir] $args] |
|
} |
|
|
|
proc gitexec {args} { |
|
global _gitexec |
|
if {$_gitexec eq {}} { |
|
if {[catch {set _gitexec [git --exec-path]} err]} { |
|
error "Git not installed?\n\n$err" |
|
} |
|
if {[is_Cygwin]} { |
|
set _gitexec [exec cygpath \ |
|
--windows \ |
|
--absolute \ |
|
$_gitexec] |
|
} else { |
|
set _gitexec [file normalize $_gitexec] |
|
} |
|
} |
|
if {$args eq {}} { |
|
return $_gitexec |
|
} |
|
return [eval [list file join $_gitexec] $args] |
|
} |
|
|
|
proc reponame {} { |
|
return $::_reponame |
|
} |
|
|
|
proc is_MacOSX {} { |
|
if {[tk windowingsystem] eq {aqua}} { |
|
return 1 |
|
} |
|
return 0 |
|
} |
|
|
|
proc is_Windows {} { |
|
if {$::tcl_platform(platform) eq {windows}} { |
|
return 1 |
|
} |
|
return 0 |
|
} |
|
|
|
proc is_Cygwin {} { |
|
global _iscygwin |
|
if {$_iscygwin eq {}} { |
|
if {$::tcl_platform(platform) eq {windows}} { |
|
if {[catch {set p [exec cygpath --windir]} err]} { |
|
set _iscygwin 0 |
|
} else { |
|
set _iscygwin 1 |
|
} |
|
} else { |
|
set _iscygwin 0 |
|
} |
|
} |
|
return $_iscygwin |
|
} |
|
|
|
proc is_enabled {option} { |
|
global enabled_options |
|
if {[catch {set on $enabled_options($option)}]} {return 0} |
|
return $on |
|
} |
|
|
|
proc enable_option {option} { |
|
global enabled_options |
|
set enabled_options($option) 1 |
|
} |
|
|
|
proc disable_option {option} { |
|
global enabled_options |
|
set enabled_options($option) 0 |
|
} |
|
|
|
###################################################################### |
|
## |
|
## config |
|
|
|
proc is_many_config {name} { |
|
switch -glob -- $name { |
|
remote.*.fetch - |
|
remote.*.push |
|
{return 1} |
|
* |
|
{return 0} |
|
} |
|
} |
|
|
|
proc is_config_true {name} { |
|
global repo_config |
|
if {[catch {set v $repo_config($name)}]} { |
|
return 0 |
|
} elseif {$v eq {true} || $v eq {1} || $v eq {yes}} { |
|
return 1 |
|
} else { |
|
return 0 |
|
} |
|
} |
|
|
|
proc get_config {name} { |
|
global repo_config |
|
if {[catch {set v $repo_config($name)}]} { |
|
return {} |
|
} else { |
|
return $v |
|
} |
|
} |
|
|
|
proc load_config {include_global} { |
|
global repo_config global_config default_config |
|
|
|
array unset global_config |
|
if {$include_global} { |
|
catch { |
|
set fd_rc [git_read config --global --list] |
|
while {[gets $fd_rc line] >= 0} { |
|
if {[regexp {^([^=]+)=(.*)$} $line line name value]} { |
|
if {[is_many_config $name]} { |
|
lappend global_config($name) $value |
|
} else { |
|
set global_config($name) $value |
|
} |
|
} |
|
} |
|
close $fd_rc |
|
} |
|
} |
|
|
|
array unset repo_config |
|
catch { |
|
set fd_rc [git_read config --list] |
|
while {[gets $fd_rc line] >= 0} { |
|
if {[regexp {^([^=]+)=(.*)$} $line line name value]} { |
|
if {[is_many_config $name]} { |
|
lappend repo_config($name) $value |
|
} else { |
|
set repo_config($name) $value |
|
} |
|
} |
|
} |
|
close $fd_rc |
|
} |
|
|
|
foreach name [array names default_config] { |
|
if {[catch {set v $global_config($name)}]} { |
|
set global_config($name) $default_config($name) |
|
} |
|
if {[catch {set v $repo_config($name)}]} { |
|
set repo_config($name) $default_config($name) |
|
} |
|
} |
|
} |
|
|
|
###################################################################### |
|
## |
|
## handy utils |
|
|
|
proc _git_cmd {name} { |
|
global _git_cmd_path |
|
|
|
if {[catch {set v $_git_cmd_path($name)}]} { |
|
switch -- $name { |
|
version - |
|
--version - |
|
--exec-path { return [list $::_git $name] } |
|
} |
|
|
|
set p [gitexec git-$name$::_search_exe] |
|
if {[file exists $p]} { |
|
set v [list $p] |
|
} elseif {[is_Windows] && [file exists [gitexec git-$name]]} { |
|
# Try to determine what sort of magic will make |
|
# git-$name go and do its thing, because native |
|
# Tcl on Windows doesn't know it. |
|
# |
|
set p [gitexec git-$name] |
|
set f [open $p r] |
|
set s [gets $f] |
|
close $f |
|
|
|
switch -glob -- $s { |
|
#!*sh { set i sh } |
|
#!*perl { set i perl } |
|
#!*python { set i python } |
|
default { error "git-$name is not supported: $s" } |
|
} |
|
|
|
upvar #0 _$i interp |
|
if {![info exists interp]} { |
|
set interp [_which $i] |
|
} |
|
if {$interp eq {}} { |
|
error "git-$name requires $i (not in PATH)" |
|
} |
|
set v [list $interp $p] |
|
} else { |
|
# Assume it is builtin to git somehow and we |
|
# aren't actually able to see a file for it. |
|
# |
|
set v [list $::_git $name] |
|
} |
|
set _git_cmd_path($name) $v |
|
} |
|
return $v |
|
} |
|
|
|
proc _which {what} { |
|
global env _search_exe _search_path |
|
|
|
if {$_search_path eq {}} { |
|
if {[is_Cygwin]} { |
|
set _search_path [split [exec cygpath \ |
|
--windows \ |
|
--path \ |
|
--absolute \ |
|
$env(PATH)] {;}] |
|
set _search_exe .exe |
|
} elseif {[is_Windows]} { |
|
set _search_path [split $env(PATH) {;}] |
|
set _search_exe .exe |
|
} else { |
|
set _search_path [split $env(PATH) :] |
|
set _search_exe {} |
|
} |
|
} |
|
|
|
foreach p $_search_path { |
|
set p [file join $p $what$_search_exe] |
|
if {[file exists $p]} { |
|
return [file normalize $p] |
|
} |
|
} |
|
return {} |
|
} |
|
|
|
proc _lappend_nice {cmd_var} { |
|
global _nice |
|
upvar $cmd_var cmd |
|
|
|
if {![info exists _nice]} { |
|
set _nice [_which nice] |
|
} |
|
if {$_nice ne {}} { |
|
lappend cmd $_nice |
|
} |
|
} |
|
|
|
proc git {args} { |
|
set opt [list exec] |
|
|
|
while {1} { |
|
switch -- [lindex $args 0] { |
|
--nice { |
|
_lappend_nice opt |
|
} |
|
|
|
default { |
|
break |
|
} |
|
|
|
} |
|
|
|
set args [lrange $args 1 end] |
|
} |
|
|
|
set cmdp [_git_cmd [lindex $args 0]] |
|
set args [lrange $args 1 end] |
|
|
|
return [eval $opt $cmdp $args] |
|
} |
|
|
|
proc _open_stdout_stderr {cmd} { |
|
if {[catch { |
|
set fd [open $cmd r] |
|
} err]} { |
|
if { [lindex $cmd end] eq {2>@1} |
|
&& $err eq {can not find channel named "1"} |
|
} { |
|
# Older versions of Tcl 8.4 don't have this 2>@1 IO |
|
# redirect operator. Fallback to |& cat for those. |
|
# The command was not actually started, so its safe |
|
# to try to start it a second time. |
|
# |
|
set fd [open [concat \ |
|
[lrange $cmd 0 end-1] \ |
|
[list |& cat] \ |
|
] r] |
|
} else { |
|
error $err |
|
} |
|
} |
|
fconfigure $fd -eofchar {} |
|
return $fd |
|
} |
|
|
|
proc git_read {args} { |
|
set opt [list |] |
|
|
|
while {1} { |
|
switch -- [lindex $args 0] { |
|
--nice { |
|
_lappend_nice opt |
|
} |
|
|
|
--stderr { |
|
lappend args 2>@1 |
|
} |
|
|
|
default { |
|
break |
|
} |
|
|
|
} |
|
|
|
set args [lrange $args 1 end] |
|
} |
|
|
|
set cmdp [_git_cmd [lindex $args 0]] |
|
set args [lrange $args 1 end] |
|
|
|
return [_open_stdout_stderr [concat $opt $cmdp $args]] |
|
} |
|
|
|
proc git_write {args} { |
|
set opt [list |] |
|
|
|
while {1} { |
|
switch -- [lindex $args 0] { |
|
--nice { |
|
_lappend_nice opt |
|
} |
|
|
|
default { |
|
break |
|
} |
|
|
|
} |
|
|
|
set args [lrange $args 1 end] |
|
} |
|
|
|
set cmdp [_git_cmd [lindex $args 0]] |
|
set args [lrange $args 1 end] |
|
|
|
return [open [concat $opt $cmdp $args] w] |
|
} |
|
|
|
proc sq {value} { |
|
regsub -all ' $value "'\\''" value |
|
return "'$value'" |
|
} |
|
|
|
proc load_current_branch {} { |
|
global current_branch is_detached |
|
|
|
set fd [open [gitdir HEAD] r] |
|
if {[gets $fd ref] < 1} { |
|
set ref {} |
|
} |
|
close $fd |
|
|
|
set pfx {ref: refs/heads/} |
|
set len [string length $pfx] |
|
if {[string equal -length $len $pfx $ref]} { |
|
# We're on a branch. It might not exist. But |
|
# HEAD looks good enough to be a branch. |
|
# |
|
set current_branch [string range $ref $len end] |
|
set is_detached 0 |
|
} else { |
|
# Assume this is a detached head. |
|
# |
|
set current_branch HEAD |
|
set is_detached 1 |
|
} |
|
} |
|
|
|
auto_load tk_optionMenu |
|
rename tk_optionMenu real__tkOptionMenu |
|
proc tk_optionMenu {w varName args} { |
|
set m [eval real__tkOptionMenu $w $varName $args] |
|
$m configure -font font_ui |
|
$w configure -font font_ui |
|
return $m |
|
} |
|
|
|
###################################################################### |
|
## |
|
## find git |
|
|
|
set _git [_which git] |
|
if {$_git eq {}} { |
|
catch {wm withdraw .} |
|
error_popup "Cannot find git in PATH." |
|
exit 1 |
|
} |
|
|
|
###################################################################### |
|
## |
|
## version check |
|
|
|
if {[catch {set _git_version [git --version]} err]} { |
|
catch {wm withdraw .} |
|
tk_messageBox \ |
|
-icon error \ |
|
-type ok \ |
|
-title "git-gui: fatal error" \ |
|
-message "Cannot determine Git version: |
|
|
|
$err |
|
|
|
[appname] requires Git 1.5.0 or later." |
|
exit 1 |
|
} |
|
if {![regsub {^git version } $_git_version {} _git_version]} { |
|
catch {wm withdraw .} |
|
tk_messageBox \ |
|
-icon error \ |
|
-type ok \ |
|
-title "git-gui: fatal error" \ |
|
-message "Cannot parse Git version string:\n\n$_git_version" |
|
exit 1 |
|
} |
|
|
|
set _real_git_version $_git_version |
|
regsub -- {-dirty$} $_git_version {} _git_version |
|
regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version |
|
regsub {\.rc[0-9]+$} $_git_version {} _git_version |
|
regsub {\.GIT$} $_git_version {} _git_version |
|
|
|
if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} { |
|
catch {wm withdraw .} |
|
if {[tk_messageBox \ |
|
-icon warning \ |
|
-type yesno \ |
|
-default no \ |
|
-title "[appname]: warning" \ |
|
-message "Git version cannot be determined. |
|
|
|
$_git claims it is version '$_real_git_version'. |
|
|
|
[appname] requires at least Git 1.5.0 or later. |
|
|
|
Assume '$_real_git_version' is version 1.5.0? |
|
"] eq {yes}} { |
|
set _git_version 1.5.0 |
|
} else { |
|
exit 1 |
|
} |
|
} |
|
unset _real_git_version |
|
|
|
proc git-version {args} { |
|
global _git_version |
|
|
|
switch [llength $args] { |
|
0 { |
|
return $_git_version |
|
} |
|
|
|
2 { |
|
set op [lindex $args 0] |
|
set vr [lindex $args 1] |
|
set cm [package vcompare $_git_version $vr] |
|
return [expr $cm $op 0] |
|
} |
|
|
|
4 { |
|
set type [lindex $args 0] |
|
set name [lindex $args 1] |
|
set parm [lindex $args 2] |
|
set body [lindex $args 3] |
|
|
|
if {($type ne {proc} && $type ne {method})} { |
|
error "Invalid arguments to git-version" |
|
} |
|
if {[llength $body] < 2 || [lindex $body end-1] ne {default}} { |
|
error "Last arm of $type $name must be default" |
|
} |
|
|
|
foreach {op vr cb} [lrange $body 0 end-2] { |
|
if {[git-version $op $vr]} { |
|
return [uplevel [list $type $name $parm $cb]] |
|
} |
|
} |
|
|
|
return [uplevel [list $type $name $parm [lindex $body end]]] |
|
} |
|
|
|
default { |
|
error "git-version >= x" |
|
} |
|
|
|
} |
|
} |
|
|
|
if {[git-version < 1.5]} { |
|
catch {wm withdraw .} |
|
tk_messageBox \ |
|
-icon error \ |
|
-type ok \ |
|
-title "git-gui: fatal error" \ |
|
-message "[appname] requires Git 1.5.0 or later. |
|
|
|
You are using [git-version]: |
|
|
|
[git --version]" |
|
exit 1 |
|
} |
|
|
|
###################################################################### |
|
## |
|
## configure our library |
|
|
|
set oguilib {@@GITGUI_LIBDIR@@} |
|
set oguirel {@@GITGUI_RELATIVE@@} |
|
if {$oguirel eq {1}} { |
|
set oguilib [file dirname [file dirname [file normalize $argv0]]] |
|
set oguilib [file join $oguilib share git-gui lib] |
|
} elseif {[string match @@* $oguirel]} { |
|
set oguilib [file join [file dirname [file normalize $argv0]] lib] |
|
} |
|
|
|
set idx [file join $oguilib tclIndex] |
|
if {[catch {set fd [open $idx r]} err]} { |
|
catch {wm withdraw .} |
|
tk_messageBox \ |
|
-icon error \ |
|
-type ok \ |
|
-title "git-gui: fatal error" \ |
|
-message $err |
|
exit 1 |
|
} |
|
if {[gets $fd] eq {# Autogenerated by git-gui Makefile}} { |
|
set idx [list] |
|
while {[gets $fd n] >= 0} { |
|
if {$n ne {} && ![string match #* $n]} { |
|
lappend idx $n |
|
} |
|
} |
|
} else { |
|
set idx {} |
|
} |
|
close $fd |
|
|
|
if {$idx ne {}} { |
|
set loaded [list] |
|
foreach p $idx { |
|
if {[lsearch -exact $loaded $p] >= 0} continue |
|
source [file join $oguilib $p] |
|
lappend loaded $p |
|
} |
|
unset loaded p |
|
} else { |
|
set auto_path [concat [list $oguilib] $auto_path] |
|
} |
|
unset -nocomplain oguirel idx fd |
|
|
|
###################################################################### |
|
## |
|
## feature option selection |
|
|
|
if {[regexp {^git-(.+)$} [appname] _junk subcommand]} { |
|
unset _junk |
|
} else { |
|
set subcommand gui |
|
} |
|
if {$subcommand eq {gui.sh}} { |
|
set subcommand gui |
|
} |
|
if {$subcommand eq {gui} && [llength $argv] > 0} { |
|
set subcommand [lindex $argv 0] |
|
set argv [lrange $argv 1 end] |
|
} |
|
|
|
enable_option multicommit |
|
enable_option branch |
|
enable_option transport |
|
disable_option bare |
|
|
|
switch -- $subcommand { |
|
browser - |
|
blame { |
|
enable_option bare |
|
|
|
disable_option multicommit |
|
disable_option branch |
|
disable_option transport |
|
} |
|
citool { |
|
enable_option singlecommit |
|
|
|
disable_option multicommit |
|
disable_option branch |
|
disable_option transport |
|
} |
|
} |
|
|
|
###################################################################### |
|
## |
|
## repository setup |
|
|
|
if {[catch { |
|
set _gitdir $env(GIT_DIR) |
|
set _prefix {} |
|
}] |
|
&& [catch { |
|
set _gitdir [git rev-parse --git-dir] |
|
set _prefix [git rev-parse --show-prefix] |
|
} err]} { |
|
catch {wm withdraw .} |
|
error_popup "Cannot find the git directory:\n\n$err" |
|
exit 1 |
|
} |
|
if {![file isdirectory $_gitdir] && [is_Cygwin]} { |
|
catch {set _gitdir [exec cygpath --unix $_gitdir]} |
|
} |
|
if {![file isdirectory $_gitdir]} { |
|
catch {wm withdraw .} |
|
error_popup "Git directory not found:\n\n$_gitdir" |
|
exit 1 |
|
} |
|
if {$_prefix ne {}} { |
|
regsub -all {[^/]+/} $_prefix ../ cdup |
|
if {[catch {cd $cdup} err]} { |
|
catch {wm withdraw .} |
|
error_popup "Cannot move to top of working directory:\n\n$err" |
|
exit 1 |
|
} |
|
unset cdup |
|
} elseif {![is_enabled bare]} { |
|
if {[lindex [file split $_gitdir] end] ne {.git}} { |
|
catch {wm withdraw .} |
|
error_popup "Cannot use funny .git directory:\n\n$_gitdir" |
|
exit 1 |
|
} |
|
if {[catch {cd [file dirname $_gitdir]} err]} { |
|
catch {wm withdraw .} |
|
error_popup "No working directory [file dirname $_gitdir]:\n\n$err" |
|
exit 1 |
|
} |
|
} |
|
set _reponame [file split [file normalize $_gitdir]] |
|
if {[lindex $_reponame end] eq {.git}} { |
|
set _reponame [lindex $_reponame end-1] |
|
} else { |
|
set _reponame [lindex $_reponame end] |
|
} |
|
|
|
###################################################################### |
|
## |
|
## global init |
|
|
|
set current_diff_path {} |
|
set current_diff_side {} |
|
set diff_actions [list] |
|
|
|
set HEAD {} |
|
set PARENT {} |
|
set MERGE_HEAD [list] |
|
set commit_type {} |
|
set empty_tree {} |
|
set current_branch {} |
|
set is_detached 0 |
|
set current_diff_path {} |
|
set is_3way_diff 0 |
|
set selected_commit_type new |
|
|
|
###################################################################### |
|
## |
|
## task management |
|
|
|
set rescan_active 0 |
|
set diff_active 0 |
|
set last_clicked {} |
|
|
|
set disable_on_lock [list] |
|
set index_lock_type none |
|
|
|
proc lock_index {type} { |
|
global index_lock_type disable_on_lock |
|
|
|
if {$index_lock_type eq {none}} { |
|
set index_lock_type $type |
|
foreach w $disable_on_lock { |
|
uplevel #0 $w disabled |
|
} |
|
return 1 |
|
} elseif {$index_lock_type eq "begin-$type"} { |
|
set index_lock_type $type |
|
return 1 |
|
} |
|
return 0 |
|
} |
|
|
|
proc unlock_index {} { |
|
global index_lock_type disable_on_lock |
|
|
|
set index_lock_type none |
|
foreach w $disable_on_lock { |
|
uplevel #0 $w normal |
|
} |
|
} |
|
|
|
###################################################################### |
|
## |
|
## status |
|
|
|
proc repository_state {ctvar hdvar mhvar} { |
|
global current_branch |
|
upvar $ctvar ct $hdvar hd $mhvar mh |
|
|
|
set mh [list] |
|
|
|
load_current_branch |
|
if {[catch {set hd [git rev-parse --verify HEAD]}]} { |
|
set hd {} |
|
set ct initial |
|
return |
|
} |
|
|
|
set merge_head [gitdir MERGE_HEAD] |
|
if {[file exists $merge_head]} { |
|
set ct merge |
|
set fd_mh [open $merge_head r] |
|
while {[gets $fd_mh line] >= 0} { |
|
lappend mh $line |
|
} |
|
close $fd_mh |
|
return |
|
} |
|
|
|
set ct normal |
|
} |
|
|
|
proc PARENT {} { |
|
global PARENT empty_tree |
|
|
|
set p [lindex $PARENT 0] |
|
if {$p ne {}} { |
|
return $p |
|
} |
|
if {$empty_tree eq {}} { |
|
set empty_tree [git mktree << {}] |
|
} |
|
return $empty_tree |
|
} |
|
|
|
proc rescan {after {honor_trustmtime 1}} { |
|
global HEAD PARENT MERGE_HEAD commit_type |
|
global ui_index ui_workdir ui_comm |
|
global rescan_active file_states |
|
global repo_config |
|
|
|
if {$rescan_active > 0 || ![lock_index read]} return |
|
|
|
repository_state newType newHEAD newMERGE_HEAD |
|
if {[string match amend* $commit_type] |
|
&& $newType eq {normal} |
|
&& $newHEAD eq $HEAD} { |
|
} else { |
|
set HEAD $newHEAD |
|
set PARENT $newHEAD |
|
set MERGE_HEAD $newMERGE_HEAD |
|
set commit_type $newType |
|
} |
|
|
|
array unset file_states |
|
|
|
if {!$::GITGUI_BCK_exists && |
|
(![$ui_comm edit modified] |
|
|| [string trim [$ui_comm get 0.0 end]] eq {})} { |
|
if {[string match amend* $commit_type]} { |
|
} elseif {[load_message GITGUI_MSG]} { |
|
} elseif {[load_message MERGE_MSG]} { |
|
} elseif {[load_message SQUASH_MSG]} { |
|
} |
|
$ui_comm edit reset |
|
$ui_comm edit modified false |
|
} |
|
|
|
if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} { |
|
rescan_stage2 {} $after |
|
} else { |
|
set rescan_active 1 |
|
ui_status {Refreshing file status...} |
|
set fd_rf [git_read update-index \ |
|
-q \ |
|
--unmerged \ |
|
--ignore-missing \ |
|
--refresh \ |
|
] |
|
fconfigure $fd_rf -blocking 0 -translation binary |
|
fileevent $fd_rf readable \ |
|
[list rescan_stage2 $fd_rf $after] |
|
} |
|
} |
|
|
|
proc rescan_stage2 {fd after} { |
|
global rescan_active buf_rdi buf_rdf buf_rlo |
|
|
|
if {$fd ne {}} { |
|
read $fd |
|
if {![eof $fd]} return |
|
close $fd |
|
} |
|
|
|
set ls_others [list --exclude-per-directory=.gitignore] |
|
set info_exclude [gitdir info exclude] |
|
if {[file readable $info_exclude]} { |
|
lappend ls_others "--exclude-from=$info_exclude" |
|
} |
|
set user_exclude [get_config core.excludesfile] |
|
if {$user_exclude ne {} && [file readable $user_exclude]} { |
|
lappend ls_others "--exclude-from=$user_exclude" |
|
} |
|
|
|
set buf_rdi {} |
|
set buf_rdf {} |
|
set buf_rlo {} |
|
|
|
set rescan_active 3 |
|
ui_status {Scanning for modified files ...} |
|
set fd_di [git_read diff-index --cached -z [PARENT]] |
|
set fd_df [git_read diff-files -z] |
|
set fd_lo [eval git_read ls-files --others -z $ls_others] |
|
|
|
fconfigure $fd_di -blocking 0 -translation binary -encoding binary |
|
fconfigure $fd_df -blocking 0 -translation binary -encoding binary |
|
fconfigure $fd_lo -blocking 0 -translation binary -encoding binary |
|
fileevent $fd_di readable [list read_diff_index $fd_di $after] |
|
fileevent $fd_df readable [list read_diff_files $fd_df $after] |
|
fileevent $fd_lo readable [list read_ls_others $fd_lo $after] |
|
} |
|
|
|
proc load_message {file} { |
|
global ui_comm |
|
|
|
set f [gitdir $file] |
|
if {[file isfile $f]} { |
|
if {[catch {set fd [open $f r]}]} { |
|
return 0 |
|
} |
|
fconfigure $fd -eofchar {} |
|
set content [string trim [read $fd]] |
|
close $fd |
|
regsub -all -line {[ \r\t]+$} $content {} content |
|
$ui_comm delete 0.0 end |
|
$ui_comm insert end $content |
|
return 1 |
|
} |
|
return 0 |
|
} |
|
|
|
proc read_diff_index {fd after} { |
|
global buf_rdi |
|
|
|
append buf_rdi [read $fd] |
|
set c 0 |
|
set n [string length $buf_rdi] |
|
while {$c < $n} { |
|
set z1 [string first "\0" $buf_rdi $c] |
|
if {$z1 == -1} break |
|
incr z1 |
|
set z2 [string first "\0" $buf_rdi $z1] |
|
if {$z2 == -1} break |
|
|
|
incr c |
|
set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }] |
|
set p [string range $buf_rdi $z1 [expr {$z2 - 1}]] |
|
merge_state \ |
|
[encoding convertfrom $p] \ |
|
[lindex $i 4]? \ |
|
[list [lindex $i 0] [lindex $i 2]] \ |
|
[list] |
|
set c $z2 |
|
incr c |
|
} |
|
if {$c < $n} { |
|
set buf_rdi [string range $buf_rdi $c end] |
|
} else { |
|
set buf_rdi {} |
|
} |
|
|
|
rescan_done $fd buf_rdi $after |
|
} |
|
|
|
proc read_diff_files {fd after} { |
|
global buf_rdf |
|
|
|
append buf_rdf [read $fd] |
|
set c 0 |
|
set n [string length $buf_rdf] |
|
while {$c < $n} { |
|
set z1 [string first "\0" $buf_rdf $c] |
|
if {$z1 == -1} break |
|
incr z1 |
|
set z2 [string first "\0" $buf_rdf $z1] |
|
if {$z2 == -1} break |
|
|
|
incr c |
|
set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }] |
|
set p [string range $buf_rdf $z1 [expr {$z2 - 1}]] |
|
merge_state \ |
|
[encoding convertfrom $p] \ |
|
?[lindex $i 4] \ |
|
[list] \ |
|
[list [lindex $i 0] [lindex $i 2]] |
|
set c $z2 |
|
incr c |
|
} |
|
if {$c < $n} { |
|
set buf_rdf [string range $buf_rdf $c end] |
|
} else { |
|
set buf_rdf {} |
|
} |
|
|
|
rescan_done $fd buf_rdf $after |
|
} |
|
|
|
proc read_ls_others {fd after} { |
|
global buf_rlo |
|
|
|
append buf_rlo [read $fd] |
|
set pck [split $buf_rlo "\0"] |
|
set buf_rlo [lindex $pck end] |
|
foreach p [lrange $pck 0 end-1] { |
|
merge_state [encoding convertfrom $p] ?O |
|
} |
|
rescan_done $fd buf_rlo $after |
|
} |
|
|
|
proc rescan_done {fd buf after} { |
|
global rescan_active current_diff_path |
|
global file_states repo_config |
|
upvar $buf to_clear |
|
|
|
if {![eof $fd]} return |
|
set to_clear {} |
|
close $fd |
|
if {[incr rescan_active -1] > 0} return |
|
|
|
prune_selection |
|
unlock_index |
|
display_all_files |
|
if {$current_diff_path ne {}} reshow_diff |
|
uplevel #0 $after |
|
} |
|
|
|
proc prune_selection {} { |
|
global file_states selected_paths |
|
|
|
foreach path [array names selected_paths] { |
|
if {[catch {set still_here $file_states($path)}]} { |
|
unset selected_paths($path) |
|
} |
|
} |
|
} |
|
|
|
###################################################################### |
|
## |
|
## ui helpers |
|
|
|
proc mapicon {w state path} { |
|
global all_icons |
|
|
|
if {[catch {set r $all_icons($state$w)}]} { |
|
puts "error: no icon for $w state={$state} $path" |
|
return file_plain |
|
} |
|
return $r |
|
} |
|
|
|
proc mapdesc {state path} { |
|
global all_descs |
|
|
|
if {[catch {set r $all_descs($state)}]} { |
|
puts "error: no desc for state={$state} $path" |
|
return $state |
|
} |
|
return $r |
|
} |
|
|
|
proc ui_status {msg} { |
|
$::main_status show $msg |
|
} |
|
|
|
proc ui_ready {{test {}}} { |
|
$::main_status show {Ready.} $test |
|
} |
|
|
|
proc escape_path {path} { |
|
regsub -all {\\} $path "\\\\" path |
|
regsub -all "\n" $path "\\n" path |
|
return $path |
|
} |
|
|
|
proc short_path {path} { |
|
return [escape_path [lindex [file split $path] end]] |
|
} |
|
|
|
set next_icon_id 0 |
|
set null_sha1 [string repeat 0 40] |
|
|
|
proc merge_state {path new_state {head_info {}} {index_info {}}} { |
|
global file_states next_icon_id null_sha1 |
|
|
|
set s0 [string index $new_state 0] |
|
set s1 [string index $new_state 1] |
|
|
|
if {[catch {set info $file_states($path)}]} { |
|
set state __ |
|
set icon n[incr next_icon_id] |
|
} else { |
|
set state [lindex $info 0] |
|
set icon [lindex $info 1] |
|
if {$head_info eq {}} {set head_info [lindex $info 2]} |
|
if {$index_info eq {}} {set index_info [lindex $info 3]} |
|
} |
|
|
|
if {$s0 eq {?}} {set s0 [string index $state 0]} \ |
|
elseif {$s0 eq {_}} {set s0 _} |
|
|
|
if {$s1 eq {?}} {set s1 [string index $state 1]} \ |
|
elseif {$s1 eq {_}} {set s1 _} |
|
|
|
if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} { |
|
set head_info [list 0 $null_sha1] |
|
} elseif {$s0 ne {_} && [string index $state 0] eq {_} |
|
&& $head_info eq {}} { |
|
set head_info $index_info |
|
} |
|
|
|
set file_states($path) [list $s0$s1 $icon \ |
|
$head_info $index_info \ |
|
] |
|
return $state |
|
} |
|
|
|
proc display_file_helper {w path icon_name old_m new_m} { |
|
global file_lists |
|
|
|
if {$new_m eq {_}} { |
|
set lno [lsearch -sorted -exact $file_lists($w) $path] |
|
if {$lno >= 0} { |
|
set file_lists($w) [lreplace $file_lists($w) $lno $lno] |
|
incr lno |
|
$w conf -state normal |
|
$w delete $lno.0 [expr {$lno + 1}].0 |
|
$w conf -state disabled |
|
} |
|
} elseif {$old_m eq {_} && $new_m ne {_}} { |
|
lappend file_lists($w) $path |
|
set file_lists($w) [lsort -unique $file_lists($w)] |
|
set lno [lsearch -sorted -exact $file_lists($w) $path] |
|
incr lno |
|
$w conf -state normal |
|
$w image create $lno.0 \ |
|
-align center -padx 5 -pady 1 \ |
|
-name $icon_name \ |
|
-image [mapicon $w $new_m $path] |
|
$w insert $lno.1 "[escape_path $path]\n" |
|
$w conf -state disabled |
|
} elseif {$old_m ne $new_m} { |
|
$w conf -state normal |
|
$w image conf $icon_name -image [mapicon $w $new_m $path] |
|
$w conf -state disabled |
|
} |
|
} |
|
|
|
proc display_file {path state} { |
|
global file_states selected_paths |
|
global ui_index ui_workdir |
|
|
|
set old_m [merge_state $path $state] |
|
set s $file_states($path) |
|
set new_m [lindex $s 0] |
|
set icon_name [lindex $s 1] |
|
|
|
set o [string index $old_m 0] |
|
set n [string index $new_m 0] |
|
if {$o eq {U}} { |
|
set o _ |
|
} |
|
if {$n eq {U}} { |
|
set n _ |
|
} |
|
display_file_helper $ui_index $path $icon_name $o $n |
|
|
|
if {[string index $old_m 0] eq {U}} { |
|
set o U |
|
} else { |
|
set o [string index $old_m 1] |
|
} |
|
if {[string index $new_m 0] eq {U}} { |
|
set n U |
|
} else { |
|
set n [string index $new_m 1] |
|
} |
|
display_file_helper $ui_workdir $path $icon_name $o $n |
|
|
|
if {$new_m eq {__}} { |
|
unset file_states($path) |
|
catch {unset selected_paths($path)} |
|
} |
|
} |
|
|
|
proc display_all_files_helper {w path icon_name m} { |
|
global file_lists |
|
|
|
lappend file_lists($w) $path |
|
set lno [expr {[lindex [split [$w index end] .] 0] - 1}] |
|
$w image create end \ |
|
-align center -padx 5 -pady 1 \ |
|
-name $icon_name \ |
|
-image [mapicon $w $m $path] |
|
$w insert end "[escape_path $path]\n" |
|
} |
|
|
|
proc display_all_files {} { |
|
global ui_index ui_workdir |
|
global file_states file_lists |
|
global last_clicked |
|
|
|
$ui_index conf -state normal |
|
$ui_workdir conf -state normal |
|
|
|
$ui_index delete 0.0 end |
|
$ui_workdir delete 0.0 end |
|
set last_clicked {} |
|
|
|
set file_lists($ui_index) [list] |
|
set file_lists($ui_workdir) [list] |
|
|
|
foreach path [lsort [array names file_states]] { |
|
set s $file_states($path) |
|
set m [lindex $s 0] |
|
set icon_name [lindex $s 1] |
|
|
|
set s [string index $m 0] |
|
if {$s ne {U} && $s ne {_}} { |
|
display_all_files_helper $ui_index $path \ |
|
$icon_name $s |
|
} |
|
|
|
if {[string index $m 0] eq {U}} { |
|
set s U |
|
} else { |
|
set s [string index $m 1] |
|
} |
|
if {$s ne {_}} { |
|
display_all_files_helper $ui_workdir $path \ |
|
$icon_name $s |
|
} |
|
} |
|
|
|
$ui_index conf -state disabled |
|
$ui_workdir conf -state disabled |
|
} |
|
|
|
###################################################################### |
|
## |
|
## icons |
|
|
|
set filemask { |
|
#define mask_width 14 |
|
#define mask_height 15 |
|
static unsigned char mask_bits[] = { |
|
0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, |
|
0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, |
|
0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f}; |
|
} |
|
|
|
image create bitmap file_plain -background white -foreground black -data { |
|
#define plain_width 14 |
|
#define plain_height 15 |
|
static unsigned char plain_bits[] = { |
|
0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10, |
|
0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, |
|
0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f}; |
|
} -maskdata $filemask |
|
|
|
image create bitmap file_mod -background white -foreground blue -data { |
|
#define mod_width 14 |
|
#define mod_height 15 |
|
static unsigned char mod_bits[] = { |
|
0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10, |
|
0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, |
|
0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f}; |
|
} -maskdata $filemask |
|
|
|
image create bitmap file_fulltick -background white -foreground "#007000" -data { |
|
#define file_fulltick_width 14 |
|
#define file_fulltick_height 15 |
|
static unsigned char file_fulltick_bits[] = { |
|
0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16, |
|
0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10, |
|
0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f}; |
|
} -maskdata $filemask |
|
|
|
image create bitmap file_parttick -background white -foreground "#005050" -data { |
|
#define parttick_width 14 |
|
#define parttick_height 15 |
|
static unsigned char parttick_bits[] = { |
|
0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10, |
|
0x7a, 0x14, 0x02, 0x16, 0x02, 0x13, 0x8a, 0x11, 0xda, 0x10, 0x72, 0x10, |
|
0x22, 0x10, 0x02, 0x10, 0xfe, 0x1f}; |
|
} -maskdata $filemask |
|
|
|
image create bitmap file_question -background white -foreground black -data { |
|
#define file_question_width 14 |
|
#define file_question_height 15 |
|
static unsigned char file_question_bits[] = { |
|
0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13, |
|
0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10, |
|
0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f}; |
|
} -maskdata $filemask |
|
|
|
image create bitmap file_removed -background white -foreground red -data { |
|
#define file_removed_width 14 |
|
#define file_removed_height 15 |
|
static unsigned char file_removed_bits[] = { |
|
0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10, |
|
0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13, |
|
0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f}; |
|
} -maskdata $filemask |
|
|
|
image create bitmap file_merge -background white -foreground blue -data { |
|
#define file_merge_width 14 |
|
#define file_merge_height 15 |
|
static unsigned char file_merge_bits[] = { |
|
0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10, |
|
0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, |
|
0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f}; |
|
} -maskdata $filemask |
|
|
|
set ui_index .vpane.files.index.list |
|
set ui_workdir .vpane.files.workdir.list |
|
|
|
set all_icons(_$ui_index) file_plain |
|
set all_icons(A$ui_index) file_fulltick |
|
set all_icons(M$ui_index) file_fulltick |
|
set all_icons(D$ui_index) file_removed |
|
set all_icons(U$ui_index) file_merge |
|
|
|
set all_icons(_$ui_workdir) file_plain |
|
set all_icons(M$ui_workdir) file_mod |
|
set all_icons(D$ui_workdir) file_question |
|
set all_icons(U$ui_workdir) file_merge |
|
set all_icons(O$ui_workdir) file_plain |
|
|
|
set max_status_desc 0 |
|
foreach i { |
|
{__ "Unmodified"} |
|
|
|
{_M "Modified, not staged"} |
|
{M_ "Staged for commit"} |
|
{MM "Portions staged for commit"} |
|
{MD "Staged for commit, missing"} |
|
|
|
{_O "Untracked, not staged"} |
|
{A_ "Staged for commit"} |
|
{AM "Portions staged for commit"} |
|
{AD "Staged for commit, missing"} |
|
|
|
{_D "Missing"} |
|
{D_ "Staged for removal"} |
|
{DO "Staged for removal, still present"} |
|
|
|
{U_ "Requires merge resolution"} |
|
{UU "Requires merge resolution"} |
|
{UM "Requires merge resolution"} |
|
{UD "Requires merge resolution"} |
|
} { |
|
if {$max_status_desc < [string length [lindex $i 1]]} { |
|
set max_status_desc [string length [lindex $i 1]] |
|
} |
|
set all_descs([lindex $i 0]) [lindex $i 1] |
|
} |
|
unset i |
|
|
|
###################################################################### |
|
## |
|
## util |
|
|
|
proc bind_button3 {w cmd} { |
|
bind $w <Any-Button-3> $cmd |
|
if {[is_MacOSX]} { |
|
# Mac OS X sends Button-2 on right click through three-button mouse, |
|
# or through trackpad right-clicking (two-finger touch + click). |
|
bind $w <Any-Button-2> $cmd |
|
bind $w <Control-Button-1> $cmd |
|
} |
|
} |
|
|
|
proc scrollbar2many {list mode args} { |
|
foreach w $list {eval $w $mode $args} |
|
} |
|
|
|
proc many2scrollbar {list mode sb top bottom} { |
|
$sb set $top $bottom |
|
foreach w $list {$w $mode moveto $top} |
|
} |
|
|
|
proc incr_font_size {font {amt 1}} { |
|
set sz [font configure $font -size] |
|
incr sz $amt |
|
font configure $font -size $sz |
|
font configure ${font}bold -size $sz |
|
font configure ${font}italic -size $sz |
|
} |
|
|
|
###################################################################### |
|
## |
|
## ui commands |
|
|
|
set starting_gitk_msg {Starting gitk... please wait...} |
|
|
|
proc do_gitk {revs} { |
|
# -- Always start gitk through whatever we were loaded with. This |
|
# lets us bypass using shell process on Windows systems. |
|
# |
|
set exe [file join [file dirname $::_git] gitk] |
|
set cmd [list [info nameofexecutable] $exe] |
|
if {! [file exists $exe]} { |
|
error_popup "Unable to start gitk:\n\n$exe does not exist" |
|
} else { |
|
eval exec $cmd $revs & |
|
ui_status $::starting_gitk_msg |
|
after 10000 { |
|
ui_ready $starting_gitk_msg |
|
} |
|
} |
|
} |
|
|
|
set is_quitting 0 |
|
|
|
proc do_quit {} { |
|
global ui_comm is_quitting repo_config commit_type |
|
global GITGUI_BCK_exists GITGUI_BCK_i |
|
|
|
if {$is_quitting} return |
|
set is_quitting 1 |
|
|
|
if {[winfo exists $ui_comm]} { |
|
# -- Stash our current commit buffer. |
|
# |
|
set save [gitdir GITGUI_MSG] |
|
if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} { |
|
file rename -force [gitdir GITGUI_BCK] $save |
|
set GITGUI_BCK_exists 0 |
|
} else { |
|
set msg [string trim [$ui_comm get 0.0 end]] |
|
regsub -all -line {[ \r\t]+$} $msg {} msg |
|
if {(![string match amend* $commit_type] |
|
|| [$ui_comm edit modified]) |
|
&& $msg ne {}} { |
|
catch { |
|
set fd [open $save w] |
|
puts -nonewline $fd $msg |
|
close $fd |
|
} |
|
} else { |
|
catch {file delete $save} |
|
} |
|
} |
|
|
|
# -- Remove our editor backup, its not needed. |
|
# |
|
after cancel $GITGUI_BCK_i |
|
if {$GITGUI_BCK_exists} { |
|
catch {file delete [gitdir GITGUI_BCK]} |
|
} |
|
|
|
# -- Stash our current window geometry into this repository. |
|
# |
|
set cfg_geometry [list] |
|
lappend cfg_geometry [wm geometry .] |
|
lappend cfg_geometry [lindex [.vpane sash coord 0] 1] |
|
lappend cfg_geometry [lindex [.vpane.files sash coord 0] 0] |
|
if {[catch {set rc_geometry $repo_config(gui.geometry)}]} { |
|
set rc_geometry {} |
|
} |
|
if {$cfg_geometry ne $rc_geometry} { |
|
catch {git config gui.geometry $cfg_geometry} |
|
} |
|
} |
|
|
|
destroy . |
|
} |
|
|
|
proc do_rescan {} { |
|
rescan ui_ready |
|
} |
|
|
|
proc do_commit {} { |
|
commit_tree |
|
} |
|
|
|
proc toggle_or_diff {w x y} { |
|
global file_states file_lists current_diff_path ui_index ui_workdir |
|
global last_clicked selected_paths |
|
|
|
set pos [split [$w index @$x,$y] .] |
|
set lno [lindex $pos 0] |
|
set col [lindex $pos 1] |
|
set path [lindex $file_lists($w) [expr {$lno - 1}]] |
|
if {$path eq {}} { |
|
set last_clicked {} |
|
return |
|
} |
|
|
|
set last_clicked [list $w $lno] |
|
array unset selected_paths |
|
$ui_index tag remove in_sel 0.0 end |
|
$ui_workdir tag remove in_sel 0.0 end |
|
|
|
if {$col == 0} { |
|
if {$current_diff_path eq $path} { |
|
set after {reshow_diff;} |
|
} else { |
|
set after {} |
|
} |
|
if {$w eq $ui_index} { |
|
update_indexinfo \ |
|
"Unstaging [short_path $path] from commit" \ |
|
[list $path] \ |
|
[concat $after [list ui_ready]] |
|
} elseif {$w eq $ui_workdir} { |
|
update_index \ |
|
"Adding [short_path $path]" \ |
|
[list $path] \ |
|
[concat $after [list ui_ready]] |
|
} |
|
} else { |
|
show_diff $path $w $lno |
|
} |
|
} |
|
|
|
proc add_one_to_selection {w x y} { |
|
global file_lists last_clicked selected_paths |
|
|
|
set lno [lindex [split [$w index @$x,$y] .] 0] |
|
set path [lindex $file_lists($w) [expr {$lno - 1}]] |
|
if {$path eq {}} { |
|
set last_clicked {} |
|
return |
|
} |
|
|
|
if {$last_clicked ne {} |
|
&& [lindex $last_clicked 0] ne $w} { |
|
array unset selected_paths |
|
[lindex $last_clicked 0] tag remove in_sel 0.0 end |
|
} |
|
|
|
set last_clicked [list $w $lno] |
|
if {[catch {set in_sel $selected_paths($path)}]} { |
|
set in_sel 0 |
|
} |
|
if {$in_sel} { |
|
unset selected_paths($path) |
|
$w tag remove in_sel $lno.0 [expr {$lno + 1}].0 |
|
} else { |
|
set selected_paths($path) 1 |
|
$w tag add in_sel $lno.0 [expr {$lno + 1}].0 |
|
} |
|
} |
|
|
|
proc add_range_to_selection {w x y} { |
|
global file_lists last_clicked selected_paths |
|
|
|
if {[lindex $last_clicked 0] ne $w} { |
|
toggle_or_diff $w $x $y |
|
return |
|
} |
|
|
|
set lno [lindex [split [$w index @$x,$y] .] 0] |
|
set lc [lindex $last_clicked 1] |
|
if {$lc < $lno} { |
|
set begin $lc |
|
set end $lno |
|
} else { |
|
set begin $lno |
|
set end $lc |
|
} |
|
|
|
foreach path [lrange $file_lists($w) \ |
|
[expr {$begin - 1}] \ |
|
[expr {$end - 1}]] { |
|
set selected_paths($path) 1 |
|
} |
|
$w tag add in_sel $begin.0 [expr {$end + 1}].0 |
|
} |
|
|
|
###################################################################### |
|
## |
|
## config defaults |
|
|
|
set cursor_ptr arrow |
|
font create font_diff -family Courier -size 10 |
|
font create font_ui |
|
catch { |
|
label .dummy |
|
eval font configure font_ui [font actual [.dummy cget -font]] |
|
destroy .dummy |
|
} |
|
|
|
font create font_uiitalic |
|
font create font_uibold |
|
font create font_diffbold |
|
font create font_diffitalic |
|
|
|
foreach class {Button Checkbutton Entry Label |
|
Labelframe Listbox Menu Message |
|
Radiobutton Spinbox Text} { |
|
option add *$class.font font_ui |
|
} |
|
unset class |
|
|
|
if {[is_Windows] || [is_MacOSX]} { |
|
option add *Menu.tearOff 0 |
|
} |
|
|
|
if {[is_MacOSX]} { |
|
set M1B M1 |
|
set M1T Cmd |
|
} else { |
|
set M1B Control |
|
set M1T Ctrl |
|
} |
|
|
|
proc apply_config {} { |
|
global repo_config font_descs |
|
|
|
foreach option $font_descs { |
|
set name [lindex $option 0] |
|
set font [lindex $option 1] |
|
if {[catch { |
|
foreach {cn cv} $repo_config(gui.$name) { |
|
font configure $font $cn $cv |
|
} |
|
} err]} { |
|
error_popup "Invalid font specified in gui.$name:\n\n$err" |
|
} |
|
foreach {cn cv} [font configure $font] { |
|
font configure ${font}bold $cn $cv |
|
font configure ${font}italic $cn $cv |
|
} |
|
font configure ${font}bold -weight bold |
|
font configure ${font}italic -slant italic |
|
} |
|
} |
|
|
|
set default_config(merge.diffstat) true |
|
set default_config(merge.summary) false |
|
set default_config(merge.verbosity) 2 |
|
set default_config(user.name) {} |
|
set default_config(user.email) {} |
|
|
|
set default_config(gui.matchtrackingbranch) false |
|
set default_config(gui.pruneduringfetch) false |
|
set default_config(gui.trustmtime) false |
|
set default_config(gui.diffcontext) 5 |
|
set default_config(gui.newbranchtemplate) {} |
|
set default_config(gui.fontui) [font configure font_ui] |
|
set default_config(gui.fontdiff) [font configure font_diff] |
|
set font_descs { |
|
{fontui font_ui {Main Font}} |
|
{fontdiff font_diff {Diff/Console Font}} |
|
} |
|
load_config 0 |
|
apply_config |
|
|
|
###################################################################### |
|
## |
|
## ui construction |
|
|
|
set ui_comm {} |
|
|
|
# -- Menu Bar |
|
# |
|
menu .mbar -tearoff 0 |
|
.mbar add cascade -label Repository -menu .mbar.repository |
|
.mbar add cascade -label Edit -menu .mbar.edit |
|
if {[is_enabled branch]} { |
|
.mbar add cascade -label Branch -menu .mbar.branch |
|
} |
|
if {[is_enabled multicommit] || [is_enabled singlecommit]} { |
|
.mbar add cascade -label Commit -menu .mbar.commit |
|
} |
|
if {[is_enabled transport]} { |
|
.mbar add cascade -label Merge -menu .mbar.merge |
|
.mbar add cascade -label Fetch -menu .mbar.fetch |
|
.mbar add cascade -label Push -menu .mbar.push |
|
} |
|
. configure -menu .mbar |
|
|
|
# -- Repository Menu |
|
# |
|
menu .mbar.repository |
|
|
|
.mbar.repository add command \ |
|
-label {Browse Current Branch's Files} \ |
|
-command {browser::new $current_branch} |
|
set ui_browse_current [.mbar.repository index last] |
|
.mbar.repository add command \ |
|
-label {Browse Branch Files...} \ |
|
-command browser_open::dialog |
|
.mbar.repository add separator |
|
|
|
.mbar.repository add command \ |
|
-label {Visualize Current Branch's History} \ |
|
-command {do_gitk $current_branch} |
|
set ui_visualize_current [.mbar.repository index last] |
|
.mbar.repository add command \ |
|
-label {Visualize All Branch History} \ |
|
-command {do_gitk --all} |
|
.mbar.repository add separator |
|
|
|
proc current_branch_write {args} { |
|
global current_branch |
|
.mbar.repository entryconf $::ui_browse_current \ |
|
-label "Browse $current_branch's Files" |
|
.mbar.repository entryconf $::ui_visualize_current \ |
|
-label "Visualize $current_branch's History" |
|
} |
|
trace add variable current_branch write current_branch_write |
|
|
|
if {[is_enabled multicommit]} { |
|
.mbar.repository add command -label {Database Statistics} \ |
|
-command do_stats |
|
|
|
.mbar.repository add command -label {Compress Database} \ |
|
-command do_gc |
|
|
|
.mbar.repository add command -label {Verify Database} \ |
|
-command do_fsck_objects |
|
|
|
.mbar.repository add separator |
|
|
|
if {[is_Cygwin]} { |
|
.mbar.repository add command \ |
|
-label {Create Desktop Icon} \ |
|
-command do_cygwin_shortcut |
|
} elseif {[is_Windows]} { |
|
.mbar.repository add command \ |
|
-label {Create Desktop Icon} \ |
|
-command do_windows_shortcut |
|
} elseif {[is_MacOSX]} { |
|
.mbar.repository add command \ |
|
-label {Create Desktop Icon} \ |
|
-command do_macosx_app |
|
} |
|
} |
|
|
|
.mbar.repository add command -label Quit \ |
|
-command do_quit \ |
|
-accelerator $M1T-Q |
|
|
|
# -- Edit Menu |
|
# |
|
menu .mbar.edit |
|
.mbar.edit add command -label Undo \ |
|
-command {catch {[focus] edit undo}} \ |
|
-accelerator $M1T-Z |
|
.mbar.edit add command -label Redo \ |
|
-command {catch {[focus] edit redo}} \ |
|
-accelerator $M1T-Y |
|
.mbar.edit add separator |
|
.mbar.edit add command -label Cut \ |
|
-command {catch {tk_textCut [focus]}} \ |
|
-accelerator $M1T-X |
|
.mbar.edit add command -label Copy \ |
|
-command {catch {tk_textCopy [focus]}} \ |
|
-accelerator $M1T-C |
|
.mbar.edit add command -label Paste \ |
|
-command {catch {tk_textPaste [focus]; [focus] see insert}} \ |
|
-accelerator $M1T-V |
|
.mbar.edit add command -label Delete \ |
|
-command {catch {[focus] delete sel.first sel.last}} \ |
|
-accelerator Del |
|
.mbar.edit add separator |
|
.mbar.edit add command -label {Select All} \ |
|
-command {catch {[focus] tag add sel 0.0 end}} \ |
|
-accelerator $M1T-A |
|
|
|
# -- Branch Menu |
|
# |
|
if {[is_enabled branch]} { |
|
menu .mbar.branch |
|
|
|
.mbar.branch add command -label {Create...} \ |
|
-command branch_create::dialog \ |
|
-accelerator $M1T-N |
|
lappend disable_on_lock [list .mbar.branch entryconf \ |
|
[.mbar.branch index last] -state] |
|
|
|
.mbar.branch add command -label {Checkout...} \ |
|
-command branch_checkout::dialog \ |
|
-accelerator $M1T-O |
|
lappend disable_on_lock [list .mbar.branch entryconf \ |
|
[.mbar.branch index last] -state] |
|
|
|
.mbar.branch add command -label {Rename...} \ |
|
-command branch_rename::dialog |
|
lappend disable_on_lock [list .mbar.branch entryconf \ |
|
[.mbar.branch index last] -state] |
|
|
|
.mbar.branch add command -label {Delete...} \ |
|
-command branch_delete::dialog |
|
lappend disable_on_lock [list .mbar.branch entryconf \ |
|
[.mbar.branch index last] -state] |
|
|
|
.mbar.branch add command -label {Reset...} \ |
|
-command merge::reset_hard |
|
lappend disable_on_lock [list .mbar.branch entryconf \ |
|
[.mbar.branch index last] -state] |
|
} |
|
|
|
# -- Commit Menu |
|
# |
|
if {[is_enabled multicommit] || [is_enabled singlecommit]} { |
|
menu .mbar.commit |
|
|
|
.mbar.commit add radiobutton \ |
|
-label {New Commit} \ |
|
-command do_select_commit_type \ |
|
-variable selected_commit_type \ |
|
-value new |
|
lappend disable_on_lock \ |
|
[list .mbar.commit entryconf [.mbar.commit index last] -state] |
|
|
|
.mbar.commit add radiobutton \ |
|
-label {Amend Last Commit} \ |
|
-command do_select_commit_type \ |
|
-variable selected_commit_type \ |
|
-value amend |
|
lappend disable_on_lock \ |
|
[list .mbar.commit entryconf [.mbar.commit index last] -state] |
|
|
|
.mbar.commit add separator |
|
|
|
.mbar.commit add command -label Rescan \ |
|
-command do_rescan \ |
|
-accelerator F5 |
|
lappend disable_on_lock \ |
|
[list .mbar.commit entryconf [.mbar.commit index last] -state] |
|
|
|
.mbar.commit add command -label {Stage To Commit} \ |
|
-command do_add_selection |
|
lappend disable_on_lock \ |
|
[list .mbar.commit entryconf [.mbar.commit index last] -state] |
|
|
|
.mbar.commit add command -label {Stage Changed Files To Commit} \ |
|
-command do_add_all \ |
|
-accelerator $M1T-I |
|
lappend disable_on_lock \ |
|
[list .mbar.commit entryconf [.mbar.commit index last] -state] |
|
|
|
.mbar.commit add command -label {Unstage From Commit} \ |
|
-command do_unstage_selection |
|
lappend disable_on_lock \ |
|
[list .mbar.commit entryconf [.mbar.commit index last] -state] |
|
|
|
.mbar.commit add command -label {Revert Changes} \ |
|
-command do_revert_selection |
|
lappend disable_on_lock \ |
|
[list .mbar.commit entryconf [.mbar.commit index last] -state] |
|
|
|
.mbar.commit add separator |
|
|
|
.mbar.commit add command -label {Sign Off} \ |
|
-command do_signoff \ |
|
-accelerator $M1T-S |
|
|
|
.mbar.commit add command -label Commit \ |
|
-command do_commit \ |
|
-accelerator $M1T-Return |
|
lappend disable_on_lock \ |
|
[list .mbar.commit entryconf [.mbar.commit index last] -state] |
|
} |
|
|
|
# -- Merge Menu |
|
# |
|
if {[is_enabled branch]} { |
|
menu .mbar.merge |
|
.mbar.merge add command -label {Local Merge...} \ |
|
-command merge::dialog \ |
|
-accelerator $M1T-M |
|
lappend disable_on_lock \ |
|
[list .mbar.merge entryconf [.mbar.merge index last] -state] |
|
.mbar.merge add command -label {Abort Merge...} \ |
|
-command merge::reset_hard |
|
lappend disable_on_lock \ |
|
[list .mbar.merge entryconf [.mbar.merge index last] -state] |
|
} |
|
|
|
# -- Transport Menu |
|
# |
|
if {[is_enabled transport]} { |
|
menu .mbar.fetch |
|
|
|
menu .mbar.push |
|
.mbar.push add command -label {Push...} \ |
|
-command do_push_anywhere \ |
|
-accelerator $M1T-P |
|
.mbar.push add command -label {Delete...} \ |
|
-command remote_branch_delete::dialog |
|
} |
|
|
|
if {[is_MacOSX]} { |
|
# -- Apple Menu (Mac OS X only) |
|
# |
|
.mbar add cascade -label Apple -menu .mbar.apple |
|
menu .mbar.apple |
|
|
|
.mbar.apple add command -label "About [appname]" \ |
|
-command do_about |
|
.mbar.apple add command -label "Options..." \ |
|
-command do_options |
|
} else { |
|
# -- Edit Menu |
|
# |
|
.mbar.edit add separator |
|
.mbar.edit add command -label {Options...} \ |
|
-command do_options |
|
} |
|
|
|
# -- Help Menu |
|
# |
|
.mbar add cascade -label Help -menu .mbar.help |
|
menu .mbar.help |
|
|
|
if {![is_MacOSX]} { |
|
.mbar.help add command -label "About [appname]" \ |
|
-command do_about |
|
} |
|
|
|
set browser {} |
|
catch {set browser $repo_config(instaweb.browser)} |
|
set doc_path [file dirname [gitexec]] |
|
set doc_path [file join $doc_path Documentation index.html] |
|
|
|
if {[is_Cygwin]} { |
|
set doc_path [exec cygpath --mixed $doc_path] |
|
} |
|
|
|
if {$browser eq {}} { |
|
if {[is_MacOSX]} { |
|
set browser open |
|
} elseif {[is_Cygwin]} { |
|
set program_files [file dirname [exec cygpath --windir]] |
|
set program_files [file join $program_files {Program Files}] |
|
set firefox [file join $program_files {Mozilla Firefox} firefox.exe] |
|
set ie [file join $program_files {Internet Explorer} IEXPLORE.EXE] |
|
if {[file exists $firefox]} { |
|
set browser $firefox |
|
} elseif {[file exists $ie]} { |
|
set browser $ie |
|
} |
|
unset program_files firefox ie |
|
} |
|
} |
|
|
|
if {[file isfile $doc_path]} { |
|
set doc_url "file:$doc_path" |
|
} else { |
|
set doc_url {http://www.kernel.org/pub/software/scm/git/docs/} |
|
} |
|
|
|
if {$browser ne {}} { |
|
.mbar.help add command -label {Online Documentation} \ |
|
-command [list exec $browser $doc_url &] |
|
} |
|
unset browser doc_path doc_url |
|
|
|
set root_exists 0 |
|
bind . <Visibility> { |
|
bind . <Visibility> {} |
|
set root_exists 1 |
|
} |
|
|
|
# -- Standard bindings |
|
# |
|
wm protocol . WM_DELETE_WINDOW do_quit |
|
bind all <$M1B-Key-q> do_quit |
|
bind all <$M1B-Key-Q> do_quit |
|
bind all <$M1B-Key-w> {destroy [winfo toplevel %W]} |
|
bind all <$M1B-Key-W> {destroy [winfo toplevel %W]} |
|
|
|
set subcommand_args {} |
|
proc usage {} { |
|
puts stderr "usage: $::argv0 $::subcommand $::subcommand_args" |
|
exit 1 |
|
} |
|
|
|
# -- Not a normal commit type invocation? Do that instead! |
|
# |
|
switch -- $subcommand { |
|
browser - |
|
blame { |
|
set subcommand_args {rev? path} |
|
if {$argv eq {}} usage |
|
set head {} |
|
set path {} |
|
set is_path 0 |
|
foreach a $argv { |
|
if {$is_path || [file exists $_prefix$a]} { |
|
if {$path ne {}} usage |
|
set path $_prefix$a |
|
break |
|
} elseif {$a eq {--}} { |
|
if {$path ne {}} { |
|
if {$head ne {}} usage |
|
set head $path |
|
set path {} |
|
} |
|
set is_path 1 |
|
} elseif {$head eq {}} { |
|
if {$head ne {}} usage |
|
set head $a |
|
set is_path 1 |
|
} else { |
|
usage |
|
} |
|
} |
|
unset is_path |
|
|
|
if {$head ne {} && $path eq {}} { |
|
set path $_prefix$head |
|
set head {} |
|
} |
|
|
|
if {$head eq {}} { |
|
load_current_branch |
|
} else { |
|
if {[regexp {^[0-9a-f]{1,39}$} $head]} { |
|
if {[catch { |
|
set head [git rev-parse --verify $head] |
|
} err]} { |
|
puts stderr $err |
|
exit 1 |
|
} |
|
} |
|
set current_branch $head |
|
} |
|
|
|
switch -- $subcommand { |
|
browser { |
|
if {$head eq {}} { |
|
if {$path ne {} && [file isdirectory $path]} { |
|
set head $current_branch |
|
} else { |
|
set head $path |
|
set path {} |
|
} |
|
} |
|
browser::new $head $path |
|
} |
|
blame { |
|
if {$head eq {} && ![file exists $path]} { |
|
puts stderr "fatal: cannot stat path $path: No such file or directory" |
|
exit 1 |
|
} |
|
blame::new $head $path |
|
} |
|
} |
|
return |
|
} |
|
citool - |
|
gui { |
|
if {[llength $argv] != 0} { |
|
puts -nonewline stderr "usage: $argv0" |
|
if {$subcommand ne {gui} && [appname] ne "git-$subcommand"} { |
|
puts -nonewline stderr " $subcommand" |
|
} |
|
puts stderr {} |
|
exit 1 |
|
} |
|
# fall through to setup UI for commits |
|
} |
|
default { |
|
puts stderr "usage: $argv0 \[{blame|browser|citool}\]" |
|
exit 1 |
|
} |
|
} |
|
|
|
# -- Branch Control |
|
# |
|
frame .branch \ |
|
-borderwidth 1 \ |
|
-relief sunken |
|
label .branch.l1 \ |
|
-text {Current Branch:} \ |
|
-anchor w \ |
|
-justify left |
|
label .branch.cb \ |
|
-textvariable current_branch \ |
|
-anchor w \ |
|
-justify left |
|
pack .branch.l1 -side left |
|
pack .branch.cb -side left -fill x |
|
pack .branch -side top -fill x |
|
|
|
# -- Main Window Layout |
|
# |
|
panedwindow .vpane -orient vertical |
|
panedwindow .vpane.files -orient horizontal |
|
.vpane add .vpane.files -sticky nsew -height 100 -width 200 |
|
pack .vpane -anchor n -side top -fill both -expand 1 |
|
|
|
# -- Index File List |
|
# |
|
frame .vpane.files.index -height 100 -width 200 |
|
label .vpane.files.index.title -text {Staged Changes (Will Be Committed)} \ |
|
-background lightgreen |
|
text $ui_index -background white -borderwidth 0 \ |
|
-width 20 -height 10 \ |
|
-wrap none \ |
|
-cursor $cursor_ptr \ |
|
-xscrollcommand {.vpane.files.index.sx set} \ |
|
-yscrollcommand {.vpane.files.index.sy set} \ |
|
-state disabled |
|
scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview] |
|
scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview] |
|
pack .vpane.files.index.title -side top -fill x |
|
pack .vpane.files.index.sx -side bottom -fill x |
|
pack .vpane.files.index.sy -side right -fill y |
|
pack $ui_index -side left -fill both -expand 1 |
|
.vpane.files add .vpane.files.index -sticky nsew |
|
|
|
# -- Working Directory File List |
|
# |
|
frame .vpane.files.workdir -height 100 -width 200 |
|
label .vpane.files.workdir.title -text {Unstaged Changes (Will Not Be Committed)} \ |
|
-background lightsalmon |
|
text $ui_workdir -background white -borderwidth 0 \ |
|
-width 20 -height 10 \ |
|
-wrap none \ |
|
-cursor $cursor_ptr \ |
|
-xscrollcommand {.vpane.files.workdir.sx set} \ |
|
-yscrollcommand {.vpane.files.workdir.sy set} \ |
|
-state disabled |
|
scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview] |
|
scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview] |
|
pack .vpane.files.workdir.title -side top -fill x |
|
pack .vpane.files.workdir.sx -side bottom -fill x |
|
pack .vpane.files.workdir.sy -side right -fill y |
|
pack $ui_workdir -side left -fill both -expand 1 |
|
.vpane.files add .vpane.files.workdir -sticky nsew |
|
|
|
foreach i [list $ui_index $ui_workdir] { |
|
$i tag conf in_diff -background lightgray |
|
$i tag conf in_sel -background lightgray |
|
} |
|
unset i |
|
|
|
# -- Diff and Commit Area |
|
# |
|
frame .vpane.lower -height 300 -width 400 |
|
frame .vpane.lower.commarea |
|
frame .vpane.lower.diff -relief sunken -borderwidth 1 |
|
pack .vpane.lower.commarea -side top -fill x |
|
pack .vpane.lower.diff -side bottom -fill both -expand 1 |
|
.vpane add .vpane.lower -sticky nsew |
|
|
|
# -- Commit Area Buttons |
|
# |
|
frame .vpane.lower.commarea.buttons |
|
label .vpane.lower.commarea.buttons.l -text {} \ |
|
-anchor w \ |
|
-justify left |
|
pack .vpane.lower.commarea.buttons.l -side top -fill x |
|
pack .vpane.lower.commarea.buttons -side left -fill y |
|
|
|
button .vpane.lower.commarea.buttons.rescan -text {Rescan} \ |
|
-command do_rescan |
|
pack .vpane.lower.commarea.buttons.rescan -side top -fill x |
|
lappend disable_on_lock \ |
|
{.vpane.lower.commarea.buttons.rescan conf -state} |
|
|
|
button .vpane.lower.commarea.buttons.incall -text {Stage Changed} \ |
|
-command do_add_all |
|
pack .vpane.lower.commarea.buttons.incall -side top -fill x |
|
lappend disable_on_lock \ |
|
{.vpane.lower.commarea.buttons.incall conf -state} |
|
|
|
button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \ |
|
-command do_signoff |
|
pack .vpane.lower.commarea.buttons.signoff -side top -fill x |
|
|
|
button .vpane.lower.commarea.buttons.commit -text {Commit} \ |
|
-command do_commit |
|
pack .vpane.lower.commarea.buttons.commit -side top -fill x |
|
lappend disable_on_lock \ |
|
{.vpane.lower.commarea.buttons.commit conf -state} |
|
|
|
button .vpane.lower.commarea.buttons.push -text {Push} \ |
|
-command do_push_anywhere |
|
pack .vpane.lower.commarea.buttons.push -side top -fill x |
|
|
|
# -- Commit Message Buffer |
|
# |
|
frame .vpane.lower.commarea.buffer |
|
frame .vpane.lower.commarea.buffer.header |
|
set ui_comm .vpane.lower.commarea.buffer.t |
|
set ui_coml .vpane.lower.commarea.buffer.header.l |
|
radiobutton .vpane.lower.commarea.buffer.header.new \ |
|
-text {New Commit} \ |
|
-command do_select_commit_type \ |
|
-variable selected_commit_type \ |
|
-value new |
|
lappend disable_on_lock \ |
|
[list .vpane.lower.commarea.buffer.header.new conf -state] |
|
radiobutton .vpane.lower.commarea.buffer.header.amend \ |
|
-text {Amend Last Commit} \ |
|
-command do_select_commit_type \ |
|
-variable selected_commit_type \ |
|
-value amend |
|
lappend disable_on_lock \ |
|
[list .vpane.lower.commarea.buffer.header.amend conf -state] |
|
label $ui_coml \ |
|
-anchor w \ |
|
-justify left |
|
proc trace_commit_type {varname args} { |
|
global ui_coml commit_type |
|
switch -glob -- $commit_type { |
|
initial {set txt {Initial Commit Message:}} |
|
amend {set txt {Amended Commit Message:}} |
|
amend-initial {set txt {Amended Initial Commit Message:}} |
|
amend-merge {set txt {Amended Merge Commit Message:}} |
|
merge {set txt {Merge Commit Message:}} |
|
* {set txt {Commit Message:}} |
|
} |
|
$ui_coml conf -text $txt |
|
} |
|
trace add variable commit_type write trace_commit_type |
|
pack $ui_coml -side left -fill x |
|
pack .vpane.lower.commarea.buffer.header.amend -side right |
|
pack .vpane.lower.commarea.buffer.header.new -side right |
|
|
|
text $ui_comm -background white -borderwidth 1 \ |
|
-undo true \ |
|
-maxundo 20 \ |
|
-autoseparators true \ |
|
-relief sunken \ |
|
-width 75 -height 9 -wrap none \ |
|
-font font_diff \ |
|
-yscrollcommand {.vpane.lower.commarea.buffer.sby set} |
|
scrollbar .vpane.lower.commarea.buffer.sby \ |
|
-command [list $ui_comm yview] |
|
pack .vpane.lower.commarea.buffer.header -side top -fill x |
|
pack .vpane.lower.commarea.buffer.sby -side right -fill y |
|
pack $ui_comm -side left -fill y |
|
pack .vpane.lower.commarea.buffer -side left -fill y |
|
|
|
# -- Commit Message Buffer Context Menu |
|
# |
|
set ctxm .vpane.lower.commarea.buffer.ctxm |
|
menu $ctxm -tearoff 0 |
|
$ctxm add command \ |
|
-label {Cut} \ |
|
-command {tk_textCut $ui_comm} |
|
$ctxm add command \ |
|
-label {Copy} \ |
|
-command {tk_textCopy $ui_comm} |
|
$ctxm add command \ |
|
-label {Paste} \ |
|
-command {tk_textPaste $ui_comm} |
|
$ctxm add command \ |
|
-label {Delete} \ |
|
-command {$ui_comm delete sel.first sel.last} |
|
$ctxm add separator |
|
$ctxm add command \ |
|
-label {Select All} \ |
|
-command {focus $ui_comm;$ui_comm tag add sel 0.0 end} |
|
$ctxm add command \ |
|
-label {Copy All} \ |
|
-command { |
|
$ui_comm tag add sel 0.0 end |
|
tk_textCopy $ui_comm |
|
$ui_comm tag remove sel 0.0 end |
|
} |
|
$ctxm add separator |
|
$ctxm add command \ |
|
-label {Sign Off} \ |
|
-command do_signoff |
|
bind_button3 $ui_comm "tk_popup $ctxm %X %Y" |
|
|
|
# -- Diff Header |
|
# |
|
proc trace_current_diff_path {varname args} { |
|
global current_diff_path diff_actions file_states |
|
if {$current_diff_path eq {}} { |
|
set s {} |
|
set f {} |
|
set p {} |
|
set o disabled |
|
} else { |
|
set p $current_diff_path |
|
set s [mapdesc [lindex $file_states($p) 0] $p] |
|
set f {File:} |
|
set p [escape_path $p] |
|
set o normal |
|
} |
|
|
|
.vpane.lower.diff.header.status configure -text $s |
|
.vpane.lower.diff.header.file configure -text $f |
|
.vpane.lower.diff.header.path configure -text $p |
|
foreach w $diff_actions { |
|
uplevel #0 $w $o |
|
} |
|
} |
|
trace add variable current_diff_path write trace_current_diff_path |
|
|
|
frame .vpane.lower.diff.header -background gold |
|
label .vpane.lower.diff.header.status \ |
|
-background gold \ |
|
-width $max_status_desc \ |
|
-anchor w \ |
|
-justify left |
|
label .vpane.lower.diff.header.file \ |
|
-background gold \ |
|
-anchor w \ |
|
-justify left |
|
label .vpane.lower.diff.header.path \ |
|
-background gold \ |
|
-anchor w \ |
|
-justify left |
|
pack .vpane.lower.diff.header.status -side left |
|
pack .vpane.lower.diff.header.file -side left |
|
pack .vpane.lower.diff.header.path -fill x |
|
set ctxm .vpane.lower.diff.header.ctxm |
|
menu $ctxm -tearoff 0 |
|
$ctxm add command \ |
|
-label {Copy} \ |
|
-command { |
|
clipboard clear |
|
clipboard append \ |
|
-format STRING \ |
|
-type STRING \ |
|
-- $current_diff_path |
|
} |
|
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
|
bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y" |
|
|
|
# -- Diff Body |
|
# |
|
frame .vpane.lower.diff.body |
|
set ui_diff .vpane.lower.diff.body.t |
|
text $ui_diff -background white -borderwidth 0 \ |
|
-width 80 -height 15 -wrap none \ |
|
-font font_diff \ |
|
-xscrollcommand {.vpane.lower.diff.body.sbx set} \ |
|
-yscrollcommand {.vpane.lower.diff.body.sby set} \ |
|
-state disabled |
|
scrollbar .vpane.lower.diff.body.sbx -orient horizontal \ |
|
-command [list $ui_diff xview] |
|
scrollbar .vpane.lower.diff.body.sby -orient vertical \ |
|
-command [list $ui_diff yview] |
|
pack .vpane.lower.diff.body.sbx -side bottom -fill x |
|
pack .vpane.lower.diff.body.sby -side right -fill y |
|
pack $ui_diff -side left -fill both -expand 1 |
|
pack .vpane.lower.diff.header -side top -fill x |
|
pack .vpane.lower.diff.body -side bottom -fill both -expand 1 |
|
|
|
$ui_diff tag conf d_cr -elide true |
|
$ui_diff tag conf d_@ -foreground blue -font font_diffbold |
|
$ui_diff tag conf d_+ -foreground {#00a000} |
|
$ui_diff tag conf d_- -foreground red |
|
|
|
$ui_diff tag conf d_++ -foreground {#00a000} |
|
$ui_diff tag conf d_-- -foreground red |
|
$ui_diff tag conf d_+s \ |
|
-foreground {#00a000} \ |
|
-background {#e2effa} |
|
$ui_diff tag conf d_-s \ |
|
-foreground red \ |
|
-background {#e2effa} |
|
$ui_diff tag conf d_s+ \ |
|
-foreground {#00a000} \ |
|
-background ivory1 |
|
$ui_diff tag conf d_s- \ |
|
-foreground red \ |
|
-background ivory1 |
|
|
|
$ui_diff tag conf d<<<<<<< \ |
|
-foreground orange \ |
|
-font font_diffbold |
|
$ui_diff tag conf d======= \ |
|
-foreground orange \ |
|
-font font_diffbold |
|
$ui_diff tag conf d>>>>>>> \ |
|
-foreground orange \ |
|
-font font_diffbold |
|
|
|
$ui_diff tag raise sel |
|
|
|
# -- Diff Body Context Menu |
|
# |
|
set ctxm .vpane.lower.diff.body.ctxm |
|
menu $ctxm -tearoff 0 |
|
$ctxm add command \ |
|
-label {Refresh} \ |
|
-command reshow_diff |
|
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
|
$ctxm add command \ |
|
-label {Copy} \ |
|
-command {tk_textCopy $ui_diff} |
|
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
|
$ctxm add command \ |
|
-label {Select All} \ |
|
-command {focus $ui_diff;$ui_diff tag add sel 0.0 end} |
|
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
|
$ctxm add command \ |
|
-label {Copy All} \ |
|
-command { |
|
$ui_diff tag add sel 0.0 end |
|
tk_textCopy $ui_diff |
|
$ui_diff tag remove sel 0.0 end |
|
} |
|
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
|
$ctxm add separator |
|
$ctxm add command \ |
|
-label {Apply/Reverse Hunk} \ |
|
-command {apply_hunk $cursorX $cursorY} |
|
set ui_diff_applyhunk [$ctxm index last] |
|
lappend diff_actions [list $ctxm entryconf $ui_diff_applyhunk -state] |
|
$ctxm add separator |
|
$ctxm add command \ |
|
-label {Decrease Font Size} \ |
|
-command {incr_font_size font_diff -1} |
|
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
|
$ctxm add command \ |
|
-label {Increase Font Size} \ |
|
-command {incr_font_size font_diff 1} |
|
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
|
$ctxm add separator |
|
$ctxm add command \ |
|
-label {Show Less Context} \ |
|
-command {if {$repo_config(gui.diffcontext) >= 1} { |
|
incr repo_config(gui.diffcontext) -1 |
|
reshow_diff |
|
}} |
|
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
|
$ctxm add command \ |
|
-label {Show More Context} \ |
|
-command {if {$repo_config(gui.diffcontext) < 99} { |
|
incr repo_config(gui.diffcontext) |
|
reshow_diff |
|
}} |
|
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] |
|
$ctxm add separator |
|
$ctxm add command -label {Options...} \ |
|
-command do_options |
|
proc popup_diff_menu {ctxm x y X Y} { |
|
global current_diff_path file_states |
|
set ::cursorX $x |
|
set ::cursorY $y |
|
if {$::ui_index eq $::current_diff_side} { |
|
set s normal |
|
set l "Unstage Hunk From Commit" |
|
} else { |
|
if {$current_diff_path eq {} |
|
|| ![info exists file_states($current_diff_path)] |
|
|| {_O} eq [lindex $file_states($current_diff_path) 0]} { |
|
set s disabled |
|
} else { |
|
set s normal |
|
} |
|
set l "Stage Hunk For Commit" |
|
} |
|
if {$::is_3way_diff} { |
|
set s disabled |
|
} |
|
$ctxm entryconf $::ui_diff_applyhunk -state $s -label $l |
|
tk_popup $ctxm $X $Y |
|
} |
|
bind_button3 $ui_diff [list popup_diff_menu $ctxm %x %y %X %Y] |
|
|
|
# -- Status Bar |
|
# |
|
set main_status [::status_bar::new .status] |
|
pack .status -anchor w -side bottom -fill x |
|
$main_status show {Initializing...} |
|
|
|
# -- Load geometry |
|
# |
|
catch { |
|
set gm $repo_config(gui.geometry) |
|
wm geometry . [lindex $gm 0] |
|
.vpane sash place 0 \ |
|
[lindex [.vpane sash coord 0] 0] \ |
|
[lindex $gm 1] |
|
.vpane.files sash place 0 \ |
|
[lindex $gm 2] \ |
|
[lindex [.vpane.files sash coord 0] 1] |
|
unset gm |
|
} |
|
|
|
# -- Key Bindings |
|
# |
|
bind $ui_comm <$M1B-Key-Return> {do_commit;break} |
|
bind $ui_comm <$M1B-Key-i> {do_add_all;break} |
|
bind $ui_comm <$M1B-Key-I> {do_add_all;break} |
|
bind $ui_comm <$M1B-Key-x> {tk_textCut %W;break} |
|
bind $ui_comm <$M1B-Key-X> {tk_textCut %W;break} |
|
bind $ui_comm <$M1B-Key-c> {tk_textCopy %W;break} |
|
bind $ui_comm <$M1B-Key-C> {tk_textCopy %W;break} |
|
bind $ui_comm <$M1B-Key-v> {tk_textPaste %W; %W see insert; break} |
|
bind $ui_comm <$M1B-Key-V> {tk_textPaste %W; %W see insert; break} |
|
bind $ui_comm <$M1B-Key-a> {%W tag add sel 0.0 end;break} |
|
bind $ui_comm <$M1B-Key-A> {%W tag add sel 0.0 end;break} |
|
|
|
bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break} |
|
bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break} |
|
bind $ui_diff <$M1B-Key-c> {tk_textCopy %W;break} |
|
bind $ui_diff <$M1B-Key-C> {tk_textCopy %W;break} |
|
bind $ui_diff <$M1B-Key-v> {break} |
|
bind $ui_diff <$M1B-Key-V> {break} |
|
bind $ui_diff <$M1B-Key-a> {%W tag add sel 0.0 end;break} |
|
bind $ui_diff <$M1B-Key-A> {%W tag add sel 0.0 end;break} |
|
bind $ui_diff <Key-Up> {catch {%W yview scroll -1 units};break} |
|
bind $ui_diff <Key-Down> {catch {%W yview scroll 1 units};break} |
|
bind $ui_diff <Key-Left> {catch {%W xview scroll -1 units};break} |
|
bind $ui_diff <Key-Right> {catch {%W xview scroll 1 units};break} |
|
bind $ui_diff <Key-k> {catch {%W yview scroll -1 units};break} |
|
bind $ui_diff <Key-j> {catch {%W yview scroll 1 units};break} |
|
bind $ui_diff <Key-h> {catch {%W xview scroll -1 units};break} |
|
bind $ui_diff <Key-l> {catch {%W xview scroll 1 units};break} |
|
bind $ui_diff <Control-Key-b> {catch {%W yview scroll -1 pages};break} |
|
bind $ui_diff <Control-Key-f> {catch {%W yview scroll 1 pages};break} |
|
bind $ui_diff <Button-1> {focus %W} |
|
|
|
if {[is_enabled branch]} { |
|
bind . <$M1B-Key-n> branch_create::dialog |
|
bind . <$M1B-Key-N> branch_create::dialog |
|
bind . <$M1B-Key-o> branch_checkout::dialog |
|
bind . <$M1B-Key-O> branch_checkout::dialog |
|
bind . <$M1B-Key-m> merge::dialog |
|
bind . <$M1B-Key-M> merge::dialog |
|
} |
|
if {[is_enabled transport]} { |
|
bind . <$M1B-Key-p> do_push_anywhere |
|
bind . <$M1B-Key-P> do_push_anywhere |
|
} |
|
|
|
bind . <Key-F5> do_rescan |
|
bind . <$M1B-Key-r> do_rescan |
|
bind . <$M1B-Key-R> do_rescan |
|
bind . <$M1B-Key-s> do_signoff |
|
bind . <$M1B-Key-S> do_signoff |
|
bind . <$M1B-Key-i> do_add_all |
|
bind . <$M1B-Key-I> do_add_all |
|
bind . <$M1B-Key-Return> do_commit |
|
foreach i [list $ui_index $ui_workdir] { |
|
bind $i <Button-1> "toggle_or_diff $i %x %y; break" |
|
bind $i <$M1B-Button-1> "add_one_to_selection $i %x %y; break" |
|
bind $i <Shift-Button-1> "add_range_to_selection $i %x %y; break" |
|
} |
|
unset i |
|
|
|
set file_lists($ui_index) [list] |
|
set file_lists($ui_workdir) [list] |
|
|
|
wm title . "[appname] ([reponame]) [file normalize [file dirname [gitdir]]]" |
|
focus -force $ui_comm |
|
|
|
# -- Warn the user about environmental problems. Cygwin's Tcl |
|
# does *not* pass its env array onto any processes it spawns. |
|
# This means that git processes get none of our environment. |
|
# |
|
if {[is_Cygwin]} { |
|
set ignored_env 0 |
|
set suggest_user {} |
|
set msg "Possible environment issues exist. |
|
|
|
The following environment variables are probably |
|
going to be ignored by any Git subprocess run |
|
by [appname]: |
|
|
|
" |
|
foreach name [array names env] { |
|
switch -regexp -- $name { |
|
{^GIT_INDEX_FILE$} - |
|
{^GIT_OBJECT_DIRECTORY$} - |
|
{^GIT_ALTERNATE_OBJECT_DIRECTORIES$} - |
|
{^GIT_DIFF_OPTS$} - |
|
{^GIT_EXTERNAL_DIFF$} - |
|
{^GIT_PAGER$} - |
|
{^GIT_TRACE$} - |
|
{^GIT_CONFIG$} - |
|
{^GIT_CONFIG_LOCAL$} - |
|
{^GIT_(AUTHOR|COMMITTER)_DATE$} { |
|
append msg " - $name\n" |
|
incr ignored_env |
|
} |
|
{^GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL)$} { |
|
append msg " - $name\n" |
|
incr ignored_env |
|
set suggest_user $name |
|
} |
|
} |
|
} |
|
if {$ignored_env > 0} { |
|
append msg " |
|
This is due to a known issue with the |
|
Tcl binary distributed by Cygwin." |
|
|
|
if {$suggest_user ne {}} { |
|
append msg " |
|
|
|
A good replacement for $suggest_user |
|
is placing values for the user.name and |
|
user.email settings into your personal |
|
~/.gitconfig file. |
|
" |
|
} |
|
warn_popup $msg |
|
} |
|
unset ignored_env msg suggest_user name |
|
} |
|
|
|
# -- Only initialize complex UI if we are going to stay running. |
|
# |
|
if {[is_enabled transport]} { |
|
load_all_remotes |
|
|
|
populate_fetch_menu |
|
populate_push_menu |
|
} |
|
|
|
if {[winfo exists $ui_comm]} { |
|
set GITGUI_BCK_exists [load_message GITGUI_BCK] |
|
|
|
# -- If both our backup and message files exist use the |
|
# newer of the two files to initialize the buffer. |
|
# |
|
if {$GITGUI_BCK_exists} { |
|
set m [gitdir GITGUI_MSG] |
|
if {[file isfile $m]} { |
|
if {[file mtime [gitdir GITGUI_BCK]] > [file mtime $m]} { |
|
catch {file delete [gitdir GITGUI_MSG]} |
|
} else { |
|
$ui_comm delete 0.0 end |
|
$ui_comm edit reset |
|
$ui_comm edit modified false |
|
catch {file delete [gitdir GITGUI_BCK]} |
|
set GITGUI_BCK_exists 0 |
|
} |
|
} |
|
unset m |
|
} |
|
|
|
proc backup_commit_buffer {} { |
|
global ui_comm GITGUI_BCK_exists |
|
|
|
set m [$ui_comm edit modified] |
|
if {$m || $GITGUI_BCK_exists} { |
|
set msg [string trim [$ui_comm get 0.0 end]] |
|
regsub -all -line {[ \r\t]+$} $msg {} msg |
|
|
|
if {$msg eq {}} { |
|
if {$GITGUI_BCK_exists} { |
|
catch {file delete [gitdir GITGUI_BCK]} |
|
set GITGUI_BCK_exists 0 |
|
} |
|
} elseif {$m} { |
|
catch { |
|
set fd [open [gitdir GITGUI_BCK] w] |
|
puts -nonewline $fd $msg |
|
close $fd |
|
set GITGUI_BCK_exists 1 |
|
} |
|
} |
|
|
|
$ui_comm edit modified false |
|
} |
|
|
|
set ::GITGUI_BCK_i [after 2000 backup_commit_buffer] |
|
} |
|
|
|
backup_commit_buffer |
|
} |
|
|
|
lock_index begin-read |
|
if {![winfo ismapped .]} { |
|
wm deiconify . |
|
} |
|
after 1 do_rescan |
|
if {[is_enabled multicommit]} { |
|
after 1000 hint_gc |
|
}
|
|
|