Fix some error handling

Author: isc-dchui

cls/SourceControl/Git/API.cls

@@ -39,18 +39,18 @@ ClassMethod Configure()
 
 /// API for git pull - just wraps Utils
 /// - 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)
+ClassMethod Pull(pTerminateOnError As %Boolean = 0) As %Status
 {
-    set st = ##class(SourceControl.Git.Utils).Pull(,pTerminateOnError)
-    if pTerminateOnError && $$$ISERR(st) {
+    set sc = ##class(SourceControl.Git.Utils).Pull(,pTerminateOnError)
+    if pTerminateOnError && $$$ISERR(sc) {
         Do $System.Process.Terminate($Job,1)
     }
-    quit st
+    quit sc
 }
 
 /// Imports all items from the Git repository into IRIS.
 /// - pForce: if true, will import an item even if the last updated timestamp in IRIS is later than that of the file on disk.
-ClassMethod ImportAll(pForce As %Boolean = 0) as %Status
+ClassMethod ImportAll(pForce As %Boolean = 0) As %Status
 {
     return ##class(SourceControl.Git.Utils).ImportAll(pForce)
 }

cls/SourceControl/Git/Settings.cls

@@ -625,4 +625,5 @@ ClassMethod GetRemoteType(remoteURL As %String) As %String
 {
     return $select(remoteURL [ "https": "HTTPS",1:"SSH")
 }
+
 }

cls/SourceControl/Git/Utils.cls

@@ -712,7 +712,8 @@ ClassMethod Clone(remote As %String) As %Status
     // TODO: eventually use /ENV flag with GIT_TERMINAL_PROMPT=0. (This isn't doc'd yet and is only in really new versions.)
     set rc = ..RunGitWithArgs(.errStream, .outStream, "clone", remote, settings.namespaceTemp)
     if rc '= 0 {
-        quit $$$ERROR($$$GeneralError, "Git clone failed: "_errStream.Read())
+        set errMsg = errStream.Read()
+        quit $$$ERROR($$$GeneralError, "Git clone failed: "_errMsg)
     }
     // can I substitute this with the new print method?
     $$$NewLineIfNonEmptyStream(errStream)
@@ -1956,12 +1957,18 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
             set email = ..GitUserEmail()
         }
 
-        set newArgs($increment(newArgs)) = "-c"
-        set newArgs($increment(newArgs)) = "user.name="_username
-        set newArgs($increment(newArgs)) = "-c"
-        set newArgs($increment(newArgs)) = "user.email="_email
-        set newArgs($increment(newArgs)) = "-c"
-        set newArgs($increment(newArgs)) = "credential.interactive=false"
+        if username '= "" {
+            set newArgs($increment(newArgs)) = "-c"
+            set newArgs($increment(newArgs)) = "user.name="_username
+        }
+        if email '= "" {
+            set newArgs($increment(newArgs)) = "-c"
+            set newArgs($increment(newArgs)) = "user.email="_email
+        }
+        if ('..UsingOAuth()) {
+            set newArgs($increment(newArgs)) = "-c"
+            set newArgs($increment(newArgs)) = "credential.interactive=false"
+        }
     }
 
     set newArgs($increment(newArgs)) = command
@@ -2127,7 +2134,7 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
 
     set baseArgs = "/STDOUT="_$$$QUOTE(outLog)_" /STDERR="_$$$QUOTE(errLog)_$case(inFile, "":"", :" /STDIN="_$$$QUOTE(inFile))
     // Use OAuth Authentication if needed (TODO: Should this be done always, or only for certain commands?)
-    if ((..UsingOAuth())) {
+    if (..UsingOAuth()) {
         set token = ##class(SourceControl.Git.OAuth2).GetToken()
         if (token '= "") {
             if ($$$isWINDOWS) {

cls/SourceControl/Git/WebUIDriver.cls

@@ -445,7 +445,6 @@ ClassMethod GetOAuthURL(%request As %CSP.Request) As %SystemBase
         set oauthURL = "/isc/studio/usertemplates/gitsourcecontrol/oauth2.csp?CSPSHARE=1&Namespace="_$namespace_"&Username="_$username
         set oauthURL = ..GetURLPrefix(%request, oauthURL)
     #; }
-    set ^mtempdc = oauthURL
     quit {"url": (oauthURL)}
 }
 

cls/_zpkg/isc/sc/git/Socket.cls

@@ -39,14 +39,14 @@ ClassMethod Run()
 			do ##class(SourceControl.Git.Utils).RunGitCommandWithInput("config",,,,"--global", "--add", "safe.directory", root)
 		}
 
-		Do ##class(SourceControl.Git.Utils).Init()
+		$$$ThrowOnError(##class(SourceControl.Git.Utils).Init())
 		Write !,"Done."
 	} ElseIf %request.Get("method") = "clone" {
 		Set remote = %request.Get("remote")
-		Do ##class(SourceControl.Git.Utils).Clone(remote)
+		$$$ThrowOnError(##class(SourceControl.Git.Utils).Clone(remote))
 		Write !,"Done."
 	} ElseIf %request.Get("method") = "sshkeygen" {
-		Do ##class(SourceControl.Git.Utils).GenerateSSHKeyPair()
+		$$$ThrowOnError(##class(SourceControl.Git.Utils).GenerateSSHKeyPair())
 		Write !,"Done."
 	} Else {
 		Write !!,"Invalid method selected.",!!