Use stored repository defaultBranch instead of fetching

Author: pol-rivero

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

@@ -3961,6 +3961,13 @@ export class AppStore extends TypedBaseStore<IAppState> {
     this._initializeCompare(repository)
 
     this.updateCurrentTutorialStep(repository)
+
+    if (!repository.defaultBranch && gitStore.defaultBranch) {
+      this._updateRepositoryDefaultBranch(
+        repository,
+        gitStore.defaultBranch.name
+      )
+    }
   }
 
   private async updateStashEntryCountMetric(
@@ -4005,7 +4012,8 @@ export class AppStore extends TypedBaseStore<IAppState> {
     lookup.set(repository.id, {
       aheadBehind: status.branchAheadBehind || null,
       changedFilesCount: status.workingDirectory.files.length,
-      branchName: status.currentBranch,
+      branchName: status.currentBranch || null,
+      defaultBranchName: repository.defaultBranch,
     })
   }
   /**
@@ -4051,7 +4059,8 @@ export class AppStore extends TypedBaseStore<IAppState> {
         // they were already set when calling `updateSidebarIndicator()` with
         // the status object.
         changedFilesCount: existing?.changedFilesCount ?? 0,
-        branchName: existing?.branchName,
+        branchName: existing?.branchName ?? null,
+        defaultBranchName: existing?.defaultBranchName ?? null,
       })
       this.emitUpdate()
     }

app/src/models/repository.ts

@@ -224,7 +224,11 @@ export interface ILocalRepositoryState {
    * The name of the currently checked out branch, or `undefined` if the
    * branch name is not available (e.g. detached HEAD).
    */
-  readonly branchName?: string
+  readonly branchName: string | null
+  /**
+   * The name of the default branch, or `undefined` if not available.
+   */
+  readonly defaultBranchName: string | null
 }
 
 /**

app/src/ui/dispatcher/dispatcher.ts

@@ -23,7 +23,6 @@ import {
   MultiCommitOperationConflictState,
   IMultiCommitOperationState,
   CommitOptions,
-  IBranchesState,
 } from '../../lib/app-state'
 import { assertNever, fatalError } from '../../lib/fatal-error'
 import {
@@ -2199,11 +2198,6 @@ export class Dispatcher {
     }
   }
 
-  public getBranchesState(repository: Repository): IBranchesState {
-    const state = this.repositoryStateManager.get(repository)
-    return state.branchesState
-  }
-
   private async openOrCloneRepository(url: string): Promise<Repository | null> {
     const state = this.appStore.getState()
     const repositories = state.repositories

app/src/ui/repositories-list/group-repositories.ts

@@ -61,7 +61,8 @@ export interface IRepositoryListItem extends IFilterListItem {
   readonly needsDisambiguation: boolean
   readonly aheadBehind: IAheadBehind | null
   readonly changedFilesCount: number
-  readonly branchName?: string
+  readonly branchName: string | null
+  readonly defaultBranchName: string | null
 }
 
 const recentRepositoriesThreshold = 7
@@ -183,7 +184,8 @@ const toSortedListItems = (
           ((allNames.get(title) ?? 0) > 1 && group.kind === 'recent'),
         aheadBehind: repoState?.aheadBehind ?? null,
         changedFilesCount: repoState?.changedFilesCount ?? 0,
-        branchName: repoState?.branchName,
+        branchName: repoState?.branchName ?? null,
+        defaultBranchName: repoState?.defaultBranchName ?? null,
       }
     })
     .sort(({ repository: x }, { repository: y }) =>

app/src/ui/repositories-list/repositories-list.tsx

@@ -27,17 +27,9 @@ import { SectionFilterList } from '../lib/section-filter-list'
 import { assertNever } from '../../lib/fatal-error'
 import { IAheadBehind } from '../../models/branch'
 import { ShowBranchNameInRepoListSetting } from '../../models/show-branch-name-in-repo-list'
-import { throttle } from 'lodash'
 
 const BlankSlateImage = encodePathAsUrl(__dirname, 'static/empty-no-repo.svg')
 
-const refreshRepositoryThrottled = throttle(
-  async (dispatcher: Dispatcher, repository: Repository) => {
-    await dispatcher.refreshRepository(repository)
-  },
-  5000
-)
-
 interface IRepositoriesListProps {
   readonly selectedRepository: Repositoryish | null
   readonly repositories: ReadonlyArray<Repositoryish>
@@ -169,33 +161,19 @@ export class RepositoriesList extends React.Component<
 
   private shouldShowBranchName(item: IRepositoryListItem): boolean {
     const { showBranchNameInRepoList } = this.props
-
-    if (!(item.repository instanceof Repository) || !item.branchName) {
-      return false
-    }
-    if (showBranchNameInRepoList === ShowBranchNameInRepoListSetting.Never) {
-      return false
-    }
-    if (showBranchNameInRepoList === ShowBranchNameInRepoListSetting.Always) {
-      return true
-    }
-
-    if (
-      showBranchNameInRepoList ===
-      ShowBranchNameInRepoListSetting.WhenNotDefault
-    ) {
-      const branchState = this.props.dispatcher.getBranchesState(
-        item.repository
-      )
-      if (branchState.allBranches.length === 0) {
-        refreshRepositoryThrottled(this.props.dispatcher, item.repository)
+    switch (showBranchNameInRepoList) {
+      case ShowBranchNameInRepoListSetting.Never:
         return false
-      }
-      const defaultBranch = branchState.defaultBranch
-      return defaultBranch === null || item.branchName !== defaultBranch.name
+      case ShowBranchNameInRepoListSetting.Always:
+        return true
+      case ShowBranchNameInRepoListSetting.WhenNotDefault:
+        return item.branchName !== item.defaultBranchName
+      default:
+        assertNever(
+          showBranchNameInRepoList,
+          `Unknown show branch name setting: ${showBranchNameInRepoList}`
+        )
     }
-
-    assertNever(showBranchNameInRepoList, `Unknown show branch name setting`)
   }
 
   private renderItem = (item: IRepositoryListItem, matches: IMatches) => {
@@ -208,9 +186,7 @@ export class RepositoriesList extends React.Component<
         matches={matches}
         aheadBehind={item.aheadBehind}
         changedFilesCount={item.changedFilesCount}
-        branchName={
-          this.shouldShowBranchName(item) ? item.branchName : undefined
-        }
+        branchName={this.shouldShowBranchName(item) ? item.branchName : null}
       />
     )
   }
@@ -239,9 +215,7 @@ export class RepositoriesList extends React.Component<
     item: IRepositoryListItem
   ): JSX.Element | string | null => {
     const { repository, aheadBehind, changedFilesCount } = item
-    const branchName = this.shouldShowBranchName(item)
-      ? item.branchName
-      : undefined
+    const branchName = this.shouldShowBranchName(item) ? item.branchName : null
     const gitHubRepo =
       repository instanceof Repository ? repository.gitHubRepository : null
     const alias = repository instanceof Repository ? repository.alias : null

app/src/ui/repositories-list/repository-list-item.tsx

@@ -28,8 +28,8 @@ interface IRepositoryListItemProps {
   /** Number of uncommitted changes */
   readonly changedFilesCount: number
 
-  /** The name of the current branch, if available */
-  readonly branchName?: string
+  /** The name of the current branch, if it should be displayed */
+  readonly branchName: string | null
 }
 
 /** A repository item. */