Merge branch 'main' into issue-586

Author: isc-etamarch

CHANGELOG.md

@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed not showing warnings on Studio (#660)
 - Fixed business processes and rules not being added to source control automatically (#676)
 - Embedded Git commits settings when cloning empty repo to avert any issues
+- Fixed Import All options not importing the Embedded Git configuration file
+- Improved performance of IDE editing and baselining of decomposed productions
 
 ## [2.9.0] - 2025-01-09
 

cls/SourceControl/Git/Extension.cls

@@ -356,12 +356,15 @@ Method OnAfterSave(InternalName As %String, Object As %RegisteredObject = {$$$NU
                             $$$ThrowOnError(##class(SourceControl.Git.Utils).DeleteExternalFile(key))
                         }
                     } elseif '..IsInSourceControl(key) {
-                        $$$ThrowOnError(##class(SourceControl.Git.Utils).AddToSourceControl(key))
+                        $$$ThrowOnError(##class(SourceControl.Git.Utils).AddToSourceControl(key,0))
                     } else {
                         $$$ThrowOnError(..OnAfterSave(key))
                     }
                     set key = $order(productionItems(key))
                 }
+                if $data(productionItems) {
+                    do ##class(SourceControl.Git.Change).RefreshUncommitted(,,,1)
+                }
             }
             if ..IsInSourceControl(InternalName) {
                 if fromWebApp {

cls/SourceControl/Git/Util/Production.cls

@@ -18,10 +18,13 @@ ClassMethod BaselineProduction(productionName, settings As SourceControl.Git.Set
             $$$ThrowOnError(st)
             set key = $order(itemInternalNames(""))
             while (key '= "") {
-                set st = ##class(SourceControl.Git.Utils).AddToSourceControl(key)
+                set st = ##class(SourceControl.Git.Utils).AddToSourceControl(key,0)
                 $$$ThrowOnError(st)
                 set key = $order(itemInternalNames(key))
             }
+            if $data(itemInternalNames) {
+                do ##class(SourceControl.Git.Change).RefreshUncommitted(,,,1)
+            }
         } else {
             write !, "Exporting production in class format: " _ productionInternalName
             set st = ##class(SourceControl.Git.Utils).AddToSourceControl(productionInternalName)

cls/SourceControl/Git/Utils.cls

@@ -772,7 +772,7 @@ ClassMethod AddToServerSideSourceControl(InternalName As %String) As %Status
     quit ec
 }
 
-ClassMethod AddToSourceControl(InternalName As %String) As %Status
+ClassMethod AddToSourceControl(InternalName As %String, refreshUncommitted As %Boolean = 1) As %Status
 {
     do ##class(SourceControl.Git.PackageManagerContext).ForInternalName(InternalName)
     set settings = ##class(SourceControl.Git.Settings).%New()
@@ -809,7 +809,9 @@ ClassMethod AddToSourceControl(InternalName As %String) As %Status
 
         }
     }
-    do ##class(SourceControl.Git.Change).RefreshUncommitted(,,,1)
+    if refreshUncommitted {
+        do ##class(SourceControl.Git.Change).RefreshUncommitted(,,,1)
+    }
     quit ec
 }
 
@@ -1491,6 +1493,12 @@ ClassMethod ListItemsInFiles(ByRef itemList, ByRef err) As %Status
 {
     #define DoNotLoad 1
     set res = $$$OK
+
+    // Config file may exist at the root of the Git repo.
+    set configFilePath = ##class(%File).NormalizeFilename(##class(SourceControl.Git.Settings.Document).#EXTERNALNAME, ..TempFolder())
+    if ##class(%File).Exists(##class(%File).NormalizeFilename(configFilePath)) {
+        set itemList(..NameToInternalName(configFilePath)) = ""
+    }
 
     set mappingFileType = $order($$$SourceMapping(""))
     while (mappingFileType '= "") {