Add option to filter commits history by authors email

app/src/lib/app-state.ts

@@ -1006,6 +1006,9 @@ export interface ICompareState {
   /** The SHA associated with the most recent history state */
   readonly tip: string | null
 
+  /** The SHAs of commits to render in the compare list */
+  readonly prevFilteredHistoryCommitSHAs: ReadonlyArray<string>
+
   /** The SHAs of commits to render in the compare list */
   readonly filteredHistoryCommitSHAs: ReadonlyArray<string>
 

app/src/lib/stores/app-store.ts

@@ -450,6 +450,7 @@ import {
   gatherCommitContext,
 } from '../copilot-conflict-context'
 import { resolveWithin } from '../path'
+import { TFilters } from '../../ui/history/commit-graph-filter-button'
 
 const LastSelectedRepositoryIDKey = 'last-selected-repository-id'
 
@@ -2019,7 +2020,8 @@ export class AppStore extends TypedBaseStore<IAppState> {
   public async _loadNextCommitBatch(
     repository: Repository,
     alreadyFiltered: number,
-    queryTextLowercase?: string
+    queryTextLowercase?: string,
+    authorFiltersLowercase?: string[]
   ): Promise<void> {
     const gitStore = this.gitStoreCache.get(repository)
 
@@ -2055,14 +2057,28 @@ export class AppStore extends TypedBaseStore<IAppState> {
       return
     }
 
-    const newFilteredCommits = newCommits.filter(sha =>
+    const baseFilteredCommits = newCommits.filter(sha =>
       this.commitIsIncluded(gitStore.commitLookup.get(sha), queryTextLowercase)
     )
 
+    const newFilteredCommits =
+      authorFiltersLowercase && authorFiltersLowercase.length > 0
+        ? baseFilteredCommits.filter(sha => {
+            const commit = gitStore.commitLookup.get(sha)
+            return authorFiltersLowercase.some(filter =>
+              this.commitIsIncludedByAuthorFilter(commit, filter)
+            )
+          })
+        : baseFilteredCommits
+
     this.repositoryStateCache.updateCompareState(repository, () => ({
       allHistoryCommitSHAs: commits.concat(newCommits),
       filteredHistoryCommitSHAs:
         state.compareState.filteredHistoryCommitSHAs.concat(newFilteredCommits),
+      prevFilteredHistoryCommitSHAs:
+        state.compareState.filteredHistoryCommitSHAs.concat(
+          baseFilteredCommits
+        ),
     }))
 
     const numFilteredCommits = alreadyFiltered + newFilteredCommits.length
@@ -2073,7 +2089,8 @@ export class AppStore extends TypedBaseStore<IAppState> {
       return this._loadNextCommitBatch(
         repository,
         numFilteredCommits,
-        queryTextLowercase
+        queryTextLowercase,
+        authorFiltersLowercase
       )
     }
     return
@@ -2301,14 +2318,33 @@ export class AppStore extends TypedBaseStore<IAppState> {
     )
   }
 
+  private commitIsIncludedByAuthorFilter(
+    commit: Commit | undefined,
+    filterTextLowerCase: string
+  ): boolean {
+    if (!commit) {
+      return false
+    }
+    return (
+      !filterTextLowerCase ||
+      commit.author.email.toLowerCase() === filterTextLowerCase
+    )
+  }
+
   public async _updateCommitSearchQuery(
     repository: Repository,
-    query: string
+    query: string,
+    filters?: TFilters
   ): Promise<void> {
     const state = this.repositoryStateCache.get(repository)
     const compareState = state.compareState
-    const isIncrementalSearch = query.startsWith(compareState.commitSearchQuery)
-
+    const authorFiltersSet = filters && filters.get('author')
+    const authorFiltersLowercase = authorFiltersSet
+      ? Array.from(authorFiltersSet).map(item => item.toLowerCase())
+      : []
+    const isIncrementalSearch = query
+      ? query.startsWith(compareState.commitSearchQuery)
+      : false
     this.repositoryStateCache.updateCompareState(repository, () => ({
       commitSearchQuery: query,
     }))
@@ -2318,23 +2354,37 @@ export class AppStore extends TypedBaseStore<IAppState> {
     }
 
     const candidateCommitSHAs = isIncrementalSearch
-      ? compareState.filteredHistoryCommitSHAs
+      ? compareState.prevFilteredHistoryCommitSHAs
       : compareState.allHistoryCommitSHAs
+
     const queryTextLowercase = query.toLowerCase()
-    const filteredCommitSHAs = queryTextLowercase
+    const baseFilteredCommitSHAs = queryTextLowercase
       ? candidateCommitSHAs.filter(sha =>
           this.commitIsIncluded(state.commitLookup.get(sha), queryTextLowercase)
         )
       : candidateCommitSHAs
+
+    const newFilteredCommitSHAs =
+      authorFiltersLowercase.length > 0
+        ? baseFilteredCommitSHAs.filter(sha => {
+            const commit = state.commitLookup.get(sha)
+            return authorFiltersLowercase.some(filter =>
+              this.commitIsIncludedByAuthorFilter(commit, filter)
+            )
+          })
+        : baseFilteredCommitSHAs
+
     this.repositoryStateCache.updateCompareState(repository, () => ({
-      filteredHistoryCommitSHAs: filteredCommitSHAs,
+      filteredHistoryCommitSHAs: newFilteredCommitSHAs,
+      prevFilteredHistoryCommitSHAs: baseFilteredCommitSHAs,
     }))
     this.emitUpdate()
-    if (filteredCommitSHAs.length < MinimumFilteredCommitsToLoad) {
+    if (newFilteredCommitSHAs.length < MinimumFilteredCommitsToLoad) {
       this.currentCommitFilterPromise = this._loadNextCommitBatch(
         repository,
-        filteredCommitSHAs.length,
-        queryTextLowercase
+        newFilteredCommitSHAs.length,
+        queryTextLowercase,
+        authorFiltersLowercase
       )
       await this.currentCommitFilterPromise
       this.currentCommitFilterPromise = null

app/src/lib/stores/repository-state-cache.ts

@@ -366,6 +366,7 @@ function getInitialRepositoryState(): IRepositoryState {
       filterText: '',
       commitSearchQuery: '',
       allHistoryCommitSHAs: [],
+      prevFilteredHistoryCommitSHAs: [],
       filteredHistoryCommitSHAs: [],
       commitGraphRefs: [],
       commitGraphHiddenBranchRefs: null,

app/src/ui/dispatcher/dispatcher.ts

@@ -146,6 +146,7 @@ import {
   ICopilotConflictResolutionResponse,
   IConflictResolutionProgress,
 } from '../../lib/copilot-conflict-resolution'
+import { TFilters } from '../history/commit-graph-filter-button'
 
 /**
  * An error handler function.
@@ -296,9 +297,10 @@ export class Dispatcher {
   /** Update the commit search filter text. */
   public setCommitSearchQuery(
     repository: Repository,
-    text: string
+    text: string,
+    filters?: TFilters
   ): Promise<void> {
-    return this.appStore._updateCommitSearchQuery(repository, text)
+    return this.appStore._updateCommitSearchQuery(repository, text, filters)
   }
 
   /** Load the changed files for the current history selection. */