Merge branch 'main' into repo-status

GitoxideLabs · Apr 14, 2022 · 4086335 · 4086335
2 parents 499c811 + 16570ef
commit 4086335
Show file tree

Hide file tree

Showing 48 changed files with 2,013 additions and 343 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,7 +5,7 @@ repository = "https://github.com/Byron/gitoxide"
 authors = ["Sebastian Thiel <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"
-version = "0.12.0"
+version = "0.13.0"
 default-run = "gix"
 include = ["src/**/*", "LICENSE-*", "README.md", "CHANGELOG.md"]
 resolver = "2"
@@ -82,9 +82,9 @@ cache-efficiency-debug = ["git-features/cache-efficiency-debug"]
 [dependencies]
 anyhow = "1.0.42"
 
-gitoxide-core = { version = "^0.14.0", path = "gitoxide-core" }
+gitoxide-core = { version = "^0.15.0", path = "gitoxide-core" }
 git-features = { version = "^0.20.0", path = "git-features" }
-git-repository = { version = "^0.16.0", path = "git-repository", default-features = false }
+git-repository = { version = "^0.17.0", path = "git-repository", default-features = false }
 
 git-transport-for-configuration-only = { package = "git-transport", optional = true, version = "^0.16.0", path = "git-transport" }
 
@@ -135,6 +135,7 @@ members = [
     "git-chunk",
     "git-quote",
     "git-object",
+    "git-glob",
     "git-diff",
     "git-traverse",
     "git-index",
@@ -156,6 +157,7 @@ members = [
     "git-repository",
     "gitoxide-core",
     "git-tui",
+    "git-tix",
 
     "experiments/object-access",
     "experiments/diffing",

diff --git a/Makefile b/Makefile
@@ -91,6 +91,7 @@ check: ## Build all code in suitable configurations
 	cd git-index && cargo check --features serde1
 	cd git-revision && cargo check --features serde1
 	cd git-attributes && cargo check --features serde1
+	cd git-glob && cargo check --features serde1
 	cd git-mailmap && cargo check --features serde1
 	cd git-worktree && cargo check --features serde1
 	cd git-actor && cargo check --features serde1

diff --git a/README.md b/README.md
@@ -90,15 +90,16 @@ Follow linked crate name for detailed status. Please note that all crates follow
 Crates that seem feature complete and need to see some more use before they can be released as 1.0.
 
 * [git-mailmap](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-mailmap)
+* [git-chunk](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-chunk)
 
 ### Initial Development
 * **usable**
   * [git-actor](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-actor)
   * [git-hash](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-hash)
-  * [git-chunk](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-chunk)
   * [git-object](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-object)
   * [git-validate](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-validate)
   * [git-url](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-url)
+  * [git-glob](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-glob)
   * [git-packetline](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-packetline)
   * [git-transport](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-transport)
   * [git-protocol](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-protocol)
@@ -124,6 +125,7 @@ Crates that seem feature complete and need to see some more use before they can
   * [git-pathspec](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-pathspec)
   * [git-subomdule](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-submodule)
   * [git-tui](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-tui)
+  * [git-tix](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-tix)
   * [git-bundle](https://github.com/Byron/gitoxide/blob/main/crate-status.md#git-bundle)
 
 ### Stress Testing

diff --git a/cargo-smart-release/Cargo.toml b/cargo-smart-release/Cargo.toml
@@ -26,7 +26,7 @@ test = false
 cache-efficiency-debug = ["git-repository/cache-efficiency-debug"]
 
 [dependencies]
-git-repository = { version = "^0.16.0", path = "../git-repository", features = ["unstable"] }
+git-repository = { version = "^0.17.0", path = "../git-repository", features = ["unstable"] }
 anyhow = "1.0.42"
 clap = { version = "3.0.0", features = ["derive", "cargo"] }
 env_logger = { version = "0.9.0", default-features = false, features = ["humantime", "termcolor", "atty"] }

diff --git a/crate-status.md b/crate-status.md
@@ -1,5 +1,4 @@
 ### git-actor
-
 * [x] read and write a signature that uniquely identifies an actor within a git repository
 
 ### git-hash
@@ -9,8 +8,8 @@
     * [ ] Some examples
 
 ### git-chunk
-* [ ] decode the chunk file table of contents and provide convenient API
-* [ ] write the table of contents
+* [x] decode the chunk file table of contents and provide convenient API
+* [x] write the table of contents
 
 ### git-object
 * *decode (zero-copy)* borrowed objects
@@ -28,7 +27,6 @@
     * [ ] Some examples
 
 ### git-pack
-
 * **packs**
     * [x] traverse pack index
     * [x] 'object' abstraction
@@ -73,7 +71,6 @@
     * [ ] Some examples
 
 ### git-odb
-
 * **loose object store**
     * [x] traverse
     * [x] read
@@ -210,25 +207,21 @@ Check out the [performance discussion][git-traverse-performance] as well.
     * [ ] Some examples
 
 ### git-attributes
-
 * [x] parse git-ignore files (aka git-attributes without the attributes or negation)
 * [x] parse git-attributes files
 * [ ] create an attributes stack, ideally one that includes 'ignored' status from .gitignore files.
    * [ ] support for built-in `binary` macro for `-text -diff -merge`
 
 ### git-quote
-
 * **ansi-c**
   * [x] quote
   * [ ] unquote
 
 ### git-mailmap
-
 * [x] parsing
 * [x] lookup and mapping of author names
 
 ### git-pathspec
-
 * [ ] parse
 * [ ] check for match
 
@@ -238,6 +231,10 @@ A mechanism to associate metadata with any object, and keep revisions of it usin
 
 * [ ] CRUD for git notes
 
+### git-glob
+* [x] parse pattern
+* [x] a type for pattern matching of paths and non-paths, optionally case-insensitively.
+
 ### git-worktree
 * handle the working tree/checkout
   - [x] checkout an index of files, executables and symlinks just as fast as git
@@ -263,7 +260,6 @@ A mechanism to associate metadata with any object, and keep revisions of it usin
 * parse specifications into revisions (like `git rev-parse`)
 
 ### git-submodule
-
 * CRUD for submodules
 * try to handle with all the nifty interactions and be a little more comfortable than what git offers, lay a foundation for smarter git submodules.
 
@@ -488,6 +484,10 @@ See its [README.md](https://github.com/Byron/gitoxide/blob/main/git-lock/README.
 ### git-tui
 * _a terminal user interface seeking to replace and improve on `tig`_
 * Can display complex history in novel ways to make them graspable. Maybe [this post] can be an inspiration.
+
+### git-tix
+
+A re-implementation of a minimal `tig` like UI that aims to be fast and to the point.
 
 [tagname-validation]: https://github.com/git/git/blob/master/Documentation/technical/protocol-common.txt#L23:L23
 [this post]: http://blog.danieljanus.pl/2021/07/01/commit-groups/
diff --git a/experiments/diffing/Cargo.toml b/experiments/diffing/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 
 [dependencies]
 anyhow = "1"
-git-repository = { version = "^0.16.0", path = "../../git-repository", features = ["unstable"] }
+git-repository = { version = "^0.17.0", path = "../../git-repository", features = ["unstable"] }
 git-features-for-config = { package = "git-features", version = "^0.20.0", path = "../../git-features", features = ["cache-efficiency-debug"] }
 git2 = "0.14"
 rayon = "1.5.0"

diff --git a/experiments/object-access/Cargo.toml b/experiments/object-access/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 
 [dependencies]
 anyhow = "1"
-git-repository = { path = "../../git-repository", version = "^0.16.0", features = ["unstable"] }
+git-repository = { path = "../../git-repository", version = "^0.17.0", features = ["unstable"] }
 git2 = "0.14"
 rayon = "1.5.0"
 parking_lot = { version = "0.12.0", default-features = false }
diff --git a/experiments/traversal/Cargo.toml b/experiments/traversal/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 
 [dependencies]
 anyhow = "1"
-git-repository = { version = "^0.16.0", path = "../../git-repository", features = ["unstable"] }
+git-repository = { version = "^0.17.0", path = "../../git-repository", features = ["unstable"] }
 git2 = "0.14"
 rayon = "1.5.0"
 dashmap = "5.1.0"
diff --git a/git-actor/src/signature/mod.rs b/git-actor/src/signature/mod.rs
@@ -1,7 +1,8 @@
 mod _ref {
-    use crate::{signature::decode, Signature, SignatureRef};
     use bstr::ByteSlice;
 
+    use crate::{signature::decode, Signature, SignatureRef};
+
     impl<'a> SignatureRef<'a> {
         /// Deserialize a signature from the given `data`.
         pub fn from_bytes<E>(data: &'a [u8]) -> Result<SignatureRef<'a>, nom::Err<E>>

diff --git a/git-attributes/Cargo.toml b/git-attributes/Cargo.toml
@@ -12,15 +12,15 @@ doctest = false
 
 [features]
 ## Data structures implement `serde::Serialize` and `serde::Deserialize`.
-serde1 = ["serde", "bstr/serde1"]
+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-quote = { version = "^0.2.0", path = "../git-quote" }
+git-glob = { version = "^0.2.0", path = "../git-glob" }
 
 bstr = { version = "0.2.13", default-features = false, features = ["std"]}
-bitflags = "1.3.2"
 unicode-bom = "1.1.4"
 quick-error = "2.0.0"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}

diff --git a/git-attributes/src/ignore.rs b/git-attributes/src/ignore.rs
diff --git a/git-attributes/src/lib.rs b/git-attributes/src/lib.rs
@@ -18,8 +18,6 @@ pub enum State<'a> {
     Unspecified,
 }
 
-pub mod ignore;
-
 pub mod parse;
 
 pub fn parse(buf: &[u8]) -> parse::Lines<'_> {

diff --git a/git-attributes/src/parse/attribute.rs b/git-attributes/src/parse/attribute.rs
@@ -6,8 +6,9 @@ use bstr::{BStr, BString, ByteSlice};
 #[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
 pub enum Kind {
     /// A pattern to match paths against
-    Pattern(BString, crate::ignore::pattern::Mode),
+    Pattern(git_glob::Pattern),
     /// The name of the macro to define, always a valid attribute name
+    // TODO: turn it into its own type for maximum safety
     Macro(BString),
 }
 
@@ -162,14 +163,14 @@ fn parse_line(line: &BStr, line_number: usize) -> Option<Result<(Kind, Iter<'_>,
                 _ => unreachable!("BUG: check_attr() must only return attribute errors"),
             }),
         None => {
-            let (pattern, flags) = super::ignore::parse_line(line.as_ref())?;
-            if flags.contains(crate::ignore::pattern::Mode::NEGATIVE) {
+            let pattern = git_glob::Pattern::from_bytes(line.as_ref())?;
+            if pattern.mode.contains(git_glob::pattern::Mode::NEGATIVE) {
                 Err(Error::PatternNegation {
                     line: line.into_owned(),
                     line_number,
                 })
             } else {
-                Ok(Kind::Pattern(pattern, flags))
+                Ok(Kind::Pattern(pattern))
             }
         }
     };