mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-06 10:42:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Only fire update diff base when the dot repo is scanned

Browse source
This commit is contained in:
Mikayla Maki 2023-05-22 13:57:07 -07:00
parent 1d07cff765
commit 96224fa7e8
No known key found for this signature in database
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -329,7 +329,7 @@ pub struct LocalMutableSnapshot {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct LocalRepositoryEntry { pub struct LocalRepositoryEntry {
pub(crate) scan_id: usize, pub(crate) scan_id: usize,
pub(crate) full_scan_id: usize, pub(crate) git_dir_scan_id: usize,
pub(crate) repo_ptr: Arc<Mutex<dyn GitRepository>>, pub(crate) repo_ptr: Arc<Mutex<dyn GitRepository>>,
/// Path to the actual .git folder. /// Path to the actual .git folder.
/// Note: if .git is a file, this points to the folder indicated by the .git file /// Note: if .git is a file, this points to the folder indicated by the .git file
@ -830,7 +830,7 @@ impl LocalWorktree {
old_repos.next(); old_repos.next();
} }
Ordering::Equal => { Ordering::Equal => {
if old_repo.scan_id != new_repo.scan_id { if old_repo.git_dir_scan_id != new_repo.git_dir_scan_id {
if let Some(entry) = self.entry_for_id(**new_entry_id) { if let Some(entry) = self.entry_for_id(**new_entry_id) {
diff.insert(entry.path.clone(), (*new_repo).clone()); diff.insert(entry.path.clone(), (*new_repo).clone());
} }
@ -2006,7 +2006,7 @@ impl LocalSnapshot {
work_dir_id, work_dir_id,
LocalRepositoryEntry { LocalRepositoryEntry {
scan_id, scan_id,
full_scan_id: scan_id, git_dir_scan_id: scan_id,
repo_ptr: repo, repo_ptr: repo,
git_dir_path: parent_path.clone(), git_dir_path: parent_path.clone(),
}, },
@ -3166,7 +3166,7 @@ impl BackgroundScanner {
snapshot.build_repo(dot_git_dir.into(), fs); snapshot.build_repo(dot_git_dir.into(), fs);
return None; return None;
}; };
if repo.full_scan_id == scan_id { if repo.git_dir_scan_id == scan_id {
return None; return None;
} }
(*entry_id, repo.repo_ptr.to_owned()) (*entry_id, repo.repo_ptr.to_owned())
@ -3183,7 +3183,7 @@ impl BackgroundScanner {
snapshot.git_repositories.update(&entry_id, |entry| { snapshot.git_repositories.update(&entry_id, |entry| {
entry.scan_id = scan_id; entry.scan_id = scan_id;
entry.full_scan_id = scan_id; entry.git_dir_scan_id = scan_id;
}); });
snapshot.repository_entries.update(&work_dir, |entry| { snapshot.repository_entries.update(&work_dir, |entry| {
@ -3212,7 +3212,7 @@ impl BackgroundScanner {
let local_repo = snapshot.get_local_repo(&repo)?.to_owned(); let local_repo = snapshot.get_local_repo(&repo)?.to_owned();
// Short circuit if we've already scanned everything // Short circuit if we've already scanned everything
if local_repo.full_scan_id == scan_id { if local_repo.git_dir_scan_id == scan_id {
return None; return None;
} }