Merge branch 'worktree-organization'

Sebastian Thiel committed 3 years ago

Commit 8d0d8e02 parents ef54aab e5717e193 files · +424 −252Browse files

Unified · Split

93 files

Cargo.lock +38 −4
Cargo.toml +2 −0
README.md +2 −0
crate-status.md +28 −20
etc/gix-components.monopic +0 −0
etc/gix-components.txt +3 −0
gitoxide-core/src/hours/core.rs +2 −2
gitoxide-core/src/index/checkout.rs +4 −4
gitoxide-core/src/repository/attributes/query.rs +4 −4
gitoxide-core/src/repository/clone.rs +1 −1
gitoxide-core/src/repository/index/entries.rs +7 −7
gix-archive/tests/archive.rs +5 −5
gix-diff/Cargo.toml +11 −1
gix-diff/src/lib.rs +7 −0
gix-filter/tests/pipeline/mod.rs +8 −8
gix-status/CHANGELOG.md +0 −0
gix-status/Cargo.toml +37 −0
gix-status/LICENSE-APACHE +1 −0
gix-status/LICENSE-MIT +1 −0
gix-status/src/index_as_worktree/content.rs +0 −0
gix-status/src/index_as_worktree/function.rs +3 −3
gix-status/src/index_as_worktree/mod.rs +0 −0
gix-status/src/index_as_worktree/recorder.rs +1 −1
gix-status/src/index_as_worktree/types.rs +2 −2
gix-status/src/lib.rs +15 −0
gix-status/src/read.rs +1 −2
gix-status/tests/fixtures/generated-archives/.gitignore +2 −0
gix-status/tests/fixtures/generated-archives/racy_git.tar.xz +3 −0
gix-status/tests/fixtures/generated-archives/status_conflict.tar.xz +3 −0
gix-status/tests/fixtures/generated-archives/status_intent_to_add.tar.xz +3 −0
gix-status/tests/fixtures/generated-archives/status_removed.tar.xz +3 −0
gix-status/tests/fixtures/racy_git.sh +0 −0
gix-status/tests/fixtures/status_changed.sh +0 −0
gix-status/tests/fixtures/status_conflict.sh +0 −0
gix-status/tests/fixtures/status_intent_to_add.sh +0 −0
gix-status/tests/fixtures/status_removed.sh +0 −0
gix-status/tests/fixtures/status_unchanged.sh +0 −0
gix-status/tests/status-multi-threaded.rs +4 −0
gix-status/tests/status-single-threaded.rs +4 −0
gix-status/tests/status/index_as_worktree.rs +6 −6
gix-status/tests/status/mod.rs +7 −0
gix-worktree-state/Cargo.toml +44 −0
gix-worktree-state/LICENSE-APACHE +1 −0
gix-worktree-state/LICENSE-MIT +1 −0
gix-worktree-state/src/checkout/chunk.rs +3 −2
gix-worktree-state/src/checkout/entry.rs +2 −2
gix-worktree-state/src/checkout/function.rs +4 −3
gix-worktree-state/src/checkout/mod.rs +1 −1
gix-worktree-state/src/lib.rs +6 −0
gix-worktree-state/tests/fixtures/generated-archives/.gitignore +5 −0
gix-worktree-state/tests/fixtures/generated-archives/make_ignorecase_collisions.tar.xz +0 −0
gix-worktree-state/tests/fixtures/make_dangerous_symlink.sh +0 −0
gix-worktree-state/tests/fixtures/make_ignorecase_collisions.sh +0 −0
gix-worktree-state/tests/fixtures/make_mixed_without_submodules.sh +0 −0
gix-worktree-state/tests/fixtures/make_mixed_without_submodules_and_symlinks.sh +0 −0
gix-worktree-state/tests/state-multi-threaded.rs +4 −0
gix-worktree-state/tests/state-single-threaded.rs +4 −0
gix-worktree-state/tests/state/checkout.rs +10 −10
gix-worktree-state/tests/state/mod.rs +10 −0
gix-worktree-stream/tests/stream.rs +5 −5
gix-worktree/Cargo.toml +1 −9
gix-worktree/src/lib.rs +5 −14
gix-worktree/src/stack/delegate.rs +1 −1
gix-worktree/src/stack/mod.rs +10 −10
gix-worktree/src/stack/platform.rs +1 −1
gix-worktree/src/stack/state/attributes.rs +5 −5
gix-worktree/src/stack/state/ignore.rs +2 −2
gix-worktree/src/stack/state/mod.rs +1 −1
gix-worktree/src/untracked.rs +0 −1
gix-worktree/tests/fixtures/generated-archives/.gitignore +0 −5
gix-worktree/tests/fixtures/generated-archives/make_special_exclude_case.tar.xz +2 −2
gix-worktree/tests/fixtures/generated-archives/racy_git.tar.xz +0 −3
gix-worktree/tests/fixtures/generated-archives/status_conflict.tar.xz +0 −3
gix-worktree/tests/fixtures/generated-archives/status_intent_to_add.tar.xz +0 −3
gix-worktree/tests/fixtures/generated-archives/status_removed.tar.xz +0 −3
gix-worktree/tests/fixtures/make_ignore_setup.sh +0 −18
gix-worktree/tests/worktree/mod.rs +2 −10
gix-worktree/tests/worktree/stack/attributes.rs +4 −4
gix-worktree/tests/worktree/stack/create_directory.rs +9 −9
gix-worktree/tests/worktree/stack/ignore.rs +7 −7
gix-worktree/tests/worktree/stack/mod.rs +0 −0
gix/Cargo.toml +1 −0
gix/src/clone/checkout.rs +6 −5
gix/src/config/cache/access.rs +9 −9
gix/src/filter.rs +3 −3
gix/src/pathspec.rs +4 −4
gix/src/repository/attributes.rs +13 −13
gix/src/repository/filter.rs +2 −2
gix/src/repository/pathspec.rs +1 −1
gix/src/repository/worktree.rs +1 −1
gix/src/types.rs +1 −1
gix/src/worktree/mod.rs +8 −7
justfile +8 −3

  "gix-utils 0.1.5",
  "gix-validate 0.8.0",
  "gix-worktree 0.24.0",
