Merge branch 'main' into issue-655

Author: isc-etamarch

Diff for: CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Changing system mode (environment name) in setting spersists after instance restart (#655)
+- 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

Diff for: docs/testing.md

@@ -18,7 +18,7 @@ The following is a testing plan that should be followed prior to release of a ne
   - Add, edit, and delete items through Studio / VS Code. Use the Sync option. All changes should be committed and pushed to the remote.
   - Add, edit, and delete items on the remote. Add, edit, and delete unrelated items through Studio/VSCode. All changes should be pulled, committed, and pushed.
   - Add an item to an interoperability production and sync. Check out a new feature branch. The item should no longer exist in the production. Set the previous branch as the remote merge branch. Sync. The new item should exist in the production.
-  - Add an item to a production and sync. Check out a new feature branch. The item should no longer exist in the production. Set the previous branch as the remote merge branch. Add a new item to the production. Sync. The production should now have both new items, and the source control output should show it automatically resolved a conflict.
+  - Make sure production decomposition is off. Add an item to a production and sync. Check out a new feature branch. The item should no longer exist in the production. Set the previous branch as the remote merge branch. Add a new item to the production. Sync. The production should now have both new items, and the source control output should show it automatically resolved a conflict.
 
   ## Testing production decomposition
   - Enable production decomposition in the git-source-control settings.

Diff for: 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">';

Diff for: 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">';