Radish alpha
r
rad:z2UcCU1LgMshWvXj6hXSDDrwB8q8M
Radicle Job Collaborative Object
Radicle
Git
chore: update to radicle to 0.21.0
Fintan Halpenny committed 1 month ago
commit 57f2ad075792d8d6a48b4e9eab5d25aa0fca6498
parent e37ff34
4 files changed +161 -96
modified Cargo.lock
@@ -514,6 +514,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"

[[package]]
+
name = "dyn-clone"
+
version = "1.0.20"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
+

+
[[package]]
name = "ec25519"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -668,42 +674,20 @@ dependencies = [
]

[[package]]
-
name = "git-ref-format"
-
version = "0.3.1"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "7428e0d6e549a9a613d6f019b839a0f5142c331295b79e119ca8f4faac145da1"
-
dependencies = [
-
 "git-ref-format-core",
-
 "git-ref-format-macro",
-
]
-

-
[[package]]
name = "git-ref-format-core"
-
version = "0.3.1"
+
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "bbaeb9672a55e9e32cb6d3ef781e7526b25ab97d499fae71615649340b143424"
+
checksum = "1955ef3abddd586f24c834d28f959d610157ab5cb71f2200911932a0018d0364"
dependencies = [
 "serde",
 "thiserror 1.0.69",
]

[[package]]
-
name = "git-ref-format-macro"
-
version = "0.3.1"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "3b6ca5353accc201f6324dff744ba4660099546d4daf187ba868f07562e36ca4"
-
dependencies = [
-
 "git-ref-format-core",
-
 "proc-macro-error",
-
 "quote",
-
 "syn 2.0.101",
-
]
-

