Merge pull request #586 from nanashili/main

Git: Unified GitAccounts, GitClient and GitClone

CodeEdit.xcodeproj/project.pbxproj

@@ -37,7 +37,7 @@
  2072FA1A280D872600C7F8D4 /* LineEndings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2072FA19280D872600C7F8D4 /* LineEndings.swift */; };
  2072FA1C280D874000C7F8D4 /* IndentUsing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2072FA1B280D874000C7F8D4 /* IndentUsing.swift */; };
  2072FA1E280D891500C7F8D4 /* Location.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2072FA1D280D891500C7F8D4 /* Location.swift */; };
- 20C4319A28058B9E00964DD5 /* GitAccounts in Frameworks */ = {isa = PBXBuildFile; productRef = 20C4319928058B9E00964DD5 /* GitAccounts */; };
+ 20AFDC7F28206701001A4FC7 /* Git in Frameworks */ = {isa = PBXBuildFile; productRef = 20AFDC7E28206701001A4FC7 /* Git */; };
  20D839AB280DEB2900B27357 /* NoSelectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D839AA280DEB2900B27357 /* NoSelectionView.swift */; };
  20D839AE280E0CA700B27357 /* PopoverView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20D839AD280E0CA700B27357 /* PopoverView.swift */; };
  20EBB501280C325D00F3A5DA /* FileInspectorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20EBB500280C325D00F3A5DA /* FileInspectorView.swift */; };
@@ -71,9 +71,7 @@
  5CA8776527FC6A95003F5CD5 /* QuickOpen in Frameworks */ = {isa = PBXBuildFile; productRef = 5CA8776427FC6A95003F5CD5 /* QuickOpen */; };
  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 */; };
  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 */; };
  B658FB3727DA9E1000EA4DBD /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B658FB3627DA9E1000EA4DBD /* Preview Assets.xcassets */; };
  B6EE989027E8879A00CDD8AB /* InspectorSidebar.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6EE988F27E8879A00CDD8AB /* InspectorSidebar.swift */; };
@@ -204,9 +202,9 @@
  0483E34D27FCC46600354AC0 /* ExtensionsStore in Frameworks */,
  64B64EDE27F7B79400C400F1 /* About in Frameworks */,
  043BCF07281DA2F5000AC47C /* TabBar in Frameworks */,
+ 20AFDC7F28206701001A4FC7 /* Git in Frameworks */,
  04C3256B28034FC800C8DA2D /* CodeEditKit in Frameworks */,
  2864BAAC28117B3F002DBD1A /* ShellClient in Frameworks */,
- 20C4319A28058B9E00964DD5 /* GitAccounts in Frameworks */,
  2864BAAE28117D7C002DBD1A /* TerminalEmulator in Frameworks */,
  5C403B8F27E20F8000788241 /* WorkspaceClient in Frameworks */,
  5CAD1B972806B57D0059A74E /* Breadcrumbs in Frameworks */,
@@ -216,8 +214,6 @@
  D70F5E2C27E4E8CF004EE4B9 /* WelcomeModule in Frameworks */,
  D7F72DEB27EA3574000C3064 /* Search in Frameworks */,
  2816F594280CF50500DD548B /* CodeEditSymbols in Frameworks */,
- B34B213227ECDC3A006033A9 /* GitClone in Frameworks */,
- 5CFA753B27E896B60002F01B /* GitClient in Frameworks */,
  28CE5EA027E6493D0065D29C /* StatusBar in Frameworks */,
  2004A3832808468600FD9696 /* Feedback in Frameworks */,
  5CF38A5E27E48E6C0096A0F7 /* CodeFile in Frameworks */,
@@ -497,15 +493,12 @@
  5CF38A5D27E48E6C0096A0F7 /* CodeFile */,
  D70F5E2B27E4E8CF004EE4B9 /* WelcomeModule */,
  28CE5E9F27E6493D0065D29C /* StatusBar */,
- 5CFA753A27E896B60002F01B /* GitClient */,
  D7F72DEA27EA3574000C3064 /* Search */,
- B34B213127ECDC3A006033A9 /* GitClone */,
  2803257027F3CF1F009C7DC2 /* AppPreferences */,
  64B64EDD27F7B79400C400F1 /* About */,
  5CA8776427FC6A95003F5CD5 /* QuickOpen */,
  0483E34C27FCC46600354AC0 /* ExtensionsStore */,
  04C3256A28034FC800C8DA2D /* CodeEditKit */,
