Show merge commits per file log setting now shows merge commits if enabled, if disabled no merge commits are displayed.

Author: austincondiff

CodeEdit/Features/InspectorArea/HistoryInspector/HistoryInspectorModel.swift

@@ -40,7 +40,11 @@ final class HistoryInspectorModel: ObservableObject {
         do {
             let commitHistory = try await sourceControlManager
                 .gitClient
-                .getCommitHistory(maxCount: 40, fileLocalPath: fileURL)
+                .getCommitHistory(
+                    maxCount: 40,
+                    fileLocalPath: fileURL,
+                    showMergeCommits: Settings.shared.preferences.sourceControl.git.showMergeCommitsPerFileLog
+                )
             await setCommitHistory(commitHistory)
         } catch {
             await setCommitHistory([])

CodeEdit/Features/InspectorArea/HistoryInspector/HistoryInspectorView.swift

@@ -7,6 +7,9 @@
 import SwiftUI
 
 struct HistoryInspectorView: View {
+    @AppSettings(\.sourceControl.git.showMergeCommitsPerFileLog)
+    var showMergeCommitsPerFileLog
+
     @EnvironmentObject private var workspace: WorkspaceDocument
 
     @EnvironmentObject private var editorManager: EditorManager
@@ -60,5 +63,10 @@ struct HistoryInspectorView: View {
             await model.setWorkspace(sourceControlManager: workspace.sourceControlManager)
             await model.setFile(url: editorManager.activeEditor.selectedTab?.file.url.path)
         }
+        .onChange(of: showMergeCommitsPerFileLog) { _ in
+            Task {
+                await model.updateCommitHistory()
+            }
+        }
     }
 }

CodeEdit/Features/NavigatorArea/SourceControlNavigator/History/Views/SourceControlNavigatorHistoryView.swift

@@ -15,6 +15,9 @@ struct SourceControlNavigatorHistoryView: View {
         case error(error: Error)
     }
 
+    @AppSettings(\.sourceControl.git.showMergeCommitsPerFileLog)
+    var showMergeCommitsPerFileLog
+
     @EnvironmentObject var sourceControlManager: SourceControlManager
 
     @State var commitHistoryStatus: Status = .loading
@@ -28,7 +31,10 @@ struct SourceControlNavigatorHistoryView: View {
             commitHistoryStatus = .loading
             let commits = try await sourceControlManager
                 .gitClient
-                .getCommitHistory(branchName: sourceControlManager.currentBranch?.name)
+                .getCommitHistory(
+                    branchName: sourceControlManager.currentBranch?.name,
+                    showMergeCommits: Settings.shared.preferences.sourceControl.git.showMergeCommitsPerFileLog
+                )
             await MainActor.run {
                 commitHistory = commits
                 commitHistoryStatus = .ready
@@ -102,5 +108,10 @@ struct SourceControlNavigatorHistoryView: View {
         .task {
             await updateCommitHistory()
         }
+        .onChange(of: showMergeCommitsPerFileLog) { _ in
+            Task {
+                await updateCommitHistory()
+            }
+        }
     }
 }

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

@@ -17,7 +17,8 @@ extension GitClient {
     func getCommitHistory(
         branchName: String? = nil,
         maxCount: Int? = nil,
-        fileLocalPath: String? = nil
+        fileLocalPath: String? = nil,
+        showMergeCommits: Bool = false
     ) async throws -> [GitCommit] {
         let branchString = branchName != nil ? "\"\(branchName ?? "")\"" : ""
         let fileString = fileLocalPath != nil ? "\"\(fileLocalPath ?? "")\"" : ""
@@ -30,7 +31,7 @@ extension GitClient {
         dateFormatter.dateFormat = "EEE, dd MMM yyyy HH:mm:ss Z"
 
         let output = try await run(
-            "log -z --pretty=%h¦%H¦%s¦%aN¦%ae¦%cn¦%ce¦%aD¦%b¦%D¦ \(countString) \(branchString) -- \(fileString)"
+            "log \(showMergeCommits ? "" : "--no-merges") -z --pretty=%h¦%H¦%s¦%aN¦%ae¦%cn¦%ce¦%aD¦%b¦%D¦ \(countString) \(branchString) -- \(fileString)"
                 .trimmingCharacters(in: .whitespacesAndNewlines)
         )
         let remoteURL = try await getRemoteURL()