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

WIP: Refactor existing git code to use new representation.

Browse source 
co-authored-by: petros <petros@zed.dev>
This commit is contained in:
Mikayla Maki 2023-05-02 10:22:47 -07:00
parent 563f13925f
commit bcf608e9e9
No known key found for this signature in database
2 changed files with 117 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -64,7 +64,7 @@ use std::{
},
time::{Duration, Instant, SystemTime},
};
use sum_tree::TreeMap;
use terminals::Terminals;
use util::{debug_panic, defer, merge_json_value_into, post_inc, ResultExt, TryFutureExt as _};
@ -4697,7 +4697,7 @@ impl Project {
fn update_local_worktree_buffers_git_repos(
&mut self,
worktree: ModelHandle<Worktree>,
repos: &TreeMap<RepositoryWorkDirectory, RepositoryEntry>,
repos: &Vec<RepositoryEntry>,
cx: &mut ModelContext<Self>,
) {
for (_, buffer) in &self.opened_buffers {
@ -4712,27 +4712,30 @@ impl Project {
let path = file.path().clone();
let (work_directory, repo) = match repos
let repo = match repos
.iter()
.find(|(work_directory, _)| work_directory.contains(&path))
.find(|entry| entry.work_directory.contains(&path))
{
Some((work_directory, repo)) => (work_directory, repo.clone()),
Some(repo) => repo.clone(),
None => return,
};
let relative_repo = match work_directory.relativize(&path) {
let relative_repo = match repo.work_directory.relativize(&path) {
Some(relative_repo) => relative_repo.to_owned(),
None => return,
};
let remote_id = self.remote_id();
let client = self.client.clone();
let diff_base_task = worktree.update(cx, move |worktree, cx| {
worktree
.as_local()
.unwrap()
.load_index_text(repo, relative_repo, cx)
});
cx.spawn(|_, mut cx| async move {
let diff_base = cx
.background()
.spawn(async move { repo.repo.lock().load_index_text(&relative_repo) })
.await;
let diff_base = diff_base_task.await;
let buffer_id = buffer.update(&mut cx, |buffer, cx| {
buffer.set_diff_base(diff_base.clone(), cx);