Fix discard

Author: isc-etamarch

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed not showing warnings on Studio (#660)
 - Fixed business processes and rules not being added to source control automatically (#676)
 - Embedded Git commits settings when cloning empty repo to avert any issues
+- Fixed Discard / Stash not working on deletes (#688)
 
 ## [2.9.0] - 2025-01-09
 

cls/SourceControl/Git/DiscardState.cls

@@ -15,6 +15,9 @@ Property Timestamp As %TimeStamp [ Required ];
 
 Property ExternalFile As %Boolean [ Required ];
 
+// Boolean tracking whether or not file was deleted as part of change
+Property Delete As %Boolean;
+
 Index BranchMap On Branch [ Type = bitmap ];
 
 Method RestoreToFileTree()
@@ -24,17 +27,23 @@ Method RestoreToFileTree()
     if ('##class(%File).DirectoryExists(dir)) {
         do ##class(%File).CreateDirectoryChain(dir)
     }
-    
-    // Recreate File
-    set fileStream = ##class(%Stream.FileCharacter).%New()
-    set fileStream.Filename = ..FullExternalName
-    $$$ThrowOnError(fileStream.CopyFrom(..Contents))
-    $$$ThrowOnError(fileStream.%Save())
-
-    // Add file to source-control / IRIS
-    if '..ExternalFile {
-        do ##class(SourceControl.Git.Utils).ImportItem(..Name, 1, 1, 1)
+
+    if (..Delete) {
+        do ##class(%File).Delete(..FullExternalName)
         do ##class(SourceControl.Git.Utils).AddToServerSideSourceControl(..Name)
+    } else {
+    
+        // Recreate File
+        set fileStream = ##class(%Stream.FileCharacter).%New()
+        set fileStream.Filename = ..FullExternalName
+        $$$ThrowOnError(fileStream.CopyFrom(..Contents))
+        $$$ThrowOnError(fileStream.%Save())
+
+        // Add file to source-control / IRIS
+        if '..ExternalFile {
+            do ##class(SourceControl.Git.Utils).ImportItem(..Name, 1, 1, 1)
+            do ##class(SourceControl.Git.Utils).AddToServerSideSourceControl(..Name)
+        }
     }
 
     // Delete discard record
@@ -57,11 +66,15 @@ ClassMethod SaveDiscardState(InternalName As %String, name As %String) As %Statu
             set discardState.ExternalFile = 0
         }
         // Copy over file contents
-        set fileStream = ##class(%Stream.FileCharacter).%New()
-        set fileStream.Filename = discardState.FullExternalName
-        do fileStream.%Open()
-        do discardState.Contents.CopyFrom(fileStream)
-        do fileStream.%Close()
+        if (##class(%File).Exists(discardState.FullExternalName)) {
+            set fileStream = ##class(%Stream.FileCharacter).%New()
+            set fileStream.Filename = discardState.FullExternalName
+            do fileStream.%Open()
+            do discardState.Contents.CopyFrom(fileStream)
+            do fileStream.%Close()
+        } else {
+            set discardState.Delete = 1
+        }
 
         // Save extra information
         set discardState.Username = $USERNAME