Creating a new branch, checking out an existing branch and deleting a local branch

cls/SourceControl/Git/Extension.cls

@@ -20,6 +20,8 @@ XData Menu
 <MenuItem Separator="true"/>
 <MenuItem Name="%AddToSC" />
 <MenuItem Name="%RemoveFromSC"/>
+<MenuItem Name="%NewBranch" />
+<MenuItem Name="%SwitchBranch" />
 <MenuItem Name="%Revert" />
 <MenuItem Name="%Commit" />
 <MenuItem Separator="true"/>
@@ -86,16 +88,24 @@ Method OnSourceMenuItem(name As %String, ByRef Enabled As %String, ByRef Display
 			set DisplayName = "Import All Force"
 		} elseif $ListFind($ListBuild("%AddToSC","%RemoveFromSC","%Revert","%Commit"),name) {
 			quit ..OnSourceMenuContextItem(InternalName,name,.Enabled,.DisplayName)
+		} elseif name = "%RepoStatus" && ##class(Utils).GitBinExists() {
+			set DisplayName = "Check for modifications"
+		} elseif name = "%NewBranch" {
+			set DisplayName = "Create a new branch"
+			set Enabled = 1
+		} elseif name = "%SwitchBranch" {
+			set DisplayName = "Check out an existing branch"
+			set Enabled = 1
 		} elseif name = "%Push" {
 			// TODO: Only display if there are no files checked out by other users
 			set Enabled = 1
-			set DisplayName = "Push"
+			set DisplayName = "Push to remote branch"
 		} elseif name = "%Fetch" {
 			set Enabled = 1
-			set DisplayName = "Fetch"
+			set DisplayName = "Fetch from remote"
 		} elseif name = "%Pull" {
 			set Enabled = 1
-			set DisplayName = "Pull"
+			set DisplayName = "Pull changes from remote branch"
 		} elseif ##class(Utils).IsMenuGitCommand(name) && ##class(Utils).GitBinExists() {
 			set DisplayName = $case(name,"%StashSave":"Stash save",
 			                             "%StashPop":"Stash pop",
@@ -290,4 +300,3 @@ Method GetStatus(InternalName As %String, ByRef IsInSourceControl As %Boolean, B
 }
 
 }
-

cls/SourceControl/Git/Settings.cls

@@ -80,4 +80,3 @@ ClassMethod Configure() As %Boolean [ CodeMode = objectgenerator ]
 }
 
 }
-

cls/SourceControl/Git/Utils.cls

@@ -140,11 +140,11 @@ ClassMethod UserAction(InternalName As %String, MenuName As %String, ByRef Targe
     		($system.Version.GetOS()="Windows") {
         write !!,"===Path to git.exe not found: "_..GitBinPath()_"!===",!
     }
-	    
+
     if (..Type(InternalName) = "csp") && ($Extract(InternalName,1) '= "/") {
         set InternalName = "/" _ InternalName
     }
-    
+
     if (menuItemName = "%Settings") {
         set Action = 2
         set Target = "/isc/studio/usertemplates/gitsourcecontrol/gitprojectsettings.csp?NSpace="_$namespace_"&Username="_$username
@@ -180,6 +180,14 @@ ClassMethod UserAction(InternalName As %String, MenuName As %String, ByRef Targe
     } elseif (menuItemName = "%Revert") {
         set Reload = 1
         quit ..Revert(InternalName)
+    } elseif (menuItemName = "%NewBranch") {
+        set Target = "Please enter the name of the new branch"
+        set Action = 7
+        quit $$$OK
+    } elseif (menuItemName = "%SwitchBranch") {
+        set Target = "Please enter the name of the existing branch"
+        set Action = 7
+        quit $$$OK
     } elseif (menuItemName = "%Commit") {
         set Target = "Please enter a commit message"
         set Action = 7
@@ -219,6 +227,16 @@ ClassMethod AfterUserAction(Type As %Integer, Name As %String, InternalName As %
 		    do ..Commit(InternalName, Msg)
 		    set Reload = 1
 	    }
+    } elseif (menuItemName = "%NewBranch") {
+        if (Answer = 1) {
+            do ..NewBranch(Msg)
+            set Reload = 1
+        }
+    } elseif (menuItemName = "%SwitchBranch") {
+        if (Answer = 1) {
+            do ..SwitchBranch(Msg)
+            set Reload = 1
+        }
     }
     quit $$$OK
 }
@@ -233,6 +251,22 @@ ClassMethod Revert(InternalName As %String) As %Status
 	quit $$$OK
 }
 
