2006-11-19 08:57:58 +01:00
|
|
|
|
#!/bin/sh
|
2006-11-06 20:20:27 +01:00
|
|
|
|
# Tcl ignores the next line -*- tcl -*- \
|
2007-06-22 07:10:12 +02:00
|
|
|
|
if test "z$*" = zversion \
|
|
|
|
|
|| test "z$*" = z--version; \
|
|
|
|
|
then \
|
|
|
|
|
echo 'git-gui version @@GITGUI_VERSION@@'; \
|
|
|
|
|
exit; \
|
|
|
|
|
fi; \
|
|
|
|
|
exec wish "$0" -- "$@"
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2007-02-12 22:12:04 +01:00
|
|
|
|
set appvers {@@GITGUI_VERSION@@}
|
2006-11-21 08:36:55 +01:00
|
|
|
|
set copyright {
|
2007-02-19 03:06:48 +01:00
|
|
|
|
Copyright <20> 2006, 2007 Shawn Pearce, et. al.
|
2006-11-21 08:36:55 +01:00
|
|
|
|
|
2007-01-21 02:08:20 +01:00
|
|
|
|
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}
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
######################################################################
|
2007-06-02 22:11:26 +02:00
|
|
|
|
##
|
|
|
|
|
## 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
|
|
|
|
|
}
|
|
|
|
|
|
2007-05-28 17:22:13 +02:00
|
|
|
|
######################################################################
|
|
|
|
|
##
|
|
|
|
|
## 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
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
######################################################################
|
|
|
|
|
##
|
|
|
|
|
## configure our library
|
|
|
|
|
|
|
|
|
|
set oguilib {@@GITGUI_LIBDIR@@}
|
2007-05-27 06:03:37 +02:00
|
|
|
|
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]} {
|
2007-05-08 05:35:48 +02:00
|
|
|
|
set oguilib [file join [file dirname [file normalize $argv0]] lib]
|
|
|
|
|
}
|
2007-05-28 17:28:16 +02:00
|
|
|
|
|
2007-05-18 00:01:50 +02:00
|
|
|
|
set idx [file join $oguilib tclIndex]
|
2007-05-28 17:28:16 +02:00
|
|
|
|
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
|
2007-05-18 00:01:50 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
2007-05-28 17:28:16 +02:00
|
|
|
|
} else {
|
|
|
|
|
set idx {}
|
2007-05-18 00:01:50 +02:00
|
|
|
|
}
|
2007-05-28 17:28:16 +02:00
|
|
|
|
close $fd
|
|
|
|
|
|
2007-05-18 00:01:50 +02:00
|
|
|
|
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]
|
|
|
|
|
}
|
2007-05-28 17:11:56 +02:00
|
|
|
|
unset -nocomplain oguirel idx fd
|
2007-05-08 05:35:48 +02:00
|
|
|
|
|
2007-01-21 03:48:56 +01:00
|
|
|
|
######################################################################
|
|
|
|
|
##
|
|
|
|
|
## read only globals
|
|
|
|
|
|
|
|
|
|
set _appname [lindex [file split $argv0] end]
|
|
|
|
|
set _gitdir {}
|
2007-01-29 02:58:47 +01:00
|
|
|
|
set _gitexec {}
|
2007-01-21 03:48:56 +01:00
|
|
|
|
set _reponame {}
|
2007-01-29 02:58:47 +01:00
|
|
|
|
set _iscygwin {}
|
2007-01-21 03:48:56 +01:00
|
|
|
|
|
|
|
|
|
proc appname {} {
|
|
|
|
|
global _appname
|
|
|
|
|
return $_appname
|
|
|
|
|
}
|
|
|
|
|
|
2007-01-21 03:55:05 +01:00
|
|
|
|
proc gitdir {args} {
|
2007-01-21 03:48:56 +01:00
|
|
|
|
global _gitdir
|
2007-01-21 03:55:05 +01:00
|
|
|
|
if {$args eq {}} {
|
|
|
|
|
return $_gitdir
|
|
|
|
|
}
|
|
|
|
|
return [eval [concat [list file join $_gitdir] $args]]
|
2007-01-21 03:48:56 +01:00
|
|
|
|
}
|
|
|
|
|
|
2007-01-29 02:58:47 +01:00
|
|
|
|
proc gitexec {args} {
|
|
|
|
|
global _gitexec
|
|
|
|
|
if {$_gitexec eq {}} {
|
2007-02-13 04:48:56 +01:00
|
|
|
|
if {[catch {set _gitexec [git --exec-path]} err]} {
|
2007-01-29 02:58:47 +01:00
|
|
|
|
error "Git not installed?\n\n$err"
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if {$args eq {}} {
|
|
|
|
|
return $_gitexec
|
|
|
|
|
}
|
|
|
|
|
return [eval [concat [list file join $_gitexec] $args]]
|
|
|
|
|
}
|
|
|
|
|
|
2007-01-21 03:48:56 +01:00
|
|
|
|
proc reponame {} {
|
|
|
|
|
global _reponame
|
|
|
|
|
return $_reponame
|
|
|
|
|
}
|
2006-11-12 01:03:06 +01:00
|
|
|
|
|
2007-01-29 02:58:47 +01:00
|
|
|
|
proc is_MacOSX {} {
|
|
|
|
|
global tcl_platform tk_library
|
|
|
|
|
if {[tk windowingsystem] eq {aqua}} {
|
|
|
|
|
return 1
|
|
|
|
|
}
|
|
|
|
|
return 0
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
proc is_Windows {} {
|
|
|
|
|
global tcl_platform
|
|
|
|
|
if {$tcl_platform(platform) eq {windows}} {
|
|
|
|
|
return 1
|
|
|
|
|
}
|
|
|
|
|
return 0
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
proc is_Cygwin {} {
|
|
|
|
|
global tcl_platform _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
|
|
|
|
|
}
|
|
|
|
|
|
2007-02-09 00:03:41 +01:00
|
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-09 05:42:51 +01:00
|
|
|
|
######################################################################
|
|
|
|
|
##
|
|
|
|
|
## config
|
|
|
|
|
|
2006-11-12 09:47:00 +01:00
|
|
|
|
proc is_many_config {name} {
|
|
|
|
|
switch -glob -- $name {
|
|
|
|
|
remote.*.fetch -
|
|
|
|
|
remote.*.push
|
|
|
|
|
{return 1}
|
|
|
|
|
*
|
|
|
|
|
{return 0}
|
|
|
|
|
}
|
|
|
|
|
}
|
2006-11-09 05:42:51 +01:00
|
|
|
|
|
2007-01-26 10:43:43 +01:00
|
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2007-05-28 18:52:57 +02:00
|
|
|
|
proc get_config {name} {
|
|
|
|
|
global repo_config
|
|
|
|
|
if {[catch {set v $repo_config($name)}]} {
|
|
|
|
|
return {}
|
|
|
|
|
} else {
|
|
|
|
|
return $v
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-12 22:24:52 +01:00
|
|
|
|
proc load_config {include_global} {
|
2006-11-12 09:47:00 +01:00
|
|
|
|
global repo_config global_config default_config
|
|
|
|
|
|
|
|
|
|
array unset global_config
|
2006-11-12 22:24:52 +01:00
|
|
|
|
if {$include_global} {
|
|
|
|
|
catch {
|
2007-02-09 01:53:36 +01:00
|
|
|
|
set fd_rc [open "| git config --global --list" r]
|
2006-11-12 22:24:52 +01:00
|
|
|
|
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
|
|
|
|
|
}
|
2006-11-12 09:47:00 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
2006-11-12 22:24:52 +01:00
|
|
|
|
close $fd_rc
|
2006-11-12 09:47:00 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
2006-11-12 22:24:52 +01:00
|
|
|
|
|
|
|
|
|
array unset repo_config
|
2006-11-09 05:42:51 +01:00
|
|
|
|
catch {
|
2007-02-09 01:53:36 +01:00
|
|
|
|
set fd_rc [open "| git config --list" r]
|
2006-11-09 05:42:51 +01:00
|
|
|
|
while {[gets $fd_rc line] >= 0} {
|
|
|
|
|
if {[regexp {^([^=]+)=(.*)$} $line line name value]} {
|
2006-11-12 09:47:00 +01:00
|
|
|
|
if {[is_many_config $name]} {
|
|
|
|
|
lappend repo_config($name) $value
|
|
|
|
|
} else {
|
|
|
|
|
set repo_config($name) $value
|
|
|
|
|
}
|
2006-11-09 05:42:51 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
close $fd_rc
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-12 09:47:00 +01:00
|
|
|
|
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)
|
|
|
|
|
}
|
2006-11-09 05:42:51 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2007-02-13 04:48:56 +01:00
|
|
|
|
######################################################################
|
|
|
|
|
##
|
|
|
|
|
## handy utils
|
|
|
|
|
|
|
|
|
|
proc git {args} {
|
|
|
|
|
return [eval exec git $args]
|
|
|
|
|
}
|
|
|
|
|
|
2007-05-31 02:39:46 +02:00
|
|
|
|
proc current-branch {} {
|
|
|
|
|
set ref {}
|
|
|
|
|
set fd [open [gitdir HEAD] r]
|
|
|
|
|
if {[gets $fd ref] <16
|
|
|
|
|
|| ![regsub {^ref: refs/heads/} $ref {} ref]} {
|
|
|
|
|
set ref {}
|
|
|
|
|
}
|
|
|
|
|
close $fd
|
|
|
|
|
return $ref
|
|
|
|
|
}
|
|
|
|
|
|
2007-04-29 04:00:02 +02:00
|
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
|
2007-02-14 05:15:25 +01:00
|
|
|
|
######################################################################
|
|
|
|
|
##
|
|
|
|
|
## version check
|
|
|
|
|
|
2007-07-09 00:48:08 +02:00
|
|
|
|
if {[catch {set _git_version [git --version]} err]} {
|
2007-02-14 05:15:25 +01:00
|
|
|
|
catch {wm withdraw .}
|
|
|
|
|
error_popup "Cannot determine Git version:
|
|
|
|
|
|
|
|
|
|
$err
|
|
|
|
|
|
2007-07-09 00:48:08 +02:00
|
|
|
|
[appname] requires Git 1.5.0 or later."
|
|
|
|
|
exit 1
|
|
|
|
|
}
|
|
|
|
|
if {![regsub {^git version } $_git_version {} _git_version]} {
|
|
|
|
|
catch {wm withdraw .}
|
|
|
|
|
error_popup "Cannot parse Git version string:\n\n$_git_version"
|
2007-02-14 05:15:25 +01:00
|
|
|
|
exit 1
|
|
|
|
|
}
|
2007-07-09 00:48:08 +02:00
|
|
|
|
regsub {\.[0-9]+\.g[0-9a-f]+$} $_git_version {} _git_version
|
|
|
|
|
regsub {\.rc[0-9]+$} $_git_version {} _git_version
|
|
|
|
|
|
|
|
|
|
proc git-version {args} {
|
|
|
|
|
global _git_version
|
|
|
|
|
|
|
|
|
|
switch [llength $args] {
|
|
|
|
|
0 {
|
|
|
|
|
return $_git_version
|
2007-02-14 05:15:25 +01:00
|
|
|
|
}
|
2007-07-09 00:48:08 +02:00
|
|
|
|
|
|
|
|
|
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]} {
|
2007-02-14 05:15:25 +01:00
|
|
|
|
catch {wm withdraw .}
|
2007-07-09 00:48:08 +02:00
|
|
|
|
error_popup "[appname] requires Git 1.5.0 or later.
|
|
|
|
|
|
|
|
|
|
You are using [git-version]:
|
|
|
|
|
|
|
|
|
|
[git --version]"
|
2007-02-14 05:15:25 +01:00
|
|
|
|
exit 1
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-09 05:42:51 +01:00
|
|
|
|
######################################################################
|
|
|
|
|
##
|
|
|
|
|
## repository setup
|
|
|
|
|
|
2007-05-09 03:58:25 +02:00
|
|
|
|
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]} {
|
2006-11-12 01:10:10 +01:00
|
|
|
|
catch {wm withdraw .}
|
|
|
|
|
error_popup "Cannot find the git directory:\n\n$err"
|
2006-11-09 05:42:51 +01:00
|
|
|
|
exit 1
|
|
|
|
|
}
|
2007-01-29 02:58:47 +01:00
|
|
|
|
if {![file isdirectory $_gitdir] && [is_Cygwin]} {
|
|
|
|
|
catch {set _gitdir [exec cygpath --unix $_gitdir]}
|
|
|
|
|
}
|
2007-01-21 03:48:56 +01:00
|
|
|
|
if {![file isdirectory $_gitdir]} {
|
2006-11-16 04:45:33 +01:00
|
|
|
|
catch {wm withdraw .}
|
2007-01-21 03:48:56 +01:00
|
|
|
|
error_popup "Git directory not found:\n\n$_gitdir"
|
2006-11-16 04:45:33 +01:00
|
|
|
|
exit 1
|
|
|
|
|
}
|
2007-01-21 03:48:56 +01:00
|
|
|
|
if {[lindex [file split $_gitdir] end] ne {.git}} {
|
2006-11-16 04:45:33 +01:00
|
|
|
|
catch {wm withdraw .}
|
2007-01-29 02:58:47 +01:00
|
|
|
|
error_popup "Cannot use funny .git directory:\n\n$_gitdir"
|
2006-11-16 04:45:33 +01:00
|
|
|
|
exit 1
|
|
|
|
|
}
|
2007-01-21 03:48:56 +01:00
|
|
|
|
if {[catch {cd [file dirname $_gitdir]} err]} {
|
2006-11-16 04:13:45 +01:00
|
|
|
|
catch {wm withdraw .}
|
2007-01-21 03:48:56 +01:00
|
|
|
|
error_popup "No working directory [file dirname $_gitdir]:\n\n$err"
|
2006-11-16 04:13:45 +01:00
|
|
|
|
exit 1
|
2006-11-09 05:42:51 +01:00
|
|
|
|
}
|
2007-01-21 03:48:56 +01:00
|
|
|
|
set _reponame [lindex [file split \
|
|
|
|
|
[file normalize [file dirname $_gitdir]]] \
|
2007-01-21 03:36:21 +01:00
|
|
|
|
end]
|
2006-11-09 05:42:51 +01:00
|
|
|
|
|
2007-02-18 08:12:32 +01:00
|
|
|
|
######################################################################
|
|
|
|
|
##
|
|
|
|
|
## global init
|
|
|
|
|
|
|
|
|
|
set current_diff_path {}
|
|
|
|
|
set current_diff_side {}
|
|
|
|
|
set diff_actions [list]
|
|
|
|
|
set ui_status_value {Initializing...}
|
|
|
|
|
|
|
|
|
|
set HEAD {}
|
|
|
|
|
set PARENT {}
|
|
|
|
|
set MERGE_HEAD [list]
|
|
|
|
|
set commit_type {}
|
|
|
|
|
set empty_tree {}
|
|
|
|
|
set current_branch {}
|
|
|
|
|
set current_diff_path {}
|
|
|
|
|
set selected_commit_type new
|
|
|
|
|
|
2006-11-06 20:20:27 +01:00
|
|
|
|
######################################################################
|
|
|
|
|
##
|
2006-11-07 01:12:58 +01:00
|
|
|
|
## task management
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2006-11-14 07:29:32 +01:00
|
|
|
|
set rescan_active 0
|
2006-11-06 22:07:32 +01:00
|
|
|
|
set diff_active 0
|
2006-11-13 22:06:38 +01:00
|
|
|
|
set last_clicked {}
|
2006-11-06 22:07:32 +01:00
|
|
|
|
|
2006-11-07 01:12:58 +01:00
|
|
|
|
set disable_on_lock [list]
|
|
|
|
|
set index_lock_type none
|
|
|
|
|
|
|
|
|
|
proc lock_index {type} {
|
|
|
|
|
global index_lock_type disable_on_lock
|
2006-11-06 22:07:32 +01:00
|
|
|
|
|
2006-11-13 00:16:45 +01:00
|
|
|
|
if {$index_lock_type eq {none}} {
|
2006-11-07 01:12:58 +01:00
|
|
|
|
set index_lock_type $type
|
|
|
|
|
foreach w $disable_on_lock {
|
|
|
|
|
uplevel #0 $w disabled
|
|
|
|
|
}
|
|
|
|
|
return 1
|
2006-11-18 09:31:25 +01:00
|
|
|
|
} elseif {$index_lock_type eq "begin-$type"} {
|
2006-11-07 01:12:58 +01:00
|
|
|
|
set index_lock_type $type
|
2006-11-06 22:07:32 +01:00
|
|
|
|
return 1
|
|
|
|
|
}
|
|
|
|
|
return 0
|
|
|
|
|
}
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2006-11-07 01:12:58 +01:00
|
|
|
|
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
|
|
|
|
|
|
2006-11-21 03:27:22 +01:00
|
|
|
|
proc repository_state {ctvar hdvar mhvar} {
|
2007-01-21 03:48:56 +01:00
|
|
|
|
global current_branch
|
2006-11-21 03:27:22 +01:00
|
|
|
|
upvar $ctvar ct $hdvar hd $mhvar mh
|
|
|
|
|
|
|
|
|
|
set mh [list]
|
2006-11-07 02:50:59 +01:00
|
|
|
|
|
2007-05-31 02:39:46 +02:00
|
|
|
|
set current_branch [current-branch]
|
2007-02-13 04:48:56 +01:00
|
|
|
|
if {[catch {set hd [git rev-parse --verify HEAD]}]} {
|
2006-11-18 08:50:58 +01:00
|
|
|
|
set hd {}
|
2006-11-07 02:50:59 +01:00
|
|
|
|
set ct initial
|
2006-11-21 03:27:22 +01:00
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
|
2007-01-21 03:55:05 +01:00
|
|
|
|
set merge_head [gitdir MERGE_HEAD]
|
2006-11-21 03:27:22 +01:00
|
|
|
|
if {[file exists $merge_head]} {
|
2006-11-07 02:50:59 +01:00
|
|
|
|
set ct merge
|
2006-11-21 03:27:22 +01:00
|
|
|
|
set fd_mh [open $merge_head r]
|
|
|
|
|
while {[gets $fd_mh line] >= 0} {
|
|
|
|
|
lappend mh $line
|
|
|
|
|
}
|
|
|
|
|
close $fd_mh
|
|
|
|
|
return
|
2006-11-07 02:50:59 +01:00
|
|
|
|
}
|
2006-11-21 03:27:22 +01:00
|
|
|
|
|
|
|
|
|
set ct normal
|
2006-11-07 02:50:59 +01:00
|
|
|
|
}
|
|
|
|
|
|
2006-11-18 08:50:58 +01:00
|
|
|
|
proc PARENT {} {
|
|
|
|
|
global PARENT empty_tree
|
|
|
|
|
|
2006-11-21 03:27:22 +01:00
|
|
|
|
set p [lindex $PARENT 0]
|
|
|
|
|
if {$p ne {}} {
|
|
|
|
|
return $p
|
2006-11-18 08:50:58 +01:00
|
|
|
|
}
|
|
|
|
|
if {$empty_tree eq {}} {
|
2007-02-13 04:48:56 +01:00
|
|
|
|
set empty_tree [git mktree << {}]
|
2006-11-18 08:50:58 +01:00
|
|
|
|
}
|
|
|
|
|
return $empty_tree
|
|
|
|
|
}
|
|
|
|
|
|
2007-01-22 23:10:38 +01:00
|
|
|
|
proc rescan {after {honor_trustmtime 1}} {
|
2006-11-21 03:27:22 +01:00
|
|
|
|
global HEAD PARENT MERGE_HEAD commit_type
|
2007-01-21 04:06:51 +01:00
|
|
|
|
global ui_index ui_workdir ui_status_value ui_comm
|
2006-11-14 07:29:32 +01:00
|
|
|
|
global rescan_active file_states
|
2007-02-09 00:03:41 +01:00
|
|
|
|
global repo_config
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2006-11-14 07:29:32 +01:00
|
|
|
|
if {$rescan_active > 0 || ![lock_index read]} return
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2006-11-21 03:27:22 +01:00
|
|
|
|
repository_state newType newHEAD newMERGE_HEAD
|
2006-11-18 08:50:58 +01:00
|
|
|
|
if {[string match amend* $commit_type]
|
2006-11-21 03:27:22 +01:00
|
|
|
|
&& $newType eq {normal}
|
|
|
|
|
&& $newHEAD eq $HEAD} {
|
2006-11-07 03:34:10 +01:00
|
|
|
|
} else {
|
2006-11-21 03:27:22 +01:00
|
|
|
|
set HEAD $newHEAD
|
|
|
|
|
set PARENT $newHEAD
|
|
|
|
|
set MERGE_HEAD $newMERGE_HEAD
|
|
|
|
|
set commit_type $newType
|
2006-11-07 03:34:10 +01:00
|
|
|
|
}
|
|
|
|
|
|
2006-11-06 20:20:27 +01:00
|
|
|
|
array unset file_states
|
|
|
|
|
|
2006-11-06 22:07:32 +01:00
|
|
|
|
if {![$ui_comm edit modified]
|
2006-11-13 00:16:45 +01:00
|
|
|
|
|| [string trim [$ui_comm get 0.0 end]] eq {}} {
|
2007-06-12 01:39:55 +02:00
|
|
|
|
if {[string match amend* $commit_type]} {
|
|
|
|
|
} elseif {[load_message GITGUI_MSG]} {
|
2006-11-06 22:07:32 +01:00
|
|
|
|
} elseif {[load_message MERGE_MSG]} {
|
|
|
|
|
} elseif {[load_message SQUASH_MSG]} {
|
|
|
|
|
}
|
2006-11-11 22:16:25 +01:00
|
|
|
|
$ui_comm edit reset
|
2006-11-21 03:59:19 +01:00
|
|
|
|
$ui_comm edit modified false
|
2006-11-06 22:07:32 +01:00
|
|
|
|
}
|
|
|
|
|
|
2007-02-09 00:10:05 +01:00
|
|
|
|
if {[is_enabled branch]} {
|
2007-02-08 21:59:39 +01:00
|
|
|
|
load_all_heads
|
|
|
|
|
populate_branch_menu
|
|
|
|
|
}
|
|
|
|
|
|
2007-01-22 23:10:38 +01:00
|
|
|
|
if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} {
|
2006-11-14 07:29:32 +01:00
|
|
|
|
rescan_stage2 {} $after
|
2006-11-08 03:27:29 +01:00
|
|
|
|
} else {
|
2006-11-14 07:29:32 +01:00
|
|
|
|
set rescan_active 1
|
2006-11-08 03:27:29 +01:00
|
|
|
|
set ui_status_value {Refreshing file status...}
|
2006-11-12 03:52:06 +01:00
|
|
|
|
set cmd [list git update-index]
|
|
|
|
|
lappend cmd -q
|
|
|
|
|
lappend cmd --unmerged
|
|
|
|
|
lappend cmd --ignore-missing
|
|
|
|
|
lappend cmd --refresh
|
|
|
|
|
set fd_rf [open "| $cmd" r]
|
2006-11-08 03:27:29 +01:00
|
|
|
|
fconfigure $fd_rf -blocking 0 -translation binary
|
2006-11-12 01:40:33 +01:00
|
|
|
|
fileevent $fd_rf readable \
|
2006-11-14 07:29:32 +01:00
|
|
|
|
[list rescan_stage2 $fd_rf $after]
|
2006-11-08 03:27:29 +01:00
|
|
|
|
}
|
2006-11-06 22:07:32 +01:00
|
|
|
|
}
|
|
|
|
|
|
2006-11-14 07:29:32 +01:00
|
|
|
|
proc rescan_stage2 {fd after} {
|
2007-01-21 03:48:56 +01:00
|
|
|
|
global ui_status_value
|
2006-11-18 08:50:58 +01:00
|
|
|
|
global rescan_active buf_rdi buf_rdf buf_rlo
|
2006-11-06 22:07:32 +01:00
|
|
|
|
|
2006-11-13 00:16:45 +01:00
|
|
|
|
if {$fd ne {}} {
|
2006-11-08 03:27:29 +01:00
|
|
|
|
read $fd
|
|
|
|
|
if {![eof $fd]} return
|
|
|
|
|
close $fd
|
|
|
|
|
}
|
2006-11-06 22:07:32 +01:00
|
|
|
|
|
2006-11-06 20:20:27 +01:00
|
|
|
|
set ls_others [list | git ls-files --others -z \
|
|
|
|
|
--exclude-per-directory=.gitignore]
|
2007-01-21 03:55:05 +01:00
|
|
|
|
set info_exclude [gitdir info exclude]
|
2006-11-06 20:20:27 +01:00
|
|
|
|
if {[file readable $info_exclude]} {
|
|
|
|
|
lappend ls_others "--exclude-from=$info_exclude"
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-08 00:34:09 +01:00
|
|
|
|
set buf_rdi {}
|
|
|
|
|
set buf_rdf {}
|
|
|
|
|
set buf_rlo {}
|
|
|
|
|
|
2006-11-14 07:29:32 +01:00
|
|
|
|
set rescan_active 3
|
2006-11-06 22:07:32 +01:00
|
|
|
|
set ui_status_value {Scanning for modified files ...}
|
2006-11-18 08:50:58 +01:00
|
|
|
|
set fd_di [open "| git diff-index --cached -z [PARENT]" r]
|
2006-11-06 20:20:27 +01:00
|
|
|
|
set fd_df [open "| git diff-files -z" r]
|
|
|
|
|
set fd_lo [open $ls_others r]
|
|
|
|
|
|
2007-01-23 10:07:18 +01:00
|
|
|
|
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
|
2006-11-14 07:29:32 +01:00
|
|
|
|
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]
|
2006-11-06 20:20:27 +01:00
|
|
|
|
}
|
|
|
|
|
|
2006-11-06 22:07:32 +01:00
|
|
|
|
proc load_message {file} {
|
2007-01-21 03:48:56 +01:00
|
|
|
|
global ui_comm
|
2006-11-06 22:07:32 +01:00
|
|
|
|
|
2007-01-21 03:55:05 +01:00
|
|
|
|
set f [gitdir $file]
|
2006-11-07 03:34:10 +01:00
|
|
|
|
if {[file isfile $f]} {
|
2006-11-06 22:07:32 +01:00
|
|
|
|
if {[catch {set fd [open $f r]}]} {
|
|
|
|
|
return 0
|
|
|
|
|
}
|
2006-11-07 03:34:10 +01:00
|
|
|
|
set content [string trim [read $fd]]
|
2006-11-06 22:07:32 +01:00
|
|
|
|
close $fd
|
2007-01-25 18:54:59 +01:00
|
|
|
|
regsub -all -line {[ \r\t]+$} $content {} content
|
2006-11-06 22:07:32 +01:00
|
|
|
|
$ui_comm delete 0.0 end
|
|
|
|
|
$ui_comm insert end $content
|
|
|
|
|
return 1
|
|
|
|
|
}
|
|
|
|
|
return 0
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-14 07:29:32 +01:00
|
|
|
|
proc read_diff_index {fd after} {
|
2006-11-06 20:20:27 +01:00
|
|
|
|
global buf_rdi
|
|
|
|
|
|
|
|
|
|
append buf_rdi [read $fd]
|
2006-11-08 00:34:09 +01:00
|
|
|
|
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
|
2006-11-19 07:00:48 +01:00
|
|
|
|
set i [split [string range $buf_rdi $c [expr {$z1 - 2}]] { }]
|
2007-01-23 10:07:18 +01:00
|
|
|
|
set p [string range $buf_rdi $z1 [expr {$z2 - 1}]]
|
2006-11-19 06:29:55 +01:00
|
|
|
|
merge_state \
|
2007-01-23 10:07:18 +01:00
|
|
|
|
[encoding convertfrom $p] \
|
2006-11-19 07:00:48 +01:00
|
|
|
|
[lindex $i 4]? \
|
|
|
|
|
[list [lindex $i 0] [lindex $i 2]] \
|
2006-11-19 06:29:55 +01:00
|
|
|
|
[list]
|
|
|
|
|
set c $z2
|
2006-11-19 07:00:48 +01:00
|
|
|
|
incr c
|
2006-11-06 20:20:27 +01:00
|
|
|
|
}
|
2006-11-08 00:34:09 +01:00
|
|
|
|
if {$c < $n} {
|
|
|
|
|
set buf_rdi [string range $buf_rdi $c end]
|
|
|
|
|
} else {
|
|
|
|
|
set buf_rdi {}
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-14 07:29:32 +01:00
|
|
|
|
rescan_done $fd buf_rdi $after
|
2006-11-06 20:20:27 +01:00
|
|
|
|
}
|
|
|
|
|
|
2006-11-14 07:29:32 +01:00
|
|
|
|
proc read_diff_files {fd after} {
|
2006-11-06 20:20:27 +01:00
|
|
|
|
global buf_rdf
|
|
|
|
|
|
|
|
|
|
append buf_rdf [read $fd]
|
2006-11-08 00:34:09 +01:00
|
|
|
|
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
|
2006-11-19 07:00:48 +01:00
|
|
|
|
set i [split [string range $buf_rdf $c [expr {$z1 - 2}]] { }]
|
2007-01-23 10:07:18 +01:00
|
|
|
|
set p [string range $buf_rdf $z1 [expr {$z2 - 1}]]
|
2006-11-19 06:29:55 +01:00
|
|
|
|
merge_state \
|
2007-01-23 10:07:18 +01:00
|
|
|
|
[encoding convertfrom $p] \
|
2006-11-19 07:00:48 +01:00
|
|
|
|
?[lindex $i 4] \
|
2006-11-19 06:29:55 +01:00
|
|
|
|
[list] \
|
2006-11-19 07:00:48 +01:00
|
|
|
|
[list [lindex $i 0] [lindex $i 2]]
|
2006-11-19 06:29:55 +01:00
|
|
|
|
set c $z2
|
2006-11-19 07:00:48 +01:00
|
|
|
|
incr c
|
2006-11-08 00:34:09 +01:00
|
|
|
|
}
|
|
|
|
|
if {$c < $n} {
|
|
|
|
|
set buf_rdf [string range $buf_rdf $c end]
|
|
|
|
|
} else {
|
|
|
|
|
set buf_rdf {}
|
2006-11-06 20:20:27 +01:00
|
|
|
|
}
|
2006-11-08 00:34:09 +01:00
|
|
|
|
|
2006-11-14 07:29:32 +01:00
|
|
|
|
rescan_done $fd buf_rdf $after
|
2006-11-06 20:20:27 +01:00
|
|
|
|
}
|
|
|
|
|
|
2006-11-14 07:29:32 +01:00
|
|
|
|
proc read_ls_others {fd after} {
|
2006-11-06 20:20:27 +01:00
|
|
|
|
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] {
|
2007-01-23 10:07:18 +01:00
|
|
|
|
merge_state [encoding convertfrom $p] ?O
|
2006-11-06 20:20:27 +01:00
|
|
|
|
}
|
2006-11-14 07:29:32 +01:00
|
|
|
|
rescan_done $fd buf_rlo $after
|
2006-11-06 20:20:27 +01:00
|
|
|
|
}
|
|
|
|
|
|
2006-11-14 07:29:32 +01:00
|
|
|
|
proc rescan_done {fd buf after} {
|
2007-05-08 05:35:48 +02:00
|
|
|
|
global rescan_active current_diff_path
|
2006-11-13 10:22:42 +01:00
|
|
|
|
global file_states repo_config
|
2006-11-12 00:38:00 +01:00
|
|
|
|
upvar $buf to_clear
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2006-11-13 10:22:42 +01:00
|
|
|
|
if {![eof $fd]} return
|
|
|
|
|
set to_clear {}
|
|
|
|
|
close $fd
|
2006-11-14 07:29:32 +01:00
|
|
|
|
if {[incr rescan_active -1] > 0} return
|
2006-11-08 01:30:54 +01:00
|
|
|
|
|
2006-11-13 22:06:38 +01:00
|
|
|
|
prune_selection
|
2006-11-13 10:22:42 +01:00
|
|
|
|
unlock_index
|
|
|
|
|
display_all_files
|
2007-05-08 05:35:48 +02:00
|
|
|
|
if {$current_diff_path ne {}} reshow_diff
|
2006-11-14 07:29:32 +01:00
|
|
|
|
uplevel #0 $after
|
2006-11-06 20:20:27 +01:00
|
|
|
|
}
|
|
|
|
|
|
2006-11-13 22:06:38 +01:00
|
|
|
|
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)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-06 20:20:27 +01:00
|
|
|
|
######################################################################
|
|
|
|
|
##
|
2007-05-08 05:35:48 +02:00
|
|
|
|
## ui helpers
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
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
|
|
|
|
|
}
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
proc mapdesc {state path} {
|
|
|
|
|
global all_descs
|
2006-11-11 23:52:16 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
if {[catch {set r $all_descs($state)}]} {
|
|
|
|
|
puts "error: no desc for state={$state} $path"
|
|
|
|
|
return $state
|
|
|
|
|
}
|
|
|
|
|
return $r
|
|
|
|
|
}
|
2006-11-11 23:52:16 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
proc escape_path {path} {
|
|
|
|
|
regsub -all {\\} $path "\\\\" path
|
|
|
|
|
regsub -all "\n" $path "\\n" path
|
|
|
|
|
return $path
|
2006-11-06 20:20:27 +01:00
|
|
|
|
}
|
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
proc short_path {path} {
|
|
|
|
|
return [escape_path [lindex [file split $path] end]]
|
2006-11-12 00:38:00 +01:00
|
|
|
|
}
|
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
set next_icon_id 0
|
|
|
|
|
set null_sha1 [string repeat 0 40]
|
2006-11-12 03:52:06 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
proc merge_state {path new_state {head_info {}} {index_info {}}} {
|
|
|
|
|
global file_states next_icon_id null_sha1
|
2006-11-12 03:52:06 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
set s0 [string index $new_state 0]
|
|
|
|
|
set s1 [string index $new_state 1]
|
2006-11-12 03:52:06 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
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]}
|
|
|
|
|
}
|
2006-11-12 03:52:06 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
if {$s0 eq {?}} {set s0 [string index $state 0]} \
|
|
|
|
|
elseif {$s0 eq {_}} {set s0 _}
|
2007-01-23 04:41:13 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
if {$s1 eq {?}} {set s1 [string index $state 1]} \
|
|
|
|
|
elseif {$s1 eq {_}} {set s1 _}
|
2006-11-12 03:52:06 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
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
|
|
|
|
|
}
|
2006-11-12 03:52:06 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
set file_states($path) [list $s0$s1 $icon \
|
|
|
|
|
$head_info $index_info \
|
|
|
|
|
]
|
|
|
|
|
return $state
|
|
|
|
|
}
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
proc display_file_helper {w path icon_name old_m new_m} {
|
|
|
|
|
global file_lists
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
if {$new_m eq {_}} {
|
2007-01-26 04:38:59 +01:00
|
|
|
|
set lno [lsearch -sorted -exact $file_lists($w) $path]
|
2007-01-26 03:33:06 +01:00
|
|
|
|
if {$lno >= 0} {
|
2007-05-08 05:35:48 +02:00
|
|
|
|
set file_lists($w) [lreplace $file_lists($w) $lno $lno]
|
2007-01-26 03:33:06 +01:00
|
|
|
|
incr lno
|
2007-05-08 05:35:48 +02:00
|
|
|
|
$w conf -state normal
|
|
|
|
|
$w delete $lno.0 [expr {$lno + 1}].0
|
|
|
|
|
$w conf -state disabled
|
2006-11-11 23:52:16 +01:00
|
|
|
|
}
|
2007-05-08 05:35:48 +02:00
|
|
|
|
} 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
|
2006-11-11 23:52:16 +01:00
|
|
|
|
}
|
2007-05-08 05:35:48 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
proc display_file {path state} {
|
|
|
|
|
global file_states selected_paths
|
|
|
|
|
global ui_index ui_workdir
|
2006-11-11 23:52:16 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
set old_m [merge_state $path $state]
|
2006-11-06 20:20:27 +01:00
|
|
|
|
set s $file_states($path)
|
2007-05-08 05:35:48 +02:00
|
|
|
|
set new_m [lindex $s 0]
|
|
|
|
|
set icon_name [lindex $s 1]
|
2007-01-21 17:54:16 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
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 _
|
2006-11-06 20:20:27 +01:00
|
|
|
|
}
|
2007-05-08 05:35:48 +02:00
|
|
|
|
display_file_helper $ui_index $path $icon_name $o $n
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
if {[string index $old_m 0] eq {U}} {
|
|
|
|
|
set o U
|
|
|
|
|
} else {
|
|
|
|
|
set o [string index $old_m 1]
|
2007-01-21 17:54:16 +01:00
|
|
|
|
}
|
2007-05-08 05:35:48 +02:00
|
|
|
|
if {[string index $new_m 0] eq {U}} {
|
|
|
|
|
set n U
|
|
|
|
|
} else {
|
|
|
|
|
set n [string index $new_m 1]
|
2007-01-21 17:54:16 +01:00
|
|
|
|
}
|
2007-05-08 05:35:48 +02:00
|
|
|
|
display_file_helper $ui_workdir $path $icon_name $o $n
|
|
|
|
|
|
|
|
|
|
if {$new_m eq {__}} {
|
|
|
|
|
unset file_states($path)
|
|
|
|
|
catch {unset selected_paths($path)}
|
2006-11-06 20:20:27 +01:00
|
|
|
|
}
|
2007-05-08 05:35:48 +02:00
|
|
|
|
}
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
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"
|
2006-11-06 20:20:27 +01:00
|
|
|
|
}
|
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
proc display_all_files {} {
|
|
|
|
|
global ui_index ui_workdir
|
|
|
|
|
global file_states file_lists
|
|
|
|
|
global last_clicked
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
$ui_index conf -state normal
|
|
|
|
|
$ui_workdir conf -state normal
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
$ui_index delete 0.0 end
|
|
|
|
|
$ui_workdir delete 0.0 end
|
|
|
|
|
set last_clicked {}
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
set file_lists($ui_index) [list]
|
|
|
|
|
set file_lists($ui_workdir) [list]
|
2006-11-12 03:52:06 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
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
|
2006-11-12 03:52:06 +01:00
|
|
|
|
}
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
if {[string index $m 0] eq {U}} {
|
|
|
|
|
set s U
|
|
|
|
|
} else {
|
|
|
|
|
set s [string index $m 1]
|
2007-01-25 03:20:57 +01:00
|
|
|
|
}
|
2007-05-08 05:35:48 +02:00
|
|
|
|
if {$s ne {_}} {
|
|
|
|
|
display_all_files_helper $ui_workdir $path \
|
|
|
|
|
$icon_name $s
|
2007-01-25 03:20:57 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
$ui_index conf -state disabled
|
|
|
|
|
$ui_workdir conf -state disabled
|
2007-01-25 03:20:57 +01:00
|
|
|
|
}
|
|
|
|
|
|
2006-11-07 02:50:59 +01:00
|
|
|
|
######################################################################
|
|
|
|
|
##
|
2007-05-08 05:35:48 +02:00
|
|
|
|
## icons
|
2006-11-07 02:50:59 +01:00
|
|
|
|
|
2007-05-08 05:35:48 +02:00
|
|
|
|
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};
|
|
|
|
|
}
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
|
2006-11-06 22:07:32 +01:00
|
|
|
|
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[] = {
|
2006-11-06 20:20:27 +01:00
|
|
|
|
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
|
|
|
|
|
|
2007-01-29 08:50:10 +01:00
|
|
|
|
set file_dir_data {
|
|
|
|
|
#define file_width 18
|
|
|
|
|
#define file_height 18
|
|
|
|
|
static unsigned char file_bits[] = {
|
|
|
|
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x03, 0x00,
|
|
|
|
|
0x0c, 0x03, 0x00, 0x04, 0xfe, 0x00, 0x06, 0x80, 0x00, 0xff, 0x9f, 0x00,
|
|
|
|
|
0x03, 0x98, 0x00, 0x02, 0x90, 0x00, 0x06, 0xb0, 0x00, 0x04, 0xa0, 0x00,
|
|
|
|
|
0x0c, 0xe0, 0x00, 0x08, 0xc0, 0x00, 0xf8, 0xff, 0x00, 0x00, 0x00, 0x00,
|
|
|
|
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
|
|
|
|
|
}
|
|
|
|
|
image create bitmap file_dir -background white -foreground blue \
|
|
|
|
|
-data $file_dir_data -maskdata $file_dir_data
|
|
|
|
|
unset file_dir_data
|
|
|
|
|
|
|
|
|
|
set file_uplevel_data {
|
|
|
|
|
#define up_width 15
|
|
|
|
|
#define up_height 15
|
|
|
|
|
static unsigned char up_bits[] = {
|
|
|
|
|
0x80, 0x00, 0xc0, 0x01, 0xe0, 0x03, 0xf0, 0x07, 0xf8, 0x0f, 0xfc, 0x1f,
|
|
|
|
|
0xfe, 0x3f, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01, 0xc0, 0x01,
|
|
|
|
|
0xc0, 0x01, 0xc0, 0x01, 0x00, 0x00};
|
|
|
|
|
}
|
|
|
|
|
image create bitmap file_uplevel -background white -foreground red \
|
|
|
|
|
-data $file_uplevel_data -maskdata $file_uplevel_data
|
|
|
|
|
unset file_uplevel_data
|
2007-01-29 06:50:41 +01:00
|
|
|
|
|
2006-11-08 01:58:37 +01:00
|
|
|
|
set ui_index .vpane.files.index.list
|
2007-01-21 04:06:51 +01:00
|
|
|
|
set ui_workdir .vpane.files.workdir.list
|
2007-01-21 04:45:19 +01:00
|
|
|
|
|
|
|
|
|
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
|
2007-01-21 18:30:51 +01:00
|
|
|
|
set all_icons(U$ui_workdir) file_merge
|
2007-01-21 04:45:19 +01:00
|
|
|
|
set all_icons(O$ui_workdir) file_plain
|
|
|
|
|
|
2006-11-06 22:07:32 +01:00
|
|
|
|
set max_status_desc 0
|
2006-11-06 20:20:27 +01:00
|
|
|
|
foreach i {
|
2007-01-21 04:45:19 +01:00
|
|
|
|
{__ "Unmodified"}
|
|
|
|
|
|
2007-01-21 05:00:28 +01:00
|
|
|
|
{_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"}
|
2007-01-21 04:45:19 +01:00
|
|
|
|
|
|
|
|
|
{_D "Missing"}
|
2007-01-21 05:00:28 +01:00
|
|
|
|
{D_ "Staged for removal"}
|
|
|
|
|
{DO "Staged for removal, still present"}
|
2007-01-21 04:45:19 +01:00
|
|
|
|
|
2007-01-21 05:00:28 +01:00
|
|
|
|
{U_ "Requires merge resolution"}
|
2007-01-21 18:30:51 +01:00
|
|
|
|
{UU "Requires merge resolution"}
|
2007-01-21 05:00:28 +01:00
|
|
|
|
{UM "Requires merge resolution"}
|
|
|
|
|
{UD "Requires merge resolution"}
|
2006-11-06 20:20:27 +01:00
|
|
|
|
} {
|
2007-01-21 04:45:19 +01:00
|
|
|
|
if {$max_status_desc < [string length [lindex $i 1]]} {
|
|
|
|
|
set max_status_desc [string length [lindex $i 1]]
|
2006-11-06 22:07:32 +01:00
|
|
|
|
}
|
2007-01-21 04:45:19 +01:00
|
|
|
|
set all_descs([lindex $i 0]) [lindex $i 1]
|
2006-11-06 20:20:27 +01:00
|
|
|
|
}
|
2007-01-21 04:45:19 +01:00
|
|
|
|
unset i
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
|
|
|
|
######################################################################
|
|
|
|
|
##
|
|
|
|
|
## util
|
|
|
|
|
|
2006-11-12 08:22:21 +01:00
|
|
|
|
proc bind_button3 {w cmd} {
|
|
|
|
|
bind $w <Any-Button-3> $cmd
|
|
|
|
|
if {[is_MacOSX]} {
|
|
|
|
|
bind $w <Control-Button-1> $cmd
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2007-01-29 06:50:41 +01:00
|
|
|
|
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}
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-12 06:40:38 +01:00
|
|
|
|
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
|
2007-06-02 23:15:56 +02:00
|
|
|
|
font configure ${font}italic -size $sz
|
2006-11-12 06:40:38 +01:00
|
|
|
|
}
|
|
|
|
|
|
2006-11-06 20:20:27 +01:00
|
|
|
|
######################################################################
|
|
|
|
|
##
|
|
|
|
|
## ui commands
|
|
|
|
|
|
2007-01-21 03:56:25 +01:00
|
|
|
|
set starting_gitk_msg {Starting gitk... please wait...}
|
2006-11-07 05:47:05 +01:00
|
|
|
|
|
2006-11-22 02:33:09 +01:00
|
|
|
|
proc do_gitk {revs} {
|
2007-01-29 02:58:47 +01:00
|
|
|
|
global env ui_status_value starting_gitk_msg
|
|
|
|
|
|
|
|
|
|
# -- Always start gitk through whatever we were loaded with. This
|
|
|
|
|
# lets us bypass using shell process on Windows systems.
|
|
|
|
|
#
|
2007-05-02 18:44:44 +02:00
|
|
|
|
set cmd [list [info nameofexecutable]]
|
2007-06-29 13:32:29 +02:00
|
|
|
|
set exe [gitexec gitk]
|
|
|
|
|
lappend cmd $exe
|
2006-11-22 02:33:09 +01:00
|
|
|
|
if {$revs ne {}} {
|
|
|
|
|
append cmd { }
|
|
|
|
|
append cmd $revs
|
2006-11-07 01:12:58 +01:00
|
|
|
|
}
|
2006-11-22 02:33:09 +01:00
|
|
|
|
|
2007-06-29 13:32:29 +02:00
|
|
|
|
if {! [file exists $exe]} {
|
|
|
|
|
error_popup "Unable to start gitk:\n\n$exe does not exist"
|
2006-11-06 20:20:27 +01:00
|
|
|
|
} else {
|
2007-06-29 13:32:29 +02:00
|
|
|
|
eval exec $cmd &
|
2006-11-22 02:33:09 +01:00
|
|
|
|
set ui_status_value $starting_gitk_msg
|
|
|
|
|
after 10000 {
|
|
|
|
|
if {$ui_status_value eq $starting_gitk_msg} {
|
|
|
|
|
set ui_status_value {Ready.}
|
|
|
|
|
}
|
|
|
|
|
}
|
2006-11-06 20:20:27 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-12 08:27:28 +01:00
|
|
|
|
set is_quitting 0
|
2006-11-12 01:32:24 +01:00
|
|
|
|
|
2006-11-06 20:20:27 +01:00
|
|
|
|
proc do_quit {} {
|
2007-01-21 03:48:56 +01:00
|
|
|
|
global ui_comm is_quitting repo_config commit_type
|
2006-11-12 01:32:24 +01:00
|
|
|
|
|
2006-11-12 08:27:28 +01:00
|
|
|
|
if {$is_quitting} return
|
|
|
|
|
set is_quitting 1
|
2006-11-06 22:07:32 +01:00
|
|
|
|
|
2007-02-08 23:47:17 +01:00
|
|
|
|
if {[winfo exists $ui_comm]} {
|
|
|
|
|
# -- Stash our current commit buffer.
|
|
|
|
|
#
|
|
|
|
|
set save [gitdir GITGUI_MSG]
|
|
|
|
|
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}
|
2006-11-06 22:07:32 +01:00
|
|
|
|
}
|
|
|
|
|
|
2007-02-08 23:47:17 +01:00
|
|
|
|
# -- 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} {
|
2007-02-13 04:48:56 +01:00
|
|
|
|
catch {git config gui.geometry $cfg_geometry}
|
2007-02-08 23:47:17 +01:00
|
|
|
|
}
|
2006-11-12 09:47:00 +01:00
|
|
|
|
}
|
|
|
|
|
|
2006-11-06 20:20:27 +01:00
|
|
|
|
destroy .
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
proc do_rescan {} {
|
2006-11-14 07:29:32 +01:00
|
|
|
|
rescan {set ui_status_value {Ready.}}
|
2006-11-06 20:20:27 +01:00
|
|
|
|
}
|
|
|
|
|
|
2006-11-07 02:03:36 +01:00
|
|
|
|
proc do_commit {} {
|
2006-11-07 02:50:59 +01:00
|
|
|
|
commit_tree
|
2006-11-07 02:03:36 +01:00
|
|
|
|
}
|
|
|
|
|
|
2006-11-13 22:06:38 +01:00
|
|
|
|
proc toggle_or_diff {w x y} {
|
2007-01-21 17:37:58 +01:00
|
|
|
|
global file_states file_lists current_diff_path ui_index ui_workdir
|
2006-11-13 22:06:38 +01:00
|
|
|
|
global last_clicked selected_paths
|
2006-11-06 22:07:32 +01:00
|
|
|
|
|
2006-11-06 20:20:27 +01:00
|
|
|
|
set pos [split [$w index @$x,$y] .]
|
|
|
|
|
set lno [lindex $pos 0]
|
|
|
|
|
set col [lindex $pos 1]
|
2006-11-13 22:06:38 +01:00
|
|
|
|
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
|
2007-01-21 04:06:51 +01:00
|
|
|
|
$ui_workdir tag remove in_sel 0.0 end
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2006-11-13 22:06:38 +01:00
|
|
|
|
if {$col == 0} {
|
2007-01-21 17:37:58 +01:00
|
|
|
|
if {$current_diff_path eq $path} {
|
2006-11-18 09:03:16 +01:00
|
|
|
|
set after {reshow_diff;}
|
|
|
|
|
} else {
|
|
|
|
|
set after {}
|
|
|
|
|
}
|
2007-01-21 05:10:30 +01:00
|
|
|
|
if {$w eq $ui_index} {
|
2006-11-19 06:37:49 +01:00
|
|
|
|
update_indexinfo \
|
2007-01-21 05:07:04 +01:00
|
|
|
|
"Unstaging [short_path $path] from commit" \
|
2006-11-19 06:37:49 +01:00
|
|
|
|
[list $path] \
|
|
|
|
|
[concat $after {set ui_status_value {Ready.}}]
|
2007-01-21 05:10:30 +01:00
|
|
|
|
} elseif {$w eq $ui_workdir} {
|
2006-11-19 06:37:49 +01:00
|
|
|
|
update_index \
|
2007-01-21 01:07:46 +01:00
|
|
|
|
"Adding [short_path $path]" \
|
2006-11-19 06:37:49 +01:00
|
|
|
|
[list $path] \
|
|
|
|
|
[concat $after {set ui_status_value {Ready.}}]
|
|
|
|
|
}
|
2006-11-13 22:06:38 +01:00
|
|
|
|
} else {
|
2006-11-11 23:52:16 +01:00
|
|
|
|
show_diff $path $w $lno
|
2006-11-06 20:20:27 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-13 22:06:38 +01:00
|
|
|
|
proc add_one_to_selection {w x y} {
|
2007-01-21 05:46:53 +01:00
|
|
|
|
global file_lists last_clicked selected_paths
|
2006-11-12 00:38:00 +01:00
|
|
|
|
|
2007-01-21 05:46:53 +01:00
|
|
|
|
set lno [lindex [split [$w index @$x,$y] .] 0]
|
2006-11-13 22:06:38 +01:00
|
|
|
|
set path [lindex $file_lists($w) [expr {$lno - 1}]]
|
|
|
|
|
if {$path eq {}} {
|
|
|
|
|
set last_clicked {}
|
|
|
|
|
return
|
|
|
|
|
}
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2007-01-21 05:46:53 +01:00
|
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-13 22:06:38 +01:00
|
|
|
|
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} {
|
2007-01-21 05:46:53 +01:00
|
|
|
|
global file_lists last_clicked selected_paths
|
2006-11-13 22:06:38 +01:00
|
|
|
|
|
|
|
|
|
if {[lindex $last_clicked 0] ne $w} {
|
|
|
|
|
toggle_or_diff $w $x $y
|
|
|
|
|
return
|
2006-11-06 20:20:27 +01:00
|
|
|
|
}
|
2006-11-13 22:06:38 +01:00
|
|
|
|
|
2007-01-21 05:46:53 +01:00
|
|
|
|
set lno [lindex [split [$w index @$x,$y] .] 0]
|
2006-11-13 22:06:38 +01:00
|
|
|
|
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
|
2006-11-06 20:20:27 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
######################################################################
|
|
|
|
|
##
|
2006-11-12 11:27:00 +01:00
|
|
|
|
## config defaults
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2006-11-12 08:30:02 +01:00
|
|
|
|
set cursor_ptr arrow
|
2006-11-12 06:40:38 +01:00
|
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
|
2007-06-02 23:15:56 +02:00
|
|
|
|
font create font_uiitalic
|
2006-11-12 11:27:00 +01:00
|
|
|
|
font create font_uibold
|
|
|
|
|
font create font_diffbold
|
2007-06-02 23:15:56 +02:00
|
|
|
|
font create font_diffitalic
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2007-04-29 05:14:08 +02:00
|
|
|
|
foreach class {Button Checkbutton Entry Label
|
|
|
|
|
Labelframe Listbox Menu Message
|
2007-06-02 23:18:46 +02:00
|
|
|
|
Radiobutton Spinbox Text} {
|
2007-04-29 05:14:08 +02:00
|
|
|
|
option add *$class.font font_ui
|
|
|
|
|
}
|
|
|
|
|
unset class
|
|
|
|
|
|
2007-05-28 17:34:47 +02:00
|
|
|
|
if {[is_Windows] || [is_MacOSX]} {
|
|
|
|
|
option add *Menu.tearOff 0
|
|
|
|
|
}
|
|
|
|
|
|
2007-05-24 08:33:13 +02:00
|
|
|
|
if {[is_MacOSX]} {
|
2006-11-12 08:22:21 +01:00
|
|
|
|
set M1B M1
|
|
|
|
|
set M1T Cmd
|
2006-11-22 02:21:11 +01:00
|
|
|
|
} else {
|
2007-05-24 08:33:13 +02:00
|
|
|
|
set M1B Control
|
|
|
|
|
set M1T Ctrl
|
2006-11-07 01:12:58 +01:00
|
|
|
|
}
|
|
|
|
|
|
2006-11-12 11:27:00 +01:00
|
|
|
|
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
|
2007-06-02 23:15:56 +02:00
|
|
|
|
font configure ${font}italic $cn $cv
|
2006-11-12 11:27:00 +01:00
|
|
|
|
}
|
|
|
|
|
font configure ${font}bold -weight bold
|
2007-06-02 23:15:56 +02:00
|
|
|
|
font configure ${font}italic -slant italic
|
2006-11-12 11:27:00 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2007-05-28 23:58:07 +02:00
|
|
|
|
set default_config(merge.diffstat) true
|
2007-01-27 08:31:01 +01:00
|
|
|
|
set default_config(merge.summary) false
|
2007-01-26 10:43:43 +01:00
|
|
|
|
set default_config(merge.verbosity) 2
|
2007-01-29 08:56:07 +01:00
|
|
|
|
set default_config(user.name) {}
|
|
|
|
|
set default_config(user.email) {}
|
|
|
|
|
|
2007-05-28 17:04:59 +02:00
|
|
|
|
set default_config(gui.pruneduringfetch) false
|
2006-11-12 11:27:00 +01:00
|
|
|
|
set default_config(gui.trustmtime) false
|
2006-11-13 01:20:02 +01:00
|
|
|
|
set default_config(gui.diffcontext) 5
|
2007-01-21 22:28:59 +01:00
|
|
|
|
set default_config(gui.newbranchtemplate) {}
|
2006-11-12 11:27:00 +01:00
|
|
|
|
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}}
|
|
|
|
|
}
|
2006-11-12 22:24:52 +01:00
|
|
|
|
load_config 0
|
2006-11-12 11:27:00 +01:00
|
|
|
|
apply_config
|
|
|
|
|
|
2007-02-09 01:10:52 +01:00
|
|
|
|
######################################################################
|
|
|
|
|
##
|
|
|
|
|
## feature option selection
|
|
|
|
|
|
2007-02-09 01:41:32 +01:00
|
|
|
|
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]
|
|
|
|
|
}
|
|
|
|
|
|
2007-02-09 01:10:52 +01:00
|
|
|
|
enable_option multicommit
|
|
|
|
|
enable_option branch
|
|
|
|
|
enable_option transport
|
|
|
|
|
|
2007-02-09 01:41:32 +01:00
|
|
|
|
switch -- $subcommand {
|
2007-02-16 06:24:03 +01:00
|
|
|
|
browser -
|
2007-02-09 01:41:32 +01:00
|
|
|
|
blame {
|
2007-02-09 01:10:52 +01:00
|
|
|
|
disable_option multicommit
|
|
|
|
|
disable_option branch
|
|
|
|
|
disable_option transport
|
|
|
|
|
}
|
2007-02-09 01:41:32 +01:00
|
|
|
|
citool {
|
|
|
|
|
enable_option singlecommit
|
2007-02-09 01:10:52 +01:00
|
|
|
|
|
|
|
|
|
disable_option multicommit
|
|
|
|
|
disable_option branch
|
|
|
|
|
disable_option transport
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-12 11:27:00 +01:00
|
|
|
|
######################################################################
|
|
|
|
|
##
|
|
|
|
|
## ui construction
|
|
|
|
|
|
2007-02-09 01:10:52 +01:00
|
|
|
|
set ui_comm {}
|
|
|
|
|
|
2006-11-06 20:20:27 +01:00
|
|
|
|
# -- Menu Bar
|
2006-11-18 09:27:23 +01:00
|
|
|
|
#
|
2006-11-12 06:40:38 +01:00
|
|
|
|
menu .mbar -tearoff 0
|
2007-04-29 05:14:08 +02:00
|
|
|
|
.mbar add cascade -label Repository -menu .mbar.repository
|
|
|
|
|
.mbar add cascade -label Edit -menu .mbar.edit
|
2007-02-09 00:10:05 +01:00
|
|
|
|
if {[is_enabled branch]} {
|
2007-04-29 05:14:08 +02:00
|
|
|
|
.mbar add cascade -label Branch -menu .mbar.branch
|
2006-11-24 23:30:12 +01:00
|
|
|
|
}
|
2007-02-09 01:10:52 +01:00
|
|
|
|
if {[is_enabled multicommit] || [is_enabled singlecommit]} {
|
2007-04-29 05:14:08 +02:00
|
|
|
|
.mbar add cascade -label Commit -menu .mbar.commit
|
2007-02-09 01:10:52 +01:00
|
|
|
|
}
|
2007-02-09 00:10:05 +01:00
|
|
|
|
if {[is_enabled transport]} {
|
2007-04-29 05:14:08 +02:00
|
|
|
|
.mbar add cascade -label Merge -menu .mbar.merge
|
|
|
|
|
.mbar add cascade -label Fetch -menu .mbar.fetch
|
|
|
|
|
.mbar add cascade -label Push -menu .mbar.push
|
2006-11-12 22:20:36 +01:00
|
|
|
|
}
|
2006-11-06 20:20:27 +01:00
|
|
|
|
. configure -menu .mbar
|
|
|
|
|
|
2006-11-21 05:01:47 +01:00
|
|
|
|
# -- Repository Menu
|
2006-11-18 09:27:23 +01:00
|
|
|
|
#
|
2006-11-21 05:01:47 +01:00
|
|
|
|
menu .mbar.repository
|
2007-01-29 06:50:41 +01:00
|
|
|
|
|
|
|
|
|
.mbar.repository add command \
|
|
|
|
|
-label {Browse Current Branch} \
|
2007-05-09 02:33:47 +02:00
|
|
|
|
-command {browser::new $current_branch}
|
2007-02-09 01:10:52 +01:00
|
|
|
|
trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Browse \$current_branch\" ;#"
|
2007-01-29 06:50:41 +01:00
|
|
|
|
.mbar.repository add separator
|
|
|
|
|
|
2006-11-22 02:33:09 +01:00
|
|
|
|
.mbar.repository add command \
|
|
|
|
|
-label {Visualize Current Branch} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-command {do_gitk $current_branch}
|
2007-02-09 01:10:52 +01:00
|
|
|
|
trace add variable current_branch write ".mbar.repository entryconf [.mbar.repository index last] -label \"Visualize \$current_branch\" ;#"
|
2007-01-25 19:01:16 +01:00
|
|
|
|
.mbar.repository add command \
|
|
|
|
|
-label {Visualize All Branches} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-command {do_gitk --all}
|
2006-11-22 02:33:09 +01:00
|
|
|
|
.mbar.repository add separator
|
2006-11-21 04:22:10 +01:00
|
|
|
|
|
2007-02-09 00:03:41 +01:00
|
|
|
|
if {[is_enabled multicommit]} {
|
2007-01-24 21:21:01 +01:00
|
|
|
|
.mbar.repository add command -label {Database Statistics} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-command do_stats
|
2007-01-24 21:21:01 +01:00
|
|
|
|
|
2007-01-21 00:38:12 +01:00
|
|
|
|
.mbar.repository add command -label {Compress Database} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-command do_gc
|
2006-11-16 04:35:26 +01:00
|
|
|
|
|
2006-11-21 05:01:47 +01:00
|
|
|
|
.mbar.repository add command -label {Verify Database} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-command do_fsck_objects
|
2006-11-21 03:43:41 +01:00
|
|
|
|
|
2006-11-21 05:01:47 +01:00
|
|
|
|
.mbar.repository add separator
|
2006-11-21 04:22:10 +01:00
|
|
|
|
|
2007-01-29 02:58:47 +01:00
|
|
|
|
if {[is_Cygwin]} {
|
|
|
|
|
.mbar.repository add command \
|
|
|
|
|
-label {Create Desktop Icon} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-command do_cygwin_shortcut
|
2007-01-29 02:58:47 +01:00
|
|
|
|
} elseif {[is_Windows]} {
|
2006-11-21 05:01:47 +01:00
|
|
|
|
.mbar.repository add command \
|
2006-11-16 04:35:26 +01:00
|
|
|
|
-label {Create Desktop Icon} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-command do_windows_shortcut
|
2006-11-18 06:31:00 +01:00
|
|
|
|
} elseif {[is_MacOSX]} {
|
2006-11-21 05:01:47 +01:00
|
|
|
|
.mbar.repository add command \
|
2006-11-18 06:31:00 +01:00
|
|
|
|
-label {Create Desktop Icon} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-command do_macosx_app
|
2006-11-16 04:35:26 +01:00
|
|
|
|
}
|
2006-11-12 22:20:36 +01:00
|
|
|
|
}
|
2006-11-25 09:38:39 +01:00
|
|
|
|
|
2006-11-21 05:01:47 +01:00
|
|
|
|
.mbar.repository add command -label Quit \
|
2006-11-06 20:20:27 +01:00
|
|
|
|
-command do_quit \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-accelerator $M1T-Q
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2006-11-11 21:51:41 +01:00
|
|
|
|
# -- Edit Menu
|
|
|
|
|
#
|
|
|
|
|
menu .mbar.edit
|
|
|
|
|
.mbar.edit add command -label Undo \
|
|
|
|
|
-command {catch {[focus] edit undo}} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-accelerator $M1T-Z
|
2006-11-11 21:51:41 +01:00
|
|
|
|
.mbar.edit add command -label Redo \
|
|
|
|
|
-command {catch {[focus] edit redo}} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-accelerator $M1T-Y
|
2006-11-11 21:51:41 +01:00
|
|
|
|
.mbar.edit add separator
|
|
|
|
|
.mbar.edit add command -label Cut \
|
|
|
|
|
-command {catch {tk_textCut [focus]}} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-accelerator $M1T-X
|
2006-11-11 21:51:41 +01:00
|
|
|
|
.mbar.edit add command -label Copy \
|
|
|
|
|
-command {catch {tk_textCopy [focus]}} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-accelerator $M1T-C
|
2006-11-11 21:51:41 +01:00
|
|
|
|
.mbar.edit add command -label Paste \
|
|
|
|
|
-command {catch {tk_textPaste [focus]; [focus] see insert}} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-accelerator $M1T-V
|
2006-11-11 21:51:41 +01:00
|
|
|
|
.mbar.edit add command -label Delete \
|
|
|
|
|
-command {catch {[focus] delete sel.first sel.last}} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-accelerator Del
|
2006-11-11 21:51:41 +01:00
|
|
|
|
.mbar.edit add separator
|
|
|
|
|
.mbar.edit add command -label {Select All} \
|
|
|
|
|
-command {catch {[focus] tag add sel 0.0 end}} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-accelerator $M1T-A
|
2006-11-11 21:51:41 +01:00
|
|
|
|
|
2006-11-25 09:38:39 +01:00
|
|
|
|
# -- Branch Menu
|
|
|
|
|
#
|
2007-02-09 00:10:05 +01:00
|
|
|
|
if {[is_enabled branch]} {
|
2006-11-24 23:30:12 +01:00
|
|
|
|
menu .mbar.branch
|
|
|
|
|
|
|
|
|
|
.mbar.branch add command -label {Create...} \
|
|
|
|
|
-command do_create_branch \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-accelerator $M1T-N
|
2006-11-24 23:30:12 +01:00
|
|
|
|
lappend disable_on_lock [list .mbar.branch entryconf \
|
|
|
|
|
[.mbar.branch index last] -state]
|
|
|
|
|
|
2007-05-28 18:52:57 +02:00
|
|
|
|
.mbar.branch add command -label {Rename...} \
|
|
|
|
|
-command branch_rename::dialog
|
|
|
|
|
lappend disable_on_lock [list .mbar.branch entryconf \
|
|
|
|
|
[.mbar.branch index last] -state]
|
|
|
|
|
|
2006-11-24 23:30:12 +01:00
|
|
|
|
.mbar.branch add command -label {Delete...} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-command do_delete_branch
|
2006-11-24 23:30:12 +01:00
|
|
|
|
lappend disable_on_lock [list .mbar.branch entryconf \
|
|
|
|
|
[.mbar.branch index last] -state]
|
2007-02-26 17:22:10 +01:00
|
|
|
|
|
|
|
|
|
.mbar.branch add command -label {Reset...} \
|
2007-05-02 19:56:27 +02:00
|
|
|
|
-command merge::reset_hard
|
2007-02-26 17:22:10 +01:00
|
|
|
|
lappend disable_on_lock [list .mbar.branch entryconf \
|
|
|
|
|
[.mbar.branch index last] -state]
|
2006-11-24 23:30:12 +01:00
|
|
|
|
}
|
|
|
|
|
|
2006-11-06 20:20:27 +01:00
|
|
|
|
# -- Commit Menu
|
2006-11-18 09:27:23 +01:00
|
|
|
|
#
|
2007-02-09 01:10:52 +01:00
|
|
|
|
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 \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-value new
|
2007-02-09 01:10:52 +01:00
|
|
|
|
lappend disable_on_lock \
|
|
|
|
|
[list .mbar.commit entryconf [.mbar.commit index last] -state]
|
2006-11-19 02:59:49 +01:00
|
|
|
|
|
2007-02-09 01:10:52 +01:00
|
|
|
|
.mbar.commit add radiobutton \
|
|
|
|
|
-label {Amend Last Commit} \
|
|
|
|
|
-command do_select_commit_type \
|
|
|
|
|
-variable selected_commit_type \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-value amend
|
2007-02-09 01:10:52 +01:00
|
|
|
|
lappend disable_on_lock \
|
|
|
|
|
[list .mbar.commit entryconf [.mbar.commit index last] -state]
|
2006-11-19 02:59:49 +01:00
|
|
|
|
|
2007-02-09 01:10:52 +01:00
|
|
|
|
.mbar.commit add separator
|
2006-11-19 02:59:49 +01:00
|
|
|
|
|
2007-02-09 01:10:52 +01:00
|
|
|
|
.mbar.commit add command -label Rescan \
|
|
|
|
|
-command do_rescan \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-accelerator F5
|
2007-02-09 01:10:52 +01:00
|
|
|
|
lappend disable_on_lock \
|
|
|
|
|
[list .mbar.commit entryconf [.mbar.commit index last] -state]
|
2006-11-19 02:59:49 +01:00
|
|
|
|
|
2007-02-09 01:10:52 +01:00
|
|
|
|
.mbar.commit add command -label {Add To Commit} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-command do_add_selection
|
2007-02-09 01:10:52 +01:00
|
|
|
|
lappend disable_on_lock \
|
|
|
|
|
[list .mbar.commit entryconf [.mbar.commit index last] -state]
|
2006-11-19 02:59:49 +01:00
|
|
|
|
|
2007-02-09 01:44:49 +01:00
|
|
|
|
.mbar.commit add command -label {Add Existing To Commit} \
|
2007-02-09 01:10:52 +01:00
|
|
|
|
-command do_add_all \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-accelerator $M1T-I
|
2007-02-09 01:10:52 +01:00
|
|
|
|
lappend disable_on_lock \
|
|
|
|
|
[list .mbar.commit entryconf [.mbar.commit index last] -state]
|
2006-11-19 02:59:49 +01:00
|
|
|
|
|
2007-02-09 01:10:52 +01:00
|
|
|
|
.mbar.commit add command -label {Unstage From Commit} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-command do_unstage_selection
|
2007-02-09 01:10:52 +01:00
|
|
|
|
lappend disable_on_lock \
|
|
|
|
|
[list .mbar.commit entryconf [.mbar.commit index last] -state]
|
2006-11-24 03:40:45 +01:00
|
|
|
|
|
2007-02-09 01:10:52 +01:00
|
|
|
|
.mbar.commit add command -label {Revert Changes} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-command do_revert_selection
|
2007-02-09 01:10:52 +01:00
|
|
|
|
lappend disable_on_lock \
|
|
|
|
|
[list .mbar.commit entryconf [.mbar.commit index last] -state]
|
2006-11-24 03:40:45 +01:00
|
|
|
|
|
2007-02-09 01:10:52 +01:00
|
|
|
|
.mbar.commit add separator
|
2006-11-19 06:29:55 +01:00
|
|
|
|
|
2007-02-09 01:10:52 +01:00
|
|
|
|
.mbar.commit add command -label {Sign Off} \
|
|
|
|
|
-command do_signoff \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-accelerator $M1T-S
|
2006-11-19 02:59:49 +01:00
|
|
|
|
|
2007-02-09 01:10:52 +01:00
|
|
|
|
.mbar.commit add command -label Commit \
|
|
|
|
|
-command do_commit \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-accelerator $M1T-Return
|
2007-02-09 01:10:52 +01:00
|
|
|
|
lappend disable_on_lock \
|
|
|
|
|
[list .mbar.commit entryconf [.mbar.commit index last] -state]
|
|
|
|
|
}
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2007-02-26 17:17:11 +01:00
|
|
|
|
# -- Merge Menu
|
|
|
|
|
#
|
|
|
|
|
if {[is_enabled branch]} {
|
|
|
|
|
menu .mbar.merge
|
|
|
|
|
.mbar.merge add command -label {Local Merge...} \
|
2007-05-02 19:56:27 +02:00
|
|
|
|
-command merge::dialog
|
2007-02-26 17:17:11 +01:00
|
|
|
|
lappend disable_on_lock \
|
|
|
|
|
[list .mbar.merge entryconf [.mbar.merge index last] -state]
|
|
|
|
|
.mbar.merge add command -label {Abort Merge...} \
|
2007-05-02 19:56:27 +02:00
|
|
|
|
-command merge::reset_hard
|
2007-02-26 17:17:11 +01:00
|
|
|
|
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...} \
|
2007-07-06 04:15:00 +02:00
|
|
|
|
-command do_push_anywhere \
|
|
|
|
|
-accelerator $M1T-P
|
git-gui: Allow users to delete remote branches
Git has supported remote branch deletion for quite some time, but
I've just never gotten around to supporting it in git-gui. Some
workflows have users push short-term branches to some remote Git
repository, then delete them a few days/weeks later when that topic
has been fully merged into the main trunk. Typically in that style
of workflow the user will want to remove the branches they created.
We now offer a "Delete..." option in the Push menu, right below the
generic "Push..." option. When the user opens our generic delete
dialog they can select a preconfigured remote, or enter a random
URL. We run `git ls-remote $url` to obtain the list of branches and
tags known there, and offer this list in a listbox for the user to
select one or more from.
Like our local branch delete dialog we offer the user a way to filter
their selected branch list down to only those branches that have been
merged into another branch. This is a very common operation as the
user will likely want to select a range of topic branches, but only
delete them if they have been merged into some sort of common trunk.
Unfortunately our remote merge base detection is not nearly as strict
as the local branch version. We only offer remote heads as the test
commit (not any local ones) and we require that all necessary commits
to successfully run git-merge-base are available locally. If one or
more is missing we suggest that the user run a fetch first.
Since the Git remote protocol doesn't let us specify what the tested
commit was when we evaluated our decision to execute the remote delete
there is a race condition here. The user could do a merge test against
the trunk, determine a topic branch was fully merged, but before they
can start pushing the delete request another user could fast-forward
the remote topic branch to a new commit that is not merged into the
trunk. The delete will arrive after, and remove the topic, even though
it was not fully merged.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
2007-05-28 21:23:32 +02:00
|
|
|
|
.mbar.push add command -label {Delete...} \
|
|
|
|
|
-command remote_branch_delete::dialog
|
2007-02-26 17:17:11 +01:00
|
|
|
|
}
|
|
|
|
|
|
2006-11-21 08:33:56 +01:00
|
|
|
|
if {[is_MacOSX]} {
|
|
|
|
|
# -- Apple Menu (Mac OS X only)
|
|
|
|
|
#
|
|
|
|
|
.mbar add cascade -label Apple -menu .mbar.apple
|
|
|
|
|
menu .mbar.apple
|
|
|
|
|
|
2007-01-21 03:48:56 +01:00
|
|
|
|
.mbar.apple add command -label "About [appname]" \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-command do_about
|
2007-02-14 06:10:20 +01:00
|
|
|
|
.mbar.apple add command -label "Options..." \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-command do_options
|
2006-11-21 08:33:56 +01:00
|
|
|
|
} else {
|
|
|
|
|
# -- Edit Menu
|
|
|
|
|
#
|
|
|
|
|
.mbar.edit add separator
|
|
|
|
|
.mbar.edit add command -label {Options...} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-command do_options
|
2006-11-21 08:33:56 +01:00
|
|
|
|
|
2006-12-08 04:07:38 +01:00
|
|
|
|
# -- Tools Menu
|
|
|
|
|
#
|
2007-06-26 21:27:35 +02:00
|
|
|
|
if {[is_Cygwin] && [file exists /usr/local/miga/lib/gui-miga]} {
|
2006-12-08 04:07:38 +01:00
|
|
|
|
proc do_miga {} {
|
2007-01-21 03:48:56 +01:00
|
|
|
|
global ui_status_value
|
2006-12-08 04:07:38 +01:00
|
|
|
|
if {![lock_index update]} return
|
|
|
|
|
set cmd [list sh --login -c "/usr/local/miga/lib/gui-miga \"[pwd]\""]
|
|
|
|
|
set miga_fd [open "|$cmd" r]
|
|
|
|
|
fconfigure $miga_fd -blocking 0
|
|
|
|
|
fileevent $miga_fd readable [list miga_done $miga_fd]
|
|
|
|
|
set ui_status_value {Running miga...}
|
|
|
|
|
}
|
|
|
|
|
proc miga_done {fd} {
|
|
|
|
|
read $fd 512
|
|
|
|
|
if {[eof $fd]} {
|
|
|
|
|
close $fd
|
|
|
|
|
unlock_index
|
|
|
|
|
rescan [list set ui_status_value {Ready.}]
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
.mbar add cascade -label Tools -menu .mbar.tools
|
|
|
|
|
menu .mbar.tools
|
|
|
|
|
.mbar.tools add command -label "Migrate" \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-command do_miga
|
2006-12-08 04:07:38 +01:00
|
|
|
|
lappend disable_on_lock \
|
|
|
|
|
[list .mbar.tools entryconf [.mbar.tools index last] -state]
|
|
|
|
|
}
|
2007-01-29 02:00:36 +01:00
|
|
|
|
}
|
2006-12-08 04:07:38 +01:00
|
|
|
|
|
2007-01-29 02:00:36 +01:00
|
|
|
|
# -- Help Menu
|
|
|
|
|
#
|
2007-04-29 05:14:08 +02:00
|
|
|
|
.mbar add cascade -label Help -menu .mbar.help
|
2007-01-29 02:00:36 +01:00
|
|
|
|
menu .mbar.help
|
2006-11-21 08:33:56 +01:00
|
|
|
|
|
2007-01-29 02:00:36 +01:00
|
|
|
|
if {![is_MacOSX]} {
|
2007-01-21 03:48:56 +01:00
|
|
|
|
.mbar.help add command -label "About [appname]" \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-command do_about
|
2006-11-21 08:33:56 +01:00
|
|
|
|
}
|
2006-11-21 05:55:51 +01:00
|
|
|
|
|
2007-01-29 02:00:36 +01:00
|
|
|
|
set browser {}
|
|
|
|
|
catch {set browser $repo_config(instaweb.browser)}
|
2007-01-29 02:58:47 +01:00
|
|
|
|
set doc_path [file dirname [gitexec]]
|
2007-01-29 02:00:36 +01:00
|
|
|
|
set doc_path [file join $doc_path Documentation index.html]
|
|
|
|
|
|
2007-01-29 02:58:47 +01:00
|
|
|
|
if {[is_Cygwin]} {
|
2007-02-19 01:06:09 +01:00
|
|
|
|
set doc_path [exec cygpath --mixed $doc_path]
|
2007-01-29 02:00:36 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if {$browser eq {}} {
|
|
|
|
|
if {[is_MacOSX]} {
|
|
|
|
|
set browser open
|
2007-01-29 02:58:47 +01:00
|
|
|
|
} elseif {[is_Cygwin]} {
|
2007-01-29 02:00:36 +01:00
|
|
|
|
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} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-command [list exec $browser $doc_url &]
|
2007-01-29 02:00:36 +01:00
|
|
|
|
}
|
|
|
|
|
unset browser doc_path doc_url
|
2006-11-21 05:55:51 +01:00
|
|
|
|
|
2007-02-09 01:10:52 +01:00
|
|
|
|
# -- Standard bindings
|
|
|
|
|
#
|
2007-06-12 05:52:43 +02:00
|
|
|
|
wm protocol . WM_DELETE_WINDOW do_quit
|
2007-02-09 01:10:52 +01:00
|
|
|
|
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]}
|
|
|
|
|
|
2007-05-09 04:36:01 +02:00
|
|
|
|
set subcommand_args {}
|
|
|
|
|
proc usage {} {
|
|
|
|
|
puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
|
|
|
|
|
exit 1
|
|
|
|
|
}
|
|
|
|
|
|
2007-02-09 01:10:52 +01:00
|
|
|
|
# -- Not a normal commit type invocation? Do that instead!
|
|
|
|
|
#
|
2007-02-09 01:41:32 +01:00
|
|
|
|
switch -- $subcommand {
|
2007-02-16 06:24:03 +01:00
|
|
|
|
browser {
|
2007-05-09 04:36:01 +02:00
|
|
|
|
set subcommand_args {rev?}
|
|
|
|
|
switch [llength $argv] {
|
2007-05-31 02:39:46 +02:00
|
|
|
|
0 { set current_branch [current-branch] }
|
|
|
|
|
1 { set current_branch [lindex $argv 0] }
|
2007-05-09 04:36:01 +02:00
|
|
|
|
default usage
|
2007-02-16 06:24:03 +01:00
|
|
|
|
}
|
2007-05-09 02:33:47 +02:00
|
|
|
|
browser::new $current_branch
|
2007-02-16 06:24:03 +01:00
|
|
|
|
return
|
|
|
|
|
}
|
2007-02-09 01:10:52 +01:00
|
|
|
|
blame {
|
2007-05-09 04:36:01 +02:00
|
|
|
|
set subcommand_args {rev? path?}
|
2007-05-09 04:48:47 +02:00
|
|
|
|
set head {}
|
2007-05-09 04:36:01 +02:00
|
|
|
|
set path {}
|
|
|
|
|
set is_path 0
|
|
|
|
|
foreach a $argv {
|
|
|
|
|
if {$is_path || [file exists $_prefix$a]} {
|
|
|
|
|
if {$path ne {}} usage
|
2007-05-10 00:35:04 +02:00
|
|
|
|
set path $_prefix$a
|
2007-05-09 04:36:01 +02:00
|
|
|
|
break
|
|
|
|
|
} elseif {$a eq {--}} {
|
|
|
|
|
if {$path ne {}} {
|
2007-05-09 04:48:47 +02:00
|
|
|
|
if {$head ne {}} usage
|
|
|
|
|
set head $path
|
2007-05-09 04:36:01 +02:00
|
|
|
|
set path {}
|
|
|
|
|
}
|
|
|
|
|
set is_path 1
|
2007-05-09 04:48:47 +02:00
|
|
|
|
} elseif {$head eq {}} {
|
|
|
|
|
if {$head ne {}} usage
|
|
|
|
|
set head $a
|
2007-05-09 04:36:01 +02:00
|
|
|
|
} else {
|
|
|
|
|
usage
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
unset is_path
|
|
|
|
|
|
2007-05-09 04:48:47 +02:00
|
|
|
|
if {$head eq {}} {
|
2007-05-31 02:39:46 +02:00
|
|
|
|
set current_branch [current-branch]
|
2007-05-09 04:48:47 +02:00
|
|
|
|
} else {
|
|
|
|
|
set current_branch $head
|
2007-02-09 01:10:52 +01:00
|
|
|
|
}
|
2007-05-09 04:48:47 +02:00
|
|
|
|
|
|
|
|
|
if {$path eq {}} usage
|
|
|
|
|
blame::new $head $path
|
2007-02-09 01:41:32 +01:00
|
|
|
|
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
|
2007-02-09 01:10:52 +01:00
|
|
|
|
}
|
|
|
|
|
default {
|
2007-02-21 07:24:57 +01:00
|
|
|
|
puts stderr "usage: $argv0 \[{blame|browser|citool}\]"
|
2007-02-09 01:10:52 +01:00
|
|
|
|
exit 1
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-24 21:38:18 +01:00
|
|
|
|
# -- Branch Control
|
|
|
|
|
#
|
|
|
|
|
frame .branch \
|
|
|
|
|
-borderwidth 1 \
|
|
|
|
|
-relief sunken
|
|
|
|
|
label .branch.l1 \
|
|
|
|
|
-text {Current Branch:} \
|
|
|
|
|
-anchor w \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-justify left
|
2006-11-24 21:38:18 +01:00
|
|
|
|
label .branch.cb \
|
|
|
|
|
-textvariable current_branch \
|
|
|
|
|
-anchor w \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-justify left
|
2006-11-24 21:38:18 +01:00
|
|
|
|
pack .branch.l1 -side left
|
|
|
|
|
pack .branch.cb -side left -fill x
|
|
|
|
|
pack .branch -side top -fill x
|
|
|
|
|
|
2006-11-06 20:20:27 +01:00
|
|
|
|
# -- Main Window Layout
|
2006-11-18 09:27:23 +01:00
|
|
|
|
#
|
2006-11-06 20:20:27 +01:00
|
|
|
|
panedwindow .vpane -orient vertical
|
|
|
|
|
panedwindow .vpane.files -orient horizontal
|
2007-01-21 23:50:42 +01:00
|
|
|
|
.vpane add .vpane.files -sticky nsew -height 100 -width 200
|
2006-11-06 20:20:27 +01:00
|
|
|
|
pack .vpane -anchor n -side top -fill both -expand 1
|
|
|
|
|
|
|
|
|
|
# -- Index File List
|
2006-11-18 09:27:23 +01:00
|
|
|
|
#
|
2007-01-21 23:50:42 +01:00
|
|
|
|
frame .vpane.files.index -height 100 -width 200
|
2007-05-08 13:33:06 +02:00
|
|
|
|
label .vpane.files.index.title -text {Staged Changes (Will Be Committed)} \
|
2007-06-05 23:50:02 +02:00
|
|
|
|
-background lightgreen
|
2006-11-06 20:20:27 +01:00
|
|
|
|
text $ui_index -background white -borderwidth 0 \
|
2007-01-21 23:50:42 +01:00
|
|
|
|
-width 20 -height 10 \
|
2007-01-21 20:58:01 +01:00
|
|
|
|
-wrap none \
|
2006-11-12 02:33:30 +01:00
|
|
|
|
-cursor $cursor_ptr \
|
2007-01-21 20:58:01 +01:00
|
|
|
|
-xscrollcommand {.vpane.files.index.sx set} \
|
|
|
|
|
-yscrollcommand {.vpane.files.index.sy set} \
|
2006-11-06 20:20:27 +01:00
|
|
|
|
-state disabled
|
2007-01-21 20:58:01 +01:00
|
|
|
|
scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
|
|
|
|
|
scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
|
2006-11-06 20:20:27 +01:00
|
|
|
|
pack .vpane.files.index.title -side top -fill x
|
2007-01-21 20:58:01 +01:00
|
|
|
|
pack .vpane.files.index.sx -side bottom -fill x
|
|
|
|
|
pack .vpane.files.index.sy -side right -fill y
|
2006-11-06 20:20:27 +01:00
|
|
|
|
pack $ui_index -side left -fill both -expand 1
|
|
|
|
|
.vpane.files add .vpane.files.index -sticky nsew
|
|
|
|
|
|
2007-01-21 04:06:51 +01:00
|
|
|
|
# -- Working Directory File List
|
2006-11-18 09:27:23 +01:00
|
|
|
|
#
|
2007-01-21 23:50:42 +01:00
|
|
|
|
frame .vpane.files.workdir -height 100 -width 200
|
2007-05-08 13:33:06 +02:00
|
|
|
|
label .vpane.files.workdir.title -text {Unstaged Changes (Will Not Be Committed)} \
|
2007-06-05 23:50:02 +02:00
|
|
|
|
-background lightsalmon
|
2007-01-21 04:06:51 +01:00
|
|
|
|
text $ui_workdir -background white -borderwidth 0 \
|
2007-01-21 23:50:42 +01:00
|
|
|
|
-width 20 -height 10 \
|
2007-01-21 20:58:01 +01:00
|
|
|
|
-wrap none \
|
2006-11-12 02:33:30 +01:00
|
|
|
|
-cursor $cursor_ptr \
|
2007-01-21 20:58:01 +01:00
|
|
|
|
-xscrollcommand {.vpane.files.workdir.sx set} \
|
|
|
|
|
-yscrollcommand {.vpane.files.workdir.sy set} \
|
2006-11-06 20:20:27 +01:00
|
|
|
|
-state disabled
|
2007-01-21 20:58:01 +01:00
|
|
|
|
scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
|
|
|
|
|
scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
|
2007-01-21 04:06:51 +01:00
|
|
|
|
pack .vpane.files.workdir.title -side top -fill x
|
2007-01-21 20:58:01 +01:00
|
|
|
|
pack .vpane.files.workdir.sx -side bottom -fill x
|
|
|
|
|
pack .vpane.files.workdir.sy -side right -fill y
|
2007-01-21 04:06:51 +01:00
|
|
|
|
pack $ui_workdir -side left -fill both -expand 1
|
|
|
|
|
.vpane.files add .vpane.files.workdir -sticky nsew
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2007-01-21 04:06:51 +01:00
|
|
|
|
foreach i [list $ui_index $ui_workdir] {
|
2007-06-05 23:50:02 +02:00
|
|
|
|
$i tag conf in_diff -background lightgray
|
|
|
|
|
$i tag conf in_sel -background lightgray
|
2006-11-13 22:06:38 +01:00
|
|
|
|
}
|
|
|
|
|
unset i
|
2006-11-06 22:07:32 +01:00
|
|
|
|
|
2006-11-08 02:27:46 +01:00
|
|
|
|
# -- Diff and Commit Area
|
2006-11-18 09:27:23 +01:00
|
|
|
|
#
|
2006-11-12 12:53:56 +01:00
|
|
|
|
frame .vpane.lower -height 300 -width 400
|
2006-11-08 02:27:46 +01:00
|
|
|
|
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
|
2007-01-24 21:21:01 +01:00
|
|
|
|
.vpane add .vpane.lower -sticky nsew
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
|
|
|
|
# -- Commit Area Buttons
|
2006-11-18 09:27:23 +01:00
|
|
|
|
#
|
2006-11-08 02:27:46 +01:00
|
|
|
|
frame .vpane.lower.commarea.buttons
|
|
|
|
|
label .vpane.lower.commarea.buttons.l -text {} \
|
2006-11-06 20:20:27 +01:00
|
|
|
|
-anchor w \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-justify left
|
2006-11-08 02:27:46 +01:00
|
|
|
|
pack .vpane.lower.commarea.buttons.l -side top -fill x
|
|
|
|
|
pack .vpane.lower.commarea.buttons -side left -fill y
|
2006-11-06 22:07:32 +01:00
|
|
|
|
|
2006-11-08 02:27:46 +01:00
|
|
|
|
button .vpane.lower.commarea.buttons.rescan -text {Rescan} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-command do_rescan
|
2006-11-08 02:27:46 +01:00
|
|
|
|
pack .vpane.lower.commarea.buttons.rescan -side top -fill x
|
2006-11-12 01:40:33 +01:00
|
|
|
|
lappend disable_on_lock \
|
|
|
|
|
{.vpane.lower.commarea.buttons.rescan conf -state}
|
2006-11-06 22:07:32 +01:00
|
|
|
|
|
2007-02-09 01:44:49 +01:00
|
|
|
|
button .vpane.lower.commarea.buttons.incall -text {Add Existing} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-command do_add_all
|
2006-11-09 04:48:34 +01:00
|
|
|
|
pack .vpane.lower.commarea.buttons.incall -side top -fill x
|
2006-11-12 01:40:33 +01:00
|
|
|
|
lappend disable_on_lock \
|
|
|
|
|
{.vpane.lower.commarea.buttons.incall conf -state}
|
2006-11-06 22:07:32 +01:00
|
|
|
|
|
2006-11-08 02:27:46 +01:00
|
|
|
|
button .vpane.lower.commarea.buttons.signoff -text {Sign Off} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-command do_signoff
|
2006-11-08 02:27:46 +01:00
|
|
|
|
pack .vpane.lower.commarea.buttons.signoff -side top -fill x
|
2006-11-06 22:07:32 +01:00
|
|
|
|
|
2006-11-08 02:27:46 +01:00
|
|
|
|
button .vpane.lower.commarea.buttons.commit -text {Commit} \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-command do_commit
|
2006-11-08 02:27:46 +01:00
|
|
|
|
pack .vpane.lower.commarea.buttons.commit -side top -fill x
|
2006-11-12 01:40:33 +01:00
|
|
|
|
lappend disable_on_lock \
|
|
|
|
|
{.vpane.lower.commarea.buttons.commit conf -state}
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2007-07-06 04:19:33 +02:00
|
|
|
|
button .vpane.lower.commarea.buttons.push -text {Push} \
|
|
|
|
|
-command do_push_anywhere
|
|
|
|
|
pack .vpane.lower.commarea.buttons.push -side top -fill x
|
|
|
|
|
|
2006-11-06 20:20:27 +01:00
|
|
|
|
# -- Commit Message Buffer
|
2006-11-18 09:27:23 +01:00
|
|
|
|
#
|
2006-11-08 02:27:46 +01:00
|
|
|
|
frame .vpane.lower.commarea.buffer
|
2006-11-19 02:59:49 +01:00
|
|
|
|
frame .vpane.lower.commarea.buffer.header
|
2006-11-08 02:27:46 +01:00
|
|
|
|
set ui_comm .vpane.lower.commarea.buffer.t
|
2006-11-19 02:59:49 +01:00
|
|
|
|
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 \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-value new
|
2006-11-19 02:59:49 +01:00
|
|
|
|
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 \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-value amend
|
2006-11-19 02:59:49 +01:00
|
|
|
|
lappend disable_on_lock \
|
|
|
|
|
[list .vpane.lower.commarea.buffer.header.amend conf -state]
|
2006-11-18 09:27:23 +01:00
|
|
|
|
label $ui_coml \
|
2006-11-06 20:20:27 +01:00
|
|
|
|
-anchor w \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-justify left
|
2006-11-18 08:50:58 +01:00
|
|
|
|
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:}}
|
2006-11-21 03:27:22 +01:00
|
|
|
|
amend-merge {set txt {Amended Merge Commit Message:}}
|
2006-11-18 08:50:58 +01:00
|
|
|
|
merge {set txt {Merge Commit Message:}}
|
|
|
|
|
* {set txt {Commit Message:}}
|
|
|
|
|
}
|
|
|
|
|
$ui_coml conf -text $txt
|
|
|
|
|
}
|
|
|
|
|
trace add variable commit_type write trace_commit_type
|
2006-11-19 02:59:49 +01:00
|
|
|
|
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
|
|
|
|
|
|
2006-11-06 20:20:27 +01:00
|
|
|
|
text $ui_comm -background white -borderwidth 1 \
|
2006-11-11 21:51:41 +01:00
|
|
|
|
-undo true \
|
2006-11-11 22:16:25 +01:00
|
|
|
|
-maxundo 20 \
|
2006-11-11 21:51:41 +01:00
|
|
|
|
-autoseparators true \
|
2006-11-06 20:20:27 +01:00
|
|
|
|
-relief sunken \
|
2006-11-08 02:27:46 +01:00
|
|
|
|
-width 75 -height 9 -wrap none \
|
2006-11-12 06:40:38 +01:00
|
|
|
|
-font font_diff \
|
2006-11-12 02:33:30 +01:00
|
|
|
|
-yscrollcommand {.vpane.lower.commarea.buffer.sby set}
|
2006-11-12 01:40:33 +01:00
|
|
|
|
scrollbar .vpane.lower.commarea.buffer.sby \
|
|
|
|
|
-command [list $ui_comm yview]
|
2006-11-19 02:59:49 +01:00
|
|
|
|
pack .vpane.lower.commarea.buffer.header -side top -fill x
|
2006-11-08 02:27:46 +01:00
|
|
|
|
pack .vpane.lower.commarea.buffer.sby -side right -fill y
|
2006-11-06 20:20:27 +01:00
|
|
|
|
pack $ui_comm -side left -fill y
|
2006-11-08 02:27:46 +01:00
|
|
|
|
pack .vpane.lower.commarea.buffer -side left -fill y
|
|
|
|
|
|
2006-11-12 02:24:23 +01:00
|
|
|
|
# -- Commit Message Buffer Context Menu
|
|
|
|
|
#
|
2006-11-16 00:55:05 +01:00
|
|
|
|
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} \
|
2007-01-23 00:31:12 +01:00
|
|
|
|
-command {focus $ui_comm;$ui_comm tag add sel 0.0 end}
|
2006-11-16 00:55:05 +01:00
|
|
|
|
$ctxm add command \
|
|
|
|
|
-label {Copy All} \
|
|
|
|
|
-command {
|
2006-11-12 02:24:23 +01:00
|
|
|
|
$ui_comm tag add sel 0.0 end
|
|
|
|
|
tk_textCopy $ui_comm
|
|
|
|
|
$ui_comm tag remove sel 0.0 end
|
2006-11-16 00:55:05 +01:00
|
|
|
|
}
|
|
|
|
|
$ctxm add separator
|
|
|
|
|
$ctxm add command \
|
|
|
|
|
-label {Sign Off} \
|
2006-11-12 02:24:23 +01:00
|
|
|
|
-command do_signoff
|
2006-11-16 00:55:05 +01:00
|
|
|
|
bind_button3 $ui_comm "tk_popup $ctxm %X %Y"
|
2006-11-12 02:24:23 +01:00
|
|
|
|
|
2006-11-08 02:27:46 +01:00
|
|
|
|
# -- Diff Header
|
2006-11-18 09:27:23 +01:00
|
|
|
|
#
|
2007-01-21 17:37:58 +01:00
|
|
|
|
proc trace_current_diff_path {varname args} {
|
|
|
|
|
global current_diff_path diff_actions file_states
|
|
|
|
|
if {$current_diff_path eq {}} {
|
2006-11-16 00:55:05 +01:00
|
|
|
|
set s {}
|
|
|
|
|
set f {}
|
|
|
|
|
set p {}
|
|
|
|
|
set o disabled
|
|
|
|
|
} else {
|
2007-01-21 17:37:58 +01:00
|
|
|
|
set p $current_diff_path
|
2006-11-16 00:55:05 +01:00
|
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
}
|
2007-01-21 17:37:58 +01:00
|
|
|
|
trace add variable current_diff_path write trace_current_diff_path
|
2006-11-16 00:55:05 +01:00
|
|
|
|
|
2007-06-05 23:50:02 +02:00
|
|
|
|
frame .vpane.lower.diff.header -background gold
|
2006-11-16 00:55:05 +01:00
|
|
|
|
label .vpane.lower.diff.header.status \
|
2007-06-05 23:50:02 +02:00
|
|
|
|
-background gold \
|
2006-11-13 04:06:37 +01:00
|
|
|
|
-width $max_status_desc \
|
|
|
|
|
-anchor w \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-justify left
|
2006-11-16 00:55:05 +01:00
|
|
|
|
label .vpane.lower.diff.header.file \
|
2007-06-05 23:50:02 +02:00
|
|
|
|
-background gold \
|
2006-11-16 00:55:05 +01:00
|
|
|
|
-anchor w \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-justify left
|
2006-11-16 00:55:05 +01:00
|
|
|
|
label .vpane.lower.diff.header.path \
|
2007-06-05 23:50:02 +02:00
|
|
|
|
-background gold \
|
2006-11-13 06:48:44 +01:00
|
|
|
|
-anchor w \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-justify left
|
2006-11-16 00:55:05 +01:00
|
|
|
|
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} \
|
2006-11-13 06:48:44 +01:00
|
|
|
|
-command {
|
|
|
|
|
clipboard clear
|
|
|
|
|
clipboard append \
|
|
|
|
|
-format STRING \
|
|
|
|
|
-type STRING \
|
2007-01-21 17:37:58 +01:00
|
|
|
|
-- $current_diff_path
|
2006-11-13 06:48:44 +01:00
|
|
|
|
}
|
2006-11-16 00:55:05 +01:00
|
|
|
|
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
|
|
|
|
|
bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
|
2006-11-08 02:27:46 +01:00
|
|
|
|
|
|
|
|
|
# -- Diff Body
|
2006-11-18 09:27:23 +01:00
|
|
|
|
#
|
2006-11-08 02:27:46 +01:00
|
|
|
|
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 \
|
2006-11-12 06:40:38 +01:00
|
|
|
|
-font font_diff \
|
2006-11-08 02:27:46 +01:00
|
|
|
|
-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
|
|
|
|
|
|
2007-01-25 03:30:23 +01:00
|
|
|
|
$ui_diff tag conf d_cr -elide true
|
2007-01-21 20:49:45 +01:00
|
|
|
|
$ui_diff tag conf d_@ -foreground blue -font font_diffbold
|
|
|
|
|
$ui_diff tag conf d_+ -foreground {#00a000}
|
2007-01-21 19:12:02 +01:00
|
|
|
|
$ui_diff tag conf d_- -foreground red
|
|
|
|
|
|
2007-01-21 20:49:45 +01:00
|
|
|
|
$ui_diff tag conf d_++ -foreground {#00a000}
|
2007-01-21 19:12:02 +01:00
|
|
|
|
$ui_diff tag conf d_-- -foreground red
|
|
|
|
|
$ui_diff tag conf d_+s \
|
2007-01-21 20:49:45 +01:00
|
|
|
|
-foreground {#00a000} \
|
|
|
|
|
-background {#e2effa}
|
2007-01-21 19:12:02 +01:00
|
|
|
|
$ui_diff tag conf d_-s \
|
|
|
|
|
-foreground red \
|
2007-01-21 20:49:45 +01:00
|
|
|
|
-background {#e2effa}
|
2007-01-21 19:12:02 +01:00
|
|
|
|
$ui_diff tag conf d_s+ \
|
2007-01-21 20:49:45 +01:00
|
|
|
|
-foreground {#00a000} \
|
|
|
|
|
-background ivory1
|
2007-01-21 19:12:02 +01:00
|
|
|
|
$ui_diff tag conf d_s- \
|
|
|
|
|
-foreground red \
|
2007-01-21 20:49:45 +01:00
|
|
|
|
-background ivory1
|
2007-01-21 19:12:02 +01:00
|
|
|
|
|
|
|
|
|
$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
|
2006-11-06 20:20:27 +01:00
|
|
|
|
|
2007-01-21 20:49:45 +01:00
|
|
|
|
$ui_diff tag raise sel
|
|
|
|
|
|
2006-11-12 02:24:23 +01:00
|
|
|
|
# -- Diff Body Context Menu
|
|
|
|
|
#
|
2006-11-16 00:55:05 +01:00
|
|
|
|
set ctxm .vpane.lower.diff.body.ctxm
|
|
|
|
|
menu $ctxm -tearoff 0
|
2007-01-21 19:27:43 +01:00
|
|
|
|
$ctxm add command \
|
|
|
|
|
-label {Refresh} \
|
|
|
|
|
-command reshow_diff
|
2007-01-25 02:39:30 +01:00
|
|
|
|
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
|
2006-11-16 00:55:05 +01:00
|
|
|
|
$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} \
|
2007-01-23 00:31:12 +01:00
|
|
|
|
-command {focus $ui_diff;$ui_diff tag add sel 0.0 end}
|
2006-11-16 00:55:05 +01:00
|
|
|
|
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
|
|
|
|
|
$ctxm add command \
|
|
|
|
|
-label {Copy All} \
|
|
|
|
|
-command {
|
2006-11-12 02:24:23 +01:00
|
|
|
|
$ui_diff tag add sel 0.0 end
|
|
|
|
|
tk_textCopy $ui_diff
|
|
|
|
|
$ui_diff tag remove sel 0.0 end
|
2006-11-16 00:55:05 +01:00
|
|
|
|
}
|
|
|
|
|
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
|
|
|
|
|
$ctxm add separator
|
2007-01-25 03:20:57 +01:00
|
|
|
|
$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
|
2006-11-16 00:55:05 +01:00
|
|
|
|
$ctxm add command \
|
|
|
|
|
-label {Decrease Font Size} \
|
2006-11-12 06:40:38 +01:00
|
|
|
|
-command {incr_font_size font_diff -1}
|
2006-11-16 00:55:05 +01:00
|
|
|
|
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
|
|
|
|
|
$ctxm add command \
|
|
|
|
|
-label {Increase Font Size} \
|
2006-11-12 06:40:38 +01:00
|
|
|
|
-command {incr_font_size font_diff 1}
|
2006-11-16 00:55:05 +01:00
|
|
|
|
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
|
|
|
|
|
$ctxm add separator
|
|
|
|
|
$ctxm add command \
|
|
|
|
|
-label {Show Less Context} \
|
2007-06-01 05:32:54 +02:00
|
|
|
|
-command {if {$repo_config(gui.diffcontext) >= 1} {
|
2006-11-13 01:20:02 +01:00
|
|
|
|
incr repo_config(gui.diffcontext) -1
|
|
|
|
|
reshow_diff
|
|
|
|
|
}}
|
2006-11-16 00:55:05 +01:00
|
|
|
|
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
|
|
|
|
|
$ctxm add command \
|
|
|
|
|
-label {Show More Context} \
|
2007-06-01 05:32:54 +02:00
|
|
|
|
-command {if {$repo_config(gui.diffcontext) < 99} {
|
2006-11-13 01:20:02 +01:00
|
|
|
|
incr repo_config(gui.diffcontext)
|
|
|
|
|
reshow_diff
|
2007-06-01 05:32:54 +02:00
|
|
|
|
}}
|
2006-11-16 00:55:05 +01:00
|
|
|
|
lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
|
|
|
|
|
$ctxm add separator
|
|
|
|
|
$ctxm add command -label {Options...} \
|
2006-11-12 12:53:56 +01:00
|
|
|
|
-command do_options
|
2007-01-25 03:20:57 +01:00
|
|
|
|
bind_button3 $ui_diff "
|
|
|
|
|
set cursorX %x
|
|
|
|
|
set cursorY %y
|
|
|
|
|
if {\$ui_index eq \$current_diff_side} {
|
|
|
|
|
$ctxm entryconf $ui_diff_applyhunk -label {Unstage Hunk From Commit}
|
|
|
|
|
} else {
|
|
|
|
|
$ctxm entryconf $ui_diff_applyhunk -label {Stage Hunk For Commit}
|
|
|
|
|
}
|
|
|
|
|
tk_popup $ctxm %X %Y
|
|
|
|
|
"
|
2007-01-25 18:55:20 +01:00
|
|
|
|
unset ui_diff_applyhunk
|
2006-11-12 02:24:23 +01:00
|
|
|
|
|
2006-11-06 20:20:27 +01:00
|
|
|
|
# -- Status Bar
|
2006-11-16 00:55:05 +01:00
|
|
|
|
#
|
2006-11-06 20:20:27 +01:00
|
|
|
|
label .status -textvariable ui_status_value \
|
|
|
|
|
-anchor w \
|
|
|
|
|
-justify left \
|
|
|
|
|
-borderwidth 1 \
|
2007-04-29 05:14:08 +02:00
|
|
|
|
-relief sunken
|
2006-11-06 20:20:27 +01:00
|
|
|
|
pack .status -anchor w -side bottom -fill x
|
|
|
|
|
|
2006-11-09 05:42:51 +01:00
|
|
|
|
# -- Load geometry
|
2006-11-16 00:55:05 +01:00
|
|
|
|
#
|
2006-11-09 05:42:51 +01:00
|
|
|
|
catch {
|
2006-11-12 09:47:00 +01:00
|
|
|
|
set gm $repo_config(gui.geometry)
|
2006-11-12 01:32:24 +01:00
|
|
|
|
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
|
2006-11-12 01:40:33 +01:00
|
|
|
|
}
|
2006-11-09 05:42:51 +01:00
|
|
|
|
|
2006-11-06 20:20:27 +01:00
|
|
|
|
# -- Key Bindings
|
2006-11-16 00:55:05 +01:00
|
|
|
|
#
|
2006-11-07 02:50:59 +01:00
|
|
|
|
bind $ui_comm <$M1B-Key-Return> {do_commit;break}
|
2007-01-21 05:07:04 +01:00
|
|
|
|
bind $ui_comm <$M1B-Key-i> {do_add_all;break}
|
|
|
|
|
bind $ui_comm <$M1B-Key-I> {do_add_all;break}
|
2006-11-11 21:51:41 +01:00
|
|
|
|
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}
|
2006-11-11 22:16:25 +01:00
|
|
|
|
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}
|
2007-05-01 21:51:09 +02:00
|
|
|
|
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}
|
2007-01-25 18:57:57 +01:00
|
|
|
|
bind $ui_diff <Button-1> {focus %W}
|
2006-11-11 21:16:01 +01:00
|
|
|
|
|
2007-02-09 00:10:05 +01:00
|
|
|
|
if {[is_enabled branch]} {
|
2007-01-21 07:34:55 +01:00
|
|
|
|
bind . <$M1B-Key-n> do_create_branch
|
|
|
|
|
bind . <$M1B-Key-N> do_create_branch
|
|
|
|
|
}
|
2007-07-06 04:15:00 +02:00
|
|
|
|
if {[is_enabled transport]} {
|
|
|
|
|
bind . <$M1B-Key-p> do_push_anywhere
|
|
|
|
|
bind . <$M1B-Key-P> do_push_anywhere
|
|
|
|
|
}
|
2007-01-21 07:34:55 +01:00
|
|
|
|
|
2007-07-06 04:16:38 +02:00
|
|
|
|
bind . <Key-F5> do_rescan
|
|
|
|
|
bind . <$M1B-Key-r> do_rescan
|
|
|
|
|
bind . <$M1B-Key-R> do_rescan
|
2006-11-07 08:57:46 +01:00
|
|
|
|
bind . <$M1B-Key-s> do_signoff
|
|
|
|
|
bind . <$M1B-Key-S> do_signoff
|
2007-01-21 05:07:04 +01:00
|
|
|
|
bind . <$M1B-Key-i> do_add_all
|
|
|
|
|
bind . <$M1B-Key-I> do_add_all
|
2006-11-07 08:57:46 +01:00
|
|
|
|
bind . <$M1B-Key-Return> do_commit
|
2007-01-21 04:06:51 +01:00
|
|
|
|
foreach i [list $ui_index $ui_workdir] {
|
2006-11-13 22:06:38 +01:00
|
|
|
|
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"
|
2006-11-06 20:20:27 +01:00
|
|
|
|
}
|
2006-11-12 02:00:35 +01:00
|
|
|
|
unset i
|
|
|
|
|
|
|
|
|
|
set file_lists($ui_index) [list]
|
2007-01-21 04:06:51 +01:00
|
|
|
|
set file_lists($ui_workdir) [list]
|
2006-11-18 09:27:23 +01:00
|
|
|
|
|
2007-04-14 21:10:48 +02:00
|
|
|
|
wm title . "[appname] ([reponame]) [file normalize [file dirname [gitdir]]]"
|
2006-11-06 20:20:27 +01:00
|
|
|
|
focus -force $ui_comm
|
2006-11-21 21:28:14 +01:00
|
|
|
|
|
2006-11-25 09:38:39 +01:00
|
|
|
|
# -- 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.
|
2006-11-21 21:28:14 +01:00
|
|
|
|
#
|
2007-01-29 02:58:47 +01:00
|
|
|
|
if {[is_Cygwin]} {
|
2006-11-21 21:28:14 +01:00
|
|
|
|
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
|
2007-01-21 03:48:56 +01:00
|
|
|
|
by [appname]:
|
2006-11-21 21:28:14 +01:00
|
|
|
|
|
|
|
|
|
"
|
|
|
|
|
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
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-25 09:38:39 +01:00
|
|
|
|
# -- Only initialize complex UI if we are going to stay running.
|
|
|
|
|
#
|
2007-02-09 00:10:05 +01:00
|
|
|
|
if {[is_enabled transport]} {
|
2006-11-12 22:20:36 +01:00
|
|
|
|
load_all_remotes
|
2006-11-25 09:35:33 +01:00
|
|
|
|
load_all_heads
|
2006-11-25 09:38:39 +01:00
|
|
|
|
|
2007-01-21 07:31:14 +01:00
|
|
|
|
populate_branch_menu
|
2007-01-25 23:16:22 +01:00
|
|
|
|
populate_fetch_menu
|
|
|
|
|
populate_push_menu
|
2006-11-12 22:20:36 +01:00
|
|
|
|
}
|
2006-11-25 09:38:39 +01:00
|
|
|
|
|
2007-01-21 03:23:21 +01:00
|
|
|
|
# -- Only suggest a gc run if we are going to stay running.
|
|
|
|
|
#
|
2007-02-09 00:03:41 +01:00
|
|
|
|
if {[is_enabled multicommit]} {
|
2007-01-21 03:23:21 +01:00
|
|
|
|
set object_limit 2000
|
|
|
|
|
if {[is_Windows]} {set object_limit 200}
|
2007-02-13 04:48:56 +01:00
|
|
|
|
regexp {^([0-9]+) objects,} [git count-objects] _junk objects_current
|
2007-01-21 03:23:21 +01:00
|
|
|
|
if {$objects_current >= $object_limit} {
|
|
|
|
|
if {[ask_popup \
|
|
|
|
|
"This repository currently has $objects_current loose objects.
|
|
|
|
|
|
2007-03-27 12:31:55 +02:00
|
|
|
|
To maintain optimal performance it is strongly recommended that you compress the database when more than $object_limit loose objects exist.
|
2007-01-21 03:23:21 +01:00
|
|
|
|
|
|
|
|
|
Compress the database now?"] eq yes} {
|
|
|
|
|
do_gc
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
unset object_limit _junk objects_current
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-18 09:31:25 +01:00
|
|
|
|
lock_index begin-read
|
2006-11-14 07:29:32 +01:00
|
|
|
|
after 1 do_rescan
|