Merge pull request #595 from intersystems/issue-591

Fix branch creation

Author: isc-tleavitt

CHANGELOG.md

@@ -49,6 +49,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed suppressing editing of locked classes (#301)
 - Fixed importing CSP files (#251)
 - Fixed changing favorites for users without permissions (#587)
+- Fix creating new branch from Git Web UI (#591)
 
 ## [2.6.0] - 2024-10-07
 

cls/SourceControl/Git/WebUIDriver.cls

@@ -102,7 +102,7 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
         do %request.Set("EXPIRES",0)
         do ##class(%CSP.StreamServer).OnPreHTTP() // Need to call this to set headers properly
         set %stream = 1 // Leak this to webuidriver.csp
-    } elseif $match(pathStart,"git-command|git|dirname|hostname|viewonly|discarded-states|restore-discarded|contexts") {
+    } elseif $match(pathStart,"git-command|git|dirname|hostname|viewonly|discarded-states|restore-discarded|contexts|create-branch") {
         if (%request.Method = "GET") {
             set %data = ##class(%Stream.TmpCharacter).%New()
             // Things not handled from Python backend:
@@ -218,6 +218,7 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
                 } else {
                     set inFile = ""
                 }
+
                 set returnCode = ##class(SourceControl.Git.Utils).RunGitCommandWithInput("-c",inFile,.errStream,.outStream,gitArgs...)
 
                 set %data = ##class(%Stream.TmpCharacter).%New()
@@ -328,6 +329,21 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
                 do %data.Rewind()
                 do ##class(SourceControl.Git.Change).RefreshUncommitted(,,,1)
                 set handled = 1  
+            } elseif (pathStart = "create-branch") {
+                set branchName = $get(%request.Data("branch",1),"")
+                if (branchName = "") {
+                    do %data.Write("ERROR! Enter a valid branch name")
+                } else {
+                    set %data = ##class(%Stream.TmpCharacter).%New()
+
+                    set st =  ##class(SourceControl.Git.Utils).NewBranch(branchName)
+                    if $$$ISERR(st) {
+                        do %data.Write("Error! "_$System.Status.GetErrorText(st))
+                    } else {
+                        do %data.Write(branchName_" branch created!")
+                    }
+                    set handled = 1
+                }
             }
         }
     }
@@ -426,4 +442,3 @@ ClassMethod GetRemote() As %Library.DynamicObject
 }
 
 }
-

git-webui/release/share/git-webui/webui/js/git-webui.js

@@ -576,17 +576,21 @@ webui.SideBarView = function(mainView, noEventHandlers) {
                         $("#confirm-branch-checkout").on('click', '#confirm-checkout', function(e){
                             e.preventDefault();
                             var refName = $("#confirm-branch-checkout pre")[0].innerHTML;
-    
-                            webui.git("checkout -b " + refName, updateSideBar);
-                            removeModal("#confirm-branch-checkout");
+
+                            $.post('create-branch', {branch: refName}, function() {
+                                updateSideBar();
+                                removeModal("#confirm-branch-checkout");
+                            });
                         });
 
                         $("#confirm-branch-checkout").find("#cancel-checkout, .close").click(function() {
                             removeModal("#confirm-branch-checkout");
                         });
                     }
                     else{       
-                        webui.git("checkout -b " + refName, updateSideBar);
+                        $.post('create-branch', {branch: refName}, function() {
+                            updateSideBar();
+                        });
                     }
                 });
             });

git-webui/src/share/git-webui/webui/js/git-webui.js

@@ -576,17 +576,21 @@ webui.SideBarView = function(mainView, noEventHandlers) {
                         $("#confirm-branch-checkout").on('click', '#confirm-checkout', function(e){
                             e.preventDefault();
                             var refName = $("#confirm-branch-checkout pre")[0].innerHTML;
-    
-                            webui.git("checkout -b " + refName, updateSideBar);
-                            removeModal("#confirm-branch-checkout");
+
+                            $.post('create-branch', {branch: refName}, function() {
+                                updateSideBar();
+                                removeModal("#confirm-branch-checkout");
+                            });
                         });
 
                         $("#confirm-branch-checkout").find("#cancel-checkout, .close").click(function() {
                             removeModal("#confirm-branch-checkout");
                         });
                     }
                     else{       
-                        webui.git("checkout -b " + refName, updateSideBar);
+                        $.post('create-branch', {branch: refName}, function() {
+                            updateSideBar();
+                        });
                     }
                 });
             });