fix: fixes and updates to embedded git config file

Author: isc-pbarton

cls/SourceControl/Git/Settings.cls

@@ -86,11 +86,11 @@ Method SaveWithSourceControl() As %Status
     set sc = $$$OK
     #dim %SourceControl As %Studio.SourceControl.Interface
     if '$isobject($get(%SourceControl)) {
+        new %SourceControl
         do ##class(%Studio.SourceControl.Interface).SourceControlCreate($username)
     }
     set gitDir = ##class(%File).NormalizeDirectory(..namespaceTemp)_".git"
-    set skipSourceControl = ('##class(%File).DirectoryExists(gitDir) && 
-        (##class(%Studio.SourceControl.Interface).SourceControlClassGet() = ##class(SourceControl.Git.Extension).%ClassName(1)))
+    set skipSourceControl = '##class(%File).DirectoryExists(gitDir)
     $$$QuitOnError(..%Save())
     set internalName = ##class(SourceControl.Git.Settings.Document).#INTERNALNAME
     set settingsDoc = ##class(SourceControl.Git.Settings.Document).%New(internalName)
@@ -104,7 +104,7 @@ Method SaveWithSourceControl() As %Status
                 $$$QuitOnError(sc)
             }
         }
-        if ($IsObject(%SourceControl)) {
+        if ($IsObject($get(%SourceControl))) {
             $$$QuitOnError(%SourceControl.OnAfterSave(internalName))
         }
     }
@@ -223,6 +223,8 @@ Method ImportDynamicObject(pSettingsDyn As %DynamicObject)
             set ..Mappings(k1, k2) = v2.%Get("directory")
             if v2.%Get("noFolders") {
                 set ..Mappings(k1, k2, "NoFolders") = 1
+            } else {
+                kill ..Mappings(k1, k2, "NoFolders")
             }
         }
     }

cls/SourceControl/Git/Settings/Document.cls

@@ -1,12 +1,12 @@
-/// Custom studio document type for git-source-control settings that are controlled by a file
+/// Custom studio document type for Embedded Git settings that are controlled by a file
 Class SourceControl.Git.Settings.Document Extends %Studio.AbstractDocument
 {
 
 Projection RegisterExtension As %Projection.StudioDocument(DocumentExtension = "GSC", DocumentNew = 0, DocumentType = "json");
 
-Parameter INTERNALNAME = "git-source-control.GSC";
+Parameter INTERNALNAME = "embedded-git-config.GSC";
 
-Parameter EXTERNALNAME = "git-source-control.json";
+Parameter EXTERNALNAME = "embedded-git-config.json";
 
 /// Return 1 if the routine 'name' exists and 0 if it does not.
 ClassMethod Exists(name As %String) As %Boolean

docs/production-decomposition.md

@@ -1,10 +1,10 @@
 # Production Decomposition
-Production Decomposition is a feature of git-source-control that allows multiple developers to edit the same IRIS Interoperability production in the same namespace. In the past, the production class has been an obstacle preventing organizations using multi-user development namespaces from adopting source control. Production Decomposition resolves this by representing the production as a directory of files for each production item that may be edited independently. An uncommitted change to the settings for a single item through the Interoperability Portal will block other users from editing that item while allowing changes to other items in the production.
+Production Decomposition is a feature of Embedded Git that allows multiple developers to edit the same IRIS Interoperability production in the same namespace. In the past, the production class has been an obstacle preventing organizations using multi-user development namespaces from adopting source control. Production Decomposition resolves this by representing the production as a directory of files for each production item that may be edited independently. An uncommitted change to the settings for a single item through the Interoperability Portal will block other users from editing that item while allowing changes to other items in the production.
 
 ## Enabling production decomposition
-The feature may be enabled by checking the "Decompose Productions" box in the Git Settings page. For deployment of changes to other environments through git to work properly, the value of this setting must match on all namespaces connected to this repository. To assist, settings are automatically exported into a `git-source-control.json` file at the root of the repository that may be committed and imported into other environments.
+The feature may be enabled by checking the "Decompose Productions" box in the Git Settings page. For deployment of changes to other environments through git to work properly, the value of this setting must match on all namespaces connected to this repository. To assist, settings are automatically exported into a `embedded-git-config.json` file at the root of the repository that may be committed and imported into other environments.
 
-If there are existing productions in the namespace, they should be migrated to the new decomposed format by running `do ##class(SourceControl.Git.API).BaselineProductions()`. You may then use the Git Web UI to view, commit, and push the corresponding changes. This method should be run in a single namespace and then deployed to other namespaces through normal git-source-control deployment mechanisms.
+If there are existing productions in the namespace, they should be migrated to the new decomposed format by running `do ##class(SourceControl.Git.API).BaselineProductions()`. You may then use the Git Web UI to view, commit, and push the corresponding changes. This method should be run in a single namespace and then deployed to other namespaces through normal Embedded Git deployment mechanisms.
 
 ## Editing productions in the IDE
 There are a couple of limitations related to editing a production class directly in an integrated development environment (Studio or VS Code).

test/UnitTest/SourceControl/Git/Settings.cls

@@ -67,12 +67,12 @@ Method TestSaveAndImportSettings()
     set settings.percentClassReplace = "_"
     set settings.decomposeProductions = 1
     $$$ThrowOnError(settings.SaveWithSourceControl())
-    do $$$AssertStatusOK(##class(SourceControl.Git.Utils).AddToSourceControl("git-source-control.GSC"))
+    do $$$AssertStatusOK(##class(SourceControl.Git.Utils).AddToSourceControl("embedded-git-config.GSC"))
     // settings file should be in source control
-    do $$$AssertTrue(##class(SourceControl.Git.Utils).IsInSourceControl("git-source-control.GSC"))
-    do $$$AssertEquals($replace(##class(SourceControl.Git.Utils).ExternalName("git-source-control.GSC"),"\","/"),"git-source-control.json")
+    do $$$AssertTrue(##class(SourceControl.Git.Utils).IsInSourceControl("embedded-git-config.GSC"))
+    do $$$AssertEquals($replace(##class(SourceControl.Git.Utils).ExternalName("embedded-git-config.GSC"),"\","/"),"embedded-git-config.json")
     // commit settings
-    do $$$AssertStatusOK(##class(SourceControl.Git.Utils).Commit("git-source-control.GSC"))
+    do $$$AssertStatusOK(##class(SourceControl.Git.Utils).Commit("embedded-git-config.GSC"))
     // settings should be in the global
     do $$$AssertEquals(^SYS("SourceControl","Git","settings","mappings","CLS","Foo"),"foo/")
     do $$$AssertEquals(^SYS("SourceControl","Git","settings","pullEventClass"),"SourceControl.Git.PullEventHandler.Default")
@@ -90,7 +90,7 @@ Method TestSaveAndImportSettings()
     do $$$AssertEquals(^SYS("SourceControl","Git","settings","percentClassReplace"),"x")
     do $$$AssertEquals(^SYS("SourceControl","Git","settings","decomposeProductions"),"0")
     // revert change to settings 
-    do $$$AssertStatusOK(##class(SourceControl.Git.Utils).Revert("git-source-control.GSC"))
+    do $$$AssertStatusOK(##class(SourceControl.Git.Utils).Revert("embedded-git-config.GSC"))
     // old setting should be in the global
     do $$$AssertEquals(^SYS("SourceControl","Git","settings","mappings","CLS","Foo"),"foo/")
     do $$$AssertEquals(^SYS("SourceControl","Git","settings","pullEventClass"),"SourceControl.Git.PullEventHandler.Default")