Merge branch 'worktree-stack'

Author: Byron

Cargo.lock

@@ -65,7 +65,7 @@ clippy: ## Run cargo clippy on all crates
 	cargo clippy --all --no-default-features --features lean-async --tests
 
 check-msrv: ## run cargo msrv to validate the current msrv requirements, similar to what CI does
-	cd git-repository && cargo msrv verify
+	cd git-repository && cargo +1.54.0 check --package git-repository --no-default-features --features async-network-client,unstable,local-time-support,max-performance
 
 check-win: ## see that windows compiles, provided the x86_64-pc-windows-msvc target and cargo-xwin are present.
 	cargo xwin build --target x86_64-pc-windows-msvc  --no-default-features --features small
@@ -286,7 +286,7 @@ bench-git-config:
 check-msrv-on-ci: ## Check the minimal support rust version for currently installed Rust version
 	rustc --version
 	cargo check --package git-repository
-	cargo check --package git-repository --no-default-features --features async-network-client
+	cargo check --package git-repository --no-default-features --features async-network-client,unstable,local-time-support,max-performance
 
 ##@ Maintenance
 

Makefile

@@ -110,6 +110,9 @@ Crates that seem feature complete and need to see some more use before they can
   * [git-traverse](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-traverse)
   * [git-config](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-config)
   * [git-features](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-features)
+  * [git-credentials](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-credentials)
+  * [git-sec](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-sec)
+  * [git-quote](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-quote)
   * [git-ref](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-ref)
   * [git-repository](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-repository)
   * `gitoxide-core`
@@ -119,10 +122,7 @@ Crates that seem feature complete and need to see some more use before they can
   * [git-bitmap](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-bitmap)
   * [git-revision](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-revision)
   * [git-attributes](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-attributes)
-  * [git-quote](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-quote)
 * **idea**
-  * [git-credentials](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-credentials)
-  * [git-sec](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-sec)
   * [git-note](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-note)
   * [git-filter](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-filter)
   * [git-date](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-date)

README.md

@@ -37,6 +37,8 @@ echo "in root: gitoxide CLI"
 (enter git-url && indent cargo diet -n --package-size-limit 15KB)
 (enter git-validate && indent cargo diet -n --package-size-limit 5KB)
 (enter git-date && indent cargo diet -n --package-size-limit 5KB)
+(enter git-filter && indent cargo diet -n --package-size-limit 5KB)
+(enter git-lfs && indent cargo diet -n --package-size-limit 5KB)
 (enter git-note && indent cargo diet -n --package-size-limit 5KB)
 (enter git-sec && indent cargo diet -n --package-size-limit 5KB)
 (enter git-tix && indent cargo diet -n --package-size-limit 5KB)

etc/check-package-size.sh

@@ -17,6 +17,7 @@ serde1 = ["serde", "bstr/serde1", "git-glob/serde1"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+git-features = { version = "^0.20.0", path = "../git-features" }
 git-quote = { version = "^0.2.0", path = "../git-quote" }
 git-glob = { version = "^0.2.0", path = "../git-glob" }
 

git-attributes/Cargo.toml

@@ -1,7 +1,7 @@
 #![forbid(unsafe_code)]
 #![deny(rust_2018_idioms)]
 
-use bstr::BStr;
+use bstr::{BStr, BString};
 
 #[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
 #[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
@@ -18,6 +18,88 @@ pub enum State<'a> {
     Unspecified,
 }
 