-
[[package]]
name = "git2"
-
version = "0.19.0"
+
version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
+
checksum = "7b88256088d75a56f8ecfa070513a775dd9107f6530ef14919dac831af9cfe2b"
dependencies = [
 "bitflags",
 "libc",
@@ -920,9 +904,9 @@ checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"

[[package]]
name = "libgit2-sys"
-
version = "0.17.0+1.8.1"
+
version = "0.18.3+1.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"
+
checksum = "c9b3acc4b91781bb0b3386669d325163746af5f6e4f73e6d2d630e09a35f3487"
dependencies = [
 "cc",
 "libc",
@@ -961,15 +945,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"

[[package]]
-
name = "localtime"
-
version = "1.3.1"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "016a009e0bb8ba6e3229fb74bf11a8fe6ef24542cc6ef35ef38863ac13f96d87"
-
dependencies = [
-
 "serde",
-
]
-

-
[[package]]
name = "log"
version = "0.4.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -982,6 +957,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"

[[package]]
+
name = "memoffset"
+
version = "0.9.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+
dependencies = [
+
 "autocfg",
+
]
+

+
[[package]]
name = "multibase"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1212,30 +1196,6 @@ dependencies = [
]

[[package]]
-
name = "proc-macro-error"
-
version = "1.0.4"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-
dependencies = [
-
 "proc-macro-error-attr",
-
 "proc-macro2",
-
 "quote",
-
 "syn 1.0.109",
-
 "version_check",
-
]
-

-
[[package]]
-
name = "proc-macro-error-attr"
-
version = "1.0.4"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-
dependencies = [
-
 "proc-macro2",
-
 "quote",
-
 "version_check",
-
]
-

-
[[package]]
name = "proc-macro2"
version = "1.0.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1270,9 +1230,9 @@ checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"

[[package]]
name = "radicle"
-
version = "0.20.0"
+
version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "91edce404aa2177a9687c66f2fbdad78d98b77aad1992728f05eba4c559dd007"
+
checksum = "bed19c0448cb77a8be9c7a5b6fc00a884d10434e679ad0eb8731fe4a52534346"
dependencies = [
 "amplify",
 "base64",
@@ -1285,14 +1245,16 @@ dependencies = [
 "git2",
 "indexmap",
 "libc",
-
 "localtime",
 "log",
 "multibase",
 "nonempty 0.9.0",
 "qcheck",
 "radicle-cob",
+
 "radicle-core",
 "radicle-crypto",
-
 "radicle-git-ext",
+
 "radicle-git-ref-format",
+
 "radicle-localtime",
+
 "radicle-oid",
 "radicle-ssh",
 "serde",
 "serde-untagged",
@@ -1300,49 +1262,68 @@ dependencies = [
 "siphasher",
 "sqlite",
 "tempfile",
-
 "thiserror 1.0.69",
+
 "thiserror 2.0.12",
+
 "uds_windows",
 "unicode-normalization",
-
 "winpipe",
]

[[package]]
name = "radicle-cob"
-
version = "0.17.0"
+
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "672f459d736dcd68f970bc3140adb1c1c9c8399a15b9c2b3ff58a682bbfad92a"
+
checksum = "bed621de031dce3c39b6c262c9a9297fab0f1e3099f78e8bffb9cd132a679d94"
dependencies = [
 "fastrand",
+
 "git-ref-format-core",
 "git2",
 "log",
 "nonempty 0.9.0",
 "radicle-crypto",
 "radicle-dag",
-
 "radicle-git-ext",
+
 "radicle-git-metadata",
+
 "radicle-oid",
 "serde",
 "serde_json",
 "signature 2.2.0",
-
 "thiserror 1.0.69",
+
 "thiserror 2.0.12",
+
]
+

+
[[package]]
+
name = "radicle-core"
+
version = "0.1.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "f797194bf12af94f8ce914520bdb54ba9f8c824621f3faa6763101dbd2e1dc79"
+
dependencies = [
+
 "git2",
+
 "multibase",
+
 "qcheck",
+
 "radicle-crypto",
+
 "radicle-oid",
+
 "schemars",
+
 "serde",
+
 "sqlite",
+
 "thiserror 2.0.12",
]

[[package]]
name = "radicle-crypto"
-
version = "0.14.0"
+
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "c811eab805f7a5ac5205773314f64e53658b713bfc2ee8984bfb8b8184a79773"
+
checksum = "9a615a06e20545b03f9b01f0380687262e949e976a3127fbb932cb3fdb435866"
dependencies = [
 "amplify",
 "cyphernet",
 "ec25519",
 "fastrand",
+
 "git-ref-format-core",
 "multibase",
 "qcheck",
-
 "radicle-git-ext",
 "radicle-ssh",
 "serde",
 "signature 2.2.0",
 "sqlite",
 "ssh-key",
-
 "thiserror 1.0.69",
+
 "thiserror 2.0.12",
 "zeroize",
]

@@ -1356,17 +1337,21 @@ dependencies = [
]

[[package]]
-
name = "radicle-git-ext"
-
version = "0.8.1"
+
name = "radicle-git-metadata"
+
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "4b78c26e67d1712ad5a0c602ae3b236609461372ac04e200bda359fe4a1c6650"
+
checksum = "522d7fa07dfe61981b5d96e9aeb2b7fb2f4a8d5804638e928eaedb33e423eccb"
dependencies = [
-
 "git-ref-format",
-
 "git2",
-
 "percent-encoding",
-
 "radicle-std-ext",
-
 "serde",
-
 "thiserror 1.0.69",
+
 "thiserror 2.0.12",
+
]
+

+
[[package]]
+
name = "radicle-git-ref-format"
+
version = "0.1.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "7fe7a4a8137c193d15d05a6d1eb9ef79649b52e1f659161df69ebc385bbed55c"
+
dependencies = [
+
 "git-ref-format-core",
]

[[package]]
@@ -1388,6 +1373,25 @@ dependencies = [
]

[[package]]
+
name = "radicle-localtime"
+
version = "0.1.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "c5c36714fd32dc9421f8ed3edf0d1c1a4aa3b5210fddf8eaef40ea90c88fdddd"
+
dependencies = [
+
 "serde",
+
]
+

+
[[package]]
+
name = "radicle-oid"
+
version = "0.1.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "d95c486f589d4f5ef7bd8fce56419854d90cc63a8bbcebe021e0a4f4cca75ac9"
+
dependencies = [
+
 "git2",
+
 "serde",
+
]
+

+
[[package]]
name = "radicle-ssh"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1399,12 +1403,6 @@ dependencies = [
]

[[package]]
-
name = "radicle-std-ext"
-
version = "0.1.1"
-
source = "registry+https://github.com/rust-lang/crates.io-index"
-
checksum = "5310e7a04506b6ce92dc9c47b26bd24c1c680937a3dcd13cd20847f89dbda32a"
-

-
[[package]]
name = "rand"
version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1435,6 +1433,26 @@ dependencies = [
]

[[package]]
+
name = "ref-cast"
+
version = "1.0.25"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d"
+
dependencies = [
+
 "ref-cast-impl",
+
]
+

+
[[package]]
+
name = "ref-cast-impl"
+
version = "1.0.25"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
+
dependencies = [
+
 "proc-macro2",
+
 "quote",
+
 "syn 2.0.101",
+
]
+

+
[[package]]
name = "rfc6979"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1491,6 +1509,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"

[[package]]
+
name = "schemars"
+
version = "1.2.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc"
+
dependencies = [
+
 "dyn-clone",
+
 "ref-cast",
+
 "schemars_derive",
+
 "serde",
+
 "serde_json",
+
]
+

+
[[package]]
+
name = "schemars_derive"
+
version = "1.2.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "7d115b50f4aaeea07e79c1912f645c7513d81715d0420f8bc77a18c6260b307f"
+
dependencies = [
+
 "proc-macro2",
+
 "quote",
+
 "serde_derive_internals",
+
 "syn 2.0.101",
+
]
+

+
[[package]]
name = "sec1"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1536,6 +1579,17 @@ dependencies = [
]

[[package]]
+
name = "serde_derive_internals"
+
version = "0.29.1"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
+
dependencies = [
+
 "proc-macro2",
+
 "quote",
+
 "syn 2.0.101",
+
]
+

+
[[package]]
name = "serde_json"
version = "1.0.140"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1866,6 +1920,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"

[[package]]
+
name = "uds_windows"
+
version = "1.2.0"
+
source = "registry+https://github.com/rust-lang/crates.io-index"
+
checksum = "51b70b87d15e91f553711b40df3048faf27a7a04e01e0ddc0cf9309f0af7c2ca"
+
dependencies = [
+
 "memoffset",
+
 "tempfile",
+
 "windows-sys",
+
]
+

+
[[package]]
name = "unicode-ident"
version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
modified Cargo.toml
@@ -9,7 +9,7 @@ authors = ["Fintan Halpenny <fintan.halpenny@gmail.com>"]
edition = "2021"
# N.B. always use the full semver so that rust-overlay in `flake.nix` can select
# the correct version
-
rust-version = "1.84.0"
+
rust-version = "1.85.0"

[dependencies]
chrono = { version = "0.4", default-features = false }
@@ -18,7 +18,7 @@ indexmap = { version = "2.7.1", features = ["serde"] }
nonempty = "0.11.0"
once_cell = "1.20.3"
qcheck = "1.0.0"
-
radicle = { version = "0.20.0" }
+
radicle = { version = "0.21.0" }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.140"
thiserror = "2.0.11"
@@ -26,5 +26,5 @@ url = { version = "2.5.4", features = ["serde"] }
uuid = { version = "1.13.1", features = ["serde", "v4"] }

[dev-dependencies.radicle]
-
version = "0.20.0"
+
version = "0.21.0"
features = ["test"]
modified src/bin/rad-job.rs
@@ -97,7 +97,7 @@ fn announce(profile: &Profile, repo_id: RepoId) -> Result<(), error::Announce> {
    let mut node = Node::new(profile.home.socket());

    let (synced, unsynced) = node
-
        .seeds(repo_id)
+
        .seeds_for(repo_id, [*profile.id()])
        .map_err(error::Announce::Seeds)?
        .iter()
        .fold(
@@ -121,7 +121,7 @@ fn announce(profile: &Profile, repo_id: RepoId) -> Result<(), error::Announce> {
    ))
    .map_err(error::Announce::Announcer)?;

-
    node.announce(repo_id, TIMEOUT, announcer, |_, _| ())
+
    node.announce(repo_id, [*profile.id()], TIMEOUT, announcer, |_, _| ())
        .map_err(error::Announce::Announcement)?;

    Ok(())
modified src/error.rs
@@ -26,7 +26,7 @@ pub enum Build {
        oid: git::Oid,
        /// The underlying error from Git that occurred.
        #[source]
-
        err: git::Error,
+
        err: git::raw::Error,
    },
}