cleanup path classificaiton after fixes in `gix-pathspec`

Sebastian Thiel committed 2 years ago

Commit 44a2e001 parent 5b475672 files · +17 −23Browse files

Unified · Split

2 files

gix-dir/src/walk/classify.rs +4 −14
gix-dir/tests/walk/mod.rs +13 −9

@@ -21,13 +21,7 @@ pub fn root( · 20 unmodified lines
21	21	let mut path_buf = worktree_root.to_owned();
22	22	// These initial values kick in if worktree_relative_root.is_empty();
23	23	let file_kind = path_buf.symlink_metadata().map(\|m\| m.file_type().into()).ok();
24		− let pathspec_orig = std::mem::replace(
25		− ctx.pathspec,
26		− gix_pathspec::Search::from_specs(None, None, "".as_ref()).expect("empty is valid"),
27		− );
28		− let res = path(&mut path_buf, buf, 0, file_kind, \|\| None, options, ctx);
29		− *ctx.pathspec = pathspec_orig;
30		− let mut out = res?;
	24	+ let mut out = path(&mut path_buf, buf, 0, file_kind, \|\| None, options, ctx)?;
31	25	let worktree_root_is_repository = out
32	26	.disk_kind
33	27	.map_or(false, \|kind\| matches!(kind, entry::Kind::Repository));
@@ -59,9 +53,6 @@ pub fn root( · 25 unmodified lines
59	53	}
60	54	last_length = Some(buf.len());
61	55	}
62		− if out.pathspec_match.is_none() {
63		− out.pathspec_match = Some(PathspecMatch::Always);
64		− }
65	56	Ok((out, worktree_root_is_repository))
66	57	}
67	58	/// The product of [`path()`] calls.
@@ -181,10 +172,9 @@ pub fn path( · 113 unmodified lines
181	172	out.property = entry::Property::DotGit.into();
182	173	return Ok(out);
183	174	}
184		− let pathspec_could_match = rela_path.is_empty()
185		− \|\| ctx
186		− .pathspec
187		− .can_match_relative_path(rela_path.as_bstr(), disk_kind.map(\|ft\| ft.is_dir()));
	175	+ let pathspec_could_match = ctx
	176	+ .pathspec
	177	+ .can_match_relative_path(rela_path.as_bstr(), disk_kind.map(\|ft\| ft.is_dir()));
188	178	if !pathspec_could_match {
189	179	return Ok(out.with_status(entry::Status::Pruned));
190	180	}

gix-dir/tests/walk/mod.rs+13−9

@@ -2732,7 +2732,7 @@ fn worktree_root_can_be_symlink() -> crate::Result { · 2731 unmodified lines
2732	2732	#[test]
2733	2733	fn root_may_not_go_through_dot_git() -> crate::Result {
2734	2734	let root = fixture("with-nested-dot-git");
2735		− for (dir, expected_pathspec) in [("", Verbatim), ("subdir", Always)] {
	2735	+ for (dir, expected_pathspec) in [("", Some(Verbatim)), ("subdir", None)] {
2736	2736	let troot = root.join("dir").join(".git").join(dir);
2737	2737	let ((out, _root), entries) = collect(&root, Some(&troot), \|keep, ctx\| {
2738	2738	walk(&root, ctx, options_emit_all(), keep)
@@ -2747,9 +2747,11 @@ fn root_may_not_go_through_dot_git() -> crate::Result { · 8 unmodified lines
2747	2747	);
2748	2748	assert_eq!(
2749	2749	entries,
2750		− [entry("dir/.git", Pruned, Directory)
2751		− .with_property(DotGit)
2752		− .with_match(expected_pathspec)],
	2750	+ [{
	2751	+ let mut e = entry("dir/.git", Pruned, Directory).with_property(DotGit);
	2752	+ e.0.pathspec_match = expected_pathspec;
	2753	+ e
	2754	+ }],
2753	2755	"{dir}: no traversal happened as root passes though .git"
2754	2756	);
2755	2757	}
@@ -3165,7 +3167,7 @@ fn root_can_be_pruned_early_with_pathspec() -> crate::Result { · 409 unmodified lines
3165	3167
3166	3168	assert_eq!(
3167	3169	entries,
3168		− [entry("dir", Pruned, Directory)],
	3170	+ [entry_nomatch("dir", Pruned, Directory)],
3169	3171	"the pathspec didn't match the root, early abort"
3170	3172	);
3171	3173	Ok(())
@@ -3927,7 +3929,7 @@ fn untracked_and_ignored_collapse_mix() { · 755 unmodified lines
3927	3929	#[test]
3928	3930	fn root_cannot_pass_through_case_altered_capital_dot_git_if_case_insensitive() -> crate::Result {
3929	3931	let root = fixture("with-nested-capitalized-dot-git");
3930		− for (dir, expected_pathspec) in [("", Verbatim), ("subdir", Always)] {
	3932	+ for (dir, expected_pathspec) in [("", Some(Verbatim)), ("subdir", None)] {
3931	3933	let troot = root.join("dir").join(".GIT").join(dir);
3932	3934	let ((out, _root), entries) = collect(&root, Some(&troot), \|keep, ctx\| {
3933	3935	walk(
@@ -3950,9 +3952,11 @@ fn root_cannot_pass_through_case_altered_capital_dot_git_if_case_insensitive() - · 16 unmodified lines
3950	3952	);
3951	3953	assert_eq!(
3952	3954	entries,
3953		− [entry("dir/.GIT", Pruned, Directory)
3954		− .with_property(DotGit)
3955		− .with_match(expected_pathspec)],
	3955	+ [{
	3956	+ let mut e = entry("dir/.GIT", Pruned, Directory).with_property(DotGit);
	3957	+ e.0.pathspec_match = expected_pathspec;
	3958	+ e
	3959	+ }],
3956	3960	"{dir}: no traversal happened as root passes though .git, it compares in a case-insensitive fashion"
3957	3961	);
3958	3962	}