+/// A grouping of lists of patterns while possibly keeping associated to their base path.
+///
+/// Patterns with base path are queryable relative to that base, otherwise they are relative to the repository root.
+#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
+pub struct MatchGroup<T: match_group::Tag> {
+    /// A list of pattern lists, each representing a patterns from a file or specified by hand, in the order they were
+    /// specified in.
+    ///
+    /// During matching, this order is reversed.
+    pub patterns: Vec<PatternList<T>>,
+}
+
+/// A list of patterns with an optional names, for matching against it.
+#[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
+pub struct PatternList<T: match_group::Tag> {
+    /// Patterns and their associated data in the order they were loaded in or specified.
+    ///
+    /// During matching, this order is reversed.
+    pub patterns: Vec<(git_glob::Pattern, T::Value)>,
+
+    /// The path at which the patterns are located in a format suitable for matches, or `None` if the patterns
+    /// are relative to the worktree root.
+    base: Option<BString>,
+}
+
+mod match_group {
+    use crate::{MatchGroup, PatternList};
+    use std::ffi::OsString;
+    use std::path::PathBuf;
+
+    /// A marker trait to identify the type of a description.
+    pub trait Tag: Clone + PartialEq + Eq + std::fmt::Debug + std::hash::Hash + Ord + PartialOrd {
+        /// The value associated with a pattern.
+        type Value: PartialEq + Eq + std::fmt::Debug + std::hash::Hash + Ord + PartialOrd + Clone;
+    }
+
+    /// Identify ignore patterns.
+    #[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
+    pub struct Ignore;
+    impl Tag for Ignore {
+        type Value = ();
+    }
+
+    /// Identify patterns with attributes.
+    #[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
+    pub struct Attributes;
+    impl Tag for Attributes {
+        /// TODO: identify the actual value, should be name/State pairs, but there is the question of storage.
+        type Value = ();
+    }
+
+    impl MatchGroup<Ignore> {
+        /// See [PatternList::<Ignore>::from_overrides()] for details.
+        pub fn from_overrides(patterns: impl IntoIterator<Item = impl Into<OsString>>) -> Self {
+            MatchGroup {
+                patterns: vec![PatternList::<Ignore>::from_overrides(patterns)],
+            }
+        }
+    }
+
+    impl PatternList<Ignore> {
+        /// Parse a list of patterns, using slashes as path separators
+        pub fn from_overrides(patterns: impl IntoIterator<Item = impl Into<OsString>>) -> Self {
+            PatternList {
+                patterns: patterns
+                    .into_iter()
+                    .map(Into::into)
+                    .filter_map(|pattern| {
+                        let pattern = git_features::path::into_bytes(PathBuf::from(pattern)).ok()?;
+                        git_glob::parse(pattern.as_ref()).map(|p| (p, ()))
+                    })
+                    .collect(),
+                base: None,
+            }
+        }
+    }
+}
+pub use match_group::{Attributes, Ignore, Tag};
+
+pub type Files = MatchGroup<Attributes>;
+pub type IgnoreFiles = MatchGroup<Ignore>;
+
 pub mod parse;
 
 pub fn parse(buf: &[u8]) -> parse::Lines<'_> {

git-attributes/src/lib.rs

@@ -1 +1,2 @@
+mod match_group;
 mod parse;

git-attributes/tests/attributes.rs

@@ -0,0 +1,14 @@
+mod ignore {
+    use git_attributes::Ignore;
+
+    #[test]
+    fn init_from_overrides() {
+        let input = ["simple", "pattern/"];
+        let patterns = git_attributes::MatchGroup::<Ignore>::from_overrides(input).patterns;
+        assert_eq!(patterns.len(), 1);
+        assert_eq!(
+            git_attributes::PatternList::<Ignore>::from_overrides(input),
+            patterns.into_iter().next().unwrap()
+        );
+    }
+}

git-attributes/tests/match_group/mod.rs

@@ -30,7 +30,7 @@ fn line_numbers_are_counted_correctly() {
             (pattern(r"!foo.html", Mode::NO_SUB_DIR, None), vec![set("x")], 8),
             (pattern(r"#a/path", Mode::empty(), None), vec![unset("a")], 10),
             (
-                pattern(r"*", Mode::ABSOLUTE | Mode::NO_SUB_DIR | Mode::ENDS_WITH, Some(0)),
+                pattern(r"/*", Mode::ABSOLUTE | Mode::NO_SUB_DIR | Mode::ENDS_WITH, Some(1)),
                 vec![unspecified("b")],
                 11
             ),
@@ -272,7 +272,6 @@ fn pattern(name: &str, flags: git_glob::pattern::Mode, first_wildcard_pos: Optio
         text: name.into(),
         mode: flags,
         first_wildcard_pos,
-        base_path: None,
     })
 }
 

git-attributes/tests/parse/attribute.rs

@@ -20,10 +20,10 @@ fn line_numbers_are_counted_correctly() {
             ("*.[oa]".into(), Mode::NO_SUB_DIR, 2),
             ("*.html".into(), Mode::NO_SUB_DIR | Mode::ENDS_WITH, 5),
             ("foo.html".into(), Mode::NO_SUB_DIR | Mode::NEGATIVE, 8),
-            ("*".into(), Mode::NO_SUB_DIR | Mode::ENDS_WITH | Mode::ABSOLUTE, 11),
-            ("foo".into(), Mode::NEGATIVE | Mode::NO_SUB_DIR | Mode::ABSOLUTE, 12),
-            ("foo/*".into(), Mode::ABSOLUTE, 13),
-            ("foo/bar".into(), Mode::ABSOLUTE | Mode::NEGATIVE, 14)
+            ("/*".into(), Mode::NO_SUB_DIR | Mode::ENDS_WITH | Mode::ABSOLUTE, 11),
+            ("/foo".into(), Mode::NEGATIVE | Mode::NO_SUB_DIR | Mode::ABSOLUTE, 12),
+            ("/foo/*".into(), Mode::ABSOLUTE, 13),
+            ("/foo/bar".into(), Mode::ABSOLUTE | Mode::NEGATIVE, 14)
         ]
     );
 }

