Further tweak to namespace temp folder setting

isc-tleavitt · isc-tleavitt · commit 7d85a796e160 · 2023-01-13T13:22:55.000-05:00
diff --git a/cls/SourceControl/Git/Settings.cls b/cls/SourceControl/Git/Settings.cls
@@ -53,7 +53,8 @@ Method %Save() As %Status
     }
     kill ^||GitVersion
     
-    set @storage@("settings","namespaceTemp") = ##class(%Library.File).NormalizeDirectory(..namespaceTemp)
+    set ..namespaceTemp = ##class(%Library.File).NormalizeDirectory(..namespaceTemp)
+    set @storage@("settings","namespaceTemp") = ..namespaceTemp
     if ('##class(%File).DirectoryExists(@storage@("settings","namespaceTemp"))){
         do ##class(%Library.File).CreateDirectoryChain(@storage@("settings","namespaceTemp"))
     }
diff --git a/test/UnitTest/SourceControl/Git/AddRemove.cls b/test/UnitTest/SourceControl/Git/AddRemove.cls
@@ -50,9 +50,10 @@ Method %OnNew(initvalue) As %Status
 {
 	Merge ..SourceControlGlobal = ^SYS("SourceControl")
 	Kill ^SYS("SourceControl")
-	Set folder = ##class(%Library.File).NormalizeFilename(##class(%Library.File).TempFilename()_"dir/")
-	Set ^SYS("SourceControl","Git","settings","namespaceTemp") = folder
-	Set ^SYS("SourceControl","Git","settings","mappings","MAC","*")="rtn/"
+	Set settings = ##class(SourceControl.Git.Settings).%New()
+	Set settings.namespaceTemp = ##class(%Library.File).TempFilename()_"dir"
+	Set settings.Mappings("MAC","*")="rtn/"
+	Do settings.%Save()
 	Do ##class(%Studio.SourceControl.Interface).SourceControlClassSet("SourceControl.Git.Extension")
 	Quit ##super(initvalue)
 }

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,8 @@ Method %Save() As %Status`
`53`	`53`	`}`
`54`	`54`	`kill ^\|\|GitVersion`
`55`	`55`
`56`		`- set @storage@("settings","namespaceTemp") = ##class(%Library.File).NormalizeDirectory(..namespaceTemp)`
	`56`	`+ set ..namespaceTemp = ##class(%Library.File).NormalizeDirectory(..namespaceTemp)`
	`57`	`+ set @storage@("settings","namespaceTemp") = ..namespaceTemp`
`57`	`58`	`if ('##class(%File).DirectoryExists(@storage@("settings","namespaceTemp"))){`
`58`	`59`	`do ##class(%Library.File).CreateDirectoryChain(@storage@("settings","namespaceTemp"))`
`59`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,10 @@ Method %OnNew(initvalue) As %Status`
`50`	`50`	`{`
`51`	`51`	`Merge ..SourceControlGlobal = ^SYS("SourceControl")`
`52`	`52`	`Kill ^SYS("SourceControl")`
`53`		`- Set folder = ##class(%Library.File).NormalizeFilename(##class(%Library.File).TempFilename()_"dir/")`
`54`		`- Set ^SYS("SourceControl","Git","settings","namespaceTemp") = folder`
`55`		`- Set ^SYS("SourceControl","Git","settings","mappings","MAC","*")="rtn/"`
	`53`	`+ Set settings = ##class(SourceControl.Git.Settings).%New()`
	`54`	`+ Set settings.namespaceTemp = ##class(%Library.File).TempFilename()_"dir"`
	`55`	`+ Set settings.Mappings("MAC","*")="rtn/"`
	`56`	`+ Do settings.%Save()`
`56`	`57`	`Do ##class(%Studio.SourceControl.Interface).SourceControlClassSet("SourceControl.Git.Extension")`
`57`	`58`	`Quit ##super(initvalue)`
`58`	`59`	`}`