diff --git a/Cargo.lock b/Cargo.lock index 559e9eb8..4f2ba254 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -68,9 +68,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" [[package]] name = "arc-swap" @@ -136,9 +136,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" [[package]] name = "cc" -version = "1.2.4" +version = "1.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf" +checksum = "c31a0499c1dc64f458ad13872de75c0eb7e3fdb0e67964610c914b034fc5956e" dependencies = [ "shlex", ] @@ -319,6 +319,12 @@ dependencies = [ "encoding_rs", ] +[[package]] +name = "env_home" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f84e12ccf0a7ddc17a6c41c93326024c42920d7ee630d04950e6926645c0fe" + [[package]] name = "equivalent" version = "1.0.1" @@ -479,9 +485,9 @@ checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "gix" -version = "0.68.0" +version = "0.69.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b04c66359b5e17f92395abc433861df0edf48f39f3f590818d1d7217327dd6a1" +checksum = "8d0eebdaecdcf405d5433a36f85e4f058cf4de48ee2604388be0dbccbaad353e" dependencies = [ "gix-actor", "gix-attributes", @@ -506,11 +512,13 @@ dependencies = [ "gix-pack", "gix-path", "gix-pathspec", + "gix-protocol", "gix-ref", "gix-refspec", "gix-revision", "gix-revwalk", "gix-sec", + "gix-shallow", "gix-status", "gix-submodule", "gix-tempfile", @@ -522,7 +530,7 @@ dependencies = [ "gix-worktree", "once_cell", "smallvec", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] @@ -535,7 +543,7 @@ dependencies = [ "gix-date", "gix-utils", "itoa", - "thiserror 2.0.7", + "thiserror 2.0.9", "winnow", ] @@ -552,7 +560,7 @@ dependencies = [ "gix-trace", "kstring", "smallvec", - "thiserror 2.0.7", + "thiserror 2.0.9", "unicode-bom", ] @@ -562,7 +570,7 @@ version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d48b897b4bbc881aea994b4a5bbb340a04979d7be9089791304e04a9fbc66b53" dependencies = [ - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] @@ -571,14 +579,14 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c6ffbeb3a5c0b8b84c3fe4133a6f8c82fa962f4caefe8d0762eced025d3eb4f7" dependencies = [ - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] name = "gix-command" -version = "0.3.11" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7d6b8f3a64453fd7e8191eb80b351eb7ac0839b40a1237cd2c137d5079fe53" +checksum = "9405c0a56e17f8365a46870cd2c7db71323ecc8bda04b50cb746ea37bd091e90" dependencies = [ "bstr", "gix-path", @@ -597,7 +605,7 @@ dependencies = [ "gix-features", "gix-hash", "memmap2", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] @@ -616,7 +624,7 @@ dependencies = [ "memchr", "once_cell", "smallvec", - "thiserror 2.0.7", + "thiserror 2.0.9", "unicode-bom", "winnow", ] @@ -631,26 +639,26 @@ dependencies = [ "bstr", "gix-path", "libc", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] name = "gix-date" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "691142b1a34d18e8ed6e6114bc1a2736516c5ad60ef3aa9bd1b694886e3ca92d" +checksum = "c57c477b645ee248b173bb1176b52dd528872f12c50375801a58aaf5ae91113f" dependencies = [ "bstr", "itoa", "jiff", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] name = "gix-diff" -version = "0.48.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a327be31a392144b60ab0b1c863362c32a1c8f7effdfa2141d5d5b6b916ef3bf" +checksum = "a8e92566eccbca205a0a0f96ffb0327c061e85bc5c95abbcddfe177498aa04f6" dependencies = [ "bstr", "gix-command", @@ -664,14 +672,14 @@ dependencies = [ "gix-traverse", "gix-worktree", "imara-diff", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] name = "gix-dir" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd6a0618958f9cce78a32724f8e06c4f4a57ca7080f645736d53676dc9b4db9" +checksum = "fba2ffbcf4bd34438e8a8367ccbc94870549903d1f193a14f47eb6b0967e1293" dependencies = [ "bstr", "gix-discover", @@ -684,7 +692,7 @@ dependencies = [ "gix-trace", "gix-utils", "gix-worktree", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] @@ -700,7 +708,7 @@ dependencies = [ "gix-path", "gix-ref", "gix-sec", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] @@ -718,15 +726,15 @@ dependencies = [ "once_cell", "prodash", "sha1_smol", - "thiserror 2.0.7", + "thiserror 2.0.9", "walkdir", ] [[package]] name = "gix-filter" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5108cc58d58b27df10ac4de7f31b2eb96d588a33e5eba23739b865f5d8db7995" +checksum = "3d0ecdee5667f840ba20c7fe56d63f8e1dc1e6b3bfd296151fe5ef07c874790a" dependencies = [ "bstr", "encoding_rs", @@ -740,14 +748,14 @@ dependencies = [ "gix-trace", "gix-utils", "smallvec", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] name = "gix-fs" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34740384d8d763975858fa2c176b68652a6fcc09f616e24e3ce967b0d370e4d8" +checksum = "3b3d4fac505a621f97e5ce2c69fdc425742af00c0920363ca4074f0eb48b1db9" dependencies = [ "fastrand", "gix-features", @@ -773,7 +781,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b5eccc17194ed0e67d49285e4853307e4147e95407f91c1c3e4a13ba9f4e4ce" dependencies = [ "faster-hex", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] @@ -825,7 +833,7 @@ dependencies = [ "memmap2", "rustix", "smallvec", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] @@ -841,9 +849,9 @@ dependencies = [ [[package]] name = "gix-object" -version = "0.46.0" +version = "0.46.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65d93e2bbfa83a307e47f45e45de7b6c04d7375a8bd5907b215f4bf45237d879" +checksum = "e42d58010183ef033f31088479b4eb92b44fe341b35b62d39eb8b185573d77ea" dependencies = [ "bstr", "gix-actor", @@ -851,19 +859,20 @@ dependencies = [ "gix-features", "gix-hash", "gix-hashtable", + "gix-path", "gix-utils", "gix-validate", "itoa", "smallvec", - "thiserror 2.0.7", + "thiserror 2.0.9", "winnow", ] [[package]] name = "gix-odb" -version = "0.65.0" +version = "0.66.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93bed6e1b577c25a6bb8e6ecbf4df525f29a671ddf5f2221821a56a8dbeec4e3" +checksum = "cb780eceb3372ee204469478de02eaa34f6ba98247df0186337e0333de97d0ae" dependencies = [ "arc-swap", "gix-date", @@ -877,14 +886,14 @@ dependencies = [ "gix-quote", "parking_lot", "tempfile", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] name = "gix-pack" -version = "0.55.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b91fec04d359544fecbb8e85117ec746fbaa9046ebafcefb58cb74f20dc76d4" +checksum = "4158928929be29cae7ab97afc8e820a932071a7f39d8ba388eed2380c12c566c" dependencies = [ "clru", "gix-chunk", @@ -895,7 +904,19 @@ dependencies = [ "gix-path", "memmap2", "smallvec", - "thiserror 2.0.7", + "thiserror 2.0.9", +] + +[[package]] +name = "gix-packetline" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "911aeea8b2dabeed2f775af9906152a1f0109787074daf9e64224e3892dde453" +dependencies = [ + "bstr", + "faster-hex", + "gix-trace", + "thiserror 2.0.9", ] [[package]] @@ -907,7 +928,7 @@ dependencies = [ "bstr", "faster-hex", "gix-trace", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] @@ -920,7 +941,7 @@ dependencies = [ "gix-trace", "home", "once_cell", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] @@ -935,7 +956,26 @@ dependencies = [ "gix-config-value", "gix-glob", "gix-path", - "thiserror 2.0.7", + "thiserror 2.0.9", +] + +[[package]] +name = "gix-protocol" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c84642e8b6fed7035ce9cc449593019c55b0ec1af7a5dce1ab8a0636eaaeb067" +dependencies = [ + "bstr", + "gix-date", + "gix-features", + "gix-hash", + "gix-ref", + "gix-shallow", + "gix-transport", + "gix-utils", + "maybe-async", + "thiserror 2.0.9", + "winnow", ] [[package]] @@ -946,14 +986,14 @@ checksum = "64a1e282216ec2ab2816cd57e6ed88f8009e634aec47562883c05ac8a7009a63" dependencies = [ "bstr", "gix-utils", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] name = "gix-ref" -version = "0.49.0" +version = "0.49.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eae462723686272a58f49501015ef7c0d67c3e042c20049d8dd9c7eff92efde" +checksum = "a91b61776c839d0f1b7114901179afb0947aa7f4d30793ca1c56d335dfef485f" dependencies = [ "gix-actor", "gix-features", @@ -966,7 +1006,7 @@ dependencies = [ "gix-utils", "gix-validate", "memmap2", - "thiserror 2.0.7", + "thiserror 2.0.9", "winnow", ] @@ -981,14 +1021,14 @@ dependencies = [ "gix-revision", "gix-validate", "smallvec", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] name = "gix-revision" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44488e0380847967bc3e3cacd8b22652e02ea1eb58afb60edd91847695cd2d8d" +checksum = "61e1ddc474405a68d2ce8485705dd72fe6ce959f2f5fe718601ead5da2c8f9e7" dependencies = [ "bstr", "gix-commitgraph", @@ -996,7 +1036,7 @@ dependencies = [ "gix-hash", "gix-object", "gix-revwalk", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] @@ -1011,7 +1051,7 @@ dependencies = [ "gix-hashtable", "gix-object", "smallvec", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] @@ -1027,10 +1067,22 @@ dependencies = [ ] [[package]] -name = "gix-status" -version = "0.15.0" +name = "gix-shallow" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201396192ee4c4dd9e8a84fed4b0d2b33d639fca815fb99b0f653dfeddf38585" +checksum = "88d2673242e87492cb6ff671f0c01f689061ca306c4020f137197f3abc84ce01" +dependencies = [ + "bstr", + "gix-hash", + "gix-lock", + "thiserror 2.0.9", +] + +[[package]] +name = "gix-status" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1665770e277608bd6b0eaf86adbf6cb3ffc6fb97749e7bc6f9318ac5f37564df" dependencies = [ "bstr", "filetime", @@ -1046,7 +1098,7 @@ dependencies = [ "gix-pathspec", "gix-worktree", "portable-atomic", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] @@ -1061,7 +1113,7 @@ dependencies = [ "gix-pathspec", "gix-refspec", "gix-url", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] @@ -1085,10 +1137,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04bdde120c29f1fc23a24d3e115aeeea3d60d8e65bab92cc5f9d90d9302eb952" [[package]] -name = "gix-traverse" -version = "0.43.0" +name = "gix-transport" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff2ec9f779680f795363db1c563168b32b8d6728ec58564c628e85c92d29faf" +checksum = "dd04d91e507a8713cfa2318d5a85d75b36e53a40379cc7eb7634ce400ecacbaf" +dependencies = [ + "bstr", + "gix-command", + "gix-features", + "gix-packetline", + "gix-quote", + "gix-sec", + "gix-url", + "thiserror 2.0.9", +] + +[[package]] +name = "gix-traverse" +version = "0.43.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed47d648619e23e93f971d2bba0d10c1100e54ef95d2981d609907a8cabac89" dependencies = [ "bitflags", "gix-commitgraph", @@ -1098,19 +1166,20 @@ dependencies = [ "gix-object", "gix-revwalk", "smallvec", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] name = "gix-url" -version = "0.28.1" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e09f97db3618fb8e473d7d97e77296b50aaee0ddcd6a867f07443e3e87391099" +checksum = "d096fb733ba6bd3f5403dba8bd72bdd8809fe2b347b57844040b8f49c93492d9" dependencies = [ "bstr", "gix-features", "gix-path", - "thiserror 2.0.7", + "percent-encoding", + "thiserror 2.0.9", "url", ] @@ -1132,7 +1201,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd520d09f9f585b34b32aba1d0b36ada89ab7fefb54a8ca3fe37fc482a750937" dependencies = [ "bstr", - "thiserror 2.0.7", + "thiserror 2.0.9", ] [[package]] @@ -1266,7 +1335,7 @@ dependencies = [ "log", "serde", "serde_json", - "thiserror 2.0.7", + "thiserror 2.0.9", "tokio", ] @@ -1322,7 +1391,7 @@ dependencies = [ "serde", "serde_json", "slotmap", - "thiserror 2.0.7", + "thiserror 2.0.9", "tokio", "tokio-stream", ] @@ -1397,7 +1466,7 @@ dependencies = [ "smallvec", "tempfile", "termini", - "thiserror 2.0.7", + "thiserror 2.0.9", "tokio", "tokio-stream", "toml", @@ -1464,7 +1533,7 @@ dependencies = [ "serde_json", "slotmap", "tempfile", - "thiserror 2.0.7", + "thiserror 2.0.9", "tokio", "tokio-stream", "toml", @@ -1760,9 +1829,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.168" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libloading" @@ -1813,6 +1882,17 @@ version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +[[package]] +name = "maybe-async" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "memchr" version = "2.7.4" @@ -2187,9 +2267,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.133" +version = "1.0.134" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" dependencies = [ "itoa", "memchr", @@ -2412,11 +2492,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.7" +version = "2.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93605438cbd668185516ab499d589afb7ee1859ea3d5fc8f6b0755e1c7443767" +checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc" dependencies = [ - "thiserror-impl 2.0.7", + "thiserror-impl 2.0.9", ] [[package]] @@ -2432,9 +2512,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.7" +version = "2.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d8749b4531af2117677a5fcd12b1348a3fe2b81e36e61ffeac5c4aa3273e36" +checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4" dependencies = [ "proc-macro2", "quote", @@ -2716,12 +2796,12 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "which" -version = "7.0.0" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9cad3279ade7346b96e38731a641d7343dd6a53d55083dd54eadfa5a1b38c6b" +checksum = "fb4a9e33648339dc1642b0e36e21b3385e6148e289226f657c809dee59df5028" dependencies = [ "either", - "home", + "env_home", "rustix", "winsafe", ] diff --git a/helix-lsp-types/Cargo.toml b/helix-lsp-types/Cargo.toml index 308edad6..36ca6ac7 100644 --- a/helix-lsp-types/Cargo.toml +++ b/helix-lsp-types/Cargo.toml @@ -23,7 +23,7 @@ license = "MIT" [dependencies] bitflags = "2.6.0" serde = { version = "1.0.216", features = ["derive"] } -serde_json = "1.0.133" +serde_json = "1.0.134" serde_repr = "0.1" url = {version = "2.5.4", features = ["serde"]} diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml index 5b46a261..e8c2db24 100644 --- a/helix-term/Cargo.toml +++ b/helix-term/Cargo.toml @@ -74,7 +74,7 @@ grep-searcher = "0.1.14" [target.'cfg(not(windows))'.dependencies] # https://github.com/vorner/signal-hook/issues/100 signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] } -libc = "0.2.168" +libc = "0.2.169" [target.'cfg(target_os = "macos")'.dependencies] crossterm = { version = "0.28", features = ["event-stream", "use-dev-tty", "libc"] } diff --git a/helix-vcs/Cargo.toml b/helix-vcs/Cargo.toml index 8d3f55a6..93b9def8 100644 --- a/helix-vcs/Cargo.toml +++ b/helix-vcs/Cargo.toml @@ -19,7 +19,7 @@ tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "p parking_lot = "0.12" arc-swap = { version = "1.7.1" } -gix = { version = "0.68.0", features = ["attributes", "status"], default-features = false, optional = true } +gix = { version = "0.69.1", features = ["attributes", "status"], default-features = false, optional = true } imara-diff = "0.1.7" anyhow = "1" diff --git a/helix-vcs/src/git.rs b/helix-vcs/src/git.rs index 189f6e22..0a156ad8 100644 --- a/helix-vcs/src/git.rs +++ b/helix-vcs/src/git.rs @@ -144,6 +144,7 @@ fn status(repo: &Repository, f: impl Fn(Result) -> bool) -> Result<( copies: None, percentage: Some(0.5), limit: 1000, + ..Default::default() })); // No filtering based on path