Merge branch 'main' into feature/update-progress-messages

Author: isc-pbarton

CHANGELOG.md

@@ -9,7 +9,10 @@ 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)
-- Fix baselining output more consistent, human readable
+- Fix baselining output more consistent, human readable (#814)
+- Import All now imports configuration file before everything else (#806)
+- Fixed another instance of deletes showing as owned by undefined user (#812)
+- Fix Revert not syncing files with IRIS (#789)
 
 ## [2.12.2] - 2025-07-08
 

cls/SourceControl/Git/Change.cls

@@ -66,6 +66,12 @@ ClassMethod AddDeletedToUncommitted(Filename, InternalName) As %Status
     Quit ..SetUncommitted(Filename, "delete", InternalName, $USERNAME, "", 1, "", "", 0)
 }
 
+/// Determine if an item is deleted, if it is not in a provided list of git files but is a known tracked item
+ClassMethod IsDeleted(InternalName As %String, ByRef gitFiles) As %Boolean
+{
+    Quit ('$data(gitFiles(InternalName))) && ($data($$$TrackedItems(##class(%Studio.SourceControl.Interface).normalizeName(InternalName))))
+}
+
 /// The Filename here is an ExternalName formatted name with the full file path
 ClassMethod IsUncommitted(Filename, ByRef ID) As %Boolean
 {
@@ -151,8 +157,7 @@ ClassMethod RefreshUncommitted(Display = 0, IncludeRevert = 0, Output gitFiles,
 
         if ((InternalName = "") 
                 || ((InternalName '= "") 
-                    && ('$data(gitFiles(InternalName), found)) 
-                    && ($data($$$TrackedItems(##class(%Studio.SourceControl.Interface).normalizeName(InternalName))))))  {
+                    && ..IsDeleted(InternalName, .gitFiles)))  {
             set sc=..RemoveUncommitted(filename,Display,0,0)
             if $$$ISERR(sc) continue
         }

cls/SourceControl/Git/Extension.cls

@@ -529,7 +529,8 @@ Method GetStatus(ByRef InternalName As %String, ByRef IsInSourceControl As %Bool
     } else {
         // If it doesn't show up in git status, there are no uncommitted changes so it should not be locked or checked out by any user
         set Editable=1, IsCheckedOut=0, UserCheckedOut=""
-        if ##class(SourceControl.Git.Change).IsUncommitted(filename){
+        if ##class(SourceControl.Git.Change).IsUncommitted(filename)
+           && '##class(SourceControl.Git.Change).IsDeleted(InternalName, .files) {
             #; Remove the item from the list of uncommitted changes;
             set sc=##class(SourceControl.Git.Change).RemoveUncommitted(filename,1,1)
             if $$$ISERR(sc) write "Error removing uncommitted file "_filename_" - "_$system.OBJ.DisplayError(sc)

cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls

@@ -15,14 +15,19 @@ Method OnPull() As %Status
     for i=1:1:$get(..ModifiedFiles) {
         set internalName = ..ModifiedFiles(i).internalName
         if internalName = ##class(SourceControl.Git.Settings.Document).#INTERNALNAME {
-            set sc = $$$ADDSC(sc, ##class(SourceControl.Git.Utils).ImportItem(internalName))
+            set sc = $$$ADDSC(sc, ##class(SourceControl.Git.Utils).ImportItem(internalName, 1))
+            quit
         }
     }
 
     set nFiles = 0
 
     for i=1:1:$get(..ModifiedFiles){
         set internalName = ..ModifiedFiles(i).internalName
+        
+        // Don't import the config file a second time
+        continue:internalName=##class(SourceControl.Git.Settings.Document).#INTERNALNAME
+        
         if ((internalName = "") && (..ModifiedFiles(i).changeType '= "D")) {
             write !, ..ModifiedFiles(i).externalName, " was not imported into the database and will not be compiled. "
         } elseif (..ModifiedFiles(i).changeType = "D") {

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
@@ -1981,6 +2001,25 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
                 set diffCompare = args(i + 1)
             } elseif (args(i) = "commit") {
                 set isCommit = 1
+            } elseif (args(i) = "reset") {
+                // Sync files after performing a 'Hard Reset' via the WebUI
+                if (args(i + 1) = "--hard") {
+                    set syncIrisWithDiff = 1
+                    set syncIrisWithDiffAfterGit = 1
+                    set syncIrisWithDiffVerbose = 1
+                    // The current commit will still be able to be referenced to diff against
+                    // despite the fact that it will disappear after the reset is performed
+                    set diffBase = ..GetCurrentRevision()
+                }
+            } elseif (args(i) = "revert") {
+                // Sync files after performing a 'Revert' via the WebUI
+                if (args(i + 1) = "--no-commit") {
+                    set syncIrisWithDiff = 1
+                    set syncIrisWithDiffAfterGit = 1
+                    set syncIrisWithDiffVerbose = 1
+                    // When syncing diff against what is being reverted
+                    set diffBase = args(i + 2)
+                }
             }
         }
     }