mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-27 19:02:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fixed ci

Browse source
This commit is contained in:
Mikayla Maki 2023-06-07 16:58:55 -07:00
parent 8ca1a7d43d
commit fc1f8c5657
No known key found for this signature in database
1 changed files with 26 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5410,33 +5410,31 @@ mod tests {
], ],
); );
panic!(); check_propagated_statuses(
&snapshot,
&[
(Path::new("a/b"), Some(GitFileStatus::Added)),
(Path::new("a/b/c1.txt"), Some(GitFileStatus::Added)),
(Path::new("a/b/c2.txt"), None),
(Path::new("a/d"), Some(GitFileStatus::Modified)),
(Path::new("a/d/e1.txt"), None),
(Path::new("a/d/e2.txt"), Some(GitFileStatus::Modified)),
(Path::new("f"), None),
(Path::new("f/no-status.txt"), None),
(Path::new("g"), Some(GitFileStatus::Conflict)),
],
);
// check_propagated_statuses( check_propagated_statuses(
// &snapshot, &snapshot,
// &[ &[
// (Path::new("a/b"), Some(GitFileStatus::Added)), (Path::new("a/b/c1.txt"), Some(GitFileStatus::Added)),
// (Path::new("a/b/c1.txt"), Some(GitFileStatus::Added)), (Path::new("a/b/c2.txt"), None),
// (Path::new("a/b/c2.txt"), None), (Path::new("a/d/e1.txt"), None),
// (Path::new("a/d"), Some(GitFileStatus::Modified)), (Path::new("a/d/e2.txt"), Some(GitFileStatus::Modified)),
// (Path::new("a/d/e1.txt"), None), (Path::new("f/no-status.txt"), None),
// (Path::new("a/d/e2.txt"), Some(GitFileStatus::Modified)), ],
// (Path::new("f"), None), );
// (Path::new("f/no-status.txt"), None),
// (Path::new("g"), Some(GitFileStatus::Conflict)),
// ],
// );
// check_propagated_statuses(
// &snapshot,
// &[
// (Path::new("a/b/c1.txt"), Some(GitFileStatus::Added)),
// (Path::new("a/b/c2.txt"), None),
// (Path::new("a/d/e1.txt"), None),
// (Path::new("a/d/e2.txt"), Some(GitFileStatus::Modified)),
// (Path::new("f/no-status.txt"), None),
// ],
// );
#[track_caller] #[track_caller]
fn check_propagated_statuses( fn check_propagated_statuses(
@ -5447,14 +5445,12 @@ mod tests {
.iter() .iter()
.map(|(path, _)| snapshot.entry_for_path(path).unwrap().clone()) .map(|(path, _)| snapshot.entry_for_path(path).unwrap().clone())
.collect::<Vec<_>>(); .collect::<Vec<_>>();
dbg!(&entries);
snapshot.propagate_git_statuses(&mut entries); snapshot.propagate_git_statuses(&mut entries);
dbg!(&entries);
assert_eq!( assert_eq!(
dbg!(entries entries
.iter() .iter()
.map(|e| (e.path.as_ref(), e.git_status)) .map(|e| (e.path.as_ref(), e.git_status))
.collect::<Vec<_>>()), .collect::<Vec<_>>(),
expected_statuses expected_statuses
); );
} }