History

Merge pull request #1591 from EliahKagan/run-ci/deps-via-worktree

In gix-testtools, use `ignore` and `index` via `gix_worktree`

Sebastian Thiel committed 2 years ago

Commit c485a2b2 parents 7c2af44 f7f24e53 files · +3 −8Browse files

Unified · Split

3 files
  1. Cargo.lock +0 −2
  2. tests/tools/Cargo.toml +0 −3
  3. tests/tools/src/lib.rs +3 −3
Cargo.lock+0−2
@@ -2577,8 +2577,6 @@ dependencies = [ · 2576 unmodified lines
2577 "fs_extra",2577 "fs_extra",
2578 "gix-discover 0.32.0",2578 "gix-discover 0.32.0",
2579 "gix-fs 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",2579 "gix-fs 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)",
2580 "gix-ignore 0.11.4 (registry+https://github.com/rust-lang/crates.io-index)",
2581 "gix-index 0.33.1",
2582 "gix-lock 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",2580 "gix-lock 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
2583 "gix-tempfile 14.0.2 (registry+https://github.com/rust-lang/crates.io-index)",2581 "gix-tempfile 14.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
2584 "gix-worktree 0.34.1",2582 "gix-worktree 0.34.1",
tests/tools/Cargo.toml+0−3
@@ -27,9 +27,6 @@ xz = ["dep:xz2"] · 26 unmodified lines
27[dependencies]27[dependencies]
28gix-lock = "14.0.0"28gix-lock = "14.0.0"
29gix-discover = "0.32.0"29gix-discover = "0.32.0"
30# TODO(ST) remove once `gix-worktree` exports `index`.
31gix-ignore = "0.11.2"
32gix-index = "0.33.0"
33gix-worktree = "0.34.0"30gix-worktree = "0.34.0"
34gix-fs = "0.11"31gix-fs = "0.11"
35gix-tempfile = { version = "^14.0.0", default-features = false, features = ["signals"] }32gix-tempfile = { version = "^14.0.0", default-features = false, features = ["signals"] }
tests/tools/src/lib.rs+3−3
@@ -67,11 +67,11 @@ static EXCLUDE_LUT: Lazy<Mutex<Option<gix_worktree::Stack>>> = Lazy::new(|| { · 66 unmodified lines
67 let mut buf = Vec::with_capacity(512);67 let mut buf = Vec::with_capacity(512);
68 let case = gix_fs::Capabilities::probe(&work_tree)68 let case = gix_fs::Capabilities::probe(&work_tree)
69 .ignore_case69 .ignore_case
70 .then_some(gix_ignore::glob::pattern::Case::Fold)70 .then_some(gix_worktree::ignore::glob::pattern::Case::Fold)
71 .unwrap_or_default();71 .unwrap_or_default();
72 let state = gix_worktree::stack::State::IgnoreStack(gix_worktree::stack::state::Ignore::new(72 let state = gix_worktree::stack::State::IgnoreStack(gix_worktree::stack::state::Ignore::new(
73 Default::default(),73 Default::default(),
74 gix_ignore::Search::from_git_dir(&gix_dir, None, &mut buf).ok()?,74 gix_worktree::ignore::Search::from_git_dir(&gix_dir, None, &mut buf).ok()?,
75 None,75 None,
76 gix_worktree::stack::state::ignore::Source::WorktreeThenIdMappingIfNotSkipped,76 gix_worktree::stack::state::ignore::Source::WorktreeThenIdMappingIfNotSkipped,
77 ));77 ));
@@ -707,7 +707,7 @@ fn is_excluded(archive: &Path) -> bool { · 629 unmodified lines
707 cache707 cache
708 .at_path(708 .at_path(
709 relative_path,709 relative_path,
710 Some(gix_index::entry::Mode::FILE),710 Some(gix_worktree::index::entry::Mode::FILE),
711 &gix_worktree::object::find::Never,711 &gix_worktree::object::find::Never,
712 )712 )
713 .ok()?713 .ok()?