Merge branch 'main' into label-merge-conflicts

Author: isc-pbarton

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [2.15.0] - Unreleased
 
+### Added
+- Import All has been added to public-facing API (#891)
+
 ## Fixed
 - Web UI workspace view labels changes as Unmerged if there are merge conflicts (#890)
 

cls/SourceControl/Git/API.cls

@@ -48,6 +48,13 @@ ClassMethod Pull(pTerminateOnError As %Boolean = 0)
     quit st
 }
 
+/// Imports all items from the Git repository into IRIS.
+/// - pForce: if true, will import an item even if the last updated timestamp in IRIS is later than that of the file on disk.
+ClassMethod ImportAll(pForce As %Boolean = 0) as %Status
+{
+    return ##class(SourceControl.Git.Utils).ImportAll(pForce)
+}
+
 /// Locks the environment to prevent changes to code other than through git pull.
 /// Returns 1 if the environment was already locked, 0 if it was previously unlocked.
 ClassMethod Lock()

test/UnitTest/SourceControl/Git/ImportAll.cls

@@ -58,7 +58,7 @@ Method TestImportAll()
 	do ..WriteFile(##class(SourceControl.Git.Settings).%New().namespaceTemp_"csp/git/unittest/xsl/test.xsl", "<?xml version=""1.0"" encoding=""UTF-8""?> <xsl:stylesheet version=""1.0""></xsl:stylesheet>")
 	$$$ThrowOnError(##class(%Routine).Delete("test.mac"))
 	do ##class(%RoutineMgr).Delete("/csp/git/unittest/xsl/test.xsl")
-	$$$ThrowOnError(##class(SourceControl.Git.Utils).ImportAll(1))
+	$$$ThrowOnError(##class(SourceControl.Git.API).ImportAll(1))
 	do $$$AssertTrue(##class(%Routine).Exists("test.mac"))
 	do $$$AssertTrue(##class(%RoutineMgr).Exists("/csp/git/unittest/xsl/test.xsl"))
 	do $$$AssertFilesSame(##class(SourceControl.Git.Settings).%New().namespaceTemp_"csp/git/unittest/xsl/test.xsl", ..WebAppPath_"/test.xsl")