- 20C4319928058B9E00964DD5 /* GitAccounts */,
  5CAD1B962806B57D0059A74E /* Breadcrumbs */,
  28117FCF280768A500649353 /* CodeEditUI */,
  2004A3822808468600FD9696 /* Feedback */,
@@ -514,6 +507,7 @@
  2864BAAB28117B3F002DBD1A /* ShellClient */,
  2864BAAD28117D7C002DBD1A /* TerminalEmulator */,
  043BCF06281DA2F5000AC47C /* TabBar */,
+ 20AFDC7E28206701001A4FC7 /* Git */,
  );
  productName = CodeEdit;
  productReference = B658FB2C27DA9E0F00EA4DBD /* CodeEdit.app */;
@@ -1192,9 +1186,9 @@
  isa = XCSwiftPackageProductDependency;
  productName = CodeEditUtils;
  };
- 20C4319928058B9E00964DD5 /* GitAccounts */ = {
+ 20AFDC7E28206701001A4FC7 /* Git */ = {
  isa = XCSwiftPackageProductDependency;
- productName = GitAccounts;
+ productName = Git;
  };
  2803257027F3CF1F009C7DC2 /* AppPreferences */ = {
  isa = XCSwiftPackageProductDependency;
@@ -1237,18 +1231,10 @@
  isa = XCSwiftPackageProductDependency;
  productName = CodeFile;
  };
- 5CFA753A27E896B60002F01B /* GitClient */ = {
- isa = XCSwiftPackageProductDependency;
- productName = GitClient;
- };
  64B64EDD27F7B79400C400F1 /* About */ = {
  isa = XCSwiftPackageProductDependency;
  productName = About;
  };
- B34B213127ECDC3A006033A9 /* GitClone */ = {
- isa = XCSwiftPackageProductDependency;
- productName = GitClone;
- };
  D70F5E2B27E4E8CF004EE4B9 /* WelcomeModule */ = {
  isa = XCSwiftPackageProductDependency;
  productName = WelcomeModule;

CodeEdit/Documents/CodeEditWindowController.swift

@@ -10,7 +10,7 @@ import SwiftUI
 import CodeFile
 import CodeEditUI
 import QuickOpen
-import GitClient
+import Git
 
 final class CodeEditWindowController: NSWindowController, NSToolbarDelegate {
 

CodeEdit/Info.plist

@@ -45,6 +45,6 @@
  </dict>
  </array>
  <key>GitHash</key>
- <string>a8e63ed1d032d782d649b50fd046258144802c30</string>
+ <string>2ecbb1b718e07b1c5318123c311d4975670d9b78</string>
 </dict>
 </plist>

CodeEdit/InspectorSidebar/Models/HistoryInspectorModel.swift

@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import GitClient
+import Git
 
 public final class HistoryInspectorModel: ObservableObject {
 

CodeEdit/InspectorSidebar/Views/HistoryInspector.swift

@@ -5,7 +5,7 @@
 // Created by Nanashi Li on 2022/03/24.
 //
 import SwiftUI
-import GitClient
+import Git
 import CodeEditUI
 
 struct HistoryInspector: View {

CodeEdit/InspectorSidebar/Views/HistoryItem.swift

@@ -5,7 +5,7 @@
 // Created by Nanashi Li on 2022/03/24.
 //
 import SwiftUI
-import GitClient
+import Git
 import CodeEditUtils
 
 struct HistoryItem: View {

CodeEdit/InspectorSidebar/Views/Popover/PopoverView.swift

@@ -6,7 +6,7 @@
 //
 
 import SwiftUI
-import GitClient
+import Git
 import CodeEditUI
 import CodeEditUtils
 

CodeEditModules/Modules/AppPreferences/src/Sections/AccountsPreferences/Accounts/Login/Github/GithubEnterpriseLoginView.swift

@@ -6,7 +6,7 @@
 //
 
 import SwiftUI
-import GitAccounts
+import Git
 import CodeEditUtils
 
 struct GithubEnterpriseLoginView: View {

CodeEditModules/Modules/AppPreferences/src/Sections/AccountsPreferences/Accounts/Login/Github/GithubLoginView.swift

@@ -6,7 +6,7 @@
 //
 
 import SwiftUI
-import GitAccounts
+import Git
 import CodeEditUtils
 
 struct GithubLoginView: View {

CodeEditModules/Modules/AppPreferences/src/Sections/AccountsPreferences/Accounts/Login/Gitlab/GitlabHostedLoginView.swift

@@ -7,7 +7,7 @@
 
 import SwiftUI
 import CodeEditUtils
-import GitAccounts
+import Git
 
 struct GitlabHostedLoginView: View {
  @State var eneterpriseLink = ""

CodeEditModules/Modules/AppPreferences/src/Sections/AccountsPreferences/Accounts/Login/Gitlab/GitlabLoginView.swift

@@ -6,7 +6,7 @@
 //
 
 import SwiftUI
-import GitAccounts
+import Git
 import CodeEditUtils
 
 struct GitlabLoginView: View {

CodeEditModules/Modules/CodeEditUI/src/ToolbarBranchPicker.swift

@@ -8,7 +8,7 @@
 import SwiftUI
 import CodeEditSymbols
 import WorkspaceClient
-import GitClient
+import Git
 
 /// A view that pops up a branch picker.
 public struct ToolbarBranchPicker: View {

CodeEditModules/Modules/Feedback/src/FeedbackView.swift

@@ -7,7 +7,7 @@
 
 import SwiftUI
 import CodeEditUI
-import GitAccounts
+import Git
 import AppPreferences
 
 public struct FeedbackView: View {

CodeEditModules/Modules/Feedback/src/Model/FeedbackModel.swift

@@ -6,7 +6,7 @@
 //
 
 import SwiftUI
-import GitAccounts
+import Git
 import AppPreferences
 import CodeEditUtils
 

CodeEditModules/Modules/GitClient/Tests/GitClientTests.swift → CodeEditModules/Modules/Git/Tests/GitClientTests.swift

@@ -1,12 +1,12 @@
 //
 // GitClientTests.swift
-// CodeEditModules/GitClientTests
+// CodeEditModules/GitTests
 //
 // Created by Marco Carnevali on 27/03/22.
 //
 
 import XCTest
-@testable import GitClient
+@testable import Git
 import ShellClient
 
 final class GitClientTests: XCTestCase {

CodeEditModules/Modules/GitAccounts/src/Gitlab/Model/EventData.swift → CodeEditModules/Modules/Git/src/Accounts/Gitlab/Model/EventData.swift

@@ -21,7 +21,7 @@ open class EventData: Codable {
  open var userAvatar: URL?
  open var projectID: Int?
  open var project: Project?
- open var commits: [Commit]?
+ open var commits: [GitlabCommit]?
  open var totalCommitsCount: Int?
 
  enum CodingKeys: String, CodingKey {

CodeEditModules/Modules/GitAccounts/src/Gitlab/Model/Commit.swift → CodeEditModules/Modules/Git/src/Accounts/Gitlab/Model/GitlabCommit.swift

@@ -1,13 +1,13 @@
 //
-// Commit.swift
+// GitlabCommit.swift
 // CodeEditModules/GitAccounts
 //
 // Created by Nanashi Li on 2022/03/31.
 //
 
 import Foundation
 
-open class Commit: Codable {
+open class GitlabCommit: Codable {
  open var id: String
  open var shortID: String?
  open var title: String?
@@ -131,7 +131,7 @@ public extension GitlabAccount {
  since: String = "",
  until: String = "",
  completion: @escaping (
- _ response: Result<Commit, Error>) -> Void) -> URLSessionDataTaskProtocol? {
+ _ response: Result<GitlabCommit, Error>) -> Void) -> URLSessionDataTaskProtocol? {
 
  let router = CommitRouter.readCommits(self.configuration,
  id: id,
@@ -141,7 +141,7 @@ public extension GitlabAccount {
 
  return router.load(session,
  dateDecodingStrategy: .formatted(Time.rfc3339DateFormatter),
- expectedResultType: Commit.self) { json, error in
+ expectedResultType: GitlabCommit.self) { json, error in
 
  if let error = error {
  completion(Result.failure(error))
@@ -163,13 +163,13 @@ public extension GitlabAccount {
  id: String,
  sha: String,
  completion: @escaping (
- _ response: Result<Commit, Error>) -> Void) -> URLSessionDataTaskProtocol? {
+ _ response: Result<GitlabCommit, Error>) -> Void) -> URLSessionDataTaskProtocol? {
 
  let router = CommitRouter.readCommit(self.configuration, id: id, sha: sha)
 
  return router.load(session,
  dateDecodingStrategy: .formatted(Time.rfc3339DateFormatter),
- expectedResultType: Commit.self) { json, error in
+ expectedResultType: GitlabCommit.self) { json, error in
 
  if let error = error {
  completion(Result.failure(error))

CodeEditModules/Modules/GitClient/src/Interface.swift → CodeEditModules/Modules/Git/src/Client/Interface.swift

@@ -1,6 +1,6 @@
 //
 // Interface.swift
-// CodeEditModules/GitClient
+// CodeEditModules/Git
 //
 // Created by Marco Carnevali on 21/03/22.
 //

CodeEditModules/Modules/GitClient/src/Live.swift → CodeEditModules/Modules/Git/src/Client/Live.swift

@@ -1,6 +1,6 @@
 //
 // Live.swift
-// CodeEditModules/GitClient
+// CodeEditModules/Git
 //
 // Created by Marco Carnevali on 21/03/22.
 //

CodeEditModules/Modules/GitClient/src/Models/Commit.swift → CodeEditModules/Modules/Git/src/Client/Models/Commit.swift

@@ -1,6 +1,6 @@
 //
 // Commit.swift
-// CodeEditModules/GitClient
+// CodeEditModules/Git
 //
 // Created by Marco Carnevali on 27/03/22.
 //

CodeEditModules/Modules/GitClone/src/CheckoutBranch.swift → CodeEditModules/Modules/Git/src/Clone/CheckoutBranch.swift

@@ -1,12 +1,11 @@
 //
 // CheckoutBranch.swift
-// CodeEditModules/GitClone
+// CodeEditModules/Git
 //
 // Created by Aleksi Puttonen on 18.4.2022.
 //
 
 import Foundation
-import GitClient
 import SwiftUI
 
 public extension CheckoutBranchView {

CodeEditModules/Modules/GitClone/src/CheckoutBranchView.swift → CodeEditModules/Modules/Git/src/Clone/CheckoutBranchView.swift

@@ -1,13 +1,12 @@
 //
 // CheckoutBranchView.swift
-// CodeEditModules/GitClone
+// CodeEditModules/Git
 //
 // Created by Aleksi Puttonen on 14.4.2022.
 //
 
 import Foundation
 import SwiftUI
-import GitClient
 import ShellClient
 
 public struct CheckoutBranchView: View {

CodeEditModules/Modules/GitClone/src/GitCloneView.swift → CodeEditModules/Modules/Git/src/Clone/GitCloneView.swift

@@ -1,12 +1,11 @@
 //
 // GitCloneView.swift
-// CodeEditModules/GitClone
+// CodeEditModules/Git
 //
 // Created by Aleksi Puttonen on 23.3.2022.
 //
 
 import SwiftUI
-import GitClient
 import Foundation
 import ShellClient
 

CodeEditModules/Modules/StatusBar/src/Model/StatusBarModel.swift

@@ -5,7 +5,7 @@
 // Created by Lukas Pistrol on 20.03.22.
 //
 
-import GitClient
+import Git
 import SwiftUI
 
 public enum StatusBarTab: String, CaseIterable, Identifiable {

CodeEditModules/Modules/StatusBar/src/StatusBar.swift

@@ -6,7 +6,7 @@
 //
 
 import SwiftUI
-import GitClient
+import Git
 import CodeEditUI
 
 /// # StatusBarView

CodeEditModules/Modules/WelcomeModule/Tests/UnitTests.swift

@@ -7,7 +7,7 @@
 
 @testable import WelcomeModule
 import ShellClient
-import GitClone
+import Git
 import Foundation
 import SnapshotTesting
 import SwiftUI

CodeEditModules/Modules/WelcomeModule/src/WelcomeView.swift

@@ -9,7 +9,7 @@ import SwiftUI
 import AppKit
 import Foundation
 import AppPreferences
-import GitClone
+import Git
 
 public struct WelcomeView: View {
  @Environment(\.colorScheme) var colorScheme