Merge pull request #736 from intersystems/issue-687

Responsive stash

Author: isc-etamarch

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Partial support for production decomposition with the new interoperability editors
 
 ### Fixed
+- Popping from stash is more responsive (#687)
 - Favorites links for Git pages now works on recent IRIS versions (#734)
 
 ## [2.10.0] - 2025-02-10

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

@@ -2005,10 +2005,10 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
         }
         var stashIndex = parseInt($(".log-entry.active .stash-list-index").text());
         webui.git_command(["stash", "apply", "stash@{"+stashIndex+"}"], function(output) {
-            webui.showSuccess(output);
-            parent.stashView.update(0);
+            webui.showSuccess("Applied stash item");
+            parent.update();
             self.clear()
-        });
+        }, webui.showWarning(output), webui.showError(output));
     }
 
     self.popSelectedStash = function() {
@@ -2017,10 +2017,10 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
         }
         var stashIndex = parseInt($(".log-entry.active .stash-list-index").text());
         webui.git_command(["stash", "pop", "stash@{"+stashIndex+"}"], function(output) {
-            webui.showSuccess(output);
-            parent.stashView.update(0);
+            webui.showSuccess("Popped from stash");
+            parent.update();
             self.clear()
-        });
+        }, webui.showWarning(output), webui.showError(output));
     }
 
     self.dropSelectedStash = function() {
@@ -2029,10 +2029,10 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
         }
         var stashIndex = parseInt($(".log-entry.active .stash-list-index").text());
         webui.git_command(["stash", "drop", "stash@{"+stashIndex+"}"], function() {
-            webui.showSuccess(output.substring(output.indexOf("Dropped")));
-            parent.stashView.update(0);
+            webui.showSuccess("Dropped from stash");
+            parent.update();
             self.clear();
-        });
+        }, webui.showWarning(output), webui.showError(output));
     }
 
     var html = '<div class="diff-view-container panel panel-default">';

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

@@ -2005,10 +2005,10 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
         }
         var stashIndex = parseInt($(".log-entry.active .stash-list-index").text());
         webui.git_command(["stash", "apply", "stash@{"+stashIndex+"}"], function(output) {
-            webui.showSuccess(output);
-            parent.stashView.update(0);
+            webui.showSuccess("Applied stash item");
+            parent.update();
             self.clear()
-        });
+        }, webui.showWarning(output), webui.showError(output));
     }
 
     self.popSelectedStash = function() {
@@ -2017,10 +2017,10 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
         }
         var stashIndex = parseInt($(".log-entry.active .stash-list-index").text());
         webui.git_command(["stash", "pop", "stash@{"+stashIndex+"}"], function(output) {
-            webui.showSuccess(output);
-            parent.stashView.update(0);
+            webui.showSuccess("Popped from stash");
+            parent.update();
             self.clear()
-        });
+        }, webui.showWarning(output), webui.showError(output));
     }
 
     self.dropSelectedStash = function() {
@@ -2029,10 +2029,10 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
         }
         var stashIndex = parseInt($(".log-entry.active .stash-list-index").text());
         webui.git_command(["stash", "drop", "stash@{"+stashIndex+"}"], function() {
-            webui.showSuccess(output.substring(output.indexOf("Dropped")));
-            parent.stashView.update(0);
+            webui.showSuccess("Dropped from stash");
+            parent.update();
             self.clear();
-        });
+        }, webui.showWarning(output), webui.showError(output));
     }
 
     var html = '<div class="diff-view-container panel panel-default">';