diff --git a/Cargo.lock b/Cargo.lock index ea5b47ffc..dcdb09443 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2152,7 +2152,7 @@ version = "0.0.0" dependencies = [ "assert_cmd", "futures", - "gix-path", + "gix-path 0.10.9 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.29.0", "rand 0.8.5", "serde", @@ -2470,49 +2470,48 @@ dependencies = [ [[package]] name = "gix" version = "0.64.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78414d29fcc82329080166077e0f7689f4016551fdb334d787c3d040fe2634f" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" dependencies = [ - "gix-actor", - "gix-attributes", + "gix-actor 0.31.5 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-attributes 0.22.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "gix-command", - "gix-commitgraph", + "gix-commitgraph 0.24.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "gix-config", "gix-credentials", - "gix-date", + "gix-date 0.9.0", "gix-diff", "gix-dir", "gix-discover 0.33.0", - "gix-features", + "gix-features 0.38.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "gix-filter", - "gix-fs", - "gix-glob", - "gix-hash", - "gix-hashtable", - "gix-ignore", - "gix-index", - "gix-lock", + "gix-fs 0.11.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-glob 0.16.4 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-hash 0.14.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-hashtable 0.5.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-ignore 0.11.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-index 0.33.1 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-lock 14.0.0 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "gix-macros", "gix-negotiate", - "gix-object", + "gix-object 0.42.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "gix-odb", "gix-pack", - "gix-path", + "gix-path 0.10.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "gix-pathspec", "gix-prompt", "gix-ref 0.45.0", "gix-refspec", "gix-revision", - "gix-revwalk", - "gix-sec", + "gix-revwalk 0.13.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-sec 0.10.7 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "gix-submodule", - "gix-tempfile", - "gix-trace", - "gix-traverse", + "gix-tempfile 14.0.1 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-trace 0.1.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-traverse 0.39.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "gix-url", - "gix-utils", - "gix-validate", - "gix-worktree", + "gix-utils 0.1.12 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-validate 0.8.5 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-worktree 0.34.1 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "once_cell", "smallvec", "thiserror", @@ -2525,11 +2524,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0e454357e34b833cc3a00b6efbbd3dd4d18b24b9fb0c023876ec2645e8aa3f2" dependencies = [ "bstr", - "gix-date", - "gix-utils", + "gix-date 0.8.7", + "gix-utils 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 1.0.11", "thiserror", - "winnow 0.6.13", + "winnow 0.6.16", +] + +[[package]] +name = "gix-actor" +version = "0.31.5" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" +dependencies = [ + "bstr", + "gix-date 0.9.0", + "gix-utils 0.1.12 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "itoa 1.0.11", + "thiserror", + "winnow 0.6.16", ] [[package]] @@ -2539,10 +2551,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e37ce99c7e81288c28b703641b6d5d119aacc45c1a6b247156e6249afa486257" dependencies = [ "bstr", - "gix-glob", - "gix-path", - "gix-quote", - "gix-trace", + "gix-glob 0.16.4 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-path 0.10.9 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-quote 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-trace 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "kstring", + "smallvec", + "thiserror", + "unicode-bom", +] + +[[package]] +name = "gix-attributes" +version = "0.22.3" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" +dependencies = [ + "bstr", + "gix-glob 0.16.4 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-path 0.10.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-quote 0.4.12 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-trace 0.1.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "kstring", "smallvec", "thiserror", @@ -2558,6 +2586,14 @@ dependencies = [ "thiserror", ] +[[package]] +name = "gix-bitmap" +version = "0.2.11" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" +dependencies = [ + "thiserror", +] + [[package]] name = "gix-chunk" version = "0.4.8" @@ -2567,15 +2603,22 @@ dependencies = [ "thiserror", ] +[[package]] +name = "gix-chunk" +version = "0.4.8" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" +dependencies = [ + "thiserror", +] + [[package]] name = "gix-command" version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d76867867da891cbe32021ad454e8cae90242f6afb06762e4dd0d357afd1d7b" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" dependencies = [ "bstr", - "gix-path", - "gix-trace", + "gix-path 0.10.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-trace 0.1.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "shell-words", ] @@ -2586,9 +2629,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "133b06f67f565836ec0c473e2116a60fb74f80b6435e21d88013ac0e3c60fc78" dependencies = [ "bstr", - "gix-chunk", - "gix-features", - "gix-hash", + "gix-chunk 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-features 0.38.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-hash 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", + "memmap2", + "thiserror", +] + +[[package]] +name = "gix-commitgraph" +version = "0.24.3" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" +dependencies = [ + "bstr", + "gix-chunk 0.4.8 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-features 0.38.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-hash 0.14.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "memmap2", "thiserror", ] @@ -2596,50 +2652,47 @@ dependencies = [ [[package]] name = "gix-config" version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28f53fd03d1bf09ebcc2c8654f08969439c4556e644ca925f27cf033bc43e658" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" dependencies = [ "bstr", "gix-config-value", - "gix-features", - "gix-glob", - "gix-path", + "gix-features 0.38.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-glob 0.16.4 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-path 0.10.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "gix-ref 0.45.0", - "gix-sec", + "gix-sec 0.10.7 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "memchr", "once_cell", "smallvec", "thiserror", "unicode-bom", - "winnow 0.6.13", + "winnow 0.6.16", ] [[package]] name = "gix-config-value" version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b328997d74dd15dc71b2773b162cb4af9a25c424105e4876e6d0686ab41c383e" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" dependencies = [ "bitflags 2.6.0", "bstr", - "gix-path", + "gix-path 0.10.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "libc", "thiserror", ] [[package]] name = "gix-credentials" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91b446df0841c9d74b3f98f21657b892581a4af78904a22e0cbc6144da972eea" +version = "0.24.4" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" dependencies = [ "bstr", "gix-command", "gix-config-value", - "gix-path", + "gix-path 0.10.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "gix-prompt", - "gix-sec", - "gix-trace", + "gix-sec 0.10.7 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-trace 0.1.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "gix-url", "thiserror", ] @@ -2657,34 +2710,43 @@ dependencies = [ ] [[package]] -name = "gix-diff" -version = "0.44.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1996d5c8a305b59709467d80617c9fde48d9d75fd1f4179ea970912630886c9d" +name = "gix-date" +version = "0.9.0" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" dependencies = [ "bstr", - "gix-hash", - "gix-object", + "itoa 1.0.11", + "jiff", + "thiserror", +] + +[[package]] +name = "gix-diff" +version = "0.44.1" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" +dependencies = [ + "bstr", + "gix-hash 0.14.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-object 0.42.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "thiserror", ] [[package]] name = "gix-dir" version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c975679aa00dd2d757bfd3ddb232e8a188c0094c3306400575a0813858b1365" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" dependencies = [ "bstr", "gix-discover 0.33.0", - "gix-fs", - "gix-ignore", - "gix-index", - "gix-object", - "gix-path", + "gix-fs 0.11.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-ignore 0.11.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-index 0.33.1 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-object 0.42.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-path 0.10.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "gix-pathspec", - "gix-trace", - "gix-utils", - "gix-worktree", + "gix-trace 0.1.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-utils 0.1.12 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-worktree 0.34.1 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "thiserror", ] @@ -2696,27 +2758,26 @@ checksum = "fc27c699b63da66b50d50c00668bc0b7e90c3a382ef302865e891559935f3dbf" dependencies = [ "bstr", "dunce", - "gix-fs", - "gix-hash", - "gix-path", + "gix-fs 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-hash 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-path 0.10.9 (registry+https://github.com/rust-lang/crates.io-index)", "gix-ref 0.44.1", - "gix-sec", + "gix-sec 0.10.7 (registry+https://github.com/rust-lang/crates.io-index)", "thiserror", ] [[package]] name = "gix-discover" version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67662731cec3cb31ba3ed2463809493f76d8e5d6c6d245de8b0560438c13450e" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" dependencies = [ "bstr", "dunce", - "gix-fs", - "gix-hash", - "gix-path", + "gix-fs 0.11.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-hash 0.14.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-path 0.10.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "gix-ref 0.45.0", - "gix-sec", + "gix-sec 0.10.7 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "thiserror", ] @@ -2725,17 +2786,31 @@ name = "gix-features" version = "0.38.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac7045ac9fe5f9c727f38799d002a7ed3583cd777e3322a7c4b43e3cf437dc69" +dependencies = [ + "gix-hash 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-trace 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-utils 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", + "prodash 28.0.0", + "sha1_smol", + "walkdir", +] + +[[package]] +name = "gix-features" +version = "0.38.2" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" dependencies = [ "crc32fast", "crossbeam-channel", "flate2", - "gix-hash", - "gix-trace", - "gix-utils", + "gix-hash 0.14.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-trace 0.1.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-utils 0.1.12 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "libc", "once_cell", "parking_lot 0.12.3", - "prodash", + "prodash 29.0.0", "sha1_smol", "thiserror", "walkdir", @@ -2744,20 +2819,19 @@ dependencies = [ [[package]] name = "gix-filter" version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6547738da28275f4dff4e9f3a0f28509f53f94dd6bd822733c91cb306bca61a" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" dependencies = [ "bstr", "encoding_rs", - "gix-attributes", + "gix-attributes 0.22.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "gix-command", - "gix-hash", - "gix-object", + "gix-hash 0.14.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-object 0.42.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "gix-packetline-blocking", - "gix-path", - "gix-quote", - "gix-trace", - "gix-utils", + "gix-path 0.10.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-quote 0.4.12 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-trace 0.1.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-utils 0.1.12 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "smallvec", "thiserror", ] @@ -2769,8 +2843,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6adf99c27cdf17b1c4d77680c917e0d94d8783d4e1c73d3be0d1d63107163d7a" dependencies = [ "fastrand 2.1.0", - "gix-features", - "gix-utils", + "gix-features 0.38.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-utils 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gix-fs" +version = "0.11.2" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" +dependencies = [ + "fastrand 2.1.0", + "gix-features 0.38.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-utils 0.1.12 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", ] [[package]] @@ -2781,8 +2865,19 @@ checksum = "fa7df15afa265cc8abe92813cd354d522f1ac06b29ec6dfa163ad320575cb447" dependencies = [ "bitflags 2.6.0", "bstr", - "gix-features", - "gix-path", + "gix-features 0.38.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-path 0.10.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gix-glob" +version = "0.16.4" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" +dependencies = [ + "bitflags 2.6.0", + "bstr", + "gix-features 0.38.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-path 0.10.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", ] [[package]] @@ -2795,13 +2890,32 @@ dependencies = [ "thiserror", ] +[[package]] +name = "gix-hash" +version = "0.14.2" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" +dependencies = [ + "faster-hex", + "thiserror", +] + [[package]] name = "gix-hashtable" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ddf80e16f3c19ac06ce415a38b8591993d3f73aede049cb561becb5b3a8e242" dependencies = [ - "gix-hash", + "gix-hash 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", + "hashbrown 0.14.5", + "parking_lot 0.12.3", +] + +[[package]] +name = "gix-hashtable" +version = "0.5.2" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" +dependencies = [ + "gix-hash 0.14.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "hashbrown 0.14.5", "parking_lot 0.12.3", ] @@ -2813,9 +2927,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e6afb8f98e314d4e1adc822449389ada863c174b5707cedd327d67b84dba527" dependencies = [ "bstr", - "gix-glob", - "gix-path", - "gix-trace", + "gix-glob 0.16.4 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-path 0.10.9 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-trace 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-bom", +] + +[[package]] +name = "gix-ignore" +version = "0.11.3" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" +dependencies = [ + "bstr", + "gix-glob 0.16.4 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-path 0.10.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-trace 0.1.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "unicode-bom", ] @@ -2829,15 +2955,42 @@ dependencies = [ "bstr", "filetime", "fnv", - "gix-bitmap", - "gix-features", - "gix-fs", - "gix-hash", - "gix-lock", - "gix-object", - "gix-traverse", - "gix-utils", - "gix-validate", + "gix-bitmap 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-features 0.38.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-fs 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-hash 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-lock 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-object 0.42.3 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-traverse 0.39.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-utils 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-validate 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", + "hashbrown 0.14.5", + "itoa 1.0.11", + "libc", + "memmap2", + "rustix 0.38.34", + "smallvec", + "thiserror", +] + +[[package]] +name = "gix-index" +version = "0.33.1" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" +dependencies = [ + "bitflags 2.6.0", + "bstr", + "filetime", + "fnv", + "gix-bitmap 0.2.11 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-features 0.38.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-fs 0.11.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-hash 0.14.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-lock 14.0.0 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-object 0.42.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-traverse 0.39.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-utils 0.1.12 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-validate 0.8.5 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "hashbrown 0.14.5", "itoa 1.0.11", "libc", @@ -2853,16 +3006,25 @@ version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3bc7fe297f1f4614774989c00ec8b1add59571dc9b024b4c00acb7dedd4e19d" dependencies = [ - "gix-tempfile", - "gix-utils", + "gix-tempfile 14.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-utils 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror", +] + +[[package]] +name = "gix-lock" +version = "14.0.0" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" +dependencies = [ + "gix-tempfile 14.0.1 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-utils 0.1.12 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "thiserror", ] [[package]] name = "gix-macros" version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "999ce923619f88194171a67fb3e6d613653b8d4d6078b529b15a765da0edcc17" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" dependencies = [ "proc-macro2", "quote", @@ -2872,15 +3034,14 @@ dependencies = [ [[package]] name = "gix-negotiate" version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ec879fb6307bb63519ba89be0024c6f61b4b9d61f1a91fd2ce572d89fe9c224" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" dependencies = [ "bitflags 2.6.0", - "gix-commitgraph", - "gix-date", - "gix-hash", - "gix-object", - "gix-revwalk", + "gix-commitgraph 0.24.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-date 0.9.0", + "gix-hash 0.14.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-object 0.42.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-revwalk 0.13.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "smallvec", "thiserror", ] @@ -2892,33 +3053,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25da2f46b4e7c2fa7b413ce4dffb87f69eaf89c2057e386491f4c55cadbfe386" dependencies = [ "bstr", - "gix-actor", - "gix-date", - "gix-features", - "gix-hash", - "gix-utils", - "gix-validate", + "gix-actor 0.31.5 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-date 0.8.7", + "gix-features 0.38.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-hash 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-utils 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-validate 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", "itoa 1.0.11", "smallvec", "thiserror", - "winnow 0.6.13", + "winnow 0.6.16", +] + +[[package]] +name = "gix-object" +version = "0.42.3" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" +dependencies = [ + "bstr", + "gix-actor 0.31.5 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-date 0.9.0", + "gix-features 0.38.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-hash 0.14.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-utils 0.1.12 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-validate 0.8.5 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "itoa 1.0.11", + "smallvec", + "thiserror", + "winnow 0.6.16", ] [[package]] name = "gix-odb" version = "0.61.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20d384fe541d93d8a3bb7d5d5ef210780d6df4f50c4e684ccba32665a5e3bc9b" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" dependencies = [ "arc-swap", - "gix-date", - "gix-features", - "gix-fs", - "gix-hash", - "gix-object", + "gix-date 0.9.0", + "gix-features 0.38.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-fs 0.11.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-hash 0.14.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-object 0.42.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "gix-pack", - "gix-path", - "gix-quote", + "gix-path 0.10.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-quote 0.4.12 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "parking_lot 0.12.3", "tempfile", "thiserror", @@ -2927,16 +3105,15 @@ dependencies = [ [[package]] name = "gix-pack" version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0594491fffe55df94ba1c111a6566b7f56b3f8d2e1efc750e77d572f5f5229" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" dependencies = [ "clru", - "gix-chunk", - "gix-features", - "gix-hash", - "gix-hashtable", - "gix-object", - "gix-path", + "gix-chunk 0.4.8 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-features 0.38.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-hash 0.14.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-hashtable 0.5.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-object 0.42.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-path 0.10.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "memmap2", "smallvec", "thiserror", @@ -2945,12 +3122,11 @@ dependencies = [ [[package]] name = "gix-packetline-blocking" version = "0.17.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31d42378a3d284732e4d589979930d0d253360eccf7ec7a80332e5ccb77e14a" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" dependencies = [ "bstr", "faster-hex", - "gix-trace", + "gix-trace 0.1.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "thiserror", ] @@ -2961,7 +3137,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d23d5bbda31344d8abc8de7c075b3cf26e5873feba7c4a15d916bce67382bd9" dependencies = [ "bstr", - "gix-trace", + "gix-trace 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "home", + "once_cell", + "thiserror", +] + +[[package]] +name = "gix-path" +version = "0.10.9" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" +dependencies = [ + "bstr", + "gix-trace 0.1.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "home", "once_cell", "thiserror", @@ -2970,23 +3158,21 @@ dependencies = [ [[package]] name = "gix-pathspec" version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d307d1b8f84dc8386c4aa20ce0cf09242033840e15469a3ecba92f10cfb5c046" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" dependencies = [ "bitflags 2.6.0", "bstr", - "gix-attributes", + "gix-attributes 0.22.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "gix-config-value", - "gix-glob", - "gix-path", + "gix-glob 0.16.4 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-path 0.10.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "thiserror", ] [[package]] name = "gix-prompt" version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e0595d2be4b6d6a71a099e989bdd610882b882da35fb8503d91d6f81aa0936f" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" dependencies = [ "gix-command", "gix-config-value", @@ -3002,7 +3188,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbff4f9b9ea3fa7a25a70ee62f545143abef624ac6aa5884344e70c8b0a1d9ff" dependencies = [ "bstr", - "gix-utils", + "gix-utils 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "thiserror", +] + +[[package]] +name = "gix-quote" +version = "0.4.12" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" +dependencies = [ + "bstr", + "gix-utils 0.1.12 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "thiserror", ] @@ -3012,53 +3208,51 @@ version = "0.44.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3394a2997e5bc6b22ebc1e1a87b41eeefbcfcff3dbfa7c4bd73cb0ac8f1f3e2e" dependencies = [ - "gix-actor", - "gix-date", - "gix-features", - "gix-fs", - "gix-hash", - "gix-lock", - "gix-object", - "gix-path", - "gix-tempfile", - "gix-utils", - "gix-validate", + "gix-actor 0.31.5 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-date 0.8.7", + "gix-features 0.38.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-fs 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-hash 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-lock 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-object 0.42.3 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-path 0.10.9 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-tempfile 14.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-utils 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-validate 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", "memmap2", "thiserror", - "winnow 0.6.13", + "winnow 0.6.16", ] [[package]] name = "gix-ref" version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "636e96a0a5562715153fee098c217110c33a6f8218f08f4687ff99afde159bb5" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" dependencies = [ - "gix-actor", - "gix-features", - "gix-fs", - "gix-hash", - "gix-lock", - "gix-object", - "gix-path", - "gix-tempfile", - "gix-utils", - "gix-validate", + "gix-actor 0.31.5 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-features 0.38.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-fs 0.11.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-hash 0.14.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-lock 14.0.0 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-object 0.42.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-path 0.10.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-tempfile 14.0.1 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-utils 0.1.12 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-validate 0.8.5 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "memmap2", "thiserror", - "winnow 0.6.13", + "winnow 0.6.16", ] [[package]] name = "gix-refspec" version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6868f8cd2e62555d1f7c78b784bece43ace40dd2a462daf3b588d5416e603f37" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" dependencies = [ "bstr", - "gix-hash", + "gix-hash 0.14.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "gix-revision", - "gix-validate", + "gix-validate 0.8.5 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "smallvec", "thiserror", ] @@ -3066,14 +3260,13 @@ dependencies = [ [[package]] name = "gix-revision" version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b13e43c2118c4b0537ddac7d0821ae0dfa90b7b8dbf20c711e153fb749adce" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" dependencies = [ "bstr", - "gix-date", - "gix-hash", - "gix-object", - "gix-revwalk", + "gix-date 0.9.0", + "gix-hash 0.14.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-object 0.42.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-revwalk 0.13.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "thiserror", ] @@ -3083,11 +3276,25 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b030ccaab71af141f537e0225f19b9e74f25fefdba0372246b844491cab43e0" dependencies = [ - "gix-commitgraph", - "gix-date", - "gix-hash", - "gix-hashtable", - "gix-object", + "gix-commitgraph 0.24.3 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-date 0.8.7", + "gix-hash 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-hashtable 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-object 0.42.3 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec", + "thiserror", +] + +[[package]] +name = "gix-revwalk" +version = "0.13.2" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" +dependencies = [ + "gix-commitgraph 0.24.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-date 0.9.0", + "gix-hash 0.14.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-hashtable 0.5.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-object 0.42.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "smallvec", "thiserror", ] @@ -3099,7 +3306,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1547d26fa5693a7f34f05b4a3b59a90890972922172653bcb891ab3f09f436df" dependencies = [ "bitflags 2.6.0", - "gix-path", + "gix-path 0.10.9 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "gix-sec" +version = "0.10.7" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" +dependencies = [ + "bitflags 2.6.0", + "gix-path 0.10.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "libc", "windows-sys 0.52.0", ] @@ -3107,12 +3325,11 @@ dependencies = [ [[package]] name = "gix-submodule" version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f2e0f69aa00805e39d39ec80472a7e9da20ed5d73318b27925a2cc198e854fd" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" dependencies = [ "bstr", "gix-config", - "gix-path", + "gix-path 0.10.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "gix-pathspec", "gix-refspec", "gix-url", @@ -3125,7 +3342,7 @@ version = "14.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "006acf5a613e0b5cf095d8e4b3f48c12a60d9062aa2b2dd105afaf8344a5600c" dependencies = [ - "gix-fs", + "gix-fs 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc", "once_cell", "parking_lot 0.12.3", @@ -3134,6 +3351,18 @@ dependencies = [ "tempfile", ] +[[package]] +name = "gix-tempfile" +version = "14.0.1" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" +dependencies = [ + "gix-fs 0.11.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "libc", + "once_cell", + "parking_lot 0.12.3", + "tempfile", +] + [[package]] name = "gix-testtools" version = "0.15.0" @@ -3145,19 +3374,19 @@ dependencies = [ "fastrand 2.1.0", "fs_extra", "gix-discover 0.32.0", - "gix-fs", - "gix-ignore", - "gix-index", - "gix-lock", - "gix-tempfile", - "gix-worktree", + "gix-fs 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-ignore 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-index 0.33.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-lock 14.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-tempfile 14.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-worktree 0.34.1 (registry+https://github.com/rust-lang/crates.io-index)", "io-close", "is_ci", "once_cell", "parking_lot 0.12.3", "tar", "tempfile", - "winnow 0.6.13", + "winnow 0.6.16", ] [[package]] @@ -3166,6 +3395,11 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f924267408915fddcd558e3f37295cc7d6a3e50f8bd8b606cee0808c3915157e" +[[package]] +name = "gix-trace" +version = "0.1.9" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" + [[package]] name = "gix-traverse" version = "0.39.2" @@ -3173,12 +3407,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e499a18c511e71cf4a20413b743b9f5bcf64b3d9e81e9c3c6cd399eae55a8840" dependencies = [ "bitflags 2.6.0", - "gix-commitgraph", - "gix-date", - "gix-hash", - "gix-hashtable", - "gix-object", - "gix-revwalk", + "gix-commitgraph 0.24.3 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-date 0.8.7", + "gix-hash 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-hashtable 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-object 0.42.3 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-revwalk 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec", + "thiserror", +] + +[[package]] +name = "gix-traverse" +version = "0.39.2" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" +dependencies = [ + "bitflags 2.6.0", + "gix-commitgraph 0.24.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-date 0.9.0", + "gix-hash 0.14.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-hashtable 0.5.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-object 0.42.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-revwalk 0.13.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "smallvec", "thiserror", ] @@ -3186,12 +3436,11 @@ dependencies = [ [[package]] name = "gix-url" version = "0.27.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2eb9b35bba92ea8f0b5ab406fad3cf6b87f7929aa677ff10aa042c6da621156" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" dependencies = [ "bstr", - "gix-features", - "gix-path", + "gix-features 0.38.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-path 0.10.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", "home", "thiserror", "url", @@ -3202,6 +3451,15 @@ name = "gix-utils" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35192df7fd0fa112263bad8021e2df7167df4cc2a6e6d15892e1e55621d3d4dc" +dependencies = [ + "fastrand 2.1.0", + "unicode-normalization", +] + +[[package]] +name = "gix-utils" +version = "0.1.12" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" dependencies = [ "bstr", "fastrand 2.1.0", @@ -3218,6 +3476,15 @@ dependencies = [ "thiserror", ] +[[package]] +name = "gix-validate" +version = "0.8.5" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" +dependencies = [ + "bstr", + "thiserror", +] + [[package]] name = "gix-worktree" version = "0.34.1" @@ -3225,16 +3492,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26f7326ebe0b9172220694ea69d344c536009a9b98fb0f9de092c440f3efe7a6" dependencies = [ "bstr", - "gix-attributes", - "gix-features", - "gix-fs", - "gix-glob", - "gix-hash", - "gix-ignore", - "gix-index", - "gix-object", - "gix-path", - "gix-validate", + "gix-attributes 0.22.3 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-features 0.38.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-fs 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-glob 0.16.4 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-hash 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-ignore 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-index 0.33.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-object 0.42.3 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-path 0.10.9 (registry+https://github.com/rust-lang/crates.io-index)", + "gix-validate 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "gix-worktree" +version = "0.34.1" +source = "git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3#1d37bf6a773d56eea9003aa626ced413e8e0eaa3" +dependencies = [ + "bstr", + "gix-attributes 0.22.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-features 0.38.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-fs 0.11.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-glob 0.16.4 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-hash 0.14.2 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-ignore 0.11.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-index 0.33.1 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-object 0.42.3 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-path 0.10.9 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", + "gix-validate 0.8.5 (git+https://github.com/Byron/gitoxide?rev=1d37bf6a773d56eea9003aa626ced413e8e0eaa3)", ] [[package]] @@ -3993,6 +4278,31 @@ dependencies = [ "system-deps 5.0.0", ] +[[package]] +name = "jiff" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c33f2189d126c374d29641af39a0dc73daa1c8292403645575ce32e22e768a4" +dependencies = [ + "jiff-tzdb-platform", + "windows-sys 0.52.0", +] + +[[package]] +name = "jiff-tzdb" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05fac328b3df1c0f18a3c2ab6cb7e06e4e549f366017d796e3e66b6d6889abe6" + +[[package]] +name = "jiff-tzdb-platform" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8da387d5feaf355954c2c122c194d6df9c57d865125a67984bb453db5336940" +dependencies = [ + "jiff-tzdb", +] + [[package]] name = "jni" version = "0.20.0" @@ -5253,6 +5563,12 @@ version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79" +[[package]] +name = "prodash" +version = "29.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a266d8d6020c61a437be704c5e618037588e1985c7dbb7bf8d265db84cffe325" + [[package]] name = "prost" version = "0.12.6" @@ -7138,7 +7454,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.13", + "winnow 0.6.16", ] [[package]] @@ -8146,9 +8462,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.13" +version = "0.6.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "b480ae9340fc261e6be3e95a1ba86d54ae3f9171132a73ce8d4bbaf68339507c" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index 74524e821..e0bfd1965 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,7 +34,7 @@ resolver = "2" [workspace.dependencies] # Add the `tracing` or `tracing-detail` features to see more of gitoxide in the logs. Useful to see which programs it invokes. -gix = { version = "0.64", default-features = false, features = [] } +gix = { git = "https://github.com/Byron/gitoxide", rev = "1d37bf6a773d56eea9003aa626ced413e8e0eaa3", default-features = false, features = [] } git2 = { version = "0.18.3", features = [ "vendored-openssl", "vendored-libgit2", diff --git a/crates/gitbutler-branch-actions/tests/fixtures/for-listing.sh b/crates/gitbutler-branch-actions/tests/fixtures/for-listing.sh index 6a473e259..a3493359c 100644 --- a/crates/gitbutler-branch-actions/tests/fixtures/for-listing.sh +++ b/crates/gitbutler-branch-actions/tests/fixtures/for-listing.sh @@ -2,13 +2,39 @@ set -eu -o pipefail CLI=${1:?The first argument is the GitButler CLI} +function tick () { + if test -z "${tick+set}"; then + tick=1675176957 + else + tick=$(($tick + 60)) + fi + GIT_COMMITTER_DATE="$tick +0100" + GIT_AUTHOR_DATE="$tick +0100" + export GIT_COMMITTER_DATE GIT_AUTHOR_DATE +} +tick + + git init remote (cd remote echo first > file git add . && git commit -m "init" ) -export GITBUTLER_CLI_DATA_DIR=./git/gitbutler/app-data +git clone remote single-branch-no-vbranch + +git clone remote single-branch-no-vbranch-one-commit +(cd single-branch-no-vbranch-one-commit + echo change >> file && git add . && git commit -m "local change" +) + +git clone remote single-branch-no-vbranch-multi-remote +(cd single-branch-no-vbranch-multi-remote + git remote add other-origin ../remote + git fetch other-origin +) + +export GITBUTLER_CLI_DATA_DIR=./user/gitbutler/app-data git clone remote one-vbranch-on-integration (cd one-vbranch-on-integration $CLI project add --switch-to-integration "$(git rev-parse --symbolic-full-name @{u})" diff --git a/crates/gitbutler-repo/src/repository.rs b/crates/gitbutler-repo/src/repository.rs index 1e57ef446..9c257a597 100644 --- a/crates/gitbutler-repo/src/repository.rs +++ b/crates/gitbutler-repo/src/repository.rs @@ -447,17 +447,18 @@ impl RepoActionsExt for CommandContext { fn signatures(&self) -> Result<(git2::Signature, git2::Signature)> { let repo = gix::open(self.repository().path())?; - let default_actor = gix::actor::SignatureRef { - name: GITBUTLER_INTEGRATION_COMMIT_AUTHOR_NAME.into(), - email: GITBUTLER_INTEGRATION_COMMIT_AUTHOR_EMAIL.into(), - time: Default::default(), - }; - let author = repo.author().transpose()?.unwrap_or(default_actor); + let author = repo + .author() + .transpose()? + .unwrap_or_else(|| default_actor_with_commit_time("GIT_AUTHOR_DATE")); + let config: Config = self.repository().into(); let committer = if config.user_real_comitter()? { - repo.committer().transpose()?.unwrap_or(default_actor) + repo.committer() + .transpose()? + .unwrap_or_else(|| default_actor_with_commit_time("GIT_COMMITTER_DATE")) } else { - default_actor + default_actor_with_commit_time("GIT_COMMITTER_DATE") }; Ok(( @@ -467,10 +468,28 @@ impl RepoActionsExt for CommandContext { } } +fn default_actor_with_commit_time( + overriding_variable_name: &str, +) -> gix::actor::SignatureRef<'static> { + gix::actor::SignatureRef { + name: GITBUTLER_INTEGRATION_COMMIT_AUTHOR_NAME.into(), + email: GITBUTLER_INTEGRATION_COMMIT_AUTHOR_EMAIL.into(), + time: std::env::var(overriding_variable_name) + .ok() + .and_then(|time| gix::date::parse(&time, Some(std::time::SystemTime::now())).ok()) + .unwrap_or_else(|| gix::date::Time::now_local_or_utc()), + } +} + +/// Convert `actor` to a `git2` representation or fail if that's not possible. +/// Note that the current time as provided by `gix` is also use as it +/// respects the `GIT_AUTHOR|COMMITTER_DATE` environment variables. fn actor_to_git2_signature( actor: gix::actor::SignatureRef<'_>, ) -> Result> { - Ok(git2::Signature::now( + let offset_in_minutes = actor.time.offset / 60; + let time = git2::Time::new(actor.time.seconds, offset_in_minutes); + Ok(git2::Signature::new( actor .name .to_str() @@ -479,6 +498,7 @@ fn actor_to_git2_signature( .email .to_str() .with_context(|| format!("Could not process actor email: {}", actor.email))?, + &time, )?) }