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

Wire in the branch name

Browse source
This commit is contained in:
Mikayla Maki 2023-05-03 08:51:58 -07:00
parent 5b4e58d1de
commit 26afd592c5
No known key found for this signature in database
2 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -125,7 +125,7 @@ pub struct RepositoryEntry {
pub(crate) git_dir_entry_id: ProjectEntryId,
pub(crate) work_directory: RepositoryWorkDirectory,
pub(crate) scan_id: usize,
// TODO: pub(crate) head_ref: Arc<str>,
pub(crate) branch: Option<Arc<str>>,
}
impl RepositoryEntry {
@ -1687,6 +1687,7 @@ impl LocalSnapshot {
git_dir_entry_id: parent_entry.id,
work_directory: key,
scan_id: 0,
branch: None,
},
);
@ -2678,11 +2679,14 @@ impl BackgroundScanner {
let repo_with_path_in_dotgit = snapshot.repo_for_metadata(&path);
if let Some((key, repo)) = repo_with_path_in_dotgit {
repo.lock().reload_index();
let repo = repo.lock();
repo.reload_index();
let branch = repo.branch_name();
snapshot
.repository_entries
.update(&key, |entry| entry.scan_id = scan_id);
snapshot.repository_entries.update(&key, |entry| {
entry.scan_id = scan_id;
entry.branch = branch.map(Into::into)
});
}
if let Some(scan_queue_tx) = &scan_queue_tx {
@ -3514,6 +3518,7 @@ mod tests {
work_directory: RepositoryWorkDirectory(
Path::new(&format!("don't-care-{}", scan_id)).into(),
),
branch: None,
}
}