Fix checking out remote branches / uncommitted work

Author: isc-etamarch

CHANGELOG.md

@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added feedback to settings page (#550)
 - Fix "Home" navigation to point to current namespace (#548)
 - Fixed issues when user checks out nonexistent branch (#549)
+- Fixed checking out branch with uncommitted work (#539)
 
 ## [2.6.0] - 2024-10-07
 

cls/SourceControl/Git/Utils.cls

@@ -403,15 +403,20 @@ ClassMethod NewBranch(newBranchName As %String) As %Status
 
 ClassMethod SwitchBranch(targetBranchName As %String) As %Status
 {
-    // Make sure that branch exists first
-    do ..RunGitWithArgs(.errStream,.outStream,"local-branches","branch", "--verbose")
+    // Make sure that branch exists first (-a lists both local and remote)
+    do ..RunGitWithArgs(.errStream,.outStream,"branch", "-a")
     set branches = outStream.Read()
     if ('$find(branches,targetBranchName)) {
         quit $$$ERROR($$$GeneralError, "Selected branch does not exist"_$C(10))
     }
     k outStream, errStream
     do ..RunGitWithArgs(.errStream, .outStream, "checkout", targetBranchName)
     do ..PrintStreams(errStream, outStream)
+    // Checkout can fail due to unstaged changes
+    set errs = errStream.Read()
+    if (errs '= "") {
+        quit $$$ERROR($$$GeneralError, errs)
+    }
     quit $$$OK
 }