new branch option in basic mode comes from default merge branch

Author: isc-hwojnick

CHANGELOG.md

@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Now skips files belonging to other git enabled packages in `##class(SourceControl.Git.Change).RefreshUncommitted()` (#347)
 - Added a new "Branch" parameter to `##class(SourceControl.Git.PullEventHandler)` (#351)
 - Command-line utility to do a baseline export of items in a namespace
+- 'New Branch' menu option in basic now will create new branches from the configured default merge branch
+- Merging back with the default merge branch is now a part of the basic mode's Sync flow
 
 
 ## [2.3.1] - 2024-04-30

cls/SourceControl/Git/Extension.cls

@@ -125,6 +125,7 @@ Method OnSourceMenuItem(name As %String, ByRef Enabled As %String, ByRef Display
             set Enabled = $CASE(name,
                 "Status": 1,
                 "GitWebUI" : 1,
+                "NewBranch": 1,
                 "Sync": 1,
                 "": 1,
                 :-1

cls/SourceControl/Git/Utils.cls

@@ -340,6 +340,16 @@ ClassMethod Commit(InternalName As %String, Message As %String = "example commit
 
 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)
+        do ..PrintStreams(errStream, outStream)
+        kill errStream, outStream
+        do ..RunGitWithArgs(.errStream, .outStream, "pull")
+        do ..PrintStreams(errStream, outStream)
+        kill errStream, outStream
+    }
+    
     do ..RunGitWithArgs(.errStream, .outStream, "checkout", "-b", newBranchName)
     do ..PrintStreams(errStream, outStream)
     quit $$$OK