Revert PR #106

This fix seems to be no longer needed under the new worktrees data structure

Reverts 23ce8ac

Author: pol-rivero

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

@@ -24,11 +24,6 @@ import {
 } from '../../models/diff-font'
 import { EditorOverride } from '../../models/editor-override'
 import { stageResolvedConflictFiles } from '../git/stage'
-import { normalizePath } from '../helpers/path'
-import {
-  getPreferredWorktreePath,
-  clearPreferredWorktreePath,
-} from '../worktree-preferences'
 import {
   AccountsStore,
   CloningRepositoriesStore,
@@ -2467,57 +2462,20 @@ export class AppStore extends TypedBaseStore<IAppState> {
 
     this.selectedRepository = repository
 
+    this.emitUpdate()
     this.stopBackgroundFetching()
     this.stopPullRequestUpdater()
     this._clearBanner()
     this.stopBackgroundPruner()
 
     if (repository == null) {
-      this.emitUpdate()
       return Promise.resolve(null)
     }
 
     if (!(repository instanceof Repository)) {
-      this.emitUpdate()
       return Promise.resolve(null)
     }
 
-    // When returning to a repository that has worktrees, restore the
-    // previously active linked worktree so the user doesn't always land
-    // on the main worktree after switching repos.
-    if (!repository.isLinkedWorktree) {
-      const repoPath = normalizePath(repository.path)
-      const preferredPath = getPreferredWorktreePath(repoPath)
-
-      if (preferredPath && preferredPath !== repoPath) {
-        const linkedRepo = this.repositories.find(
-          r =>
-            r instanceof Repository && normalizePath(r.path) === preferredPath
-        )
-
-        if (linkedRepo instanceof Repository) {
-          repository = linkedRepo
-          this.selectedRepository = repository
-        } else {
-          const exists = await pathExists(preferredPath)
-          if (exists) {
-            const addedRepos = await this._addRepositories(
-              [preferredPath],
-              repository.login
-            )
-            if (addedRepos.length > 0) {
-              repository = addedRepos[0]
-              this.selectedRepository = repository
-            }
-          } else {
-            clearPreferredWorktreePath(repoPath)
-          }
-        }
-      }
-    }
-
-    this.emitUpdate()
-
     if (persistSelection) {
       setNumber(LastSelectedRepositoryIDKey, repository.id)
     }
@@ -8188,23 +8146,6 @@ export class AppStore extends TypedBaseStore<IAppState> {
       return
     }
 
-    if (repository instanceof Repository) {
-      if (repository.isLinkedWorktree) {
-        const repoPath = normalizePath(repository.path)
-        const mainRepo = this.repositories.find(
-          r =>
-            r instanceof Repository &&
-            !r.isLinkedWorktree &&
-            getPreferredWorktreePath(normalizePath(r.path)) === repoPath
-        )
-        if (mainRepo instanceof Repository) {
-          clearPreferredWorktreePath(normalizePath(mainRepo.path))
-        }
-      } else {
-        clearPreferredWorktreePath(normalizePath(repository.path))
-      }
-    }
-
     const allRepositories = await this.repositoriesStore.getAll()
     if (allRepositories.length === 0) {
       this._closeFoldout(FoldoutType.Repository)

app/src/lib/worktree-preferences.ts

@@ -19,7 +19,6 @@ import { PopupType } from '../../models/popup'
 import { Resizable } from '../resizable'
 import { enableResizingToolbarButtons } from '../../lib/feature-flag'
 import { normalizePath } from '../../lib/helpers/path'
-import { setPreferredWorktreePath } from '../../lib/worktree-preferences'
 
 interface IWorktreeDropdownProps {
   readonly dispatcher: Dispatcher
@@ -60,13 +59,6 @@ export class WorktreeDropdown extends React.Component<
 
     dispatcher.closeFoldout(FoldoutType.Worktree)
 
-    const { allWorktrees } = this.props.repositoryState.worktreesState
-    const mainWorktree = allWorktrees.find(wt => wt.type === 'main')
-
-    if (mainWorktree) {
-      setPreferredWorktreePath(mainWorktree.path, worktree.path)
-    }
-
     const existingRepo = repositories.find(
       r => r instanceof Repository && normalizePath(r.path) === worktreePath
     )

app/src/ui/toolbar/worktree-dropdown.tsx

@@ -8,10 +8,6 @@ import { Ref } from '../lib/ref'
 import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
 import { removeWorktree, getMainWorktreePath } from '../../lib/git/worktree'
 import { normalizePath } from '../../lib/helpers/path'
-import {
-  getPreferredWorktreePath,
-  clearPreferredWorktreePath,
-} from '../../lib/worktree-preferences'
 
 interface IDeleteWorktreeDialogProps {
   readonly repository: Repository
@@ -70,19 +66,16 @@ export class DeleteWorktreeDialog extends React.Component<
     const isDeletingCurrentWorktree =
       normalizePath(repository.path) === normalizePath(worktreePath)
 
-    const mainPathForCleanup = await getMainWorktreePath(repository)
-
     try {
       if (isDeletingCurrentWorktree) {
         // When deleting the currently selected worktree, we must switch away
         // first. Otherwise git runs from the directory being deleted and the
         // app is left pointing at a non-existent path.
-        if (mainPathForCleanup === null) {
+        const mainPath = await getMainWorktreePath(repository)
+        if (mainPath === null) {
           throw new Error('Could not find main worktree')
         }
 
-        const mainPath = mainPathForCleanup
-
         const addedRepos = await dispatcher.addRepositories(
           [mainPath],
           repository.login
@@ -97,20 +90,13 @@ export class DeleteWorktreeDialog extends React.Component<
         await dispatcher.removeRepository(repository, false)
       } else {
         await removeWorktree(repository, worktreePath)
-        await dispatcher.refreshRepository(repository)
       }
     } catch (e) {
       dispatcher.postError(e)
       this.setState({ isDeleting: false })
       return
     }
 
-    const resolvedMainPath = mainPathForCleanup ?? repository.path
-    const preferred = getPreferredWorktreePath(resolvedMainPath)
-    if (preferred && normalizePath(preferred) === normalizePath(worktreePath)) {
-      clearPreferredWorktreePath(resolvedMainPath)
-    }
-
     this.props.onDismissed()
   }
 }

app/src/ui/worktrees/delete-worktree-dialog.tsx

@@ -7,7 +7,6 @@ import { Dialog, DialogContent, DialogFooter } from '../dialog'
 import { TextBox } from '../lib/text-box'
 import { OkCancelButtonGroup } from '../dialog/ok-cancel-button-group'
 import { moveWorktree } from '../../lib/git/worktree'
-import { setPreferredWorktreePath } from '../../lib/worktree-preferences'
 
 interface IRenameWorktreeDialogProps {
   readonly repository: Repository
@@ -46,14 +45,12 @@ export class RenameWorktreeDialog extends React.Component<
     this.setState({ renaming: true })
 
     const storedRepo = await dispatcher.getRepositoryForPath(worktreePath)
-    const mainRepoPath = repository.path
 
     try {
       await moveWorktree(repository, worktreePath, newPath)
       if (storedRepo !== null) {
         await dispatcher.updateRepositoryPath(storedRepo, newPath)
       }
-      setPreferredWorktreePath(mainRepoPath, newPath)
     } catch (e) {
       dispatcher.postError(e)
       return