Merge pull request #560 from intersystems/issue-471

Added pruning to fetch calls

Author: isc-tleavitt

CHANGELOG.md

@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed git path configuration (#463)
 - Added feedback to settings page (#550)
 - Fix "Home" navigation to point to current namespace (#548)
+- Make sure more fetch calls prune the remote branches (#471)
 - Force export of item if it has been modified (#354)
 - Production configuration page no longer closes Sync/WebUI when operations there change the production (#542)
 

cls/SourceControl/Git/Utils.cls

@@ -570,7 +570,7 @@ ClassMethod Push(remote As %String = "origin", force As %Boolean = 0) As %Status
 
 ClassMethod Fetch(ByRef diffFiles) As %Status
 {
-    do ..RunGitCommand("fetch", .errStream, .outStream)
+    do ..RunGitCommand("fetch", .errStream, .outStream, "--prune")
     write !, "Fetch done"
     kill errStream, outStream
     do ..RunGitCommand("diff", .errStream, .outStream, "..origin/"_..GetCurrentBranch(), "--name-only")
@@ -1853,7 +1853,7 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
             set diffBase = ..GetCurrentBranch()
         }
 
-        do ..RunGitCommand("fetch", .errorStream, .outputStream)
+        do ..RunGitCommand("fetch", .errorStream, .outputStream,"--prune")
         kill errorStream, outputStream
         do ##class(SourceControl.Git.Utils).RunGitCommandWithInput("diff",,.errorStream,.outputStream, diffBase_$Case(diffCompare,"":"",:"..")_diffCompare, "--name-status")
         do ..ParseDiffStream(outputStream,,.files)

git-webui/release/share/git-webui/webui/js/git-webui.js

@@ -596,7 +596,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
     self.pruneRemoteBranches = function(e){
         e.preventDefault();
         $(".btn-prune-remote-branches").addClass("refresh-start");
-        webui.git("fetch --prune",updateSideBar);
+        webui.git("fetch --prune ",updateSideBar);
     }
 
     self.getPackageVersion = function() {
@@ -761,7 +761,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
                         if(branchType === "remote"){
                             var remoteName = refName.split("/")[0];
                             var branchName = refName.split("/")[1];
-                            webui.git("fetch "+remoteName+" "+branchName);
+                            webui.git("fetch --prune "+remoteName+" "+branchName);
                             webui.git("branch -l "+branchName, function(existingBranch) {
                                 if (existingBranch.length > 0) {
                                     webui.git("checkout " +branchName, updateSideBar);
@@ -782,7 +782,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
                 }
                 else{
                     if(branchType === "remote"){
-                        webui.git("fetch "+remoteName+" "+branchName);
+                        webui.git("fetch --prune "+remoteName+" "+branchName);
                         webui.git("branch -l "+branchName, function(existingBranch) {
                             if (existingBranch.length > 0) {
                                 webui.git("checkout " +branchName, updateSideBar);
@@ -908,7 +908,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
         var branchName = refName.split('/')[1];
 
         if(branchName){
-            webui.git("fetch "+remoteName+" "+branchName);
+            webui.git("fetch --prune "+remoteName+" "+branchName);
         }
 
         function callTestMergeHandler(message){

git-webui/src/share/git-webui/webui/js/git-webui.js

@@ -596,7 +596,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
     self.pruneRemoteBranches = function(e){
         e.preventDefault();
         $(".btn-prune-remote-branches").addClass("refresh-start");
-        webui.git("fetch --prune",updateSideBar);
+        webui.git("fetch --prune ",updateSideBar);
     }
 
     self.getPackageVersion = function() {
@@ -761,7 +761,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
                         if(branchType === "remote"){
                             var remoteName = refName.split("/")[0];
                             var branchName = refName.split("/")[1];
-                            webui.git("fetch "+remoteName+" "+branchName);
+                            webui.git("fetch --prune "+remoteName+" "+branchName);
                             webui.git("branch -l "+branchName, function(existingBranch) {
                                 if (existingBranch.length > 0) {
                                     webui.git("checkout " +branchName, updateSideBar);
@@ -782,7 +782,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
                 }
                 else{
                     if(branchType === "remote"){
-                        webui.git("fetch "+remoteName+" "+branchName);
+                        webui.git("fetch --prune "+remoteName+" "+branchName);
                         webui.git("branch -l "+branchName, function(existingBranch) {
                             if (existingBranch.length > 0) {
                                 webui.git("checkout " +branchName, updateSideBar);
@@ -908,7 +908,7 @@ webui.SideBarView = function(mainView, noEventHandlers) {
         var branchName = refName.split('/')[1];
 
         if(branchName){
-            webui.git("fetch "+remoteName+" "+branchName);
+            webui.git("fetch --prune "+remoteName+" "+branchName);
         }
 
         function callTestMergeHandler(message){