Merge pull request #625 from intersystems/new-branch-errors

Errors switching to new branch are reported to UI

Author: isc-tleavitt

CHANGELOG.md

@@ -5,6 +5,11 @@ 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
+- Creating a new branch now reports the error if uncommitted changes conflict (#624)
+
 ## [2.7.0] - 2024-11-04
 
 ### Added

cls/SourceControl/Git/Utils.cls

@@ -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
     }
 
@@ -2938,3 +2944,4 @@ ClassMethod InDefaultBranchBasicMode() As %Boolean
 }
 
 }
+

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>