diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 22e6a01..f96e35b 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -1,5 +1,8 @@ { "enabledMcpjsonServers": [ "annot-dev" + ], + "disabledMcpjsonServers": [ + "annot-dev" ] } diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 6f5d50e..2ee43e3 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -52,24 +52,24 @@ name = "annot" version = "0.19.0" dependencies = [ "arboard", - "base64 0.23.0", + "base64 0.23.1", "chrono", "clap", "diffy", "dirs", "fs4", "futures", - "gix 0.86.0", + "gix 0.87.1", "hex", "htmlescape", "ignore", - "indexmap 2.14.0", + "indexmap 2.14.1", "insta", "jj-cli", "jj-lib", "languages", "parking_lot", - "pollster 1.0.1", + "pollster", "proptest", "pulldown-cmark", "rand 0.10.2", @@ -79,14 +79,14 @@ dependencies = [ "serde", "serde_json", "sha2 0.11.0", - "similar 3.1.1", + "similar 3.2.0", "sublime_fuzzy", "syntect", "tauri", "tauri-build", "tauri-plugin-opener", "tempfile", - "thiserror 2.0.19", + "thiserror 2.0.20", "tokio", "unicode-width 0.2.2", "urlencoding", @@ -103,7 +103,7 @@ dependencies = [ "ratatui-core", "simdutf8", "smallvec", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -395,9 +395,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64" -version = "0.23.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b25655df2c3cdd83c5e5b293b88acd880332b2ddadd7c30ac43144fdc0033da9" +checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5" [[package]] name = "beef" @@ -414,21 +414,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bisync" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5020822f6d6f23196ccaf55e228db36f9de1cf788052b37992e17cbc96ec41a7" -dependencies = [ - "bisync_macros", -] - -[[package]] -name = "bisync_macros" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d21f40d350a700f6aa107e45fb26448cf489d34794b2ba4522181dc9f1173af6" - [[package]] name = "bit-set" version = "0.5.3" @@ -663,7 +648,7 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -767,9 +752,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.6.4" +version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91e0c145792ef73a6ad36d27c75ac09f1832222a3c209689d90f534685ee5b7" +checksum = "473c7e07f409a8d772161724aa8db6a765a2532a70f9667eeb7b49d3d02fbdca" dependencies = [ "clap_builder", "clap_derive", @@ -786,9 +771,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.6.2" +version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f09628afdcc538b57f3c6341e9c8e9970f18e4a481690a64974d7023bd33548b" +checksum = "7b48fea5a88e9ae728a2dcbedbfc0e730f7d60da42e1cb049a83c9fb8b789889" dependencies = [ "anstream", "anstyle", @@ -1148,14 +1133,35 @@ version = "0.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52560adf09603e58c9a7ee1fe1dcb95a16927b17c127f0ac02d6e768a0e25bc1" +[[package]] +name = "ctrlc" +version = "3.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0b1fab2ae45819af2d0731d60f2afe17227ebb1a1538a236da84c93e9a60162" +dependencies = [ + "dispatch2", + "nix 0.31.3", + "windows-sys 0.61.2", +] + [[package]] name = "darling" version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.23.0", + "darling_macro 0.23.0", +] + +[[package]] +name = "darling" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed17f5901b6630b993ca003def43f2f8ef4014fc13b047b57aad617ff32bc2ec" +dependencies = [ + "darling_core 0.24.1", + "darling_macro 0.24.1", ] [[package]] @@ -1171,17 +1177,41 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "darling_core" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6837e2cf7485aaae18f86181d2f0e9a7ed297a025e220aeabf63fdebd3a2ddff" +dependencies = [ + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 3.0.3", +] + [[package]] name = "darling_macro" version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d" dependencies = [ - "darling_core", + "darling_core 0.23.0", "quote", "syn 2.0.117", ] +[[package]] +name = "darling_macro" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ac7135c3ef02b2f7833bbeb1be5ba7f966dcde8a87c6b87f65a778d71a02785" +dependencies = [ + "darling_core 0.24.1", + "quote", + "syn 3.0.3", +] + [[package]] name = "dashmap" version = "6.2.1" @@ -1235,7 +1265,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e" dependencies = [ - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -1278,9 +1308,9 @@ dependencies = [ [[package]] name = "diffy" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10aec8f7f9393bd6a4f2762be0ceb012d3cbe2478987258cc9960de148561914" +checksum = "3e3dc2f773b6aaa63b1a7684b8589f670a8a0146a510b74d23a401c882364b49" dependencies = [ "hashbrown 0.17.1", ] @@ -1774,9 +1804,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88cf1f829d945f548cf8fec32c61b1f202b6d93b45848602fc02af4b12ad218" +checksum = "9a31d2a3fbaaeb2af2368bbdd904aa8e812d3c04a1ee10d3171f52d556e5d0a3" dependencies = [ "futures-channel", "futures-core", @@ -1789,9 +1819,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "262590f4fe6afeb0bc83be1daa64e52657fe185690a958af7f3ad0e92085c5ae" +checksum = "b1f9e3d69d39e4862ffed03ed071a76f9a13ba1d9109d355b0f0aa6b15e393c4" dependencies = [ "futures-core", "futures-sink", @@ -1799,15 +1829,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd50c473c80f6d7c3670a752354b8e569b1a7cbfdc0419ec88e5edad85e0dc7" +checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e" [[package]] name = "futures-executor" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6754879cc9f2c66f88c6e5c35344bb0bdb0708b0352b1201815667c7eabc7458" +checksum = "031b47cf1a3c6cc8bc2fc76cd437f521619387907d469316e7c0bc278f1f5432" dependencies = [ "futures-core", "futures-task", @@ -1816,9 +1846,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4577ecaa3c4f96589d473f679a71b596316f6641bc350038b962a5daf0085d7a" +checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed" [[package]] name = "futures-lite" @@ -1835,32 +1865,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d6d3cde68c518367be28956066ddfef33813991b77a55005a69dae04bf3b10b" +checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 3.0.3", ] [[package]] name = "futures-sink" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34418ac499d6305c2fb5ad0ed2f6ac998c5f8ca209b4510f7f94242c647e307" +checksum = "1944426bf7d03f1d14f708785e4b33efd750b36d48a157b836b3efc15ede8e1d" [[package]] name = "futures-task" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b231ed28831efb4a61a08580c4bc233ec56bc009f4cd8f52da2c3cb97df0c109" +checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd" [[package]] name = "futures-util" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a77a90a256fce34da66415271e30f94ee91c57b04b8a2c042d9cf3220179deaa" +checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc" dependencies = [ "futures-channel", "futures-core", @@ -2076,15 +2106,15 @@ version = "0.85.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa8b2e38ebfc4484dfef8580ddcaf8abb7285e6f3eb6413ff6775d104ae96ca6" dependencies = [ - "gix-actor", + "gix-actor 0.41.2", "gix-attributes 0.33.2", - "gix-command", + "gix-command 0.9.1", "gix-commitgraph 0.37.1", "gix-config 0.58.0", - "gix-date", + "gix-date 0.15.6", "gix-diff 0.65.0", "gix-discover 0.53.0", - "gix-error", + "gix-error 0.2.5", "gix-features 0.48.1", "gix-filter 0.32.0", "gix-fs 0.21.2", @@ -2117,70 +2147,73 @@ dependencies = [ "gix-worktree-stream 0.34.0", "nonempty", "smallvec", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix" -version = "0.86.0" +version = "0.87.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb3790fd8981cba7949f1ba924ef865d902df731627bc5998d14164063892fce" +checksum = "fdefc1465d8631807deaf504dacdeff628b978de515653b47976ca7c28ab2a7a" dependencies = [ - "gix-actor", + "gix-actor 0.42.0", "gix-archive", - "gix-attributes 0.34.0", + "gix-attributes 0.35.0", "gix-blame", - "gix-command", - "gix-commitgraph 0.38.0", - "gix-config 0.59.0", + "gix-command 0.10.1", + "gix-commitgraph 0.39.0", + "gix-config 0.60.0", "gix-credentials", - "gix-date", - "gix-diff 0.66.0", + "gix-date 0.16.0", + "gix-diff 0.67.1", "gix-dir", - "gix-discover 0.54.0", - "gix-error", - "gix-features 0.49.0", - "gix-filter 0.33.0", - "gix-fs 0.22.0", - "gix-glob 0.27.0", - "gix-hash 0.26.0", + "gix-discover 0.55.0", + "gix-error 0.3.2", + "gix-features 0.49.1", + "gix-filter 0.34.0", + "gix-fs 0.22.1", + "gix-glob 0.27.1", + "gix-hash 0.26.2", "gix-hashtable 0.16.0", - "gix-ignore 0.22.0", - "gix-index 0.54.0", + "gix-ignore 0.22.1", + "gix-index 0.55.0", "gix-lock 24.0.0", "gix-mailmap", + "gix-merge", "gix-negotiate", - "gix-object 0.63.0", - "gix-odb 0.83.0", - "gix-pack 0.73.0", + "gix-note", + "gix-object 0.64.1", + "gix-odb 0.84.0", + "gix-pack 0.74.2", "gix-path", - "gix-pathspec 0.19.0", + "gix-pathspec 0.20.0", "gix-prompt", - "gix-protocol 0.64.0", - "gix-ref 0.66.0", - "gix-refspec 0.44.0", - "gix-revision 0.48.0", - "gix-revwalk 0.34.0", + "gix-protocol 0.65.1", + "gix-quote 0.8.0", + "gix-ref 0.67.1", + "gix-refspec 0.45.1", + "gix-revision 0.49.1", + "gix-revwalk 0.35.0", "gix-sec", "gix-shallow 0.13.0", "gix-status", - "gix-submodule 0.33.0", + "gix-submodule 0.34.0", "gix-tempfile 24.0.0", "gix-trace", - "gix-traverse 0.60.0", - "gix-url 0.37.0", + "gix-traverse 0.61.0", + "gix-url 0.38.0", "gix-utils", "gix-validate", - "gix-worktree 0.55.0", + "gix-worktree 0.56.0", "gix-worktree-state", - "gix-worktree-stream 0.35.0", + "gix-worktree-stream 0.36.1", "gix-zlib", "nonempty", "parking_lot", "regex", "signal-hook 0.4.4", "smallvec", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -2190,21 +2223,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33f9308ad6fd35b2a865cbe4117ac61b2be59e4a9ef1621c7a9794f7c8e52c5b" dependencies = [ "bstr", - "gix-date", - "gix-error", + "gix-date 0.15.6", + "gix-error 0.2.5", +] + +[[package]] +name = "gix-actor" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e37efa99929ac62f980fb1a7dcd09dea85b3aa6ead6ba0498362add3f4e698de" +dependencies = [ + "bstr", + "gix-date 0.16.0", + "gix-error 0.3.2", ] [[package]] name = "gix-archive" -version = "0.35.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6760ef6ef4edfa6449918977d59518ff209676f47e89bdce87a36a50be35e834" +checksum = "1c4ef97efd3920d3525104c5f253dec94dc935f953a50055954939177aed2cdd" dependencies = [ "bstr", - "gix-date", - "gix-error", - "gix-object 0.63.0", - "gix-worktree-stream 0.35.0", + "gix-date 0.16.0", + "gix-error 0.3.2", + "gix-object 0.64.1", + "gix-worktree-stream 0.36.1", ] [[package]] @@ -2216,28 +2260,28 @@ dependencies = [ "bstr", "gix-glob 0.26.1", "gix-path", - "gix-quote", + "gix-quote 0.7.2", "gix-trace", "kstring", "smallvec", - "thiserror 2.0.19", + "thiserror 2.0.20", "unicode-bom", ] [[package]] name = "gix-attributes" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31c593692ebdc1e38858d9a2b56f6a594c501e24a38971fe6685571f5a07be0" +checksum = "76b83782ac69ae28921a6e8fbcf2e24069613f1518030b97ae622b079abffa54" dependencies = [ "bstr", - "gix-features 0.49.0", - "gix-glob 0.27.0", + "gix-features 0.49.1", + "gix-glob 0.27.1", "gix-path", - "gix-quote", + "gix-quote 0.8.0", "gix-trace", "smallvec", - "thiserror 2.0.19", + "thiserror 2.0.20", "unicode-bom", ] @@ -2247,27 +2291,36 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cd1d118d0f5d88b96e6f6e13b566475fef4797ead4a02c26fed36c1375066f7" dependencies = [ - "gix-error", + "gix-error 0.2.5", +] + +[[package]] +name = "gix-bitmap" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f17013c7ef5cb95ebb4bf4978201e6a8a42ffea9d666fd5388f1b7e742307d80" +dependencies = [ + "gix-error 0.3.2", ] [[package]] name = "gix-blame" -version = "0.16.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06d20ff0e88ada2dd852b3852727b664ec9baefdf653d1d4e722e858c52cd17" +checksum = "54fe27f8037c58cb4b6d60fe0aacf7ee2c998633cedf4e989351c07d9a3a575d" dependencies = [ - "gix-commitgraph 0.38.0", - "gix-date", - "gix-diff 0.66.0", - "gix-error", - "gix-hash 0.26.0", - "gix-object 0.63.0", - "gix-revwalk 0.34.0", + "gix-commitgraph 0.39.0", + "gix-date 0.16.0", + "gix-diff 0.67.1", + "gix-error 0.3.2", + "gix-hash 0.26.2", + "gix-object 0.64.1", + "gix-revwalk 0.35.0", "gix-trace", - "gix-traverse 0.60.0", - "gix-worktree 0.55.0", + "gix-traverse 0.61.0", + "gix-worktree 0.56.0", "smallvec", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -2276,7 +2329,16 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2a871e5cab12ba568845714473505deefffb3c04eb47f4708ce344cd459c1cc" dependencies = [ - "gix-error", + "gix-error 0.2.5", +] + +[[package]] +name = "gix-chunk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00e32f938b3745ac93d73bc7490b6a15a661b2fc81973bfe90e275cc53c908e1" +dependencies = [ + "gix-error 0.3.2", ] [[package]] @@ -2287,11 +2349,23 @@ checksum = "00706d4fef135ef4b01680d5218c6ee40cda8baf697b864296cbc887d19118f6" dependencies = [ "bstr", "gix-path", - "gix-quote", + "gix-quote 0.7.2", "gix-trace", "shell-words", ] +[[package]] +name = "gix-command" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa00adbd2c77f584cfe41f348772d2f131af1fa519a7f6b98638f1144ead96a4" +dependencies = [ + "bstr", + "gix-path", + "gix-quote 0.8.0", + "gix-trace", +] + [[package]] name = "gix-commitgraph" version = "0.37.1" @@ -2299,8 +2373,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f675d0df484a7f6a47e64bd6f311af489d947c0323b0564f36d14f3d7762abb" dependencies = [ "bstr", - "gix-chunk", - "gix-error", + "gix-chunk 0.7.3", + "gix-error 0.2.5", "gix-hash 0.25.1", "memmap2", "nonempty", @@ -2308,14 +2382,14 @@ dependencies = [ [[package]] name = "gix-commitgraph" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2cd7f054ae2727223fe46dd39c012f066b12f532962d336d29ee193261787da" +checksum = "6b93c9fb1f5be01bba54a7a3b7455d359efc68555539c75ef74b8021bb6db497" dependencies = [ "bstr", - "gix-chunk", - "gix-error", - "gix-hash 0.26.0", + "gix-chunk 0.8.0", + "gix-error 0.3.2", + "gix-hash 0.26.2", "memmap2", "nonempty", ] @@ -2334,26 +2408,26 @@ dependencies = [ "gix-ref 0.65.0", "gix-sec", "smallvec", - "thiserror 2.0.19", + "thiserror 2.0.20", "unicode-bom", ] [[package]] name = "gix-config" -version = "0.59.0" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "103d11bef95c467577ecfa8b7b86a22e65af3507b2c9bfa3809a4afbae7df301" +checksum = "f973c28c0a4871a7926fc90c8377d4458fd6cbb19692f56582b4d2022313ae90" dependencies = [ "bstr", - "gix-config-value 0.19.0", - "gix-features 0.49.0", - "gix-glob 0.27.0", + "gix-config-value 0.19.1", + "gix-features 0.49.1", + "gix-glob 0.27.1", "gix-path", - "gix-ref 0.66.0", + "gix-ref 0.67.1", "gix-sec", "gix-utils", "smallvec", - "thiserror 2.0.19", + "thiserror 2.0.20", "unicode-bom", ] @@ -2367,38 +2441,39 @@ dependencies = [ "bstr", "gix-path", "libc", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix-config-value" -version = "0.19.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f813e312a3f7f327187823cd4c754a3e4d948c98907d11e8f37554a2b6b8059" +checksum = "6f6af5321bfd3711a279d6b244d58532ba1cfabf9eb6374791f19929d8970082" dependencies = [ "bitflags 2.13.0", "bstr", "gix-path", "libc", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix-credentials" -version = "0.39.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b637f873d5f9aa67e672c1b23741a18e046d33028017adede32f4b4087a2e7" +checksum = "16c11822054fd4b80a1ab722b703f2e7c691b20484d898374289b742c1f49e50" dependencies = [ "bstr", - "gix-command", - "gix-config-value 0.19.0", - "gix-date", + "gix-command 0.10.1", + "gix-config-value 0.19.1", + "gix-date 0.16.0", "gix-path", "gix-prompt", + "gix-quote 0.8.0", "gix-sec", "gix-trace", - "gix-url 0.37.0", - "thiserror 2.0.19", + "gix-url 0.38.0", + "thiserror 2.0.20", ] [[package]] @@ -2408,7 +2483,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e47b9e8cdc688296609b706428de570f88b1e0eed7156dde7b4a89d26fa4567" dependencies = [ "bstr", - "gix-error", + "gix-error 0.2.5", + "itoa", + "jiff", +] + +[[package]] +name = "gix-date" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e63d9aa18f29facd571c8953e66224ee0075b9e16622024794555ed4acceea85" +dependencies = [ + "bstr", + "gix-error 0.3.2", "itoa", "jiff", ] @@ -2420,7 +2507,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92c6d56c94edf92d78203a1cd416f770e35e10b6955ede6b9d7d0c22ff88a5f3" dependencies = [ "bstr", - "gix-command", + "gix-command 0.9.1", "gix-filter 0.32.0", "gix-fs 0.21.2", "gix-hash 0.25.1", @@ -2431,51 +2518,51 @@ dependencies = [ "gix-trace", "gix-traverse 0.59.0", "gix-worktree 0.54.0", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix-diff" -version = "0.66.0" +version = "0.67.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee7d89a3c507491cdfc57a1d1e0e300214720b4f7709ebc253e422f99822bfc" +checksum = "1b1689ff5ddeee4acfb2a43e875a1072a76d208624b15a9065c938b39cb0da2a" dependencies = [ "bstr", - "gix-attributes 0.34.0", - "gix-command", - "gix-filter 0.33.0", - "gix-fs 0.22.0", - "gix-hash 0.26.0", + "gix-attributes 0.35.0", + "gix-command 0.10.1", + "gix-filter 0.34.0", + "gix-fs 0.22.1", + "gix-hash 0.26.2", "gix-imara-diff", - "gix-index 0.54.0", - "gix-object 0.63.0", + "gix-index 0.55.0", + "gix-object 0.64.1", "gix-path", - "gix-pathspec 0.19.0", + "gix-pathspec 0.20.0", "gix-tempfile 24.0.0", "gix-trace", - "gix-traverse 0.60.0", - "gix-worktree 0.55.0", - "thiserror 2.0.19", + "gix-traverse 0.61.0", + "gix-worktree 0.56.0", + "thiserror 2.0.20", ] [[package]] name = "gix-dir" -version = "0.28.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f24bc78f283946ac64757c8a61ffa71f0230aa1e8d98cbb0771db479871dd5b6" +checksum = "8342d5eb0ea054ed6ef807e628e38f06dd51eceeec9529767d8b23e33eff9c09" dependencies = [ "bstr", - "gix-discover 0.54.0", - "gix-fs 0.22.0", - "gix-ignore 0.22.0", - "gix-index 0.54.0", - "gix-object 0.63.0", + "gix-discover 0.55.0", + "gix-fs 0.22.1", + "gix-ignore 0.22.1", + "gix-index 0.55.0", + "gix-object 0.64.1", "gix-path", - "gix-pathspec 0.19.0", + "gix-pathspec 0.20.0", "gix-trace", "gix-utils", - "gix-worktree 0.55.0", - "thiserror 2.0.19", + "gix-worktree 0.56.0", + "thiserror 2.0.20", ] [[package]] @@ -2490,22 +2577,22 @@ dependencies = [ "gix-path", "gix-ref 0.65.0", "gix-sec", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix-discover" -version = "0.54.0" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f517766fa1101dfe2606c1a19a8ffa699099030995a9194445446dfe261bdf" +checksum = "ec32a30ec2934735599c2545f30067e80bd255fd3454b52a5d59bc02b52874a3" dependencies = [ "bstr", "dunce", - "gix-fs 0.22.0", + "gix-fs 0.22.1", "gix-path", - "gix-ref 0.66.0", + "gix-ref 0.67.1", "gix-sec", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -2517,6 +2604,15 @@ dependencies = [ "bstr", ] +[[package]] +name = "gix-error" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a1ba536602db507119eb5f3cdf80bef3ca5a5ec0dfc6e9c7f46dc70ade7c112" +dependencies = [ + "bstr", +] + [[package]] name = "gix-features" version = "0.48.1" @@ -2533,16 +2629,16 @@ dependencies = [ "once_cell", "parking_lot", "prodash", - "thiserror 2.0.19", + "thiserror 2.0.20", "walkdir", "zlib-rs", ] [[package]] name = "gix-features" -version = "0.49.0" +version = "0.49.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20aa09e83a48dc02c5f5f08578aa79d3ab1bab4618b8c362f88684645a02bdcc" +checksum = "39c0e59d9d253dcccc38c3a46b91bfb9b46bd63eed54fe1a719e12194884d52a" dependencies = [ "bytes", "bytesize", @@ -2567,37 +2663,37 @@ dependencies = [ "bstr", "encoding_rs", "gix-attributes 0.33.2", - "gix-command", + "gix-command 0.9.1", "gix-hash 0.25.1", "gix-object 0.62.0", "gix-packetline 0.21.5", "gix-path", - "gix-quote", + "gix-quote 0.7.2", "gix-trace", "gix-utils", "smallvec", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix-filter" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e7b5dbf524d97e839f642930c76d7f011c0791e7d11d8148989ac5af7c76aa8" +checksum = "9c30b28d957e2e6f1e1bbfbfd26b8e0bb0aab68d8a5e730fb4fd3049943575e3" dependencies = [ "bstr", "encoding_rs", - "gix-attributes 0.34.0", - "gix-command", - "gix-hash 0.26.0", - "gix-object 0.63.0", - "gix-packetline 0.22.0", + "gix-attributes 0.35.0", + "gix-command 0.10.1", + "gix-hash 0.26.2", + "gix-object 0.64.1", + "gix-packetline 0.22.2", "gix-path", - "gix-quote", + "gix-quote 0.8.0", "gix-trace", "gix-utils", "smallvec", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -2611,20 +2707,20 @@ dependencies = [ "gix-features 0.48.1", "gix-path", "gix-utils", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix-fs" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865cf13fcaf5455220546cb9607c416bd1be9a6caafd143655a362fdeab64e80" +checksum = "ebcfa9fd253f25350a3b21b3dd74034a446098e373c6123d4cee3519894f12ef" dependencies = [ "bstr", - "gix-features 0.49.0", + "gix-features 0.49.1", "gix-path", "gix-utils", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -2641,13 +2737,13 @@ dependencies = [ [[package]] name = "gix-glob" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "421e92a711554fa5827d1b0599d3389acdd0f6729e97a8c5a57d79af1e50bf36" +checksum = "b417cf515fd8c91468b578071f76d6cba716f8a1eccd853906bff4908b2c1413" dependencies = [ "bitflags 2.13.0", "bstr", - "gix-features 0.49.0", + "gix-features 0.49.1", "gix-path", ] @@ -2660,19 +2756,20 @@ dependencies = [ "faster-hex", "gix-features 0.48.1", "sha1-checked", - "thiserror 2.0.19", + "sha2 0.11.0", + "thiserror 2.0.20", ] [[package]] name = "gix-hash" -version = "0.26.0" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13adaa73415fd6c902310923f68d0b98e8cecf14b33ea58c02cc387cee56f54e" +checksum = "380b9c423a54f0821064b954b5a5ab25c660812f6a91da03c3f1cb4b10762aa5" dependencies = [ "faster-hex", - "gix-features 0.49.0", + "gix-features 0.49.1", "sha1-checked", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -2692,7 +2789,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78fccd6fea3bcf0b39c076bae60ae49b08daaf538b950202101a981f9d3c01d3" dependencies = [ - "gix-hash 0.26.0", + "gix-hash 0.26.2", "hashbrown 0.17.1", "parking_lot", ] @@ -2712,12 +2809,12 @@ dependencies = [ [[package]] name = "gix-ignore" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cff8e8aa125e39377456073e63df3334d9e5741372ddcc226198015076dda2" +checksum = "65859a2f7de5e159d4344a5486ebf53b6bac22d5ec6afa836e47c10ae88a7f0f" dependencies = [ "bstr", - "gix-glob 0.27.0", + "gix-glob 0.27.1", "gix-path", "gix-trace", "unicode-bom", @@ -2725,9 +2822,9 @@ dependencies = [ [[package]] name = "gix-imara-diff" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a791e6620676a875f362f3156ed213e73ca099a09bf992c18812abe65cc37b1" +checksum = "1c91d8cffac8849493a82233811bd02b2b183b8cf39bf704de0fa0841b737595" dependencies = [ "bstr", "hashbrown 0.17.1", @@ -2743,7 +2840,7 @@ dependencies = [ "bstr", "filetime", "fnv", - "gix-bitmap", + "gix-bitmap 0.3.3", "gix-features 0.48.1", "gix-fs 0.21.2", "gix-hash 0.25.1", @@ -2758,26 +2855,26 @@ dependencies = [ "memmap2", "rustix", "smallvec", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix-index" -version = "0.54.0" +version = "0.55.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5009c4e7e9f9b4cfaaab1153e49133eb04d79c015b5702d6c3d2ab94271a89c6" +checksum = "632e16cb48b0e88a747e106924cb2765194105d8070a7a961b0d080ed806c632" dependencies = [ "bitflags 2.13.0", "bstr", "filetime", "fnv", - "gix-bitmap", - "gix-features 0.49.0", - "gix-fs 0.22.0", - "gix-hash 0.26.0", + "gix-bitmap 0.4.0", + "gix-features 0.49.1", + "gix-fs 0.22.1", + "gix-hash 0.26.2", "gix-lock 24.0.0", - "gix-object 0.63.0", - "gix-traverse 0.60.0", + "gix-object 0.64.1", + "gix-traverse 0.61.0", "gix-utils", "gix-validate", "hashbrown 0.17.1", @@ -2786,7 +2883,7 @@ dependencies = [ "memmap2", "rustix", "smallvec", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -2797,7 +2894,7 @@ checksum = "65c9dedd9e90b0d47624d2ed241d394e09294118364e87b9b7e5f1fe755f3c2c" dependencies = [ "gix-tempfile 23.0.2", "gix-utils", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -2808,33 +2905,82 @@ checksum = "d4c69157820343bf1c6e4b88b9808e920900de02e18aaf5862b30ada43814848" dependencies = [ "gix-tempfile 24.0.0", "gix-utils", - "thiserror 2.0.19", + "thiserror 2.0.20", +] + +[[package]] +name = "gix-macros" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3836b4b051393464a753c5a08fe19c7ce0d8b77574a92bd558972941d4553cb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", ] [[package]] name = "gix-mailmap" -version = "0.33.2" +version = "0.34.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a824767d38b81475059cb01f5020a13fb96e7ed6bbf9851c7112b46ada78db48" +checksum = "1a1c6ca2f9481e5e98b3600b859bc595d46cdf3b600709d5f91b8c118ae452a1" dependencies = [ "bstr", - "gix-actor", - "gix-date", - "gix-error", + "gix-actor 0.42.0", + "gix-date 0.16.0", + "gix-error 0.3.2", +] + +[[package]] +name = "gix-merge" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72fad4279c940a0fa460ffdf3a3c0e48b7ca5ccb2b08f51a02b22ffcd1efb900" +dependencies = [ + "bstr", + "gix-command 0.10.1", + "gix-diff 0.67.1", + "gix-filter 0.34.0", + "gix-fs 0.22.1", + "gix-hash 0.26.2", + "gix-imara-diff", + "gix-index 0.55.0", + "gix-object 0.64.1", + "gix-path", + "gix-quote 0.8.0", + "gix-revision 0.49.1", + "gix-revwalk 0.35.0", + "gix-tempfile 24.0.0", + "gix-trace", + "gix-worktree 0.56.0", + "nonempty", + "thiserror 2.0.20", ] [[package]] name = "gix-negotiate" -version = "0.34.0" +version = "0.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fa5aa789990f124e4f559b142cecfb60662cb4ae17006684ea9d668f4f07689" +checksum = "91068ecee956121d663635b873ae87ad9c5d3f2d6788facfd12829140b39c897" dependencies = [ "bitflags 2.13.0", - "gix-commitgraph 0.38.0", - "gix-date", - "gix-hash 0.26.0", - "gix-object 0.63.0", - "gix-revwalk 0.34.0", + "gix-commitgraph 0.39.0", + "gix-date 0.16.0", + "gix-hash 0.26.2", + "gix-object 0.64.1", + "gix-revwalk 0.35.0", +] + +[[package]] +name = "gix-note" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9af6bbdb3f3c62b4920407c479af1cc0beb27fd75a762782d48baed53d330958" +dependencies = [ + "gix-error 0.3.2", + "gix-hash 0.26.2", + "gix-hashtable 0.16.0", + "gix-object 0.64.1", ] [[package]] @@ -2844,8 +2990,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "019b38afc3eac1e41f9fe09a327664b313ba4a120fa5f40e3678795d0e42783e" dependencies = [ "bstr", - "gix-actor", - "gix-date", + "gix-actor 0.41.2", + "gix-date 0.15.6", "gix-features 0.48.1", "gix-hash 0.25.1", "gix-hashtable 0.15.2", @@ -2853,26 +2999,28 @@ dependencies = [ "gix-validate", "itoa", "smallvec", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix-object" -version = "0.63.0" +version = "0.64.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e48c235e7f886eb819fc878af75be889333dd3c38bee02ed7af48ae2cf596c4" +checksum = "56fef799ca40cdeab4de5a3e74a696d8fa9b9c6264592646bf022e026f13ce2c" dependencies = [ "bstr", - "gix-actor", - "gix-date", - "gix-features 0.49.0", - "gix-hash 0.26.0", + "gix-actor 0.42.0", + "gix-command 0.10.1", + "gix-date 0.16.0", + "gix-features 0.49.1", + "gix-hash 0.26.2", "gix-hashtable 0.16.0", + "gix-tempfile 24.0.0", "gix-utils", "gix-validate", "itoa", "smallvec", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -2889,33 +3037,33 @@ dependencies = [ "gix-object 0.62.0", "gix-pack 0.72.0", "gix-path", - "gix-quote", + "gix-quote 0.7.2", "memmap2", "parking_lot", "tempfile", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix-odb" -version = "0.83.0" +version = "0.84.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd494ffb5037e62b8220109e894d2861ff2150a2cacbfccdba57ae1ebab2b96" +checksum = "cf45d195b71cb6363886e7b466821bf4dffd7aba1b6b814ff75488e0061d72a7" dependencies = [ "arc-swap", - "gix-features 0.49.0", - "gix-fs 0.22.0", - "gix-hash 0.26.0", + "gix-features 0.49.1", + "gix-fs 0.22.1", + "gix-hash 0.26.2", "gix-hashtable 0.16.0", - "gix-object 0.63.0", - "gix-pack 0.73.0", + "gix-object 0.64.1", + "gix-pack 0.74.2", "gix-path", - "gix-quote", + "gix-quote 0.8.0", "gix-zlib", "memmap2", "parking_lot", "tempfile", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -2925,8 +3073,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca3e7f1726cd2c0cd1cf1fc20be8a8e623f0b163f1f8d6fc836cfb9bc8cd758b" dependencies = [ "clru", - "gix-chunk", - "gix-error", + "gix-chunk 0.7.3", + "gix-error 0.2.5", "gix-features 0.48.1", "gix-hash 0.25.1", "gix-hashtable 0.15.2", @@ -2934,28 +3082,29 @@ dependencies = [ "gix-path", "memmap2", "smallvec", - "thiserror 2.0.19", + "thiserror 2.0.20", "uluru", ] [[package]] name = "gix-pack" -version = "0.73.0" +version = "0.74.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d5446127b269706e85998065267ddd2ccc3550179da6780b22fe496175ccb20" +checksum = "3d199d515cbdcf05f531f3859be9771fc12acac7b7fe0f5b581b2c1ab1c3a61e" dependencies = [ "clru", - "gix-chunk", - "gix-error", - "gix-features 0.49.0", - "gix-hash 0.26.0", + "crossbeam-deque", + "gix-chunk 0.8.0", + "gix-error 0.3.2", + "gix-features 0.49.1", + "gix-hash 0.26.2", "gix-hashtable 0.16.0", - "gix-object 0.63.0", + "gix-object 0.64.1", "gix-path", "gix-zlib", "memmap2", "smallvec", - "thiserror 2.0.19", + "thiserror 2.0.20", "uluru", ] @@ -2968,31 +3117,31 @@ dependencies = [ "bstr", "faster-hex", "gix-trace", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix-packetline" -version = "0.22.0" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3766025c72319c4accdd854a18e6f0dd176c8eb0f3bc8a60a7765be2b50cabf2" +checksum = "792bd92bea390087e6223b18d4d023decc36467de31e6b066b69b94beea1b9e2" dependencies = [ "bstr", "faster-hex", "gix-trace", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix-path" -version = "0.12.3" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ed3e8d7a82e886e17a72e03d4ba0c13db6f2219b6cd4e2900b4cae426ec20c9" +checksum = "38fc6f029ea67de83cbcbd33fd98c05a48360d2932b39d9fdacbc6eae802d475" dependencies = [ "bstr", "gix-trace", "gix-validate", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -3007,35 +3156,35 @@ dependencies = [ "gix-config-value 0.18.1", "gix-glob 0.26.1", "gix-path", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix-pathspec" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f6fa5f8007f008187c3f60b4373209ca83d1cc947f35ede03e16cd15a4d137" +checksum = "c92e44c63ba53bb55aa88ee48847664beae9446417621582fb14dfc69b2f8c72" dependencies = [ "bitflags 2.13.0", "bstr", - "gix-attributes 0.34.0", - "gix-config-value 0.19.0", - "gix-glob 0.27.0", + "gix-attributes 0.35.0", + "gix-config-value 0.19.1", + "gix-glob 0.27.1", "gix-path", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix-prompt" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cb1f1eb92d6f4c9d4c105a6ca912cff637fbd5cacbcbafa5deccd88bfaa3565" +checksum = "802256e13ecb2133ba5f9e6acbaa6b08bac027b1c5929f85f6adbb56ba3a4f28" dependencies = [ - "gix-command", - "gix-config-value 0.19.0", + "gix-command 0.10.1", + "gix-config-value 0.19.1", "parking_lot", "rustix", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -3045,7 +3194,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978468bae4ea2df20c72db3b20d0bdb548a0c1090b85a83643b553e6e0e041f2" dependencies = [ "bstr", - "gix-date", + "gix-date 0.15.6", "gix-features 0.48.1", "gix-hash 0.25.1", "gix-ref 0.65.0", @@ -3054,26 +3203,26 @@ dependencies = [ "gix-utils", "maybe-async", "nonempty", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix-protocol" -version = "0.64.0" +version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dede40e89c1e90f548415f50636bb051f6d9c60f68b8b710bc07825722d19588" +checksum = "68878c37ae168b474c762d70adc8a8e0f9323ed0d80444a672e2eb561fa16691" dependencies = [ - "bisync", "bstr", - "gix-date", - "gix-features 0.49.0", - "gix-hash 0.26.0", - "gix-ref 0.66.0", + "gix-date 0.16.0", + "gix-features 0.49.1", + "gix-hash 0.26.2", + "gix-macros", + "gix-ref 0.67.1", "gix-shallow 0.13.0", - "gix-transport 0.58.0", + "gix-transport 0.59.2", "gix-utils", "nonempty", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -3083,7 +3232,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6e541fc33cc2b783b7979040d445a0c86a2eca747c8faea4ca84230d06ae6ef" dependencies = [ "bstr", - "gix-error", + "gix-error 0.2.5", + "gix-utils", +] + +[[package]] +name = "gix-quote" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f74795eb76eab8313063849f9cbd2bbcdc6e4692f71c1d7d0244ab11cd777329" +dependencies = [ + "bstr", + "gix-error 0.3.2", "gix-utils", ] @@ -3093,7 +3253,7 @@ version = "0.65.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bbfbce1dfd7d7f8469ddef6d3518376aff664348f153cbe0fc3e58ef993d24e" dependencies = [ - "gix-actor", + "gix-actor 0.41.2", "gix-features 0.48.1", "gix-fs 0.21.2", "gix-hash 0.25.1", @@ -3104,27 +3264,27 @@ dependencies = [ "gix-utils", "gix-validate", "memmap2", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix-ref" -version = "0.66.0" +version = "0.67.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb0c90a8f6202ceaaa22996cbf837c943ccb2d8af9ff3490f0758305e6b7883" +checksum = "8328387e7ab354e1dc3afb63e6b4d1866f82d7ce035222bc9d5baaf36bc88020" dependencies = [ - "gix-actor", - "gix-features 0.49.0", - "gix-fs 0.22.0", - "gix-hash 0.26.0", + "gix-actor 0.42.0", + "gix-features 0.49.1", + "gix-fs 0.22.1", + "gix-hash 0.26.2", "gix-lock 24.0.0", - "gix-object 0.63.0", + "gix-object 0.64.1", "gix-path", "gix-tempfile 24.0.0", "gix-utils", "gix-validate", "memmap2", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -3134,29 +3294,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7bc36a4fb1a1540b59cf2da498783080743fa274b02a3f19ca444fc4015a9d4f" dependencies = [ "bstr", - "gix-error", + "gix-error 0.2.5", "gix-glob 0.26.1", "gix-hash 0.25.1", "gix-revision 0.47.0", "gix-validate", "smallvec", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix-refspec" -version = "0.44.0" +version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7406282cc0259b51f6aee299ca3d31279a020530363152a2e6c96e8a7f7bbc83" +checksum = "7de280d46e8fd9e4d3e7e2ab4276b965e377ba68b2b9a8fce56371015e8bb059" dependencies = [ "bstr", - "gix-error", - "gix-glob 0.27.0", - "gix-hash 0.26.0", - "gix-revision 0.48.0", + "gix-hash 0.26.2", "gix-validate", "smallvec", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -3167,8 +3324,8 @@ checksum = "885075c3c21eb9c06e0be3b3728ba5932c04e1c1011dcee7c81801980e3e986f" dependencies = [ "bstr", "gix-commitgraph 0.37.1", - "gix-date", - "gix-error", + "gix-date 0.15.6", + "gix-error 0.2.5", "gix-hash 0.25.1", "gix-object 0.62.0", "gix-revwalk 0.33.0", @@ -3177,19 +3334,19 @@ dependencies = [ [[package]] name = "gix-revision" -version = "0.48.0" +version = "0.49.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55e09d4a1ecf2beecc8c09cafcad37979e805b31f588b0e957e191df5783681" +checksum = "4577b864c3e134697e91564553e43230c2e401bb1bcc51cfa998edca21c95078" dependencies = [ "bitflags 2.13.0", "bstr", - "gix-commitgraph 0.38.0", - "gix-date", - "gix-error", - "gix-hash 0.26.0", + "gix-commitgraph 0.39.0", + "gix-date 0.16.0", + "gix-error 0.3.2", + "gix-hash 0.26.2", "gix-hashtable 0.16.0", - "gix-object 0.63.0", - "gix-revwalk 0.34.0", + "gix-object 0.64.1", + "gix-revwalk 0.35.0", "gix-trace", "nonempty", ] @@ -3201,29 +3358,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f11fe7ca2585193d3d70bbe0be175a2008d883a704cc7a55e454e113e689455" dependencies = [ "gix-commitgraph 0.37.1", - "gix-date", - "gix-error", + "gix-date 0.15.6", + "gix-error 0.2.5", "gix-hash 0.25.1", "gix-hashtable 0.15.2", "gix-object 0.62.0", "smallvec", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix-revwalk" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c113c0a53294dc6280ffc06cbcc4f50f820397e97d6a00b429a44b8db26e29" +checksum = "248823eefe405e2c0754b74f6f43ab6faab68670cdbf2d6e114cb0471f766450" dependencies = [ - "gix-commitgraph 0.38.0", - "gix-date", - "gix-error", - "gix-hash 0.26.0", + "gix-commitgraph 0.39.0", + "gix-date 0.16.0", + "gix-error 0.3.2", + "gix-hash 0.26.2", "gix-hashtable 0.16.0", - "gix-object 0.63.0", + "gix-object 0.64.1", "smallvec", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -3248,7 +3405,7 @@ dependencies = [ "gix-hash 0.25.1", "gix-lock 23.0.1", "nonempty", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -3258,34 +3415,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ecc9f4b40537043e4bbd7d3d1760e74fb8e7b07a546166b558acaa73ad97f4a" dependencies = [ "bstr", - "gix-hash 0.26.0", + "gix-hash 0.26.2", "gix-lock 24.0.0", "nonempty", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix-status" -version = "0.33.0" +version = "0.34.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f83b1c74e69b90411fbfe89ccebc47aa49457ce4eb9b942b1311258fc863d22" +checksum = "1401d871c01d82add5a9f654439b00722d0c632b332cd2cb63193f94327c8458" dependencies = [ "bstr", "filetime", - "gix-diff 0.66.0", + "gix-diff 0.67.1", "gix-dir", - "gix-features 0.49.0", - "gix-filter 0.33.0", - "gix-fs 0.22.0", - "gix-hash 0.26.0", - "gix-index 0.54.0", - "gix-object 0.63.0", + "gix-features 0.49.1", + "gix-filter 0.34.0", + "gix-fs 0.22.1", + "gix-hash 0.26.2", + "gix-index 0.55.0", + "gix-object 0.64.1", "gix-path", - "gix-pathspec 0.19.0", - "gix-worktree 0.55.0", + "gix-pathspec 0.20.0", + "gix-worktree 0.56.0", "hashbrown 0.16.1", "portable-atomic", - "thiserror 2.0.19", + "thiserror 2.0.20", "windows-sys 0.61.2", ] @@ -3301,22 +3458,22 @@ dependencies = [ "gix-pathspec 0.18.1", "gix-refspec 0.43.0", "gix-url 0.36.1", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix-submodule" -version = "0.33.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd98077a56d08886112e6b08dc94076d03539f4bc0b9d7880e4be2b8a640d8c" +checksum = "da85564d6725c483b8d95d7b31d1db0b78c29e462a2b481949e2f18e1ed55a6a" dependencies = [ "bstr", - "gix-config 0.59.0", + "gix-config 0.60.0", "gix-path", - "gix-pathspec 0.19.0", - "gix-refspec 0.44.0", - "gix-url 0.37.0", - "thiserror 2.0.19", + "gix-pathspec 0.20.0", + "gix-refspec 0.45.1", + "gix-url 0.38.0", + "thiserror 2.0.20", ] [[package]] @@ -3339,7 +3496,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b675b920bd5a61d17ad542772f03ec34c60feb8ff683e1560c03ae967363731e" dependencies = [ "dashmap", - "gix-fs 0.22.0", + "gix-fs 0.22.1", "libc", "parking_lot", "signal-hook 0.4.4", @@ -3360,30 +3517,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "186874f7ad1fb2f9a2f2aa9c2dabc7f9dd087bef74c1a0eee2b4a9cf0248fcb3" dependencies = [ "bstr", - "gix-command", + "gix-command 0.9.1", "gix-features 0.48.1", "gix-packetline 0.21.5", - "gix-quote", + "gix-quote 0.7.2", "gix-sec", "gix-url 0.36.1", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix-transport" -version = "0.58.0" +version = "0.59.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c1bcf30081eb8ab04540a5795c67a2fcb22cb2e976e8b1a4ea657b1ed61469" +checksum = "b3f41a64939953ff49117df4eb91334d299abc59ff57a90fb2193d8ffa5886f1" dependencies = [ "bstr", - "gix-command", - "gix-features 0.49.0", - "gix-packetline 0.22.0", + "gix-command 0.10.1", + "gix-features 0.49.1", + "gix-packetline 0.22.2", "gix-path", - "gix-quote", + "gix-quote 0.8.0", "gix-sec", - "gix-url 0.37.0", - "thiserror 2.0.19", + "gix-url 0.38.0", + "thiserror 2.0.20", ] [[package]] @@ -3394,30 +3551,30 @@ checksum = "5062cca8f2977565bbaf666ec31dbdb9bc9d9293beb65f9bec52e6c1121b62a1" dependencies = [ "bitflags 2.13.0", "gix-commitgraph 0.37.1", - "gix-date", + "gix-date 0.15.6", "gix-hash 0.25.1", "gix-hashtable 0.15.2", "gix-object 0.62.0", "gix-revwalk 0.33.0", "smallvec", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix-traverse" -version = "0.60.0" +version = "0.61.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "008c5cd879e46e86b5c2469e633611978b18775d53d05668d691bc13088bd409" +checksum = "9af3503668739f4de5dba57fe15cfd9adc443b08bcbbf195e5de16b648872245" dependencies = [ "bitflags 2.13.0", - "gix-commitgraph 0.38.0", - "gix-date", - "gix-hash 0.26.0", + "gix-commitgraph 0.39.0", + "gix-date 0.16.0", + "gix-hash 0.26.2", "gix-hashtable 0.16.0", - "gix-object 0.63.0", - "gix-revwalk 0.34.0", + "gix-object 0.64.1", + "gix-revwalk 0.35.0", "smallvec", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -3429,27 +3586,27 @@ dependencies = [ "bstr", "gix-path", "percent-encoding", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix-url" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d10e53b8eae21ee601687f47bbbd6cb2ed7162cb4c1cafdd422fb7ec64cbee" +checksum = "5bda80ccb4bc81fb9fb07a975916eb0c7a889bcbcb0c8a239c3f82a9cc2abdda" dependencies = [ "bstr", "gix-path", "gix-utils", "percent-encoding", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] name = "gix-utils" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1795bd2a970ca8b2185318c2abb97d955c71992f1cf28de73ad3b593a9f3ce8" +checksum = "0da1c46491b49458a446cc76f0085860f8164c2290742e0aa8c653ce67240a97" dependencies = [ "bstr", "fastrand", @@ -3459,9 +3616,9 @@ dependencies = [ [[package]] name = "gix-validate" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a034e84d1e04e1b1f20f51f12491da230b6ac8b925d0c8e1b89bcd87a7c5ccc" +checksum = "4dae8780f63ed8a803b8bdabbd7aa5f5c5d74592c8b50eed875c1bb4f6545a6a" dependencies = [ "bstr", ] @@ -3486,39 +3643,39 @@ dependencies = [ [[package]] name = "gix-worktree" -version = "0.55.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31eb8e675122e83585e461fe28f68ff8c5ed55b49017b697e7e76423ff973424" +checksum = "3ed36b627476e2072c129900a17c977a38052b5497e27308159bc881fbf4eecf" dependencies = [ "bstr", - "gix-attributes 0.34.0", - "gix-features 0.49.0", - "gix-fs 0.22.0", - "gix-glob 0.27.0", - "gix-hash 0.26.0", - "gix-ignore 0.22.0", - "gix-index 0.54.0", - "gix-object 0.63.0", + "gix-attributes 0.35.0", + "gix-features 0.49.1", + "gix-fs 0.22.1", + "gix-glob 0.27.1", + "gix-hash 0.26.2", + "gix-ignore 0.22.1", + "gix-index 0.55.0", + "gix-object 0.64.1", "gix-path", "gix-validate", ] [[package]] name = "gix-worktree-state" -version = "0.33.0" +version = "0.34.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc47372fc12b9fbea51b257bcc8d4970326cf5c7e42135bbfb5d72871bb30bd4" +checksum = "4c14faa5b9527823c656a033e841dde11ca5b774f1bca7a9cdc23db677e55d56" dependencies = [ "bstr", - "gix-features 0.49.0", - "gix-filter 0.33.0", - "gix-fs 0.22.0", - "gix-index 0.54.0", - "gix-object 0.63.0", + "gix-features 0.49.1", + "gix-filter 0.34.0", + "gix-fs 0.22.1", + "gix-index 0.55.0", + "gix-object 0.64.1", "gix-path", - "gix-worktree 0.55.0", + "gix-worktree 0.56.0", "io-close", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -3528,7 +3685,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55f3a878c89a05470ad98c644b0015777c530da24854dd29e41fe4f41176840f" dependencies = [ "gix-attributes 0.33.2", - "gix-error", + "gix-error 0.2.5", "gix-features 0.48.1", "gix-filter 0.32.0", "gix-fs 0.21.2", @@ -3541,19 +3698,19 @@ dependencies = [ [[package]] name = "gix-worktree-stream" -version = "0.35.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b088c8724e7be120c4798dd86925cf05332c9d356a463542578600c50c7a549" +checksum = "de5ec0ccbab39c9994656ea031ded8ffd90b370a3cc8e360fbe3c4ebe7c64964" dependencies = [ - "gix-attributes 0.34.0", - "gix-error", - "gix-features 0.49.0", - "gix-filter 0.33.0", - "gix-fs 0.22.0", - "gix-hash 0.26.0", - "gix-object 0.63.0", + "gix-attributes 0.35.0", + "gix-error 0.3.2", + "gix-features 0.49.1", + "gix-filter 0.34.0", + "gix-fs 0.22.1", + "gix-hash 0.26.2", + "gix-object 0.64.1", "gix-path", - "gix-traverse 0.60.0", + "gix-traverse 0.61.0", "parking_lot", ] @@ -3563,7 +3720,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e8813f5579b3075ff9c90f7c59cd2b62b4ebb639361f0911648b22d7446cc7c" dependencies = [ - "thiserror 2.0.19", + "thiserror 2.0.20", "zlib-rs", ] @@ -4057,9 +4214,9 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.31" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f8a7b8211e695a1d0cd91cace480d4d0bd57667ab10277cc412c5f7f4884f83" +checksum = "00b69833ed729dc5aa7d19541d96d6cf8e9137194207a04916d658e43168402f" dependencies = [ "crossbeam-deque", "globset", @@ -4098,9 +4255,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.14.0" +version = "2.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" +checksum = "07aa2048142242915a31d35844fb311e0e53fcca590c3a0a40dcf1b841fa09eb" dependencies = [ "equivalent", "hashbrown 0.17.1", @@ -4144,7 +4301,7 @@ version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5eb2d60ef19920a3a9193c3e371f726ec1dafc045dac788d0fb3704272458971" dependencies = [ - "darling", + "darling 0.23.0", "indoc", "proc-macro2", "quote", @@ -4302,9 +4459,9 @@ dependencies = [ [[package]] name = "jj-cli" -version = "0.43.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046d761c74adaeff26fb8961b19867800b97f006894fb96a4f53f2d05157f52" +checksum = "87860d1b4763c853bc7a60e792912629bf4609efbf1f8b7a508484a85a437b4d" dependencies = [ "ansi-to-tui", "bstr", @@ -4315,13 +4472,14 @@ dependencies = [ "clap_complete_nushell", "clap_mangen", "crossterm", + "ctrlc", "dunce", "erased-serde", "etcetera", "futures", "gix 0.85.0", "globset", - "indexmap 2.14.0", + "indexmap 2.14.1", "indoc", "itertools 0.15.0", "jj-lib", @@ -4333,7 +4491,7 @@ dependencies = [ "percent-encoding", "pest", "pest_derive", - "pollster 0.4.0", + "pollster", "rand 0.10.2", "rand_chacha 0.10.0", "ratatui", @@ -4348,7 +4506,7 @@ dependencies = [ "slab", "tempfile", "textwrap", - "thiserror 2.0.19", + "thiserror 2.0.20", "timeago", "tokio", "toml 1.1.2+spec-1.1.0", @@ -4362,9 +4520,9 @@ dependencies = [ [[package]] name = "jj-lib" -version = "0.43.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22e2ced34a1a51f0f449bfff2cbacda1c338b2611268b5684a80251e4c8bf71" +checksum = "0d58fe15e3acbc89de606b7a10b284498ed908d09f3b7bdf560ca6f92e3a8d63" dependencies = [ "async-trait", "blake2", @@ -4380,15 +4538,16 @@ dependencies = [ "gix-ignore 0.21.1", "globset", "hashbrown 0.17.1", - "indexmap 2.14.0", + "indexmap 2.14.1", "interim", "itertools 0.15.0", "jj-lib-proc-macros", "maplit", + "memchr", "once_cell", "pest", "pest_derive", - "pollster 0.4.0", + "pollster", "prost", "rand 0.10.2", "rand_chacha 0.10.0", @@ -4401,7 +4560,7 @@ dependencies = [ "smallvec", "strsim", "tempfile", - "thiserror 2.0.19", + "thiserror 2.0.20", "toml_edit 0.25.12+spec-1.1.0", "tracing", "winreg 0.56.0", @@ -4409,13 +4568,13 @@ dependencies = [ [[package]] name = "jj-lib-proc-macros" -version = "0.43.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c21554e3755e5ecfec934d84ac64d0295d9c2f2b96f6a740a1ddb66addf4142e" +checksum = "d68a9ec87af36ba808fa818f5f1f041cce01df9eb0e21690e854fe612640060e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.117", + "syn 3.0.3", ] [[package]] @@ -4504,7 +4663,7 @@ checksum = "bde5057d6143cc94e861d90f591b9303d6716c6b9602309150bd068853c10899" dependencies = [ "hashbrown 0.16.1", "portable-atomic", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -4775,9 +4934,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.8.0" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" +checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "memmap2" @@ -4873,7 +5032,7 @@ dependencies = [ "once_cell", "png 0.18.1", "serde", - "thiserror 2.0.19", + "thiserror 2.0.20", "windows-sys 0.61.2", ] @@ -5572,7 +5731,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "092791278e026273c1b65bbdcfbba3a300f2994c896bd01ab01da613c29c46f1" dependencies = [ "base64 0.22.1", - "indexmap 2.14.0", + "indexmap 2.14.1", "quick-xml", "serde", "time", @@ -5618,12 +5777,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "pollster" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3" - [[package]] name = "pollster" version = "1.0.1" @@ -5979,7 +6132,7 @@ dependencies = [ "palette", "serde", "strum", - "thiserror 2.0.19", + "thiserror 2.0.20", "unicode-segmentation", "unicode-truncate", "unicode-width 0.2.2", @@ -6091,7 +6244,7 @@ checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" dependencies = [ "getrandom 0.2.17", "libredox", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -6128,9 +6281,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.16" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fcfdb36bda0c880c5931cdc7a2bcdc8ba4556847b9d912bca70bc94708711ad" +checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2" dependencies = [ "aho-corasick", "memchr", @@ -6179,37 +6332,38 @@ dependencies = [ [[package]] name = "rmcp" -version = "2.2.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14db48ee17a9ba61810ab1a9c1beb7d06d8136ae39ac25a1137f10d357af01af" +checksum = "42b6914fac0be956fe704a38239c3f44a9f841d1b06a5713d2f638065593f5b5" dependencies = [ - "async-trait", - "base64 0.22.1", + "base64 0.23.1", "chrono", "futures", + "indexmap 2.14.1", "pastey", "pin-project-lite", "rmcp-macros", "schemars 1.2.2", "serde", "serde_json", - "thiserror 2.0.19", + "thiserror 2.0.20", "tokio", "tokio-util", "tracing", + "uuid", ] [[package]] name = "rmcp-macros" -version = "2.2.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "783d787bf21813b285f13019adc49e11af501c658890c1e519f31f937c68b7e3" +checksum = "cdf1c49bd4d52014b94db0877410db273c2008f01628b0252a2e9460ad9b7fda" dependencies = [ - "darling", + "darling 0.24.1", "proc-macro2", "quote", "serde_json", - "syn 2.0.117", + "syn 3.0.3", ] [[package]] @@ -6325,7 +6479,7 @@ dependencies = [ "smallvec", "terminfo", "termwiz", - "thiserror 2.0.19", + "thiserror 2.0.20", "unicode-segmentation", "unicode-width 0.1.14", "vec_map", @@ -6408,7 +6562,7 @@ dependencies = [ "ratatui", "serde", "serde_json", - "thiserror 2.0.19", + "thiserror 2.0.20", "tracing", "unicode-width 0.2.2", ] @@ -6565,7 +6719,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.14.0", + "indexmap 2.14.1", "schemars 0.9.0", "schemars 1.2.2", "serde_core", @@ -6580,7 +6734,7 @@ version = "3.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b90c488738ecb4fb0262f41f43bc40efc5868d9fb744319ddf5f5317f417bfac" dependencies = [ - "darling", + "darling 0.23.0", "proc-macro2", "quote", "syn 2.0.117", @@ -6592,7 +6746,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.14.0", + "indexmap 2.14.1", "itoa", "ryu", "serde", @@ -6761,9 +6915,9 @@ checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa" [[package]] name = "similar" -version = "3.1.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6505efef05804732ed8a3f2d4f279429eb485bd69d5b0cc6b19cc02005cda16" +checksum = "4f66ca1f7aca2474dc10c942eb22feffc897735f54cd1db90138c2fddb490987" dependencies = [ "bstr", ] @@ -7008,7 +7162,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "thiserror 2.0.19", + "thiserror 2.0.20", "walkdir", "yaml-rust", ] @@ -7124,7 +7278,7 @@ dependencies = [ "tauri-runtime", "tauri-runtime-wry", "tauri-utils", - "thiserror 2.0.19", + "thiserror 2.0.20", "tokio", "tray-icon", "url", @@ -7175,7 +7329,7 @@ dependencies = [ "sha2 0.10.9", "syn 2.0.117", "tauri-utils", - "thiserror 2.0.19", + "thiserror 2.0.20", "time", "url", "uuid", @@ -7214,9 +7368,9 @@ dependencies = [ [[package]] name = "tauri-plugin-opener" -version = "2.5.4" +version = "2.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17e1bea14edce6b793a04e2417e3fd924b9bc4faae83cdee7d714156cceeed29" +checksum = "60d60366174b745b4ef5824b8bbc1c457fd08f0ce101ff643c0a49181a9f4e91" dependencies = [ "dunce", "glob", @@ -7228,7 +7382,7 @@ dependencies = [ "serde_json", "tauri", "tauri-plugin", - "thiserror 2.0.19", + "thiserror 2.0.20", "url", "windows", "zbus", @@ -7252,7 +7406,7 @@ dependencies = [ "serde", "serde_json", "tauri-utils", - "thiserror 2.0.19", + "thiserror 2.0.20", "url", "webkit2gtk", "webview2-com", @@ -7315,7 +7469,7 @@ dependencies = [ "serde_json", "serde_with", "swift-rs", - "thiserror 2.0.19", + "thiserror 2.0.20", "toml 1.1.2+spec-1.1.0", "url", "urlpattern", @@ -7465,11 +7619,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.19" +version = "2.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a43598840e33d5b0331f38c5e30d13bb11c11210a4b58f0d9b18a5a5eefcd9" +checksum = "ec86235f5fcc2a73650310756d2ac5b138a5780bbbdfae3eeccec992c435ba4f" dependencies = [ - "thiserror-impl 2.0.19", + "thiserror-impl 2.0.20", ] [[package]] @@ -7485,9 +7639,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.19" +version = "2.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43cbfe0cf76104d42a574802844187e84a305e531ed54455f11fbde0f10541cd" +checksum = "bc04cd3e1236dd4a98afca4569f2deb3f120e5422a4023be2cb683f8486292af" dependencies = [ "proc-macro2", "quote", @@ -7640,7 +7794,7 @@ version = "0.9.12+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863" dependencies = [ - "indexmap 2.14.0", + "indexmap 2.14.1", "serde_core", "serde_spanned 1.1.1", "toml_datetime 0.7.5+spec-1.1.0", @@ -7655,7 +7809,7 @@ version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee" dependencies = [ - "indexmap 2.14.0", + "indexmap 2.14.1", "serde_core", "serde_spanned 1.1.1", "toml_datetime 1.1.1+spec-1.1.0", @@ -7697,7 +7851,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.14.0", + "indexmap 2.14.1", "toml_datetime 0.6.3", "winnow 0.5.40", ] @@ -7708,7 +7862,7 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ - "indexmap 2.14.0", + "indexmap 2.14.1", "serde", "serde_spanned 0.6.9", "toml_datetime 0.6.3", @@ -7721,7 +7875,7 @@ version = "0.25.12+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7" dependencies = [ - "indexmap 2.14.0", + "indexmap 2.14.1", "serde_core", "serde_spanned 1.1.1", "toml_datetime 1.1.1+spec-1.1.0", @@ -7880,7 +8034,7 @@ dependencies = [ "once_cell", "png 0.18.1", "serde", - "thiserror 2.0.19", + "thiserror 2.0.20", "windows-sys 0.61.2", ] @@ -8100,9 +8254,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.24.0" +version = "1.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf3923a6f5c4c6382e0b653c4117f48d631ea17f38ed86e2a828e6f7412f5239" +checksum = "b5772d71c9be8a8a6ac2117d949c5b224c1b72241bb611d9a3012edcf8af7812" dependencies = [ "atomic", "getrandom 0.4.2", @@ -8306,7 +8460,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" dependencies = [ "anyhow", - "indexmap 2.14.0", + "indexmap 2.14.1", "wasm-encoder", "wasmparser", ] @@ -8332,7 +8486,7 @@ checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" dependencies = [ "bitflags 2.13.0", "hashbrown 0.15.5", - "indexmap 2.14.0", + "indexmap 2.14.1", "semver", ] @@ -8433,7 +8587,7 @@ version = "0.38.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "381336cfffd772377d291702245447a5251a2ffa5bad679c99e61bc48bacbf9c" dependencies = [ - "thiserror 2.0.19", + "thiserror 2.0.20", "windows", "windows-core 0.61.2", ] @@ -9032,7 +9186,7 @@ checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" dependencies = [ "anyhow", "heck 0.5.0", - "indexmap 2.14.0", + "indexmap 2.14.1", "prettyplease", "syn 2.0.117", "wasm-metadata", @@ -9063,7 +9217,7 @@ checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" dependencies = [ "anyhow", "bitflags 2.13.0", - "indexmap 2.14.0", + "indexmap 2.14.1", "log", "serde", "serde_derive", @@ -9082,7 +9236,7 @@ checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" dependencies = [ "anyhow", "id-arena", - "indexmap 2.14.0", + "indexmap 2.14.1", "log", "semver", "serde", @@ -9131,7 +9285,7 @@ dependencies = [ "sha2 0.10.9", "soup3", "tao-macros", - "thiserror 2.0.19", + "thiserror 2.0.20", "url", "webkit2gtk", "webkit2gtk-sys", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 5afcbfe..c5174ca 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -29,15 +29,15 @@ syntect = "5" thiserror = "2" dirs = "6" fs4 = "1.1" -gix = "=0.86.0" +gix = "=0.87.1" # jj tier. Pre-1.0 with a monthly breaking-release cadence — pinned exactly, # bumped deliberately. `git` feature: the git backend, which every real jj # repo (colocated or not) uses to store objects. -jj-lib = { version = "=0.43.0", features = ["git"] } +jj-lib = { version = "=0.44.0", features = ["git"] } futures = "0.3" pollster = "1.0" rand = "0.10" -rmcp = { version = "2.2.0", features = ["server", "transport-io"] } +rmcp = { version = "3.2.0", features = ["server", "transport-io"] } tokio = { version = "1.48.0", features = ["full"] } schemars = { version = "1.1.0", features = ["derive"] } diffy = "0.5" @@ -64,7 +64,7 @@ similar = { version = "3", features = ["inline"] } # terminal UI stack (ratatui, crossterm, streampager — +129 crates) that a # desktop app has no use for, and its config env *writes* to `.jj`. The # tripwire test gets the fidelity; the app pays nothing. -jj-cli = { version = "=0.43.0", default-features = false, features = ["git"] } +jj-cli = { version = "=0.44.0", default-features = false, features = ["git"] } insta = "1.45" proptest = "1" tempfile = "3.23.0" diff --git a/src-tauri/src/vcs/jj/jj-defaults.toml b/src-tauri/src/vcs/jj/jj-defaults.toml index c5660ac..55dc690 100644 --- a/src-tauri/src/vcs/jj/jj-defaults.toml +++ b/src-tauri/src/vcs/jj/jj-defaults.toml @@ -1,4 +1,4 @@ -# jj's own defaults — copied verbatim from jj-cli 0.43 +# jj's own defaults — copied verbatim from jj-cli 0.44 # (`cli/src/config/misc.toml` and `cli/src/config/revsets.toml`). # # These live in jj-cli, not jj-lib, and annot links only jj-lib (jj-cli writes to @@ -33,7 +33,7 @@ simplify-parents = "reachable(@, mutable())" # log revset is also used as the default short-prefixes. If it failed to # evaluate, lengthy warning messages would be printed. Use present(expr) if # symbols in expr might not always exist. -log = "present(@) | ancestors(immutable_heads().., 2) | trunk()" +log = "builtin_log()" # Emit the working-copy branch first, which is usually most interesting. # This also helps stabilize output order. log-graph-prioritize = "present(@)" @@ -56,6 +56,10 @@ latest( ) ''' +# The default set of revisions shown by `jj log` if no revisions or paths are +# specified. +'builtin_log()' = 'present(@) | ancestors(immutable_heads().., 2) | trunk()' + # If immutable_heads() failed to evaluate, many jj commands wouldn't work. Use # present(expr) if symbols in expr might not always exist. 'builtin_immutable_heads()' = 'trunk() | tags() | untracked_remote_bookmarks()' diff --git a/src-tauri/src/vcs/jj/mod.rs b/src-tauri/src/vcs/jj/mod.rs index 05ff660..55e4193 100644 --- a/src-tauri/src/vcs/jj/mod.rs +++ b/src-tauri/src/vcs/jj/mod.rs @@ -41,12 +41,15 @@ use jj_lib::conflicts::{ MaterializedTreeValue, }; use jj_lib::copies::{CopyOperation, CopyRecords}; +use jj_lib::default_backend_factories::{ + default_backend_factories, default_working_copy_factories, +}; use jj_lib::fileset; use jj_lib::id_prefix::IdPrefixContext; use jj_lib::matchers::{EverythingMatcher, Matcher, NothingMatcher}; use jj_lib::merged_tree::MergedTree; use jj_lib::object_id::ObjectId as _; -use jj_lib::repo::{ReadonlyRepo, Repo as _, StoreFactories}; +use jj_lib::repo::{ReadonlyRepo, Repo as _}; use jj_lib::repo_path::{RepoPath, RepoPathUiConverter}; use jj_lib::revset::{ self, RevsetAliasesMap, RevsetDiagnostics, RevsetExtensions, RevsetParseContext, @@ -54,7 +57,7 @@ use jj_lib::revset::{ }; use jj_lib::settings::{HumanByteSize, UserSettings}; use jj_lib::working_copy::{SnapshotOptions, WorkingCopyFreshness}; -use jj_lib::workspace::{default_working_copy_factories, Workspace}; +use jj_lib::workspace::Workspace; use pollster::FutureExt as _; use super::{tree_sort, BlobRef, DiffTarget, FileEntry, FileStatus, Prepared}; @@ -102,7 +105,7 @@ impl JjRepo { let workspace = Workspace::load( &settings, root, - &StoreFactories::default(), + &default_backend_factories(), &default_working_copy_factories(), ) .map_err(|e| jj_err("failed to load jj workspace", e))?;