diff --git a/Cargo.lock b/Cargo.lock index 2f958ff0..5ce00e75 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -357,12 +357,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.94" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7" +checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc" dependencies = [ "jobserver", "libc", + "shlex", ] [[package]] @@ -747,18 +748,6 @@ dependencies = [ "libc", ] -[[package]] -name = "escargot" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c000f23e9d459aef148b7267e02b03b94a0aaacf4ec64c65612f67e02f525fb6" -dependencies = [ - "log", - "once_cell", - "serde", - "serde_json", -] - [[package]] name = "fastrand" version = "2.0.0" @@ -897,7 +886,7 @@ dependencies = [ "git-ref-format-core", "proc-macro-error", "quote", - "syn 2.0.48", + "syn 2.0.90", ] [[package]] @@ -1063,9 +1052,9 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -1192,9 +1181,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -1630,22 +1619,13 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] -[[package]] -name = "qcheck" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b439bd4242da51d62d18c95e6a6add749346756b0d1a587dfd0cc22fa6b5f3f0" -dependencies = [ - "rand", -] - [[package]] name = "quote" version = "1.0.35" @@ -1657,8 +1637,9 @@ dependencies = [ [[package]] name = "radicle" -version = "0.13.0" -source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#0c9a7419dcfd265b6c1efe85c915d126feaef649" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd823aeed3ffe73eb82a213e62cb3811f9bdf453844d6e0b14684e0757fb389b" dependencies = [ "amplify", "base64", @@ -1674,7 +1655,6 @@ dependencies = [ "multibase", "nonempty", "once_cell", - "qcheck", "radicle-cob", "radicle-crypto", "radicle-git-ext", @@ -1690,8 +1670,9 @@ dependencies = [ [[package]] name = "radicle-cli" -version = "0.11.0" -source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#0c9a7419dcfd265b6c1efe85c915d126feaef649" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d41c1d8b9c0a6e5fd92eeefc247107d330e1d0517f1e55ded9d3bf2a12104420" dependencies = [ "anyhow", "chrono", @@ -1725,20 +1706,19 @@ dependencies = [ "tree-sitter-python", "tree-sitter-ruby", "tree-sitter-rust", - "tree-sitter-toml", + "tree-sitter-toml-ng", "tree-sitter-typescript", "zeroize", ] [[package]] name = "radicle-cli-test" -version = "0.10.0" -source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#0c9a7419dcfd265b6c1efe85c915d126feaef649" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df187ee120e2dfc949bfae6b1acbe8b8d815167ba5229a312cdabfeb4952bc27" dependencies = [ - "escargot", "log", "pretty_assertions", - "radicle", "shlex", "snapbox", "thiserror", @@ -1746,8 +1726,9 @@ dependencies = [ [[package]] name = "radicle-cob" -version = "0.12.0" -source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#0c9a7419dcfd265b6c1efe85c915d126feaef649" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90581a9508ccc310998e991d7acf139d2991297d3fb37d30de07536e10256afb" dependencies = [ "fastrand", "git2", @@ -1765,14 +1746,13 @@ dependencies = [ [[package]] name = "radicle-crypto" version = "0.11.0" -source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#0c9a7419dcfd265b6c1efe85c915d126feaef649" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1d6a67969719841ad06049597006368eb4238ca63a02d20207654dfd1d2d6ad" dependencies = [ "amplify", "cyphernet", "ec25519", - "fastrand", "multibase", - "qcheck", "radicle-git-ext", "radicle-ssh", "serde", @@ -1784,8 +1764,9 @@ dependencies = [ [[package]] name = "radicle-dag" -version = "0.9.0" -source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#0c9a7419dcfd265b6c1efe85c915d126feaef649" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb41c7e10ada3a4df960190a96bfb4af56d33ada890f917acc8e3b122b614875" dependencies = [ "fastrand", ] @@ -1814,19 +1795,11 @@ dependencies = [ "libc", ] -[[package]] -name = "radicle-signals" -version = "0.10.0" -source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#0c9a7419dcfd265b6c1efe85c915d126feaef649" -dependencies = [ - "crossbeam-channel", - "libc", -] - [[package]] name = "radicle-ssh" version = "0.9.0" -source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#0c9a7419dcfd265b6c1efe85c915d126feaef649" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbee758010fb64482be4b18591fbeb3cbc15b16450d143edf4edb5484c7366c6" dependencies = [ "byteorder", "log", @@ -1861,8 +1834,9 @@ dependencies = [ [[package]] name = "radicle-term" -version = "0.11.0" -source = "git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master#0c9a7419dcfd265b6c1efe85c915d126feaef649" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829c1f1d97d2d0f0d8738c8050c4821a74b59bf9d034d9b6aae55b19372236de" dependencies = [ "anstyle-query", "anyhow", @@ -1871,7 +1845,7 @@ dependencies = [ "inquire", "libc", "once_cell", - "radicle-signals 0.10.0 (git+https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git?branch=master)", + "radicle-signals", "shlex", "termion 3.0.0", "thiserror", @@ -1897,7 +1871,7 @@ dependencies = [ "pretty_assertions", "radicle", "radicle-cli", - "radicle-signals 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "radicle-signals", "radicle-surf", "radicle-term", "ratatui", @@ -2008,9 +1982,9 @@ checksum = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb" [[package]] name = "regex" -version = "1.9.4" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -2020,9 +1994,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -2031,9 +2005,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rfc6979" @@ -2134,7 +2108,7 @@ checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.90", ] [[package]] @@ -2413,7 +2387,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.90", ] [[package]] @@ -2422,6 +2396,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520" + [[package]] name = "strum" version = "0.26.1" @@ -2441,7 +2421,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.48", + "syn 2.0.90", ] [[package]] @@ -2463,9 +2443,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -2557,22 +2537,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.90", ] [[package]] @@ -2680,7 +2660,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.90", ] [[package]] @@ -2696,130 +2676,141 @@ dependencies = [ [[package]] name = "tree-sitter" -version = "0.20.10" +version = "0.24.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d" +checksum = "b67baf55e7e1b6806063b1e51041069c90afff16afcbbccd278d899f9d84bca4" dependencies = [ "cc", "regex", + "regex-syntax", + "streaming-iterator", + "tree-sitter-language", ] [[package]] name = "tree-sitter-bash" -version = "0.20.5" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da2032c37eb2ce29fd18df7d3b94355fec8d6d854d8f80934955df542b5906" +checksum = "329a4d48623ac337d42b1df84e81a1c9dbb2946907c102ca72db158c1964a52e" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-c" -version = "0.20.8" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bbd5f3d8658c08581f8f2adac6c391c2e9fa00fe9246bf6c5f52213b9cc6b72" +checksum = "db56fadd8c3c6bc880dffcf1177c9d1c54a71a5207716db8660189082e63b587" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-css" -version = "0.20.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3306ddefa1d2681adda2613d11974ffabfbeb215e23235da6c862f3493a04fd" +checksum = "25435a275adb3226b6fddab891bbc50d1a500774a44ceb97022a39666ccda75d" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-go" -version = "0.20.0" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad6d11f19441b961af2fda7f12f5d0dac325f6d6de83836a1d3750018cc5114" +checksum = "b13d476345220dbe600147dd444165c5791bf85ef53e28acbedd46112ee18431" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-highlight" -version = "0.20.1" +version = "0.24.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "042342584c5a7a0b833d9fc4e2bdab3f9868ddc6c4b339a1e01451c6720868bc" +checksum = "7f0f856de10d70a6d14d66db3648f7410c131cd49e989a863f15dda9acae6044" dependencies = [ + "lazy_static", "regex", + "streaming-iterator", "thiserror", "tree-sitter", ] [[package]] name = "tree-sitter-html" -version = "0.20.0" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "017822b6bd42843c4bd67fabb834f61ce23254e866282dd93871350fd6b7fa1d" +checksum = "261b708e5d92061ede329babaaa427b819329a9d427a1d710abb0f67bbef63ee" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-json" -version = "0.20.2" +version = "0.24.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9a38a9c679b55cc8d17350381ec08d69fa1a17a53fcf197f344516e485ed4d" +checksum = "4d727acca406c0020cffc6cf35516764f36c8e3dc4408e5ebe2cb35a947ec471" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] -name = "tree-sitter-md" -version = "0.1.7" +name = "tree-sitter-language" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c20d3ef8d202430b644a307e6299d84bf8ed87fa1b796e4638f8805a595060c" +checksum = "e8ddffe35a0e5eeeadf13ff7350af564c6e73993a24db62caee1822b185c2600" + +[[package]] +name = "tree-sitter-md" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f968c22a01010b83fc960455ae729db08dbeb6388617d9113897cb9204b030" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-python" -version = "0.20.4" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c93b1b1fbd0d399db3445f51fd3058e43d0b4dcff62ddbdb46e66550978aa5" +checksum = "2416de7eea3f2e1bd53c250f2d3f3394fc77f78497680f37f4b87918b8d752e3" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-ruby" -version = "0.20.1" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d50ef383469df8485f024c5fb01faced8cb90368192a7ba02605b43b2427fe" +checksum = "be0484ea4ef6bb9c575b4fdabde7e31340a8d2dbc7d52b321ac83da703249f95" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] name = "tree-sitter-rust" -version = "0.20.4" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0832309b0b2b6d33760ce5c0e818cb47e1d72b468516bfe4134408926fa7594" +checksum = "a4d64d449ca63e683c562c7743946a646671ca23947b9c925c0cfbe65051a4af" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] -name = "tree-sitter-toml" -version = "0.20.0" +name = "tree-sitter-toml-ng" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca517f578a98b23d20780247cc2688407fa81effad5b627a5a364ec3339b53e8" +checksum = "695d20cd83acf16c02c773f03e76d7b43b19883d4e2ce3652a8f06b5e0da7455" dependencies = [ "cc", "tree-sitter", @@ -2827,12 +2818,12 @@ dependencies = [ [[package]] name = "tree-sitter-typescript" -version = "0.20.5" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8bc1d2c24276a48ef097a71b56888ac9db63717e8f8d0b324668a27fd619670" +checksum = "6c5f76ed8d947a75cc446d5fccd8b602ebf0cde64ccf2ffa434d873d7a575eff" dependencies = [ "cc", - "tree-sitter", + "tree-sitter-language", ] [[package]] @@ -2993,7 +2984,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.90", "wasm-bindgen-shared", ] @@ -3015,7 +3006,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.90", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3093,7 +3084,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.90", ] [[package]] @@ -3104,7 +3095,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.90", ] [[package]] @@ -3297,7 +3288,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.90", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index d8d1cfa2..e7a13e76 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,12 +32,9 @@ lazy_static = { version = "1.5.0" } libc = { version = "^0.2" } log = { version = "0.4.19" } nom = { version = "^7.1.0" } -# radicle = { version = "0.13.0" } -# radicle-term = { version = "0.11.0" } -# radicle-cli = { version = "0.11.0" } -radicle = { git = "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git", branch = "master", package = "radicle" } -radicle-term = { git = "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git", branch = "master", package = "radicle-term" } -radicle-cli = { git = "https://seed.radicle.xyz/z3gqcJUoA1n9HaHKufZs5FCSGazv5.git", branch = "master", package = "radicle-cli" } +radicle = { version = "0.14.0" } +radicle-term = { version = "0.12.0" } +radicle-cli = { version = "0.12.1" } radicle-surf = { version = "0.22.0" } radicle-signals = { version = "0.10.0" } ratatui = { version = "0.27.0", default-features = false, features = ["all-widgets", "termion"] } diff --git a/bin/commands/patch/review/builder.rs b/bin/commands/patch/review/builder.rs index e7fde5cc..83455c1d 100644 --- a/bin/commands/patch/review/builder.rs +++ b/bin/commands/patch/review/builder.rs @@ -502,7 +502,11 @@ impl CommentBuilder { for line in hunk.to_unified_string()?.lines() { writeln!(&mut input, "> {line}")?; } - let output = term::Editor::new().extension("diff").edit(input)?; + + let output = term::Editor::comment() + .extension("diff") + .initial(input)? + .edit()?; if let Some(output) = output { let header = HunkHeader::try_from(hunk)?;