refactor deletes on import into pull event handler

Author: isc-pbarton

cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls

@@ -38,17 +38,36 @@ Method OnPull() As %Status
     quit $system.OBJ.CompileList(.compilelist, "cukb")
 }
 
-Method DeleteFile(item As %String)
+Method DeleteFile(item As %String) As %Status
 {
+    set sc = $$$OK
     set type = ##class(SourceControl.Git.Utils).Type(item)
-    if (type = "cls") {
-        quit $System.OBJ.Delete(item)
-    } elseif (type = "csp") {
-        quit $System.CSP.DeletePage(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 {
-        quit ##class(%Library.RoutineMgr).Delete(item)
+        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
+        }
+    }
+    return sc
 }
 
 }
-

cls/SourceControl/Git/Utils.cls

@@ -1327,13 +1327,6 @@ ClassMethod ImportRoutines(force As %Boolean = 0) As %Status
         }
     }
 
-    set eventHandler = $classmethod(..PullEventClass(),"%New")
-    set eventHandler.LocalRoot = ..TempFolder()
-    merge eventHandler.ModifiedFiles = files
-    set sc = eventHandler.OnPull()
-    if $$$ISERR(sc) {
-        set ec = $$$ADDSC(ec,sc)
-    }
 
     //let's delete all items for which corresponding files had been deleted
     #dim item as %String = ""
@@ -1347,41 +1340,21 @@ ClassMethod ImportRoutines(force As %Boolean = 0) As %Status
         set fullExternalName = ..FullExternalName(item)
         if '##class(%File).Exists(fullExternalName) {
             write !,fullExternalName," does not exist - deleting ",item
-            #dim type as %String = ..Type(item)
-            #dim name as %String = ..NameWithoutExtension(item)
-            #dim deleted as %Boolean = 1
-            if type = "prj" {
-                set ec = $$$ADDSC(ec, $system.OBJ.DeleteProject(name))
-            }elseif type = "cls" {
-                set ec = $$$ADDSC(ec, $system.OBJ.Delete(item))
-            }elseif $listfind($listbuild("mac","int","inc","bas","mvb","mvi"), type) > 0 {
-                set ec = $$$ADDSC(ec, ##class(%Routine).Delete(item))
-            }elseif type = "csp" {
-                #dim filename = $system.CSP.GetFileName(item)
-                if ##class(%File).Exists(filename) && '##class(%File).Delete(filename) {
-                    set ec = $$$ADDSC(ec, ..MakeError("Error while removing "_item))
-                }
-            }elseif ..UserTypeCached(item) {
-                set ec = $$$ADDSC(ec, ##class(%Library.RoutineMgr).Delete(item))
-            } else {
-                set deleted = 0
-            }
-            
-            if deleted && ec {
-                do ..RemoveRoutineTSH(item)
-                kill $$$TrackedItems(..NormalizeExtension(item))
-                write !, item, " was deleted"
-            } else {
-                if +$system.Status.GetErrorCodes(ec) '= $$$ClassDoesNotExist {
-                    write !, "Error: could not delete ", item
-                } else {
-                    // if something we wanted to delete is already deleted -- good!
-                    set ec = $$$OK
-                }
-            }
+            set modification = ##class(SourceControl.Git.Modification).%New()
+            set modification.changeType = "D"
+            set modification.internalName = item
+            set modification.externalName = fullExternalName
+            set files($increment(files)) = modification
         }
     }
 
+    set eventHandler = $classmethod(..PullEventClass(),"%New")
+    set eventHandler.LocalRoot = ..TempFolder()
+    merge eventHandler.ModifiedFiles = files
+    set sc = eventHandler.OnPull()
+    if $$$ISERR(sc) {
+        set ec = $$$ADDSC(ec,sc)
+    }
     write !, "==import done=="
     quit ec
 }