Merge pull request #565 from intersystems/issue-545

Terminate git pull on error

Author: isc-tleavitt

CHANGELOG.md

@@ -44,6 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix errors when deleting non-existent files on import (#524)
 - Fix errors on commit when a file was added, never committed, then deleted from the repository (#481)
 - Fixed issue with saving multiple new no-folder mapping settings at the same time (#533)
+- Fixed sending OS error when git pull encounters error (#545)
 
 ## [2.6.0] - 2024-10-07
 

cls/SourceControl/Git/API.cls

@@ -44,9 +44,14 @@ ClassMethod Configure()
 }
 
 /// API for git pull - just wraps Utils
-ClassMethod Pull()
+/// - pTerminateOnError: if set to 1, this will terminate on error if there are any errors in the pull, otherwise will return status
+ClassMethod Pull(pTerminateOnError As %Boolean = 0)
 {
-    quit ##class(SourceControl.Git.Utils).Pull()
+    set st = ##class(SourceControl.Git.Utils).Pull(,pTerminateOnError)
+    if pTerminateOnError && $$$ISERR(st) {
+        Do $System.Process.Terminate($Job,1)
+    }
+    quit st
 }
 
 /// Locks the environment to prevent changes to code other than through git pull.

cls/SourceControl/Git/Utils.cls

@@ -612,7 +612,7 @@ ClassMethod GetCurrentRevision() As %String
     quit revision
 }
 
-ClassMethod Pull(remote As %String = "origin") As %Status
+ClassMethod Pull(remote As %String = "origin", pTerminateOnError As %Boolean=0) As %Status
 {
     New %gitSCOutputFlag
     Set %gitSCOutputFlag = 1
@@ -627,6 +627,10 @@ ClassMethod Pull(remote As %String = "origin") As %Status
     write !
     do errStream.OutputToDevice()
     write !, "Pull ran with return code: " _ returnCode
+    set err = errStream.Read()
+    if ($find(err,"error") || $find(err, "fatal") || $find(err, "ERROR")) && pTerminateOnError {
+        quit $$$ERROR($$$GeneralError, err)
+    }
     quit $$$OK
 }