Branch checkout after cloning (#460)

* Git Clone: Add basic functionality of cloning repository

Basics of cloning repository implemented. Pressing clone on welcome
view now opens simple window with url input with clone and close buttons

For now it clones the repositories in to your home dir. Error handling
for now is nada and should be implemented in later commits

* Git Clone: Select target folder and clone the repository

Now you can select the folder to which you want to clone the repository.
This defaults to home folder.

Also added check that the repository isn't empty when trying to clone.

* Git Clone: Open cloned folder

Now after we press `clone` button, we firstly clone the specified
repository to given folder. After cloning, we open folder picker for
the user to pick folder to open the editor in. However this could be better if
we straight up open the editor in the cloned folder, rather than giving user an option
to choose the folder in between.

* Git Clone: Add error handling

Added error handling for git related errors e.g. when trying to clone
non existent repository

* Git Clone: Implementation as a module

Changed GitClone to be module as discussed in
#232 (comment)

* Git Clone: Uncomment dependency from Package.swift

* Git Clone: Switch to use NSSavePanel

Switched the git clone view folder picking to use NSSavePanel
instead of NSOpenPanel.

NSSavePanel gives us kind of the same flow as Xcode has, as it's also using
NSSavePanel to prompt the target folder for cloning.

The view now consist of two separate modals that pop open, and it may
seem cumbersome, but it now has kind of the same functionality as Xcode.

* Git Clone: Remove .git only if the url has it.

* Git Clone: Reposition UI

Repositioning buttons, input and text. Also added app icon to the view

* Git Clone: Change clone view to be sheet

Changed git clone view to be sheet instead of normal window. This
is better for UX as you can't click anywhere else than the clone view
until you either cancel or clone the repository

* Git Clone: Validate url and more error handling

Naive Xcode-like check for the url implemented. For now if the url
does not start with certain string, the clone button is disabled, just
like in Xcode.

Also added check for when user decides to press cancel on folder selection
#232 (comment)

* Git Clone: Add automatic pasting

If you have 'valid' git url in your clipboard when opening the clone
view, it now automatically pastes it to the textfield

* GitClone: Fix some force unwrappings and make vars private

* GitClone: Make shellClient constant

* GitClone: Fix indentation and make logic private func

Fixed indentation in WelcomeView and moved the logic of cloning
repository into it's own private function

* GitClone: Add CheckoutBranchModal

Added modal to checkout to other branches after cloning the repository

* GitClone: Make checkout button defaultAction

* GitClone: Add possibility to checkout to remote branches

Showing all branhes to make it possible to checkout to remote
branches as well as local

* GitClone: Make the modal wider

* GitClone: Open checkout branch modal only if there's multiple branches

* GitClone: Refactor extension to separate file.

Author: Pythonen

CodeEdit.xcodeproj/project.pbxproj

@@ -48,6 +48,7 @@
 		5CAD1B972806B57D0059A74E /* Breadcrumbs in Frameworks */ = {isa = PBXBuildFile; productRef = 5CAD1B962806B57D0059A74E /* Breadcrumbs */; };
 		5CF38A5E27E48E6C0096A0F7 /* CodeFile in Frameworks */ = {isa = PBXBuildFile; productRef = 5CF38A5D27E48E6C0096A0F7 /* CodeFile */; };
 		5CFA753B27E896B60002F01B /* GitClient in Frameworks */ = {isa = PBXBuildFile; productRef = 5CFA753A27E896B60002F01B /* GitClient */; };
+		B34B213227ECDC3A006033A9 /* GitClone in Frameworks */ = {isa = PBXBuildFile; productRef = B34B213127ECDC3A006033A9 /* GitClone */; };
 		64B64EDE27F7B79400C400F1 /* About in Frameworks */ = {isa = PBXBuildFile; productRef = 64B64EDD27F7B79400C400F1 /* About */; };
 		B34B213227ECDC3A006033A9 /* GitClone in Frameworks */ = {isa = PBXBuildFile; productRef = B34B213127ECDC3A006033A9 /* GitClone */; };
 		B658FB3427DA9E1000EA4DBD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B658FB3327DA9E1000EA4DBD /* Assets.xcassets */; };
@@ -1069,6 +1070,10 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = GitClient;
 		};
+		B34B213127ECDC3A006033A9 /* GitClone */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = GitClone;
+		};
 		64B64EDD27F7B79400C400F1 /* About */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = About;

CodeEdit/Info.plist

@@ -45,6 +45,6 @@
 		</dict>
 	</array>
 	<key>GitHash</key>
-	<string>67a2618bab3900fa3dd96764fb0232183a95fb88</string>
+	<string>13ac174726e9ecffc846676d833be1cac8fd953c</string>
 </dict>
 </plist>

CodeEditModules/Modules/GitClient/src/Interface.swift

