Merge pull request #576 from intersystems/524-deleting-deleted-files-on-import-all-fails

Catch errors on deleting items with nonexistent files

Author: isc-tleavitt

CHANGELOG.md

@@ -39,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Initialize repo in settings page now uses entered repo (#486)
 - Report error more clearly if you try to create a branch with an invalid name (#534)
 - Don't default to WINDOWS style paths (#357)
+- Fix errors when deleting non-existent files on import (#524)
 
 ## [2.6.0] - 2024-10-07
 

cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls

@@ -44,32 +44,45 @@ Method OnPull() As %Status
 }
 
 Method DeleteFile(item As %String) As %Status
-{
-    set sc = $$$OK
-    set type = ##class(SourceControl.Git.Utils).Type(item)
-    set name = ##class(SourceControl.Git.Utils).NameWithoutExtension(item)
-    set deleted = 1
-    if type = "prj" {
-        set sc = $system.OBJ.DeleteProject(name)
-    }elseif type = "cls" {
-        set sc = $system.OBJ.Delete(item)
-    }elseif $listfind($listbuild("mac","int","inc","bas","mvb","mvi"), type) > 0 {
-        set sc = ##class(%Routine).Delete(item)
-    }elseif type = "csp" {
-        set sc = $System.CSP.DeletePage(item)
-    }elseif ##class(SourceControl.Git.Utils).UserTypeCached(item) {
-        set sc = ##class(%Library.RoutineMgr).Delete(item)
-    } else {
-        set deleted = 0
-    }
-    
-    if deleted && $$$ISOK(sc) {
-        do ##class(SourceControl.Git.Utils).RemoveRoutineTSH(item)
-        kill $$$TrackedItems(##class(SourceControl.Git.Utils).NormalizeExtension(item))
-    } else {
-        if +$system.Status.GetErrorCodes(sc) = $$$ClassDoesNotExist {
-            // if something we wanted to delete is already deleted -- good!
+{   
+    try {
+        set sc = $$$OK
+        set type = ##class(SourceControl.Git.Utils).Type(item)
+        set name = ##class(SourceControl.Git.Utils).NameWithoutExtension(item)
+        set deleted = 1
+        if type = "prj" {
+            set sc = $system.OBJ.DeleteProject(name)
+        }elseif type = "cls" {
+            set sc = $system.OBJ.Delete(item)
+        }elseif $listfind($listbuild("mac","int","inc","bas","mvb","mvi"), type) > 0 {
+            set sc = ##class(%Routine).Delete(item)
+        }elseif type = "csp" {
+            set sc = $System.CSP.DeletePage(item)
+        }elseif ##class(SourceControl.Git.Utils).UserTypeCached(item) {
+            set sc = ##class(%Library.RoutineMgr).Delete(item)
+        } else {
+            set deleted = 0
+        }
+        
+        if deleted && $$$ISOK(sc) {
+            do ##class(SourceControl.Git.Utils).RemoveRoutineTSH(item)
+            kill $$$TrackedItems(##class(SourceControl.Git.Utils).NormalizeExtension(item))
+        } else {
+            if +$system.Status.GetErrorCodes(sc) = $$$ClassDoesNotExist {
+                // if something we wanted to delete is already deleted -- good!
+                set sc = $$$OK
+            }
+        }
+    } catch e {
+        set filename = ##class(SourceControl.Git.Utils).FullExternalName(item)
+        if '##class(%File).Exists(filename) {
+            do ##class(SourceControl.Git.Utils).RemoveRoutineTSH(item)
+            // file doesn't exist anymore despite error -- should be ok
             set sc = $$$OK
+        } else {
+            // Item still exists and was not deleted -- bad
+            set sc = e.AsStatus()
+            do e.Log() 
         }
     }
     return sc