+ClassMethod NewBranch(newBranchName As %String) As %Status
+{
+    do ..RunGitWithArgs(.errStream, .outStream, "checkout", "-b", newBranchName)
+    do errStream.OutputToDevice()
+	do outStream.OutputToDevice()
+    quit $$$OK
+}
+
+ClassMethod SwitchBranch(targetBranchName As %String) As %Status
+{
+    do ..RunGitWithArgs(.errStream, .outStream, "checkout", targetBranchName)
+    do errStream.OutputToDevice()
+	do outStream.OutputToDevice()
+    quit $$$OK
+}
+
 ClassMethod Commit(InternalName As %String, Message As %String = "example commit message") As %Status
 {
 	set filename = ..FullExternalName(InternalName)
@@ -1322,4 +1356,3 @@ ClassMethod OutputConfigureMessage()
 }
 
 }
-

csp/gitprojectsettings.csp

@@ -36,7 +36,6 @@ body {
 hr {
     opacity: 0.15
 }
-
 </STYLE>
 </head>
 <body>
@@ -192,7 +191,6 @@ hr {
 <script src="js/jquery.min.js"></script>
 <script src="js/popper.min.js"></script>
 <script src="js/bootstrap.min.js"></script>
-<script src="js/git-webui.js"></script>
 <script language="JavaScript">
 $(function () {
   $('[data-toggle="tooltip"]').tooltip()

git-webui/release/share/git-webui/webui/css/git-webui.css

@@ -57,7 +57,8 @@ body {
   min-width: 0;
   flex-direction: column;
   -webkit-flex-direction: column;
-  width: 14em;
+  padding: 0 0.5% 0 0.5%;
+  width: 17em;
   background-color: #333333;
 }
 #sidebar #sidebar-logo {
@@ -94,14 +95,46 @@ body {
   cursor: pointer;
   padding: 10px 0;
 }
+#sidebar-switch-branches > h4 a {
+  color: inherit;
+}
+
+.accordion-item {
+  background-color: #333333;
+  color: #eeeeee;
+  padding-bottom:1%;
+  margin: 0%;
+  border: none;
+}
+
+.accordion-header {
+  padding: 1% 2% 0% 14%;
+  background-color: #333333;
+  color: #eeeeee;
+  border:none;
+}
+
+.btn-branch {
+  background-color: #333333;
+  color: #eee;
+  padding: 0%;
+  margin: 0%;
+  border: none;
+}
+
+.btn-branch:hover {
+  color: #fff;
+}
+
 #sidebar #sidebar-content #sidebar-workspace h4:before {
   content: url(../img/computer.svg);
 }
 #sidebar #sidebar-content #sidebar-remote h4:before {
   content: url(../img/daemon.svg);
 }
 #sidebar #sidebar-content #sidebar-local-branches h4:before,
-#sidebar #sidebar-content #sidebar-remote-branches h4:before {
+#sidebar #sidebar-content #sidebar-remote-branches h4:before,
+#sidebar #sidebar-content #sidebar-switch-branches h4:before {
   content: url(../img/branch.svg);
 }
 #sidebar #sidebar-content #sidebar-tags h4:before {
@@ -123,11 +156,57 @@ body {
   text-overflow: ellipsis;
 }
 #sidebar #sidebar-content .active {
-  background-color: #428bca;
-}
-#sidebar .modal-dialog .list-group-item {
-  border: 0;
+  background-color: #0d6efd;
 }