@@ -9,7 +9,7 @@ import Foundation
 
 public struct GitClient {
     public var getCurrentBranchName: () throws -> String
-    public var getBranches: () throws -> [String]
+    public var getBranches: (Bool) throws -> [String]
     public var checkoutBranch: (String) throws -> Void
     public var pull: () throws -> Void
     public var cloneRepository: (String) throws -> Void
@@ -22,7 +22,7 @@ public struct GitClient {
 
     init(
         getCurrentBranchName: @escaping () throws -> String,
-        getBranches: @escaping () throws -> [String],
+        getBranches: @escaping (Bool) throws -> [String],
         checkoutBranch: @escaping (String) throws -> Void,
         pull: @escaping () throws -> Void,
         cloneRepository: @escaping (String) throws -> Void,

CodeEditModules/Modules/GitClient/src/Live.swift

@@ -14,8 +14,15 @@ public extension GitClient {
         directoryURL: URL,
         shellClient: ShellClient
     ) -> GitClient {
-        func getBranches() throws -> [String] {
-            try shellClient.run(
+        func getBranches(_ allBranches: Bool = false) throws -> [String] {
+            if allBranches == true {
+                return try shellClient.run(
+                    "cd \(directoryURL.relativePath);git branch -a --format \"%(refname:short)\""
+                )
+                    .components(separatedBy: "\n")
+                    .filter { $0 != "" }
+            }
+            return try shellClient.run(
                 "cd \(directoryURL.relativePath);git branch --format \"%(refname:short)\""
             )
                 .components(separatedBy: "\n")
@@ -40,7 +47,7 @@ public extension GitClient {
             )
             if output.contains("fatal: not a git repository") {
                 throw GitClientError.notGitRepository
-            } else if !output.contains("Switched to branch") {
+            } else if !output.contains("Switched to branch") && !output.contains("Switched to a new branch") {
                 throw GitClientError.outputError(output)
             }
         }
@@ -50,7 +57,6 @@ public extension GitClient {
                 throw GitClientError.outputError(output)
             }
         }
-
         func getCommitHistory(entries: Int?, fileLocalPath: String?) throws -> [Commit] {
             var entriesString = ""
             let fileLocalPath = fileLocalPath ?? ""
@@ -75,7 +81,7 @@ public extension GitClient {
 
         return GitClient(
             getCurrentBranchName: getCurrentBranchName,
-            getBranches: getBranches,
+            getBranches: getBranches(_:),
             checkoutBranch: checkoutBranch(name:),
             pull: {
                 let output = try shellClient.run(

CodeEditModules/Modules/GitClone/src/CheckoutBranch.swift

@@ -0,0 +1,50 @@
+//
+//  CheckoutBranch.swift
+//  
+//
+//  Created by Aleksi Puttonen on 18.4.2022.
+//
+
+import Foundation
+import GitClient
+import SwiftUI
+
+public extension CheckoutBranchView {
+    func getBranches() -> [String] {
+        guard let url = URL(string: repoPath) else {
+            return [""]
+        }
+        do {
+            let branches = try GitClient.default(directoryURL: url,
+                                                 shellClient: shellClient).getBranches(true)
+            return branches
+        } catch {
+            return [""]
+        }
+    }
+    func checkoutBranch() {
+        var parsedBranch = selectedBranch
+        if selectedBranch.contains("origin/") || selectedBranch.contains("upstream/") {
+            parsedBranch = selectedBranch.components(separatedBy: "/")[1]
+        }
+        do {
+            if let url = URL(string: repoPath) {
+                try GitClient.default(directoryURL: url,
+                                      shellClient: shellClient).checkoutBranch(parsedBranch)
+                isPresented = false
+            }
+        } catch {
+            guard let error = error as? GitClient.GitClientError else { return }
+            let alert = NSAlert()
+            alert.alertStyle = .critical
+            alert.addButton(withTitle: "Ok")
+            switch error {
+            case .notGitRepository:
+                alert.messageText = "Not a git repository"
+            case let .outputError(message):
+                alert.messageText = message
+            }
+            alert.runModal()
+        }
+    }
+}

CodeEditModules/Modules/GitClone/src/CheckoutBranchView.swift

@@ -0,0 +1,76 @@
+//
+//  CheckoutBranchView.swift
+//  
+//
+//  Created by Aleksi Puttonen on 14.4.2022.
+//
+
+import Foundation
+import SwiftUI
+import GitClient
+import ShellClient
+
+public struct CheckoutBranchView: View {
+    internal let shellClient: ShellClient
+    @Binding internal var isPresented: Bool
+    @Binding internal var repoPath: String
+    // TODO: This has to be derived from git
+    @State internal var selectedBranch = "main"
+    public init(isPresented: Binding<Bool>,
+                repoPath: Binding<String>,
+                shellClient: ShellClient) {
+        self.shellClient = shellClient
+        self._isPresented = isPresented
+        self._repoPath = repoPath
+    }
+    public var body: some View {
+        VStack(spacing: 8) {
+            HStack {
+                Image(nsImage: NSApp.applicationIconImage)
+                    .resizable()
+                    .frame(width: 64, height: 64)
+                    .padding(.bottom, 50)
+                VStack(alignment: .leading) {
+                    Text("Checkout branch")
+                        .bold()
+                        .padding(.bottom, 2)
+                    Text("Select a branch to checkout")
+                        .font(.system(size: 11))
+                        .foregroundColor(.secondary)
+                        .alignmentGuide(.trailing) { context in
+                        context[.trailing]
+                    }
+                    Menu {
+                        ForEach(getBranches().filter {!$0.contains("HEAD")}, id: \.self) { branch in
+                            Button {
+                                    guard selectedBranch != branch else { return }
+                                    selectedBranch = branch
+                            } label: {
+                                Text(branch)
+                            }.disabled(selectedBranch == branch)
+                        }
+                    } label: {
+                        Text(selectedBranch)
+                    }
+                    HStack {
+                        Button("Cancel") {
+                            isPresented = false
+                        }
+                        Button("Checkout") {
+                            checkoutBranch()
+                        }
+                        .keyboardShortcut(.defaultAction)
+                    }
+                    .alignmentGuide(.trailing) { context in
+                        context[.trailing]
+                    }
+                    .offset(x: 145)
+                }
+            }
+            .padding(.top, 20)
+            .padding(.horizontal, 20)
+            .padding(.bottom, 16)
+            .frame(width: 400)
+        }
+    }
+}

CodeEditModules/Modules/GitClone/src/GitCloneView.swift

@@ -13,11 +13,17 @@ import ShellClient
 public struct GitCloneView: View {
     private let shellClient: ShellClient
     @Binding private var isPresented: Bool
+    @Binding private var showCheckout: Bool
+    @Binding private var repoPath: String
     @State private var repoUrlStr = ""
-    @State private var repoPath = "~/"
-    public init(shellClient: ShellClient, isPresented: Binding<Bool>) {
+    public init(shellClient: ShellClient,
+                isPresented: Binding<Bool>,
+                showCheckout: Binding<Bool>,
+                repoPath: Binding<String>) {
         self.shellClient = shellClient
         self._isPresented = isPresented
+        self._showCheckout = showCheckout
+        self._repoPath = repoPath
     }
     public var body: some View {
         VStack(spacing: 8) {
@@ -154,8 +160,8 @@ extension GitCloneView {
                                                     attributes: nil)
             try GitClient.default(directoryURL: dirUrl,
                                   shellClient: shellClient).cloneRepository(repoUrlStr)
-            // TODO: Maybe add possibility to checkout to certain branch straight after cloning
             isPresented = false
+            checkBranches(dirUrl: dirUrl)
         } catch {
             guard let error = error as? GitClient.GitClientError else {
                 return showAlert(alertMsg: "Error", infoText: error.localizedDescription)
@@ -168,4 +174,17 @@ extension GitCloneView {
             }
         }
     }
+    private func checkBranches(dirUrl: URL) {
+        // Check if repo has only one branch, and if so, don't show the checkout page
+        do {
+            let branches = try GitClient.default(directoryURL: dirUrl,
+                                  shellClient: shellClient).getBranches(true)
+            let filtered = branches.filter {!$0.contains("HEAD")}
+            if filtered.count > 1 {
+                showCheckout = true
+            }
+        } catch {
+            return
+        }
+    }
 }

CodeEditModules/Modules/StatusBar/src/StatusBarItems/StatusBarBranchPicker.swift

@@ -18,7 +18,7 @@ internal struct StatusBarBranchPicker: View {
 
     internal var body: some View {
         Menu {
-            ForEach((try? model.gitClient.getBranches()) ?? [], id: \.self) { branch in
+            ForEach((try? model.gitClient.getBranches(false)) ?? [], id: \.self) { branch in
                 Button {
                     do {
                         guard model.selectedBranch != branch else { return }

CodeEditModules/Modules/WelcomeModule/src/WelcomeView.swift

@@ -14,6 +14,8 @@ import GitClone
 public struct WelcomeView: View {
     @Environment(\.colorScheme) var colorScheme
     @State var showGitClone = false
+    @State var showCheckoutBranch = false
+    @State private var repoPath = "~/"
     @State var isHovering: Bool = false
     @State var isHoveringClose: Bool = false
     @StateObject private var prefs: AppPreferencesModel = .shared
@@ -201,7 +203,15 @@ public struct WelcomeView: View {
             }
         }
         .sheet(isPresented: $showGitClone) {
-            GitCloneView(shellClient: .live, isPresented: $showGitClone)
+            GitCloneView(shellClient: .live,
+                         isPresented: $showGitClone,
+                         showCheckout: $showCheckoutBranch,
+                         repoPath: $repoPath)
+        }
+        .sheet(isPresented: $showCheckoutBranch) {
+            CheckoutBranchView(isPresented: $showCheckoutBranch,
+                                repoPath: $repoPath,
+                                shellClient: .live)
         }
     }