Skip to content

Draft: Migrate Git Implementation to SwiftGitX #1990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Draft: Migrate Git Implementation to SwiftGitX #1990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
168b3a5
Initial implementation of SwiftGitX
ibrahimcetin Feb 18, 2025
18078a9
Migrate commit, add and reset functions
ibrahimcetin Feb 18, 2025
8647dbd
Migrate git history to SwiftGitX
ibrahimcetin Feb 18, 2025
c34de80
Delete GitCommit model
ibrahimcetin Feb 19, 2025
029ba89
Migrate git stash
ibrahimcetin Feb 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions CodeEdit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
04BA7C1C2AE2D84100584E1C /* GitClient+Commit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04BA7C1B2AE2D84100584E1C /* GitClient+Commit.swift */; };
04BA7C1E2AE2D8A000584E1C /* GitClient+Clone.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04BA7C1D2AE2D8A000584E1C /* GitClient+Clone.swift */; };
04BA7C202AE2D92B00584E1C /* GitClient+Status.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04BA7C1F2AE2D92B00584E1C /* GitClient+Status.swift */; };
04BA7C222AE2D95E00584E1C /* GitClient+CommitHistory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04BA7C212AE2D95E00584E1C /* GitClient+CommitHistory.swift */; };
04BA7C242AE2E7CD00584E1C /* SourceControlNavigatorSyncView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04BA7C232AE2E7CD00584E1C /* SourceControlNavigatorSyncView.swift */; };
04BA7C272AE2E9F100584E1C /* GitClient+Push.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04BA7C262AE2E9F100584E1C /* GitClient+Push.swift */; };
04BC1CDE2AD9B4B000A83EA5 /* EditorFileTabCloseButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04BC1CDD2AD9B4B000A83EA5 /* EditorFileTabCloseButton.swift */; };
04C3255B2801F86400C8DA2D /* ProjectNavigatorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 285FEC6D27FE4B4A00E57D53 /* ProjectNavigatorViewController.swift */; };
04C3255C2801F86900C8DA2D /* ProjectNavigatorMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 285FEC7127FE4EEF00E57D53 /* ProjectNavigatorMenu.swift */; };
0FB8F70E2D650481004AF0B3 /* SwiftGitX in Frameworks */ = {isa = PBXBuildFile; productRef = 0FF8F8872D634CB500C5D113 /* SwiftGitX */; };
0FD96BCE2BEF42530025A697 /* CodeEditWindowController+Toolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0FD96BCD2BEF42530025A697 /* CodeEditWindowController+Toolbar.swift */; };
201169D72837B2E300F92B46 /* SourceControlNavigatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 201169D62837B2E300F92B46 /* SourceControlNavigatorView.swift */; };
201169DB2837B34000F92B46 /* GitChangedFileListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 201169DA2837B34000F92B46 /* GitChangedFileListView.swift */; };
Expand Down Expand Up @@ -221,7 +221,6 @@
587B9E9529301D8F00AC7927 /* BitBucketUser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587B9E4E29301D8F00AC7927 /* BitBucketUser.swift */; };
587B9E9629301D8F00AC7927 /* BitBucketRepositories.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587B9E4F29301D8F00AC7927 /* BitBucketRepositories.swift */; };
587B9E9729301D8F00AC7927 /* BitBucketAccount+Token.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587B9E5029301D8F00AC7927 /* BitBucketAccount+Token.swift */; };
587B9E9829301D8F00AC7927 /* GitCommit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587B9E5329301D8F00AC7927 /* GitCommit.swift */; };
587B9E9929301D8F00AC7927 /* GitChangedFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587B9E5429301D8F00AC7927 /* GitChangedFile.swift */; };
587B9E9A29301D8F00AC7927 /* GitStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587B9E5529301D8F00AC7927 /* GitStatus.swift */; };
587FB99029C1246400B519DD /* EditorTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 587FB98F29C1246400B519DD /* EditorTabView.swift */; };
Expand Down Expand Up @@ -516,8 +515,6 @@
9D36E1BF2B5E7D7500443C41 /* GitBranchesGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9D36E1BE2B5E7D7500443C41 /* GitBranchesGroup.swift */; };
B6041F4D29D7A4E9000F3454 /* SettingsPageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6041F4C29D7A4E9000F3454 /* SettingsPageView.swift */; };
B6041F5229D7D6D6000F3454 /* SettingsWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6041F5129D7D6D6000F3454 /* SettingsWindow.swift */; };
B607181D2B0C5BE3009CDAB4 /* GitClient+Stash.swift in Sources */ = {isa = PBXBuildFile; fileRef = B607181C2B0C5BE3009CDAB4 /* GitClient+Stash.swift */; };
B60718202B0C6CE7009CDAB4 /* GitStashEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = B607181F2B0C6CE7009CDAB4 /* GitStashEntry.swift */; };
B60718312B15A9A3009CDAB4 /* CEOutlineGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60718302B15A9A3009CDAB4 /* CEOutlineGroup.swift */; };
B60718372B170638009CDAB4 /* SourceControlRenameBranchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B60718362B170638009CDAB4 /* SourceControlRenameBranchView.swift */; };
B607183F2B17DB07009CDAB4 /* SourceControlNavigatorRepositoryView+contextMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = B607183E2B17DB07009CDAB4 /* SourceControlNavigatorRepositoryView+contextMenu.swift */; };
Expand Down Expand Up @@ -726,7 +723,6 @@
04BA7C1B2AE2D84100584E1C /* GitClient+Commit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GitClient+Commit.swift"; sourceTree = "<group>"; };
04BA7C1D2AE2D8A000584E1C /* GitClient+Clone.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GitClient+Clone.swift"; sourceTree = "<group>"; };
04BA7C1F2AE2D92B00584E1C /* GitClient+Status.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GitClient+Status.swift"; sourceTree = "<group>"; };
04BA7C212AE2D95E00584E1C /* GitClient+CommitHistory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GitClient+CommitHistory.swift"; sourceTree = "<group>"; };
04BA7C232AE2E7CD00584E1C /* SourceControlNavigatorSyncView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceControlNavigatorSyncView.swift; sourceTree = "<group>"; };
04BA7C262AE2E9F100584E1C /* GitClient+Push.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GitClient+Push.swift"; sourceTree = "<group>"; };
04BC1CDD2AD9B4B000A83EA5 /* EditorFileTabCloseButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorFileTabCloseButton.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -927,7 +923,6 @@
587B9E4E29301D8F00AC7927 /* BitBucketUser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BitBucketUser.swift; sourceTree = "<group>"; };
587B9E4F29301D8F00AC7927 /* BitBucketRepositories.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BitBucketRepositories.swift; sourceTree = "<group>"; };
587B9E5029301D8F00AC7927 /* BitBucketAccount+Token.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "BitBucketAccount+Token.swift"; sourceTree = "<group>"; };
587B9E5329301D8F00AC7927 /* GitCommit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GitCommit.swift; sourceTree = "<group>"; };
587B9E5429301D8F00AC7927 /* GitChangedFile.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GitChangedFile.swift; sourceTree = "<group>"; };
587B9E5529301D8F00AC7927 /* GitStatus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GitStatus.swift; sourceTree = "<group>"; };
587FB98F29C1246400B519DD /* EditorTabView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditorTabView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1201,8 +1196,6 @@
9D36E1BE2B5E7D7500443C41 /* GitBranchesGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GitBranchesGroup.swift; sourceTree = "<group>"; };
B6041F4C29D7A4E9000F3454 /* SettingsPageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsPageView.swift; sourceTree = "<group>"; };
B6041F5129D7D6D6000F3454 /* SettingsWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsWindow.swift; sourceTree = "<group>"; };
B607181C2B0C5BE3009CDAB4 /* GitClient+Stash.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GitClient+Stash.swift"; sourceTree = "<group>"; };
B607181F2B0C6CE7009CDAB4 /* GitStashEntry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GitStashEntry.swift; sourceTree = "<group>"; };
B60718302B15A9A3009CDAB4 /* CEOutlineGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CEOutlineGroup.swift; sourceTree = "<group>"; };
B60718362B170638009CDAB4 /* SourceControlRenameBranchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceControlRenameBranchView.swift; sourceTree = "<group>"; };
B607183E2B17DB07009CDAB4 /* SourceControlNavigatorRepositoryView+contextMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceControlNavigatorRepositoryView+contextMenu.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1352,6 +1345,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
0FB8F70E2D650481004AF0B3 /* SwiftGitX in Frameworks */,
6C85BB402C2105ED00EB5DEF /* CodeEditKit in Frameworks */,
6C66C31329D05CDC00DE9ED2 /* GRDB in Frameworks */,
58F2EB1E292FB954004A9BDE /* Sparkle in Frameworks */,
Expand Down Expand Up @@ -2322,13 +2316,11 @@
04BA7C182AE2D7C600584E1C /* GitClient+Branches.swift */,
04BA7C1D2AE2D8A000584E1C /* GitClient+Clone.swift */,
04BA7C1B2AE2D84100584E1C /* GitClient+Commit.swift */,
04BA7C212AE2D95E00584E1C /* GitClient+CommitHistory.swift */,
B65B11032B09DB1C002852CF /* GitClient+Fetch.swift */,
B69BFDC62B0686910050D9A6 /* GitClient+Initiate.swift */,
B65B10EE2B07C454002852CF /* GitClient+Remote.swift */,
B65B11002B09D5D4002852CF /* GitClient+Pull.swift */,
04BA7C262AE2E9F100584E1C /* GitClient+Push.swift */,
B607181C2B0C5BE3009CDAB4 /* GitClient+Stash.swift */,
04BA7C1F2AE2D92B00584E1C /* GitClient+Status.swift */,
B628B7922B18369800F9775A /* GitClient+Validate.swift */,
);
Expand All @@ -2341,9 +2333,7 @@
04BA7C0A2AE2A2D100584E1C /* GitBranch.swift */,
9D36E1BE2B5E7D7500443C41 /* GitBranchesGroup.swift */,
587B9E5429301D8F00AC7927 /* GitChangedFile.swift */,
587B9E5329301D8F00AC7927 /* GitCommit.swift */,
B65B10F12B07D34F002852CF /* GitRemote.swift */,
B607181F2B0C6CE7009CDAB4 /* GitStashEntry.swift */,
587B9E5529301D8F00AC7927 /* GitStatus.swift */,
);
path = Models;
Expand Down Expand Up @@ -3829,6 +3819,7 @@
6CC00A8A2CBEF150004E8134 /* CodeEditSourceEditor */,
6C73A6D22D4F1E550012D95C /* CodeEditSourceEditor */,
6C9DB9E32D55656300ACD86E /* CodeEditSourceEditor */,
0FF8F8872D634CB500C5D113 /* SwiftGitX */,
);
productName = CodeEdit;
productReference = B658FB2C27DA9E0F00EA4DBD /* CodeEdit.app */;
Expand Down Expand Up @@ -3927,6 +3918,7 @@
6C4E37FA2C73E00700AEE7B5 /* XCRemoteSwiftPackageReference "SwiftTerm" */,
6CB94D012CA1205100E8651C /* XCRemoteSwiftPackageReference "swift-async-algorithms" */,
6C9DB9E22D55656300ACD86E /* XCRemoteSwiftPackageReference "CodeEditSourceEditor" */,
0FF8F8862D634CB500C5D113 /* XCRemoteSwiftPackageReference "SwiftGitX" */,
);
productRefGroup = B658FB2D27DA9E0F00EA4DBD /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -4087,7 +4079,6 @@
5B698A0F2B2636A700DE9392 /* SearchSettingsIgnoreGlobPatternItemView.swift in Sources */,
587B9E8A29301D8F00AC7927 /* GitHubIssue.swift in Sources */,
EC0870F72A455F6400EB8692 /* ProjectNavigatorViewController+NSMenuDelegate.swift in Sources */,
B60718202B0C6CE7009CDAB4 /* GitStashEntry.swift in Sources */,
6CAAF69429BCD78600A1F48A /* (null) in Sources */,
6CDAFDDF2D35DADD002B2D47 /* String+ValidFileName.swift in Sources */,
3026F50F2AC006C80061227E /* InspectorAreaViewModel.swift in Sources */,
Expand Down Expand Up @@ -4190,10 +4181,8 @@
587B9E8B29301D8F00AC7927 /* GitHubAccount+deleteReference.swift in Sources */,
6CD0358A2C3461160091E1F4 /* KeyWindowControllerObserver.swift in Sources */,
58798237292E30B90085B254 /* FeedbackView.swift in Sources */,
587B9E9829301D8F00AC7927 /* GitCommit.swift in Sources */,
6C5228B529A868BD00AC48F6 /* Environment+ContentInsets.swift in Sources */,
587B9E9429301D8F00AC7927 /* BitBucketTokenConfiguration.swift in Sources */,
04BA7C222AE2D95E00584E1C /* GitClient+CommitHistory.swift in Sources */,
581BFB672926431000D251EC /* WelcomeWindowView.swift in Sources */,
58A5DFA329339F6400D1BD5D /* CommandManager.swift in Sources */,
58798284292ED0FB0085B254 /* TerminalEmulatorView.swift in Sources */,
Expand Down Expand Up @@ -4476,7 +4465,6 @@
04BA7C1E2AE2D8A000584E1C /* GitClient+Clone.swift in Sources */,
58F2EB09292FB2B0004A9BDE /* TerminalSettings.swift in Sources */,
6C578D8429CD343800DC73B2 /* ExtensionDetailView.swift in Sources */,
B607181D2B0C5BE3009CDAB4 /* GitClient+Stash.swift in Sources */,
B65B10F22B07D34F002852CF /* GitRemote.swift in Sources */,
B6A43C5D29FC4AF00027E0E0 /* CreateSSHKeyView.swift in Sources */,
B6EA200229DB7F81001BF195 /* View+ConstrainHeightToWindow.swift in Sources */,
Expand Down Expand Up @@ -5725,6 +5713,14 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
0FF8F8862D634CB500C5D113 /* XCRemoteSwiftPackageReference "SwiftGitX" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/ibrahimcetin/SwiftGitX";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 0.1.7;
};
};
2816F592280CF50500DD548B /* XCRemoteSwiftPackageReference "CodeEditSymbols" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/CodeEditApp/CodeEditSymbols";
Expand Down Expand Up @@ -5864,6 +5860,11 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
0FF8F8872D634CB500C5D113 /* SwiftGitX */ = {
isa = XCSwiftPackageProductDependency;
package = 0FF8F8862D634CB500C5D113 /* XCRemoteSwiftPackageReference "SwiftGitX" */;
productName = SwiftGitX;
};
2816F593280CF50500DD548B /* CodeEditSymbols */ = {
isa = XCSwiftPackageProductDependency;
package = 2816F592280CF50500DD548B /* XCRemoteSwiftPackageReference "CodeEditSymbols" */;
Expand Down
20 changes: 19 additions & 1 deletion CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"originHash" : "aef43d6aa0c467418565c574c33495a50d6e24057eb350c17704ab4ae2aead6c",
"originHash" : "d3cab6e96b236b7927ac50c474e65b9a97c4c314fc032fee7184cd5d58e1afc9",
"pins" : [
{
"identity" : "anycodable",
Expand Down Expand Up @@ -127,6 +127,15 @@
"version" : "0.13.2"
}
},
{
"identity" : "libgit2",
"kind" : "remoteSourceControl",
"location" : "https://github.com/ibrahimcetin/libgit2.git",
"state" : {
"revision" : "6e627a8d345d9de7df6f69c134ec5dfa81e75ade",
"version" : "1.8.0"
}
},
{
"identity" : "logstream",
"kind" : "remoteSourceControl",
Expand Down Expand Up @@ -217,6 +226,15 @@
"version" : "509.1.1"
}
},
{
"identity" : "swiftgitx",
"kind" : "remoteSourceControl",
"location" : "https://github.com/ibrahimcetin/SwiftGitX",
"state" : {
"revision" : "a0b878c02599cda868cb7920e123b4f0be620fcb",
"version" : "0.1.7"
}
},
{
"identity" : "swiftlintplugin",
"kind" : "remoteSourceControl",
Expand Down
5 changes: 4 additions & 1 deletion CodeEdit/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import SwiftUI
import CodeEditSymbols
import CodeEditSourceEditor
import OSLog
import SwiftGitX

final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
private let logger = Logger(subsystem: Bundle.main.bundleIdentifier ?? "", category: "AppDelegate")
Expand All @@ -24,6 +25,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
Settings.shared.preferences.general.appAppearance.applyAppearance()
checkForFilesToOpen()

_ = try? SwiftGitX.initialize()

NSApp.closeWindow(.welcome, .about)

DispatchQueue.main.async {
Expand Down Expand Up @@ -60,7 +63,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
}

func applicationWillTerminate(_ aNotification: Notification) {

_ = try? SwiftGitX.shutdown()
}

func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
Expand Down
5 changes: 3 additions & 2 deletions CodeEdit/Features/InspectorArea/HistoryInspector/HistoryInspectorItemView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
//

import SwiftUI
import SwiftGitX

struct HistoryInspectorItemView: View {
var commit: GitCommit
var commit: Commit

@Binding var selection: GitCommit?
@Binding var selection: Commit?

private var showPopup: Binding<Bool> {
Binding<Bool> {
Expand Down
21 changes: 11 additions & 10 deletions CodeEdit/Features/InspectorArea/HistoryInspector/HistoryInspectorModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//

import Foundation
import SwiftGitX

final class HistoryInspectorModel: ObservableObject {
private(set) var sourceControlManager: SourceControlManager?
Expand All @@ -17,7 +18,7 @@ final class HistoryInspectorModel: ObservableObject {
private(set) var fileURL: String?

/// The selected branch from the GitClient
@Published var commitHistory: [GitCommit] = []
@Published var commitHistory: [Commit] = []

func setWorkspace(sourceControlManager: SourceControlManager?) async {
self.sourceControlManager = sourceControlManager
Expand All @@ -32,27 +33,27 @@ final class HistoryInspectorModel: ObservableObject {
}

func updateCommitHistory() async {
guard let sourceControlManager, let fileURL else {
guard let repository = sourceControlManager?.repository, let fileURL else {
await setCommitHistory([])
return
}

do {
let commitHistory = try await sourceControlManager
.gitClient
.getCommitHistory(
maxCount: 40,
fileLocalPath: fileURL,
showMergeCommits: Settings.shared.preferences.sourceControl.git.showMergeCommitsPerFileLog
)
let commitHistory = try Array(repository.log(sorting: .time).prefix(40))
// .gitClient
// .getCommitHistory(
// maxCount: 40,
// fileLocalPath: fileURL,
// showMergeCommits: Settings.shared.preferences.sourceControl.git.showMergeCommitsPerFileLog
// )
Comment on lines +43 to +48
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be commented out or deleted?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't delete it because I didn't understand what showMergeCommits does and prefers to keep it for now to don't forget.

await setCommitHistory(commitHistory)
} catch {
await setCommitHistory([])
}
}

@MainActor
private func setCommitHistory(_ history: [GitCommit]) {
private func setCommitHistory(_ history: [Commit]) {
self.commitHistory = history
}
}
3 changes: 2 additions & 1 deletion CodeEdit/Features/InspectorArea/HistoryInspector/HistoryInspectorView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// Created by Nanashi Li on 2022/03/24.
//
import SwiftUI
import SwiftGitX

struct HistoryInspectorView: View {
@AppSettings(\.sourceControl.git.showMergeCommitsPerFileLog)
Expand All @@ -16,7 +17,7 @@ struct HistoryInspectorView: View {

@ObservedObject private var model: HistoryInspectorModel

@State var selection: GitCommit?
@State var selection: Commit?

/// Initialize with GitClient
/// - Parameter gitClient: a GitClient
Expand Down
7 changes: 4 additions & 3 deletions CodeEdit/Features/InspectorArea/HistoryInspector/HistoryPopoverView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
//

import SwiftUI
import SwiftGitX

struct HistoryPopoverView: View {

private var commit: GitCommit
private var commit: Commit

init(commit: GitCommit) {
init(commit: Commit) {
self.commit = commit
}

Expand All @@ -32,7 +33,7 @@ struct HistoryPopoverView: View {
.disabled(true)
ActionButton("Email \(commit.author)", systemImage: "envelope") {
let service = NSSharingService(named: NSSharingService.Name.composeEmail)
service?.recipients = [commit.authorEmail]
service?.recipients = [commit.author.email]
service?.perform(withItems: [])
}
}
Expand Down
Loading