Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Finished RepositoryEntry refactoring, smoke tests passing

Browse source 
co-authored-by: Max <max@zed.dev>
This commit is contained in:
Mikayla Maki 2023-05-05 14:43:46 -07:00
parent 53569ece03
commit 270147d20c
No known key found for this signature in database
3 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/collab/migrations.sqlite/20221109000000_test_schema.sql
View file

@ -85,14 +85,13 @@ CREATE INDEX "index_worktree_entries_on_project_id_and_worktree_id" ON "worktree
CREATE TABLE "worktree_repositories" ( CREATE TABLE "worktree_repositories" (
"project_id" INTEGER NOT NULL, "project_id" INTEGER NOT NULL,
"worktree_id" INTEGER NOT NULL, "worktree_id" INTEGER NOT NULL,
"dot_git_entry_id" INTEGER NOT NULL, "work_directory_id" INTEGER NOT NULL,
"scan_id" INTEGER NOT NULL, "scan_id" INTEGER NOT NULL,
"branch" VARCHAR, "branch" VARCHAR,
"work_directory_path" VARCHAR NOT NULL,
"is_deleted" BOOL NOT NULL, "is_deleted" BOOL NOT NULL,
PRIMARY KEY(project_id, worktree_id, dot_git_entry_id), PRIMARY KEY(project_id, worktree_id, work_directory_id),
FOREIGN KEY(project_id, worktree_id) REFERENCES worktrees (project_id, id) ON DELETE CASCADE, FOREIGN KEY(project_id, worktree_id) REFERENCES worktrees (project_id, id) ON DELETE CASCADE,
FOREIGN KEY(project_id, worktree_id, dot_git_entry_id) REFERENCES worktree_entries (project_id, worktree_id, id) ON DELETE CASCADE FOREIGN KEY(project_id, worktree_id, work_directory_id) REFERENCES worktree_entries (project_id, worktree_id, id) ON DELETE CASCADE
); );
CREATE INDEX "index_worktree_repositories_on_project_id" ON "worktree_repositories" ("project_id"); CREATE INDEX "index_worktree_repositories_on_project_id" ON "worktree_repositories" ("project_id");
CREATE INDEX "index_worktree_repositories_on_project_id_and_worktree_id" ON "worktree_repositories" ("project_id", "worktree_id"); CREATE INDEX "index_worktree_repositories_on_project_id_and_worktree_id" ON "worktree_repositories" ("project_id", "worktree_id");

5
crates/collab/src/rpc.rs
View file

@ -1063,9 +1063,8 @@ async fn rejoin_room(
removed_entries: worktree.removed_entries, removed_entries: worktree.removed_entries,
scan_id: worktree.scan_id, scan_id: worktree.scan_id,
is_last_update: worktree.completed_scan_id == worktree.scan_id, is_last_update: worktree.completed_scan_id == worktree.scan_id,
//TODO repo updated_repositories: worktree.updated_repositories,
updated_repositories: vec![], removed_repositories: worktree.removed_repositories,
removed_repositories: vec![],
}; };
for update in proto::split_worktree_update(message, MAX_CHUNK_SIZE) { for update in proto::split_worktree_update(message, MAX_CHUNK_SIZE) {
session.peer.send(session.connection_id, update.clone())?; session.peer.send(session.connection_id, update.clone())?;

23
crates/project/src/worktree.rs
View file

@ -1422,10 +1422,11 @@ impl Snapshot {
scan_id: repository.scan_id as usize, scan_id: repository.scan_id as usize,
branch: repository.branch.map(Into::into), branch: repository.branch.map(Into::into),
}; };
// TODO: Double check this logic
if let Some(entry) = self.entry_for_id(repository.work_directory_id()) { if let Some(entry) = self.entry_for_id(repository.work_directory_id()) {
self.repository_entries self.repository_entries
.insert(RepositoryWorkDirectory(entry.path.clone()), repository) .insert(RepositoryWorkDirectory(entry.path.clone()), repository)
} else {
log::error!("no work directory entry for repository {:?}", repository)
} }
} }
@ -2528,23 +2529,21 @@ impl BackgroundScanner {
let mut snapshot = self.snapshot.lock(); let mut snapshot = self.snapshot.lock();
let mut git_repositories = mem::take(&mut snapshot.git_repositories); let mut git_repositories = mem::take(&mut snapshot.git_repositories);
git_repositories.retain(|project_entry_id, _| { git_repositories.retain(|work_directory_id, _| {
snapshot snapshot
.entry_for_id(*project_entry_id) .entry_for_id(*work_directory_id)
.map_or(false, |entry| entry.path.file_name() == Some(&DOT_GIT)) .map_or(false, |entry| {
snapshot.entry_for_path(entry.path.join(*DOT_GIT)).is_some()
})
}); });
snapshot.git_repositories = git_repositories; snapshot.git_repositories = git_repositories;
let mut git_repository_entries = mem::take(&mut snapshot.snapshot.repository_entries); let mut git_repository_entries = mem::take(&mut snapshot.snapshot.repository_entries);
git_repository_entries.retain(|_, entry| { git_repository_entries.retain(|_, entry| {
entry snapshot
.work_directory(&snapshot) .git_repositories
.map(|directory| { .get(&entry.work_directory.0)
snapshot .is_some()
.entry_for_path((directory.as_ref()).join(".git"))
.is_some()
})
.unwrap_or(false)
}); });
snapshot.snapshot.repository_entries = git_repository_entries; snapshot.snapshot.repository_entries = git_repository_entries;