[RFC PATCH 2/2] git-gui: teach fetch/prune menu to do it for all remotes
From: Heiko Voigt <hidden>
Date: 2016-06-15 22:50:33
Subsystem:
library code, the rest · Maintainers:
Andrew Morton, Linus Torvalds
The commandline fetch already has this option for some time. Since this was not available at the time git gui was written lets implement it now. Signed-off-by: Heiko Voigt <redacted> --- It just came to my mind that I probably should implement a version check of the commandline to ensure that this option is available. Thats why I tagged only this patch with RFC. Cheers Heiko lib/remote.tcl | 45 +++++++++++++++++++++++++++++++++++++++++++++ lib/transport.tcl | 29 +++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 0 deletions(-)
diff --git a/lib/remote.tcl b/lib/remote.tcl
index d9eab78..7011681 100644
--- a/lib/remote.tcl
+++ b/lib/remote.tcl@@ -230,6 +230,45 @@ proc make_sure_remote_submenues_exist {remote_m} { } } +proc update_all_remotes_menu_entry {} { + global all_remotes + + set have_remote 0 + foreach r $all_remotes { + set have_remote 1 + } + + set remote_m .mbar.remote + set fetch_m $remote_m.fetch + set prune_m $remote_m.prune + if {$have_remote} { + make_sure_remote_submenues_exist $remote_m + if {[$fetch_m entrycget 0 -label] ne "All"} { + + $fetch_m insert 0 separator + $fetch_m insert 0 command \ + -label "All" \ + -command fetch_from_all + + $prune_m insert 0 separator + $prune_m insert 0 command \ + -label "All" \ + -command prune_from_all + } + } else { + if {[winfo exists $fetch_m]} { + if {[$fetch_m type end] eq "separator"} { + + delete_from_menu $fetch_m 0 + delete_from_menu $fetch_m 0 + + delete_from_menu $prune_m 0 + delete_from_menu $prune_m 0 + } + } + } +} + proc populate_remotes_menu {} { global all_remotes
@@ -237,6 +276,8 @@ proc populate_remotes_menu {} { add_fetch_entry $r add_push_entry $r } + + update_all_remotes_menu_entry } proc add_single_remote {name location} {
@@ -252,6 +293,8 @@ proc add_single_remote {name location} { add_fetch_entry $name add_push_entry $name + + update_all_remotes_menu_entry } proc delete_from_menu {menu name} {
@@ -281,4 +324,6 @@ proc remove_remote {name} { delete_from_menu $remote_m.remove $name # Not all remotes are in the push menu catch { delete_from_menu $remote_m.push $name } + + update_all_remotes_menu_entry }
diff --git a/lib/transport.tcl b/lib/transport.tcl
index 3067058..7fad9b7 100644
--- a/lib/transport.tcl
+++ b/lib/transport.tcl@@ -20,6 +20,35 @@ proc prune_from {remote} { console::exec $w [list git remote prune $remote] } +proc fetch_from_all {} { + set w [console::new \ + [mc "fetch all remotes"] \ + [mc "Fetching new changes from all remotes"]] + + set cmd [list git fetch --all] + if {[is_config_true gui.pruneduringfetch]} { + lappend cmd --prune + } + + console::exec $w $cmd +} + +proc prune_from_all {} { + global all_remotes + + set w [console::new \ + [mc "remote prune all remotes"] \ + [mc "Pruning tracking branches deleted from all remotes"]] + + set cmd [list git remote prune] + + foreach r $all_remotes { + lappend cmd $r + } + + console::exec $w $cmd +} + proc push_to {remote} { set w [console::new \ [mc "push %s" $remote] \
--
1.7.4.rc3.4.g155c4