Skip to content

Commit

Permalink
Fix the worktree's repository_for_path (cherry-pick #24279) (#24292)
Browse files Browse the repository at this point in the history
Cherry-picked Fix the worktree's repository_for_path (#24279)

Go back to a less optimized implementation for now since the custom
cursor target seems to have some bugs.

Release Notes:

- Fixed missing git blame and status output in some projects with
multiple git repositories

Co-authored-by: Cole Miller <cole@zed.dev>
  • Loading branch information
gcp-cherry-pick-bot[bot] and cole-miller authored Feb 5, 2025
1 parent 9f825ca commit 0542019
Showing 1 changed file with 4 additions and 23 deletions.
27 changes: 4 additions & 23 deletions crates/worktree/src/worktree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2665,21 +2665,10 @@ impl Snapshot {

/// Get the repository whose work directory contains the given path.
pub fn repository_for_path(&self, path: &Path) -> Option<&RepositoryEntry> {
let mut cursor = self.repositories.cursor::<PathProgress>(&());
let mut repository = None;

// Git repositories may contain other git repositories. As a side effect of
// lexicographic sorting by path, deeper repositories will be after higher repositories
// So, let's loop through every matching repository until we can't find any more to find
// the deepest repository that could contain this path.
while cursor.seek_forward(&PathTarget::Contains(path), Bias::Left, &())
&& cursor.item().is_some()
{
repository = cursor.item();
cursor.next(&());
}

repository
self.repositories
.iter()
.filter(|repo| repo.work_directory.directory_contains(path))
.last()
}

/// Given an ordered iterator of entries, returns an iterator of those entries,
Expand Down Expand Up @@ -5965,7 +5954,6 @@ impl<'a> Iterator for Traversal<'a> {
enum PathTarget<'a> {
Path(&'a Path),
Successor(&'a Path),
Contains(&'a Path),
}

impl<'a> PathTarget<'a> {
Expand All @@ -5979,13 +5967,6 @@ impl<'a> PathTarget<'a> {
Ordering::Equal
}
}
PathTarget::Contains(path) => {
if path.starts_with(other) {
Ordering::Equal
} else {
Ordering::Greater
}
}
}
}
}
Expand Down

0 comments on commit 0542019

Please sign in to comment.