git-attributes/tests/parse/ignore.rs

@@ -1,7 +1,9 @@
-use crate::values::b;
-use git_config::values::{Boolean, TrueVariant};
 use std::convert::TryFrom;
 
+use git_config::values::{Boolean, TrueVariant};
+
+use crate::values::b;
+
 #[test]
 fn from_str_false() {
     assert_eq!(Boolean::try_from(b("no")), Ok(Boolean::False("no".into())));

git-config/tests/values/boolean.rs

@@ -1,6 +1,7 @@
-use git_config::values::ColorAttribute;
 use std::str::FromStr;
 
+use git_config::values::ColorAttribute;
+
 #[test]
 fn non_inverted() {
     assert_eq!(ColorAttribute::from_str("bold"), Ok(ColorAttribute::Bold));

git-config/tests/values/color_attribute.rs

@@ -1,6 +1,7 @@
-use git_config::values::ColorValue;
 use std::str::FromStr;
 
+use git_config::values::ColorValue;
+
 #[test]
 fn non_bright() {
     assert_eq!(ColorValue::from_str("normal"), Ok(ColorValue::Normal));

git-config/tests/values/color_value.rs

@@ -1,7 +1,9 @@
-use crate::values::b;
-use git_config::values::{Integer, IntegerSuffix};
 use std::convert::TryFrom;
 
+use git_config::values::{Integer, IntegerSuffix};
+
+use crate::values::b;
+
 #[test]
 fn from_str_no_suffix() {
     assert_eq!(Integer::try_from(b("1")).unwrap(), Integer { value: 1, suffix: None });

git-config/tests/values/integer.rs

@@ -1,6 +1,7 @@
-use git_config::values::normalize_str;
 use std::borrow::Cow;
 
+use git_config::values::normalize_str;
+
 #[test]
 fn not_modified_is_borrowed() {
     assert_eq!(normalize_str("hello world"), Cow::Borrowed(b"hello world"));

git-config/tests/values/normalize.rs

@@ -1,8 +1,9 @@
-use crate::values::b;
-use git_config::values::path::interpolate;
-use git_config::values::Path;
 use std::borrow::Cow;
 
+use git_config::values::{path::interpolate, Path};
+
+use crate::values::b;
+
 #[test]
 fn no_interpolation_for_paths_without_tilde_or_prefix() {
     let path = &b"/foo/bar"[..];

git-config/tests/values/path.rs

@@ -16,9 +16,6 @@ pub struct Pattern {
     pub mode: pattern::Mode,
     /// The position in `text` with the first wildcard character, or `None` if there is no wildcard at all.
     pub first_wildcard_pos: Option<usize>,
-    /// The relative base at which this pattern resides, with trailing slash, using slashes as path separator.
-    /// If `None`, the pattern is considered to be at the root of the repository.
-    pub base_path: Option<BString>,
 }
 
 ///

git-glob/src/lib.rs

@@ -26,21 +26,23 @@ pub fn pattern(mut pat: &[u8]) -> Option<(BString, pattern::Mode, Option<usize>)
     }
     if pat.first() == Some(&b'/') {
         mode |= Mode::ABSOLUTE;
-        pat = &pat[1..];
     }
-    let mut line = truncate_non_escaped_trailing_spaces(pat);
-    if line.last() == Some(&b'/') {
+    let mut pat = truncate_non_escaped_trailing_spaces(pat);
+    if pat.last() == Some(&b'/') {
         mode |= Mode::MUST_BE_DIR;
-        line.pop();
+        pat.pop();
     }
-    if !line.contains(&b'/') {
+
+    let relative_pattern = mode.contains(Mode::ABSOLUTE).then(|| &pat[1..]).unwrap_or(&pat);
+    if !relative_pattern.contains(&b'/') {
         mode |= Mode::NO_SUB_DIR;
     }
-    let pos_of_first_wildcard = first_wildcard_pos(&line);
-    if line.first() == Some(&b'*') && first_wildcard_pos(&line[1..]).is_none() {
+    if relative_pattern.first() == Some(&b'*') && first_wildcard_pos(&relative_pattern[1..]).is_none() {
         mode |= Mode::ENDS_WITH;
     }
-    Some((line, mode, pos_of_first_wildcard))
+
+    let pos_of_first_wildcard = first_wildcard_pos(&pat);
+    Some((pat, mode, pos_of_first_wildcard))
 }
 
 fn first_wildcard_pos(pat: &[u8]) -> Option<usize> {