zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-19 18:41:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Only fetch statuses for changed paths

Browse Source
This commit is contained in:
Max Brunsfeld 2023-07-21 17:08:31 -07:00
parent 05b161118c
commit ff0864026e
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/fs/src/repository.rs
View File

@ -27,7 +27,7 @@ pub trait GitRepository: Send {
fn reload_index(&self); fn reload_index(&self);
fn load_index_text(&self, relative_file_path: &Path) -> Option<String>; fn load_index_text(&self, relative_file_path: &Path) -> Option<String>;
fn branch_name(&self) -> Option<String>; fn branch_name(&self) -> Option<String>;
fn statuses(&self) -> TreeMap<RepoPath, GitFileStatus>; fn statuses(&self, path_prefix: &Path) -> TreeMap<RepoPath, GitFileStatus>;
fn status(&self, path: &RepoPath) -> Result<Option<GitFileStatus>>; fn status(&self, path: &RepoPath) -> Result<Option<GitFileStatus>>;
fn branches(&self) -> Result<Vec<Branch>>; fn branches(&self) -> Result<Vec<Branch>>;
fn change_branch(&self, _: &str) -> Result<()>; fn change_branch(&self, _: &str) -> Result<()>;
@ -78,9 +78,11 @@ impl GitRepository for LibGitRepository {
Some(branch.to_string()) Some(branch.to_string())
} }
fn statuses(&self) -> TreeMap<RepoPath, GitFileStatus> { fn statuses(&self, path_prefix: &Path) -> TreeMap<RepoPath, GitFileStatus> {
let mut map = TreeMap::default(); let mut map = TreeMap::default();
if let Some(statuses) = self.statuses(None).log_err() { let mut options = git2::StatusOptions::new();
options.pathspec(path_prefix);
if let Some(statuses) = self.statuses(Some(&mut options)).log_err() {
for status in statuses for status in statuses
.iter() .iter()
.filter(|status| !status.status().contains(git2::Status::IGNORED)) .filter(|status| !status.status().contains(git2::Status::IGNORED))
@ -201,12 +203,14 @@ impl GitRepository for FakeGitRepository {
state.branch_name.clone() state.branch_name.clone()
} }
fn statuses(&self) -> TreeMap<RepoPath, GitFileStatus> { fn statuses(&self, path_prefix: &Path) -> TreeMap<RepoPath, GitFileStatus> {
let mut map = TreeMap::default(); let mut map = TreeMap::default();
let state = self.state.lock(); let state = self.state.lock();
for (repo_path, status) in state.worktree_statuses.iter() { for (repo_path, status) in state.worktree_statuses.iter() {
if repo_path.0.starts_with(path_prefix) {
map.insert(repo_path.to_owned(), status.to_owned()); map.insert(repo_path.to_owned(), status.to_owned());
} }
}
map map
} }

9
crates/project/src/worktree.rs
View File

@ -2165,7 +2165,10 @@ impl BackgroundScannerState {
let mut containing_repository = None; let mut containing_repository = None;
if !ignore_stack.is_all() { if !ignore_stack.is_all() {
if let Some((workdir_path, repo)) = self.snapshot.local_repo_for_path(&path) { if let Some((workdir_path, repo)) = self.snapshot.local_repo_for_path(&path) {
containing_repository = Some((workdir_path, repo.repo_ptr.lock().statuses())); if let Ok(repo_path) = path.strip_prefix(&workdir_path.0) {
containing_repository =
Some((workdir_path, repo.repo_ptr.lock().statuses(repo_path)));
}
} }
} }
if !ancestor_inodes.contains(&entry.inode) { if !ancestor_inodes.contains(&entry.inode) {
@ -2357,7 +2360,7 @@ impl BackgroundScannerState {
.repository_entries .repository_entries
.update(&work_dir, |entry| entry.branch = branch.map(Into::into)); .update(&work_dir, |entry| entry.branch = branch.map(Into::into));
let statuses = repository.statuses(); let statuses = repository.statuses(Path::new(""));
self.update_git_statuses(&work_dir, &statuses); self.update_git_statuses(&work_dir, &statuses);
} }
} }
@ -2415,7 +2418,7 @@ impl BackgroundScannerState {
}, },
); );
let statuses = repo_lock.statuses(); let statuses = repo_lock.statuses(Path::new(""));
self.update_git_statuses(&work_directory, &statuses); self.update_git_statuses(&work_directory, &statuses);
drop(repo_lock); drop(repo_lock);