git-gui: GUI support for running 'git remote prune <name>'

In some workflows it is common for a large number of temporary
branches to be created in a remote repository, get fetched to
clients that typically only use git-gui, and then later have
those branches deleted from the remote repository once they have
been fully merged into all destination branches.  Users of git-gui
would obviously like to have their local tracking branches cleaned
up for them, otherwise their local tracking branch namespace would
grow out of control.

The best known way to remove these tracking branches is to run
"git remote prune <remotename>".  Even though it is more of a
Porcelain command than plumbing I'm invoking it through the UI,
because frankly I don't see a reason to reimplement its ls-remote
output filtering and config file parsing.

A new configuration option (gui.pruneduringfetch) can be used to
automatically enable running "git remote prune <remotename>" after
the fetch of that remote also completes successfully.  This is off
by default as it require an additional network connection and is
not very fast on Cygwin if a large number of tracking branches have
been removed (due to the 2 fork+exec calls per branch).

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/git-gui.sh b/git-gui.sh
index dba585111c111b180b9dc28ef67bda4be2fcb663..d238d452385e73ab4b43c0d38284a35388ba8f03 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1243,6 +1243,7 @@ set default_config(merge.verbosity) 2
 set default_config(user.name) {}
 set default_config(user.email) {}
 
+set default_config(gui.pruneduringfetch) false
 set default_config(gui.trustmtime) false
 set default_config(gui.diffcontext) 5
 set default_config(gui.newbranchtemplate) {}

diff --git a/lib/option.tcl b/lib/option.tcl
index 17fcc65f78b5e09b77738508ca4db76d9a05a8f0..e06aca59f3165348aa8263a2e4e6f525b1f7965c 100644 (file)
--- a/lib/option.tcl
+++ b/lib/option.tcl
@@ -173,6 +173,7 @@ proc do_options {} {
                {i-1..5 merge.verbosity {Merge Verbosity}}
 
                {b gui.trustmtime  {Trust File Modification Timestamps}}
+               {b gui.pruneduringfetch {Prune Tracking Branches During Fetch}}
                {i-1..99 gui.diffcontext {Number of Diff Context Lines}}
                {t gui.newbranchtemplate {New Branch Name Template}}
                } {

diff --git a/lib/remote.tcl b/lib/remote.tcl
index 99f353ed7d793ca9accf2c5d246938c8a51fea02..b54824ab725d9f11c6c5a38a8e0c53f37e41adc5 100644 (file)
--- a/lib/remote.tcl
+++ b/lib/remote.tcl
@@ -95,6 +95,7 @@ proc populate_fetch_menu {} {
        global all_remotes repo_config
 
        set m .mbar.fetch
+       set prune_list [list]
        foreach r $all_remotes {
                set enable 0
                if {![catch {set a $repo_config(remote.$r.url)}]} {
@@ -115,11 +116,21 @@ proc populate_fetch_menu {} {
                }
 
                if {$enable} {
+                       lappend prune_list $r
                        $m add command \
                                -label "Fetch from $r..." \
                                -command [list fetch_from $r]
                }
        }
+
+       if {$prune_list ne {}} {
+               $m add separator
+       }
+       foreach r $prune_list {
+               $m add command \
+                       -label "Prune from $r..." \
+                       -command [list prune_from $r]
+       }
 }
 
 proc populate_push_menu {} {

diff --git a/lib/transport.tcl b/lib/transport.tcl
index c0e7d20fce67349938373c0cfdf879aa3137d18f..e8ebc6eda090faed16c80ba748d21c0c53f9f2a4 100644 (file)
--- a/lib/transport.tcl
+++ b/lib/transport.tcl
@@ -5,9 +5,19 @@ proc fetch_from {remote} {
        set w [console::new \
                "fetch $remote" \
                "Fetching new changes from $remote"]
-       set cmd [list git fetch]
-       lappend cmd $remote
-       console::exec $w $cmd
+       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} {