+ "gix-worktree-state",
  "gix-worktree-stream",
  "is_ci",
  "log",
 name = "gix-diff"
 version = "0.34.0"
 dependencies = [
+ "document-features",
  "getrandom",
  "gix-hash 0.11.4",
  "gix-object 0.34.0",
 name = "gix-sequencer"
 version = "0.0.0"
+[[package]]
+name = "gix-status"
+version = "0.1.0"
+dependencies = [
+ "bstr",
+ "filetime",
+ "gix-features 0.32.1",
+ "gix-fs 0.4.1",
+ "gix-hash 0.11.4",
+ "gix-index 0.22.0",
+ "gix-object 0.34.0",
+ "gix-path 0.8.4",
+ "gix-testtools",
+ "thiserror",
+]
 [[package]]
 name = "gix-submodule"
 version = "0.1.0"
 dependencies = [
  "bstr",
  "document-features",
- "filetime",
  "gix-attributes 0.16.0",
  "gix-features 0.32.1",
- "gix-filter",
  "gix-fs 0.4.1",
  "gix-glob 0.10.2",
  "gix-hash 0.11.4",
  "gix-odb",
  "gix-path 0.8.4",
  "gix-testtools",
+ "serde",
+ "symlink",
+]
+[[package]]
+name = "gix-worktree-state"
+version = "0.1.0"
+dependencies = [
+ "bstr",
+ "gix-features 0.32.1",
+ "gix-filter",
+ "gix-fs 0.4.1",
+ "gix-glob 0.10.2",
+ "gix-hash 0.11.4",
+ "gix-index 0.22.0",
+ "gix-object 0.34.0",
+ "gix-odb",
+ "gix-path 0.8.4",
+ "gix-testtools",
+ "gix-worktree 0.24.0",
  "io-close",
  "once_cell",
- "serde",
  "symlink",
- "tempfile",
  "thiserror",
  "walkdir",
 ]

Cargo.toml+2−0

     "gix-index",
     "gix-bitmap",
     "gix-worktree",
+    "gix-worktree-state",
+    "gix-status",
     "gix-revision",
     "gix-packetline",
     "gix-packetline-blocking",

README.md+2−0

   * [gix-worktree-stream](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix-worktree-stream)
   * [gix-archive](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix-archive)
   * [gix-submodule](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix-submodule)
+  * [gix-status](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix-status)
+  * [gix-worktree-state](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix-worktree-state)
   * `gitoxide-core`
 * **very early**  _(possibly without any documentation and many rough edges)_
   * [gix-date](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix-date)

crate-status.md+28−20

@@ -453,28 +453,36 @@ Make it the best-performing implementation and the most convenient one. · 452 unmodified lines
453	### gix-glob	453	### gix-glob
454	* [x] parse pattern	454	* [x] parse pattern
455	* [x] a type for pattern matching of paths and non-paths, optionally case-insensitively.	455	* [x] a type for pattern matching of paths and non-paths, optionally case-insensitively.
456		456
457	### gix-worktree	457	### gix-status
		458	* [x] differences between index and worktree to turn index into worktree
		459	* [ ] differences between tree and index to turn tree into index
		460	* [ ] untracked files
		461	* [ ] fast answer to 'is it dirty'.
		462	*
		463	### gix-worktree-state
458	* handle the working tree/checkout	464	* handle the working tree/checkout
459	- [x] checkout an index of files, executables and symlinks just as fast as git	465	- [x] checkout an index of files, executables and symlinks just as fast as git
460	- [x] forbid symlinks in directories	466	- [x] forbid symlinks in directories
461	- [ ] handle submodules	467	- [ ] handle submodules
462	- [ ] handle sparse directories	468	- [ ] handle sparse directories
463	- [ ] handle sparse index	469	- [ ] handle sparse index
464	- [x] linear scaling with multi-threading up to IO saturation	470	- [x] linear scaling with multi-threading up to IO saturation
465	- supported attributes to affect working tree and index contents	471	- supported attributes to affect working tree and index contents
466	- [ ] eol	472	- [x] eol
467	- [ ] working-tree-encoding	473	- [x] working-tree-encoding
468	- …more	474	- …more
469	- filtering	475	- filtering
470	- [ ] `text`	476	- [x] `text`
471	- [ ] `ident`	477	- [x] `ident`
472	- [ ] filter processes	478	- [x] filter processes
473	- [ ] single-invocation clean/smudge filters	479	- [x] single-invocation clean/smudge filters
474	* manage multiple worktrees
475	* access to per-path information, like `.gitignore` and `.gitattributes` in a manner well suited for efficient lookups	480	* access to per-path information, like `.gitignore` and `.gitattributes` in a manner well suited for efficient lookups
476	* [x] _exclude_ information	481	* [x] _exclude_ information
477	* [ ] attributes	482	* [x] attributes
		483
		484	### gix-worktree
		485	* [x] A stack to to efficiently generate attribute lists for matching paths against.
478		486
479	### gix-revision	487	### gix-revision
480	* [x] `describe()` (similar to `git name-rev`)	488	* [x] `describe()` (similar to `git name-rev`)

etc/gix-components.monopic+0−0

Binary file not shown.

etc/gix-components.txt+3−0

@@ -0,0 +1,3 @@
	1	╔════════════════╗
	2	║ gix-submodule ║
	3	╚════════════════╝

gitoxide-core/src/hours/core.rs+2−2

@@ -101,8 +101,8 @@ pub fn spawn_tree_delta_threads<'scope>( · 100 unmodified lines
101	repo.index_or_load_from_head().map_err(Into::into).and_then(\|index\| {	101	repo.index_or_load_from_head().map_err(Into::into).and_then(\|index\| {
102	repo.attributes(	102	repo.attributes(
103	&index,	103	&index,
104	gix::worktree::cache::state::attributes::Source::IdMapping,	104	gix::worktree::stack::state::attributes::Source::IdMapping,
105	gix::worktree::cache::state::ignore::Source::IdMapping,	105	gix::worktree::stack::state::ignore::Source::IdMapping,
106	None,	106	None,
107	)	107	)
108	.map_err(Into::into)	108	.map_err(Into::into)

gitoxide-core/src/index/checkout.rs+4−4

@@ -4,7 +4,7 @@ use std::{ · 3 unmodified lines
4	};	4	};
5		5
6	use anyhow::bail;	6	use anyhow::bail;
7	use gix::{odb::FindExt, worktree::checkout, Progress};	7	use gix::{odb::FindExt, worktree::state::checkout, Progress};
8		8
9	use crate::{	9	use crate::{
10	index,	10	index,
@@ -55,7 +55,7 @@ pub fn checkout_exclusive( · 44 unmodified lines
55	progress.info(format!("Skipping {num_skipped} DIR/SYMLINK/COMMIT entries"));	55	progress.info(format!("Skipping {num_skipped} DIR/SYMLINK/COMMIT entries"));
56	}	56	}
57		57
58	let opts = gix::worktree::checkout::Options {	58	let opts = gix::worktree::state::checkout::Options {
59	fs: gix::fs::Capabilities::probe(dest_directory),	59	fs: gix::fs::Capabilities::probe(dest_directory),
60		60
61	destination_is_initially_empty: true,	61	destination_is_initially_empty: true,
@@ -86,7 +86,7 @@ pub fn checkout_exclusive( · 24 unmodified lines
86	delayed_paths_unknown,	86	delayed_paths_unknown,
87	delayed_paths_unprocessed,	87	delayed_paths_unprocessed,
88	} = match repo {	88	} = match repo {
89	Some(repo) => gix::worktree::checkout(	89	Some(repo) => gix::worktree::state::checkout(
90	&mut index,	90	&mut index,
91	dest_directory,	91	dest_directory,
92	{	92	{
@@ -109,7 +109,7 @@ pub fn checkout_exclusive( · 16 unmodified lines
109	should_interrupt,	109	should_interrupt,
110	opts,	110	opts,
111	),	111	),
112	None => gix::worktree::checkout(	112	None => gix::worktree::state::checkout(
113	&mut index,	113	&mut index,
114	dest_directory,	114	dest_directory,
115	\|_, buf\| {	115	\|_, buf\| {

gitoxide-core/src/repository/attributes/query.rs+4−4

@@ -89,16 +89,16 @@ pub(crate) mod function { · 88 unmodified lines
89		89
90	pub(crate) fn attributes_cache(	90	pub(crate) fn attributes_cache(
91	repo: &gix::Repository,	91	repo: &gix::Repository,
92	) -> anyhow::Result<(gix::worktree::Cache, IndexPersistedOrInMemory)> {	92	) -> anyhow::Result<(gix::worktree::Stack, IndexPersistedOrInMemory)> {
93	let index = repo.index_or_load_from_head()?;	93	let index = repo.index_or_load_from_head()?;
94	let cache = repo.attributes(	94	let cache = repo.attributes(
95	&index,	95	&index,
96	if repo.is_bare() {	96	if repo.is_bare() {
97	gix::worktree::cache::state::attributes::Source::IdMapping	97	gix::worktree::stack::state::attributes::Source::IdMapping
98	} else {	98	} else {
99	gix::worktree::cache::state::attributes::Source::WorktreeThenIdMapping	99	gix::worktree::stack::state::attributes::Source::WorktreeThenIdMapping
100	},	100	},
101	gix::worktree::cache::state::ignore::Source::IdMapping,	101	gix::worktree::stack::state::ignore::Source::IdMapping,
102	None,	102	None,
103	)?;	103	)?;
104	Ok((cache, index))	104	Ok((cache, index))

gitoxide-core/src/repository/clone.rs+1−1

@@ -111,7 +111,7 @@ pub(crate) mod function { · 110 unmodified lines
111	}	111	}
112	};	112	};
113		113
114	if let Some(gix::worktree::checkout::Outcome { collisions, errors, .. }) = outcome {	114	if let Some(gix::worktree::state::checkout::Outcome { collisions, errors, .. }) = outcome {
115	if !(collisions.is_empty() && errors.is_empty()) {	115	if !(collisions.is_empty() && errors.is_empty()) {
116	let mut messages = Vec::new();	116	let mut messages = Vec::new();
117	if !errors.is_empty() {	117	if !errors.is_empty() {

gitoxide-core/src/repository/index/entries.rs+7−7

@@ -56,22 +56,22 @@ pub(crate) mod function { · 55 unmodified lines
56	match attrs {	56	match attrs {
57	Attributes::WorktreeAndIndex => {	57	Attributes::WorktreeAndIndex => {
58	if repo.is_bare() {	58	if repo.is_bare() {
59	gix::worktree::cache::state::attributes::Source::IdMapping	59	gix::worktree::stack::state::attributes::Source::IdMapping
60	} else {	60	} else {
61	gix::worktree::cache::state::attributes::Source::WorktreeThenIdMapping	61	gix::worktree::stack::state::attributes::Source::WorktreeThenIdMapping
62	}	62	}
63	}	63	}
64	Attributes::Index => gix::worktree::cache::state::attributes::Source::IdMapping,	64	Attributes::Index => gix::worktree::stack::state::attributes::Source::IdMapping,
65	},	65	},
66	match attrs {	66	match attrs {
67	Attributes::WorktreeAndIndex => {	67	Attributes::WorktreeAndIndex => {
68	if repo.is_bare() {	68	if repo.is_bare() {
69	gix::worktree::cache::state::ignore::Source::IdMapping	69	gix::worktree::stack::state::ignore::Source::IdMapping
70	} else {	70	} else {
71	gix::worktree::cache::state::ignore::Source::WorktreeThenIdMappingIfNotSkipped	71	gix::worktree::stack::state::ignore::Source::WorktreeThenIdMappingIfNotSkipped
72	}	72	}
73	}	73	}
74	Attributes::Index => gix::worktree::cache::state::ignore::Source::IdMapping,	74	Attributes::Index => gix::worktree::stack::state::ignore::Source::IdMapping,
75	},	75	},
76	None,	76	None,
77	)	77	)
@@ -203,7 +203,7 @@ pub(crate) mod function { · 125 unmodified lines
203	pub excluded: usize,	203	pub excluded: usize,
204	pub with_attributes: usize,	204	pub with_attributes: usize,
205	pub max_attributes_per_path: usize,	205	pub max_attributes_per_path: usize,
206	pub cache: Option<gix::worktree::cache::Statistics>,	206	pub cache: Option<gix::worktree::stack::Statistics>,
207	}	207	}
208		208
209	#[cfg(feature = "serde")]	209	#[cfg(feature = "serde")]

gix-archive/tests/archive.rs+5−5

@@ -11,7 +11,7 @@ mod from_tree { · 10 unmodified lines
11	use gix_object::tree::EntryMode;	11	use gix_object::tree::EntryMode;
12	use gix_odb::FindExt;	12	use gix_odb::FindExt;
13	use gix_testtools::bstr::ByteSlice;	13	use gix_testtools::bstr::ByteSlice;
14	use gix_worktree::cache::state::attributes::Source;	14	use gix_worktree::stack::state::attributes::Source;
15		15
16	use crate::hex_to_id;	16	use crate::hex_to_id;
17		17
@@ -284,7 +284,7 @@ mod from_tree { · 266 unmodified lines
284	Ok(())	284	Ok(())
285	}	285	}
286		286
287	fn basic() -> gix_testtools::Result<(PathBuf, gix_hash::ObjectId, gix_odb::HandleArc, gix_worktree::Cache)> {	287	fn basic() -> gix_testtools::Result<(PathBuf, gix_hash::ObjectId, gix_odb::HandleArc, gix_worktree::Stack)> {
288	let dir = gix_testtools::scripted_fixture_read_only("basic.sh")?;	288	let dir = gix_testtools::scripted_fixture_read_only("basic.sh")?;
289		289
290	let head = {	290	let head = {
@@ -295,14 +295,14 @@ mod from_tree { · 4 unmodified lines
295		295
296	let mut collection = Default::default();	296	let mut collection = Default::default();
297	let mut buf = Default::default();	297	let mut buf = Default::default();
298	let attributes = gix_worktree::cache::state::Attributes::new(	298	let attributes = gix_worktree::stack::state::Attributes::new(
299	gix_attributes::Search::new_globals(None::<PathBuf>, &mut buf, &mut collection)?,	299	gix_attributes::Search::new_globals(None::<PathBuf>, &mut buf, &mut collection)?,
300	None,	300	None,
301	Source::WorktreeThenIdMapping,	301	Source::WorktreeThenIdMapping,
302	collection,	302	collection,
303	);	303	);
304	let state = gix_worktree::cache::State::AttributesStack(attributes);	304	let state = gix_worktree::stack::State::AttributesStack(attributes);
305	let cache = gix_worktree::Cache::new(&dir, state, Case::Sensitive, Default::default(), Default::default());	305	let cache = gix_worktree::Stack::new(&dir, state, Case::Sensitive, Default::default(), Default::default());
306	Ok((dir, head, odb.into_arc()?, cache))	306	Ok((dir, head, odb.into_arc()?, cache))
307	}	307	}
308		308

gix-diff/Cargo.toml+11−1

 autotests = false
 [features]
+default = ["blob"]
+## Enable diffing of blobs using imara-diff.
+blob = ["dep:imara-diff"]
 ## Data structures implement `serde::Serialize` and `serde::Deserialize`.
 serde = ["dep:serde", "gix-hash/serde", "gix-object/serde"]
 ## Make it possible to compile to the `wasm32-unknown-unknown` target.
 gix-hash = { version = "^0.11.4", path = "../gix-hash" }
 gix-object = { version = "^0.34.0", path = "../gix-object" }
 thiserror = "1.0.32"
-imara-diff = "0.1.3"
+imara-diff = { version = "0.1.3", optional = true }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
 getrandom = { version = "0.2.8", optional = true, default-features = false, features = ["js"] }
+document-features = { version = "0.2.0", optional = true }
+[package.metadata.docs.rs]
+all-features = true
+features = ["document-features"]
+rustdoc-args = ["--cfg", "docsrs"]

gix-diff/src/lib.rs+7−0

 //! Algorithms for diffing various git object types and for generating patches, highly optimized for performance.
+//! ## Feature Flags
+#![cfg_attr(
+feature = "document-features",
+cfg_attr(doc, doc = ::document_features::document_features!())
+)]
+#![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 #![deny(missing_docs, rust_2018_idioms)]
 #![forbid(unsafe_code)]
 pub mod tree;
 ///
+#[cfg(feature = "blob")]
 pub mod blob;

gix-filter/tests/pipeline/mod.rs+8−8

@@ -17,22 +17,22 @@ fn default() -> crate::Result { · 16 unmodified lines
17	Ok(())	17	Ok(())
18	}	18	}
19		19
20	fn attribute_cache(name: &str) -> gix_testtools::Result<gix_worktree::Cache> {	20	fn attribute_cache(name: &str) -> gix_testtools::Result<gix_worktree::Stack> {
21	let dir = gix_testtools::scripted_fixture_read_only("pipeline_repos.sh")?.join(name);	21	let dir = gix_testtools::scripted_fixture_read_only("pipeline_repos.sh")?.join(name);
22	Ok(gix_worktree::Cache::new(	22	Ok(gix_worktree::Stack::new(
23	dir,	23	dir,
24	gix_worktree::cache::State::for_add(	24	gix_worktree::stack::State::for_add(
25	gix_worktree::cache::state::Attributes::new(	25	gix_worktree::stack::state::Attributes::new(
26	Default::default(),	26	Default::default(),
27	None,	27	None,
28	gix_worktree::cache::state::attributes::Source::WorktreeThenIdMapping,	28	gix_worktree::stack::state::attributes::Source::WorktreeThenIdMapping,
29	Default::default(),	29	Default::default(),
30	),	30	),
31	gix_worktree::cache::state::Ignore::new(	31	gix_worktree::stack::state::Ignore::new(
32	Default::default(),	32	Default::default(),
33	Default::default(),	33	Default::default(),
34	None,	34	None,
35	gix_worktree::cache::state::ignore::Source::WorktreeThenIdMappingIfNotSkipped,	35	gix_worktree::stack::state::ignore::Source::WorktreeThenIdMappingIfNotSkipped,
36	),	36	),
37	),	37	),
38	Case::Sensitive,	38	Case::Sensitive,
@@ -49,7 +49,7 @@ fn pipeline( · 10 unmodified lines
49	gix_filter::pipeline::CrlfRoundTripCheck,	49	gix_filter::pipeline::CrlfRoundTripCheck,
50	eol::Configuration,	50	eol::Configuration,
51	),	51	),
52	) -> gix_testtools::Result<(gix_worktree::Cache, gix_filter::Pipeline)> {	52	) -> gix_testtools::Result<(gix_worktree::Stack, gix_filter::Pipeline)> {
53	let cache = attribute_cache(name)?;	53	let cache = attribute_cache(name)?;
54	let (drivers, encodings_with_roundtrip_check, crlf_roundtrip_check, eol_config) = init();	54	let (drivers, encodings_with_roundtrip_check, crlf_roundtrip_check, eol_config) = init();
55	let pipe = gix_filter::Pipeline::new(	55	let pipe = gix_filter::Pipeline::new(

gix-status/CHANGELOG.mdrenamed from gix-worktree/CHANGELOG.md+0−0

File renamed without changes.

gix-status/Cargo.toml+37−0

@@ -0,0 +1,37 @@
	1	[package]
	2	name = "gix-status"
	3	version = "0.1.0"
	4	repository = "https://github.com/Byron/gitoxide"
	5	license = "MIT OR Apache-2.0"
	6	description = "A crate of the gitoxide project dealing with 'git status'-like functionality"
	7	authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>", "Pascal Kuthe <pascal.kuthe@semimod.de>"]
	8	edition = "2021"
	9	include = ["src/*/", "LICENSE-*", "CHANGELOG.md"]
	10	rust-version = "1.65"
	11
	12	[lib]
	13	doctest = false
	14
	15	[[test]]
	16	name = "multi-threaded"
	17	path = "tests/status-multi-threaded.rs"
	18	required-features = ["internal-testing-gix-features-parallel"]
	19
	20	[features]
	21	internal-testing-gix-features-parallel = ["gix-features/parallel"]
	22
	23	[dependencies]
	24	gix-index = { version = "^0.22.0", path = "../gix-index" }
	25	gix-fs = { version = "^0.4.1", path = "../gix-fs" }
	26	gix-hash = { version = "^0.11.4", path = "../gix-hash" }
	27	gix-object = { version = "^0.34.0", path = "../gix-object" }
	28	gix-path = { version = "^0.8.4", path = "../gix-path" }
	29	gix-features = { version = "^0.32.1", path = "../gix-features" }
	30
	31	thiserror = "1.0.26"
	32	filetime = "0.2.15"
	33	bstr = { version = "1.3.0", default-features = false }
	34
	35	[dev-dependencies]
	36	gix-testtools = { path = "../tests/tools" }
	37

gix-status/LICENSE-APACHE+1−0

@@ -0,0 +1 @@
		1	../LICENSE-APACHE

gix-status/LICENSE-MIT+1−0

@@ -0,0 +1 @@
		1	../LICENSE-MIT

gix-status/src/index_as_worktree/content.rsrenamed from gix-worktree/src/status/content.rs+0−0

File renamed without changes.

gix-status/src/index_as_worktree/function.rsrenamed from gix-worktree/src/status/function.rs+3−3

 use gix_features::parallel::{in_parallel_if, Reduce};
 use crate::{
-    read,
+    index_as_worktree::{
-    status::{
         content,
         content::CompareBlobs,
         types::{Error, Options},
         Change, VisitEntry,
     },
+    read,
 };
 /// Calculates the changes that need to be applied to an `index` to match the state of the `worktree` and makes them
 /// Note that this isn't technically quite what this function does as this also provides some additional information,
 /// like whether a file has conflicts, and files that were added with `git add` are shown as a special
 /// changes despite not technically requiring a change to the index since `git add` already added the file to the index.
-pub fn status<'index, T, Find, E>(
+pub fn index_as_worktree<'index, T, Find, E>(
     index: &'index mut gix_index::State,
     worktree: &Path,
     collector: &mut impl VisitEntry<'index, ContentChange = T>,

gix-status/src/index_as_worktree/mod.rsrenamed from gix-worktree/src/status/mod.rs+0−0

File renamed without changes.

gix-status/src/index_as_worktree/recorder.rsrenamed from gix-worktree/src/status/recorder.rs+1−1

@@ -1,7 +1,7 @@
1	use bstr::BStr;	1	use bstr::BStr;
2	use gix_index as index;	2	use gix_index as index;
3		3
4	use crate::status::{Change, VisitEntry};	4	use crate::index_as_worktree::{Change, VisitEntry};
5		5
6	/// Convenience implementation of [`VisitEntry`] that collects all non-trivial changes into a `Vec`.	6	/// Convenience implementation of [`VisitEntry`] that collects all non-trivial changes into a `Vec`.
7	#[derive(Debug, Default)]	7	#[derive(Debug, Default)]

gix-status/src/index_as_worktree/types.rsrenamed from gix-worktree/src/status/types.rs+2−2

@@ -1,6 +1,6 @@
1	use bstr::BStr;	1	use bstr::BStr;
2		2
3	/// The error returned by [`status()`][crate::status()].	3	/// The error returned by [`status()`](crate::index_as_worktree()).
4	#[derive(Debug, thiserror::Error)]	4	#[derive(Debug, thiserror::Error)]
5	#[allow(missing_docs)]	5	#[allow(missing_docs)]
6	pub enum Error {	6	pub enum Error {
@@ -40,7 +40,7 @@ pub enum Change<T = ()> { · 33 unmodified lines
40	/// Indicates that one of the stat changes was an executable bit change	40	/// Indicates that one of the stat changes was an executable bit change
41	/// which is a significant change itself.	41	/// which is a significant change itself.
42	executable_bit_changed: bool,	42	executable_bit_changed: bool,
43	/// The output of the [`CompareBlobs`][crate::status::content::CompareBlobs] run on this entry.	43	/// The output of the [`CompareBlobs`](crate::index_as_worktree::content::CompareBlobs) run on this entry.
44	/// If there is no content change and only the executable bit	44	/// If there is no content change and only the executable bit
45	/// changed than this is `None`.	45	/// changed than this is `None`.
46	content_change: Option<T>,	46	content_change: Option<T>,

gix-status/src/lib.rs+15−0

@@ -0,0 +1,15 @@
	1	//! This crate includes the various diffs `git` can do between different representations
	2	//! of the repository state, like comparisons between…
	3	//!
	4	//! * index and working tree
	5	//! * index and tree
	6	//! * find untracked files
	7	//!
	8	//! While also being able to check check if the working tree is dirty, quickly.
	9	#![deny(missing_docs, rust_2018_idioms, unsafe_code)]
	10
	11	///
	12	pub mod read;
	13
	14	pub mod index_as_worktree;
	15	pub use index_as_worktree::function::index_as_worktree;

gix-status/src/read.rsrenamed from gix-worktree/src/read.rs+1−2

 };
 use gix_object::Blob;
-use gix_path as path;
 // TODO: tests
     if is_symlink && capabilities.symlink {
         // conversion to bstr can never fail because symlinks are only used
         // on unix (by git) so no reason to use the try version here
-        let symlink_path = path::into_bstr(read_link(path)?);
+        let symlink_path = gix_path::into_bstr(read_link(path)?);
         buf.extend_from_slice(&symlink_path);
         // TODO: there is no reason this should be a clone
         //       std isn't great about allowing users to avoid allocations but we could

gix-status/tests/fixtures/generated-archives/.gitignore+2−0

@@ -0,0 +1,2 @@
	1	status_unchanged.tar.xz
	2	status_changed.tar.xz

gix-status/tests/fixtures/generated-archives/racy_git.tar.xz+3−0

@@ -0,0 +1,3 @@
	1	version https://git-lfs.github.com/spec/v1
	2	oid sha256:c78c306d8a19ce7f09a4cdf284e761d9c7766a3491bfb83751b9e6f6bc8fc1c9
	3	size 9812

gix-status/tests/fixtures/generated-archives/status_conflict.tar.xz+3−0

@@ -0,0 +1,3 @@
	1	version https://git-lfs.github.com/spec/v1
	2	oid sha256:b64431478ff4ee4613d2e1fe0766b4da8aeac8f4dee2b42726efb6d2e87bc830
	3	size 11012

gix-status/tests/fixtures/generated-archives/status_intent_to_add.tar.xz+3−0

@@ -0,0 +1,3 @@
	1	version https://git-lfs.github.com/spec/v1
	2	oid sha256:d8fa2e8085d464945eade89cfa9dadb89345c584b1d72a535d464859f02950a7
	3	size 9280

gix-status/tests/fixtures/generated-archives/status_removed.tar.xz+3−0

@@ -0,0 +1,3 @@
	1	version https://git-lfs.github.com/spec/v1
	2	oid sha256:cbc72bb3b08e421928d4402b49100a4ac144b4cdcc84ab70e6b721ec5ce4546c
	3	size 10568

gix-status/tests/fixtures/racy_git.shrenamed from gix-worktree/tests/fixtures/racy_git.sh+0−0

File renamed without changes.

gix-status/tests/fixtures/status_changed.shrenamed from gix-worktree/tests/fixtures/status_changed.sh+0−0

File renamed without changes.

gix-status/tests/fixtures/status_conflict.shrenamed from gix-worktree/tests/fixtures/status_conflict.sh+0−0

File renamed without changes.

gix-status/tests/fixtures/status_intent_to_add.shrenamed from gix-worktree/tests/fixtures/status_intent_to_add.sh+0−0

File renamed without changes.

gix-status/tests/fixtures/status_removed.shrenamed from gix-worktree/tests/fixtures/status_removed.sh+0−0

File renamed without changes.

gix-status/tests/fixtures/status_unchanged.shrenamed from gix-worktree/tests/fixtures/status_unchanged.sh+0−0

File renamed without changes.

gix-status/tests/status-multi-threaded.rs+4−0

@@ -0,0 +1,4 @@
	1	#[cfg(feature = "internal-testing-gix-features-parallel")]
	2	mod status;
	3	#[cfg(feature = "internal-testing-gix-features-parallel")]
	4	use status::*;

gix-status/tests/status-single-threaded.rs+4−0

@@ -0,0 +1,4 @@
	1	#[cfg(not(feature = "internal-testing-gix-features-parallel"))]
	2	mod status;
	3	#[cfg(not(feature = "internal-testing-gix-features-parallel"))]
	4	use status::*;

gix-status/tests/status/index_as_worktree.rsrenamed from gix-worktree/tests/worktree/status.rs+6−6

@@ -7,9 +7,9 @@ use bstr::BStr; · 6 unmodified lines
7	use filetime::{set_file_mtime, FileTime};	7	use filetime::{set_file_mtime, FileTime};
8	use gix_index as index;	8	use gix_index as index;
9	use gix_index::Entry;	9	use gix_index::Entry;
10	use gix_worktree::{	10	use gix_status::{
11	status,	11	index_as_worktree,
12	status::{	12	index_as_worktree::{
13	content::{CompareBlobs, FastEq, ReadDataOnce},	13	content::{CompareBlobs, FastEq, ReadDataOnce},
14	Change, Options, Recorder,	14	Change, Options, Recorder,
15	},	15	},
@@ -33,7 +33,7 @@ fn fixture(name: &str, expected_status: &[(&BStr, Option<Change>, bool)]) { · 17 unmodified lines
33	let git_dir = worktree.join(".git");	33	let git_dir = worktree.join(".git");
34	let mut index = gix_index::File::at(git_dir.join("index"), gix_hash::Kind::Sha1, Default::default()).unwrap();	34	let mut index = gix_index::File::at(git_dir.join("index"), gix_hash::Kind::Sha1, Default::default()).unwrap();
35	let mut recorder = Recorder::default();	35	let mut recorder = Recorder::default();
36	status(	36	index_as_worktree(
37	&mut index,	37	&mut index,
38	&worktree,	38	&worktree,
39	&mut recorder,	39	&mut recorder,
@@ -172,7 +172,7 @@ fn racy_git() { · 132 unmodified lines
172		172
173	let count = Arc::new(AtomicUsize::new(0));	173	let count = Arc::new(AtomicUsize::new(0));
174	let counter = CountCalls(count.clone(), FastEq);	174	let counter = CountCalls(count.clone(), FastEq);
175	status(	175	index_as_worktree(
176	&mut index,	176	&mut index,
177	worktree,	177	worktree,
178	&mut recorder,	178	&mut recorder,
@@ -193,7 +193,7 @@ fn racy_git() { · 14 unmodified lines
193	// and cause proper output.	193	// and cause proper output.
194	index.set_timestamp(FileTime::from_unix_time(timestamp as i64, 0));	194	index.set_timestamp(FileTime::from_unix_time(timestamp as i64, 0));
195	let mut recorder = Recorder::default();	195	let mut recorder = Recorder::default();
196	status(	196	index_as_worktree(
197	&mut index,	197	&mut index,
198	worktree,	198	worktree,
199	&mut recorder,	199	&mut recorder,

gix-status/tests/status/mod.rs+7−0

@@ -0,0 +1,7 @@
	1	mod index_as_worktree;
	2
	3	pub fn fixture_path(name: &str) -> std::path::PathBuf {
	4	let dir = gix_testtools::scripted_fixture_read_only(std::path::Path::new(name).with_extension("sh"))
	5	.expect("script works");
	6	dir
	7	}

gix-worktree-state/Cargo.toml+44−0

@@ -0,0 +1,44 @@
	1	[package]
	2	name = "gix-worktree-state"
	3	version = "0.1.0"
	4	repository = "https://github.com/Byron/gitoxide"
	5	license = "MIT OR Apache-2.0"
	6	description = "A crate of the gitoxide project implementing setting the worktree to a particular state"
	7	authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
	8	edition = "2021"
	9	include = ["src/*/", "LICENSE-*", "CHANGELOG.md"]
	10	rust-version = "1.65"
	11
	12	[lib]
	13	doctest = false
	14
	15	[[test]]
	16	name = "multi-threaded"
	17	path = "tests/state-multi-threaded.rs"
	18	required-features = ["internal-testing-gix-features-parallel"]
	19
	20	[features]
	21	internal-testing-gix-features-parallel = ["gix-features/parallel"]
	22
	23	[dependencies]
	24	gix-worktree = { version = "^0.24.0", path = "../gix-worktree" }
	25	gix-index = { version = "^0.22.0", path = "../gix-index" }
	26	gix-fs = { version = "^0.4.1", path = "../gix-fs" }
	27	gix-hash = { version = "^0.11.4", path = "../gix-hash" }
	28	gix-object = { version = "^0.34.0", path = "../gix-object" }
	29	gix-glob = { version = "^0.10.2", path = "../gix-glob" }
	30	gix-path = { version = "^0.8.4", path = "../gix-path" }
	31	gix-features = { version = "^0.32.1", path = "../gix-features" }
	32	gix-filter = { version = "^0.3.0", path = "../gix-filter" }
	33
	34	io-close = "0.3.7"
	35	thiserror = "1.0.26"
	36	bstr = { version = "1.3.0", default-features = false }
	37
	38	[dev-dependencies]
	39	gix-testtools = { path = "../tests/tools" }
	40	gix-odb = { path = "../gix-odb" }
	41	symlink = "0.1.0"
	42	once_cell = "1.18.0"
	43
	44	walkdir = "2.3.2"

gix-worktree-state/LICENSE-APACHE+1−0

@@ -0,0 +1 @@
		1	../LICENSE-APACHE

gix-worktree-state/LICENSE-MIT+1−0

@@ -0,0 +1 @@
		1	../LICENSE-MIT

gix-worktree-state/src/checkout/chunk.rsrenamed from gix-worktree/src/checkout/chunk.rs+3−2

 use bstr::{BStr, BString};
 use gix_hash::oid;
-use crate::{checkout, checkout::entry, Cache};
+use crate::{checkout, checkout::entry};
+use gix_worktree::Stack;
 mod reduce {
     use std::marker::PhantomData;
 #[derive(Clone)]
 pub struct Context<Find: Clone> {
     pub find: Find,
-    pub path_cache: Cache,
+    pub path_cache: Stack,
     pub filters: gix_filter::Pipeline,
     pub buf: Vec<u8>,
     pub options: Options,

gix-worktree-state/src/checkout/entry.rsrenamed from gix-worktree/src/checkout/entry.rs+2−2

@@ -10,11 +10,11 @@ use gix_hash::oid; · 9 unmodified lines
10	use gix_index::{entry::Stat, Entry};	10	use gix_index::{entry::Stat, Entry};
11	use io_close::Close;	11	use io_close::Close;
12		12
13	use crate::Cache;	13	use gix_worktree::Stack;
14		14
15	pub struct Context<'a, Find> {	15	pub struct Context<'a, Find> {
16	pub find: &'a mut Find,	16	pub find: &'a mut Find,
17	pub path_cache: &'a mut Cache,	17	pub path_cache: &'a mut Stack,
18	pub filters: &'a mut gix_filter::Pipeline,	18	pub filters: &'a mut gix_filter::Pipeline,
19	pub buf: &'a mut Vec<u8>,	19	pub buf: &'a mut Vec<u8>,
20	}	20	}

gix-worktree-state/src/checkout/function.rsrenamed from gix-worktree/src/checkout/function.rs+4−3

 use gix_features::{interrupt, parallel::in_parallel_with_finalize, progress::Progress};
 use gix_hash::oid;
-use crate::{cache, checkout::chunk, Cache};
+use crate::checkout::chunk;
+use gix_worktree::{stack, Stack};
 /// Checkout the entire `index` into `dir`, and resolve objects found in index entries with `find` to write their content to their
 /// respective path in `dir`.
         None,
     );
-    let state = cache::State::for_checkout(options.overwrite_existing, std::mem::take(&mut options.attributes));
+    let state = stack::State::for_checkout(options.overwrite_existing, std::mem::take(&mut options.attributes));
     let attribute_files = state.id_mappings_from_index(index, paths, case);
     let mut ctx = chunk::Context {
         buf: Vec::new(),
         options: (&options).into(),
-        path_cache: Cache::new(dir, state, case, Vec::with_capacity(512), attribute_files),
+        path_cache: Stack::new(dir, state, case, Vec::with_capacity(512), attribute_files),
         filters: options.filters,
         find,
     };

gix-worktree-state/src/checkout/mod.rsrenamed from gix-worktree/src/checkout/mod.rs+1−1

@@ -60,7 +60,7 @@ pub struct Options { · 59 unmodified lines
60	/// Control how stat comparisons are made when checking if a file is fresh.	60	/// Control how stat comparisons are made when checking if a file is fresh.
61	pub stat_options: stat::Options,	61	pub stat_options: stat::Options,
62	/// A stack of attributes to use with the filesystem cache to use as driver for filters.	62	/// A stack of attributes to use with the filesystem cache to use as driver for filters.
63	pub attributes: crate::cache::state::Attributes,	63	pub attributes: gix_worktree::stack::state::Attributes,
64	/// The filter pipeline to use for applying mandatory filters before writing to the worktree.	64	/// The filter pipeline to use for applying mandatory filters before writing to the worktree.
65	pub filters: gix_filter::Pipeline,	65	pub filters: gix_filter::Pipeline,
66	/// Control how long-running processes may use the 'delay' capability.	66	/// Control how long-running processes may use the 'delay' capability.

gix-worktree-state/src/lib.rs+6−0

@@ -0,0 +1,6 @@
	1	//! A crate to help setting the worktree to a particular state.
	2	#![deny(missing_docs, rust_2018_idioms, unsafe_code)]
	3
	4	///
	5	pub mod checkout;
	6	pub use checkout::function::checkout;

gix-worktree-state/tests/fixtures/generated-archives/.gitignore+5−0

@@ -0,0 +1,5 @@
	1	make_ignore_and_attributes_setup.tar.xz
	2	make_mixed_without_submodules.tar.xz
	3	make_mixed_without_submodules_and_symlinks.tar.xz
	4	make_attributes_baseline.tar.xz
	5	make_dangerous_symlink.tar.xz

gix-worktree-state/tests/fixtures/generated-archives/make_ignorecase_collisions.tar.xzrenamed from gix-worktree/tests/fixtures/generated-archives/make_ignorecase_collisions.tar.xz+0−0

File renamed without changes.

gix-worktree-state/tests/fixtures/make_dangerous_symlink.shrenamed from gix-worktree/tests/fixtures/make_dangerous_symlink.sh+0−0

File renamed without changes.

gix-worktree-state/tests/fixtures/make_ignorecase_collisions.shrenamed from gix-worktree/tests/fixtures/make_ignorecase_collisions.sh+0−0

File renamed without changes.

gix-worktree-state/tests/fixtures/make_mixed_without_submodules.shrenamed from gix-worktree/tests/fixtures/make_mixed_without_submodules.sh+0−0

File renamed without changes.

gix-worktree-state/tests/fixtures/make_mixed_without_submodules_and_symlinks.shrenamed from gix-worktree/tests/fixtures/make_mixed_without_submodules_and_symlinks.sh+0−0

File renamed without changes.

gix-worktree-state/tests/state-multi-threaded.rs+4−0

@@ -0,0 +1,4 @@
	1	#[cfg(feature = "internal-testing-gix-features-parallel")]
	2	mod state;
	3	#[cfg(feature = "internal-testing-gix-features-parallel")]
	4	use state::*;

gix-worktree-state/tests/state-single-threaded.rs+4−0

@@ -0,0 +1,4 @@
	1	#[cfg(not(feature = "internal-testing-gix-features-parallel"))]
	2	mod state;
	3	#[cfg(not(feature = "internal-testing-gix-features-parallel"))]
	4	use state::*;

gix-worktree-state/tests/state/checkout.rsrenamed from gix-worktree/tests/worktree/checkout.rs+10−10

 use gix_features::progress;
 use gix_object::bstr::ByteSlice;
 use gix_odb::FindExt;
-use gix_worktree::checkout::Collision;
+use gix_testtools::tempfile::TempDir;
+use gix_worktree_state::checkout::Collision;
 use once_cell::sync::Lazy;
-use tempfile::TempDir;
 use crate::fixture_path;
 }
 fn checkout_index_in_tmp_dir(
-    opts: gix_worktree::checkout::Options,
+    opts: gix_worktree_state::checkout::Options,
     name: &str,
-) -> crate::Result<(PathBuf, TempDir, gix_index::File, gix_worktree::checkout::Outcome)> {
+) -> crate::Result<(PathBuf, TempDir, gix_index::File, gix_worktree_state::checkout::Outcome)> {
     checkout_index_in_tmp_dir_opts(opts, name, |_d| true, |_| Ok(()))
 }
 fn checkout_index_in_tmp_dir_opts(
-    opts: gix_worktree::checkout::Options,
+    opts: gix_worktree_state::checkout::Options,
     name: &str,
     mut allow_return_object: impl FnMut(&gix_hash::oid) -> bool + Send + Clone,
     prep_dest: impl Fn(&Path) -> std::io::Result<()>,
-) -> crate::Result<(PathBuf, TempDir, gix_index::File, gix_worktree::checkout::Outcome)> {
+) -> crate::Result<(PathBuf, TempDir, gix_index::File, gix_worktree_state::checkout::Outcome)> {
     let source_tree = fixture_path(name);
     let git_dir = source_tree.join(".git");
     let mut index = gix_index::File::at(git_dir.join("index"), gix_hash::Kind::Sha1, Default::default())?;
     let odb = gix_odb::at(git_dir.join("objects"))?.into_inner().into_arc()?;
-    let destination = tempfile::tempdir_in(std::env::current_dir()?)?;
+    let destination = gix_testtools::tempfile::tempdir_in(std::env::current_dir()?)?;
     prep_dest(destination.path()).expect("preparation must succeed");
-    let outcome = gix_worktree::checkout(
+    let outcome = gix_worktree_state::checkout(
         &mut index,
         destination.path(),
         move |oid, buf| {
     ))
 }
-fn opts_from_probe() -> gix_worktree::checkout::Options {
+fn opts_from_probe() -> gix_worktree_state::checkout::Options {
-    gix_worktree::checkout::Options {
+    gix_worktree_state::checkout::Options {
         fs: probe_gitoxide_dir().unwrap(),
         destination_is_initially_empty: true,
         thread_limit: gix_features::parallel::num_threads(None).into(),

gix-worktree-state/tests/state/mod.rs+10−0

@@ -0,0 +1,10 @@
	1	mod checkout;
	2
	3	use std::path::{Path, PathBuf};
	4
	5	pub type Result<T = ()> = std::result::Result<T, Box<dyn std::error::Error>>;
	6
	7	pub fn fixture_path(name: &str) -> PathBuf {
	8	let dir = gix_testtools::scripted_fixture_read_only(Path::new(name).with_extension("sh")).expect("script works");
	9	dir
	10	}

gix-worktree-stream/tests/stream.rs+5−5

@@ -15,7 +15,7 @@ mod from_tree { · 14 unmodified lines
15	use gix_object::{bstr::ByteSlice, tree::EntryMode};	15	use gix_object::{bstr::ByteSlice, tree::EntryMode};
16	use gix_odb::FindExt;	16	use gix_odb::FindExt;
17	use gix_testtools::once_cell::sync::Lazy;	17	use gix_testtools::once_cell::sync::Lazy;
18	use gix_worktree::cache::state::attributes::Source;	18	use gix_worktree::stack::state::attributes::Source;
19		19
20	use crate::hex_to_id;	20	use crate::hex_to_id;
21		21
@@ -231,7 +231,7 @@ mod from_tree { · 209 unmodified lines
231	Ok(())	231	Ok(())
232	}	232	}
233		233
234	fn basic() -> gix_testtools::Result<(PathBuf, gix_hash::ObjectId, gix_odb::HandleArc, gix_worktree::Cache)> {	234	fn basic() -> gix_testtools::Result<(PathBuf, gix_hash::ObjectId, gix_odb::HandleArc, gix_worktree::Stack)> {
235	let dir = gix_testtools::scripted_fixture_read_only("basic.sh")?;	235	let dir = gix_testtools::scripted_fixture_read_only("basic.sh")?;
236		236
237	let head = {	237	let head = {
@@ -242,14 +242,14 @@ mod from_tree { · 4 unmodified lines
242		242
243	let mut collection = Default::default();	243	let mut collection = Default::default();
244	let mut buf = Default::default();	244	let mut buf = Default::default();
245	let attributes = gix_worktree::cache::state::Attributes::new(	245	let attributes = gix_worktree::stack::state::Attributes::new(
246	gix_attributes::Search::new_globals(None::<PathBuf>, &mut buf, &mut collection)?,	246	gix_attributes::Search::new_globals(None::<PathBuf>, &mut buf, &mut collection)?,
247	None,	247	None,
248	Source::WorktreeThenIdMapping,	248	Source::WorktreeThenIdMapping,
249	collection,	249	collection,
250	);	250	);
251	let state = gix_worktree::cache::State::AttributesStack(attributes);	251	let state = gix_worktree::stack::State::AttributesStack(attributes);
252	let cache = gix_worktree::Cache::new(&dir, state, Case::Sensitive, Default::default(), Default::default());	252	let cache = gix_worktree::Stack::new(&dir, state, Case::Sensitive, Default::default(), Default::default());
253	Ok((dir, head, odb.into_arc()?, cache))	253	Ok((dir, head, odb.into_arc()?, cache))
254	}	254	}
255		255

gix-worktree/Cargo.toml+1−9

 version = "0.24.0"
 repository = "https://github.com/Byron/gitoxide"
 license = "MIT OR Apache-2.0"
-description = "A crate of the gitoxide project dedicated implementing everything around working trees and git excludes"
+description = "A crate of the gitoxide project for shared worktree related types and utilities."
 authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
 edition = "2021"
 include = ["src/**/*", "LICENSE-*", "CHANGELOG.md"]
 gix-attributes = { version = "^0.16.0", path = "../gix-attributes" }
 gix-ignore = { version = "^0.5.1", path = "../gix-ignore" }
 gix-features = { version = "^0.32.1", path = "../gix-features" }
-gix-filter = { version = "^0.3.0", path = "../gix-filter" }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
-thiserror = "1.0.26"
-filetime = "0.2.15"
 bstr = { version = "1.3.0", default-features = false }
 document-features = { version = "0.2.0", optional = true }
-io-close = "0.3.7"
 [dev-dependencies]
 gix-testtools = { path = "../tests/tools" }
 gix-odb = { path = "../gix-odb" }
 symlink = "0.1.0"
-once_cell = "1.18.0"
-walkdir = "2.3.2"
-tempfile = "3.2.0"
 [package.metadata.docs.rs]
 features = ["document-features", "serde"]

gix-worktree/src/lib.rs+5−14

-//! A crate with all index-centric functionality that is interacting with a worktree.
+//! A crate with utility types for use by other crates that implement specifics.
 //!
 //! Unless specified differently, all operations need an index file (e.g. `.git/index`) as driver.
 //!
 #![deny(missing_docs, rust_2018_idioms, unsafe_code)]
 use bstr::BString;
-///
-pub mod read;
 /// A cache for efficiently executing operations on directories and files which are encountered in sorted order.
 /// That way, these operations can be re-used for subsequent invocations in the same directory.
 ///
 ///
 /// The caching is only useful if consecutive calls to create a directory are using a sorted list of entries.
 #[derive(Clone)]
-pub struct Cache {
+pub struct Stack {
     stack: gix_fs::Stack,
     /// tells us what to do as we change paths.
-    state: cache::State,
+    state: stack::State,
     /// A buffer used when reading attribute or ignore files or their respective objects from the object database.
     buf: Vec<u8>,
     /// If case folding should happen when looking up attributes or exclusions.
     case: gix_glob::pattern::Case,
     /// A lookup table for object ids to read from in some situations when looking up attributes or exclusions.
     id_mappings: Vec<PathIdMapping>,
-    statistics: cache::Statistics,
+    statistics: stack::Statistics,
 }
 pub(crate) type PathIdMapping = (BString, gix_hash::ObjectId);
 ///
-pub mod cache;
+pub mod stack;
-///
-pub mod checkout;
-pub use checkout::function::checkout;
-pub mod status;
-pub use status::function::status;

gix-worktree/src/stack/delegate.rsrenamed from gix-worktree/src/cache/delegate.rs+1−1

@@ -1,6 +1,6 @@
1	use bstr::{BStr, ByteSlice};	1	use bstr::{BStr, ByteSlice};
2		2
3	use crate::{cache::State, PathIdMapping};	3	use crate::{stack::State, PathIdMapping};
4		4
5	/// Various aggregate numbers related to the stack delegate itself.	5	/// Various aggregate numbers related to the stack delegate itself.
6	#[derive(Default, Clone, Copy, Debug)]	6	#[derive(Default, Clone, Copy, Debug)]

gix-worktree/src/stack/mod.rsrenamed from gix-worktree/src/cache/mod.rs+10−10

@@ -4,10 +4,10 @@ use std::path::{Path, PathBuf}; · 3 unmodified lines
4	use bstr::{BStr, ByteSlice};	4	use bstr::{BStr, ByteSlice};
5	use gix_hash::oid;	5	use gix_hash::oid;
6		6
7	use super::Cache;	7	use super::Stack;
8	use crate::PathIdMapping;	8	use crate::PathIdMapping;
9		9
10	/// Various aggregate numbers collected from when the corresponding [`Cache`] was instantiated.	10	/// Various aggregate numbers collected from when the corresponding [`Stack`] was instantiated.
11	#[derive(Default, Clone, Copy, Debug)]	11	#[derive(Default, Clone, Copy, Debug)]
12	#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]	12	#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
13	pub struct Statistics {	13	pub struct Statistics {
@@ -45,12 +45,12 @@ pub enum State { · 31 unmodified lines
45		45
46	#[must_use]	46	#[must_use]
47	pub struct Platform<'a> {	47	pub struct Platform<'a> {
48	parent: &'a Cache,	48	parent: &'a Stack,
49	is_dir: Option<bool>,	49	is_dir: Option<bool>,
50	}	50	}
51		51
52	/// Initialization	52	/// Initialization
53	impl Cache {	53	impl Stack {
54	/// Create a new instance with `worktree_root` being the base for all future paths we match.	54	/// Create a new instance with `worktree_root` being the base for all future paths we match.
55	/// `state` defines the capabilities of the cache.	55	/// `state` defines the capabilities of the cache.
56	/// The `case` configures attribute and exclusion case sensitivity at query time, which should match the case that	56	/// The `case` configures attribute and exclusion case sensitivity at query time, which should match the case that
@@ -64,7 +64,7 @@ impl Cache { · 7 unmodified lines
64	id_mappings: Vec<PathIdMapping>,	64	id_mappings: Vec<PathIdMapping>,
65	) -> Self {	65	) -> Self {
66	let root = worktree_root.into();	66	let root = worktree_root.into();
67	Cache {	67	Stack {
68	stack: gix_fs::Stack::new(root),	68	stack: gix_fs::Stack::new(root),
69	state,	69	state,
70	case,	70	case,
@@ -76,12 +76,12 @@ impl Cache { · 5 unmodified lines
76	}	76	}
77		77
78	/// Entry points for attribute query	78	/// Entry points for attribute query
79	impl Cache {	79	impl Stack {
80	/// Append the `relative` path to the root directory of the cache and efficiently create leading directories, while assuring that no	80	/// Append the `relative` path to the root directory of the cache and efficiently create leading directories, while assuring that no
81	/// symlinks are in that path.	81	/// symlinks are in that path.
82	/// Unless `is_dir` is known with `Some(…)`, then `relative` points to a directory itself in which case the entire resulting	82	/// Unless `is_dir` is known with `Some(…)`, then `relative` points to a directory itself in which case the entire resulting
83	/// path is created as directory. If it's not known it is assumed to be a file.	83	/// path is created as directory. If it's not known it is assumed to be a file.
84	/// `find` maybe used to lookup objects from an [id mapping][crate::cache::State::id_mappings_from_index()], with mappnigs	84	/// `find` maybe used to lookup objects from an [id mapping][crate::stack::State::id_mappings_from_index()], with mappnigs
85	///	85	///
86	/// Provide access to cached information for that `relative` path via the returned platform.	86	/// Provide access to cached information for that `relative` path via the returned platform.
87	pub fn at_path<Find, E>(	87	pub fn at_path<Find, E>(
@@ -110,7 +110,7 @@ impl Cache { · 22 unmodified lines
110		110
111	/// Obtain a platform for lookups from a repo-`relative` path, typically obtained from an index entry. `is_dir` should reflect	111	/// Obtain a platform for lookups from a repo-`relative` path, typically obtained from an index entry. `is_dir` should reflect
112	/// whether it's a directory or not, or left at `None` if unknown.	112	/// whether it's a directory or not, or left at `None` if unknown.
113	/// `find` maybe used to lookup objects from an [id mapping][crate::cache::State::id_mappings_from_index()].	113	/// `find` maybe used to lookup objects from an [id mapping][crate::stack::State::id_mappings_from_index()].
114	/// All effects are similar to [`at_path()`][Self::at_path()].	114	/// All effects are similar to [`at_path()`][Self::at_path()].
115	///	115	///
116	/// If `relative` ends with `/` and `is_dir` is `None`, it is automatically assumed to be a directory.	116	/// If `relative` ends with `/` and `is_dir` is `None`, it is automatically assumed to be a directory.
@@ -140,7 +140,7 @@ impl Cache { · 23 unmodified lines
140	}	140	}
141		141
142	/// Mutation	142	/// Mutation
143	impl Cache {	143	impl Stack {
144	/// Reset the statistics after returning them.	144	/// Reset the statistics after returning them.
145	pub fn take_statistics(&mut self) -> Statistics {	145	pub fn take_statistics(&mut self) -> Statistics {
146	std::mem::take(&mut self.statistics)	146	std::mem::take(&mut self.statistics)
@@ -159,7 +159,7 @@ impl Cache { · 12 unmodified lines
159	}	159	}
160		160
161	/// Access	161	/// Access
162	impl Cache {	162	impl Stack {
163	/// Return the statistics we gathered thus far.	163	/// Return the statistics we gathered thus far.
164	pub fn statistics(&self) -> &Statistics {	164	pub fn statistics(&self) -> &Statistics {
165	&self.statistics	165	&self.statistics

gix-worktree/src/stack/platform.rsrenamed from gix-worktree/src/cache/platform.rs+1−1

@@ -2,7 +2,7 @@ use std::path::Path; · 1 unmodified line
2		2
3	use bstr::ByteSlice;	3	use bstr::ByteSlice;
4		4
5	use crate::cache::Platform;	5	use crate::stack::Platform;
6		6
7	/// Access	7	/// Access
8	impl<'a> Platform<'a> {	8	impl<'a> Platform<'a> {

gix-worktree/src/stack/state/attributes.rsrenamed from gix-worktree/src/cache/state/attributes.rs+5−5

@@ -4,8 +4,8 @@ use bstr::{BStr, ByteSlice}; · 3 unmodified lines
4	use gix_glob::pattern::Case;	4	use gix_glob::pattern::Case;
5		5
6	use crate::{	6	use crate::{
7	cache::state::{AttributeMatchGroup, Attributes},	7	stack::state::{AttributeMatchGroup, Attributes},
8	Cache, PathIdMapping,	8	PathIdMapping, Stack,
9	};	9	};
10		10
11	/// Various aggregate numbers related [`Attributes`].	11	/// Various aggregate numbers related [`Attributes`].
@@ -23,7 +23,7 @@ pub struct Statistics { · 11 unmodified lines
23	/// Decide where to read `.gitattributes` files from.	23	/// Decide where to read `.gitattributes` files from.
24	///	24	///
25	/// To Retrieve attribute files from id mappings, see	25	/// To Retrieve attribute files from id mappings, see
26	/// [State::id_mappings_from_index()][crate::cache::State::id_mappings_from_index()].	26	/// [State::id_mappings_from_index()][crate::stack::State::id_mappings_from_index()].
27	///	27	///
28	/// These mappings are typically produced from an index.	28	/// These mappings are typically produced from an index.
29	/// If a tree should be the source, build an attribute list from a tree instead, or convert a tree to an index.	29	/// If a tree should be the source, build an attribute list from a tree instead, or convert a tree to an index.
@@ -200,7 +200,7 @@ impl Attributes { · 170 unmodified lines
200	}	200	}
201		201
202	/// Attribute matching specific methods	202	/// Attribute matching specific methods
203	impl Cache {	203	impl Stack {
204	/// Creates a new container to store match outcomes for all attribute matches.	204	/// Creates a new container to store match outcomes for all attribute matches.
205	///	205	///
206	/// ### Panics	206	/// ### Panics
@@ -230,7 +230,7 @@ impl Cache { · 23 unmodified lines
230	}	230	}
231		231
232	/// Return the metadata collection that enables initializing attribute match outcomes as done in	232	/// Return the metadata collection that enables initializing attribute match outcomes as done in
233	/// [`attribute_matches()`][Cache::attribute_matches()] or [`selected_attribute_matches()`][Cache::selected_attribute_matches()]	233	/// [`attribute_matches()`][Stack::attribute_matches()] or [`selected_attribute_matches()`][Stack::selected_attribute_matches()]
234	///	234	///
235	/// ### Panics	235	/// ### Panics
236	///	236	///

gix-worktree/src/stack/state/ignore.rsrenamed from gix-worktree/src/cache/state/ignore.rs+2−2

@@ -4,7 +4,7 @@ use bstr::{BStr, ByteSlice}; · 3 unmodified lines
4	use gix_glob::pattern::Case;	4	use gix_glob::pattern::Case;
5		5
6	use crate::{	6	use crate::{
7	cache::state::{Ignore, IgnoreMatchGroup},	7	stack::state::{Ignore, IgnoreMatchGroup},
8	PathIdMapping,	8	PathIdMapping,
9	};	9	};
10		10
@@ -12,7 +12,7 @@ use crate::{ · 1 unmodified line
12	#[derive(Default, Debug, Clone, Copy)]	12	#[derive(Default, Debug, Clone, Copy)]
13	pub enum Source {	13	pub enum Source {
14	/// Retrieve ignore files from id mappings, see	14	/// Retrieve ignore files from id mappings, see
15	/// [State::id_mappings_from_index()][crate::cache::State::id_mappings_from_index()].	15	/// [State::id_mappings_from_index()][crate::stack::State::id_mappings_from_index()].
16	///	16	///
17	/// These mappings are typically produced from an index.	17	/// These mappings are typically produced from an index.
18	/// If a tree should be the source, build an attribute list from a tree instead, or convert a tree to an index.	18	/// If a tree should be the source, build an attribute list from a tree instead, or convert a tree to an index.

gix-worktree/src/stack/state/mod.rsrenamed from gix-worktree/src/cache/state/mod.rs+1−1

@@ -3,7 +3,7 @@ use std::path::PathBuf; · 2 unmodified lines
3	use bstr::{BString, ByteSlice};	3	use bstr::{BString, ByteSlice};
4	use gix_glob::pattern::Case;	4	use gix_glob::pattern::Case;
5		5
6	use crate::{cache::State, PathIdMapping};	6	use crate::{stack::State, PathIdMapping};
7		7
8	type AttributeMatchGroup = gix_attributes::Search;	8	type AttributeMatchGroup = gix_attributes::Search;
9	type IgnoreMatchGroup = gix_ignore::Search;	9	type IgnoreMatchGroup = gix_ignore::Search;

gix-worktree/src/untracked.rs+0−1

@@ -1 +0,0 @@
1	// TODO: untracked file detection, needs fs::Cache

gix-worktree/tests/fixtures/generated-archives/.gitignore+0−5

@@ -1,7 +1,2 @@
1	make_ignore_and_attributes_setup.tar.xz	1	make_ignore_and_attributes_setup.tar.xz
2	make_mixed_without_submodules.tar.xz
3	make_mixed_without_submodules_and_symlinks.tar.xz
4	make_attributes_baseline.tar.xz	2	make_attributes_baseline.tar.xz
5	make_dangerous_symlink.tar.xz
6	status_unchanged.tar.xz
7	status_changed.tar.xz

gix-worktree/tests/fixtures/generated-archives/make_special_exclude_case.tar.xz+2−2

@@ -1,3 +1,3 @@
1	version https://git-lfs.github.com/spec/v1	1	version https://git-lfs.github.com/spec/v1
2	oid sha256:24f605623efc49819d1b30c52fe22da8f94f2d267e8030ec9bc3b9b845801f76	2	oid sha256:1804dc740055b8a5afe65a2db14f29c8ae4691896e67342a8dcb11530fd448c6
3	size 9220	3	size 9240

gix-worktree/tests/fixtures/generated-archives/racy_git.tar.xz+0−3

@@ -1,3 +0,0 @@
1	version https://git-lfs.github.com/spec/v1
2	oid sha256:35b728a127f3b6170bac44469ff36d5ad0be2a4247a8926f1aaffb97b5973efc
3	size 1596

gix-worktree/tests/fixtures/generated-archives/status_conflict.tar.xz+0−3

@@ -1,3 +0,0 @@
1	version https://git-lfs.github.com/spec/v1
2	oid sha256:cd6d32ab7a1e372d80a617926cac2463f6620baedf74642d78fe7f8c956fd031
3	size 11036

gix-worktree/tests/fixtures/generated-archives/status_intent_to_add.tar.xz+0−3

@@ -1,3 +0,0 @@
1	version https://git-lfs.github.com/spec/v1
2	oid sha256:876670d74c01249d361aa73d83ab20d846db7c922a3ca825f778b5f9d746c401
3	size 9304

gix-worktree/tests/fixtures/generated-archives/status_removed.tar.xz+0−3

@@ -1,3 +0,0 @@
1	version https://git-lfs.github.com/spec/v1
2	oid sha256:e5fe85a65e3689e9e60598130be60761dc4ea129e04d7d5501320f7ebad1eb2b
3	size 10520

gix-worktree/tests/fixtures/make_ignore_setup.sh+0−18

@@ -1,18 +0,0 @@
1	#!/bin/bash
2	set -eu -o pipefail
3
4	git init -q
5
6	cat <<EOF >.git/info/exclude
7	# a sample .git/info/exclude
8	file-anywhere
9	/file-from-top
10
11	dir-anywhere/
12	/dir-from-top
13
14	subdir-anywhere/file
15	subdir-anywhere/dir/
16	EOF
17
18	git commit --allow-empty -m "init"

gix-worktree/tests/worktree/mod.rs+2−10

-mod cache;
+use gix_hash::ObjectId;
-mod checkout;
-mod status;
-use std::path::{Path, PathBuf};
+mod stack;
-use gix_hash::ObjectId;
 pub type Result<T = ()> = std::result::Result<T, Box<dyn std::error::Error>>;
 pub fn hex_to_id(hex: &str) -> ObjectId {
     ObjectId::from_hex(hex.as_bytes()).expect("40 bytes hex")
 }
-pub fn fixture_path(name: &str) -> PathBuf {
-    let dir = gix_testtools::scripted_fixture_read_only(Path::new(name).with_extension("sh")).expect("script works");
-    dir
-}

gix-worktree/tests/worktree/stack/attributes.rsrenamed from gix-worktree/tests/worktree/cache/attributes.rs+4−4

@@ -1,7 +1,7 @@
1	use bstr::ByteSlice;	1	use bstr::ByteSlice;
2	use gix_attributes::search::Outcome;	2	use gix_attributes::search::Outcome;
3	use gix_glob::pattern::Case;	3	use gix_glob::pattern::Case;
4	use gix_worktree::cache::state;	4	use gix_worktree::stack::state;
5		5
6	#[test]	6	#[test]
7	fn baseline() -> crate::Result {	7	fn baseline() -> crate::Result {
@@ -19,17 +19,17 @@ fn baseline() -> crate::Result { · 11 unmodified lines
19		19
20	let mut buf = Vec::new();	20	let mut buf = Vec::new();
21	let mut collection = gix_attributes::search::MetadataCollection::default();	21	let mut collection = gix_attributes::search::MetadataCollection::default();
22	let state = gix_worktree::cache::State::for_checkout(	22	let state = gix_worktree::stack::State::for_checkout(
23	false,	23	false,
24	state::Attributes::new(	24	state::Attributes::new(
25	gix_attributes::Search::new_globals([base.join("user.attributes")], &mut buf, &mut collection)?,	25	gix_attributes::Search::new_globals([base.join("user.attributes")], &mut buf, &mut collection)?,
26	Some(git_dir.join("info").join("attributes")),	26	Some(git_dir.join("info").join("attributes")),
27	gix_worktree::cache::state::attributes::Source::WorktreeThenIdMapping,	27	gix_worktree::stack::state::attributes::Source::WorktreeThenIdMapping,
28	collection,	28	collection,
29	),	29	),
30	);	30	);
31		31
32	let mut cache = gix_worktree::Cache::new(&base, state, case, buf, vec![]);	32	let mut cache = gix_worktree::Stack::new(&base, state, case, buf, vec![]);
33		33
34	let mut actual = cache.attribute_matches();	34	let mut actual = cache.attribute_matches();
35	let input = std::fs::read(base.join("baseline"))?;	35	let input = std::fs::read(base.join("baseline"))?;

gix-worktree/tests/worktree/stack/create_directory.rsrenamed from gix-worktree/tests/worktree/cache/create_directory.rs+9−9

@@ -1,7 +1,7 @@
1	use std::path::Path;	1	use std::path::Path;
2		2
3	use gix_worktree::{cache, Cache};	3	use gix_testtools::tempfile::{tempdir, TempDir};
4	use tempfile::{tempdir, TempDir};	4	use gix_worktree::{stack, Stack};
5		5
6	#[allow(clippy::ptr_arg)]	6	#[allow(clippy::ptr_arg)]
7	fn panic_on_find<'buf>(_oid: &gix_hash::oid, _buf: &'buf mut Vec<u8>) -> std::io::Result<gix_object::BlobRef<'buf>> {	7	fn panic_on_find<'buf>(_oid: &gix_hash::oid, _buf: &'buf mut Vec<u8>) -> std::io::Result<gix_object::BlobRef<'buf>> {
@@ -11,9 +11,9 @@ fn panic_on_find<'buf>(_oid: &gix_hash::oid, _buf: &'buf mut Vec<u8>) -> std::io · 3 unmodified lines
11	#[test]	11	#[test]
12	fn root_is_assumed_to_exist_and_files_in_root_do_not_create_directory() -> crate::Result {	12	fn root_is_assumed_to_exist_and_files_in_root_do_not_create_directory() -> crate::Result {
13	let dir = tempdir()?;	13	let dir = tempdir()?;
14	let mut cache = Cache::new(	14	let mut cache = Stack::new(
15	dir.path().join("non-existing-root"),	15	dir.path().join("non-existing-root"),
16	cache::State::for_checkout(false, Default::default()),	16	stack::State::for_checkout(false, Default::default()),
17	Default::default(),	17	Default::default(),
18	Vec::new(),	18	Vec::new(),
19	Default::default(),	19	Default::default(),
@@ -68,7 +68,7 @@ fn symlinks_or_files_in_path_are_forbidden_or_unlinked_when_forced() -> crate::R · 48 unmodified lines
68	std::fs::write(tmp.path().join("file-in-dir"), [])?;	68	std::fs::write(tmp.path().join("file-in-dir"), [])?;
69		69
70	for dirname in &["file-in-dir", "link-to-dir"] {	70	for dirname in &["file-in-dir", "link-to-dir"] {
71	if let cache::State::CreateDirectoryAndAttributesStack {	71	if let stack::State::CreateDirectoryAndAttributesStack {
72	unlink_on_collision, ..	72	unlink_on_collision, ..
73	} = cache.state_mut()	73	} = cache.state_mut()
74	{	74	{
@@ -90,7 +90,7 @@ fn symlinks_or_files_in_path_are_forbidden_or_unlinked_when_forced() -> crate::R · 15 unmodified lines
90	);	90	);
91	cache.take_statistics();	91	cache.take_statistics();
92	for dirname in &["link-to-dir", "file-in-dir"] {	92	for dirname in &["link-to-dir", "file-in-dir"] {
93	if let cache::State::CreateDirectoryAndAttributesStack {	93	if let stack::State::CreateDirectoryAndAttributesStack {
94	unlink_on_collision, ..	94	unlink_on_collision, ..
95	} = cache.state_mut()	95	} = cache.state_mut()
96	{	96	{
@@ -109,11 +109,11 @@ fn symlinks_or_files_in_path_are_forbidden_or_unlinked_when_forced() -> crate::R · 12 unmodified lines
109	Ok(())	109	Ok(())
110	}	110	}
111		111
112	fn new_cache() -> (Cache, TempDir) {	112	fn new_cache() -> (Stack, TempDir) {
113	let dir = tempdir().unwrap();	113	let dir = tempdir().unwrap();
114	let cache = Cache::new(	114	let cache = Stack::new(
115	dir.path(),	115	dir.path(),
116	cache::State::for_checkout(false, Default::default()),	116	stack::State::for_checkout(false, Default::default()),
117	Default::default(),	117	Default::default(),
118	Vec::new(),	118	Vec::new(),
119	Default::default(),	119	Default::default(),

gix-worktree/tests/worktree/stack/ignore.rsrenamed from gix-worktree/tests/worktree/cache/ignore.rs+7−7

@@ -1,7 +1,7 @@
1	use bstr::{BStr, ByteSlice};	1	use bstr::{BStr, ByteSlice};
2	use gix_glob::pattern::Case;	2	use gix_glob::pattern::Case;
3	use gix_odb::FindExt;	3	use gix_odb::FindExt;
4	use gix_worktree::{cache::state::ignore::Source, Cache};	4	use gix_worktree::{stack::state::ignore::Source, Stack};
5		5
6	use crate::hex_to_id;	6	use crate::hex_to_id;
7		7
@@ -37,16 +37,16 @@ fn exclude_by_dir_is_handled_just_like_git() { · 29 unmodified lines
37		37
38	let mut buf = Vec::new();	38	let mut buf = Vec::new();
39	let case = gix_glob::pattern::Case::Sensitive;	39	let case = gix_glob::pattern::Case::Sensitive;
40	let state = gix_worktree::cache::State::for_add(	40	let state = gix_worktree::stack::State::for_add(
41	Default::default(),	41	Default::default(),
42	gix_worktree::cache::state::Ignore::new(	42	gix_worktree::stack::state::Ignore::new(
43	Default::default(),	43	Default::default(),
44	gix_ignore::Search::from_git_dir(&git_dir, None, &mut buf).unwrap(),	44	gix_ignore::Search::from_git_dir(&git_dir, None, &mut buf).unwrap(),
45	None,	45	None,
46	Source::WorktreeThenIdMappingIfNotSkipped,	46	Source::WorktreeThenIdMappingIfNotSkipped,
47	),	47	),
48	);	48	);
49	let mut cache = Cache::new(&dir, state, case, buf, Default::default());	49	let mut cache = Stack::new(&dir, state, case, buf, Default::default());
50	let baseline = std::fs::read(git_dir.parent().unwrap().join("git-check-ignore.baseline")).unwrap();	50	let baseline = std::fs::read(git_dir.parent().unwrap().join("git-check-ignore.baseline")).unwrap();
51	let expectations = IgnoreExpectations {	51	let expectations = IgnoreExpectations {
52	lines: baseline.lines(),	52	lines: baseline.lines(),
@@ -95,9 +95,9 @@ fn check_against_baseline() -> crate::Result { · 42 unmodified lines
95	};	95	};
96	let mut index = gix_index::File::at(git_dir.join("index"), gix_hash::Kind::Sha1, Default::default())?;	96	let mut index = gix_index::File::at(git_dir.join("index"), gix_hash::Kind::Sha1, Default::default())?;
97	let odb = gix_odb::at(git_dir.join("objects"))?;	97	let odb = gix_odb::at(git_dir.join("objects"))?;
98	let state = gix_worktree::cache::State::for_add(	98	let state = gix_worktree::stack::State::for_add(
99	Default::default(),	99	Default::default(),
100	gix_worktree::cache::state::Ignore::new(	100	gix_worktree::stack::state::Ignore::new(
101	gix_ignore::Search::from_overrides(vec!["!force-include"]),	101	gix_ignore::Search::from_overrides(vec!["!force-include"]),
102	gix_ignore::Search::from_git_dir(&git_dir, Some(user_exclude_path), &mut buf)?,	102	gix_ignore::Search::from_git_dir(&git_dir, Some(user_exclude_path), &mut buf)?,
103	None,	103	None,
@@ -113,7 +113,7 @@ fn check_against_baseline() -> crate::Result { · 9 unmodified lines
113	hex_to_id("5c7e0ed672d3d31d83a3df61f13cc8f7b22d5bfd")	113	hex_to_id("5c7e0ed672d3d31d83a3df61f13cc8f7b22d5bfd")
114	)]	114	)]
115	);	115	);
116	let mut cache = Cache::new(&worktree_dir, state, case, buf, attribute_files_in_index);	116	let mut cache = Stack::new(&worktree_dir, state, case, buf, attribute_files_in_index);
117		117
118	let baseline = std::fs::read(git_dir.parent().unwrap().join("git-check-ignore.baseline"))?;	118	let baseline = std::fs::read(git_dir.parent().unwrap().join("git-check-ignore.baseline"))?;
119	let expectations = IgnoreExpectations {	119	let expectations = IgnoreExpectations {

gix-worktree/tests/worktree/stack/mod.rsrenamed from gix-worktree/tests/worktree/cache/mod.rs+0−0

File renamed without changes.

gix/Cargo.toml+1−0

@@ -162,6 +162,7 @@ gix-credentials = { version = "^0.17.1", path = "../gix-credentials" } · 161 unmodified lines
162	gix-prompt = { version = "^0.5.5", path = "../gix-prompt" }	162	gix-prompt = { version = "^0.5.5", path = "../gix-prompt" }
163	gix-index = { version = "^0.22.0", path = "../gix-index" }	163	gix-index = { version = "^0.22.0", path = "../gix-index" }
164	gix-worktree = { version = "^0.24.0", path = "../gix-worktree" }	164	gix-worktree = { version = "^0.24.0", path = "../gix-worktree" }
		165	gix-worktree-state = { version = "^0.1.0", path = "../gix-worktree-state" }
165	gix-hashtable = { version = "^0.2.4", path = "../gix-hashtable" }	166	gix-hashtable = { version = "^0.2.4", path = "../gix-hashtable" }
166	gix-commitgraph = { version = "^0.18.2", path = "../gix-commitgraph" }	167	gix-commitgraph = { version = "^0.18.2", path = "../gix-commitgraph" }
167	gix-pathspec = { version = "^0.1.0", path = "../gix-pathspec" }	168	gix-pathspec = { version = "^0.1.0", path = "../gix-pathspec" }

gix/src/clone/checkout.rs+6−5

         CheckoutOptions(#[from] crate::config::checkout_options::Error),
         #[error(transparent)]
         IndexCheckout(
-            #[from] gix_worktree::checkout::Error<gix_odb::find::existing_object::Error<gix_odb::store::find::Error>>,
+            #[from]
+            gix_worktree_state::checkout::Error<gix_odb::find::existing_object::Error<gix_odb::store::find::Error>>,
         ),
         #[error("Failed to reopen object database as Arc (only if thread-safety wasn't compiled in)")]
         OpenArcOdb(#[from] std::io::Error),
             &mut self,
             mut progress: impl crate::Progress,
             should_interrupt: &AtomicBool,
-        ) -> Result<(Repository, gix_worktree::checkout::Outcome), Error> {
+        ) -> Result<(Repository, gix_worktree_state::checkout::Outcome), Error> {
             let _span = gix_trace::coarse!("gix::clone::PrepareCheckout::main_worktree()");
             let repo = self
                 .repo
                 None => {
                     return Ok((
                         self.repo.take().expect("still present"),
-                        gix_worktree::checkout::Outcome::default(),
+                        gix_worktree_state::checkout::Outcome::default(),
                     ))
                 }
             };
             let mut opts = repo
                 .config
-                .checkout_options(repo, gix_worktree::cache::state::attributes::Source::IdMapping)?;
+                .checkout_options(repo, gix_worktree::stack::state::attributes::Source::IdMapping)?;
             opts.destination_is_initially_empty = true;
             let mut files = progress.add_child_with_id("checkout", ProgressId::CheckoutFiles.into());
             bytes.init(None, crate::progress::bytes());
             let start = std::time::Instant::now();
-            let outcome = gix_worktree::checkout(
+            let outcome = gix_worktree_state::checkout(
                 &mut index,
                 workdir,
                 {

gix/src/config/cache/access.rs+9−9

@@ -160,8 +160,8 @@ impl Cache { · 159 unmodified lines
160	pub(crate) fn checkout_options(	160	pub(crate) fn checkout_options(
161	&self,	161	&self,
162	repo: &Repository,	162	repo: &Repository,
163	attributes_source: gix_worktree::cache::state::attributes::Source,	163	attributes_source: gix_worktree::stack::state::attributes::Source,
164	) -> Result<gix_worktree::checkout::Options, checkout_options::Error> {	164	) -> Result<gix_worktree_state::checkout::Options, checkout_options::Error> {
165	let git_dir = repo.git_dir();	165	let git_dir = repo.git_dir();
166	let thread_limit = self.apply_leniency(	166	let thread_limit = self.apply_leniency(
167	self.resolved	167	self.resolved
@@ -189,7 +189,7 @@ impl Cache { · 21 unmodified lines
189	} else {	189	} else {
190	gix_filter::driver::apply::Delay::Forbid	190	gix_filter::driver::apply::Delay::Forbid
191	};	191	};
192	Ok(gix_worktree::checkout::Options {	192	Ok(gix_worktree_state::checkout::Options {
193	filter_process_delay,	193	filter_process_delay,
194	filters,	194	filters,
195	attributes: self	195	attributes: self
@@ -219,14 +219,14 @@ impl Cache { · 23 unmodified lines
219	&self,	219	&self,
220	git_dir: &std::path::Path,	220	git_dir: &std::path::Path,
221	overrides: Option<gix_ignore::Search>,	221	overrides: Option<gix_ignore::Search>,
222	source: gix_worktree::cache::state::ignore::Source,	222	source: gix_worktree::stack::state::ignore::Source,
223	buf: &mut Vec<u8>,	223	buf: &mut Vec<u8>,
224	) -> Result<gix_worktree::cache::state::Ignore, config::exclude_stack::Error> {	224	) -> Result<gix_worktree::stack::state::Ignore, config::exclude_stack::Error> {
225	let excludes_file = match self.excludes_file().transpose()? {	225	let excludes_file = match self.excludes_file().transpose()? {
226	Some(user_path) => Some(user_path),	226	Some(user_path) => Some(user_path),
227	None => self.xdg_config_path("ignore")?,	227	None => self.xdg_config_path("ignore")?,
228	};	228	};
229	Ok(gix_worktree::cache::state::Ignore::new(	229	Ok(gix_worktree::stack::state::Ignore::new(
230	overrides.unwrap_or_default(),	230	overrides.unwrap_or_default(),
231	gix_ignore::Search::from_git_dir(git_dir, excludes_file, buf)?,	231	gix_ignore::Search::from_git_dir(git_dir, excludes_file, buf)?,
232	None,	232	None,
@@ -237,9 +237,9 @@ impl Cache { · 4 unmodified lines
237	pub(crate) fn assemble_attribute_globals(	237	pub(crate) fn assemble_attribute_globals(
238	&self,	238	&self,
239	git_dir: &std::path::Path,	239	git_dir: &std::path::Path,
240	source: gix_worktree::cache::state::attributes::Source,	240	source: gix_worktree::stack::state::attributes::Source,
241	attributes: crate::open::permissions::Attributes,	241	attributes: crate::open::permissions::Attributes,
242	) -> Result<(gix_worktree::cache::state::Attributes, Vec<u8>), config::attribute_stack::Error> {	242	) -> Result<(gix_worktree::stack::state::Attributes, Vec<u8>), config::attribute_stack::Error> {
243	let configured_or_user_attributes = match self	243	let configured_or_user_attributes = match self
244	.trusted_file_path("core", None, Core::ATTRIBUTES_FILE.name)	244	.trusted_file_path("core", None, Core::ATTRIBUTES_FILE.name)
245	.transpose()?	245	.transpose()?
@@ -265,7 +265,7 @@ impl Cache { · 19 unmodified lines
265	let info_attributes_path = git_dir.join("info").join("attributes");	265	let info_attributes_path = git_dir.join("info").join("attributes");
266	let mut buf = Vec::new();	266	let mut buf = Vec::new();
267	let mut collection = gix_attributes::search::MetadataCollection::default();	267	let mut collection = gix_attributes::search::MetadataCollection::default();
268	let state = gix_worktree::cache::state::Attributes::new(	268	let state = gix_worktree::stack::state::Attributes::new(
269	gix_attributes::Search::new_globals(attribute_files, &mut buf, &mut collection)?,	269	gix_attributes::Search::new_globals(attribute_files, &mut buf, &mut collection)?,
270	Some(info_attributes_path),	270	Some(info_attributes_path),
271	source,	271	source,

gix/src/filter.rs+3−3

@@ -67,7 +67,7 @@ pub mod pipeline { · 66 unmodified lines
67	#[derive(Clone)]	67	#[derive(Clone)]
68	pub struct Pipeline<'repo> {	68	pub struct Pipeline<'repo> {
69	inner: gix_filter::Pipeline,	69	inner: gix_filter::Pipeline,
70	cache: gix_worktree::Cache,	70	cache: gix_worktree::Stack,
71	repo: &'repo Repository,	71	repo: &'repo Repository,
72	}	72	}
73		73
@@ -110,7 +110,7 @@ impl<'repo> Pipeline<'repo> { · 36 unmodified lines
110		110
111	/// Create a new instance by extracting all necessary information and configuration from a `repo` along with `cache` for accessing	111	/// Create a new instance by extracting all necessary information and configuration from a `repo` along with `cache` for accessing
112	/// attributes. The `index` is used for some filters which may access it under very specific circumstances.	112	/// attributes. The `index` is used for some filters which may access it under very specific circumstances.
113	pub fn new(repo: &'repo Repository, cache: gix_worktree::Cache) -> Result<Self, pipeline::options::Error> {	113	pub fn new(repo: &'repo Repository, cache: gix_worktree::Stack) -> Result<Self, pipeline::options::Error> {
114	let pipeline = gix_filter::Pipeline::new(cache.attributes_collection(), Self::options(repo)?);	114	let pipeline = gix_filter::Pipeline::new(cache.attributes_collection(), Self::options(repo)?);
115	Ok(Pipeline {	115	Ok(Pipeline {
116	inner: pipeline,	116	inner: pipeline,
@@ -120,7 +120,7 @@ impl<'repo> Pipeline<'repo> { · 3 unmodified lines
120	}	120	}
121		121
122	/// Detach the repository and obtain the individual functional parts.	122	/// Detach the repository and obtain the individual functional parts.
123	pub fn into_parts(self) -> (gix_filter::Pipeline, gix_worktree::Cache) {	123	pub fn into_parts(self) -> (gix_filter::Pipeline, gix_worktree::Stack) {
124	(self.inner, self.cache)	124	(self.inner, self.cache)
125	}	125	}
126	}	126	}

gix/src/pathspec.rs+4−4

@@ -43,7 +43,7 @@ impl<'repo> Pathspec<'repo> { · 42 unmodified lines
43	repo: &'repo Repository,	43	repo: &'repo Repository,
44	patterns: impl IntoIterator<Item = impl AsRef<BStr>>,	44	patterns: impl IntoIterator<Item = impl AsRef<BStr>>,
45	inherit_ignore_case: bool,	45	inherit_ignore_case: bool,
46	make_attributes: impl FnOnce() -> Result<gix_worktree::Cache, Box<dyn std::error::Error + Send + Sync + 'static>>,	46	make_attributes: impl FnOnce() -> Result<gix_worktree::Stack, Box<dyn std::error::Error + Send + Sync + 'static>>,
47	) -> Result<Self, init::Error> {	47	) -> Result<Self, init::Error> {
48	let mut defaults = repo.pathspec_defaults()?;	48	let mut defaults = repo.pathspec_defaults()?;
49	if inherit_ignore_case && repo.config.fs_capabilities()?.ignore_case {	49	if inherit_ignore_case && repo.config.fs_capabilities()?.ignore_case {
@@ -67,9 +67,9 @@ impl<'repo> Pathspec<'repo> { · 17 unmodified lines
67	Ok(Self { repo, search, cache })	67	Ok(Self { repo, search, cache })
68	}	68	}
69	/// Turn ourselves into the functional parts for direct usage.	69	/// Turn ourselves into the functional parts for direct usage.
70	/// Note that the [`cache`](gix_worktree::Cache) is only set if one of the [`search` patterns](Search)	70	/// Note that the [`cache`](gix_worktree::Stack) is only set if one of the [`search` patterns](Search)
71	/// is specifying attributes to match for.	71	/// is specifying attributes to match for.
72	pub fn into_parts(self) -> (Search, Option<gix_worktree::Cache>) {	72	pub fn into_parts(self) -> (Search, Option<gix_worktree::Stack>) {
73	(self.search, self.cache)	73	(self.search, self.cache)
74	}	74	}
75	}	75	}
@@ -77,7 +77,7 @@ impl<'repo> Pathspec<'repo> { · 1 unmodified line
77	/// Access	77	/// Access
78	impl<'repo> Pathspec<'repo> {	78	impl<'repo> Pathspec<'repo> {
79	/// Return the attributes cache which is used when matching attributes in pathspecs, or `None` if none of the pathspecs require that.	79	/// Return the attributes cache which is used when matching attributes in pathspecs, or `None` if none of the pathspecs require that.
80	pub fn attributes(&self) -> Option<&gix_worktree::Cache> {	80	pub fn attributes(&self) -> Option<&gix_worktree::Stack> {
81	self.cache.as_ref()	81	self.cache.as_ref()
82	}	82	}
83		83

gix/src/repository/attributes.rs+13−13

@@ -29,10 +29,10 @@ impl Repository { · 28 unmodified lines
29	pub fn attributes(	29	pub fn attributes(
30	&self,	30	&self,
31	index: &gix_index::State,	31	index: &gix_index::State,
32	attributes_source: gix_worktree::cache::state::attributes::Source,	32	attributes_source: gix_worktree::stack::state::attributes::Source,
33	ignore_source: gix_worktree::cache::state::ignore::Source,	33	ignore_source: gix_worktree::stack::state::ignore::Source,
34	exclude_overrides: Option<gix_ignore::Search>,	34	exclude_overrides: Option<gix_ignore::Search>,
35	) -> Result<gix_worktree::Cache, Error> {	35	) -> Result<gix_worktree::Stack, Error> {
36	let case = if self.config.ignore_case {	36	let case = if self.config.ignore_case {
37	gix_glob::pattern::Case::Fold	37	gix_glob::pattern::Case::Fold
38	} else {	38	} else {
@@ -46,9 +46,9 @@ impl Repository { · 7 unmodified lines
46	let ignore =	46	let ignore =
47	self.config	47	self.config
48	.assemble_exclude_globals(self.git_dir(), exclude_overrides, ignore_source, &mut buf)?;	48	.assemble_exclude_globals(self.git_dir(), exclude_overrides, ignore_source, &mut buf)?;
49	let state = gix_worktree::cache::State::AttributesAndIgnoreStack { attributes, ignore };	49	let state = gix_worktree::stack::State::AttributesAndIgnoreStack { attributes, ignore };
50	let attribute_list = state.id_mappings_from_index(index, index.path_backing(), case);	50	let attribute_list = state.id_mappings_from_index(index, index.path_backing(), case);
51	Ok(gix_worktree::Cache::new(	51	Ok(gix_worktree::Stack::new(
52	// this is alright as we don't cause mutation of that directory, it's virtual.	52	// this is alright as we don't cause mutation of that directory, it's virtual.
53	self.work_dir().unwrap_or(self.git_dir()),	53	self.work_dir().unwrap_or(self.git_dir()),
54	state,	54	state,
@@ -62,8 +62,8 @@ impl Repository { · 7 unmodified lines
62	pub fn attributes_only(	62	pub fn attributes_only(
63	&self,	63	&self,
64	index: &gix_index::State,	64	index: &gix_index::State,
65	attributes_source: gix_worktree::cache::state::attributes::Source,	65	attributes_source: gix_worktree::stack::state::attributes::Source,
66	) -> Result<gix_worktree::Cache, config::attribute_stack::Error> {	66	) -> Result<gix_worktree::Stack, config::attribute_stack::Error> {
67	let case = if self.config.ignore_case {	67	let case = if self.config.ignore_case {
68	gix_glob::pattern::Case::Fold	68	gix_glob::pattern::Case::Fold
69	} else {	69	} else {
@@ -74,9 +74,9 @@ impl Repository { · 4 unmodified lines
74	attributes_source,	74	attributes_source,
75	self.options.permissions.attributes,	75	self.options.permissions.attributes,
76	)?;	76	)?;
77	let state = gix_worktree::cache::State::AttributesStack(attributes);	77	let state = gix_worktree::stack::State::AttributesStack(attributes);
78	let attribute_list = state.id_mappings_from_index(index, index.path_backing(), case);	78	let attribute_list = state.id_mappings_from_index(index, index.path_backing(), case);
79	Ok(gix_worktree::Cache::new(	79	Ok(gix_worktree::Stack::new(
80	// this is alright as we don't cause mutation of that directory, it's virtual.	80	// this is alright as we don't cause mutation of that directory, it's virtual.
81	self.work_dir().unwrap_or(self.git_dir()),	81	self.work_dir().unwrap_or(self.git_dir()),
82	state,	82	state,
@@ -105,8 +105,8 @@ impl Repository { · 22 unmodified lines
105	&self,	105	&self,
106	index: &gix_index::State,	106	index: &gix_index::State,
107	overrides: Option<gix_ignore::Search>,	107	overrides: Option<gix_ignore::Search>,
108	source: gix_worktree::cache::state::ignore::Source,	108	source: gix_worktree::stack::state::ignore::Source,
109	) -> Result<gix_worktree::Cache, config::exclude_stack::Error> {	109	) -> Result<gix_worktree::Stack, config::exclude_stack::Error> {
110	let case = if self.config.ignore_case {	110	let case = if self.config.ignore_case {
111	gix_glob::pattern::Case::Fold	111	gix_glob::pattern::Case::Fold
112	} else {	112	} else {
@@ -116,9 +116,9 @@ impl Repository { · 3 unmodified lines
116	let ignore = self	116	let ignore = self
117	.config	117	.config
118	.assemble_exclude_globals(self.git_dir(), overrides, source, &mut buf)?;	118	.assemble_exclude_globals(self.git_dir(), overrides, source, &mut buf)?;
119	let state = gix_worktree::cache::State::IgnoreStack(ignore);	119	let state = gix_worktree::stack::State::IgnoreStack(ignore);
120	let attribute_list = state.id_mappings_from_index(index, index.path_backing(), case);	120	let attribute_list = state.id_mappings_from_index(index, index.path_backing(), case);
121	Ok(gix_worktree::Cache::new(	121	Ok(gix_worktree::Stack::new(
122	// this is alright as we don't cause mutation of that directory, it's virtual.	122	// this is alright as we don't cause mutation of that directory, it's virtual.
123	self.work_dir().unwrap_or(self.git_dir()),	123	self.work_dir().unwrap_or(self.git_dir()),
124	state,	124	state,

gix/src/repository/filter.rs+2−2

@@ -49,13 +49,13 @@ impl Repository { · 48 unmodified lines
49	},	49	},
50	Ok,	50	Ok,
51	)?)?;	51	)?)?;
52	let cache = self.attributes_only(&index, gix_worktree::cache::state::attributes::Source::IdMapping)?;	52	let cache = self.attributes_only(&index, gix_worktree::stack::state::attributes::Source::IdMapping)?;
53	(cache, IndexPersistedOrInMemory::InMemory(index))	53	(cache, IndexPersistedOrInMemory::InMemory(index))
54	} else {	54	} else {
55	let index = self.index()?;	55	let index = self.index()?;
56	let cache = self.attributes_only(	56	let cache = self.attributes_only(
57	&index,	57	&index,
58	gix_worktree::cache::state::attributes::Source::WorktreeThenIdMapping,	58	gix_worktree::stack::state::attributes::Source::WorktreeThenIdMapping,
59	)?;	59	)?;
60	(cache, IndexPersistedOrInMemory::Persisted(index))	60	(cache, IndexPersistedOrInMemory::Persisted(index))
61	};	61	};

gix/src/repository/pathspec.rs+1−1

@@ -17,7 +17,7 @@ impl Repository { · 16 unmodified lines
17	Pathspec::new(self, patterns, inherit_ignore_case, \|\| {	17	Pathspec::new(self, patterns, inherit_ignore_case, \|\| {
18	self.attributes_only(	18	self.attributes_only(
19	index,	19	index,
20	gix_worktree::cache::state::attributes::Source::WorktreeThenIdMapping,	20	gix_worktree::stack::state::attributes::Source::WorktreeThenIdMapping,
21	)	21	)
22	.map_err(Into::into)	22	.map_err(Into::into)
23	})	23	})

gix/src/repository/worktree.rs+1−1

@@ -74,7 +74,7 @@ impl crate::Repository { · 73 unmodified lines
74	// TODO(perf): when loading a non-HEAD tree, we effectively traverse the tree twice. This is usually fast though, and sharing	74	// TODO(perf): when loading a non-HEAD tree, we effectively traverse the tree twice. This is usually fast though, and sharing
75	// an object cache between the copies of the ODB handles isn't trivial and needs a lock.	75	// an object cache between the copies of the ODB handles isn't trivial and needs a lock.
76	let index = self.index_from_tree(&id)?;	76	let index = self.index_from_tree(&id)?;
77	let mut cache = self.attributes_only(&index, gix_worktree::cache::state::attributes::Source::IdMapping)?;	77	let mut cache = self.attributes_only(&index, gix_worktree::stack::state::attributes::Source::IdMapping)?;
78	let pipeline =	78	let pipeline =
79	gix_filter::Pipeline::new(cache.attributes_collection(), crate::filter::Pipeline::options(self)?);	79	gix_filter::Pipeline::new(cache.attributes_collection(), crate::filter::Pipeline::options(self)?);
80	let objects = self.objects.clone().into_arc().expect("TBD error handling");	80	let objects = self.objects.clone().into_arc().expect("TBD error handling");

gix/src/types.rs+1−1

@@ -202,7 +202,7 @@ pub struct Remote<'repo> { · 201 unmodified lines
202	pub struct Pathspec<'repo> {	202	pub struct Pathspec<'repo> {
203	pub(crate) repo: &'repo Repository,	203	pub(crate) repo: &'repo Repository,
204	/// The cache to power attribute access. It's only initialized if we have a pattern with attributes.	204	/// The cache to power attribute access. It's only initialized if we have a pattern with attributes.
205	pub(crate) cache: Option<gix_worktree::Cache>,	205	pub(crate) cache: Option<gix_worktree::Stack>,
206	/// The prepared search to use for checking matches.	206	/// The prepared search to use for checking matches.
207	pub(crate) search: gix_pathspec::Search,	207	pub(crate) search: gix_pathspec::Search,
208	}	208	}

gix/src/worktree/mod.rs+8−7

 #[cfg(feature = "worktree-archive")]
 pub use gix_archive as archive;
 pub use gix_worktree::*;
+pub use gix_worktree_state as state;
 #[cfg(feature = "worktree-stream")]
 pub use gix_worktree_stream as stream;
         ///
         /// When only excludes are desired, this is the most efficient way to obtain them. Otherwise use
         /// [`Worktree::attributes()`][crate::Worktree::attributes()] for accessing both attributes and excludes.
-        pub fn excludes(&self, overrides: Option<gix_ignore::Search>) -> Result<gix_worktree::Cache, Error> {
+        pub fn excludes(&self, overrides: Option<gix_ignore::Search>) -> Result<gix_worktree::Stack, Error> {
             let index = self.index()?;
             Ok(self.parent.excludes(
                 &index,
                 overrides,
-                gix_worktree::cache::state::ignore::Source::WorktreeThenIdMappingIfNotSkipped,
+                gix_worktree::stack::state::ignore::Source::WorktreeThenIdMappingIfNotSkipped,
             )?)
         }
     }
         ///
         /// * `$XDG_CONFIG_HOME/…/ignore|attributes` if `core.excludesFile|attributesFile` is *not* set, otherwise use the configured file.
         /// * `$GIT_DIR/info/exclude|attributes` if present.
-        pub fn attributes(&self, overrides: Option<gix_ignore::Search>) -> Result<gix_worktree::Cache, Error> {
+        pub fn attributes(&self, overrides: Option<gix_ignore::Search>) -> Result<gix_worktree::Stack, Error> {
             let index = self.index()?;
             Ok(self.parent.attributes(
                 &index,
-                gix_worktree::cache::state::attributes::Source::WorktreeThenIdMapping,
+                gix_worktree::stack::state::attributes::Source::WorktreeThenIdMapping,
-                gix_worktree::cache::state::ignore::Source::WorktreeThenIdMappingIfNotSkipped,
+                gix_worktree::stack::state::ignore::Source::WorktreeThenIdMappingIfNotSkipped,
                 overrides,
             )?)
         }
         /// Like [attributes()][Self::attributes()], but without access to exclude/ignore information.
-        pub fn attributes_only(&self) -> Result<gix_worktree::Cache, Error> {
+        pub fn attributes_only(&self) -> Result<gix_worktree::Stack, Error> {
             let index = self.index()?;
             self.parent
                 .attributes_only(
                     &index,
-                    gix_worktree::cache::state::attributes::Source::WorktreeThenIdMapping,
+                    gix_worktree::stack::state::attributes::Source::WorktreeThenIdMapping,
                 )
                 .map_err(|err| Error::CreateCache(err.into()))
         }

justfile+8−3

     cargo check -p gix-config-value
     cargo check -p gix-config --all-features
     cargo check -p gix-config
+    cargo check -p gix-diff --no-default-features
     cargo check -p gix-transport
     cargo check -p gix-transport --features blocking-client
     cargo check -p gix-transport --features async-client
     cargo test -p gix-archive --features tar
     cargo test -p gix-archive --features tar_gz
     cargo test -p gix-archive --features zip
-    cd gix-object; \
+    cd gix-status; \
       set -ex; \
       cargo test; \
-      cargo test --features verbose-object-parsing-errors
+      cargo test --features "internal-testing-gix-features-parallel"
-    cd gix-worktree; \
+    cd gix-worktree-state; \
       set -ex; \
       cargo test; \
       cargo test --features "internal-testing-gix-features-parallel"
+    cd gix-object; \
+      set -ex; \
+      cargo test; \
+      cargo test --features verbose-object-parsing-errors
     cargo test -p gix-tempfile --features signals
     cargo test -p gix-tempfile
     cargo test -p gix-features