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

Removed scan ID from repository interfaces

Browse source 
co-authored-by: Max <max@zed.dev>
This commit is contained in:
Mikayla Maki 2023-05-05 16:33:21 -07:00
parent 270147d20c
commit d8dac07408
No known key found for this signature in database
5 changed files with 172 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/project/src/project.rs
View file

@ -4697,7 +4697,7 @@ impl Project {
fn update_local_worktree_buffers_git_repos(
&mut self,
worktree_handle: ModelHandle<Worktree>,
repos: &Vec<RepositoryEntry>,
repos: &HashMap<Arc<Path>, LocalRepositoryEntry>,
cx: &mut ModelContext<Self>,
) {
debug_assert!(worktree_handle.read(cx).is_local());
@ -4715,15 +4715,16 @@ impl Project {
let path = file.path().clone();
let worktree = worktree_handle.read(cx);
let repo = match repos
let (work_directory, repo) = match repos
.iter()
.find(|repository| repository.work_directory.contains(worktree, &path))
.find(|(work_directory, _)| path.starts_with(work_directory))
{
Some(repo) => repo.clone(),
None => return,
};
let relative_repo = match repo.work_directory.relativize(worktree, &path) {
let relative_repo = match path.strip_prefix(work_directory).log_err() {
Some(relative_repo) => relative_repo.to_owned(),
None => return,
};
@ -4732,12 +4733,10 @@ impl Project {
let remote_id = self.remote_id();
let client = self.client.clone();
let diff_base_task = worktree_handle.update(cx, move |worktree, cx| {
worktree
.as_local()
.unwrap()
.load_index_text(repo, relative_repo, cx)
});
let git_ptr = repo.repo_ptr.clone();
let diff_base_task = cx
.background()
.spawn(async move { git_ptr.lock().load_index_text(&relative_repo) });
cx.spawn(|_, mut cx| async move {
let diff_base = diff_base_task.await;