Fix a few minor things

Author: isc-dchui

cls/SourceControl/Git/Settings.cls

@@ -172,11 +172,7 @@ Method %Save() As %Status
     set @storage@("settings","gitRemoteURL") = ..gitRemoteURL
     set @storage@("settings", "lockBranch") = ..lockBranch
 
-    if (..gitRemoteType = "HTTPS") {
-        set @storage@("settings","OAuth") = ..OAuth
-    } else {
-        set @storage@("settings","OAuth") = 0
-    }
+    set @storage@("settings","OAuth") = ..OAuth
 
     set @storage@("settings", "mappingsToken") = ..mappingsToken
 

cls/SourceControl/Git/Utils.cls

@@ -690,7 +690,10 @@ ClassMethod Clone(remote As %String) As %Status
 {
     set settings = ##class(SourceControl.Git.Settings).%New()
     // TODO: eventually use /ENV flag with GIT_TERMINAL_PROMPT=0. (This isn't doc'd yet and is only in really new versions.)
-    set sc = ..RunGitWithArgs(.errStream, .outStream, "clone", remote, settings.namespaceTemp)
+    set rc = ..RunGitWithArgs(.errStream, .outStream, "clone", remote, settings.namespaceTemp)
+    if rc '= 0 {
+        quit $$$ERROR($$$GeneralError, "Git clone failed: "_errStream.Read())
+    }
     // can I substitute this with the new print method?
     $$$NewLineIfNonEmptyStream(errStream)
     while 'errStream.AtEnd {
@@ -1867,7 +1870,13 @@ ClassMethod RunGitWithArgs(Output errStream, Output outStream, args...) As %Inte
 
 ClassMethod RunGitCommand(command As %String, Output errStream, Output outStream, args...) As %Integer
 {
-    quit ..RunGitCommandWithInput(command,,.errStream,.outStream,args...)
+    try {
+        set rc = ..RunGitCommandWithInput(command, "", .errStream, .outStream, args...)
+    } catch ex {
+        set errStream = ex.DisplayString()
+        do ex.Log()
+    }
+    quit rc
 }
 
 ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", Output errStream, Output outStream, args...) As %Integer
@@ -2091,6 +2100,7 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
             set env("GIT_TERMINAL_PROMPT") = 0
         }
     }
+
     try {
         // Inject instance manager directory as global git config home directory
         // On Linux, this avoids trying to use /root/.config/git/attributes for global git config

csp/gitprojectsettings.csp

@@ -167,11 +167,7 @@ body {
                 }
 
                 // Set OAuth based on remote URL protocol and toggle state
-                if ((remoteToCheck [ "https") && ($Get(%request.Data("OAuth"), 1) = 1) ) {
-                    set settings.OAuth = 1
-                } else {
-                    set settings.OAuth = 0
-                }
+                set settings.OAuth = $Get(%request.Data("OAuth", 1), 0)
 
                 set settings.compileOnImport = ($Get(%request.Data("compileOnImport", 1)) = 1)
                 set settings.decomposeProductions = ($Get(%request.Data("decomposeProductions", 1)) = 1)
@@ -212,7 +208,8 @@ body {
                 if ($get(%request.Data("proxySubmitButton",1)) = "saveDefaults") {
                     do settings.SaveDefaults()
                 }
-                do settings.%Save()
+                $$$ThrowOnError(settings.%Save())
+
             }
             set err = ""
             try {

module.xml

@@ -6,6 +6,7 @@
       <Version>2.12.2</Version>
       <Description>Server-side source control extension for use of Git on InterSystems platforms</Description>
       <Keywords>git source control studio vscode</Keywords>
+      <GlobalScope>1</GlobalScope>
       <Packaging>module</Packaging>
 
       <!-- Extension source (classes/include) -->