+#newBranchName {
+  background-color: inherit;
+  max-width: 12em;
+  color: inherit;
+  overflow: hidden;
+  margin: 0 3% 0 12%
+}
+
+.form-control-xs {
+  height: calc(1em + .375rem + 2px) !important;
+  padding: .125rem .25rem !important;
+  font-size: .75rem !important;
+  line-height: 1.5;
+  border-radius: .2rem;
+}
+
+.btn-refresh {
+  color: #B39D5C;
+  background-color: #fff3cd;
+  border: solid 1px;
+  border-color: #B39D5C;
+  margin-left: 0.5%;
+}
+
+.btn-xxs {
+  height: calc(1.2em + .175rem + 2px) !important;
+  padding: .2rem .1rem !important;
+  font-size: .7rem !important;
+  line-height: 1;
+  border-radius: .2rem;
+}
+
+.btn-xs {
+  height: calc(1.5em + .375rem + 2px) !important;
+  padding: .125rem .25rem !important;
+  font-size: .75rem !important;
+  line-height: 1.5;
+  border-radius: .2rem;
+}
+
+.btn-add {
+  padding: 0% 0% 2% 5%;
+}
+
+.btn-ok {
+  float: right;
+  margin-top:-3%
+}
+
 #main-view {
   display: flex;
   display: -webkit-flex;
@@ -185,7 +264,7 @@ body {
   background-color: rgba(244, 244, 244, 0.9);
 }
 #log-view .log-entry.active {
-  background-color: rgba(46, 127, 197, 0.9);
+  background-color: rgba(2, 82, 202, 0.9);
 }
 #log-view .log-entry.active header h6 a {
   color: #ffffff;
@@ -293,6 +372,9 @@ body {
   border-right: 0;
   white-space: nowrap;
 }
+.list-group-item{
+  border-radius: 0;
+}
 .diff-view-container {
   display: flex;
   display: -webkit-flex;
@@ -367,7 +449,7 @@ body {
   border: 0;
 }
 .diff-view-container .panel-body .diff-view .diff-view-lines .diff-view-line.active {
-  background-color: #428bca;
+  background-color: #0d6efd;
   color: white;
 }
 .diff-view-container .panel-body .diff-view .diff-view-lines .diff-line-header {
@@ -565,6 +647,7 @@ body {
   padding: 5px 10px;
   border-left: 0;
   border-right: 0;
+  border-radius: 0;
   white-space: nowrap;
 }
 #workspace-view #workspace-editor #working-copy-view .file-list-container .list-group .list-group-item.available,

git-webui/release/share/git-webui/webui/index.html

@@ -28,18 +28,18 @@
         <link rel="icon" href="img/git-icon.png" />
     </head>
     <body>
-        <script src="js/jquery.min.js"></script>
-        <script src="js/popper.min.js"></script>
-        <script src="js/bootstrap.min.js"></script>
-        <script src="js/git-webui.js"></script>
-
         <!-- Error modal dialog -->
         <div class="modal fade" id="error-modal" tabindex="-1" role="dialog">
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal"><span>&times;</span><span class="sr-only">Close</span></button>
                         <h4 class="modal-title">Error</h4>
+                        <button type="button" class="btn btn-default close" data-bs-dismiss="modal">
+                            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-x-lg" viewBox="0 0 16 16">
+                            <path fill-rule="evenodd" clip-rule="evenodd" d="M13.854 2.146a.5.5 0 0 1 0 .708l-11 11a.5.5 0 0 1-.708-.708l11-11a.5.5 0 0 1 .708 0Z" fill="#000"/>
+                            <path fill-rule="evenodd" clip-rule="evenodd" d="M2.146 2.146a.5.5 0 0 0 0 .708l11 11a.5.5 0 0 0 .708-.708l-11-11a.5.5 0 0 0-.708 0Z" fill="#000"/>
+                            </svg>
+                        </button>
                     </div>
                     <pre class="modal-body alert alert-danger"></pre>
                 </div>
@@ -80,4 +80,8 @@ <h4>License</h4>
             </div>
         </div>
     </body>
+    <script src="js/jquery.min.js"></script>
+    <script src="js/popper.min.js"></script>
+    <script src="js/bootstrap.min.js"></script>
+    <script src="js/git-webui.js"></script>
 </html>