Merge branch 'main' of https://github.com/intersystems/git-source-control into fix-branch-names

Author: isc-pbarton

CHANGELOG.md

@@ -10,10 +10,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Import of decomposed production items now has a brief timeout in case another deploy is in progress (#949)
 - Option to view an individual file's history in the source control menu (#960)
+- Change context menu now lists IPM packages from all Git-enabled namespaces, prefixed with the namespace name (#952)
 
 ### Fixed
 - Changes to % routines mapped to the current namespace may now be added to source control and committed (#944)
 - Edits to a decomposed production in VS Code fixed after changes to the VS Code ObjectScript extension (#949)
+- Configure prompt no longer quits out with an unhelpful error if existing boolean settings are null (#962)
 - Branch names are now constrained to a reasonable set of allowed characters, fixing an issue where branch names with special characters were hidden without explanation (#914)
 
 ## [2.16.0] - 2026-03-06

cls/SourceControl/Git/Settings.cls

@@ -280,7 +280,7 @@ ClassMethod CreateNamespaceTempFolder() As %Status [ Internal ]
     return $$$OK
 }
 
-ClassMethod Configure() As %Boolean [ CodeMode = objectgenerator, Internal ]
+ClassMethod Configure(Output sc As %Status = {$$$OK}) As %Boolean [ CodeMode = objectgenerator, Internal ]
 {
     do %code.WriteLine(" set inst = ..%New()")
     do %code.WriteLine(" do inst.RetrieveDefaults()")
@@ -305,6 +305,7 @@ ClassMethod Configure() As %Boolean [ CodeMode = objectgenerator, Internal ]
         set promptQuoted = $replace(promptQuoted,"${username}","'""_$Username_""'")
         set propertyDef = ##class(%Dictionary.PropertyDefinition).%OpenId("SourceControl.Git.Settings||"_property_"")
         if ((propertyDef) && (propertyDef.Type = "%Boolean")) {
+            do %code.WriteLine(" set value = ''value")
             do %code.WriteLine(" set response = ##class(%Library.Prompt).GetYesNo("_promptQuoted_",.value,,"_defaultPromptFlag_")")
         } elseif ((propertyDef) && (propertyDef.Name = "gitBinPath")) {
             do %code.WriteLine(" set valid = 0")
@@ -342,6 +343,7 @@ ClassMethod Configure() As %Boolean [ CodeMode = objectgenerator, Internal ]
         } else {
             do %code.WriteLine(" set response = ##class(%Library.Prompt).GetString("_promptQuoted_",.value,,,,"_defaultPromptFlag_")")
         }
+        do %code.WriteLine(" if (response = $$$ErrorResponse) { set sc = $get(%objlasterror, 0) }")
         do %code.WriteLine(" if response '= $$$SuccessResponse { quit 0 }")
         do %code.WriteLine(" set value = $zstrip(value,""<>W"")")
         do %code.WriteLine(" set inst."_property_" = value")

cls/SourceControl/Git/Utils.cls

@@ -2823,18 +2823,28 @@ ClassMethod GetContexts(onlyNamespaces As %Boolean) As %DynamicArray
 
     set name = ""
 
-    // Using embedded for backwards compatability
+    // Using embedded instead of ExecDirectNoPriv() for backwards compatability
     if '(onlyNamespaces) {
         &sql(DECLARE C1 CURSOR FOR SELECT name into :name from %Library.RoutineMgr_StudioOpenDialog('*.ZPM'))
-        &sql(OPEN C1)
-            throw:SQLCODE<0 ##class(%Exception.SQL).CreateFromSQLCODE(SQLCODE, %msg)
-        &sql(FETCH C1)
-        while(SQLCODE = 0) {
-            set package = name
-            do contexts.%Push(package)
-            &sql(FETCH C1)
+        new $namespace
+        set ptr = 0
+        while $listnext(namespaces,ptr,ns) {
+            if '($FIND(ns,"^^")) {
+                try {
+                    set $NAMESPACE = ns
+                    &sql(OPEN C1)
+                    throw:(SQLCODE<0) ##class(%Exception.SQL).CreateFromSQLCODE(SQLCODE, %msg)
+                    &sql(FETCH C1)
+                    while (SQLCODE = 0) {
+                        do contexts.%Push(ns_":"_name)
+                        &sql(FETCH C1)
+                    }
+                    &sql(CLOSE C1)
+                } catch e {
+                    // skip inaccessible namespaces
+                }
+            }
         }
-        &sql(CLOSE C1)
     }
 
     return contexts
@@ -3407,3 +3417,4 @@ ClassMethod IsSchemaStandard(pName As %String = "") As %Boolean [ Internal ]
 }
 
 }
+

git-webui/package-lock.json

@@ -752,10 +752,11 @@ webui.SideBarView = function(mainView, noEventHandlers) {
     }
 
     self.getCurrentContext = function() {
+        // URL pattern here is like webuidriver.csp/<namespace>/<InternalName of selected item>
         var args = window.location.href.split("webuidriver.csp/")[1].split("?")[0].split("/");
         var context = args[0];
         if (args[1] && (args[1].indexOf(".ZPM") != -1)) {
-            context = args[1];
+            context = args[0] + ":" + args[1];
         }
         return context;
     }
@@ -765,7 +766,9 @@ webui.SideBarView = function(mainView, noEventHandlers) {
         var args = urlParts[1].split("?")[0].split("/");
         var querySuffix = window.location.search || "";
         if (context.indexOf(".ZPM") != -1) {
-            args[1] = context;
+            var parts = context.split(":");
+            args[0] = parts[0];
+            args[1] = parts[1];
         } else {
             args[0] = context;
             args[1] = "";

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

@@ -752,10 +752,11 @@ webui.SideBarView = function(mainView, noEventHandlers) {
     }
 
     self.getCurrentContext = function() {
+        // URL pattern here is like webuidriver.csp/<namespace>/<InternalName of selected item>
         var args = window.location.href.split("webuidriver.csp/")[1].split("?")[0].split("/");
         var context = args[0];
         if (args[1] && (args[1].indexOf(".ZPM") != -1)) {
-            context = args[1];
+            context = args[0] + ":" + args[1];
         }
         return context;
     }
@@ -765,7 +766,9 @@ webui.SideBarView = function(mainView, noEventHandlers) {
         var args = urlParts[1].split("?")[0].split("/");
         var querySuffix = window.location.search || "";
         if (context.indexOf(".ZPM") != -1) {
-            args[1] = context;
+            var parts = context.split(":");
+            args[0] = parts[0];
+            args[1] = parts[1];
         } else {
             args[0] = context;
             args[1] = "";

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

@@ -107,6 +107,32 @@ Method TestSaveAndImportSettings()
     do $$$AssertEquals(^SYS("SourceControl","Git","settings","generatedFilesReadOnly"),"1")
 }
 
+/// Configure routine should succeed when accepting all defaults.
+Method TestConfigureCHUI()
+{
+    set oldRedirectIO = ##class(%Device).ReDirectIO()
+    set oldIO = $io
+    set st = $$$OK
+    try {
+        use $io::"^"_##class(%Studio.SourceControl.ItemSet).LogTags()
+        do ##class(%Library.Device).ReDirectIO(1)
+        set configRet = ##class(SourceControl.Git.Settings).Configure(.configSC)
+        // test when a boolean setting is set with invalid value
+        set ^SYS("SourceControl","Git","settings","generatedFilesReadOnly")=""
+        set configWithInvalidRet = ##class(SourceControl.Git.Settings).Configure(.configWithInvalidSC)
+    } catch err {
+        set st = err.AsStatus()
+    }
+    use oldIO
+    do ##class(%Device).ReDirectIO(oldRedirectIO)
+    $$$ThrowOnError(st)
+    do $$$AssertTrue(configRet)
+    do $$$AssertStatusOK(configSC)
+    do $$$AssertTrue(configWithInvalidRet)
+    do $$$AssertStatusOK(configWithInvalidSC)
+    do $$$AssertEquals($get(^SYS("SourceControl","Git","settings","generatedFilesReadOnly"),""), 0)
+}
+
 Method OnBeforeAllTests() As %Status
 {
 	merge ..SourceControlGlobal = ^SYS("SourceControl")