Merge pull request #620 from intersystems/618-deleting-non-existent-files-still-fails-on-import-all

isc-tleavitt · web-flow · commit 3f4317aec8af · 2024-11-01T15:10:04.000-04:00
Fix deleting files on import
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -54,6 +54,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix Diff View options not applying immediately (#590)
 - Cleaned up parsing of command output in Git Web UI (#609)
 - Fix TempFolder misspecification (#611)
+- Fix deleting files on import all (#618)
 
 ## [2.6.0] - 2024-10-07
 
diff --git a/cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls b/cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls
@@ -73,6 +73,8 @@ Method DeleteFile(item As %String) As %Status
                 set sc = $$$OK
             }
         }
+        // Force the catch if failing
+        $$$ThrowOnError(sc)
     } catch e {
         set filename = ##class(SourceControl.Git.Utils).FullExternalName(item)
         if '##class(%File).Exists(filename) {

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,8 @@ Method DeleteFile(item As %String) As %Status`
`73`	`73`	`set sc = $$$OK`
`74`	`74`	`}`
`75`	`75`	`}`
	`76`	`+ // Force the catch if failing`
	`77`	`+ $$$ThrowOnError(sc)`
`76`	`78`	`} catch e {`
`77`	`79`	`set filename = ##class(SourceControl.Git.Utils).FullExternalName(item)`
`78`	`80`	`if '##class(%File).Exists(filename) {`