Fix preferred worktree restoration

This broke when we added worktrees in the sidebar

Author: pol-rivero

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

@@ -2175,8 +2175,7 @@ export class AppStore extends TypedBaseStore<IAppState> {
   /** This shouldn't be called directly. See `Dispatcher`. */
   public async _selectRepository(
     repository: Repository | CloningRepository | null,
-    persistSelection: boolean = true,
-    followPreferredWorktree: boolean = true
+    persistSelection: boolean = true
   ): Promise<Repository | null> {
     const previouslySelectedRepository = this.selectedRepository
 
@@ -2212,7 +2211,8 @@ export class AppStore extends TypedBaseStore<IAppState> {
     // 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 (followPreferredWorktree && !repository.isLinkedWorktree) {
+    // Disable this behavior if "Show worktrees in repository list" is enabled.
+    if (!this.showWorktreesInSidebar && !repository.isLinkedWorktree) {
       const repoPath = normalizePath(repository.path)
       const preferredPath = getPreferredWorktreePath(repoPath)
 

app/src/ui/app.tsx

@@ -3867,7 +3867,7 @@ export class App extends React.Component<IAppProps, IAppState> {
   }
 
   private onSelectionChanged = (repository: Repository | CloningRepository) => {
-    this.props.dispatcher.selectRepository(repository, true, false)
+    this.props.dispatcher.selectRepository(repository, true)
     this.props.dispatcher.closeFoldout(FoldoutType.Repository)
   }
 

app/src/ui/dispatcher/dispatcher.ts

@@ -314,14 +314,9 @@ export class Dispatcher {
   /** Select the repository. */
   public selectRepository(
     repository: Repository | CloningRepository,
-    persistSelection: boolean = true,
-    followPreferredWorktree: boolean = true
+    persistSelection: boolean = true
   ): Promise<Repository | null> {
-    return this.appStore._selectRepository(
-      repository,
-      persistSelection,
-      followPreferredWorktree
-    )
+    return this.appStore._selectRepository(repository, persistSelection)
   }
 
   /** Change the selected section in the repository. */

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

@@ -7,6 +7,7 @@ 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
@@ -45,12 +46,14 @@ export class RenameWorktreeDialog extends React.Component<
     this.setState({ renaming: true })
 
     const storedRepo = await dispatcher.getRepositoryForPath(worktreePath)
+    const mainRepoPath = storedRepo?.mainWorktreePath ?? 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