b9dcf846e2
* commit 'git-gui/master': (36 commits) git-gui: Change prior tree SHA-1 verification to use git_read git-gui: Include a space in Cygwin shortcut command lines git-gui: Use sh.exe in Cygwin shortcuts git-gui: Paper bag fix for Cygwin shortcut creation git-gui: Improve the Windows and Mac OS X shortcut creators git-gui: Teach console widget to use git_read git-gui: Perform our own magic shbang detection on Windows git-gui: Treat `git version` as `git --version` git-gui: Assume unfound commands are known by git wrapper git-gui: Correct gitk installation location git-gui: Always use absolute path to all git executables git-gui: Show a progress meter for checking out files git-gui: Change the main window progress bar to use status_bar git-gui: Extract blame viewer status bar into mega-widget git-gui: Allow double-click in checkout dialog to start checkout git-gui: Default selection to first matching ref git-gui: Unabbreviate commit SHA-1s prior to display git-gui: Refactor branch switch to support detached head git-gui: Refactor our ui_status_value update technique git-gui: Better handling of detached HEAD ...
175 lines
4.3 KiB
Tcl
175 lines
4.3 KiB
Tcl
# git-gui transport (fetch/push) support
|
|
# Copyright (C) 2006, 2007 Shawn Pearce
|
|
|
|
proc fetch_from {remote} {
|
|
set w [console::new \
|
|
"fetch $remote" \
|
|
"Fetching new changes from $remote"]
|
|
set cmds [list]
|
|
lappend cmds [list exec git fetch $remote]
|
|
if {[is_config_true gui.pruneduringfetch]} {
|
|
lappend cmds [list exec git remote prune $remote]
|
|
}
|
|
console::chain $w $cmds
|
|
}
|
|
|
|
proc prune_from {remote} {
|
|
set w [console::new \
|
|
"remote prune $remote" \
|
|
"Pruning tracking branches deleted from $remote"]
|
|
console::exec $w [list git remote prune $remote]
|
|
}
|
|
|
|
proc push_to {remote} {
|
|
set w [console::new \
|
|
"push $remote" \
|
|
"Pushing changes to $remote"]
|
|
set cmd [list git push]
|
|
lappend cmd -v
|
|
lappend cmd $remote
|
|
console::exec $w $cmd
|
|
}
|
|
|
|
proc start_push_anywhere_action {w} {
|
|
global push_urltype push_remote push_url push_thin push_tags
|
|
|
|
set r_url {}
|
|
switch -- $push_urltype {
|
|
remote {set r_url $push_remote}
|
|
url {set r_url $push_url}
|
|
}
|
|
if {$r_url eq {}} return
|
|
|
|
set cmd [list git push]
|
|
lappend cmd -v
|
|
if {$push_thin} {
|
|
lappend cmd --thin
|
|
}
|
|
if {$push_tags} {
|
|
lappend cmd --tags
|
|
}
|
|
lappend cmd $r_url
|
|
set cnt 0
|
|
foreach i [$w.source.l curselection] {
|
|
set b [$w.source.l get $i]
|
|
lappend cmd "refs/heads/$b:refs/heads/$b"
|
|
incr cnt
|
|
}
|
|
if {$cnt == 0} {
|
|
return
|
|
} elseif {$cnt == 1} {
|
|
set unit branch
|
|
} else {
|
|
set unit branches
|
|
}
|
|
|
|
set cons [console::new \
|
|
"push $r_url" \
|
|
"Pushing $cnt $unit to $r_url"]
|
|
console::exec $cons $cmd
|
|
destroy $w
|
|
}
|
|
|
|
trace add variable push_remote write \
|
|
[list radio_selector push_urltype remote]
|
|
|
|
proc do_push_anywhere {} {
|
|
global all_remotes current_branch
|
|
global push_urltype push_remote push_url push_thin push_tags
|
|
|
|
set w .push_setup
|
|
toplevel $w
|
|
wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
|
|
|
|
label $w.header -text {Push Branches} -font font_uibold
|
|
pack $w.header -side top -fill x
|
|
|
|
frame $w.buttons
|
|
button $w.buttons.create -text Push \
|
|
-default active \
|
|
-command [list start_push_anywhere_action $w]
|
|
pack $w.buttons.create -side right
|
|
button $w.buttons.cancel -text {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
|
|
|
|
labelframe $w.source -text {Source Branches}
|
|
listbox $w.source.l \
|
|
-height 10 \
|
|
-width 70 \
|
|
-selectmode extended \
|
|
-yscrollcommand [list $w.source.sby set]
|
|
foreach h [load_all_heads] {
|
|
$w.source.l insert end $h
|
|
if {$h eq $current_branch} {
|
|
$w.source.l select set end
|
|
}
|
|
}
|
|
scrollbar $w.source.sby -command [list $w.source.l yview]
|
|
pack $w.source.sby -side right -fill y
|
|
pack $w.source.l -side left -fill both -expand 1
|
|
pack $w.source -fill both -expand 1 -pady 5 -padx 5
|
|
|
|
labelframe $w.dest -text {Destination Repository}
|
|
if {$all_remotes ne {}} {
|
|
radiobutton $w.dest.remote_r \
|
|
-text {Remote:} \
|
|
-value remote \
|
|
-variable push_urltype
|
|
eval tk_optionMenu $w.dest.remote_m push_remote $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
|
|
} else {
|
|
set push_remote [lindex $all_remotes 0]
|
|
}
|
|
set push_urltype remote
|
|
} else {
|
|
set push_urltype url
|
|
}
|
|
radiobutton $w.dest.url_r \
|
|
-text {Arbitrary URL:} \
|
|
-value url \
|
|
-variable push_urltype
|
|
entry $w.dest.url_t \
|
|
-borderwidth 1 \
|
|
-relief sunken \
|
|
-width 50 \
|
|
-textvariable push_url \
|
|
-validate key \
|
|
-validatecommand {
|
|
if {%d == 1 && [regexp {\s} %S]} {return 0}
|
|
if {%d == 1 && [string length %S] > 0} {
|
|
set push_urltype url
|
|
}
|
|
return 1
|
|
}
|
|
grid $w.dest.url_r $w.dest.url_t -sticky we -padx {0 5}
|
|
grid columnconfigure $w.dest 1 -weight 1
|
|
pack $w.dest -anchor nw -fill x -pady 5 -padx 5
|
|
|
|
labelframe $w.options -text {Transfer Options}
|
|
checkbutton $w.options.thin \
|
|
-text {Use thin pack (for slow network connections)} \
|
|
-variable push_thin
|
|
grid $w.options.thin -columnspan 2 -sticky w
|
|
checkbutton $w.options.tags \
|
|
-text {Include tags} \
|
|
-variable push_tags
|
|
grid $w.options.tags -columnspan 2 -sticky w
|
|
grid columnconfigure $w.options 1 -weight 1
|
|
pack $w.options -anchor nw -fill x -pady 5 -padx 5
|
|
|
|
set push_url {}
|
|
set push_thin 0
|
|
set push_tags 0
|
|
|
|
bind $w <Visibility> "grab $w; focus $w.buttons.create"
|
|
bind $w <Key-Escape> "destroy $w"
|
|
bind $w <Key-Return> [list start_push_anywhere_action $w]
|
|
wm title $w "[appname] ([reponame]): Push"
|
|
tkwait window $w
|
|
}
|