Merge pull request #807 from raymond-rebbeck/import-all-config-first

Import embedded-git-config.json first when performing an Import All

Author: isc-pbarton

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Fix Import All not importing items that do not already exist when compileOnImport is not set (#798)
+- Import All now imports configuration file before everything else (#806)
 
 ## [2.12.2] - 2025-07-08
 

cls/SourceControl/Git/Utils.cls

@@ -1567,14 +1567,34 @@ ClassMethod ImportRoutines(force As %Boolean = 0, pullEventClass As %String) As
 
     #dim ec as %Status = ..ListItemsInFiles(.itemList, .err)
     quit:'ec ec
-
+    
+    // If there is a config file it must be imported before everything else.
+    if $Data(itemList(##class(SourceControl.Git.Settings.Document).#INTERNALNAME)) {
+        set sc = ##class(SourceControl.Git.Utils).ImportItem(##class(SourceControl.Git.Settings.Document).#INTERNALNAME, force)
+        
+        if $$$ISERR(sc) {
+            set ec = $$$ADDSC(ec, sc)
+        } else {
+            kill err, itemList
+            set err = 0
+            
+            // Get the item list again as it may be different after just importing the config file
+            set ec = $$$ADDSC(ec, ..ListItemsInFiles(.itemList, .err))
+        }
+        quit:'ec ec
+    }
+    
     kill files
 
     set settings = ##class(SourceControl.Git.Settings).%New()
     #dim internalName as %String = ""
     for  {
         set internalName = $order(itemList(internalName))
         quit:internalName=""
+        
+        // Don't import the config file a second time
+        continue:internalName=##class(SourceControl.Git.Settings.Document).#INTERNALNAME
+        
         set context = ##class(SourceControl.Git.PackageManagerContext).ForInternalName(internalName)
         continue:context.Package'=refPackage
         set doImport = ..IsRoutineOutdated(internalName) || force