It is now possible to switch to a remote branch and create a new branch from a remote branch. We are now disabling rename branch for remote branches.

Author: austincondiff

CodeEdit/Features/NavigatorArea/SourceControlNavigator/Repository/Views/SourceControlNavigatorRepositoryView+contextMenu.swift

@@ -47,7 +47,7 @@ extension SourceControlNavigatorRepositoryView {
             showRenameBranch = true
             fromBranch = item.branch
         }
-        .disabled(item.branch == nil)
+        .disabled(item.branch == nil || item.branch?.isRemote == true)
         Divider()
         Button("Add Existing Remote...") {
             sourceControlManager.addExistingRemoteSheetIsPresented = true

CodeEdit/Features/NavigatorArea/SourceControlNavigator/Repository/Views/SourceControlNavigatorRepositoryView.swift

@@ -70,12 +70,12 @@ struct SourceControlNavigatorRepositoryView: View {
         )
         .sheet(isPresented: $showNewBranch) {
             SourceControlNavigatorNewBranchView(
-                fromBranch: fromBranch
+                fromBranch: $fromBranch
             )
         }
         .sheet(isPresented: $showRenameBranch) {
             SourceControlNavigatorRenameBranchView(
-                fromBranch: fromBranch
+                fromBranch: $fromBranch
             )
         }
         .alert(

CodeEdit/Features/SourceControl/Client/GitClient+Branches.swift

@@ -78,15 +78,6 @@ extension GitClient {
         _ = try await run("branch -d \(branch.name)")
     }
 
-    /// Create new branch
-    func newBranch(name: String, from: GitBranch) async throws {
-        if !from.isLocal {
-            return
-        }
-
-        _ = try await run("checkout -b \(name) \(from.name)")
-    }
-
     /// Rename branch
     /// - Parameter from: Name of the branch to rename
     /// - Parameter to: New name for branch
@@ -96,15 +87,18 @@ extension GitClient {
 
     /// Checkout branch
     /// - Parameter branch: Branch to checkout
-    func checkoutBranch(_ branch: GitBranch, forceLocal: Bool = false) async throws {
+    func checkoutBranch(_ branch: GitBranch, forceLocal: Bool = false, newName: String? = nil) async throws {
         var command = "checkout "
 
-        // If branch is remote, try to create local branch
-        if branch.isRemote {
-            let localName = branch.name.replacingOccurrences(of: "origin/", with: "")
-            command += forceLocal ? localName : "-b " + localName + " " + branch.name
+        let targetName = newName ?? branch.name
+
+        if (branch.isRemote && !forceLocal) || newName != nil {
+            let sourceBranch = branch.isRemote
+                ? branch.longName.replacingOccurrences(of: "refs/remotes/", with: "")
+                : branch.name
+            command += "-b \(targetName) \(sourceBranch)"
         } else {
-            command += branch.name
+            command += targetName
         }
 
         do {
@@ -117,8 +111,10 @@ extension GitClient {
             // try to switch to local branch
             if let error = error as? GitClientError,
                branch.isRemote,
-               error.localizedDescription.contains("already exists") {
+               error.description.contains("already exists") {
                 try await checkoutBranch(branch, forceLocal: true)
+            } else {
+                print(error)
             }
         }
     }

CodeEdit/Features/SourceControl/SourceControlManager+GitClient.swift

@@ -47,11 +47,7 @@ extension SourceControlManager {
 
     /// Create new branch, can be created only from local branch
     func newBranch(name: String, from: GitBranch) async throws {
-        if !from.isLocal {
-            return
-        }
-
-        try await gitClient.newBranch(name: name, from: from)
+        try await gitClient.checkoutBranch(from, newName: name)
         await refreshBranches()
         await refreshCurrentBranch()
     }

CodeEdit/Features/SourceControl/Views/SourceControlNavigatorNewBranchView.swift

@@ -14,14 +14,19 @@ struct SourceControlNavigatorNewBranchView: View {
     @EnvironmentObject var sourceControlManager: SourceControlManager
 
     @State var name: String = ""
-    let fromBranch: GitBranch?
+    @Binding var fromBranch: GitBranch?
 
     var body: some View {
         if let branch = fromBranch ?? sourceControlManager.currentBranch {
             VStack(spacing: 0) {
                 Form {
                     Section {
-                        LabeledContent("From", value: branch.name)
+                        LabeledContent(
+                            "From",
+                            value: branch.isRemote
+                                ? branch.longName.replacingOccurrences(of: "refs/remotes/", with: "")
+                                : branch.name
+                        )
                         TextField("To", value: $name, formatter: RegexFormatter(pattern: "[^a-zA-Z0-9_-]"))
                     } header: {
                         Text("Create a new branch")

CodeEdit/Features/SourceControl/Views/SourceControlNavigatorRenameBranchView.swift

@@ -15,7 +15,7 @@ struct SourceControlNavigatorRenameBranchView: View {
 
     @State var name: String = ""
 
-    let fromBranch: GitBranch?
+    @Binding var fromBranch: GitBranch?
 
     var body: some View {
         if let branch = fromBranch ?? sourceControlManager.currentBranch {