Skip to content

scm: remember worktree visibility across restarts #307887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yogeshwaran-c wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −0
Open

scm: remember worktree visibility across restarts #307887

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/vs/workbench/contrib/scm/browser/scmViewService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,17 @@ export class SCMViewService implements ISCMViewService {
this.didSelectRepository = true;
}
}
} else if (this.previousState && this.didFinishLoadingRepositories.get()) {
// Even after the initial loading phase has ended, repositories
// that are discovered later (e.g. git worktrees) should respect
// the previously persisted hidden state so that the user does
// not have to hide them again on every restart.
const index = this.previousState.all.indexOf(getProviderStorageKey(repository.provider));
if (index !== -1 && this.previousState.visible.indexOf(index) === -1) {
this.insertRepositoryView(this._repositories, repositoryView);
this._onDidChangeRepositories.fire({ added: Iterable.empty(), removed: Iterable.empty() });
return;
}
}

if (this.selectionModeConfig.get() === ISCMRepositorySelectionMode.Multiple || !this._repositories.find(r => r.selectionIndex !== -1)) {
Expand Down