Merge branch 'main' into Issue-#709

isc-pbarton · web-flow · commit fc9d6d06bae7 · 2025-04-11T10:25:17.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,8 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Pull event handler that does an IPM uninstall and load to handle deletes (#631)
 - Partial support for production decomposition with the new interoperability editors
 - Added Lock Branch setting to prevent switching branches for a protected namespace (#709)
+- Tooltips on branch operations in Git UI (#725)
 
 ### 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 --git a/cls/SourceControl/Git/Settings.cls b/cls/SourceControl/Git/Settings.cls
@@ -163,7 +163,7 @@ Method %Save() As %Status
         set @storage@("settings", "user", $username, "basicMode") = ..basicMode
     } 
     try {
-        do $SYSTEM.Version.SystemMode(..environmentName)
+        do ##class(%zpkg.isc.sc.git.SystemMode).SetSystemMode(..environmentName)
     } catch e {
         // no-op; user might not have privileges.
     }
diff --git a/cls/_zpkg/isc/sc/git/SystemMode.cls b/cls/_zpkg/isc/sc/git/SystemMode.cls
@@ -0,0 +1,23 @@
+Class %zpkg.isc.sc.git.SystemMode
+{
+    ClassMethod SetEnvironment(environment As %String) As %Status [ NotInheritable, Private ]
+{
+    $$$AddAllRoleTemporary
+    do $SYSTEM.Version.SystemMode(environment)
+    new $namespace
+    set $namespace = "%SYS"
+    set obj = ##class(Config.Startup).Open()
+    set obj.SystemMode = environment
+    return obj.%Save()
+}
+
+ClassMethod SetSystemMode(environment As %String) As %Status [ NotInheritable ]
+{
+    try {
+        do ..SetEnvironment(environment)
+    } catch e {
+        return e.AsStatus()
+    }
+    return $$$OK
+}
+}
diff --git a/docs/testing.md b/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 --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -1009,13 +1009,13 @@ webui.SideBarView = function(mainView, noEventHandlers) {
                                 '</section>' +
                                 '<section id="sidebar-local-branches">' +
                                     '<h4 class="mt-1">Local Branches' +
-                                    '<button type="button" class="btn btn-default btn-sidebar-icon btn-add shadow-none" >' +
+                                    '<button type="button" class="btn btn-default btn-sidebar-icon btn-add shadow-none" title="Create new branch">' +
                                         webui.circlePlusIcon+
                                     '</button>' + '</h4>' +
                                 '</section>' +
                                 '<section id="sidebar-remote-branches">' +
                                     '<h4 class="mt-1">Remote Branches' +
-                                    '<button type="button" class="btn btn-default btn-sidebar-icon btn-prune-remote-branches shadow-none" >'+
+                                    '<button type="button" class="btn btn-default btn-sidebar-icon btn-prune-remote-branches shadow-none" title="Git fetch of remote branches">'+
                                         webui.refreshIcon+
                                       '</button>' +'</h4>' +
                                 '</section>' +
@@ -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 --git a/git-webui/src/share/git-webui/webui/js/git-webui.js b/git-webui/src/share/git-webui/webui/js/git-webui.js
@@ -1009,13 +1009,13 @@ webui.SideBarView = function(mainView, noEventHandlers) {
                                 '</section>' +
                                 '<section id="sidebar-local-branches">' +
                                     '<h4 class="mt-1">Local Branches' +
-                                    '<button type="button" class="btn btn-default btn-sidebar-icon btn-add shadow-none" >' +
+                                    '<button type="button" class="btn btn-default btn-sidebar-icon btn-add shadow-none" title="Create new branch">' +
                                         webui.circlePlusIcon+
                                     '</button>' + '</h4>' +
                                 '</section>' +
                                 '<section id="sidebar-remote-branches">' +
                                     '<h4 class="mt-1">Remote Branches' +
-                                    '<button type="button" class="btn btn-default btn-sidebar-icon btn-prune-remote-branches shadow-none" >'+
+                                    '<button type="button" class="btn btn-default btn-sidebar-icon btn-prune-remote-branches shadow-none" title="Git fetch of remote branches">'+
                                         webui.refreshIcon+
                                       '</button>' +'</h4>' +
                                 '</section>' +
@@ -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 --git a/module.xml b/module.xml
@@ -3,7 +3,7 @@
   <Document name="git-source-control.ZPM">
     <Module>
       <Name>git-source-control</Name>
-      <Version>2.10.0</Version>
+      <Version>2.11.0</Version>
       <Description>Server-side source control extension for use of Git on InterSystems platforms</Description>
       <Keywords>git source control studio vscode</Keywords>
       <Packaging>module</Packaging>

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ Method %Save() As %Status`
`163`	`163`	`set @storage@("settings", "user", $username, "basicMode") = ..basicMode`
`164`	`164`	`}`
`165`	`165`	`try {`
`166`		`- do $SYSTEM.Version.SystemMode(..environmentName)`
	`166`	`+ do ##class(%zpkg.isc.sc.git.SystemMode).SetSystemMode(..environmentName)`
`167`	`167`	`} catch e {`
`168`	`168`	`// no-op; user might not have privileges.`
`169`	`169`	`}`