Merge branch 'master' of https://github.com/j6t/git-gui
* 'master' of https://github.com/j6t/git-gui: (26 commits) git-gui: eliminate _search_exe git-gui: remove procs gitexec and _git_cmd git-gui: use dashless 'git cmd' form for read/write git-gui: default to full copy for linked worktrees git-gui: use git-clone git-gui: remove non-ttk code git-gui: remove ${NS} indirection for ttk git-gui: always use themed widgets from ttk git-gui: remove redundant check for Tk >= 8.5 git-gui: remove unreachable Tk 8.4 code git-gui: remove unused git-version git-gui: use git_init to create new repository dir git-gui: git-remote is always available git-gui: git merge understands --strategy=recursive git-gui: git-diff knows submodules and textconv git-gui: git-blame understands -w and textconv git-gui: git rev-parse knows show_toplevel git-gui: use git-branch --show-current git-gui: git-diff-index always knows submodules git-gui: git ls-files knows --exclude-standard ...maint
Junio C Hamano
commit
0e8243a355
|
|
@ -30,9 +30,7 @@ along with this program; if not, see <https://www.gnu.org/licenses/>.}]
|
|||
##
|
||||
## Tcl/Tk sanity check
|
||||
|
||||
if {[catch {package require Tcl 8.5} err]
|
||||
|| [catch {package require Tk 8.5} err]
|
||||
} {
|
||||
if {[catch {package require Tcl 8.6-8.8} err]} {
|
||||
catch {wm withdraw .}
|
||||
tk_messageBox \
|
||||
-icon error \
|
||||
|
|
@ -81,10 +79,8 @@ proc is_Cygwin {} {
|
|||
|
||||
if {[is_Windows]} {
|
||||
set _path_sep {;}
|
||||
set _search_exe .exe
|
||||
} else {
|
||||
set _path_sep {:}
|
||||
set _search_exe {}
|
||||
}
|
||||
|
||||
if {[is_Windows]} {
|
||||
|
|
@ -114,15 +110,15 @@ set env(PATH) [join $_search_path $_path_sep]
|
|||
|
||||
if {[is_Windows]} {
|
||||
proc _which {what args} {
|
||||
global _search_exe _search_path
|
||||
global _search_path
|
||||
|
||||
if {[lsearch -exact $args -script] >= 0} {
|
||||
set suffix {}
|
||||
} elseif {[string match *$_search_exe [string tolower $what]]} {
|
||||
} elseif {[string match *.exe [string tolower $what]]} {
|
||||
# The search string already has the file extension
|
||||
set suffix {}
|
||||
} else {
|
||||
set suffix $_search_exe
|
||||
set suffix .exe
|
||||
}
|
||||
|
||||
foreach p $_search_path {
|
||||
|
|
@ -365,7 +361,6 @@ set _appname {Git Gui}
|
|||
set _gitdir {}
|
||||
set _gitworktree {}
|
||||
set _isbare {}
|
||||
set _gitexec {}
|
||||
set _githtmldir {}
|
||||
set _reponame {}
|
||||
set _shellpath {@@SHELL_PATH@@}
|
||||
|
|
@ -430,20 +425,6 @@ proc gitdir {args} {
|
|||
return [eval [list file join $_gitdir] $args]
|
||||
}
|
||||
|
||||
proc gitexec {args} {
|
||||
global _gitexec
|
||||
if {$_gitexec eq {}} {
|
||||
if {[catch {set _gitexec [git --exec-path]} err]} {
|
||||
error "Git not installed?\n\n$err"
|
||||
}
|
||||
set _gitexec [file normalize $_gitexec]
|
||||
}
|
||||
if {$args eq {}} {
|
||||
return $_gitexec
|
||||
}
|
||||
return [eval [list file join $_gitexec] $args]
|
||||
}
|
||||
|
||||
proc githtmldir {args} {
|
||||
global _githtmldir
|
||||
if {$_githtmldir eq {}} {
|
||||
|
|
@ -576,56 +557,6 @@ proc _trace_exec {cmd} {
|
|||
|
||||
#'" fix poor old emacs font-lock mode
|
||||
|
||||
proc _git_cmd {name} {
|
||||
global _git_cmd_path
|
||||
|
||||
if {[catch {set v $_git_cmd_path($name)}]} {
|
||||
switch -- $name {
|
||||
version -
|
||||
--version -
|
||||
--exec-path { return [list $::_git $name] }
|
||||
}
|
||||
|
||||
set p [gitexec git-$name$::_search_exe]
|
||||
if {[file exists $p]} {
|
||||
set v [list $p]
|
||||
} elseif {[is_Windows] && [file exists [gitexec git-$name]]} {
|
||||
# Try to determine what sort of magic will make
|
||||
# git-$name go and do its thing, because native
|
||||
# Tcl on Windows doesn't know it.
|
||||
#
|
||||
set p [gitexec git-$name]
|
||||
set f [safe_open_file $p r]
|
||||
set s [gets $f]
|
||||
close $f
|
||||
|
||||
switch -glob -- [lindex $s 0] {
|
||||
#!*sh { set i sh }
|
||||
#!*perl { set i perl }
|
||||
#!*python { set i python }
|
||||
default { error "git-$name is not supported: $s" }
|
||||
}
|
||||
|
||||
upvar #0 _$i interp
|
||||
if {![info exists interp]} {
|
||||
set interp [_which $i]
|
||||
}
|
||||
if {$interp eq {}} {
|
||||
error "git-$name requires $i (not in PATH)"
|
||||
}
|
||||
set v [concat [list $interp] [lrange $s 1 end] [list $p]]
|
||||
} else {
|
||||
# Assume it is builtin to git somehow and we
|
||||
# aren't actually able to see a file for it.
|
||||
#
|
||||
set v [list $::_git $name]
|
||||
}
|
||||
set _git_cmd_path($name) $v
|
||||
}
|
||||
return $v
|
||||
}
|
||||
|
||||
# Run a shell command connected via pipes on stdout.
|
||||
# This is for use with textconv filters and uses sh -c "..." to allow it to
|
||||
# contain a command with arguments. We presume this
|
||||
# to be a shellscript that the configured shell (/bin/sh by default) knows
|
||||
|
|
@ -681,30 +612,30 @@ proc safe_open_command {cmd {redir {}}} {
|
|||
}
|
||||
|
||||
proc git_read {cmd {redir {}}} {
|
||||
set cmdp [_git_cmd [lindex $cmd 0]]
|
||||
set cmd [lrange $cmd 1 end]
|
||||
global _git
|
||||
set cmdp [concat [list $_git] $cmd]
|
||||
|
||||
return [safe_open_command [concat $cmdp $cmd] $redir]
|
||||
return [safe_open_command $cmdp $redir]
|
||||
}
|
||||
|
||||
proc git_read_nice {cmd} {
|
||||
global _git
|
||||
set opt [list]
|
||||
|
||||
_lappend_nice opt
|
||||
|
||||
set cmdp [_git_cmd [lindex $cmd 0]]
|
||||
set cmd [lrange $cmd 1 end]
|
||||
set cmdp [concat [list $_git] $cmd]
|
||||
|
||||
return [safe_open_command [concat $opt $cmdp $cmd]]
|
||||
return [safe_open_command [concat $opt $cmdp]]
|
||||
}
|
||||
|
||||
proc git_write {cmd} {
|
||||
global _git
|
||||
set cmd [make_arglist_safe $cmd]
|
||||
set cmdp [_git_cmd [lindex $cmd 0]]
|
||||
set cmd [lrange $cmd 1 end]
|
||||
set cmdp [concat [list $_git] $cmd]
|
||||
|
||||
_trace_exec [concat $cmdp $cmd]
|
||||
return [open [concat [list | ] $cmdp $cmd] w]
|
||||
_trace_exec $cmdp
|
||||
return [open [concat [list | ] $cmdp] w]
|
||||
}
|
||||
|
||||
proc githook_read {hook_name args} {
|
||||
|
|
@ -744,27 +675,8 @@ proc sq {value} {
|
|||
proc load_current_branch {} {
|
||||
global current_branch is_detached
|
||||
|
||||
set fd [safe_open_file [gitdir HEAD] r]
|
||||
fconfigure $fd -translation binary -encoding utf-8
|
||||
if {[gets $fd ref] < 1} {
|
||||
set ref {}
|
||||
}
|
||||
close $fd
|
||||
|
||||
set pfx {ref: refs/heads/}
|
||||
set len [string length $pfx]
|
||||
if {[string equal -length $len $pfx $ref]} {
|
||||
# We're on a branch. It might not exist. But
|
||||
# HEAD looks good enough to be a branch.
|
||||
#
|
||||
set current_branch [string range $ref $len end]
|
||||
set is_detached 0
|
||||
} else {
|
||||
# Assume this is a detached head.
|
||||
#
|
||||
set current_branch HEAD
|
||||
set is_detached 1
|
||||
}
|
||||
set current_branch [git branch --show-current]
|
||||
set is_detached [expr [string length $current_branch] == 0]
|
||||
}
|
||||
|
||||
auto_load tk_optionMenu
|
||||
|
|
@ -914,18 +826,9 @@ proc apply_config {} {
|
|||
font configure ${font}italic -slant italic
|
||||
}
|
||||
|
||||
global use_ttk NS
|
||||
set use_ttk 0
|
||||
set NS {}
|
||||
if {$repo_config(gui.usettk)} {
|
||||
set use_ttk [package vsatisfies [package provide Tk] 8.5]
|
||||
if {$use_ttk} {
|
||||
set NS ttk
|
||||
bind [winfo class .] <<ThemeChanged>> [list InitTheme]
|
||||
pave_toplevel .
|
||||
color::sync_with_theme
|
||||
}
|
||||
}
|
||||
bind [winfo class .] <<ThemeChanged>> [list InitTheme]
|
||||
pave_toplevel .
|
||||
color::sync_with_theme
|
||||
|
||||
global comment_string
|
||||
set comment_string [get_config core.commentstring]
|
||||
|
|
@ -992,6 +895,8 @@ if {$_git eq {}} {
|
|||
##
|
||||
## version check
|
||||
|
||||
set MIN_GIT_VERSION 2.36
|
||||
|
||||
if {[catch {set _git_version [git --version]} err]} {
|
||||
catch {wm withdraw .}
|
||||
tk_messageBox \
|
||||
|
|
@ -1002,9 +907,10 @@ if {[catch {set _git_version [git --version]} err]} {
|
|||
|
||||
$err
|
||||
|
||||
[appname] requires Git 1.5.0 or later."
|
||||
[appname] requires Git $MIN_GIT_VERSION or later."
|
||||
exit 1
|
||||
}
|
||||
|
||||
if {![regsub {^git version } $_git_version {} _git_version]} {
|
||||
catch {wm withdraw .}
|
||||
tk_messageBox \
|
||||
|
|
@ -1029,85 +935,21 @@ proc get_trimmed_version {s} {
|
|||
set _real_git_version $_git_version
|
||||
set _git_version [get_trimmed_version $_git_version]
|
||||
|
||||
if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
|
||||
catch {wm withdraw .}
|
||||
if {[tk_messageBox \
|
||||
-icon warning \
|
||||
-type yesno \
|
||||
-default no \
|
||||
-title "[appname]: warning" \
|
||||
-message [mc "Git version cannot be determined.
|
||||
if {[catch {set vcheck [package vcompare $_git_version $MIN_GIT_VERSION]}] ||
|
||||
[expr $vcheck < 0] } {
|
||||
|
||||
%s claims it is version '%s'.
|
||||
|
||||
%s requires at least Git 1.5.0 or later.
|
||||
|
||||
Assume '%s' is version 1.5.0?
|
||||
" $_git $_real_git_version [appname] $_real_git_version]] eq {yes}} {
|
||||
set _git_version 1.5.0
|
||||
} else {
|
||||
exit 1
|
||||
}
|
||||
}
|
||||
unset _real_git_version
|
||||
|
||||
proc git-version {args} {
|
||||
global _git_version
|
||||
|
||||
switch [llength $args] {
|
||||
0 {
|
||||
return $_git_version
|
||||
}
|
||||
|
||||
2 {
|
||||
set op [lindex $args 0]
|
||||
set vr [lindex $args 1]
|
||||
set cm [package vcompare $_git_version $vr]
|
||||
return [expr $cm $op 0]
|
||||
}
|
||||
|
||||
4 {
|
||||
set type [lindex $args 0]
|
||||
set name [lindex $args 1]
|
||||
set parm [lindex $args 2]
|
||||
set body [lindex $args 3]
|
||||
|
||||
if {($type ne {proc} && $type ne {method})} {
|
||||
error "Invalid arguments to git-version"
|
||||
}
|
||||
if {[llength $body] < 2 || [lindex $body end-1] ne {default}} {
|
||||
error "Last arm of $type $name must be default"
|
||||
}
|
||||
|
||||
foreach {op vr cb} [lrange $body 0 end-2] {
|
||||
if {[git-version $op $vr]} {
|
||||
return [uplevel [list $type $name $parm $cb]]
|
||||
}
|
||||
}
|
||||
|
||||
return [uplevel [list $type $name $parm [lindex $body end]]]
|
||||
}
|
||||
|
||||
default {
|
||||
error "git-version >= x"
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
if {[git-version < 1.5]} {
|
||||
set msg1 [mc "Insufficient git version, require: "]
|
||||
set msg2 [mc "git returned:"]
|
||||
set message "$msg1 $MIN_GIT_VERSION\n$msg2 $_real_git_version"
|
||||
catch {wm withdraw .}
|
||||
tk_messageBox \
|
||||
-icon error \
|
||||
-type ok \
|
||||
-title [mc "git-gui: fatal error"] \
|
||||
-message "[appname] requires Git 1.5.0 or later.
|
||||
|
||||
You are using [git-version]:
|
||||
|
||||
[git --version]"
|
||||
-message $message
|
||||
exit 1
|
||||
}
|
||||
unset _real_git_version
|
||||
|
||||
######################################################################
|
||||
##
|
||||
|
|
@ -1270,11 +1112,9 @@ citool {
|
|||
##
|
||||
## execution environment
|
||||
|
||||
set have_tk85 [expr {[package vcompare $tk_version "8.5"] >= 0}]
|
||||
|
||||
# Suggest our implementation of askpass, if none is set
|
||||
if {![info exists env(SSH_ASKPASS)]} {
|
||||
set env(SSH_ASKPASS) [gitexec git-gui--askpass]
|
||||
set env(SSH_ASKPASS) [file join [git --exec-path] git-gui--askpass]
|
||||
}
|
||||
|
||||
######################################################################
|
||||
|
|
@ -1295,9 +1135,23 @@ if {[catch {
|
|||
load_config 1
|
||||
apply_config
|
||||
choose_repository::pick
|
||||
if {![file isdirectory $_gitdir]} {
|
||||
exit 1
|
||||
}
|
||||
set picked 1
|
||||
}
|
||||
|
||||
# Use object format as hash algorithm (either "sha1" or "sha256")
|
||||
set hashalgorithm [git rev-parse --show-object-format]
|
||||
if {$hashalgorithm eq "sha1"} {
|
||||
set hashlength 40
|
||||
} elseif {$hashalgorithm eq "sha256"} {
|
||||
set hashlength 64
|
||||
} else {
|
||||
puts stderr "Unknown hash algorithm: $hashalgorithm"
|
||||
exit 1
|
||||
}
|
||||
|
||||
# we expand the _gitdir when it's just a single dot (i.e. when we're being
|
||||
# run from the .git dir itself) lest the routines to find the worktree
|
||||
# get confused
|
||||
|
|
@ -1314,20 +1168,7 @@ if {![file isdirectory $_gitdir]} {
|
|||
load_config 0
|
||||
apply_config
|
||||
|
||||
# v1.7.0 introduced --show-toplevel to return the canonical work-tree
|
||||
if {[package vcompare $_git_version 1.7.0] >= 0} {
|
||||
set _gitworktree [git rev-parse --show-toplevel]
|
||||
} else {
|
||||
# try to set work tree from environment, core.worktree or use
|
||||
# cdup to obtain a relative path to the top of the worktree. If
|
||||
# run from the top, the ./ prefix ensures normalize expands pwd.
|
||||
if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {
|
||||
set _gitworktree [get_config core.worktree]
|
||||
if {$_gitworktree eq ""} {
|
||||
set _gitworktree [file normalize ./[git rev-parse --show-cdup]]
|
||||
}
|
||||
}
|
||||
}
|
||||
set _gitworktree [git rev-parse --show-toplevel]
|
||||
|
||||
if {$_prefix ne {}} {
|
||||
if {$_gitworktree eq {}} {
|
||||
|
|
@ -1391,8 +1232,8 @@ set is_conflict_diff 0
|
|||
set last_revert {}
|
||||
set last_revert_enc {}
|
||||
|
||||
set nullid "0000000000000000000000000000000000000000"
|
||||
set nullid2 "0000000000000000000000000000000000000001"
|
||||
set nullid [string repeat 0 $hashlength]
|
||||
set nullid2 "[string repeat 0 [expr $hashlength - 1]]1"
|
||||
|
||||
######################################################################
|
||||
##
|
||||
|
|
@ -1553,18 +1394,7 @@ proc rescan_stage2 {fd after} {
|
|||
close $fd
|
||||
}
|
||||
|
||||
if {[package vcompare $::_git_version 1.6.3] >= 0} {
|
||||
set ls_others [list --exclude-standard]
|
||||
} else {
|
||||
set ls_others [list --exclude-per-directory=.gitignore]
|
||||
if {[have_info_exclude]} {
|
||||
lappend ls_others "--exclude-from=[gitdir info exclude]"
|
||||
}
|
||||
set user_exclude [get_config core.excludesfile]
|
||||
if {$user_exclude ne {} && [file readable $user_exclude]} {
|
||||
lappend ls_others "--exclude-from=[file normalize $user_exclude]"
|
||||
}
|
||||
}
|
||||
set ls_others [list --exclude-standard]
|
||||
|
||||
set buf_rdi {}
|
||||
set buf_rdf {}
|
||||
|
|
@ -1572,11 +1402,7 @@ proc rescan_stage2 {fd after} {
|
|||
|
||||
set rescan_active 2
|
||||
ui_status [mc "Scanning for modified files ..."]
|
||||
if {[git-version >= "1.7.2"]} {
|
||||
set fd_di [git_read [list diff-index --cached --ignore-submodules=dirty -z [PARENT]]]
|
||||
} else {
|
||||
set fd_di [git_read [list diff-index --cached -z [PARENT]]]
|
||||
}
|
||||
set fd_di [git_read [list diff-index --cached --ignore-submodules=dirty -z [PARENT]]]
|
||||
set fd_df [git_read [list diff-files -z]]
|
||||
|
||||
fconfigure $fd_di -blocking 0 -translation binary -encoding binary
|
||||
|
|
@ -1845,10 +1671,9 @@ proc short_path {path} {
|
|||
}
|
||||
|
||||
set next_icon_id 0
|
||||
set null_sha1 [string repeat 0 40]
|
||||
|
||||
proc merge_state {path new_state {head_info {}} {index_info {}}} {
|
||||
global file_states next_icon_id null_sha1
|
||||
global file_states next_icon_id nullid
|
||||
|
||||
set s0 [string index $new_state 0]
|
||||
set s1 [string index $new_state 1]
|
||||
|
|
@ -1870,7 +1695,7 @@ proc merge_state {path new_state {head_info {}} {index_info {}}} {
|
|||
elseif {$s1 eq {_}} {set s1 _}
|
||||
|
||||
if {$s0 eq {A} && $s1 eq {_} && $head_info eq {}} {
|
||||
set head_info [list 0 $null_sha1]
|
||||
set head_info [list 0 $nullid]
|
||||
} elseif {$s0 ne {_} && [string index $state 0] eq {_}
|
||||
&& $head_info eq {}} {
|
||||
set head_info $index_info
|
||||
|
|
@ -2323,7 +2148,7 @@ proc do_quit {{rc {1}}} {
|
|||
global ui_comm is_quitting repo_config commit_type
|
||||
global GITGUI_BCK_exists GITGUI_BCK_i
|
||||
global ui_comm_spell
|
||||
global ret_code use_ttk
|
||||
global ret_code
|
||||
|
||||
if {$is_quitting} return
|
||||
set is_quitting 1
|
||||
|
|
@ -2381,13 +2206,8 @@ proc do_quit {{rc {1}}} {
|
|||
}
|
||||
set cfg_geometry [list]
|
||||
lappend cfg_geometry [wm geometry .]
|
||||
if {$use_ttk} {
|
||||
lappend cfg_geometry [.vpane sashpos 0]
|
||||
lappend cfg_geometry [.vpane.files sashpos 0]
|
||||
} else {
|
||||
lappend cfg_geometry [lindex [.vpane sash coord 0] 0]
|
||||
lappend cfg_geometry [lindex [.vpane.files sash coord 0] 1]
|
||||
}
|
||||
lappend cfg_geometry [.vpane sashpos 0]
|
||||
lappend cfg_geometry [.vpane.files sashpos 0]
|
||||
if {[catch {set rc_geometry $repo_config(gui.geometry)}]} {
|
||||
set rc_geometry {}
|
||||
}
|
||||
|
|
@ -3203,7 +3023,7 @@ blame {
|
|||
if {$head eq {}} {
|
||||
load_current_branch
|
||||
} else {
|
||||
if {[regexp {^[0-9a-f]{1,39}$} $head]} {
|
||||
if {[regexp [string map "@@ [expr $hashlength - 1]" {^[0-9a-f]{1,@@}$}] $head]} {
|
||||
if {[catch {
|
||||
set head [git rev-parse --verify $head]
|
||||
} err]} {
|
||||
|
|
@ -3269,13 +3089,12 @@ default {
|
|||
|
||||
# -- Branch Control
|
||||
#
|
||||
${NS}::frame .branch
|
||||
if {!$use_ttk} {.branch configure -borderwidth 1 -relief sunken}
|
||||
${NS}::label .branch.l1 \
|
||||
ttk::frame .branch
|
||||
ttk::label .branch.l1 \
|
||||
-text [mc "Current Branch:"] \
|
||||
-anchor w \
|
||||
-justify left
|
||||
${NS}::label .branch.cb \
|
||||
ttk::label .branch.cb \
|
||||
-textvariable current_branch \
|
||||
-anchor w \
|
||||
-justify left
|
||||
|
|
@ -3285,13 +3104,9 @@ pack .branch -side top -fill x
|
|||
|
||||
# -- Main Window Layout
|
||||
#
|
||||
${NS}::panedwindow .vpane -orient horizontal
|
||||
${NS}::panedwindow .vpane.files -orient vertical
|
||||
if {$use_ttk} {
|
||||
.vpane add .vpane.files
|
||||
} else {
|
||||
.vpane add .vpane.files -sticky nsew -height 100 -width 200
|
||||
}
|
||||
ttk::panedwindow .vpane -orient horizontal
|
||||
ttk::panedwindow .vpane.files -orient vertical
|
||||
.vpane add .vpane.files
|
||||
pack .vpane -anchor n -side top -fill both -expand 1
|
||||
|
||||
# -- Working Directory File List
|
||||
|
|
@ -3308,8 +3123,8 @@ ttext $ui_workdir \
|
|||
-xscrollcommand {.vpane.files.workdir.sx set} \
|
||||
-yscrollcommand {.vpane.files.workdir.sy set} \
|
||||
-state disabled
|
||||
${NS}::scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
|
||||
${NS}::scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
|
||||
ttk::scrollbar .vpane.files.workdir.sx -orient h -command [list $ui_workdir xview]
|
||||
ttk::scrollbar .vpane.files.workdir.sy -orient v -command [list $ui_workdir yview]
|
||||
pack .vpane.files.workdir.title -side top -fill x
|
||||
pack .vpane.files.workdir.sx -side bottom -fill x
|
||||
pack .vpane.files.workdir.sy -side right -fill y
|
||||
|
|
@ -3330,8 +3145,8 @@ ttext $ui_index \
|
|||
-xscrollcommand {.vpane.files.index.sx set} \
|
||||
-yscrollcommand {.vpane.files.index.sy set} \
|
||||
-state disabled
|
||||
${NS}::scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
|
||||
${NS}::scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
|
||||
ttk::scrollbar .vpane.files.index.sx -orient h -command [list $ui_index xview]
|
||||
ttk::scrollbar .vpane.files.index.sy -orient v -command [list $ui_index yview]
|
||||
pack .vpane.files.index.title -side top -fill x
|
||||
pack .vpane.files.index.sx -side bottom -fill x
|
||||
pack .vpane.files.index.sy -side right -fill y
|
||||
|
|
@ -3341,10 +3156,6 @@ pack $ui_index -side left -fill both -expand 1
|
|||
#
|
||||
.vpane.files add .vpane.files.workdir
|
||||
.vpane.files add .vpane.files.index
|
||||
if {!$use_ttk} {
|
||||
.vpane.files paneconfigure .vpane.files.workdir -sticky news
|
||||
.vpane.files paneconfigure .vpane.files.index -sticky news
|
||||
}
|
||||
|
||||
proc set_selection_colors {w has_focus} {
|
||||
foreach tag [list in_diff in_sel] {
|
||||
|
|
@ -3365,78 +3176,63 @@ unset i
|
|||
|
||||
# -- Diff and Commit Area
|
||||
#
|
||||
if {$have_tk85} {
|
||||
${NS}::panedwindow .vpane.lower -orient vertical
|
||||
${NS}::frame .vpane.lower.commarea
|
||||
${NS}::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500
|
||||
.vpane.lower add .vpane.lower.diff
|
||||
.vpane.lower add .vpane.lower.commarea
|
||||
.vpane add .vpane.lower
|
||||
if {$use_ttk} {
|
||||
.vpane.lower pane .vpane.lower.diff -weight 1
|
||||
.vpane.lower pane .vpane.lower.commarea -weight 0
|
||||
} else {
|
||||
.vpane.lower paneconfigure .vpane.lower.diff -stretch always
|
||||
.vpane.lower paneconfigure .vpane.lower.commarea -stretch never
|
||||
}
|
||||
} else {
|
||||
frame .vpane.lower -height 300 -width 400
|
||||
frame .vpane.lower.commarea
|
||||
frame .vpane.lower.diff -relief sunken -borderwidth 1
|
||||
pack .vpane.lower.diff -fill both -expand 1
|
||||
pack .vpane.lower.commarea -side bottom -fill x
|
||||
.vpane add .vpane.lower
|
||||
.vpane paneconfigure .vpane.lower -sticky nsew
|
||||
}
|
||||
ttk::panedwindow .vpane.lower -orient vertical
|
||||
ttk::frame .vpane.lower.commarea
|
||||
ttk::frame .vpane.lower.diff -relief sunken -borderwidth 1 -height 500
|
||||
.vpane.lower add .vpane.lower.diff
|
||||
.vpane.lower add .vpane.lower.commarea
|
||||
.vpane add .vpane.lower
|
||||
.vpane.lower pane .vpane.lower.diff -weight 1
|
||||
.vpane.lower pane .vpane.lower.commarea -weight 0
|
||||
|
||||
# -- Commit Area Buttons
|
||||
#
|
||||
${NS}::frame .vpane.lower.commarea.buttons
|
||||
${NS}::label .vpane.lower.commarea.buttons.l -text {} \
|
||||
ttk::frame .vpane.lower.commarea.buttons
|
||||
ttk::label .vpane.lower.commarea.buttons.l -text {} \
|
||||
-anchor w \
|
||||
-justify left
|
||||
pack .vpane.lower.commarea.buttons.l -side top -fill x
|
||||
pack .vpane.lower.commarea.buttons -side left -fill y
|
||||
|
||||
${NS}::button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
|
||||
ttk::button .vpane.lower.commarea.buttons.rescan -text [mc Rescan] \
|
||||
-command ui_do_rescan
|
||||
pack .vpane.lower.commarea.buttons.rescan -side top -fill x
|
||||
lappend disable_on_lock \
|
||||
{.vpane.lower.commarea.buttons.rescan conf -state}
|
||||
|
||||
${NS}::button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
|
||||
ttk::button .vpane.lower.commarea.buttons.incall -text [mc "Stage Changed"] \
|
||||
-command do_add_all
|
||||
pack .vpane.lower.commarea.buttons.incall -side top -fill x
|
||||
lappend disable_on_lock \
|
||||
{.vpane.lower.commarea.buttons.incall conf -state}
|
||||
|
||||
if {![is_enabled nocommitmsg]} {
|
||||
${NS}::button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
|
||||
ttk::button .vpane.lower.commarea.buttons.signoff -text [mc "Sign Off"] \
|
||||
-command do_signoff
|
||||
pack .vpane.lower.commarea.buttons.signoff -side top -fill x
|
||||
}
|
||||
|
||||
${NS}::button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \
|
||||
ttk::button .vpane.lower.commarea.buttons.commit -text [commit_btn_caption] \
|
||||
-command do_commit
|
||||
pack .vpane.lower.commarea.buttons.commit -side top -fill x
|
||||
lappend disable_on_lock \
|
||||
{.vpane.lower.commarea.buttons.commit conf -state}
|
||||
|
||||
if {![is_enabled nocommit]} {
|
||||
${NS}::button .vpane.lower.commarea.buttons.push -text [mc Push] \
|
||||
ttk::button .vpane.lower.commarea.buttons.push -text [mc Push] \
|
||||
-command do_push_anywhere
|
||||
pack .vpane.lower.commarea.buttons.push -side top -fill x
|
||||
}
|
||||
|
||||
# -- Commit Message Buffer
|
||||
#
|
||||
${NS}::frame .vpane.lower.commarea.buffer
|
||||
${NS}::frame .vpane.lower.commarea.buffer.header
|
||||
ttk::frame .vpane.lower.commarea.buffer
|
||||
ttk::frame .vpane.lower.commarea.buffer.header
|
||||
set ui_comm .vpane.lower.commarea.buffer.frame.t
|
||||
set ui_coml .vpane.lower.commarea.buffer.header.l
|
||||
|
||||
if {![is_enabled nocommit]} {
|
||||
${NS}::checkbutton .vpane.lower.commarea.buffer.header.amend \
|
||||
ttk::checkbutton .vpane.lower.commarea.buffer.header.amend \
|
||||
-text [mc "Amend Last Commit"] \
|
||||
-variable commit_type_is_amend \
|
||||
-command do_select_commit_type
|
||||
|
|
@ -3444,7 +3240,7 @@ if {![is_enabled nocommit]} {
|
|||
[list .vpane.lower.commarea.buffer.header.amend conf -state]
|
||||
}
|
||||
|
||||
${NS}::label $ui_coml \
|
||||
ttk::label $ui_coml \
|
||||
-anchor w \
|
||||
-justify left
|
||||
proc trace_commit_type {varname args} {
|
||||
|
|
@ -3479,10 +3275,10 @@ ttext $ui_comm \
|
|||
-font font_diff \
|
||||
-xscrollcommand {.vpane.lower.commarea.buffer.frame.sbx set} \
|
||||
-yscrollcommand {.vpane.lower.commarea.buffer.frame.sby set}
|
||||
${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sbx \
|
||||
ttk::scrollbar .vpane.lower.commarea.buffer.frame.sbx \
|
||||
-orient horizontal \
|
||||
-command [list $ui_comm xview]
|
||||
${NS}::scrollbar .vpane.lower.commarea.buffer.frame.sby \
|
||||
ttk::scrollbar .vpane.lower.commarea.buffer.frame.sby \
|
||||
-orient vertical \
|
||||
-command [list $ui_comm yview]
|
||||
|
||||
|
|
@ -3605,9 +3401,9 @@ ttext $ui_diff \
|
|||
-yscrollcommand {.vpane.lower.diff.body.sby set} \
|
||||
-state disabled
|
||||
catch {$ui_diff configure -tabstyle wordprocessor}
|
||||
${NS}::scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
|
||||
ttk::scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
|
||||
-command [list $ui_diff xview]
|
||||
${NS}::scrollbar .vpane.lower.diff.body.sby -orient vertical \
|
||||
ttk::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
|
||||
|
|
@ -3908,29 +3704,14 @@ proc on_ttk_pane_mapped {w pane pos} {
|
|||
bind $w <Map> {}
|
||||
after 0 [list after idle [list $w sashpos $pane $pos]]
|
||||
}
|
||||
proc on_tk_pane_mapped {w pane x y} {
|
||||
bind $w <Map> {}
|
||||
after 0 [list after idle [list $w sash place $pane $x $y]]
|
||||
}
|
||||
proc on_application_mapped {} {
|
||||
global repo_config use_ttk
|
||||
global repo_config
|
||||
bind . <Map> {}
|
||||
set gm $repo_config(gui.geometry)
|
||||
if {$use_ttk} {
|
||||
bind .vpane <Map> \
|
||||
[list on_ttk_pane_mapped %W 0 [lindex $gm 1]]
|
||||
bind .vpane.files <Map> \
|
||||
[list on_ttk_pane_mapped %W 0 [lindex $gm 2]]
|
||||
} else {
|
||||
bind .vpane <Map> \
|
||||
[list on_tk_pane_mapped %W 0 \
|
||||
[lindex $gm 1] \
|
||||
[lindex [.vpane sash coord 0] 1]]
|
||||
bind .vpane.files <Map> \
|
||||
[list on_tk_pane_mapped %W 0 \
|
||||
[lindex [.vpane.files sash coord 0] 0] \
|
||||
[lindex $gm 2]]
|
||||
}
|
||||
bind .vpane <Map> \
|
||||
[list on_ttk_pane_mapped %W 0 [lindex $gm 1]]
|
||||
bind .vpane.files <Map> \
|
||||
[list on_ttk_pane_mapped %W 0 [lindex $gm 2]]
|
||||
wm geometry . [lindex $gm 0]
|
||||
}
|
||||
if {[info exists repo_config(gui.geometry)]} {
|
||||
|
|
|
|||
|
|
@ -4,19 +4,19 @@
|
|||
proc do_about {} {
|
||||
global appvers copyright oguilib
|
||||
global tcl_patchLevel tk_patchLevel
|
||||
global ui_comm_spell NS use_ttk
|
||||
global ui_comm_spell
|
||||
|
||||
set w .about_dialog
|
||||
Dialog $w
|
||||
wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
|
||||
|
||||
pack [git_logo $w.git_logo] -side left -fill y -padx 10 -pady 10
|
||||
${NS}::label $w.header -text [mc "About %s" [appname]] \
|
||||
ttk::label $w.header -text [mc "About %s" [appname]] \
|
||||
-font font_uibold -anchor center
|
||||
pack $w.header -side top -fill x
|
||||
|
||||
${NS}::frame $w.buttons
|
||||
${NS}::button $w.buttons.close -text {Close} \
|
||||
ttk::frame $w.buttons
|
||||
ttk::button $w.buttons.close -text {Close} \
|
||||
-default active \
|
||||
-command [list destroy $w]
|
||||
pack $w.buttons.close -side right
|
||||
|
|
@ -44,7 +44,7 @@ proc do_about {} {
|
|||
|
||||
set d {}
|
||||
append d "git wrapper: $::_git\n"
|
||||
append d "git exec dir: [gitexec]\n"
|
||||
append d "git exec dir: [git --exec-path]\n"
|
||||
append d "git-gui lib: $oguilib"
|
||||
|
||||
paddedlabel $w.vers -text $v
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ field tooltip_timer {} ; # Current timer event for our tooltip
|
|||
field tooltip_commit {} ; # Commit(s) in tooltip
|
||||
|
||||
constructor new {i_commit i_path i_jump} {
|
||||
global cursor_ptr M1B M1T have_tk85 use_ttk NS
|
||||
global cursor_ptr M1B M1T
|
||||
variable active_color
|
||||
variable group_colors
|
||||
|
||||
|
|
@ -203,18 +203,17 @@ constructor new {i_commit i_path i_jump} {
|
|||
-width 80 \
|
||||
-xscrollcommand [list $w.file_pane.out.sbx set] \
|
||||
-font font_diff
|
||||
if {$have_tk85} {
|
||||
$w_file configure -inactiveselectbackground darkblue
|
||||
}
|
||||
|
||||
$w_file tag conf found \
|
||||
-background yellow
|
||||
|
||||
set w_columns [list $w_amov $w_asim $w_line $w_file]
|
||||
|
||||
${NS}::scrollbar $w.file_pane.out.sbx \
|
||||
ttk::scrollbar $w.file_pane.out.sbx \
|
||||
-orient h \
|
||||
-command [list $w_file xview]
|
||||
${NS}::scrollbar $w.file_pane.out.sby \
|
||||
ttk::scrollbar $w.file_pane.out.sby \
|
||||
-orient v \
|
||||
-command [list scrollbar2many $w_columns yview]
|
||||
eval grid $w_columns $w.file_pane.out.sby -sticky nsew
|
||||
|
|
@ -264,10 +263,10 @@ constructor new {i_commit i_path i_jump} {
|
|||
-background $active_color \
|
||||
-font font_ui
|
||||
$w_cviewer tag raise sel
|
||||
${NS}::scrollbar $w.file_pane.cm.sbx \
|
||||
ttk::scrollbar $w.file_pane.cm.sbx \
|
||||
-orient h \
|
||||
-command [list $w_cviewer xview]
|
||||
${NS}::scrollbar $w.file_pane.cm.sby \
|
||||
ttk::scrollbar $w.file_pane.cm.sby \
|
||||
-orient v \
|
||||
-command [list $w_cviewer yview]
|
||||
pack $w.file_pane.cm.sby -side right -fill y
|
||||
|
|
@ -426,6 +425,7 @@ method _kill {} {
|
|||
|
||||
method _load {jump} {
|
||||
variable group_colors
|
||||
global hashlength
|
||||
|
||||
_hide_tooltip $this
|
||||
|
||||
|
|
@ -436,7 +436,7 @@ method _load {jump} {
|
|||
$i conf -state normal
|
||||
$i delete 0.0 end
|
||||
foreach g [$i tag names] {
|
||||
if {[regexp {^g[0-9a-f]{40}$} $g]} {
|
||||
if {[regexp [string map "@@ $hashlength" {^g[0-9a-f]{@@}$}] $g]} {
|
||||
$i tag delete $g
|
||||
}
|
||||
}
|
||||
|
|
@ -470,7 +470,7 @@ method _load {jump} {
|
|||
$w_path conf -text [escape_path $path]
|
||||
|
||||
set do_textconv 0
|
||||
if {![is_config_false gui.textconv] && [git-version >= 1.7.2]} {
|
||||
if {![is_config_false gui.textconv]} {
|
||||
set filter [gitattr $path diff set]
|
||||
set textconv [get_config [join [list diff $filter textconv] .]]
|
||||
if {$filter ne {set} && $textconv ne {}} {
|
||||
|
|
@ -500,6 +500,8 @@ method _load {jump} {
|
|||
}
|
||||
|
||||
method _history_menu {} {
|
||||
global hashlength
|
||||
|
||||
set m $w.backmenu
|
||||
if {[winfo exists $m]} {
|
||||
$m delete 0 end
|
||||
|
|
@ -513,7 +515,7 @@ method _history_menu {} {
|
|||
set c [lindex $e 0]
|
||||
set f [lindex $e 1]
|
||||
|
||||
if {[regexp {^[0-9a-f]{40}$} $c]} {
|
||||
if {[regexp [string map "@@ $hashlength" {^[0-9a-f]{@@}$}] $c]} {
|
||||
set t [string range $c 0 8]...
|
||||
} elseif {$c eq {}} {
|
||||
set t {Working Directory}
|
||||
|
|
@ -627,6 +629,7 @@ method _exec_blame {cur_w cur_d options cur_s} {
|
|||
method _read_blame {fd cur_w cur_d} {
|
||||
upvar #0 $cur_d line_data
|
||||
variable group_colors
|
||||
global hashlength nullid
|
||||
|
||||
if {$fd ne $current_fd} {
|
||||
catch {close $fd}
|
||||
|
|
@ -635,7 +638,7 @@ method _read_blame {fd cur_w cur_d} {
|
|||
|
||||
$cur_w conf -state normal
|
||||
while {[gets $fd line] >= 0} {
|
||||
if {[regexp {^([a-z0-9]{40}) (\d+) (\d+) (\d+)$} $line line \
|
||||
if {[regexp [string map "@@ $hashlength" {^([a-z0-9]{@@}) (\d+) (\d+) (\d+)$}] $line line \
|
||||
cmit original_line final_line line_count]} {
|
||||
set r_commit $cmit
|
||||
set r_orig_line $original_line
|
||||
|
|
@ -648,7 +651,7 @@ method _read_blame {fd cur_w cur_d} {
|
|||
set oln $r_orig_line
|
||||
set cmit $r_commit
|
||||
|
||||
if {[regexp {^0{40}$} $cmit]} {
|
||||
if {$cmit eq $nullid} {
|
||||
set commit_abbr work
|
||||
set commit_type curr_commit
|
||||
} elseif {$cmit eq $commit} {
|
||||
|
|
@ -807,9 +810,7 @@ method _read_blame {fd cur_w cur_d} {
|
|||
# thorough copy search; insert before the threshold
|
||||
set original_options [linsert $original_options 0 -C]
|
||||
}
|
||||
if {[git-version >= 1.5.3]} {
|
||||
lappend original_options -w ; # ignore indentation changes
|
||||
}
|
||||
lappend original_options -w ; # ignore indentation changes
|
||||
|
||||
_exec_blame $this $w_amov @amov_data \
|
||||
$original_options \
|
||||
|
|
@ -857,9 +858,7 @@ method _fullcopyblame {} {
|
|||
set threshold [get_config gui.copyblamethreshold]
|
||||
set original_options [list -C -C "-C$threshold"]
|
||||
|
||||
if {[git-version >= 1.5.3]} {
|
||||
lappend original_options -w ; # ignore indentation changes
|
||||
}
|
||||
lappend original_options -w ; # ignore indentation changes
|
||||
|
||||
# Find the line range
|
||||
set pos @$::cursorX,$::cursorY
|
||||
|
|
@ -1298,7 +1297,7 @@ method _open_tooltip {cur_w} {
|
|||
# On MacOS raising a window causes it to acquire focus.
|
||||
# Tk 8.5 on MacOS seems to properly support wm transient,
|
||||
# so we can safely counter the effect there.
|
||||
if {$::have_tk85 && [is_MacOSX]} {
|
||||
if {[is_MacOSX]} {
|
||||
update
|
||||
if {$w eq {}} {
|
||||
raise .
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ field opt_fetch 1; # refetch tracking branch if used?
|
|||
field opt_detach 0; # force a detached head case?
|
||||
|
||||
constructor dialog {} {
|
||||
global use_ttk NS
|
||||
make_dialog top w
|
||||
wm withdraw $w
|
||||
wm title $top [mc "%s (%s): Checkout Branch" [appname] [reponame]]
|
||||
|
|
@ -18,16 +17,16 @@ constructor dialog {} {
|
|||
wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
|
||||
}
|
||||
|
||||
${NS}::label $w.header -text [mc "Checkout Branch"] \
|
||||
ttk::label $w.header -text [mc "Checkout Branch"] \
|
||||
-font font_uibold -anchor center
|
||||
pack $w.header -side top -fill x
|
||||
|
||||
${NS}::frame $w.buttons
|
||||
${NS}::button $w.buttons.create -text [mc Checkout] \
|
||||
ttk::frame $w.buttons
|
||||
ttk::button $w.buttons.create -text [mc Checkout] \
|
||||
-default active \
|
||||
-command [cb _checkout]
|
||||
pack $w.buttons.create -side right
|
||||
${NS}::button $w.buttons.cancel -text [mc Cancel] \
|
||||
ttk::button $w.buttons.cancel -text [mc Cancel] \
|
||||
-command [list destroy $w]
|
||||
pack $w.buttons.cancel -side right -padx 5
|
||||
pack $w.buttons -side bottom -fill x -pady 10 -padx 10
|
||||
|
|
@ -36,14 +35,14 @@ constructor dialog {} {
|
|||
$w_rev bind_listbox <Double-Button-1> [cb _checkout]
|
||||
pack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5
|
||||
|
||||
${NS}::labelframe $w.options -text [mc Options]
|
||||
ttk::labelframe $w.options -text [mc Options]
|
||||
|
||||
${NS}::checkbutton $w.options.fetch \
|
||||
ttk::checkbutton $w.options.fetch \
|
||||
-text [mc "Fetch Tracking Branch"] \
|
||||
-variable @opt_fetch
|
||||
pack $w.options.fetch -anchor nw
|
||||
|
||||
${NS}::checkbutton $w.options.detach \
|
||||
ttk::checkbutton $w.options.detach \
|
||||
-text [mc "Detach From Local Branch"] \
|
||||
-variable @opt_detach
|
||||
pack $w.options.detach -anchor nw
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ field opt_fetch 1; # refetch tracking branch if used?
|
|||
field reset_ok 0; # did the user agree to reset?
|
||||
|
||||
constructor dialog {} {
|
||||
global repo_config use_ttk NS
|
||||
global repo_config
|
||||
|
||||
make_dialog top w
|
||||
wm withdraw $w
|
||||
|
|
@ -25,39 +25,37 @@ constructor dialog {} {
|
|||
wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
|
||||
}
|
||||
|
||||
${NS}::label $w.header -text [mc "Create New Branch"] \
|
||||
ttk::label $w.header -text [mc "Create New Branch"] \
|
||||
-font font_uibold -anchor center
|
||||
pack $w.header -side top -fill x
|
||||
|
||||
${NS}::frame $w.buttons
|
||||
${NS}::button $w.buttons.create -text [mc Create] \
|
||||
ttk::frame $w.buttons
|
||||
ttk::button $w.buttons.create -text [mc Create] \
|
||||
-default active \
|
||||
-command [cb _create]
|
||||
pack $w.buttons.create -side right
|
||||
${NS}::button $w.buttons.cancel -text [mc Cancel] \
|
||||
ttk::button $w.buttons.cancel -text [mc Cancel] \
|
||||
-command [list destroy $w]
|
||||
pack $w.buttons.cancel -side right -padx 5
|
||||
pack $w.buttons -side bottom -fill x -pady 10 -padx 10
|
||||
|
||||
${NS}::labelframe $w.desc -text [mc "Branch Name"]
|
||||
${NS}::radiobutton $w.desc.name_r \
|
||||
ttk::labelframe $w.desc -text [mc "Branch Name"]
|
||||
ttk::radiobutton $w.desc.name_r \
|
||||
-text [mc "Name:"] \
|
||||
-value user \
|
||||
-variable @name_type
|
||||
if {!$use_ttk} {$w.desc.name_r configure -anchor w}
|
||||
set w_name $w.desc.name_t
|
||||
${NS}::entry $w_name \
|
||||
ttk::entry $w_name \
|
||||
-width 40 \
|
||||
-textvariable @name \
|
||||
-validate key \
|
||||
-validatecommand [cb _validate %d %S]
|
||||
grid $w.desc.name_r $w_name -sticky we -padx {0 5}
|
||||
|
||||
${NS}::radiobutton $w.desc.match_r \
|
||||
ttk::radiobutton $w.desc.match_r \
|
||||
-text [mc "Match Tracking Branch Name"] \
|
||||
-value match \
|
||||
-variable @name_type
|
||||
if {!$use_ttk} {$w.desc.match_r configure -anchor w}
|
||||
grid $w.desc.match_r -sticky we -padx {0 5} -columnspan 2
|
||||
|
||||
grid columnconfigure $w.desc 1 -weight 1
|
||||
|
|
@ -66,34 +64,34 @@ constructor dialog {} {
|
|||
set w_rev [::choose_rev::new $w.rev [mc "Starting Revision"]]
|
||||
pack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5
|
||||
|
||||
${NS}::labelframe $w.options -text [mc Options]
|
||||
ttk::labelframe $w.options -text [mc Options]
|
||||
|
||||
${NS}::frame $w.options.merge
|
||||
${NS}::label $w.options.merge.l -text [mc "Update Existing Branch:"]
|
||||
ttk::frame $w.options.merge
|
||||
ttk::label $w.options.merge.l -text [mc "Update Existing Branch:"]
|
||||
pack $w.options.merge.l -side left
|
||||
${NS}::radiobutton $w.options.merge.no \
|
||||
ttk::radiobutton $w.options.merge.no \
|
||||
-text [mc No] \
|
||||
-value none \
|
||||
-variable @opt_merge
|
||||
pack $w.options.merge.no -side left
|
||||
${NS}::radiobutton $w.options.merge.ff \
|
||||
ttk::radiobutton $w.options.merge.ff \
|
||||
-text [mc "Fast Forward Only"] \
|
||||
-value ff \
|
||||
-variable @opt_merge
|
||||
pack $w.options.merge.ff -side left
|
||||
${NS}::radiobutton $w.options.merge.reset \
|
||||
ttk::radiobutton $w.options.merge.reset \
|
||||
-text [mc Reset] \
|
||||
-value reset \
|
||||
-variable @opt_merge
|
||||
pack $w.options.merge.reset -side left
|
||||
pack $w.options.merge -anchor nw
|
||||
|
||||
${NS}::checkbutton $w.options.fetch \
|
||||
ttk::checkbutton $w.options.fetch \
|
||||
-text [mc "Fetch Tracking Branch"] \
|
||||
-variable @opt_fetch
|
||||
pack $w.options.fetch -anchor nw
|
||||
|
||||
${NS}::checkbutton $w.options.checkout \
|
||||
ttk::checkbutton $w.options.checkout \
|
||||
-text [mc "Checkout After Creation"] \
|
||||
-variable @opt_checkout
|
||||
pack $w.options.checkout -anchor nw
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ field w_check ; # revision picker for merge test
|
|||
field w_delete ; # delete button
|
||||
|
||||
constructor dialog {} {
|
||||
global current_branch use_ttk NS
|
||||
global current_branch
|
||||
|
||||
make_dialog top w
|
||||
wm withdraw $w
|
||||
|
|
@ -18,25 +18,25 @@ constructor dialog {} {
|
|||
wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
|
||||
}
|
||||
|
||||
${NS}::label $w.header -text [mc "Delete Local Branch"] \
|
||||
ttk::label $w.header -text [mc "Delete Local Branch"] \
|
||||
-font font_uibold -anchor center
|
||||
pack $w.header -side top -fill x
|
||||
|
||||
${NS}::frame $w.buttons
|
||||
ttk::frame $w.buttons
|
||||
set w_delete $w.buttons.delete
|
||||
${NS}::button $w_delete \
|
||||
ttk::button $w_delete \
|
||||
-text [mc Delete] \
|
||||
-default active \
|
||||
-state disabled \
|
||||
-command [cb _delete]
|
||||
pack $w_delete -side right
|
||||
${NS}::button $w.buttons.cancel \
|
||||
ttk::button $w.buttons.cancel \
|
||||
-text [mc Cancel] \
|
||||
-command [list destroy $w]
|
||||
pack $w.buttons.cancel -side right -padx 5
|
||||
pack $w.buttons -side bottom -fill x -pady 10 -padx 10
|
||||
|
||||
${NS}::labelframe $w.list -text [mc "Local Branches"]
|
||||
ttk::labelframe $w.list -text [mc "Local Branches"]
|
||||
set w_heads $w.list.l
|
||||
slistbox $w_heads \
|
||||
-height 10 \
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ field oldname
|
|||
field newname
|
||||
|
||||
constructor dialog {} {
|
||||
global current_branch use_ttk NS
|
||||
global current_branch
|
||||
|
||||
make_dialog top w
|
||||
wm withdraw $w
|
||||
|
|
@ -20,31 +20,27 @@ constructor dialog {} {
|
|||
set oldname $current_branch
|
||||
set newname [get_config gui.newbranchtemplate]
|
||||
|
||||
${NS}::label $w.header -text [mc "Rename Branch"]\
|
||||
ttk::label $w.header -text [mc "Rename Branch"]\
|
||||
-font font_uibold -anchor center
|
||||
pack $w.header -side top -fill x
|
||||
|
||||
${NS}::frame $w.buttons
|
||||
${NS}::button $w.buttons.rename -text [mc Rename] \
|
||||
ttk::frame $w.buttons
|
||||
ttk::button $w.buttons.rename -text [mc Rename] \
|
||||
-default active \
|
||||
-command [cb _rename]
|
||||
pack $w.buttons.rename -side right
|
||||
${NS}::button $w.buttons.cancel -text [mc Cancel] \
|
||||
ttk::button $w.buttons.cancel -text [mc Cancel] \
|
||||
-command [list destroy $w]
|
||||
pack $w.buttons.cancel -side right -padx 5
|
||||
pack $w.buttons -side bottom -fill x -pady 10 -padx 10
|
||||
|
||||
${NS}::frame $w.rename
|
||||
${NS}::label $w.rename.oldname_l -text [mc "Branch:"]
|
||||
if {$use_ttk} {
|
||||
ttk::combobox $w.rename.oldname_m -textvariable @oldname \
|
||||
-values [load_all_heads] -state readonly
|
||||
} else {
|
||||
eval tk_optionMenu $w.rename.oldname_m @oldname [load_all_heads]
|
||||
}
|
||||
ttk::frame $w.rename
|
||||
ttk::label $w.rename.oldname_l -text [mc "Branch:"]
|
||||
ttk::combobox $w.rename.oldname_m -textvariable @oldname \
|
||||
-values [load_all_heads] -state readonly
|
||||
|
||||
${NS}::label $w.rename.newname_l -text [mc "New Name:"]
|
||||
${NS}::entry $w.rename.newname_t \
|
||||
ttk::label $w.rename.newname_l -text [mc "New Name:"]
|
||||
ttk::entry $w.rename.newname_t \
|
||||
-width 40 \
|
||||
-textvariable @newname \
|
||||
-validate key \
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ field browser_busy 1
|
|||
field ls_buf {}; # Buffered record output from ls-tree
|
||||
|
||||
constructor new {commit {path {}}} {
|
||||
global cursor_ptr M1B use_ttk NS
|
||||
global cursor_ptr M1B
|
||||
make_dialog top w
|
||||
wm withdraw $top
|
||||
wm title $top [mc "%s (%s): File Browser" [appname] [reponame]]
|
||||
|
|
@ -35,15 +35,14 @@ constructor new {commit {path {}}} {
|
|||
set browser_commit $commit
|
||||
set browser_path "$browser_commit:[escape_path $path]"
|
||||
|
||||
${NS}::label $w.path \
|
||||
ttk::label $w.path \
|
||||
-textvariable @browser_path \
|
||||
-anchor w \
|
||||
-justify left \
|
||||
-font font_uibold
|
||||
if {!$use_ttk} { $w.path configure -borderwidth 1 -relief sunken}
|
||||
pack $w.path -anchor w -side top -fill x
|
||||
|
||||
${NS}::frame $w.list
|
||||
ttk::frame $w.list
|
||||
set w_list $w.list.l
|
||||
text $w_list -background white -foreground black \
|
||||
-borderwidth 0 \
|
||||
|
|
@ -55,18 +54,17 @@ constructor new {commit {path {}}} {
|
|||
-xscrollcommand [list $w.list.sbx set] \
|
||||
-yscrollcommand [list $w.list.sby set]
|
||||
rmsel_tag $w_list
|
||||
${NS}::scrollbar $w.list.sbx -orient h -command [list $w_list xview]
|
||||
${NS}::scrollbar $w.list.sby -orient v -command [list $w_list yview]
|
||||
ttk::scrollbar $w.list.sbx -orient h -command [list $w_list xview]
|
||||
ttk::scrollbar $w.list.sby -orient v -command [list $w_list yview]
|
||||
pack $w.list.sbx -side bottom -fill x
|
||||
pack $w.list.sby -side right -fill y
|
||||
pack $w_list -side left -fill both -expand 1
|
||||
pack $w.list -side top -fill both -expand 1
|
||||
|
||||
${NS}::label $w.status \
|
||||
ttk::label $w.status \
|
||||
-textvariable @browser_status \
|
||||
-anchor w \
|
||||
-justify left
|
||||
if {!$use_ttk} { $w.status configure -borderwidth 1 -relief sunken}
|
||||
pack $w.status -anchor w -side bottom -fill x
|
||||
|
||||
bind $w_list <Button-1> "[cb _click 0 @%x,%y];break"
|
||||
|
|
@ -269,7 +267,6 @@ field w ; # widget path
|
|||
field w_rev ; # mega-widget to pick the initial revision
|
||||
|
||||
constructor dialog {} {
|
||||
global use_ttk NS
|
||||
make_dialog top w
|
||||
wm withdraw $top
|
||||
wm title $top [mc "%s (%s): Browse Branch Files" [appname] [reponame]]
|
||||
|
|
@ -278,18 +275,18 @@ constructor dialog {} {
|
|||
wm transient $top .
|
||||
}
|
||||
|
||||
${NS}::label $w.header \
|
||||
ttk::label $w.header \
|
||||
-text [mc "Browse Branch Files"] \
|
||||
-font font_uibold \
|
||||
-anchor center
|
||||
pack $w.header -side top -fill x
|
||||
|
||||
${NS}::frame $w.buttons
|
||||
${NS}::button $w.buttons.browse -text [mc Browse] \
|
||||
ttk::frame $w.buttons
|
||||
ttk::button $w.buttons.browse -text [mc Browse] \
|
||||
-default active \
|
||||
-command [cb _open]
|
||||
pack $w.buttons.browse -side right
|
||||
${NS}::button $w.buttons.cancel -text [mc Cancel] \
|
||||
ttk::button $w.buttons.cancel -text [mc Cancel] \
|
||||
-command [list destroy $w]
|
||||
pack $w.buttons.cancel -side right -padx 5
|
||||
pack $w.buttons -side bottom -fill x -pady 10 -padx 10
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ method _finish_fetch {ok} {
|
|||
}
|
||||
|
||||
method _update_ref {} {
|
||||
global null_sha1 current_branch repo_config
|
||||
global nullid current_branch repo_config
|
||||
|
||||
set ref $new_ref
|
||||
set new $new_hash
|
||||
|
|
@ -177,7 +177,7 @@ method _update_ref {} {
|
|||
}
|
||||
|
||||
set reflog_msg "branch: Created from $new_expr"
|
||||
set cur $null_sha1
|
||||
set cur $nullid
|
||||
|
||||
if {($repo_config(branch.autosetupmerge) eq {true}
|
||||
|| $repo_config(branch.autosetupmerge) eq {always})
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ variable all_families [list] ; # All fonts known to Tk
|
|||
|
||||
constructor pick {path title a_family a_size} {
|
||||
variable all_families
|
||||
global use_ttk NS
|
||||
|
||||
set v_family $a_family
|
||||
set v_size $a_size
|
||||
|
|
@ -33,25 +32,25 @@ constructor pick {path title a_family a_size} {
|
|||
wm title $top "[appname] ([reponame]): $title"
|
||||
wm geometry $top "+[winfo rootx $path]+[winfo rooty $path]"
|
||||
|
||||
${NS}::label $w.header -text $title -font font_uibold -anchor center
|
||||
ttk::label $w.header -text $title -font font_uibold -anchor center
|
||||
pack $w.header -side top -fill x
|
||||
|
||||
${NS}::frame $w.buttons
|
||||
${NS}::button $w.buttons.select \
|
||||
ttk::frame $w.buttons
|
||||
ttk::button $w.buttons.select \
|
||||
-text [mc Select] \
|
||||
-default active \
|
||||
-command [cb _select]
|
||||
${NS}::button $w.buttons.cancel \
|
||||
ttk::button $w.buttons.cancel \
|
||||
-text [mc Cancel] \
|
||||
-command [list destroy $w]
|
||||
pack $w.buttons.select -side right
|
||||
pack $w.buttons.cancel -side right -padx 5
|
||||
pack $w.buttons -side bottom -fill x -pady 10 -padx 10
|
||||
|
||||
${NS}::frame $w.inner
|
||||
ttk::frame $w.inner
|
||||
|
||||
${NS}::frame $w.inner.family
|
||||
${NS}::label $w.inner.family.l \
|
||||
ttk::frame $w.inner.family
|
||||
ttk::label $w.inner.family.l \
|
||||
-text [mc "Font Family"] \
|
||||
-anchor w
|
||||
set w_family $w.inner.family.v
|
||||
|
|
@ -66,13 +65,13 @@ constructor pick {path title a_family a_size} {
|
|||
-height 10 \
|
||||
-yscrollcommand [list $w.inner.family.sby set]
|
||||
rmsel_tag $w_family
|
||||
${NS}::scrollbar $w.inner.family.sby -command [list $w_family yview]
|
||||
ttk::scrollbar $w.inner.family.sby -command [list $w_family yview]
|
||||
pack $w.inner.family.l -side top -fill x
|
||||
pack $w.inner.family.sby -side right -fill y
|
||||
pack $w_family -fill both -expand 1
|
||||
|
||||
${NS}::frame $w.inner.size
|
||||
${NS}::label $w.inner.size.l \
|
||||
ttk::frame $w.inner.size
|
||||
ttk::label $w.inner.size.l \
|
||||
-text [mc "Font Size"] \
|
||||
-anchor w
|
||||
tspinbox $w.inner.size.v \
|
||||
|
|
@ -88,8 +87,8 @@ constructor pick {path title a_family a_size} {
|
|||
grid columnconfigure $w.inner 0 -weight 1
|
||||
pack $w.inner -fill both -expand 1 -padx 5 -pady 5
|
||||
|
||||
${NS}::frame $w.example
|
||||
${NS}::label $w.example.l \
|
||||
ttk::frame $w.example
|
||||
ttk::label $w.example.l \
|
||||
-text [mc "Font Example"] \
|
||||
-anchor w
|
||||
set w_example $w.example.t
|
||||
|
|
|
|||
|
|
@ -10,22 +10,12 @@ field w_next ; # Next button
|
|||
field w_quit ; # Quit button
|
||||
field o_cons ; # Console object (if active)
|
||||
|
||||
# Status mega-widget instance during _do_clone2 (used by _copy_files and
|
||||
# _link_files). Widget is destroyed before _do_clone2 calls
|
||||
# _do_clone_checkout
|
||||
field o_status
|
||||
|
||||
# Operation displayed by status mega-widget during _do_clone_checkout =>
|
||||
# _readtree_wait => _postcheckout_wait => _do_clone_submodules =>
|
||||
# _do_validate_submodule_cloning. The status mega-widget is a different
|
||||
# instance than that stored in $o_status in earlier operations.
|
||||
field o_status_op
|
||||
|
||||
field w_types ; # List of type buttons in clone
|
||||
field w_recentlist ; # Listbox containing recent repositories
|
||||
field w_localpath ; # Entry widget bound to local_path
|
||||
|
||||
field done 0 ; # Finished picking the repository?
|
||||
field clone_ok false ; # clone succeeeded
|
||||
field local_path {} ; # Where this repository is locally
|
||||
field origin_url {} ; # Where we are cloning from
|
||||
field origin_name origin ; # What we shall call 'origin'
|
||||
|
|
@ -35,7 +25,7 @@ field readtree_err ; # Error output from read-tree (if any)
|
|||
field sorted_recent ; # recent repositories (sorted)
|
||||
|
||||
constructor pick {} {
|
||||
global M1T M1B use_ttk NS
|
||||
global M1T M1B
|
||||
|
||||
if {[set maxrecent [get_config gui.maxrecentrepo]] eq {}} {
|
||||
set maxrecent 10
|
||||
|
|
@ -88,7 +78,7 @@ constructor pick {} {
|
|||
|
||||
set w_body $w.body
|
||||
set opts $w_body.options
|
||||
${NS}::frame $w_body
|
||||
ttk::frame $w_body
|
||||
text $opts \
|
||||
-cursor $::cursor_ptr \
|
||||
-relief flat \
|
||||
|
|
@ -158,8 +148,8 @@ constructor pick {} {
|
|||
set lenrecent $maxrecent
|
||||
}
|
||||
|
||||
${NS}::label $w_body.space
|
||||
${NS}::label $w_body.recentlabel \
|
||||
ttk::label $w_body.space
|
||||
ttk::label $w_body.recentlabel \
|
||||
-anchor w \
|
||||
-text [mc "Open Recent Repository:"]
|
||||
set w_recentlist $w_body.recentlist
|
||||
|
|
@ -199,10 +189,10 @@ constructor pick {} {
|
|||
}
|
||||
pack $w_body -fill x -padx 10 -pady 10
|
||||
|
||||
${NS}::frame $w.buttons
|
||||
ttk::frame $w.buttons
|
||||
set w_next $w.buttons.next
|
||||
set w_quit $w.buttons.quit
|
||||
${NS}::button $w_quit \
|
||||
ttk::button $w_quit \
|
||||
-text [mc "Quit"] \
|
||||
-command exit
|
||||
pack $w_quit -side right -padx 5
|
||||
|
|
@ -303,10 +293,9 @@ method _open_recent_path {p} {
|
|||
}
|
||||
|
||||
method _next {action} {
|
||||
global NS
|
||||
destroy $w_body
|
||||
if {![winfo exists $w_next]} {
|
||||
${NS}::button $w_next -default active
|
||||
ttk::button $w_next -default active
|
||||
set pos -before
|
||||
if {[tk windowingsystem] eq "win32"} { set pos -after }
|
||||
pack $w_next -side right -padx 5 $pos $w_quit
|
||||
|
|
@ -323,7 +312,7 @@ method _write_local_path {args} {
|
|||
}
|
||||
|
||||
method _git_init {} {
|
||||
if {[catch {file mkdir $local_path} err]} {
|
||||
if {[catch {git init $local_path} err]} {
|
||||
error_popup [strcat \
|
||||
[mc "Failed to create repository %s:" $local_path] \
|
||||
"\n\n$err"]
|
||||
|
|
@ -337,13 +326,6 @@ method _git_init {} {
|
|||
return 0
|
||||
}
|
||||
|
||||
if {[catch {git init} err]} {
|
||||
error_popup [strcat \
|
||||
[mc "Failed to create repository %s:" $local_path] \
|
||||
"\n\n$err"]
|
||||
return 0
|
||||
}
|
||||
|
||||
_append_recentrepos [pwd]
|
||||
set ::_gitdir .git
|
||||
set ::_prefix {}
|
||||
|
|
@ -360,44 +342,29 @@ proc _is_git {path {outdir_var ""}} {
|
|||
return 1
|
||||
}
|
||||
|
||||
proc _objdir {path} {
|
||||
set objdir [file join $path .git objects]
|
||||
if {[file isdirectory $objdir]} {
|
||||
return $objdir
|
||||
}
|
||||
|
||||
set objdir [file join $path objects]
|
||||
if {[file isdirectory $objdir]} {
|
||||
return $objdir
|
||||
}
|
||||
|
||||
return {}
|
||||
}
|
||||
|
||||
######################################################################
|
||||
##
|
||||
## Create New Repository
|
||||
|
||||
method _do_new {} {
|
||||
global use_ttk NS
|
||||
$w_next conf \
|
||||
-state disabled \
|
||||
-command [cb _do_new2] \
|
||||
-text [mc "Create"]
|
||||
|
||||
${NS}::frame $w_body
|
||||
${NS}::label $w_body.h \
|
||||
ttk::frame $w_body
|
||||
ttk::label $w_body.h \
|
||||
-font font_uibold -anchor center \
|
||||
-text [mc "Create New Repository"]
|
||||
pack $w_body.h -side top -fill x -pady 10
|
||||
pack $w_body -fill x -padx 10
|
||||
|
||||
${NS}::frame $w_body.where
|
||||
${NS}::label $w_body.where.l -text [mc "Directory:"]
|
||||
${NS}::entry $w_body.where.t \
|
||||
ttk::frame $w_body.where
|
||||
ttk::label $w_body.where.l -text [mc "Directory:"]
|
||||
ttk::entry $w_body.where.t \
|
||||
-textvariable @local_path \
|
||||
-width 50
|
||||
${NS}::button $w_body.where.b \
|
||||
ttk::button $w_body.where.b \
|
||||
-text [mc "Browse"] \
|
||||
-command [cb _new_local_path]
|
||||
set w_localpath $w_body.where.t
|
||||
|
|
@ -463,56 +430,55 @@ proc _new_ok {p} {
|
|||
## Clone Existing Repository
|
||||
|
||||
method _do_clone {} {
|
||||
global use_ttk NS
|
||||
$w_next conf \
|
||||
-state disabled \
|
||||
-command [cb _do_clone2] \
|
||||
-text [mc "Clone"]
|
||||
|
||||
${NS}::frame $w_body
|
||||
${NS}::label $w_body.h \
|
||||
ttk::frame $w_body
|
||||
ttk::label $w_body.h \
|
||||
-font font_uibold -anchor center \
|
||||
-text [mc "Clone Existing Repository"]
|
||||
pack $w_body.h -side top -fill x -pady 10
|
||||
pack $w_body -fill x -padx 10
|
||||
|
||||
set args $w_body.args
|
||||
${NS}::frame $w_body.args
|
||||
ttk::frame $w_body.args
|
||||
pack $args -fill both
|
||||
|
||||
${NS}::label $args.origin_l -text [mc "Source Location:"]
|
||||
${NS}::entry $args.origin_t \
|
||||
ttk::label $args.origin_l -text [mc "Source Location:"]
|
||||
ttk::entry $args.origin_t \
|
||||
-textvariable @origin_url \
|
||||
-width 50
|
||||
${NS}::button $args.origin_b \
|
||||
ttk::button $args.origin_b \
|
||||
-text [mc "Browse"] \
|
||||
-command [cb _open_origin]
|
||||
grid $args.origin_l $args.origin_t $args.origin_b -sticky ew
|
||||
|
||||
${NS}::label $args.where_l -text [mc "Target Directory:"]
|
||||
${NS}::entry $args.where_t \
|
||||
ttk::label $args.where_l -text [mc "Target Directory:"]
|
||||
ttk::entry $args.where_t \
|
||||
-textvariable @local_path \
|
||||
-width 50
|
||||
${NS}::button $args.where_b \
|
||||
ttk::button $args.where_b \
|
||||
-text [mc "Browse"] \
|
||||
-command [cb _new_local_path]
|
||||
grid $args.where_l $args.where_t $args.where_b -sticky ew
|
||||
set w_localpath $args.where_t
|
||||
|
||||
${NS}::label $args.type_l -text [mc "Clone Type:"]
|
||||
${NS}::frame $args.type_f
|
||||
ttk::label $args.type_l -text [mc "Clone Type:"]
|
||||
ttk::frame $args.type_f
|
||||
set w_types [list]
|
||||
lappend w_types [${NS}::radiobutton $args.type_f.hardlink \
|
||||
lappend w_types [ttk::radiobutton $args.type_f.hardlink \
|
||||
-state disabled \
|
||||
-text [mc "Standard (Fast, Semi-Redundant, Hardlinks)"] \
|
||||
-variable @clone_type \
|
||||
-value hardlink]
|
||||
lappend w_types [${NS}::radiobutton $args.type_f.full \
|
||||
lappend w_types [ttk::radiobutton $args.type_f.full \
|
||||
-state disabled \
|
||||
-text [mc "Full Copy (Slower, Redundant Backup)"] \
|
||||
-variable @clone_type \
|
||||
-value full]
|
||||
lappend w_types [${NS}::radiobutton $args.type_f.shared \
|
||||
lappend w_types [ttk::radiobutton $args.type_f.shared \
|
||||
-state disabled \
|
||||
-text [mc "Shared (Fastest, Not Recommended, No Backup)"] \
|
||||
-variable @clone_type \
|
||||
|
|
@ -520,7 +486,7 @@ method _do_clone {} {
|
|||
foreach r $w_types {
|
||||
pack $r -anchor w
|
||||
}
|
||||
${NS}::checkbutton $args.type_f.recursive \
|
||||
ttk::checkbutton $args.type_f.recursive \
|
||||
-text [mc "Recursively clone submodules too"] \
|
||||
-variable @recursive \
|
||||
-onvalue true -offvalue false
|
||||
|
|
@ -588,6 +554,25 @@ method _update_clone {args} {
|
|||
method _do_clone2 {} {
|
||||
if {[file isdirectory $origin_url]} {
|
||||
set origin_url [file normalize $origin_url]
|
||||
if {$clone_type eq {hardlink}} {
|
||||
# cannot use hardlinks if this is a linked worktree (.gitfile or git-new-workdir)
|
||||
if {[git -C $origin_url rev-parse --is-inside-work-tree] == {true}} {
|
||||
set islink 0
|
||||
set dotgit [file join $origin_url .git]
|
||||
if {[file isfile $dotgit]} {
|
||||
set islink 1
|
||||
} else {
|
||||
set objdir [file join $dotgit objects]
|
||||
if {[file exists $objdir] && [file type $objdir] == {link}} {
|
||||
set islink 1
|
||||
}
|
||||
}
|
||||
if {$islink} {
|
||||
info_popup [mc "Hardlinks are unavailable. Falling back to copying."]
|
||||
set clone_type full
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if {$clone_type eq {hardlink} && ![file isdirectory $origin_url]} {
|
||||
|
|
@ -599,14 +584,6 @@ method _do_clone2 {} {
|
|||
return
|
||||
}
|
||||
|
||||
if {$clone_type eq {hardlink} || $clone_type eq {shared}} {
|
||||
set objdir [_objdir $origin_url]
|
||||
if {$objdir eq {}} {
|
||||
error_popup [mc "Not a Git repository: %s" [file tail $origin_url]]
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
set giturl $origin_url
|
||||
|
||||
if {[file exists $local_path]} {
|
||||
|
|
@ -614,459 +591,86 @@ method _do_clone2 {} {
|
|||
return
|
||||
}
|
||||
|
||||
if {![_git_init $this]} return
|
||||
set local_path [pwd]
|
||||
|
||||
if {[catch {
|
||||
git config remote.$origin_name.url $giturl
|
||||
git config remote.$origin_name.fetch +refs/heads/*:refs/remotes/$origin_name/*
|
||||
} err]} {
|
||||
error_popup [strcat [mc "Failed to configure origin"] "\n\n$err"]
|
||||
return
|
||||
set clone_options {--progress}
|
||||
if {$recursive} {
|
||||
append clone_options { --recurse-submodules}
|
||||
}
|
||||
|
||||
destroy $w_body $w_next
|
||||
|
||||
switch -exact -- $clone_type {
|
||||
hardlink {
|
||||
set o_status [status_bar::two_line $w_body]
|
||||
pack $w_body -fill x -padx 10 -pady 10
|
||||
|
||||
set status_op [$o_status start \
|
||||
[mc "Counting objects"] \
|
||||
[mc "buckets"]]
|
||||
update
|
||||
|
||||
if {[file exists [file join $objdir info alternates]]} {
|
||||
set pwd [pwd]
|
||||
if {[catch {
|
||||
file mkdir [gitdir objects info]
|
||||
set f_in [safe_open_file [file join $objdir info alternates] r]
|
||||
set f_cp [safe_open_file [gitdir objects info alternates] w]
|
||||
fconfigure $f_in -translation binary -encoding binary
|
||||
fconfigure $f_cp -translation binary -encoding binary
|
||||
cd $objdir
|
||||
while {[gets $f_in line] >= 0} {
|
||||
puts $f_cp [file normalize $line]
|
||||
}
|
||||
close $f_in
|
||||
close $f_cp
|
||||
cd $pwd
|
||||
} err]} {
|
||||
catch {cd $pwd}
|
||||
_clone_failed $this [mc "Unable to copy objects/info/alternates: %s" $err]
|
||||
$status_op stop
|
||||
return
|
||||
}
|
||||
full {
|
||||
append clone_options { --no-hardlinks --no-local}
|
||||
}
|
||||
|
||||
set tolink [list]
|
||||
set buckets [glob \
|
||||
-tails \
|
||||
-nocomplain \
|
||||
-directory [file join $objdir] ??]
|
||||
set bcnt [expr {[llength $buckets] + 2}]
|
||||
set bcur 1
|
||||
$status_op update $bcur $bcnt
|
||||
update
|
||||
|
||||
file mkdir [file join .git objects pack]
|
||||
foreach i [glob -tails -nocomplain \
|
||||
-directory [file join $objdir pack] *] {
|
||||
lappend tolink [file join pack $i]
|
||||
shared {
|
||||
append clone_options { --shared}
|
||||
}
|
||||
$status_op update [incr bcur] $bcnt
|
||||
update
|
||||
|
||||
foreach i $buckets {
|
||||
file mkdir [file join .git objects $i]
|
||||
foreach j [glob -tails -nocomplain \
|
||||
-directory [file join $objdir $i] *] {
|
||||
lappend tolink [file join $i $j]
|
||||
}
|
||||
$status_op update [incr bcur] $bcnt
|
||||
update
|
||||
}
|
||||
$status_op stop
|
||||
|
||||
if {$tolink eq {}} {
|
||||
info_popup [strcat \
|
||||
[mc "Nothing to clone from %s." $origin_url] \
|
||||
"\n" \
|
||||
[mc "The 'master' branch has not been initialized."] \
|
||||
]
|
||||
destroy $w_body
|
||||
set done 1
|
||||
return
|
||||
}
|
||||
|
||||
set i [lindex $tolink 0]
|
||||
if {[catch {
|
||||
file link -hard \
|
||||
[file join .git objects $i] \
|
||||
[file join $objdir $i]
|
||||
} err]} {
|
||||
info_popup [mc "Hardlinks are unavailable. Falling back to copying."]
|
||||
set i [_copy_files $this $objdir $tolink]
|
||||
} else {
|
||||
set i [_link_files $this $objdir [lrange $tolink 1 end]]
|
||||
}
|
||||
if {!$i} return
|
||||
|
||||
destroy $w_body
|
||||
|
||||
set o_status {}
|
||||
}
|
||||
full {
|
||||
|
||||
if {[catch {
|
||||
set o_cons [console::embed \
|
||||
$w_body \
|
||||
[mc "Cloning from %s" $origin_url]]
|
||||
pack $w_body -fill both -expand 1 -padx 10
|
||||
$o_cons exec \
|
||||
[list git fetch --no-tags -k $origin_name] \
|
||||
[cb _do_clone_tags]
|
||||
}
|
||||
shared {
|
||||
set fd [safe_open_file [gitdir objects info alternates] w]
|
||||
fconfigure $fd -translation binary
|
||||
puts $fd $objdir
|
||||
close $fd
|
||||
}
|
||||
[list git clone {*}$clone_options $origin_url $local_path] \
|
||||
[cb _do_clone2_done]
|
||||
} err]} {
|
||||
error_popup [strcat [mc "Clone failed."] "\n" $err]
|
||||
return
|
||||
}
|
||||
|
||||
if {$clone_type eq {hardlink} || $clone_type eq {shared}} {
|
||||
if {![_clone_refs $this]} return
|
||||
set pwd [pwd]
|
||||
if {[catch {
|
||||
cd $origin_url
|
||||
set HEAD [git rev-parse --verify HEAD^0]
|
||||
} err]} {
|
||||
_clone_failed $this [mc "Not a Git repository: %s" [file tail $origin_url]]
|
||||
return 0
|
||||
}
|
||||
cd $pwd
|
||||
_do_clone_checkout $this $HEAD
|
||||
tkwait variable @done
|
||||
if {!$clone_ok} {
|
||||
error_popup [mc "Clone failed."]
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
method _copy_files {objdir tocopy} {
|
||||
set status_op [$o_status start \
|
||||
[mc "Copying objects"] \
|
||||
[mc "KiB"]]
|
||||
set tot 0
|
||||
set cmp 0
|
||||
foreach p $tocopy {
|
||||
incr tot [file size [file join $objdir $p]]
|
||||
}
|
||||
foreach p $tocopy {
|
||||
if {[catch {
|
||||
set f_in [safe_open_file [file join $objdir $p] r]
|
||||
set f_cp [safe_open_file [file join .git objects $p] w]
|
||||
fconfigure $f_in -translation binary -encoding binary
|
||||
fconfigure $f_cp -translation binary -encoding binary
|
||||
|
||||
while {![eof $f_in]} {
|
||||
incr cmp [fcopy $f_in $f_cp -size 16384]
|
||||
$status_op update \
|
||||
[expr {$cmp / 1024}] \
|
||||
[expr {$tot / 1024}]
|
||||
update
|
||||
}
|
||||
|
||||
close $f_in
|
||||
close $f_cp
|
||||
} err]} {
|
||||
_clone_failed $this [mc "Unable to copy object: %s" $err]
|
||||
$status_op stop
|
||||
return 0
|
||||
}
|
||||
}
|
||||
$status_op stop
|
||||
return 1
|
||||
}
|
||||
|
||||
method _link_files {objdir tolink} {
|
||||
set total [llength $tolink]
|
||||
set status_op [$o_status start \
|
||||
[mc "Linking objects"] \
|
||||
[mc "objects"]]
|
||||
for {set i 0} {$i < $total} {} {
|
||||
set p [lindex $tolink $i]
|
||||
if {[catch {
|
||||
file link -hard \
|
||||
[file join .git objects $p] \
|
||||
[file join $objdir $p]
|
||||
} err]} {
|
||||
_clone_failed $this [mc "Unable to hardlink object: %s" $err]
|
||||
$status_op stop
|
||||
return 0
|
||||
}
|
||||
|
||||
incr i
|
||||
if {$i % 5 == 0} {
|
||||
$status_op update $i $total
|
||||
update
|
||||
}
|
||||
}
|
||||
$status_op stop
|
||||
return 1
|
||||
}
|
||||
|
||||
method _clone_refs {} {
|
||||
set pwd [pwd]
|
||||
if {[catch {cd $origin_url} err]} {
|
||||
error_popup [mc "Not a Git repository: %s" [file tail $origin_url]]
|
||||
return 0
|
||||
}
|
||||
set fd_in [git_read [list for-each-ref \
|
||||
--tcl \
|
||||
{--format=list %(refname) %(objectname) %(*objectname)}]]
|
||||
cd $pwd
|
||||
|
||||
set fd [safe_open_file [gitdir packed-refs] w]
|
||||
fconfigure $fd -translation binary
|
||||
puts $fd "# pack-refs with: peeled"
|
||||
while {[gets $fd_in line] >= 0} {
|
||||
set line [eval $line]
|
||||
set refn [lindex $line 0]
|
||||
set robj [lindex $line 1]
|
||||
set tobj [lindex $line 2]
|
||||
|
||||
if {[regsub ^refs/heads/ $refn \
|
||||
"refs/remotes/$origin_name/" refn]} {
|
||||
puts $fd "$robj $refn"
|
||||
} elseif {[string match refs/tags/* $refn]} {
|
||||
puts $fd "$robj $refn"
|
||||
if {$tobj ne {}} {
|
||||
puts $fd "^$tobj"
|
||||
}
|
||||
}
|
||||
}
|
||||
close $fd_in
|
||||
close $fd
|
||||
return 1
|
||||
}
|
||||
|
||||
method _do_clone_tags {ok} {
|
||||
if {$ok} {
|
||||
$o_cons exec \
|
||||
[list git fetch --tags -k $origin_name] \
|
||||
[cb _do_clone_HEAD]
|
||||
} else {
|
||||
$o_cons done $ok
|
||||
_clone_failed $this [mc "Cannot fetch branches and objects. See console output for details."]
|
||||
}
|
||||
}
|
||||
|
||||
method _do_clone_HEAD {ok} {
|
||||
if {$ok} {
|
||||
$o_cons exec \
|
||||
[list git fetch $origin_name HEAD] \
|
||||
[cb _do_clone_full_end]
|
||||
} else {
|
||||
$o_cons done $ok
|
||||
_clone_failed $this [mc "Cannot fetch tags. See console output for details."]
|
||||
}
|
||||
}
|
||||
|
||||
method _do_clone_full_end {ok} {
|
||||
method _do_clone2_done {ok} {
|
||||
$o_cons done $ok
|
||||
|
||||
if {$ok} {
|
||||
destroy $w_body
|
||||
|
||||
set HEAD {}
|
||||
if {[file exists [gitdir FETCH_HEAD]]} {
|
||||
set fd [safe_open_file [gitdir FETCH_HEAD] r]
|
||||
while {[gets $fd line] >= 0} {
|
||||
if {[regexp "^(.{40})\t\t" $line line HEAD]} {
|
||||
break
|
||||
}
|
||||
}
|
||||
close $fd
|
||||
}
|
||||
|
||||
catch {git pack-refs}
|
||||
_do_clone_checkout $this $HEAD
|
||||
} else {
|
||||
_clone_failed $this [mc "Cannot determine HEAD. See console output for details."]
|
||||
}
|
||||
}
|
||||
|
||||
method _clone_failed {{why {}}} {
|
||||
if {[catch {file delete -force $local_path} err]} {
|
||||
set why [strcat \
|
||||
$why \
|
||||
"\n\n" \
|
||||
[mc "Unable to cleanup %s" $local_path] \
|
||||
"\n\n" \
|
||||
$err]
|
||||
}
|
||||
if {$why ne {}} {
|
||||
update
|
||||
error_popup [strcat [mc "Clone failed."] "\n" $why]
|
||||
}
|
||||
}
|
||||
|
||||
method _do_clone_checkout {HEAD} {
|
||||
if {$HEAD eq {}} {
|
||||
info_popup [strcat \
|
||||
[mc "No default branch obtained."] \
|
||||
"\n" \
|
||||
[mc "The 'master' branch has not been initialized."] \
|
||||
]
|
||||
set done 1
|
||||
return
|
||||
}
|
||||
if {[catch {
|
||||
git update-ref HEAD $HEAD^0
|
||||
if {[catch {
|
||||
cd $local_path
|
||||
set ::_gitdir .git
|
||||
set ::_prefix {}
|
||||
_append_recentrepos [pwd]
|
||||
} err]} {
|
||||
info_popup [strcat \
|
||||
[mc "Cannot resolve %s as a commit." $HEAD^0] \
|
||||
"\n $err" \
|
||||
"\n" \
|
||||
[mc "The 'master' branch has not been initialized."] \
|
||||
]
|
||||
set done 1
|
||||
return
|
||||
}
|
||||
|
||||
set status [status_bar::two_line $w_body]
|
||||
pack $w_body -fill x -padx 10 -pady 10
|
||||
|
||||
# We start the status operation here.
|
||||
#
|
||||
# This function calls _readtree_wait as a callback.
|
||||
#
|
||||
# _readtree_wait in turn either calls _do_clone_submodules directly,
|
||||
# or calls _postcheckout_wait as a callback which then calls
|
||||
# _do_clone_submodules.
|
||||
#
|
||||
# _do_clone_submodules calls _do_validate_submodule_cloning.
|
||||
#
|
||||
# _do_validate_submodule_cloning stops the status operation.
|
||||
#
|
||||
# There are no other calls into this chain from other code.
|
||||
|
||||
set o_status_op [$status start \
|
||||
[mc "Creating working directory"] \
|
||||
[mc "files"]]
|
||||
|
||||
set readtree_err {}
|
||||
set fd [git_read [list read-tree \
|
||||
-m \
|
||||
-u \
|
||||
-v \
|
||||
HEAD \
|
||||
HEAD \
|
||||
] \
|
||||
[list 2>@1]]
|
||||
fconfigure $fd -blocking 0 -translation binary
|
||||
fileevent $fd readable [cb _readtree_wait $fd]
|
||||
}
|
||||
|
||||
method _readtree_wait {fd} {
|
||||
set buf [read $fd]
|
||||
$o_status_op update_meter $buf
|
||||
append readtree_err $buf
|
||||
|
||||
fconfigure $fd -blocking 1
|
||||
if {![eof $fd]} {
|
||||
fconfigure $fd -blocking 0
|
||||
return
|
||||
}
|
||||
|
||||
if {[catch {close $fd}]} {
|
||||
set err $readtree_err
|
||||
regsub {^fatal: } $err {} err
|
||||
error_popup [strcat \
|
||||
[mc "Initial file checkout failed."] \
|
||||
"\n\n$err"]
|
||||
return
|
||||
}
|
||||
|
||||
# -- Run the post-checkout hook.
|
||||
#
|
||||
set fd_ph [githook_read post-checkout [string repeat 0 40] \
|
||||
[git rev-parse HEAD] 1]
|
||||
if {$fd_ph ne {}} {
|
||||
global pch_error
|
||||
set pch_error {}
|
||||
fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
|
||||
fileevent $fd_ph readable [cb _postcheckout_wait $fd_ph]
|
||||
} else {
|
||||
_do_clone_submodules $this
|
||||
}
|
||||
}
|
||||
|
||||
method _postcheckout_wait {fd_ph} {
|
||||
global pch_error
|
||||
|
||||
append pch_error [read $fd_ph]
|
||||
fconfigure $fd_ph -blocking 1
|
||||
if {[eof $fd_ph]} {
|
||||
if {[catch {close $fd_ph}]} {
|
||||
hook_failed_popup post-checkout $pch_error 0
|
||||
set ok 0
|
||||
}
|
||||
unset pch_error
|
||||
_do_clone_submodules $this
|
||||
return
|
||||
}
|
||||
fconfigure $fd_ph -blocking 0
|
||||
if {!$ok} {
|
||||
set ::_gitdir {}
|
||||
set ::_prefix {}
|
||||
}
|
||||
set clone_ok $ok
|
||||
set done 1
|
||||
}
|
||||
|
||||
method _do_clone_submodules {} {
|
||||
if {$recursive eq {true}} {
|
||||
$o_status_op stop
|
||||
set o_status_op {}
|
||||
|
||||
destroy $w_body
|
||||
|
||||
set o_cons [console::embed \
|
||||
$w_body \
|
||||
[mc "Cloning submodules"]]
|
||||
pack $w_body -fill both -expand 1 -padx 10
|
||||
$o_cons exec \
|
||||
[list git submodule update --init --recursive] \
|
||||
[cb _do_validate_submodule_cloning]
|
||||
} else {
|
||||
set done 1
|
||||
}
|
||||
}
|
||||
|
||||
method _do_validate_submodule_cloning {ok} {
|
||||
if {$ok} {
|
||||
$o_cons done $ok
|
||||
set done 1
|
||||
} else {
|
||||
_clone_failed $this [mc "Cannot clone submodules."]
|
||||
}
|
||||
}
|
||||
|
||||
######################################################################
|
||||
##
|
||||
## Open Existing Repository
|
||||
|
||||
method _do_open {} {
|
||||
global NS
|
||||
$w_next conf \
|
||||
-state disabled \
|
||||
-command [cb _do_open2] \
|
||||
-text [mc "Open"]
|
||||
|
||||
${NS}::frame $w_body
|
||||
${NS}::label $w_body.h \
|
||||
ttk::frame $w_body
|
||||
ttk::label $w_body.h \
|
||||
-font font_uibold -anchor center \
|
||||
-text [mc "Open Existing Repository"]
|
||||
pack $w_body.h -side top -fill x -pady 10
|
||||
pack $w_body -fill x -padx 10
|
||||
|
||||
${NS}::frame $w_body.where
|
||||
${NS}::label $w_body.where.l -text [mc "Repository:"]
|
||||
${NS}::entry $w_body.where.t \
|
||||
ttk::frame $w_body.where
|
||||
ttk::label $w_body.where.l -text [mc "Repository:"]
|
||||
ttk::entry $w_body.where.t \
|
||||
-textvariable @local_path \
|
||||
-width 50
|
||||
${NS}::button $w_body.where.b \
|
||||
ttk::button $w_body.where.b \
|
||||
-text [mc "Browse"] \
|
||||
-command [cb _open_local_path]
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ proc new_unmerged {path {title {}}} {
|
|||
}
|
||||
|
||||
constructor _new {path unmerged_only title} {
|
||||
global current_branch is_detached use_ttk NS
|
||||
global current_branch is_detached
|
||||
|
||||
if {![info exists ::all_remotes]} {
|
||||
load_all_remotes
|
||||
|
|
@ -41,65 +41,60 @@ constructor _new {path unmerged_only title} {
|
|||
set w $path
|
||||
|
||||
if {$title ne {}} {
|
||||
${NS}::labelframe $w -text $title
|
||||
ttk::labelframe $w -text $title
|
||||
} else {
|
||||
${NS}::frame $w
|
||||
ttk::frame $w
|
||||
}
|
||||
bind $w <Destroy> [cb _delete %W]
|
||||
|
||||
if {$is_detached} {
|
||||
${NS}::radiobutton $w.detachedhead_r \
|
||||
ttk::radiobutton $w.detachedhead_r \
|
||||
-text [mc "This Detached Checkout"] \
|
||||
-value HEAD \
|
||||
-variable @revtype
|
||||
if {!$use_ttk} {$w.detachedhead_r configure -anchor w}
|
||||
grid $w.detachedhead_r -sticky we -padx {0 5} -columnspan 2
|
||||
}
|
||||
|
||||
${NS}::radiobutton $w.expr_r \
|
||||
ttk::radiobutton $w.expr_r \
|
||||
-text [mc "Revision Expression:"] \
|
||||
-value expr \
|
||||
-variable @revtype
|
||||
${NS}::entry $w.expr_t \
|
||||
ttk::entry $w.expr_t \
|
||||
-width 50 \
|
||||
-textvariable @c_expr \
|
||||
-validate key \
|
||||
-validatecommand [cb _validate %d %S]
|
||||
grid $w.expr_r $w.expr_t -sticky we -padx {0 5}
|
||||
|
||||
${NS}::frame $w.types
|
||||
${NS}::radiobutton $w.types.head_r \
|
||||
ttk::frame $w.types
|
||||
ttk::radiobutton $w.types.head_r \
|
||||
-text [mc "Local Branch"] \
|
||||
-value head \
|
||||
-variable @revtype
|
||||
pack $w.types.head_r -side left
|
||||
${NS}::radiobutton $w.types.trck_r \
|
||||
ttk::radiobutton $w.types.trck_r \
|
||||
-text [mc "Tracking Branch"] \
|
||||
-value trck \
|
||||
-variable @revtype
|
||||
pack $w.types.trck_r -side left
|
||||
${NS}::radiobutton $w.types.tag_r \
|
||||
ttk::radiobutton $w.types.tag_r \
|
||||
-text [mc "Tag"] \
|
||||
-value tag \
|
||||
-variable @revtype
|
||||
pack $w.types.tag_r -side left
|
||||
set w_filter $w.types.filter
|
||||
${NS}::entry $w_filter \
|
||||
ttk::entry $w_filter \
|
||||
-width 12 \
|
||||
-textvariable @filter \
|
||||
-validate key \
|
||||
-validatecommand [cb _filter %P]
|
||||
pack $w_filter -side right
|
||||
pack [${NS}::label $w.types.filter_icon \
|
||||
pack [ttk::label $w.types.filter_icon \
|
||||
-image ::choose_rev::img_find \
|
||||
] -side right
|
||||
grid $w.types -sticky we -padx {0 5} -columnspan 2
|
||||
|
||||
if {$use_ttk} {
|
||||
ttk::frame $w.list -style SListbox.TFrame -padding 2
|
||||
} else {
|
||||
frame $w.list
|
||||
}
|
||||
ttk::frame $w.list -style SListbox.TFrame -padding 2
|
||||
set w_list $w.list.l
|
||||
listbox $w_list \
|
||||
-font font_diff \
|
||||
|
|
@ -109,9 +104,7 @@ constructor _new {path unmerged_only title} {
|
|||
-exportselection false \
|
||||
-xscrollcommand [cb _sb_set $w.list.sbx h] \
|
||||
-yscrollcommand [cb _sb_set $w.list.sby v]
|
||||
if {$use_ttk} {
|
||||
$w_list configure -relief flat -highlightthickness 0 -borderwidth 0
|
||||
}
|
||||
$w_list configure -relief flat -highlightthickness 0 -borderwidth 0
|
||||
pack $w_list -fill both -expand 1
|
||||
grid $w.list -sticky nswe -padx {20 5} -columnspan 2
|
||||
bind $w_list <Any-Motion> [cb _show_tooltip @%x,%y]
|
||||
|
|
@ -238,12 +231,10 @@ constructor _new {path unmerged_only title} {
|
|||
}
|
||||
|
||||
method none {text} {
|
||||
global NS use_ttk
|
||||
if {![winfo exists $w.none_r]} {
|
||||
${NS}::radiobutton $w.none_r \
|
||||
ttk::radiobutton $w.none_r \
|
||||
-value none \
|
||||
-variable @revtype
|
||||
if {!$use_ttk} {$w.none_r configure -anchor w}
|
||||
grid $w.none_r -sticky we -padx {0 5} -columnspan 2
|
||||
}
|
||||
$w.none_r configure -text $text
|
||||
|
|
@ -429,7 +420,6 @@ method _delete {current} {
|
|||
}
|
||||
|
||||
method _sb_set {sb orient first last} {
|
||||
global NS
|
||||
set old_focus [focus -lastfor $w]
|
||||
|
||||
if {$first == 0 && $last == 1} {
|
||||
|
|
@ -445,10 +435,10 @@ method _sb_set {sb orient first last} {
|
|||
|
||||
if {![winfo exists $sb]} {
|
||||
if {$orient eq {h}} {
|
||||
${NS}::scrollbar $sb -orient h -command [list $w_list xview]
|
||||
ttk::scrollbar $sb -orient h -command [list $w_list xview]
|
||||
pack $sb -fill x -side bottom -before $w_list
|
||||
} else {
|
||||
${NS}::scrollbar $sb -orient v -command [list $w_list yview]
|
||||
ttk::scrollbar $sb -orient v -command [list $w_list yview]
|
||||
pack $sb -fill y -side right -before $w_list
|
||||
}
|
||||
if {$old_focus ne {}} {
|
||||
|
|
|
|||
|
|
@ -136,7 +136,6 @@ proc delete_this {{t {}}} {
|
|||
|
||||
proc make_dialog {t w args} {
|
||||
upvar $t top $w pfx this this
|
||||
global use_ttk
|
||||
uplevel [linsert $args 0 make_toplevel $t $w]
|
||||
catch {wm attributes $top -type dialog}
|
||||
pave_toplevel $pfx
|
||||
|
|
|
|||
|
|
@ -214,12 +214,10 @@ You must stage at least 1 file before you can commit.
|
|||
global comment_string
|
||||
set cmt_rx [strcat {(^|\n)} [regsub -all {\W} $comment_string {\\&}] {[^\n]*}]
|
||||
regsub -all $cmt_rx $msg {\1} msg
|
||||
# Strip leading empty lines
|
||||
regsub {^\n*} $msg {} msg
|
||||
# Strip leading and trailing empty lines (puts adds one \n)
|
||||
set msg [string trim $msg \n]
|
||||
# Compress consecutive empty lines
|
||||
regsub -all {\n{3,}} $msg "\n\n" msg
|
||||
# Strip trailing empty line
|
||||
regsub {\n\n$} $msg "\n" msg
|
||||
if {$msg eq {}} {
|
||||
error_popup [mc "Please supply a commit message.
|
||||
|
||||
|
|
@ -348,6 +346,7 @@ proc commit_committree {fd_wt curHEAD msg_p} {
|
|||
global file_states selected_paths rescan_active
|
||||
global repo_config
|
||||
global env
|
||||
global hashlength
|
||||
|
||||
gets $fd_wt tree_id
|
||||
if {[catch {close $fd_wt} err]} {
|
||||
|
|
@ -367,7 +366,7 @@ proc commit_committree {fd_wt curHEAD msg_p} {
|
|||
close $fd_ot
|
||||
|
||||
if {[string equal -length 5 {tree } $old_tree]
|
||||
&& [string length $old_tree] == 45} {
|
||||
&& [string length $old_tree] == [expr {$hashlength + 5}]} {
|
||||
set old_tree [string range $old_tree 5 end]
|
||||
} else {
|
||||
error [mc "Commit %s appears to be corrupt" $PARENT]
|
||||
|
|
|
|||
|
|
@ -27,20 +27,20 @@ constructor embed {path title} {
|
|||
}
|
||||
|
||||
method _init {} {
|
||||
global M1B use_ttk NS
|
||||
global M1B
|
||||
|
||||
if {$is_toplevel} {
|
||||
make_dialog top w -autodelete 0
|
||||
wm title $top "[appname] ([reponame]): $t_short"
|
||||
} else {
|
||||
${NS}::frame $w
|
||||
ttk::frame $w
|
||||
}
|
||||
|
||||
set console_cr 1.0
|
||||
set w_t $w.m.t
|
||||
|
||||
${NS}::frame $w.m
|
||||
${NS}::label $w.m.l1 \
|
||||
ttk::frame $w.m
|
||||
ttk::label $w.m.l1 \
|
||||
-textvariable @t_long \
|
||||
-anchor w \
|
||||
-justify left \
|
||||
|
|
@ -78,7 +78,7 @@ method _init {} {
|
|||
"
|
||||
|
||||
if {$is_toplevel} {
|
||||
${NS}::button $w.ok -text [mc "Close"] \
|
||||
ttk::button $w.ok -text [mc "Close"] \
|
||||
-state disabled \
|
||||
-command [list destroy $w]
|
||||
pack $w.ok -side bottom -anchor e -pady 10 -padx 10
|
||||
|
|
@ -207,14 +207,13 @@ method done {ok} {
|
|||
}
|
||||
|
||||
method _sb_set {sb orient first last} {
|
||||
global NS
|
||||
if {![winfo exists $sb]} {
|
||||
if {$first == $last || ($first == 0 && $last == 1)} return
|
||||
if {$orient eq {h}} {
|
||||
${NS}::scrollbar $sb -orient h -command [list $w_t xview]
|
||||
ttk::scrollbar $sb -orient h -command [list $w_t xview]
|
||||
pack $sb -fill x -side bottom -before $w_t
|
||||
} else {
|
||||
${NS}::scrollbar $sb -orient v -command [list $w_t yview]
|
||||
ttk::scrollbar $sb -orient v -command [list $w_t yview]
|
||||
pack $sb -fill y -side right -before $w_t
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
# Copyright (C) 2006, 2007 Shawn Pearce
|
||||
|
||||
proc do_stats {} {
|
||||
global use_ttk NS
|
||||
set fd [git_read [list count-objects -v]]
|
||||
while {[gets $fd line] > 0} {
|
||||
if {[regexp {^([^:]+): (\d+)$} $line _ name value]} {
|
||||
|
|
@ -26,18 +25,18 @@ proc do_stats {} {
|
|||
wm withdraw $w
|
||||
wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
|
||||
|
||||
${NS}::frame $w.buttons
|
||||
${NS}::button $w.buttons.close -text [mc Close] \
|
||||
ttk::frame $w.buttons
|
||||
ttk::button $w.buttons.close -text [mc Close] \
|
||||
-default active \
|
||||
-command [list destroy $w]
|
||||
${NS}::button $w.buttons.gc -text [mc "Compress Database"] \
|
||||
ttk::button $w.buttons.gc -text [mc "Compress Database"] \
|
||||
-default normal \
|
||||
-command "destroy $w;do_gc"
|
||||
pack $w.buttons.close -side right
|
||||
pack $w.buttons.gc -side left
|
||||
pack $w.buttons -side bottom -fill x -pady 10 -padx 10
|
||||
|
||||
${NS}::labelframe $w.stat -text [mc "Database Statistics"]
|
||||
ttk::labelframe $w.stat -text [mc "Database Statistics"]
|
||||
foreach s {
|
||||
{count {mc "Number of loose objects"}}
|
||||
{size {mc "Disk space used by loose objects"} { KiB}}
|
||||
|
|
@ -54,8 +53,8 @@ proc do_stats {} {
|
|||
set value "$value[lindex $s 2]"
|
||||
}
|
||||
|
||||
${NS}::label $w.stat.l_$name -text [mc "%s:" $label] -anchor w
|
||||
${NS}::label $w.stat.v_$name -text $value -anchor w
|
||||
ttk::label $w.stat.l_$name -text [mc "%s:" $label] -anchor w
|
||||
ttk::label $w.stat.v_$name -text $value -anchor w
|
||||
grid $w.stat.l_$name $w.stat.v_$name -sticky we -padx {0 5}
|
||||
}
|
||||
pack $w.stat -pady 10 -padx 10
|
||||
|
|
|
|||
|
|
@ -2,15 +2,13 @@
|
|||
# Copyright (C) 2006, 2007 Shawn Pearce
|
||||
|
||||
proc apply_tab_size {{firsttab {}}} {
|
||||
global have_tk85 repo_config ui_diff
|
||||
global repo_config ui_diff
|
||||
|
||||
set w [font measure font_diff "0"]
|
||||
if {$have_tk85 && $firsttab != 0} {
|
||||
if {$firsttab != 0} {
|
||||
$ui_diff configure -tabs [list [expr {$firsttab * $w}] [expr {($firsttab + $repo_config(gui.tabsize)) * $w}]]
|
||||
} elseif {$have_tk85 || $repo_config(gui.tabsize) != 8} {
|
||||
$ui_diff configure -tabs [expr {$repo_config(gui.tabsize) * $w}]
|
||||
} else {
|
||||
$ui_diff configure -tabs {}
|
||||
$ui_diff configure -tabs [expr {$repo_config(gui.tabsize) * $w}]
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -280,9 +278,7 @@ proc start_show_diff {cont_info {add_opts {}}} {
|
|||
if {$w eq $ui_index} {
|
||||
lappend cmd diff-index
|
||||
lappend cmd --cached
|
||||
if {[git-version >= "1.7.2"]} {
|
||||
lappend cmd --ignore-submodules=dirty
|
||||
}
|
||||
lappend cmd --ignore-submodules=dirty
|
||||
} elseif {$w eq $ui_workdir} {
|
||||
if {[string first {U} $m] >= 0} {
|
||||
lappend cmd diff
|
||||
|
|
@ -290,17 +286,14 @@ proc start_show_diff {cont_info {add_opts {}}} {
|
|||
lappend cmd diff-files
|
||||
}
|
||||
}
|
||||
if {![is_config_false gui.textconv] && [git-version >= 1.6.1]} {
|
||||
if {![is_config_false gui.textconv]} {
|
||||
lappend cmd --textconv
|
||||
}
|
||||
|
||||
if {[string match {160000 *} [lindex $s 2]]
|
||||
|| [string match {160000 *} [lindex $s 3]]} {
|
||||
set is_submodule_diff 1
|
||||
|
||||
if {[git-version >= "1.6.6"]} {
|
||||
lappend cmd --submodule
|
||||
}
|
||||
lappend cmd --submodule
|
||||
}
|
||||
|
||||
lappend cmd -p
|
||||
|
|
@ -319,14 +312,6 @@ proc start_show_diff {cont_info {add_opts {}}} {
|
|||
lappend cmd $path
|
||||
}
|
||||
|
||||
if {$is_submodule_diff && [git-version < "1.6.6"]} {
|
||||
if {$w eq $ui_index} {
|
||||
set cmd [list submodule summary --cached -- $path]
|
||||
} else {
|
||||
set cmd [list submodule summary --files -- $path]
|
||||
}
|
||||
}
|
||||
|
||||
if {[catch {set fd [git_read_nice $cmd]} err]} {
|
||||
set diff_active 0
|
||||
unlock_index
|
||||
|
|
|
|||
|
|
@ -71,13 +71,12 @@ proc ask_popup {msg} {
|
|||
}
|
||||
|
||||
proc hook_failed_popup {hook msg {is_fatal 1}} {
|
||||
global use_ttk NS
|
||||
set w .hookfail
|
||||
Dialog $w
|
||||
wm withdraw $w
|
||||
|
||||
${NS}::frame $w.m
|
||||
${NS}::label $w.m.l1 -text [mc "%s hook failed:" $hook] \
|
||||
ttk::frame $w.m
|
||||
ttk::label $w.m.l1 -text [mc "%s hook failed:" $hook] \
|
||||
-anchor w \
|
||||
-justify left \
|
||||
-font font_uibold
|
||||
|
|
@ -89,10 +88,10 @@ proc hook_failed_popup {hook msg {is_fatal 1}} {
|
|||
-width 80 -height 10 \
|
||||
-font font_diff \
|
||||
-yscrollcommand [list $w.m.sby set]
|
||||
${NS}::scrollbar $w.m.sby -command [list $w.m.t yview]
|
||||
ttk::scrollbar $w.m.sby -command [list $w.m.t yview]
|
||||
pack $w.m.l1 -side top -fill x
|
||||
if {$is_fatal} {
|
||||
${NS}::label $w.m.l2 \
|
||||
ttk::label $w.m.l2 \
|
||||
-text [mc "You must correct the above errors before committing."] \
|
||||
-anchor w \
|
||||
-justify left \
|
||||
|
|
@ -106,7 +105,7 @@ proc hook_failed_popup {hook msg {is_fatal 1}} {
|
|||
$w.m.t insert 1.0 $msg
|
||||
$w.m.t conf -state disabled
|
||||
|
||||
${NS}::button $w.ok -text OK \
|
||||
ttk::button $w.ok -text OK \
|
||||
-width 15 \
|
||||
-command "destroy $w"
|
||||
pack $w.ok -side bottom -anchor e -pady 10 -padx 10
|
||||
|
|
|
|||
|
|
@ -22,8 +22,6 @@ proc _close_updateindex {fd} {
|
|||
}
|
||||
|
||||
proc rescan_on_error {err {after {}}} {
|
||||
global use_ttk NS
|
||||
|
||||
set w .indexfried
|
||||
Dialog $w
|
||||
wm withdraw $w
|
||||
|
|
@ -35,14 +33,14 @@ proc rescan_on_error {err {after {}}} {
|
|||
-borderwidth 0 -highlightthickness 0 \
|
||||
-background [get_bg_color $w]
|
||||
$w.msg tag configure bold -font font_uibold -justify center
|
||||
${NS}::scrollbar $w.vs -command [list $w.msg yview]
|
||||
ttk::scrollbar $w.vs -command [list $w.msg yview]
|
||||
$w.msg insert end $s bold \n\n$err {}
|
||||
$w.msg configure -state disabled
|
||||
|
||||
${NS}::button $w.continue \
|
||||
ttk::button $w.continue \
|
||||
-text [mc "Continue"] \
|
||||
-command [list destroy $w]
|
||||
${NS}::button $w.unlock \
|
||||
ttk::button $w.unlock \
|
||||
-text [mc "Unlock Index"] \
|
||||
-command "destroy $w; _delete_indexlock"
|
||||
grid $w.msg - $w.vs -sticky news
|
||||
|
|
|
|||
|
|
@ -9,18 +9,17 @@ field ctext
|
|||
field linenum {}
|
||||
|
||||
constructor new {i_w i_text args} {
|
||||
global use_ttk NS
|
||||
set w $i_w
|
||||
set ctext $i_text
|
||||
|
||||
${NS}::frame $w
|
||||
${NS}::label $w.l -text [mc "Goto Line:"]
|
||||
ttk::frame $w
|
||||
ttk::label $w.l -text [mc "Goto Line:"]
|
||||
tentry $w.ent \
|
||||
-textvariable ${__this}::linenum \
|
||||
-background lightgreen \
|
||||
-validate key \
|
||||
-validatecommand [cb _validate %P]
|
||||
${NS}::button $w.bn -text [mc Go] -command [cb _goto]
|
||||
ttk::button $w.bn -text [mc Go] -command [cb _goto]
|
||||
|
||||
pack $w.l -side left
|
||||
pack $w.bn -side right
|
||||
|
|
|
|||
|
|
@ -112,16 +112,7 @@ method _start {} {
|
|||
close $fh
|
||||
set _last_merged_branch $branch
|
||||
|
||||
if {[git-version >= "2.5.0"]} {
|
||||
set cmd [list git merge --strategy=recursive FETCH_HEAD]
|
||||
} else {
|
||||
set cmd [list git]
|
||||
lappend cmd merge
|
||||
lappend cmd --strategy=recursive
|
||||
lappend cmd [git_redir [list fmt-merge-msg] [list <[gitdir FETCH_HEAD]]]
|
||||
lappend cmd HEAD
|
||||
lappend cmd $name
|
||||
}
|
||||
set cmd [list git merge --strategy=recursive FETCH_HEAD]
|
||||
|
||||
ui_status [mc "Merging %s and %s..." $current_branch $stitle]
|
||||
set cons [console::new [mc "Merge"] "merge $stitle"]
|
||||
|
|
@ -145,7 +136,7 @@ method _finish {cons ok} {
|
|||
|
||||
constructor dialog {} {
|
||||
global current_branch
|
||||
global M1B use_ttk NS
|
||||
global M1B
|
||||
|
||||
if {![_can_merge $this]} {
|
||||
delete_this
|
||||
|
|
@ -160,21 +151,21 @@ constructor dialog {} {
|
|||
|
||||
set _start [cb _start]
|
||||
|
||||
${NS}::label $w.header \
|
||||
ttk::label $w.header \
|
||||
-text [mc "Merge Into %s" $current_branch] \
|
||||
-font font_uibold
|
||||
pack $w.header -side top -fill x
|
||||
|
||||
${NS}::frame $w.buttons
|
||||
${NS}::button $w.buttons.visualize \
|
||||
ttk::frame $w.buttons
|
||||
ttk::button $w.buttons.visualize \
|
||||
-text [mc Visualize] \
|
||||
-command [cb _visualize]
|
||||
pack $w.buttons.visualize -side left
|
||||
${NS}::button $w.buttons.merge \
|
||||
ttk::button $w.buttons.merge \
|
||||
-text [mc Merge] \
|
||||
-command $_start
|
||||
pack $w.buttons.merge -side right
|
||||
${NS}::button $w.buttons.cancel \
|
||||
ttk::button $w.buttons.cancel \
|
||||
-text [mc "Cancel"] \
|
||||
-command [cb _cancel]
|
||||
pack $w.buttons.cancel -side right -padx 5
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ proc save_config {} {
|
|||
proc do_options {} {
|
||||
global repo_config global_config font_descs
|
||||
global repo_config_new global_config_new
|
||||
global ui_comm_spell use_ttk NS
|
||||
global ui_comm_spell
|
||||
|
||||
array unset repo_config_new
|
||||
array unset global_config_new
|
||||
|
|
@ -115,23 +115,23 @@ proc do_options {} {
|
|||
wm transient $w [winfo parent $w]
|
||||
wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
|
||||
|
||||
${NS}::frame $w.buttons
|
||||
${NS}::button $w.buttons.restore -text [mc "Restore Defaults"] \
|
||||
ttk::frame $w.buttons
|
||||
ttk::button $w.buttons.restore -text [mc "Restore Defaults"] \
|
||||
-default normal \
|
||||
-command do_restore_defaults
|
||||
pack $w.buttons.restore -side left
|
||||
${NS}::button $w.buttons.save -text [mc Save] \
|
||||
ttk::button $w.buttons.save -text [mc Save] \
|
||||
-default active \
|
||||
-command [list do_save_config $w]
|
||||
pack $w.buttons.save -side right
|
||||
${NS}::button $w.buttons.cancel -text [mc "Cancel"] \
|
||||
ttk::button $w.buttons.cancel -text [mc "Cancel"] \
|
||||
-default normal \
|
||||
-command [list destroy $w]
|
||||
pack $w.buttons.cancel -side right -padx 5
|
||||
pack $w.buttons -side bottom -fill x -pady 10 -padx 10
|
||||
|
||||
${NS}::labelframe $w.repo -text [mc "%s Repository" [reponame]]
|
||||
${NS}::labelframe $w.global -text [mc "Global (All Repositories)"]
|
||||
ttk::labelframe $w.repo -text [mc "%s Repository" [reponame]]
|
||||
ttk::labelframe $w.global -text [mc "Global (All Repositories)"]
|
||||
pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
|
||||
pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
|
||||
|
||||
|
|
@ -170,7 +170,7 @@ proc do_options {} {
|
|||
foreach f {repo global} {
|
||||
switch -glob -- $type {
|
||||
b {
|
||||
${NS}::checkbutton $w.$f.$optid -text $text \
|
||||
ttk::checkbutton $w.$f.$optid -text $text \
|
||||
-variable ${f}_config_new($name) \
|
||||
-onvalue true \
|
||||
-offvalue false
|
||||
|
|
@ -178,8 +178,8 @@ proc do_options {} {
|
|||
}
|
||||
i-* {
|
||||
regexp -- {-(\d+)\.\.(\d+)$} $type _junk min max
|
||||
${NS}::frame $w.$f.$optid
|
||||
${NS}::label $w.$f.$optid.l -text [mc "%s:" $text]
|
||||
ttk::frame $w.$f.$optid
|
||||
ttk::label $w.$f.$optid.l -text [mc "%s:" $text]
|
||||
pack $w.$f.$optid.l -side left -anchor w -fill x
|
||||
tspinbox $w.$f.$optid.v \
|
||||
-textvariable ${f}_config_new($name) \
|
||||
|
|
@ -193,9 +193,9 @@ proc do_options {} {
|
|||
}
|
||||
c -
|
||||
t {
|
||||
${NS}::frame $w.$f.$optid
|
||||
${NS}::label $w.$f.$optid.l -text [mc "%s:" $text]
|
||||
${NS}::entry $w.$f.$optid.v \
|
||||
ttk::frame $w.$f.$optid
|
||||
ttk::label $w.$f.$optid.l -text [mc "%s:" $text]
|
||||
ttk::entry $w.$f.$optid.v \
|
||||
-width 20 \
|
||||
-textvariable ${f}_config_new($name)
|
||||
pack $w.$f.$optid.l -side left -anchor w
|
||||
|
|
@ -206,7 +206,7 @@ proc do_options {} {
|
|||
menu $w.$f.$optid.m
|
||||
build_encoding_menu $w.$f.$optid.m \
|
||||
[list set ${f}_config_new($name)] 1
|
||||
${NS}::button $w.$f.$optid.b \
|
||||
ttk::button $w.$f.$optid.b \
|
||||
-text [mc "Change"] \
|
||||
-command [list popup_btn_menu \
|
||||
$w.$f.$optid.m $w.$f.$optid.b]
|
||||
|
|
@ -216,17 +216,11 @@ proc do_options {} {
|
|||
}
|
||||
s {
|
||||
set opts [eval [lindex $option 3]]
|
||||
${NS}::frame $w.$f.$optid
|
||||
${NS}::label $w.$f.$optid.l -text [mc "%s:" $text]
|
||||
if {$use_ttk} {
|
||||
ttk::combobox $w.$f.$optid.v \
|
||||
-textvariable ${f}_config_new($name) \
|
||||
-values $opts -state readonly
|
||||
} else {
|
||||
eval tk_optionMenu $w.$f.$optid.v \
|
||||
${f}_config_new($name) \
|
||||
$opts
|
||||
}
|
||||
ttk::frame $w.$f.$optid
|
||||
ttk::label $w.$f.$optid.l -text [mc "%s:" $text]
|
||||
ttk::combobox $w.$f.$optid.v \
|
||||
-textvariable ${f}_config_new($name) \
|
||||
-values $opts -state readonly
|
||||
pack $w.$f.$optid.l -side left -anchor w -fill x
|
||||
pack $w.$f.$optid.v -side right -anchor e -padx 5
|
||||
pack $w.$f.$optid -side top -anchor w -fill x
|
||||
|
|
@ -250,17 +244,11 @@ proc do_options {} {
|
|||
set ${f}_config_new(gui.spellingdictionary) $value
|
||||
}
|
||||
|
||||
${NS}::frame $w.$f.$optid
|
||||
${NS}::label $w.$f.$optid.l -text [mc "Spelling Dictionary:"]
|
||||
if {$use_ttk} {
|
||||
ttk::combobox $w.$f.$optid.v \
|
||||
-textvariable ${f}_config_new(gui.spellingdictionary) \
|
||||
-values $all_dicts -state readonly
|
||||
} else {
|
||||
eval tk_optionMenu $w.$f.$optid.v \
|
||||
${f}_config_new(gui.spellingdictionary) \
|
||||
$all_dicts
|
||||
}
|
||||
ttk::frame $w.$f.$optid
|
||||
ttk::label $w.$f.$optid.l -text [mc "Spelling Dictionary:"]
|
||||
ttk::combobox $w.$f.$optid.v \
|
||||
-textvariable ${f}_config_new(gui.spellingdictionary) \
|
||||
-values $all_dicts -state readonly
|
||||
pack $w.$f.$optid.l -side left -anchor w -fill x
|
||||
pack $w.$f.$optid.v -side right -anchor e -padx 5
|
||||
pack $w.$f.$optid -side top -anchor w -fill x
|
||||
|
|
@ -278,9 +266,9 @@ proc do_options {} {
|
|||
set global_config_new(gui.$font^^size) \
|
||||
[font configure $font -size]
|
||||
|
||||
${NS}::frame $w.global.$name
|
||||
${NS}::label $w.global.$name.l -text [mc "%s:" $text]
|
||||
${NS}::button $w.global.$name.b \
|
||||
ttk::frame $w.global.$name
|
||||
ttk::label $w.global.$name.l -text [mc "%s:" $text]
|
||||
ttk::button $w.global.$name.b \
|
||||
-text [mc "Change Font"] \
|
||||
-command [list \
|
||||
tchoosefont \
|
||||
|
|
@ -289,9 +277,9 @@ proc do_options {} {
|
|||
global_config_new(gui.$font^^family) \
|
||||
global_config_new(gui.$font^^size) \
|
||||
]
|
||||
${NS}::label $w.global.$name.f -textvariable global_config_new(gui.$font^^family)
|
||||
${NS}::label $w.global.$name.s -textvariable global_config_new(gui.$font^^size)
|
||||
${NS}::label $w.global.$name.pt -text [mc "pt."]
|
||||
ttk::label $w.global.$name.f -textvariable global_config_new(gui.$font^^family)
|
||||
ttk::label $w.global.$name.s -textvariable global_config_new(gui.$font^^size)
|
||||
ttk::label $w.global.$name.pt -text [mc "pt."]
|
||||
pack $w.global.$name.l -side left -anchor w
|
||||
pack $w.global.$name.b -side right -anchor e
|
||||
pack $w.global.$name.pt -side right -anchor w
|
||||
|
|
|
|||
|
|
@ -233,8 +233,6 @@ proc make_sure_remote_submenues_exist {remote_m} {
|
|||
proc update_all_remotes_menu_entry {} {
|
||||
global all_remotes
|
||||
|
||||
if {[git-version < 1.6.6]} { return }
|
||||
|
||||
set have_remote 0
|
||||
foreach r $all_remotes {
|
||||
incr have_remote
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ field location {}; # location of the remote the user has chosen
|
|||
field opt_action fetch; # action to do after registering the remote locally
|
||||
|
||||
constructor dialog {} {
|
||||
global repo_config use_ttk NS
|
||||
global repo_config
|
||||
|
||||
make_dialog top w
|
||||
wm withdraw $top
|
||||
|
|
@ -22,34 +22,34 @@ constructor dialog {} {
|
|||
wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
|
||||
}
|
||||
|
||||
${NS}::label $w.header -text [mc "Add New Remote"] \
|
||||
ttk::label $w.header -text [mc "Add New Remote"] \
|
||||
-font font_uibold -anchor center
|
||||
pack $w.header -side top -fill x
|
||||
|
||||
${NS}::frame $w.buttons
|
||||
${NS}::button $w.buttons.create -text [mc Add] \
|
||||
ttk::frame $w.buttons
|
||||
ttk::button $w.buttons.create -text [mc Add] \
|
||||
-default active \
|
||||
-command [cb _add]
|
||||
pack $w.buttons.create -side right
|
||||
${NS}::button $w.buttons.cancel -text [mc Cancel] \
|
||||
ttk::button $w.buttons.cancel -text [mc Cancel] \
|
||||
-command [list destroy $w]
|
||||
pack $w.buttons.cancel -side right -padx 5
|
||||
pack $w.buttons -side bottom -fill x -pady 10 -padx 10
|
||||
|
||||
${NS}::labelframe $w.desc -text [mc "Remote Details"]
|
||||
ttk::labelframe $w.desc -text [mc "Remote Details"]
|
||||
|
||||
${NS}::label $w.desc.name_l -text [mc "Name:"]
|
||||
ttk::label $w.desc.name_l -text [mc "Name:"]
|
||||
set w_name $w.desc.name_t
|
||||
${NS}::entry $w_name \
|
||||
ttk::entry $w_name \
|
||||
-width 40 \
|
||||
-textvariable @name \
|
||||
-validate key \
|
||||
-validatecommand [cb _validate_name %d %S]
|
||||
grid $w.desc.name_l $w_name -sticky we -padx {0 5}
|
||||
|
||||
${NS}::label $w.desc.loc_l -text [mc "Location:"]
|
||||
ttk::label $w.desc.loc_l -text [mc "Location:"]
|
||||
set w_loc $w.desc.loc_t
|
||||
${NS}::entry $w_loc \
|
||||
ttk::entry $w_loc \
|
||||
-width 40 \
|
||||
-textvariable @location
|
||||
grid $w.desc.loc_l $w_loc -sticky we -padx {0 5}
|
||||
|
|
@ -57,21 +57,21 @@ constructor dialog {} {
|
|||
grid columnconfigure $w.desc 1 -weight 1
|
||||
pack $w.desc -anchor nw -fill x -pady 5 -padx 5
|
||||
|
||||
${NS}::labelframe $w.action -text [mc "Further Action"]
|
||||
ttk::labelframe $w.action -text [mc "Further Action"]
|
||||
|
||||
${NS}::radiobutton $w.action.fetch \
|
||||
ttk::radiobutton $w.action.fetch \
|
||||
-text [mc "Fetch Immediately"] \
|
||||
-value fetch \
|
||||
-variable @opt_action
|
||||
pack $w.action.fetch -anchor nw
|
||||
|
||||
${NS}::radiobutton $w.action.push \
|
||||
ttk::radiobutton $w.action.push \
|
||||
-text [mc "Initialize Remote Repository and Push"] \
|
||||
-value push \
|
||||
-variable @opt_action
|
||||
pack $w.action.push -anchor nw
|
||||
|
||||
${NS}::radiobutton $w.action.none \
|
||||
ttk::radiobutton $w.action.none \
|
||||
-text [mc "Do Nothing Else Now"] \
|
||||
-value none \
|
||||
-variable @opt_action
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ field full_cache
|
|||
field cached
|
||||
|
||||
constructor dialog {} {
|
||||
global all_remotes M1B use_ttk NS
|
||||
global all_remotes M1B
|
||||
|
||||
make_dialog top w
|
||||
wm title $top [mc "%s (%s): Delete Branch Remotely" [appname] [reponame]]
|
||||
|
|
@ -31,32 +31,28 @@ constructor dialog {} {
|
|||
wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
|
||||
}
|
||||
|
||||
${NS}::label $w.header -text [mc "Delete Branch Remotely"] \
|
||||
ttk::label $w.header -text [mc "Delete Branch Remotely"] \
|
||||
-font font_uibold -anchor center
|
||||
pack $w.header -side top -fill x
|
||||
|
||||
${NS}::frame $w.buttons
|
||||
${NS}::button $w.buttons.delete -text [mc Delete] \
|
||||
ttk::frame $w.buttons
|
||||
ttk::button $w.buttons.delete -text [mc Delete] \
|
||||
-default active \
|
||||
-command [cb _delete]
|
||||
pack $w.buttons.delete -side right
|
||||
${NS}::button $w.buttons.cancel -text [mc "Cancel"] \
|
||||
ttk::button $w.buttons.cancel -text [mc "Cancel"] \
|
||||
-command [list destroy $w]
|
||||
pack $w.buttons.cancel -side right -padx 5
|
||||
pack $w.buttons -side bottom -fill x -pady 10 -padx 10
|
||||
|
||||
${NS}::labelframe $w.dest -text [mc "From Repository"]
|
||||
ttk::labelframe $w.dest -text [mc "From Repository"]
|
||||
if {$all_remotes ne {}} {
|
||||
${NS}::radiobutton $w.dest.remote_r \
|
||||
ttk::radiobutton $w.dest.remote_r \
|
||||
-text [mc "Remote:"] \
|
||||
-value remote \
|
||||
-variable @urltype
|
||||
if {$use_ttk} {
|
||||
ttk::combobox $w.dest.remote_m -textvariable @remote \
|
||||
-values $all_remotes -state readonly
|
||||
} else {
|
||||
eval tk_optionMenu $w.dest.remote_m @remote $all_remotes
|
||||
}
|
||||
ttk::combobox $w.dest.remote_m -textvariable @remote \
|
||||
-values $all_remotes -state readonly
|
||||
grid $w.dest.remote_r $w.dest.remote_m -sticky w
|
||||
if {[lsearch -sorted -exact $all_remotes origin] != -1} {
|
||||
set remote origin
|
||||
|
|
@ -68,11 +64,11 @@ constructor dialog {} {
|
|||
} else {
|
||||
set urltype url
|
||||
}
|
||||
${NS}::radiobutton $w.dest.url_r \
|
||||
ttk::radiobutton $w.dest.url_r \
|
||||
-text [mc "Arbitrary Location:"] \
|
||||
-value url \
|
||||
-variable @urltype
|
||||
${NS}::entry $w.dest.url_t \
|
||||
ttk::entry $w.dest.url_t \
|
||||
-width 50 \
|
||||
-textvariable @url \
|
||||
-validate key \
|
||||
|
|
@ -85,19 +81,19 @@ constructor dialog {} {
|
|||
grid columnconfigure $w.dest 1 -weight 1
|
||||
pack $w.dest -anchor nw -fill x -pady 5 -padx 5
|
||||
|
||||
${NS}::labelframe $w.heads -text [mc "Branches"]
|
||||
ttk::labelframe $w.heads -text [mc "Branches"]
|
||||
slistbox $w.heads.l \
|
||||
-height 10 \
|
||||
-width 70 \
|
||||
-listvariable @head_list \
|
||||
-selectmode extended
|
||||
|
||||
${NS}::frame $w.heads.footer
|
||||
${NS}::label $w.heads.footer.status \
|
||||
ttk::frame $w.heads.footer
|
||||
ttk::label $w.heads.footer.status \
|
||||
-textvariable @status \
|
||||
-anchor w \
|
||||
-justify left
|
||||
${NS}::button $w.heads.footer.rescan \
|
||||
ttk::button $w.heads.footer.rescan \
|
||||
-text [mc "Rescan"] \
|
||||
-command [cb _rescan]
|
||||
pack $w.heads.footer.status -side left -fill x
|
||||
|
|
@ -107,8 +103,8 @@ constructor dialog {} {
|
|||
pack $w.heads.l -side left -fill both -expand 1
|
||||
pack $w.heads -fill both -expand 1 -pady 5 -padx 5
|
||||
|
||||
${NS}::labelframe $w.validate -text [mc "Delete Only If"]
|
||||
${NS}::radiobutton $w.validate.head_r \
|
||||
ttk::labelframe $w.validate -text [mc "Delete Only If"]
|
||||
ttk::radiobutton $w.validate.head_r \
|
||||
-text [mc "Merged Into:"] \
|
||||
-value head \
|
||||
-variable @checktype
|
||||
|
|
@ -116,7 +112,7 @@ constructor dialog {} {
|
|||
trace add variable @head_list write [cb _write_head_list]
|
||||
trace add variable @check_head write [cb _write_check_head]
|
||||
grid $w.validate.head_r $w.validate.head_m -sticky w
|
||||
${NS}::radiobutton $w.validate.always_r \
|
||||
ttk::radiobutton $w.validate.always_r \
|
||||
-text [mc "Always (Do not perform merge checks)"] \
|
||||
-value always \
|
||||
-variable @checktype
|
||||
|
|
@ -323,6 +319,8 @@ method _load {cache uri} {
|
|||
}
|
||||
|
||||
method _read {cache fd} {
|
||||
global hashlength
|
||||
|
||||
if {$fd ne $active_ls} {
|
||||
catch {close $fd}
|
||||
return
|
||||
|
|
@ -330,7 +328,7 @@ method _read {cache fd} {
|
|||
|
||||
while {[gets $fd line] >= 0} {
|
||||
if {[string match {*^{}} $line]} continue
|
||||
if {[regexp {^([0-9a-f]{40}) (.*)$} $line _junk obj ref]} {
|
||||
if {[regexp [string map "@@ $hashlength" {^([0-9a-f]{@@}) (.*)$}] $line _junk obj ref]} {
|
||||
if {[regsub ^refs/heads/ $ref {} abr]} {
|
||||
lappend head_list $abr
|
||||
lappend head_cache($cache) $abr
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ field smarktop
|
|||
field smarkbot
|
||||
|
||||
constructor new {i_w i_text args} {
|
||||
global use_ttk NS
|
||||
set w $i_w
|
||||
set ctext $i_text
|
||||
|
||||
|
|
@ -44,14 +43,14 @@ constructor new {i_w i_text args} {
|
|||
|
||||
set history [list]
|
||||
|
||||
${NS}::frame $w
|
||||
${NS}::label $w.l -text [mc Find:]
|
||||
ttk::frame $w
|
||||
ttk::label $w.l -text [mc Find:]
|
||||
tentry $w.ent -textvariable ${__this}::searchstring -background lightgreen
|
||||
${NS}::button $w.bn -text [mc Next] -command [cb find_next]
|
||||
${NS}::button $w.bp -text [mc Prev] -command [cb find_prev]
|
||||
${NS}::checkbutton $w.re -text [mc RegExp] \
|
||||
ttk::button $w.bn -text [mc Next] -command [cb find_next]
|
||||
ttk::button $w.bp -text [mc Prev] -command [cb find_prev]
|
||||
ttk::checkbutton $w.re -text [mc RegExp] \
|
||||
-variable ${__this}::regexpsearch -command [cb _incrsearch]
|
||||
${NS}::checkbutton $w.cs -text [mc Case] \
|
||||
ttk::checkbutton $w.cs -text [mc Case] \
|
||||
-variable ${__this}::casesensitive -command [cb _incrsearch]
|
||||
pack $w.l -side left
|
||||
pack $w.cs -side right
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ proc find_ssh_key {} {
|
|||
}
|
||||
|
||||
proc do_ssh_key {} {
|
||||
global sshkey_title have_tk85 sshkey_fd use_ttk NS
|
||||
global sshkey_title sshkey_fd
|
||||
|
||||
set w .sshkey_dialog
|
||||
if {[winfo exists $w]} {
|
||||
|
|
@ -38,9 +38,9 @@ proc do_ssh_key {} {
|
|||
set gen_state disabled
|
||||
}
|
||||
|
||||
${NS}::frame $w.header
|
||||
${NS}::label $w.header.lbl -textvariable sshkey_title -anchor w
|
||||
${NS}::button $w.header.gen -text [mc "Generate Key"] \
|
||||
ttk::frame $w.header
|
||||
ttk::label $w.header.lbl -textvariable sshkey_title -anchor w
|
||||
ttk::button $w.header.gen -text [mc "Generate Key"] \
|
||||
-command [list make_ssh_key $w] -state $gen_state
|
||||
pack $w.header.lbl -side left -expand 1 -fill x
|
||||
pack $w.header.gen -side right
|
||||
|
|
@ -48,17 +48,14 @@ proc do_ssh_key {} {
|
|||
|
||||
text $w.contents -width 60 -height 10 -wrap char -relief sunken
|
||||
pack $w.contents -fill both -expand 1
|
||||
if {$have_tk85} {
|
||||
set clr darkblue
|
||||
if {$use_ttk} { set clr [ttk::style lookup . -selectbackground] }
|
||||
$w.contents configure -inactiveselectbackground $clr
|
||||
}
|
||||
set clr [ttk::style lookup . -selectbackground]
|
||||
$w.contents configure -inactiveselectbackground $clr
|
||||
|
||||
${NS}::frame $w.buttons
|
||||
${NS}::button $w.buttons.close -text [mc Close] \
|
||||
ttk::frame $w.buttons
|
||||
ttk::button $w.buttons.close -text [mc Close] \
|
||||
-default active -command [list destroy $w]
|
||||
pack $w.buttons.close -side right
|
||||
${NS}::button $w.buttons.copy -text [mc "Copy To Clipboard"] \
|
||||
ttk::button $w.buttons.copy -text [mc "Copy To Clipboard"] \
|
||||
-command [list tk_textCopy $w.contents]
|
||||
pack $w.buttons.copy -side left
|
||||
pack $w.buttons -side bottom -fill x -pady 5 -padx 5
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@ field operations ; # list of current ongoing operations
|
|||
field completed_operation_count
|
||||
|
||||
constructor new {path} {
|
||||
global use_ttk NS
|
||||
set w $path
|
||||
set w_l $w.l
|
||||
set w_c $w.c
|
||||
|
|
@ -51,11 +50,8 @@ constructor new {path} {
|
|||
set operations [list]
|
||||
set completed_operation_count 0
|
||||
|
||||
${NS}::frame $w
|
||||
if {!$use_ttk} {
|
||||
$w configure -borderwidth 1 -relief sunken
|
||||
}
|
||||
${NS}::label $w_l \
|
||||
ttk::frame $w
|
||||
ttk::label $w_l \
|
||||
-textvariable @status_bar_text \
|
||||
-anchor w \
|
||||
-justify left
|
||||
|
|
@ -72,7 +68,6 @@ method _oneline_pack {} {
|
|||
}
|
||||
|
||||
constructor two_line {path} {
|
||||
global NS
|
||||
set w $path
|
||||
set w_l $w.l
|
||||
set w_c $w.c
|
||||
|
|
@ -84,8 +79,8 @@ constructor two_line {path} {
|
|||
set operations [list]
|
||||
set completed_operation_count 0
|
||||
|
||||
${NS}::frame $w
|
||||
${NS}::label $w_l \
|
||||
ttk::frame $w
|
||||
ttk::label $w_l \
|
||||
-textvariable @status_bar_text \
|
||||
-anchor w \
|
||||
-justify left
|
||||
|
|
|
|||
|
|
@ -190,8 +190,7 @@ proc InitEntryFrame {} {
|
|||
}
|
||||
|
||||
proc gold_frame {w args} {
|
||||
global use_ttk
|
||||
if {$use_ttk && ![is_MacOSX]} {
|
||||
if {![is_MacOSX]} {
|
||||
eval [linsert $args 0 ttk::frame $w -style Gold.TFrame]
|
||||
} else {
|
||||
eval [linsert $args 0 frame $w -background gold]
|
||||
|
|
@ -199,8 +198,7 @@ proc gold_frame {w args} {
|
|||
}
|
||||
|
||||
proc tlabel {w args} {
|
||||
global use_ttk
|
||||
if {$use_ttk && ![is_MacOSX]} {
|
||||
if {![is_MacOSX]} {
|
||||
set cmd [list ttk::label $w -style Color.TLabel]
|
||||
foreach {k v} $args {
|
||||
switch -glob -- $k {
|
||||
|
|
@ -216,17 +214,7 @@ proc tlabel {w args} {
|
|||
|
||||
# The padded label gets used in the about class.
|
||||
proc paddedlabel {w args} {
|
||||
global use_ttk
|
||||
if {$use_ttk} {
|
||||
eval [linsert $args 0 ttk::label $w -style Padded.TLabel]
|
||||
} else {
|
||||
eval [linsert $args 0 label $w \
|
||||
-padx 5 -pady 5 \
|
||||
-justify left \
|
||||
-anchor w \
|
||||
-borderwidth 1 \
|
||||
-relief solid]
|
||||
}
|
||||
eval [linsert $args 0 ttk::label $w -style Padded.TLabel]
|
||||
}
|
||||
|
||||
# Create a toplevel for use as a dialog.
|
||||
|
|
@ -242,8 +230,7 @@ proc Dialog {w args} {
|
|||
# Tk toplevels are not themed - so pave it over with a themed frame to get
|
||||
# the base color correct per theme.
|
||||
proc pave_toplevel {w} {
|
||||
global use_ttk
|
||||
if {$use_ttk && ![winfo exists $w.!paving]} {
|
||||
if {![winfo exists $w.!paving]} {
|
||||
set paving [ttk::frame $w.!paving]
|
||||
place $paving -x 0 -y 0 -relwidth 1 -relheight 1
|
||||
lower $paving
|
||||
|
|
@ -254,20 +241,11 @@ proc pave_toplevel {w} {
|
|||
# On many themes the border for a scrolled listbox needs to go around the
|
||||
# listbox and the scrollbar.
|
||||
proc slistbox {w args} {
|
||||
global use_ttk NS
|
||||
if {$use_ttk} {
|
||||
set f [ttk::frame $w -style SListbox.TFrame -padding 2]
|
||||
} else {
|
||||
set f [frame $w -relief flat]
|
||||
}
|
||||
set f [ttk::frame $w -style SListbox.TFrame -padding 2]
|
||||
if {[catch {
|
||||
if {$use_ttk} {
|
||||
eval [linsert $args 0 listbox $f.list -relief flat \
|
||||
-highlightthickness 0 -borderwidth 0]
|
||||
} else {
|
||||
eval [linsert $args 0 listbox $f.list]
|
||||
}
|
||||
${NS}::scrollbar $f.vs -command [list $f.list yview]
|
||||
eval [linsert $args 0 listbox $f.list -relief flat \
|
||||
-highlightthickness 0 -borderwidth 0]
|
||||
ttk::scrollbar $f.vs -command [list $f.list yview]
|
||||
$f.list configure -yscrollcommand [list $f.vs set]
|
||||
grid $f.list $f.vs -sticky news
|
||||
grid rowconfigure $f 0 -weight 1
|
||||
|
|
@ -285,67 +263,42 @@ proc slistbox {w args} {
|
|||
|
||||
# fetch the background color from a widget.
|
||||
proc get_bg_color {w} {
|
||||
global use_ttk
|
||||
if {$use_ttk} {
|
||||
set bg [ttk::style lookup [winfo class $w] -background]
|
||||
} else {
|
||||
set bg [$w cget -background]
|
||||
}
|
||||
set bg [ttk::style lookup [winfo class $w] -background]
|
||||
return $bg
|
||||
}
|
||||
|
||||
# ttk::spinbox didn't get added until 8.6
|
||||
# ttk::spinbox
|
||||
proc tspinbox {w args} {
|
||||
global use_ttk
|
||||
if {$use_ttk && [llength [info commands ttk::spinbox]] > 0} {
|
||||
eval [linsert $args 0 ttk::spinbox $w]
|
||||
} else {
|
||||
eval [linsert $args 0 spinbox $w]
|
||||
}
|
||||
eval [linsert $args 0 ttk::spinbox $w]
|
||||
}
|
||||
|
||||
# Create a text widget with any theme specific properties.
|
||||
proc ttext {w args} {
|
||||
global use_ttk
|
||||
if {$use_ttk} {
|
||||
switch -- [ttk_get_current_theme] {
|
||||
"vista" - "xpnative" {
|
||||
lappend args -highlightthickness 0 -borderwidth 0
|
||||
}
|
||||
switch -- [ttk_get_current_theme] {
|
||||
"vista" - "xpnative" {
|
||||
lappend args -highlightthickness 0 -borderwidth 0
|
||||
}
|
||||
}
|
||||
set w [eval [linsert $args 0 text $w]]
|
||||
if {$use_ttk} {
|
||||
if {[winfo class [winfo parent $w]] eq "EntryFrame"} {
|
||||
bind $w <FocusIn> {[winfo parent %W] state focus}
|
||||
bind $w <FocusOut> {[winfo parent %W] state !focus}
|
||||
}
|
||||
if {[winfo class [winfo parent $w]] eq "EntryFrame"} {
|
||||
bind $w <FocusIn> {[winfo parent %W] state focus}
|
||||
bind $w <FocusOut> {[winfo parent %W] state !focus}
|
||||
}
|
||||
return $w
|
||||
}
|
||||
|
||||
# themed frame suitable for surrounding a text field.
|
||||
proc textframe {w args} {
|
||||
global use_ttk
|
||||
if {$use_ttk} {
|
||||
if {[catch {ttk::style layout EntryFrame}]} {
|
||||
InitEntryFrame
|
||||
}
|
||||
eval [linsert $args 0 ttk::frame $w -class EntryFrame -style EntryFrame]
|
||||
} else {
|
||||
eval [linsert $args 0 frame $w]
|
||||
if {[catch {ttk::style layout EntryFrame}]} {
|
||||
InitEntryFrame
|
||||
}
|
||||
eval [linsert $args 0 ttk::frame $w -class EntryFrame -style EntryFrame]
|
||||
return $w
|
||||
}
|
||||
|
||||
proc tentry {w args} {
|
||||
global use_ttk
|
||||
if {$use_ttk} {
|
||||
InitTheme
|
||||
ttk::entry $w -style Edged.Entry
|
||||
} else {
|
||||
entry $w
|
||||
}
|
||||
InitTheme
|
||||
ttk::entry $w -style Edged.Entry
|
||||
|
||||
rename $w _$w
|
||||
interp alias {} $w {} tentry_widgetproc $w
|
||||
|
|
@ -353,25 +306,14 @@ proc tentry {w args} {
|
|||
return $w
|
||||
}
|
||||
proc tentry_widgetproc {w cmd args} {
|
||||
global use_ttk
|
||||
switch -- $cmd {
|
||||
state {
|
||||
if {$use_ttk} {
|
||||
return [uplevel 1 [list _$w $cmd] $args]
|
||||
} else {
|
||||
if {[lsearch -exact $args pressed] != -1} {
|
||||
_$w configure -background lightpink
|
||||
} else {
|
||||
_$w configure -background lightgreen
|
||||
}
|
||||
}
|
||||
return [uplevel 1 [list _$w $cmd] $args]
|
||||
}
|
||||
configure {
|
||||
if {$use_ttk} {
|
||||
if {[set n [lsearch -exact $args -background]] != -1} {
|
||||
set args [lreplace $args $n [incr n]]
|
||||
if {[llength $args] == 0} {return}
|
||||
}
|
||||
if {[set n [lsearch -exact $args -background]] != -1} {
|
||||
set args [lreplace $args $n [incr n]]
|
||||
if {[llength $args] == 0} {return}
|
||||
}
|
||||
return [uplevel 1 [list _$w $cmd] $args]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ field ask_branch 0; # ask for a revision
|
|||
field ask_args 0; # ask for additional args
|
||||
|
||||
constructor dialog {} {
|
||||
global repo_config use_ttk NS
|
||||
global repo_config
|
||||
|
||||
make_dialog top w
|
||||
wm title $top [mc "%s (%s): Add Tool" [appname] [reponame]]
|
||||
|
|
@ -25,41 +25,41 @@ constructor dialog {} {
|
|||
wm transient $top .
|
||||
}
|
||||
|
||||
${NS}::label $w.header -text [mc "Add New Tool Command"] \
|
||||
ttk::label $w.header -text [mc "Add New Tool Command"] \
|
||||
-font font_uibold -anchor center
|
||||
pack $w.header -side top -fill x
|
||||
|
||||
${NS}::frame $w.buttons
|
||||
${NS}::checkbutton $w.buttons.global \
|
||||
ttk::frame $w.buttons
|
||||
ttk::checkbutton $w.buttons.global \
|
||||
-text [mc "Add globally"] \
|
||||
-variable @add_global
|
||||
pack $w.buttons.global -side left -padx 5
|
||||
${NS}::button $w.buttons.create -text [mc Add] \
|
||||
ttk::button $w.buttons.create -text [mc Add] \
|
||||
-default active \
|
||||
-command [cb _add]
|
||||
pack $w.buttons.create -side right
|
||||
${NS}::button $w.buttons.cancel -text [mc Cancel] \
|
||||
ttk::button $w.buttons.cancel -text [mc Cancel] \
|
||||
-command [list destroy $w]
|
||||
pack $w.buttons.cancel -side right -padx 5
|
||||
pack $w.buttons -side bottom -fill x -pady 10 -padx 10
|
||||
|
||||
${NS}::labelframe $w.desc -text [mc "Tool Details"]
|
||||
ttk::labelframe $w.desc -text [mc "Tool Details"]
|
||||
|
||||
${NS}::label $w.desc.name_cmnt -anchor w\
|
||||
ttk::label $w.desc.name_cmnt -anchor w\
|
||||
-text [mc "Use '/' separators to create a submenu tree:"]
|
||||
grid x $w.desc.name_cmnt -sticky we -padx {0 5} -pady {0 2}
|
||||
${NS}::label $w.desc.name_l -text [mc "Name:"]
|
||||
ttk::label $w.desc.name_l -text [mc "Name:"]
|
||||
set w_name $w.desc.name_t
|
||||
${NS}::entry $w_name \
|
||||
ttk::entry $w_name \
|
||||
-width 40 \
|
||||
-textvariable @name \
|
||||
-validate key \
|
||||
-validatecommand [cb _validate_name %d %S]
|
||||
grid $w.desc.name_l $w_name -sticky we -padx {0 5}
|
||||
|
||||
${NS}::label $w.desc.cmd_l -text [mc "Command:"]
|
||||
ttk::label $w.desc.cmd_l -text [mc "Command:"]
|
||||
set w_cmd $w.desc.cmd_t
|
||||
${NS}::entry $w_cmd \
|
||||
ttk::entry $w_cmd \
|
||||
-width 40 \
|
||||
-textvariable @command
|
||||
grid $w.desc.cmd_l $w_cmd -sticky we -padx {0 5} -pady {0 3}
|
||||
|
|
@ -67,30 +67,30 @@ constructor dialog {} {
|
|||
grid columnconfigure $w.desc 1 -weight 1
|
||||
pack $w.desc -anchor nw -fill x -pady 5 -padx 5
|
||||
|
||||
${NS}::checkbutton $w.confirm \
|
||||
ttk::checkbutton $w.confirm \
|
||||
-text [mc "Show a dialog before running"] \
|
||||
-variable @confirm -command [cb _check_enable_dlg]
|
||||
|
||||
${NS}::labelframe $w.dlg -labelwidget $w.confirm
|
||||
ttk::labelframe $w.dlg -labelwidget $w.confirm
|
||||
|
||||
${NS}::checkbutton $w.dlg.askbranch \
|
||||
ttk::checkbutton $w.dlg.askbranch \
|
||||
-text [mc "Ask the user to select a revision (sets \$REVISION)"] \
|
||||
-variable @ask_branch -state disabled
|
||||
pack $w.dlg.askbranch -anchor w -padx 15
|
||||
|
||||
${NS}::checkbutton $w.dlg.askargs \
|
||||
ttk::checkbutton $w.dlg.askargs \
|
||||
-text [mc "Ask the user for additional arguments (sets \$ARGS)"] \
|
||||
-variable @ask_args -state disabled
|
||||
pack $w.dlg.askargs -anchor w -padx 15
|
||||
|
||||
pack $w.dlg -anchor nw -fill x -pady {0 8} -padx 5
|
||||
|
||||
${NS}::checkbutton $w.noconsole \
|
||||
ttk::checkbutton $w.noconsole \
|
||||
-text [mc "Don't show the command output window"] \
|
||||
-variable @no_console
|
||||
pack $w.noconsole -anchor w -padx 5
|
||||
|
||||
${NS}::checkbutton $w.needsfile \
|
||||
ttk::checkbutton $w.needsfile \
|
||||
-text [mc "Run only if a diff is selected (\$FILENAME not empty)"] \
|
||||
-variable @needs_file
|
||||
pack $w.needsfile -anchor w -padx 5
|
||||
|
|
@ -179,7 +179,7 @@ field w ; # widget path
|
|||
field w_names ; # name list
|
||||
|
||||
constructor dialog {} {
|
||||
global repo_config global_config system_config use_ttk NS
|
||||
global repo_config global_config system_config
|
||||
|
||||
load_config 1
|
||||
|
||||
|
|
@ -190,21 +190,21 @@ constructor dialog {} {
|
|||
wm transient $top .
|
||||
}
|
||||
|
||||
${NS}::label $w.header -text [mc "Remove Tool Commands"] \
|
||||
ttk::label $w.header -text [mc "Remove Tool Commands"] \
|
||||
-font font_uibold -anchor center
|
||||
pack $w.header -side top -fill x
|
||||
|
||||
${NS}::frame $w.buttons
|
||||
${NS}::button $w.buttons.create -text [mc Remove] \
|
||||
ttk::frame $w.buttons
|
||||
ttk::button $w.buttons.create -text [mc Remove] \
|
||||
-default active \
|
||||
-command [cb _remove]
|
||||
pack $w.buttons.create -side right
|
||||
${NS}::button $w.buttons.cancel -text [mc Cancel] \
|
||||
ttk::button $w.buttons.cancel -text [mc Cancel] \
|
||||
-command [list destroy $w]
|
||||
pack $w.buttons.cancel -side right -padx 5
|
||||
pack $w.buttons -side bottom -fill x -pady 10 -padx 10
|
||||
|
||||
${NS}::frame $w.list
|
||||
ttk::frame $w.list
|
||||
set w_names $w.list.l
|
||||
slistbox $w_names \
|
||||
-height 10 \
|
||||
|
|
@ -227,7 +227,7 @@ constructor dialog {} {
|
|||
}
|
||||
|
||||
if {$local_cnt > 0} {
|
||||
${NS}::label $w.colorlbl -foreground blue \
|
||||
ttk::label $w.colorlbl -foreground blue \
|
||||
-text [mc "(Blue denotes repository-local tools)"]
|
||||
pack $w.colorlbl -fill x -pady 5 -padx 5
|
||||
}
|
||||
|
|
@ -272,7 +272,7 @@ field is_ok 0; # ok to start
|
|||
field argstr {}; # arguments
|
||||
|
||||
constructor dialog {fullname} {
|
||||
global M1B use_ttk NS
|
||||
global M1B
|
||||
|
||||
set title [get_config "guitool.$fullname.title"]
|
||||
if {$title eq {}} {
|
||||
|
|
@ -292,7 +292,7 @@ constructor dialog {fullname} {
|
|||
set prompt [mc "Run Command: %s" $command]
|
||||
}
|
||||
|
||||
${NS}::label $w.header -text $prompt -font font_uibold -anchor center
|
||||
ttk::label $w.header -text $prompt -font font_uibold -anchor center
|
||||
pack $w.header -side top -fill x
|
||||
|
||||
set argprompt [get_config "guitool.$fullname.argprompt"]
|
||||
|
|
@ -306,10 +306,10 @@ constructor dialog {fullname} {
|
|||
set argprompt [mc "Arguments"]
|
||||
}
|
||||
|
||||
${NS}::labelframe $w.arg -text $argprompt
|
||||
ttk::labelframe $w.arg -text $argprompt
|
||||
|
||||
set w_args $w.arg.txt
|
||||
${NS}::entry $w_args \
|
||||
ttk::entry $w_args \
|
||||
-width 40 \
|
||||
-textvariable @argstr
|
||||
pack $w_args -padx 5 -pady 5 -fill both
|
||||
|
|
@ -330,18 +330,18 @@ constructor dialog {fullname} {
|
|||
pack $w.rev -anchor nw -fill both -expand 1 -pady 5 -padx 5
|
||||
}
|
||||
|
||||
${NS}::frame $w.buttons
|
||||
ttk::frame $w.buttons
|
||||
if {$is_ask_revs} {
|
||||
${NS}::button $w.buttons.visualize \
|
||||
ttk::button $w.buttons.visualize \
|
||||
-text [mc Visualize] \
|
||||
-command [cb _visualize]
|
||||
pack $w.buttons.visualize -side left
|
||||
}
|
||||
${NS}::button $w.buttons.ok \
|
||||
ttk::button $w.buttons.ok \
|
||||
-text [mc OK] \
|
||||
-command [cb _start]
|
||||
pack $w.buttons.ok -side right
|
||||
${NS}::button $w.buttons.cancel \
|
||||
ttk::button $w.buttons.cancel \
|
||||
-text [mc "Cancel"] \
|
||||
-command [cb _cancel]
|
||||
pack $w.buttons.cancel -side right -padx 5
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ trace add variable push_remote write \
|
|||
proc do_push_anywhere {} {
|
||||
global all_remotes current_branch
|
||||
global push_urltype push_remote push_url push_thin push_tags
|
||||
global push_force use_ttk NS
|
||||
global push_force
|
||||
|
||||
set w .push_setup
|
||||
toplevel $w
|
||||
|
|
@ -129,22 +129,22 @@ proc do_push_anywhere {} {
|
|||
wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
|
||||
pave_toplevel $w
|
||||
|
||||
${NS}::label $w.header -text [mc "Push Branches"] \
|
||||
ttk::label $w.header -text [mc "Push Branches"] \
|
||||
-font font_uibold -anchor center
|
||||
pack $w.header -side top -fill x
|
||||
|
||||
${NS}::frame $w.buttons
|
||||
${NS}::button $w.buttons.create -text [mc Push] \
|
||||
ttk::frame $w.buttons
|
||||
ttk::button $w.buttons.create -text [mc Push] \
|
||||
-default active \
|
||||
-command [list start_push_anywhere_action $w]
|
||||
pack $w.buttons.create -side right
|
||||
${NS}::button $w.buttons.cancel -text [mc "Cancel"] \
|
||||
ttk::button $w.buttons.cancel -text [mc "Cancel"] \
|
||||
-default normal \
|
||||
-command [list destroy $w]
|
||||
pack $w.buttons.cancel -side right -padx 5
|
||||
pack $w.buttons -side bottom -fill x -pady 10 -padx 10
|
||||
|
||||
${NS}::labelframe $w.source -text [mc "Source Branches"]
|
||||
ttk::labelframe $w.source -text [mc "Source Branches"]
|
||||
slistbox $w.source.l \
|
||||
-height 10 \
|
||||
-width 70 \
|
||||
|
|
@ -159,20 +159,16 @@ proc do_push_anywhere {} {
|
|||
pack $w.source.l -side left -fill both -expand 1
|
||||
pack $w.source -fill both -expand 1 -pady 5 -padx 5
|
||||
|
||||
${NS}::labelframe $w.dest -text [mc "Destination Repository"]
|
||||
ttk::labelframe $w.dest -text [mc "Destination Repository"]
|
||||
if {$all_remotes ne {}} {
|
||||
${NS}::radiobutton $w.dest.remote_r \
|
||||
ttk::radiobutton $w.dest.remote_r \
|
||||
-text [mc "Remote:"] \
|
||||
-value remote \
|
||||
-variable push_urltype
|
||||
if {$use_ttk} {
|
||||
ttk::combobox $w.dest.remote_m -state readonly \
|
||||
-exportselection false \
|
||||
-textvariable push_remote \
|
||||
-values $all_remotes
|
||||
} else {
|
||||
eval tk_optionMenu $w.dest.remote_m push_remote $all_remotes
|
||||
}
|
||||
ttk::combobox $w.dest.remote_m -state readonly \
|
||||
-exportselection false \
|
||||
-textvariable push_remote \
|
||||
-values $all_remotes
|
||||
grid $w.dest.remote_r $w.dest.remote_m -sticky w
|
||||
if {[lsearch -sorted -exact $all_remotes origin] != -1} {
|
||||
set push_remote origin
|
||||
|
|
@ -183,11 +179,11 @@ proc do_push_anywhere {} {
|
|||
} else {
|
||||
set push_urltype url
|
||||
}
|
||||
${NS}::radiobutton $w.dest.url_r \
|
||||
ttk::radiobutton $w.dest.url_r \
|
||||
-text [mc "Arbitrary Location:"] \
|
||||
-value url \
|
||||
-variable push_urltype
|
||||
${NS}::entry $w.dest.url_t \
|
||||
ttk::entry $w.dest.url_t \
|
||||
-width 50 \
|
||||
-textvariable push_url \
|
||||
-validate key \
|
||||
|
|
@ -202,16 +198,16 @@ proc do_push_anywhere {} {
|
|||
grid columnconfigure $w.dest 1 -weight 1
|
||||
pack $w.dest -anchor nw -fill x -pady 5 -padx 5
|
||||
|
||||
${NS}::labelframe $w.options -text [mc "Transfer Options"]
|
||||
${NS}::checkbutton $w.options.force \
|
||||
ttk::labelframe $w.options -text [mc "Transfer Options"]
|
||||
ttk::checkbutton $w.options.force \
|
||||
-text [mc "Force overwrite existing branch (may discard changes)"] \
|
||||
-variable push_force
|
||||
grid $w.options.force -columnspan 2 -sticky w
|
||||
${NS}::checkbutton $w.options.thin \
|
||||
ttk::checkbutton $w.options.thin \
|
||||
-text [mc "Use thin pack (for slow network connections)"] \
|
||||
-variable push_thin
|
||||
grid $w.options.thin -columnspan 2 -sticky w
|
||||
${NS}::checkbutton $w.options.tags \
|
||||
ttk::checkbutton $w.options.tags \
|
||||
-text [mc "Include tags"] \
|
||||
-variable push_tags
|
||||
grid $w.options.tags -columnspan 2 -sticky w
|
||||
|
|
|
|||
3170
git-gui/po/bg.po
3170
git-gui/po/bg.po
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue