Reduce fork diff with respect to upstream

The goal of these changes is to make future merges easier, without modifying current behavior.

Author: pol-rivero

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

@@ -3327,13 +3327,15 @@ export class AppStore extends TypedBaseStore<IAppState> {
     const isStashedChangesVisible =
       changesState.selection.kind === ChangesSelectionKind.Stash
 
+    const askForConfirmationWhenStashingAllChanges = false
+
     updatePreferredAppMenuItemLabels({
       ...labels,
       contributionTargetDefaultBranch,
       isForcePushForCurrentRepository,
       isStashedChangesVisible,
       hasCurrentPullRequest: currentPullRequest !== null,
-      askForConfirmationWhenStashingAllChanges: false,
+      askForConfirmationWhenStashingAllChanges,
     })
   }
 
@@ -4582,10 +4584,10 @@ export class AppStore extends TypedBaseStore<IAppState> {
   /**
    * Update the repository sidebar indicator for the repository
    */
-  private updateSidebarIndicator(
+  private async updateSidebarIndicator(
     repository: Repository,
     status: IStatusResult | null
-  ): void {
+  ): Promise<void> {
     const lookup = this.localRepositoryStateLookup
 
     if (repository.missing) {
@@ -5378,7 +5380,6 @@ export class AppStore extends TypedBaseStore<IAppState> {
     }
 
     const { account, owner, name } = match
-
     const { endpoint } = account
     const api = API.fromAccount(account)
     const apiRepo = await api.fetchRepository(owner, name)
@@ -5495,69 +5496,6 @@ export class AppStore extends TypedBaseStore<IAppState> {
     return this.repositoriesStore.updateRepositoryAlias(repository, newAlias)
   }
 
-  /** This shouldn't be called directly. See `Dispatcher`. */
-  public async _changeRepositoryGroupName(
-    repository: Repository,
-    newGroupName: string | null
-  ): Promise<void> {
-    const mainPath = normalizePath(
-      repository.isLinkedWorktree
-        ? repository.mainWorktreePath
-        : repository.path
-    )
-    const reposToUpdate = this.repositories.filter(
-      r =>
-        normalizePath(r.path) === mainPath ||
-        (r.isLinkedWorktree && normalizePath(r.mainWorktreePath) === mainPath)
-    )
-    return this.repositoriesStore.updateRepositoryGroupName(
-      reposToUpdate,
-      newGroupName
-    )
-  }
-
-  /** This shouldn't be called directly. See `Dispatcher`. */
-  public async _updateRepositoryDefaultBranch(
-    repository: Repository,
-    defaultBranch: string | null
-  ): Promise<void> {
-    const repo = await this.repositoriesStore.updateRepositoryDefaultBranch(
-      repository,
-      defaultBranch
-    )
-    await this._refreshRepository(repo)
-  }
-
-  /** This shouldn't be called directly. See `Dispatcher`. */
-  public async _updateRepositoryAccount(
-    repository: Repository,
-    account: Account | null
-  ): Promise<void> {
-    if (repository.gitHubRepository && account === null) {
-      await this.repositoriesStore.clearGitHubRepositoryLogin(
-        repository.gitHubRepository
-      )
-    }
-    const repo = await this.repositoriesStore.updateRepositoryAccount(
-      repository,
-      account
-    )
-    const refreshedRepo = await this.repositoryWithRefreshedGitHubRepository(
-      repo
-    )
-    await this._refreshRepository(refreshedRepo)
-  }
-
-  public async _updateRepositoryEditorOverride(
-    repository: Repository,
-    customEditorOverride: EditorOverride | null
-  ): Promise<void> {
-    await this.repositoriesStore.updateRepositoryEditorOverride(
-      repository,
-      customEditorOverride
-    )
-  }
-
   /** This shouldn't be called directly. See `Dispatcher`. */
   public async _renameBranch(
     repository: Repository,
@@ -5744,6 +5682,69 @@ export class AppStore extends TypedBaseStore<IAppState> {
     return branchToCheckout
   }
 
+  /** This shouldn't be called directly. See `Dispatcher`. */
+  public async _changeRepositoryGroupName(
+    repository: Repository,
+    newGroupName: string | null
+  ): Promise<void> {
+    const mainPath = normalizePath(
+      repository.isLinkedWorktree
+        ? repository.mainWorktreePath
+        : repository.path
+    )
+    const reposToUpdate = this.repositories.filter(
+      r =>
+        normalizePath(r.path) === mainPath ||
+        (r.isLinkedWorktree && normalizePath(r.mainWorktreePath) === mainPath)
+    )
+    return this.repositoriesStore.updateRepositoryGroupName(
+      reposToUpdate,
+      newGroupName
+    )
+  }
+
+  /** This shouldn't be called directly. See `Dispatcher`. */
+  public async _updateRepositoryDefaultBranch(
+    repository: Repository,
+    defaultBranch: string | null
+  ): Promise<void> {
+    const repo = await this.repositoriesStore.updateRepositoryDefaultBranch(
+      repository,
+      defaultBranch
+    )
+    await this._refreshRepository(repo)
+  }
+
+  /** This shouldn't be called directly. See `Dispatcher`. */
+  public async _updateRepositoryAccount(
+    repository: Repository,
+    account: Account | null
+  ): Promise<void> {
+    if (repository.gitHubRepository && account === null) {
+      await this.repositoriesStore.clearGitHubRepositoryLogin(
+        repository.gitHubRepository
+      )
+    }
+    const repo = await this.repositoriesStore.updateRepositoryAccount(
+      repository,
+      account
+    )
+    const refreshedRepo = await this.repositoryWithRefreshedGitHubRepository(
+      repo
+    )
+    await this._refreshRepository(refreshedRepo)
+  }
+
+  public async _updateRepositoryEditorOverride(
+    repository: Repository,
+    customEditorOverride: EditorOverride | null
+  ): Promise<void> {
+    await this.repositoriesStore.updateRepositoryEditorOverride(
+      repository,
+      customEditorOverride
+    )
+  }
+
   private updatePushPullFetchProgress(
     repository: Repository,
     pushPullFetchProgress: Progress | null

app/src/main-process/app-window.ts

@@ -8,7 +8,6 @@ import {
 } from 'electron'
 import { shell } from '../lib/app-shell'
 import { Emitter, Disposable } from 'event-kit'
-import { join } from 'path'
 import { encodePathAsUrl } from '../lib/path'
 import {
   getWindowState,
@@ -20,6 +19,7 @@ import { URLActionType } from '../lib/parse-app-url'
 import { ILaunchStats } from '../lib/stats'
 import { menuFromElectronMenu } from '../models/app-menu'
 import { now } from './now'
+import * as path from 'path'
 import windowStateKeeper from 'electron-window-state'
 import * as ipcMain from './ipc-main'
 import * as ipcWebContents from './ipc-webcontents'
@@ -83,7 +83,12 @@ export class AppWindow {
       if (config.titleBarStyle === 'custom') {
         windowOptions.frame = false
       }
-      windowOptions.icon = join(__dirname, 'static', 'logos', '512x512.png')
+      windowOptions.icon = path.join(
+        __dirname,
+        'static',
+        'logos',
+        '512x512.png'
+      )
       windowOptions.autoHideMenuBar =
         config.titleBarStyle === 'native-without-menu-bar'
 

app/src/main-process/menu/build-default-menu.ts

@@ -11,6 +11,9 @@ import { mkdir } from 'fs/promises'
 import { buildTestMenu } from './build-test-menu'
 import { assertNever } from '../../lib/fatal-error'
 
+const createPullRequestLabel = __DARWIN__
+  ? 'Create Pull Request'
+  : 'Create &pull request'
 const defaultBranchNameValue = __DARWIN__ ? 'Default Branch' : 'default branch'
 const confirmRepositoryRemovalLabel = __DARWIN__ ? 'Remove…' : '&Remove…'
 const repositoryRemovalLabel = __DARWIN__ ? 'Remove' : '&Remove'
@@ -53,9 +56,6 @@ export function buildDefaultMenu({
     ? confirmRepositoryRemovalLabel
     : repositoryRemovalLabel
 
-  const createPullRequestLabel = __DARWIN__
-    ? 'Create Pull Request'
-    : 'Create &pull request'
   const showPullRequestLabel =
     (__DARWIN__ ? 'View Pull Request ' : 'View &pull request ') +
     onGithubLabel(gitHubRepositoryType)

app/src/ui/app.tsx

@@ -1653,9 +1653,16 @@ export class App extends React.Component<IAppProps, IAppState> {
           />
         )
       case PopupType.ConfirmDiscardChanges:
-        const showSetting = popup.showDiscardChangesSetting ?? true
-        const discardingAllChanges = popup.discardingAllChanges ?? false
+        const showSetting =
+          popup.showDiscardChangesSetting === undefined
+            ? true
+            : popup.showDiscardChangesSetting
+        const discardingAllChanges =
+          popup.discardingAllChanges === undefined
+            ? false
+            : popup.discardingAllChanges
         const permanentlyDelete = popup.permanentlyDelete ?? false
+
         return (
           <DiscardChanges
             key="discard-changes"
@@ -2266,12 +2273,12 @@ export class App extends React.Component<IAppProps, IAppState> {
       }
       case PopupType.LocalChangesOverwritten:
         // Now that we support multiple stashes, lie to the dialog so that it always shows the "stash changes" option.
-        const existingStash = false
+        const existingStash = null
         return (
           <LocalChangesOverwrittenDialog
             repository={popup.repository}
             dispatcher={this.props.dispatcher}
-            hasExistingStash={existingStash}
+            hasExistingStash={existingStash !== null}
             retryAction={popup.retryAction}
             onDismissed={onPopupDismissedFn}
             files={popup.files}