Merge branch 'main' into hcc-docs-wip

Author: isc-pbarton

CHANGELOG.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.7.1] - Unreleased
+
+### Fixed
+- Fixed improper encoding of unicode characters in commit messages (#627)
+- Creating a new branch now reports the error if uncommitted changes conflict (#624)
+- Fix Configure erroring out if git isn't found (#632)
+
 ## [2.7.0] - 2024-11-04
 
 ### Added

cls/SourceControl/Git/API.cls

@@ -18,12 +18,6 @@ ClassMethod Configure()
         set gitExists = ##class(SourceControl.Git.Utils).GitBinExists(.version)
         set gitBinPath = ##class(SourceControl.Git.Utils).GitBinPath(.isDefault)
 
-        // Make sure they are using an appropriate git version
-        if (+$PIECE(version,"version ",2))<2.31 {
-            write !!, "WARNING: You are using an older version of git which is not compatible with git-source-control. Please upgrade to git version 2.31.0 or greater to continue"
-            write !!, "Cancelling git-source-control configuration..."
-            quit
-        }
         if gitExists && isDefault {
             // Note: version starts with "git version"
             write !,version," is available via PATH. You may enter a path to a different version if needed."

cls/SourceControl/Git/Settings.cls

@@ -184,6 +184,12 @@ ClassMethod Configure() As %Boolean [ CodeMode = objectgenerator ]
             do %code.WriteLine(" set status =  inst.ConfigureBinPath(.value)")
             do %code.WriteLine(" if (status) { set valid = 1 }")
             do %code.WriteLine(" }")
+            do %code.WriteLine(" set gitExists = ##class(SourceControl.Git.Utils).GitBinExists(.version)")
+            do %code.WriteLine(" if (+$PIECE(version,""version "",2))<2.31 && gitExists{")
+            do %code.WriteLine(" write !!, ""WARNING: You are using an older version of git which is not compatible with git-source-control. Please upgrade to git version 2.31.0 or greater to continue""")
+            do %code.WriteLine(" write !!, ""Cancelling git-source-control configuration...""")
+            do %code.WriteLine(" quit")
+            do %code.WriteLine(" }")
         } elseif ((propertyDef) && (propertyDef.Name = "basicMode")) {
             set basicModePromptFlag = defaultPromptFlag + $$$MatchExactArrayMask + $$$InitialDisplayMask
             do %code.WriteLine(" set list(1) = ""Yes""")

cls/SourceControl/Git/Utils.cls

@@ -49,7 +49,7 @@ ClassMethod TempFolder() As %String
 
 ClassMethod DefaultTempFolder() As %String
 {
-    quit $get(@..#Storage@("settings","namespaceTemp"),..DefaultTemp()_$translate($znspace,"%")_..#Slash)
+    quit $get(@..#Storage@("settings","namespaceTemp"),..DefaultTemp()_..#Slash_$translate($znspace,"%")_..#Slash)
 }
 
 ClassMethod MappingsNode() As %String [ CodeMode = expression ]
@@ -395,11 +395,17 @@ ClassMethod NewBranch(newBranchName As %String) As %Status
 {
     set settings = ##class(SourceControl.Git.Settings).%New()
     if (settings.basicMode) && (settings.defaultMergeBranch '= ""){
-        do ..RunGitWithArgs(.errStream, .outStream, "checkout", settings.defaultMergeBranch)
+        set err = ..RunGitWithArgs(.errStream, .outStream, "checkout", settings.defaultMergeBranch)
         do ..PrintStreams(errStream, outStream)
+        if (err) {
+            quit $$$ERROR($$$GeneralError,errStream.Read()_$c(10)_"Current branch is: "_..GetCurrentBranch())
+        }
         kill errStream, outStream
-        do ..RunGitWithArgs(.errStream, .outStream, "pull")
+        set err = ..RunGitWithArgs(.errStream, .outStream, "pull")
         do ..PrintStreams(errStream, outStream)
+        if (err) {
+            quit $$$ERROR($$$GeneralError,errStream.Read()_$c(10)_"Current branch is: "_..GetCurrentBranch())
+        }
         kill errStream, outStream
     }
 

cls/SourceControl/Git/WebUIDriver.cls

@@ -244,7 +244,12 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
                 }
                 set handled = 1
             } elseif (pathStart = "git-command") {
-                set requestBody = ##class(%Library.DynamicObject).%FromJSON(%request.Content)
+                set stringBody = ""
+                while '%request.Content.AtEnd {
+                    set stringBody = stringBody _ %request.Content.Read()
+                }
+                set stringBody = $zconvert(stringBody,"I","UTF8")
+                set requestBody = ##class(%Library.DynamicObject).%FromJSON(stringBody)
                 set command = requestBody.command
 
                 set gitCmd = command.%Get(0)

module.xml

@@ -3,7 +3,7 @@
   <Document name="git-source-control.ZPM">
     <Module>
       <Name>git-source-control</Name>
-      <Version>2.7.0</Version>
+      <Version>2.7.1</Version>
       <Description>Server-side source control extension for use of Git on InterSystems platforms</Description>
       <Keywords>git source control studio vscode</Keywords>
       <Packaging>module</Packaging>