Merge pull request #553 from intersystems/issue-463

Added git path interpretation

Author: isc-tleavitt

CHANGELOG.md

@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix left-sidebar spacing (#525)
 - Fixed slowness loading some CSP pages with multiple instances sharing a webserver (#540)
 - Prevent direct commits to default merge branch in basic mode (#484)
+- Fixed git path configuration (#463)
 - Added feedback to settings page (#550)
 
 ## [2.6.0] - 2024-10-07

cls/SourceControl/Git/Settings.cls

@@ -170,6 +170,13 @@ ClassMethod Configure() As %Boolean [ CodeMode = objectgenerator ]
         set propertyDef = ##class(%Dictionary.PropertyDefinition).%OpenId("SourceControl.Git.Settings||"_property_"")
         if ((propertyDef) && (propertyDef.Type = "%Boolean")) {
             do %code.WriteLine(" set response = ##class(%Library.Prompt).GetYesNo("_promptQuoted_",.value,,"_defaultPromptFlag_")")
+        } elseif ((propertyDef) && (propertyDef.Name = "gitBinPath")) {
+            do %code.WriteLine(" set valid = 0")
+            do %code.WriteLine(" while ('valid) {")
+            do %code.WriteLine(" set response = ##class(%Library.Prompt).GetString("_promptQuoted_",.value,,,,"_defaultPromptFlag_")")
+            do %code.WriteLine(" set status =  inst.ConfigureBinPath(.value)")
+            do %code.WriteLine(" if (status) { set valid = 1 }")
+            do %code.WriteLine(" }")
         } elseif ((propertyDef) && (propertyDef.Name = "basicMode")) {
             set basicModePromptFlag = defaultPromptFlag + $$$MatchExactArrayMask + $$$InitialDisplayMask
             do %code.WriteLine(" set list(1) = ""Yes""")
@@ -341,4 +348,36 @@ Method OnAfterConfigure() As %Boolean
     }
 }
 
+Method ConfigureBinPath(ByRef path As %String) As %Boolean
+{
+    if (path = "") { return 1 }
+    // Sometimes path is quoted 
+    set path = $replace(path,"""","")
+    if (##class(%File).DirectoryExists(path)) {
+        set gitFile = $case($$$isWINDOWS,1:"git.exe",:"git")
+        set path = ##class(%File).Construct(path, gitFile)
+    } 
+    
+    if (##class(%File).Exists(path)) {
+        // no-op
+    } else {
+        write !, "The entered path is not a valid path, please try again"
+        return 0
+    }
+    try {
+        set sysStorage = ##class(SourceControl.Git.Utils).%SYSNamespaceStorage()
+        kill @sysStorage@("%gitBinPath")
+        if (..gitBinPath '= "") {
+            set @sysStorage@("%gitBinPath") = path
+        }
+        kill ^||GitVersion
+        // Get and write the version
+        set gitExists = ##class(SourceControl.Git.Utils).GitBinExists(.version)
+        write !, "You are now using "_version
+    } catch e {
+        // no-op, user may not have privileges
+    }
+    return 1
+}
+
 }