Fix other types (#179)

* Start of work from working session

* Minor updates to unit tests; force import during a revert.

Co-authored-by: isc-tleavitt <[email protected]>
Co-authored-by: Sarmishta Velury <[email protected]>

Author: isc-svelury

cls/SourceControl/Git/Change.cls

@@ -105,3 +105,4 @@ ClassMethod RefreshUncommitted(Display = 1, IncludeRevert = 0) As %Status
 }
 
 }
+

cls/SourceControl/Git/Utils.cls

@@ -256,7 +256,7 @@ ClassMethod Revert(InternalName As %String) As %Status
     do ..RunGitCommand("checkout", .errStream, .outStream, "--", filename)
     $$$QuitOnError(##class(SourceControl.Git.Change).RemoveUncommitted(filename,0,1))
     $$$QuitOnError(##class(SourceControl.Git.Change).RefreshUncommitted(0,1))
-    $$$QuitOnError(..ImportItem(InternalName))
+    $$$QuitOnError(..ImportItem(InternalName,1))
     quit $$$OK
 }
 
@@ -1028,7 +1028,17 @@ ClassMethod ImportItem(InternalName As %String, force As %Boolean = 0, verbose A
     #dim sc as %Status = $$$OK
 
     if ..IsRoutineOutdated(InternalName) || force {
-        set sc = $system.OBJ.Load(filename,"-l-d")
+        if ##class(%RoutineMgr).UserType(InternalName,.docclass,.doctype) {
+            set routineMgr = ##class(%RoutineMgr).%OpenId(InternalName)
+            do routineMgr.Code.Rewind()
+            set source = ##class(%Stream.FileCharacter).%OpenId(filename,,.sc)
+            if $$$ISOK(sc) {
+                do routineMgr.Code.CopyFrom(source)
+                set sc = routineMgr.%Save()
+            }
+        } else {
+            set sc = $system.OBJ.Load(filename,"-l-d")
+        }
         if sc {
             set sc = ..UpdateRoutineTSH(InternalName, fileTSH)
             if ..Type(InternalName) = "prj" {
@@ -1473,11 +1483,6 @@ ClassMethod Name(InternalName As %String) As %String
         set InternalName=$extract(InternalName,$length(p)+2,*)
         quit $translate(found_$translate(InternalName,"%","_"),"\","/")
 
-    } elseif (ext="DFI") {
-        // expected format is <folderName>-<itemName>.<itemType>.DFI; will map to an external file named <folderName>/<itemName>.<itemType>.xml
-        // replace the first '-' with '/' to translate Item Folder into subfolder on disk and leave the other dashes as dashes; converts spaces to '_'
-        quit $translate(found_$replace($translate(nam,"% ","__"),"-","/",1,1)_".xml","\","/")
-    
     } elseif ext="CLS"||(ext="PRJ")||(usertype&&(##class(%RoutineMgr).UserType(InternalName))) {
         set nam=$replace(nam,"%", ..PercentClassReplace())
         if default{
@@ -1611,3 +1616,4 @@ ClassMethod GetSourceControlInclude() As %String
 }
 
 }
+

test/UnitTest/SourceControl/Git/NameTest.cls

@@ -40,7 +40,7 @@ Method TestBasicMappings()
 	// File corresponding to a specific mapping with foldering enabled
 	do $$$AssertEquals(##class(Utils).Name("UnitTest.SourceControl.Git.NameTest.cls"),"test/UnitTest/SourceControl/Git/NameTest.cls")
 	// File corresponding to a universal mapping with special handling
-	do $$$AssertEquals(##class(Utils).Name("test2.pivot.dfi"),"test/dfi/test2.pivot.xml")
+	do $$$AssertEquals(##class(Utils).Name("test2.pivot.dfi"),"test/_resources/dfi/test2.pivot.dfi")
 }
 
 Method TestOnlyNoFolders()
@@ -73,7 +73,8 @@ Method OnBeforeAllTests() As %Status
 
     set $$$SourceMapping("CLS", "*") = "cls/"
     set $$$SourceMapping("CLS", "UnitTest") = "test/"
-    set $$$SourceMapping("DFI", "test") = "test/dfi/"
+    set $$$SourceMapping("DFI", "*", "NoFolders") = 1
+	set $$$SourceMapping("DFI", "*") = "test/_resources/dfi/"
 
     set $$$SourceMapping("NF", "*", "NoFolders") = 1
     set $$$SourceMapping("NF", "*") = "nf/sf/"
@@ -96,3 +97,4 @@ Method %OnClose() As %Status
 }
 
 }
+

test/UnitTest/SourceControl/Git/NameToInternalNameTest.cls

@@ -7,6 +7,8 @@ Class UnitTest.SourceControl.Git.NameToInternalNameTest Extends %UnitTest.TestCa
 
 Property Mappings [ MultiDimensional ];
 
+Property OldNamespaceTemp As %String;
+
 Method TestRegularClassNames()
 {
 	// Regular class that exists
@@ -32,11 +34,14 @@ Method TestPercentClassNames()
 Method TestAbstractDocumentClassNames()
 {
 	// %Studio.AbstractDocument type that exists
-	do $$$AssertEquals(##class(Utils).NameToInternalName("test\dfi\test2.pivot.xml"),"test2.pivot.DFI")
+	do ##class(%RoutineMgr).Delete("test2.pivot.DFI")
+	do $$$AssertEquals(##class(Utils).NameToInternalName("test\_resources\dfi\test2.pivot.dfi"),"")
+	do $$$AssertStatusOK(##class(Utils).ImportItem("test2.pivot.DFI",1))
+	do $$$AssertEquals(##class(Utils).NameToInternalName("test\_resources\dfi\test2.pivot.dfi"),"test2.pivot.DFI")
 	// %Studio.AbstractDocument type that does not exist and we ignore non-existent classes
-	do $$$AssertEquals(##class(Utils).NameToInternalName("test\dfi\DoesNotExist.xml"),"")
+	do $$$AssertEquals(##class(Utils).NameToInternalName("test\_resources\dfi\DoesNotExist.dfi"),"")
 	//  %Studio.AbstractDocument type that doesn't exist and we don't ignore non-existent classes
-	do $$$AssertEquals(##class(Utils).NameToInternalName("test\dfi\DoesNotExist.xml", 1, 0),"DoesNotExist.DFI")
+	do $$$AssertEquals(##class(Utils).NameToInternalName("test\_resources\dfi\DoesNotExist.dfi", 1, 0),"DoesNotExist.DFI")
 }
 
 Method TestStaticFileNames()
@@ -49,19 +54,27 @@ Method TestStaticFileNames()
 
 Method OnBeforeAllTests() As %Status
 {
+	set settings = ##class(SourceControl.Git.Settings).%New()
+	set ..OldNamespaceTemp = settings.namespaceTemp
+	set settings.namespaceTemp = $Piece(..Manager.CurrentDir,"test",1)
+	$$$ThrowOnError(settings.%Save())
 	merge ..Mappings = @##class(SourceControl.Git.Utils).MappingsNode()
 	kill @##class(SourceControl.Git.Utils).MappingsNode()
 	set $$$SourceMapping("CLS", "*") = "cls/"
 	set $$$SourceMapping("DFI", "*", "NoFolders") = 1
-	set $$$SourceMapping("DFI", "*") = "test/dfi/"
+	set $$$SourceMapping("DFI", "*") = "test/_resources/dfi/"
 	quit $$$OK
 }
 
 Method %OnClose() As %Status
 {
+	set settings = ##class(SourceControl.Git.Settings).%New()
+	set settings.namespaceTemp = ..OldNamespaceTemp
+	do settings.%Save()
 	kill @##class(SourceControl.Git.Utils).MappingsNode()
 	merge @##class(SourceControl.Git.Utils).MappingsNode() = ..Mappings
 	quit $$$OK
 }
 
 }
+