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

Directly parse .git when it's a file instead of using libgit2 (#27885)

Browse source 
Avoids building a whole git2 repository object at the worktree layer
just to watch some additional paths.

- [x] Tidy up names of the various paths
- [x] Tests for worktrees and submodules

Release Notes:

- N/A
This commit is contained in:
Cole Miller 2025-04-11 20:35:14 -04:00 • committed by GitHub
parent 429d4580cf
commit 055df30757
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 401 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

33
crates/project/src/git_store.rs
View file

@ -61,7 +61,8 @@ use sum_tree::{Edit, SumTree, TreeSet};
use text::{Bias, BufferId};
use util::{ResultExt, debug_panic, post_inc};
use worktree::{
File, PathKey, PathProgress, PathSummary, PathTarget, UpdatedGitRepositoriesSet, Worktree,
File, PathKey, PathProgress, PathSummary, PathTarget, UpdatedGitRepositoriesSet,
UpdatedGitRepository, Worktree,
};
pub struct GitStore {
@ -1144,18 +1145,23 @@ impl GitStore {
} else {
removed_ids.push(*id);
}
} else if let Some((work_directory_abs_path, dot_git_abs_path)) = update
.new_work_directory_abs_path
.clone()
.zip(update.dot_git_abs_path.clone())
} else if let UpdatedGitRepository {
new_work_directory_abs_path: Some(work_directory_abs_path),
dot_git_abs_path: Some(dot_git_abs_path),
repository_dir_abs_path: Some(repository_dir_abs_path),
common_dir_abs_path: Some(common_dir_abs_path),
..
} = update
{
let id = RepositoryId(next_repository_id.fetch_add(1, atomic::Ordering::Release));
let git_store = cx.weak_entity();
let repo = cx.new(|cx| {
let mut repo = Repository::local(
id,
work_directory_abs_path,
dot_git_abs_path,
work_directory_abs_path.clone(),
dot_git_abs_path.clone(),
repository_dir_abs_path.clone(),
common_dir_abs_path.clone(),
project_environment.downgrade(),
fs.clone(),
git_store,
@ -2542,6 +2548,8 @@ impl Repository {
id: RepositoryId,
work_directory_abs_path: Arc<Path>,
dot_git_abs_path: Arc<Path>,
repository_dir_abs_path: Arc<Path>,
common_dir_abs_path: Arc<Path>,
project_environment: WeakEntity<ProjectEnvironment>,
fs: Arc<dyn Fs>,
git_store: WeakEntity<GitStore>,
@ -2559,6 +2567,8 @@ impl Repository {
job_sender: Repository::spawn_local_git_worker(
work_directory_abs_path,
dot_git_abs_path,
repository_dir_abs_path,
common_dir_abs_path,
project_environment,
fs,
cx,
@ -3836,6 +3846,8 @@ impl Repository {
fn spawn_local_git_worker(
work_directory_abs_path: Arc<Path>,
dot_git_abs_path: Arc<Path>,
repository_dir_abs_path: Arc<Path>,
common_dir_abs_path: Arc<Path>,
project_environment: WeakEntity<ProjectEnvironment>,
fs: Arc<dyn Fs>,
cx: &mut Context<Self>,
@ -3861,6 +3873,9 @@ impl Repository {
})
.await?;
debug_assert_eq!(backend.path().as_path(), repository_dir_abs_path.as_ref());
debug_assert_eq!(backend.main_repository_path().as_path(), common_dir_abs_path.as_ref());
if let Some(git_hosting_provider_registry) =
cx.update(|cx| GitHostingProviderRegistry::try_global(cx))?
{
@ -4092,6 +4107,10 @@ impl Repository {
pub fn current_job(&self) -> Option<JobInfo> {
self.active_jobs.values().next().cloned()
}
pub fn barrier(&mut self) -> oneshot::Receiver<()> {
self.send_job(None, |_, _| async {})
}
}
fn get_permalink_in_rust_registry_src(