Merge pull request #557 from intersystems/issue-549

Fixed checking out non-existent branch

Author: isc-tleavitt

CHANGELOG.md

@@ -25,6 +25,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed git path configuration (#463)
 - 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)
 - Make sure more fetch calls prune the remote branches (#471)
 - Force export of item if it has been modified (#354)
 - Production configuration page no longer closes Sync/WebUI when operations there change the production (#542)

cls/SourceControl/Git/Utils.cls

@@ -336,7 +336,10 @@ ClassMethod AfterUserAction(Type As %Integer, Name As %String, InternalName As %
         }
     } elseif (menuItemName = "SwitchBranch") {
         if (Answer = 1) {
-            do ..SwitchBranch(Msg)
+            set status = ..SwitchBranch(Msg)
+            if $$$ISERR(status) {
+                Quit status
+            }
             set Reload = 1
         }
     } elseif (menuItemName = "Sync") {
@@ -409,8 +412,20 @@ ClassMethod NewBranch(newBranchName As %String) As %Status
 
 ClassMethod SwitchBranch(targetBranchName As %String) As %Status
 {
+    // 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 ($find(errs, "error")) {
+        quit $$$ERROR($$$GeneralError, errs)
+    }
     quit $$$OK
 }