rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5 heartwooda7dfc083cf6c60c6db5523709512aa0063f5504d
{
"request": "trigger",
"version": 1,
"event_type": "patch",
"repository": {
"id": "rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5",
"name": "heartwood",
"description": "Radicle Heartwood Protocol & Stack",
"private": false,
"default_branch": "master",
"delegates": [
"did:key:z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT",
"did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
"did:key:z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz"
]
},
"action": "Created",
"patch": {
"id": "7e8e103b0e0446d79be0f4f113d8104fd27e8e22",
"author": {
"id": "did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
"alias": null
},
"title": "radicle: improve quorum copy",
"state": {
"status": "merged",
"conflicts": []
},
"before": "f6aa46a283f63025882551a27e6d2145939560f5",
"after": "a7dfc083cf6c60c6db5523709512aa0063f5504d",
"commits": [
"a7dfc083cf6c60c6db5523709512aa0063f5504d",
"9b30b6f9bace9b8220ec3df9e58120fd904627e0"
],
"target": "3fc92f83fe089263c470b328414d923227cf0e4a",
"labels": [],
"assignees": [],
"revisions": [
{
"id": "7e8e103b0e0446d79be0f4f113d8104fd27e8e22",
"author": {
"id": "did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
"alias": null
},
"description": "The `no quorum found` error can be opaque and lead to a lot of confusion. It is\nbetter to give more information for this error so that it leads to easier\ndebugging, since it can be quite a common warning/error.\n\nInstead of a single error, there are two cases provided: `NoCandidates` and\n`Diverging`, to capture the two different variants of errors that can occur.\n\n`Display` implementations are provided for both to provide more information.",
"base": "f6aa46a283f63025882551a27e6d2145939560f5",
"oid": "51d49ef463776ee9dd1dce1c7c93606a9d4bdc1c",
"timestamp": 1730893114
},
{
"id": "6ad8d94ebb5ffa32b783198b5f302c1cc34af26d",
"author": {
"id": "did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
"alias": null
},
"description": "Changes:\n- Mention git commands for fixing",
"base": "f6aa46a283f63025882551a27e6d2145939560f5",
"oid": "2ce1adf259543bf730658d8377b915f79c5cbe97",
"timestamp": 1730893604
},
{
"id": "7d264920656f37254862ec2d24517daa1efd0273",
"author": {
"id": "did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
"alias": null
},
"description": "Changes:\n- Do not fail fetch on `set_head` \u2013 in separate commit\n- Rework copy based on review feedback",
"base": "f6aa46a283f63025882551a27e6d2145939560f5",
"oid": "131f7f6f46cc2993afb997d53805ea7857dc1fd9",
"timestamp": 1730990743
},
{
"id": "dea4d90dbd131679cc836ae38547bf79b3a66f5e",
"author": {
"id": "did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
"alias": null
},
"description": "Changes:\n- Change wording of NoCandidates copy",
"base": "f6aa46a283f63025882551a27e6d2145939560f5",
"oid": "a7dfc083cf6c60c6db5523709512aa0063f5504d",
"timestamp": 1731403872
},
{
"id": "2c245a8e5215d8bc10a3cba7332791ac135e8e03",
"author": {
"id": "did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
"alias": null
},
"description": "Rebase.",
"base": "088339850b8a355b954a26856a8bcbf66350f44c",
"oid": "3f3db21eb5fb41dd65647b3520d446bbb153b281",
"timestamp": 1731925495
},
{
"id": "32fd6e2368b354d24d534176f36ad0e014d4ad2b",
"author": {
"id": "did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
"alias": null
},
"description": "Fix test.",
"base": "159d3fce93024ffa9b97605f768e9a116a040cc1",
"oid": "91914d9345e75fbcc1922e5dcbe1e0da1f2c21c5",
"timestamp": 1731929573
}
]
}
}
{
"response": "triggered",
"run_id": {
"id": "50a6804a-5cbb-4713-a4fd-9f9f004eaba2"
},
"info_url": "https://cci.rad.levitte.org//50a6804a-5cbb-4713-a4fd-9f9f004eaba2.html"
}
Started at: 2026-09-07 23:46:39.465374+02:00
Commands:
$ rad clone rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5 .
✓ Creating checkout in ./...
✓ Remote cloudhead@z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT added
✓ Remote-tracking branch cloudhead@z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/master created for z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT
✓ Remote fintohaps@z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM added
✓ Remote-tracking branch fintohaps@z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM/master created for z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM
✓ Remote lorenz@z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz added
✓ Remote-tracking branch lorenz@z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz/master created for z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz
✓ Repository successfully cloned under /opt/radcis/ci.rad.levitte.org/cci/state/50a6804a-5cbb-4713-a4fd-9f9f004eaba2/w/
╭────────────────────────────────────╮
│ heartwood │
│ Radicle Heartwood Protocol & Stack │
│ 189 issues · 38 patches │
╰────────────────────────────────────╯
Run `cd ./.` to go to the repository directory.
Exit code: 0
$ rad patch checkout 7e8e103b0e0446d79be0f4f113d8104fd27e8e22
✓ Switched to branch patch/7e8e103 at revision dea4d90
✓ Branch patch/7e8e103 setup to track rad/patches/7e8e103b0e0446d79be0f4f113d8104fd27e8e22
Exit code: 0
$ git config advice.detachedHead false
Exit code: 0
$ git checkout a7dfc083cf6c60c6db5523709512aa0063f5504d
HEAD is now at a7dfc083 radicle: improve quorum copy
Exit code: 0
$ rad patch show 7e8e103b0e0446d79be0f4f113d8104fd27e8e22 -p
╭─────────────────────────────────────────────────────────────────────────────────╮
│ Title radicle: improve quorum copy │
│ Patch 7e8e103b0e0446d79be0f4f113d8104fd27e8e22 │
│ Author fintohaps z6Mkire…SQZ3voM │
│ Head a7dfc083cf6c60c6db5523709512aa0063f5504d │
│ Base f6aa46a283f63025882551a27e6d2145939560f5 │
│ Target master │
│ Branches patch/7e8e103 │
│ Commits ahead 2, behind 1172 │
│ Status merged │
│ │
│ The `no quorum found` error can be opaque and lead to a lot of confusion. It is │
│ better to give more information for this error so that it leads to easier │
│ debugging, since it can be quite a common warning/error. │
│ │
│ Instead of a single error, there are two cases provided: `NoCandidates` and │
│ `Diverging`, to capture the two different variants of errors that can occur. │
│ │
│ `Display` implementations are provided for both to provide more information. │
├─────────────────────────────────────────────────────────────────────────────────┤
│ a7dfc08 radicle: improve quorum copy │
│ 9b30b6f node: do not fail on `set_head` │
├─────────────────────────────────────────────────────────────────────────────────┤
│ ● Revision 7e8e103 @ f6aa46a..51d49ef by fintohaps z6Mkire…SQZ3voM 1 year ago │
│ ↑ Revision 6ad8d94 @ f6aa46a..2ce1adf by fintohaps z6Mkire…SQZ3voM 1 year ago │
│ ↑ Revision 7d26492 @ f6aa46a..131f7f6 by fintohaps z6Mkire…SQZ3voM 1 year ago │
│ ↑ Revision dea4d90 @ f6aa46a..a7dfc08 by fintohaps z6Mkire…SQZ3voM 1 year ago │
│ ↑ Revision 2c245a8 @ 0883398..3f3db21 by cloudhead z6MksFq…bS9wzpT 1 year ago │
│ ↑ Revision 32fd6e2 @ 159d3fc..91914d9 by cloudhead z6MksFq…bS9wzpT 1 year ago │
│ └─ ✓ merged by cloudhead z6MksFq…bS9wzpT │
╰─────────────────────────────────────────────────────────────────────────────────╯
commit a7dfc083cf6c60c6db5523709512aa0063f5504d
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Wed Nov 6 10:31:50 2024 +0000
radicle: improve quorum copy
The `no quorum found` error can be opaque and lead to a lot of confusion. It is
better to give more information for this error so that it leads to easier
debugging, since it can be quite a common warning/error.
Instead of a single error, there are two cases provided: `NoCandidates` and
`Diverging`, to capture the two different variants of errors that can occur.
`Display` implementations are provided for both to provide more information.
diff --git a/radicle-cli/examples/git/git-push-converge.md b/radicle-cli/examples/git/git-push-converge.md
index 171baa1f1..ef9f54aad 100644
--- a/radicle-cli/examples/git/git-push-converge.md
+++ b/radicle-cli/examples/git/git-push-converge.md
@@ -89,7 +89,8 @@ commit:
``` ~alice (stderr)
$ git push rad -f
-warn: no quorum was found for `refs/heads/master`
+warn: could not determine canonical tip for `refs/heads/master`
+warn: no commit found with at least 3 vote(s) (threshold not met)
warn: it is recommended to find a commit to agree upon
✓ Synced with 2 node(s)
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
diff --git a/radicle-node/src/worker/fetch.rs b/radicle-node/src/worker/fetch.rs
index c180efed4..7e1f615e0 100644
--- a/radicle-node/src/worker/fetch.rs
+++ b/radicle-node/src/worker/fetch.rs
@@ -7,7 +7,6 @@ use localtime::LocalTime;
use radicle::cob::TypedId;
use radicle::crypto::PublicKey;
-use radicle::git::canonical::QuorumError;
use radicle::identity::DocAt;
use radicle::prelude::RepoId;
use radicle::storage::refs::RefsAt;
@@ -89,6 +88,8 @@ impl Handle {
remote: PublicKey,
refs_at: Option<Vec<RefsAt>>,
) -> Result<FetchResult, error::Fetch> {
+ use git::canonical::QuorumError::{Diverging, NoCandidates};
+
let (result, clone, notifs) = match self {
Self::Clone { mut handle, tmp } => {
log::debug!(target: "worker", "{} cloning from {remote}", handle.local());
@@ -143,8 +144,11 @@ impl Handle {
log::trace!(target: "worker", "Set HEAD to {}", head.new);
}
}
- Err(RepositoryError::Quorum(QuorumError::NoQuorum)) => {
- log::warn!(target: "worker", "Fetch could not set HEAD: no quorum found")
+ Err(RepositoryError::Quorum(Diverging(e))) => {
+ log::warn!(target: "worker", "Fetch could not set HEAD: {e}")
+ }
+ Err(RepositoryError::Quorum(NoCandidates(e))) => {
+ log::warn!(target: "worker", "Fetch could not set HEAD: {e}")
}
Err(e) => return Err(e.into()),
}
diff --git a/radicle-remote-helper/src/push.rs b/radicle-remote-helper/src/push.rs
index 4bfd23557..0d9b6f13b 100644
--- a/radicle-remote-helper/src/push.rs
+++ b/radicle-remote-helper/src/push.rs
@@ -306,8 +306,18 @@ pub fn run(
));
}
}
- Err(canonical::QuorumError::NoQuorum) => {
- warn(format!("no quorum was found for `{canonical_ref}`"));
+ Err(canonical::QuorumError::Diverging(e)) => {
+ warn(format!(
+ "could not determine canonical tip for `{canonical_ref}`"
+ ));
+ warn(e.to_string());
+ warn("it is recommended to find a commit to agree upon");
+ }
+ Err(canonical::QuorumError::NoCandidates(e)) => {
+ warn(format!(
+ "could not determine canonical tip for `{canonical_ref}`"
+ ));
+ warn(e.to_string());
warn("it is recommended to find a commit to agree upon");
}
Err(e) => return Err(e.into()),
diff --git a/radicle/src/git/canonical.rs b/radicle/src/git/canonical.rs
index 67b2cd180..c8637b82e 100644
--- a/radicle/src/git/canonical.rs
+++ b/radicle/src/git/canonical.rs
@@ -1,4 +1,5 @@
use std::collections::BTreeMap;
+use std::fmt;
use nonempty::NonEmpty;
use raw::Repository;
@@ -27,14 +28,61 @@ pub struct Canonical {
/// Error that can occur when calculation the [`Canonical::quorum`].
#[derive(Debug, Error)]
pub enum QuorumError {
- /// Could not determine a quorum [`Oid`].
- #[error("no quorum was found")]
- NoQuorum,
+ /// Could not determine a quorum [`Oid`], due to diverging tips.
+ #[error("could not determine canonical reference tip, {0}")]
+ Diverging(Diverging),
+ /// Could not determine a base candidate from the given set of delegates.
+ #[error("could not determine canonical reference tip, {0}")]
+ NoCandidates(NoCandidates),
/// An error occurred from [`git2`].
#[error(transparent)]
Git(#[from] git2::Error),
}
+/// No candidates were found for the [`Canonical::quorum`] calculation.
+///
+/// The [`fmt::Display`] is used in [`QuorumError`], to provide information on
+/// the threshold and delegates in the calculation.
+#[derive(Debug)]
+pub struct NoCandidates {
+ threshold: usize,
+}
+
+impl fmt::Display for NoCandidates {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ let NoCandidates { threshold } = self;
+ write!(
+ f,
+ "no commit found with at least {threshold} vote(s) (threshold not met)"
+ )
+ }
+}
+
+/// Diverging commits were found during the [`Canonical::quorum`] calculation.
+///
+/// The [`fmt::Display`] is used in [`QuorumError`], to provide information on
+/// the threshold, base commit, and the two diverging commits, in the
+/// calculation.
+#[derive(Debug)]
+pub struct Diverging {
+ threshold: usize,
+ base: Oid,
+ longest: Oid,
+ head: Oid,
+}
+
+impl fmt::Display for Diverging {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ let Diverging {
+ threshold,
+ base,
+ longest,
+ head,
+ } = self;
+ write!(f, "found diverging commits {longest} and {head}, with base commit {base} and threshold {threshold}")
+ }
+}
+
impl Canonical {
/// Construct the set of canonical tips of the `Project::default_branch` for
/// the given `delegates`.
@@ -150,8 +198,9 @@ impl Canonical {
// Keep commits which pass the threshold.
candidates.retain(|_, votes| *votes >= threshold);
- // Keep track of the longest identity branch.
- let (mut longest, _) = candidates.pop_first().ok_or(QuorumError::NoQuorum)?;
+ let (mut longest, _) = candidates
+ .pop_first()
+ .ok_or_else(|| QuorumError::NoCandidates(NoCandidates { threshold }))?;
// Now that all scores are calculated, figure out what is the longest branch
// that passes the threshold. In case of divergence, return an error.
@@ -185,7 +234,12 @@ impl Canonical {
// o (base)
// |
//
- return Err(QuorumError::NoQuorum);
+ return Err(QuorumError::Diverging(Diverging {
+ threshold,
+ base: base.into(),
+ longest,
+ head: *head,
+ }));
}
}
Ok((*longest).into())
@@ -281,8 +335,8 @@ mod tests {
assert_eq!(quorum(&[*c1], 1, &repo).unwrap(), c1);
assert_eq!(quorum(&[*c2], 1, &repo).unwrap(), c2);
assert_eq!(quorum(&[*c0], 0, &repo).unwrap(), c0);
- assert_matches!(quorum(&[], 0, &repo), Err(QuorumError::NoQuorum));
- assert_matches!(quorum(&[*c0], 2, &repo), Err(QuorumError::NoQuorum));
+ assert_matches!(quorum(&[], 0, &repo), Err(QuorumError::NoCandidates(_)));
+ assert_matches!(quorum(&[*c0], 2, &repo), Err(QuorumError::NoCandidates(_)));
// C1
// |
@@ -308,19 +362,31 @@ mod tests {
// C0
assert_matches!(
quorum(&[*c1, *c2, *b2], 1, &repo),
- Err(QuorumError::NoQuorum)
+ Err(QuorumError::Diverging(_))
+ );
+ assert_matches!(
+ quorum(&[*c2, *b2], 1, &repo),
+ Err(QuorumError::Diverging(_))
+ );
+ assert_matches!(
+ quorum(&[*b2, *c2], 1, &repo),
+ Err(QuorumError::Diverging(_))
+ );
+ assert_matches!(
+ quorum(&[*c2, *b2], 2, &repo),
+ Err(QuorumError::NoCandidates(_))
+ );
+ assert_matches!(
+ quorum(&[*b2, *c2], 2, &repo),
+ Err(QuorumError::NoCandidates(_))
);
- assert_matches!(quorum(&[*c2, *b2], 1, &repo), Err(QuorumError::NoQuorum));
- assert_matches!(quorum(&[*b2, *c2], 1, &repo), Err(QuorumError::NoQuorum));
- assert_matches!(quorum(&[*c2, *b2], 2, &repo), Err(QuorumError::NoQuorum));
- assert_matches!(quorum(&[*b2, *c2], 2, &repo), Err(QuorumError::NoQuorum));
assert_eq!(quorum(&[*c1, *c2, *b2], 2, &repo).unwrap(), c1);
assert_eq!(quorum(&[*c1, *c2, *b2], 3, &repo).unwrap(), c1);
assert_eq!(quorum(&[*b2, *b2, *c2], 2, &repo).unwrap(), b2);
assert_eq!(quorum(&[*b2, *c2, *c2], 2, &repo).unwrap(), c2);
assert_matches!(
quorum(&[*b2, *b2, *c2, *c2], 2, &repo),
- Err(QuorumError::NoQuorum)
+ Err(QuorumError::Diverging(_))
);
// B2 C2 C3
@@ -331,15 +397,15 @@ mod tests {
assert_eq!(quorum(&[*b2, *c2, *c2], 2, &repo).unwrap(), c2);
assert_matches!(
quorum(&[*b2, *c2, *c2], 3, &repo),
- Err(QuorumError::NoQuorum)
+ Err(QuorumError::NoCandidates(_))
);
assert_matches!(
quorum(&[*b2, *c2, *b2, *c2], 3, &repo),
- Err(QuorumError::NoQuorum)
+ Err(QuorumError::NoCandidates(_))
);
assert_matches!(
quorum(&[*c3, *b2, *c2, *b2, *c2, *c3], 3, &repo),
- Err(QuorumError::NoQuorum)
+ Err(QuorumError::NoCandidates(_))
);
// B2 C2
@@ -349,19 +415,19 @@ mod tests {
// C0
assert_matches!(
quorum(&[*c2, *b2, *a1], 1, &repo),
- Err(QuorumError::NoQuorum)
+ Err(QuorumError::Diverging(_))
);
assert_matches!(
quorum(&[*c2, *b2, *a1], 2, &repo),
- Err(QuorumError::NoQuorum)
+ Err(QuorumError::NoCandidates(_))
);
assert_matches!(
quorum(&[*c2, *b2, *a1], 3, &repo),
- Err(QuorumError::NoQuorum)
+ Err(QuorumError::NoCandidates(_))
);
assert_matches!(
quorum(&[*c1, *c2, *b2, *a1], 4, &repo),
- Err(QuorumError::NoQuorum)
+ Err(QuorumError::NoCandidates(_))
);
assert_eq!(quorum(&[*c0, *c1, *c2, *b2, *a1], 2, &repo).unwrap(), c1,);
assert_eq!(quorum(&[*c0, *c1, *c2, *b2, *a1], 3, &repo).unwrap(), c1,);
@@ -369,23 +435,23 @@ mod tests {
assert_eq!(quorum(&[*c0, *c1, *c2, *b2, *a1], 4, &repo).unwrap(), c0,);
assert_matches!(
quorum(&[*a1, *a1, *c2, *c2, *c1], 2, &repo),
- Err(QuorumError::NoQuorum)
+ Err(QuorumError::Diverging(_))
);
assert_matches!(
quorum(&[*a1, *a1, *c2, *c2, *c1], 1, &repo),
- Err(QuorumError::NoQuorum)
+ Err(QuorumError::Diverging(_))
);
assert_matches!(
quorum(&[*a1, *a1, *c2], 1, &repo),
- Err(QuorumError::NoQuorum)
+ Err(QuorumError::Diverging(_))
);
assert_matches!(
quorum(&[*b2, *b2, *c2, *c2], 1, &repo),
- Err(QuorumError::NoQuorum)
+ Err(QuorumError::Diverging(_))
);
assert_matches!(
quorum(&[*b2, *b2, *c2, *c2, *a1], 1, &repo),
- Err(QuorumError::NoQuorum)
+ Err(QuorumError::Diverging(_))
);
// M2 M1
@@ -396,15 +462,30 @@ mod tests {
// \|
// C0
assert_eq!(quorum(&[*m1], 1, &repo).unwrap(), m1);
- assert_matches!(quorum(&[*m1, *m2], 1, &repo), Err(QuorumError::NoQuorum));
- assert_matches!(quorum(&[*m2, *m1], 1, &repo), Err(QuorumError::NoQuorum));
- assert_matches!(quorum(&[*m1, *m2], 2, &repo), Err(QuorumError::NoQuorum));
+ assert_matches!(
+ quorum(&[*m1, *m2], 1, &repo),
+ Err(QuorumError::Diverging(_))
+ );
+ assert_matches!(
+ quorum(&[*m2, *m1], 1, &repo),
+ Err(QuorumError::Diverging(_))
+ );
+ assert_matches!(
+ quorum(&[*m1, *m2], 2, &repo),
+ Err(QuorumError::NoCandidates(_))
+ );
assert_matches!(
quorum(&[*m1, *m2, *c2], 1, &repo),
- Err(QuorumError::NoQuorum)
+ Err(QuorumError::Diverging(_))
+ );
+ assert_matches!(
+ quorum(&[*m1, *a1], 1, &repo),
+ Err(QuorumError::Diverging(_))
+ );
+ assert_matches!(
+ quorum(&[*m1, *a1], 2, &repo),
+ Err(QuorumError::NoCandidates(_))
);
- assert_matches!(quorum(&[*m1, *a1], 1, &repo), Err(QuorumError::NoQuorum));
- assert_matches!(quorum(&[*m1, *a1], 2, &repo), Err(QuorumError::NoQuorum));
assert_eq!(quorum(&[*m1, *m2, *b2, *c1], 4, &repo).unwrap(), c1);
assert_eq!(quorum(&[*m1, *m1, *b2], 2, &repo).unwrap(), m1);
assert_eq!(quorum(&[*m1, *m1, *c2], 2, &repo).unwrap(), m1);
@@ -440,8 +521,14 @@ mod tests {
// C1 C2 C3
// \| /
// C0
- assert_matches!(quorum(&[*m1, *m2], 1, &repo), Err(QuorumError::NoQuorum));
- assert_matches!(quorum(&[*m1, *m2], 2, &repo), Err(QuorumError::NoQuorum));
+ assert_matches!(
+ quorum(&[*m1, *m2], 1, &repo),
+ Err(QuorumError::Diverging(_))
+ );
+ assert_matches!(
+ quorum(&[*m1, *m2], 2, &repo),
+ Err(QuorumError::NoCandidates(_))
+ );
let m3 = fixtures::commit("M3", &[*c2, *c1], &repo);
@@ -450,11 +537,29 @@ mod tests {
// C1 C2 C3
// \| /
// C0
- assert_matches!(quorum(&[*m1, *m3], 1, &repo), Err(QuorumError::NoQuorum));
- assert_matches!(quorum(&[*m1, *m3], 2, &repo), Err(QuorumError::NoQuorum));
- assert_matches!(quorum(&[*m3, *m1], 1, &repo), Err(QuorumError::NoQuorum));
- assert_matches!(quorum(&[*m3, *m1], 2, &repo), Err(QuorumError::NoQuorum));
- assert_matches!(quorum(&[*m3, *m2], 1, &repo), Err(QuorumError::NoQuorum));
- assert_matches!(quorum(&[*m3, *m2], 2, &repo), Err(QuorumError::NoQuorum));
+ assert_matches!(
+ quorum(&[*m1, *m3], 1, &repo),
+ Err(QuorumError::Diverging(_))
+ );
+ assert_matches!(
+ quorum(&[*m1, *m3], 2, &repo),
+ Err(QuorumError::NoCandidates(_))
+ );
+ assert_matches!(
+ quorum(&[*m3, *m1], 1, &repo),
+ Err(QuorumError::Diverging(_))
+ );
+ assert_matches!(
+ quorum(&[*m3, *m1], 2, &repo),
+ Err(QuorumError::NoCandidates(_))
+ );
+ assert_matches!(
+ quorum(&[*m3, *m2], 1, &repo),
+ Err(QuorumError::Diverging(_))
+ );
+ assert_matches!(
+ quorum(&[*m3, *m2], 2, &repo),
+ Err(QuorumError::NoCandidates(_))
+ );
}
}
commit 9b30b6f9bace9b8220ec3df9e58120fd904627e0
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Thu Nov 7 14:26:43 2024 +0000
node: do not fail on `set_head`
The failure to set a HEAD ref, due to quourum, during a fetch should not fail
the fetch entirely.
Instead, log the success and failure, or return an error in other cases.
In fact, any failure to set the head could have resulted in notifications not
being sent, nor caching to occur.
diff --git a/radicle-cli/examples/git/git-push-converge.md b/radicle-cli/examples/git/git-push-converge.md
index 3ae8468fd..171baa1f1 100644
--- a/radicle-cli/examples/git/git-push-converge.md
+++ b/radicle-cli/examples/git/git-push-converge.md
@@ -59,13 +59,13 @@ found` error is showing up:
$ rad remote add did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --name bob
✓ Follow policy updated for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (bob)
✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkux1…nVhib7Z..
-✗ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk.. error: no quorum was found
+✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk..
✓ Remote bob added
✓ Remote-tracking branch bob/master created for z6Mkt67…v4N1tRk
$ rad remote add did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z --name eve
✓ Follow policy updated for z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z (eve)
-✗ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkux1…nVhib7Z.. error: no quorum was found
-✗ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk.. error: no quorum was found
+✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkux1…nVhib7Z..
+✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk..
✓ Remote eve added
✓ Remote-tracking branch eve/master created for z6Mkux1…nVhib7Z
```
@@ -91,7 +91,7 @@ commit:
$ git push rad -f
warn: no quorum was found for `refs/heads/master`
warn: it is recommended to find a commit to agree upon
-✓ Synced with 1 node(s)
+✓ Synced with 2 node(s)
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
d09e634..0f9bd80 master -> master
```
@@ -99,8 +99,8 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE
``` ~bob
$ rad remote add did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --name alice
✓ Follow policy updated for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (alice)
-✗ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkux1…nVhib7Z.. error: no quorum was found
-✗ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi.. error: no quorum was found
+✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkux1…nVhib7Z..
+✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
✓ Remote alice added
✓ Remote-tracking branch alice/master created for z6MknSL…StBU8Vi
$ git reset --hard alice/master
diff --git a/radicle-node/src/worker/fetch.rs b/radicle-node/src/worker/fetch.rs
index c71695a0c..c180efed4 100644
--- a/radicle-node/src/worker/fetch.rs
+++ b/radicle-node/src/worker/fetch.rs
@@ -7,11 +7,13 @@ use localtime::LocalTime;
use radicle::cob::TypedId;
use radicle::crypto::PublicKey;
+use radicle::git::canonical::QuorumError;
use radicle::identity::DocAt;
use radicle::prelude::RepoId;
use radicle::storage::refs::RefsAt;
use radicle::storage::{
- ReadRepository, ReadStorage as _, RefUpdate, RemoteRepository, WriteRepository as _,
+ ReadRepository, ReadStorage as _, RefUpdate, RemoteRepository, RepositoryError,
+ WriteRepository as _,
};
use radicle::{cob, git, node, Storage};
use radicle_fetch::{Allowed, BlockList, FetchLimit};
@@ -135,7 +137,17 @@ impl Handle {
// points to a repository that is temporary and gets moved by [`mv`].
let repo = storage.repository(rid)?;
repo.set_identity_head()?;
- repo.set_head()?;
+ match repo.set_head() {
+ Ok(head) => {
+ if head.is_updated() {
+ log::trace!(target: "worker", "Set HEAD to {}", head.new);
+ }
+ }
+ Err(RepositoryError::Quorum(QuorumError::NoQuorum)) => {
+ log::warn!(target: "worker", "Fetch could not set HEAD: no quorum found")
+ }
+ Err(e) => return Err(e.into()),
+ }
// Notifications are only posted for pulls, not clones.
if let Some(mut store) = notifs {
Exit code: 0
shell: 'cargo --version rustc --version cargo fmt --check cargo clippy --all-targets --workspace -- --deny clippy::all cargo build --all-targets --workspace cargo doc --workspace cargo test --workspace --no-fail-fast '
Commands:
$ podman run --name 50a6804a-5cbb-4713-a4fd-9f9f004eaba2 -v /opt/radcis/ci.rad.levitte.org/cci/state/50a6804a-5cbb-4713-a4fd-9f9f004eaba2/s:/50a6804a-5cbb-4713-a4fd-9f9f004eaba2/s:ro -v /opt/radcis/ci.rad.levitte.org/cci/state/50a6804a-5cbb-4713-a4fd-9f9f004eaba2/w:/50a6804a-5cbb-4713-a4fd-9f9f004eaba2/w -w /50a6804a-5cbb-4713-a4fd-9f9f004eaba2/w -v /opt/radcis/ci.rad.levitte.org/.radicle:/${id}/.radicle:ro -e RAD_HOME=/${id}/.radicle rust:trixie bash /50a6804a-5cbb-4713-a4fd-9f9f004eaba2/s/script.sh
+ cargo --version
info: syncing channel updates for '1.80-x86_64-unknown-linux-gnu'
info: latest update on 2024-08-08, rust version 1.80.1 (3f5fd8dd4 2024-08-06)
info: downloading component 'cargo'
info: downloading component 'clippy'
info: downloading component 'rust-docs'
info: downloading component 'rust-src'
info: downloading component 'rust-std'
info: downloading component 'rustc'
info: downloading component 'rustfmt'
info: installing component 'cargo'
info: installing component 'clippy'
info: installing component 'rust-docs'
info: installing component 'rust-src'
info: installing component 'rust-std'
info: installing component 'rustc'
info: installing component 'rustfmt'
cargo 1.80.1 (376290515 2024-07-16)
+ rustc --version
rustc 1.80.1 (3f5fd8dd4 2024-08-06)
+ cargo fmt --check
+ cargo clippy --all-targets --workspace -- --deny clippy::all
Updating crates.io index
Downloading crates ...
Downloaded adler v1.0.2
Downloaded aead v0.5.2
Downloaded shell-words v1.1.0
Downloaded aho-corasick v1.1.3
Downloaded siphasher v0.3.11
Downloaded snapbox-macros v0.3.8
Downloaded snapbox v0.4.17
Downloaded smallvec v1.13.2
Downloaded siphasher v1.0.1
Downloaded typenum v1.17.0
Downloaded anyhow v1.0.82
Downloaded gix-hash v0.14.2
Downloaded termion v2.0.3
Downloaded subtle v2.5.0
Downloaded itoa v1.0.11
Downloaded gix-revwalk v0.13.2
Downloaded maybe-async v0.2.10
Downloaded gix-hashtable v0.5.2
Downloaded sqlite3-sys v0.15.2
Downloaded gix-prompt v0.8.4
Downloaded spin v0.5.2
Downloaded gix-trace v0.1.9
Downloaded universal-hash v0.5.1
Downloaded noise-framework v0.4.0
Downloaded opaque-debug v0.3.1
Downloaded powerfmt v0.2.0
Downloaded radicle-std-ext v0.1.0
Downloaded gix-object v0.42.3
Downloaded num-conv v0.1.0
Downloaded ppv-lite86 v0.2.17
Downloaded same-file v1.0.6
Downloaded netservices v0.8.0
Downloaded rand_chacha v0.3.1
Downloaded pkg-config v0.3.30
Downloaded rand_core v0.6.4
Downloaded numtoa v0.1.0
Downloaded pbkdf2 v0.12.2
Downloaded rfc6979 v0.4.0
Downloaded prodash v28.0.0
Downloaded time-macros v0.2.18
Downloaded proc-macro-error v1.0.4
Downloaded sha2 v0.10.8
Downloaded serde_derive v1.0.198
Downloaded nonempty v0.9.0
Downloaded pkcs1 v0.7.5
Downloaded gix-validate v0.8.5
Downloaded scrypt v0.11.0
Downloaded salsa20 v0.10.2
Downloaded popol v3.0.0
Downloaded rsa v0.9.6
Downloaded regex v1.10.4
Downloaded rustix v0.38.34
Downloaded serde v1.0.198
Downloaded primeorder v0.13.6
Downloaded pretty_assertions v1.4.0
Downloaded sha3 v0.10.8
Downloaded libm v0.2.8
Downloaded num-bigint-dig v0.8.4
Downloaded radicle-surf v0.22.0
Downloaded tree-sitter-python v0.20.4
Downloaded tree-sitter-md v0.1.7
Downloaded p384 v0.13.0
Downloaded idna v0.5.0
Downloaded regex-syntax v0.8.3
Downloaded tree-sitter-bash v0.20.5
Downloaded libc v0.2.155
Downloaded tree-sitter-ruby v0.20.1
Downloaded tree-sitter-rust v0.20.4
Downloaded tree-sitter-c v0.20.8
Downloaded linux-raw-sys v0.4.13
Downloaded tree-sitter-typescript v0.20.5
Downloaded libgit2-sys v0.17.0+1.8.1
Downloaded syn v2.0.60
Downloaded vcpkg v0.2.15
Downloaded time v0.3.36
Downloaded p521 v0.13.3
Downloaded hashbrown v0.14.3
Downloaded sqlite3-src v0.5.1
Downloaded winnow v0.6.8
Downloaded unicode-normalization v0.1.23
Downloaded tree-sitter v0.20.10
Downloaded ssh-key v0.6.6
Downloaded inquire v0.7.5
Downloaded unicode-segmentation v1.11.0
Downloaded libz-sys v1.1.16
Downloaded parking_lot v0.12.1
Downloaded log v0.4.21
Downloaded lexopt v0.3.0
Downloaded jobserver v0.1.31
Downloaded indexmap v2.2.6
Downloaded hmac v0.12.1
Downloaded gix-transport v0.42.0
Downloaded url v2.5.0
Downloaded unicode-ident v1.0.12
Downloaded unicode-bidi v0.3.15
Downloaded tree-sitter-go v0.20.0
Downloaded tempfile v3.10.1
Downloaded tar v0.4.40
Downloaded socket2 v0.5.7
Downloaded sec1 v0.7.3
Downloaded ryu v1.0.17
Downloaded num-iter v0.1.44
Downloaded miniz_oxide v0.7.2
Downloaded memmap2 v0.9.4
Downloaded regex-automata v0.4.6
Downloaded num-integer v0.1.46
Downloaded lock_api v0.4.11
Downloaded inout v0.1.3
Downloaded iana-time-zone v0.1.60
Downloaded group v0.13.0
Downloaded tinyvec v1.6.0
Downloaded zeroize v1.7.0
Downloaded walkdir v2.5.0
Downloaded unicode-width v0.1.11
Downloaded timeago v0.4.2
Downloaded bloomy v1.2.0
Downloaded lazy_static v1.4.0
Downloaded io-reactor v0.5.2
Downloaded gix-tempfile v14.0.1
Downloaded tree-sitter-toml v0.20.0
Downloaded thiserror v1.0.59
Downloaded memchr v2.7.2
Downloaded serde_json v1.0.116
Downloaded termion v3.0.0
Downloaded git2 v0.19.0
Downloaded once_cell v1.19.0
Downloaded rand v0.8.5
Downloaded scopeguard v1.2.0
Downloaded cyphernet v0.5.2
Downloaded chrono v0.4.38
Downloaded poly1305 v0.8.0
Downloaded parking_lot_core v0.9.9
Downloaded polyval v0.6.2
Downloaded pkcs8 v0.10.2
Downloaded pem-rfc7468 v0.7.0
Downloaded gix-traverse v0.39.2
Downloaded ssh-cipher v0.2.0
Downloaded crossbeam-channel v0.5.13
Downloaded num_threads v0.1.7
Downloaded sha1_smol v1.0.0
Downloaded percent-encoding v2.3.1
Downloaded yansi v0.5.1
Downloaded gix-url v0.27.3
Downloaded gix-sec v0.10.6
Downloaded der v0.7.9
Downloaded p256 v0.13.2
Downloaded num-traits v0.2.18
Downloaded utf8parse v0.2.1
Downloaded localtime v1.3.1
Downloaded gix-quote v0.4.12
Downloaded tree-sitter-json v0.20.2
Downloaded base64 v0.21.7
Downloaded proc-macro-error-attr v1.0.4
Downloaded proc-macro2 v1.0.81
Downloaded normalize-line-endings v0.3.0
Downloaded gix-path v0.10.9
Downloaded keccak v0.1.5
Downloaded home v0.5.9
Downloaded gix-odb v0.61.1
Downloaded radicle-git-ext v0.8.0
Downloaded qcheck v1.0.0
Downloaded crypto-bigint v0.5.5
Downloaded quote v1.0.36
Downloaded gix-utils v0.1.12
Downloaded const-oid v0.9.6
Downloaded cc v1.0.95
Downloaded tree-sitter-highlight v0.20.1
Downloaded sqlite v0.32.0
Downloaded ff v0.13.0
Downloaded base64ct v1.6.0
Downloaded gix-commitgraph v0.24.3
Downloaded getrandom v0.2.14
Downloaded escargot v0.5.10
Downloaded ctr v0.9.2
Downloaded crossbeam-utils v0.8.19
Downloaded chacha20 v0.9.1
Downloaded blowfish v0.9.1
Downloaded nonempty v0.5.0
Downloaded newline-converter v0.3.0
Downloaded unicode-display-width v0.3.0
Downloaded ssh-encoding v0.2.0
Downloaded ghash v0.5.1
Downloaded dyn-clone v1.0.17
Downloaded multibase v0.9.1
Downloaded version_check v0.9.4
Downloaded fastrand v2.1.0
Downloaded qcheck-macros v1.0.0
Downloaded gix-pack v0.51.1
Downloaded generic-array v0.14.7
Downloaded equivalent v1.0.1
Downloaded data-encoding v2.5.0
Downloaded thiserror-impl v1.0.59
Downloaded gix-credentials v0.24.2
Downloaded elliptic-curve v0.13.8
Downloaded chacha20poly1305 v0.10.1
Downloaded xattr v1.3.1
Downloaded time-core v0.1.2
Downloaded form_urlencoded v1.2.1
Downloaded either v1.11.0
Downloaded gix-diff v0.44.1
Downloaded gix-command v0.3.6
Downloaded gix-features v0.38.2
Downloaded git-ref-format-core v0.3.0
Downloaded filetime v0.2.23
Downloaded ecdsa v0.16.9
Downloaded data-encoding-macro-internal v0.1.12
Downloaded autocfg v1.2.0
Downloaded fxhash v0.2.1
Downloaded digest v0.10.7
Downloaded cyphergraphy v0.3.0
Downloaded tree-sitter-css v0.20.0
Downloaded errno v0.3.8
Downloaded ed25519 v1.5.3
Downloaded ec25519 v0.1.0
Downloaded deranged v0.3.11
Downloaded cpufeatures v0.2.12
Downloaded tree-sitter-html v0.20.0
Downloaded spki v0.7.3
Downloaded socks5-client v0.4.1
Downloaded gix-packetline v0.17.5
Downloaded gix-actor v0.31.5
Downloaded git-ref-format-macro v0.3.0
Downloaded data-encoding-macro v0.1.14
Downloaded base32 v0.4.0
Downloaded tinyvec_macros v0.1.1
Downloaded syn v1.0.109
Downloaded gix-fs v0.11.2
Downloaded gix-config-value v0.14.6
Downloaded faster-hex v0.9.0
Downloaded cypheraddr v0.4.0
Downloaded crypto-common v0.1.6
Downloaded byteorder v1.5.0
Downloaded base16ct v0.2.0
Downloaded gix-chunk v0.4.8
Downloaded ct-codecs v1.1.1
Downloaded colored v2.1.0
Downloaded bstr v1.9.1
Downloaded bcrypt-pbkdf v0.10.0
Downloaded base-x v0.2.11
Downloaded ascii v1.1.0
Downloaded anstyle-query v1.0.2
Downloaded anstream v0.6.13
Downloaded gix-date v0.8.7
Downloaded flate2 v1.0.28
Downloaded block-padding v0.3.3
Downloaded block-buffer v0.10.4
Downloaded anstyle v1.0.6
Downloaded diff v0.1.13
Downloaded colorchoice v1.0.0
Downloaded gix-protocol v0.45.0
Downloaded arc-swap v1.7.1
Downloaded shlex v1.3.0
Downloaded bitflags v2.5.0
Downloaded base64 v0.13.1
Downloaded signature v1.6.4
Downloaded git-ref-format v0.3.0
Downloaded cbc v0.1.2
Downloaded anstyle-parse v0.2.3
Downloaded crc32fast v1.4.0
Downloaded cipher v0.4.4
Downloaded cfg-if v1.0.0
Downloaded amplify_derive v4.0.0
Downloaded amplify v4.6.0
Downloaded aes-gcm v0.10.3
Downloaded aes v0.8.4
Downloaded similar v2.5.0
Downloaded signature v2.2.0
Downloaded amplify_syn v2.0.1
Downloaded amplify_num v0.5.2
Compiling libc v0.2.155
Compiling proc-macro2 v1.0.81
Compiling unicode-ident v1.0.12
Checking cfg-if v1.0.0
Compiling once_cell v1.19.0
Compiling version_check v0.9.4
Checking memchr v2.7.2
Checking regex-syntax v0.8.3
Compiling quote v1.0.36
Compiling jobserver v0.1.31
Checking aho-corasick v1.1.3
Compiling cc v1.0.95
Compiling syn v2.0.60
Compiling thiserror v1.0.59
Checking regex-automata v0.4.6
Compiling typenum v1.17.0
Checking getrandom v0.2.14
Compiling generic-array v0.14.7
Checking rand_core v0.6.4
Checking tinyvec_macros v0.1.1
Checking tinyvec v1.6.0
Checking bstr v1.9.1
Checking crypto-common v0.1.6
Checking fastrand v2.1.0
Checking unicode-normalization v0.1.23
Checking subtle v2.5.0
Compiling syn v1.0.109
Checking zeroize v1.7.0
Checking cpufeatures v0.2.12
Checking bitflags v2.5.0
Checking block-padding v0.3.3
Checking inout v0.1.3
Checking block-buffer v0.10.4
Compiling pkg-config v0.3.30
Checking digest v0.10.7
Checking cipher v0.4.4
Compiling autocfg v1.2.0
Compiling crc32fast v1.4.0
Checking sha2 v0.10.8
Checking unicode-bidi v0.3.15
Compiling thiserror-impl v1.0.59
Checking percent-encoding v2.3.1
Checking idna v0.5.0
Checking form_urlencoded v1.2.1
Checking universal-hash v0.5.1
Checking opaque-debug v0.3.1
Compiling vcpkg v0.2.15
Compiling serde v1.0.198
Compiling amplify_syn v2.0.1
Compiling libz-sys v1.1.16
Checking url v2.5.0
Compiling serde_derive v1.0.198
Checking byteorder v1.5.0
Compiling rustix v0.38.34
Compiling data-encoding v2.5.0
Checking linux-raw-sys v0.4.13
Compiling amplify_derive v4.0.0
Compiling data-encoding-macro-internal v0.1.12
Checking signature v1.6.4
Checking ascii v1.1.0
Checking log v0.4.21
Checking amplify_num v0.5.2
Checking itoa v1.0.11
Checking data-encoding-macro v0.1.14
Checking ed25519 v1.5.3
Compiling libgit2-sys v0.17.0+1.8.1
Checking aead v0.5.2
Checking amplify v4.6.0
Compiling proc-macro-error-attr v1.0.4
Checking ct-codecs v1.1.1
Checking base-x v0.2.11
Checking ec25519 v0.1.0
Checking multibase v0.9.1
Checking poly1305 v0.8.0
Checking chacha20 v0.9.1
Compiling proc-macro-error v1.0.4
Checking cyphergraphy v0.3.0
Checking keccak v0.1.5
Checking sha3 v0.10.8
Compiling git-ref-format-core v0.3.0
Checking polyval v0.6.2
Compiling sqlite3-src v0.5.1
Checking hmac v0.12.1
Checking hashbrown v0.14.3
Checking ppv-lite86 v0.2.17
Checking base32 v0.4.0
Checking base64ct v1.6.0
Checking cypheraddr v0.4.0
Checking pem-rfc7468 v0.7.0
Checking rand_chacha v0.3.1
Checking pbkdf2 v0.12.2
Checking ghash v0.5.1
Compiling git-ref-format-macro v0.3.0
Checking chacha20poly1305 v0.10.1
Checking tempfile v3.10.1
Checking ctr v0.9.2
Checking aes v0.8.4
Compiling crossbeam-utils v0.8.19
Checking aes-gcm v0.10.3
Checking git-ref-format v0.3.0
Checking noise-framework v0.4.0
Checking rand v0.8.5
Checking socks5-client v0.4.1
Checking ssh-encoding v0.2.0
Checking blowfish v0.9.1
Checking cbc v0.1.2
Checking radicle-std-ext v0.1.0
Checking bcrypt-pbkdf v0.10.0
Checking ssh-cipher v0.2.0
Checking cyphernet v0.5.2
Checking signature v2.2.0
Checking ssh-key v0.6.6
Checking crossbeam-channel v0.5.13
Checking qcheck v1.0.0
Checking radicle-ssh v0.9.0 (/50a6804a-5cbb-4713-a4fd-9f9f004eaba2/w/radicle-ssh)
Compiling num-traits v0.2.18
Compiling tree-sitter v0.20.10
Checking equivalent v1.0.1
Compiling serde_json v1.0.116
Checking indexmap v2.2.6
Checking regex v1.10.4
Checking ryu v1.0.17
Checking nonempty v0.9.0
Checking radicle-dag v0.9.0 (/50a6804a-5cbb-4713-a4fd-9f9f004eaba2/w/radicle-dag)
Compiling anyhow v1.0.82
Checking iana-time-zone v0.1.60
Checking anstyle-query v1.0.2
Checking lazy_static v1.4.0
Checking chrono v0.4.38
Checking colored v2.1.0
Checking localtime v1.3.1
Checking utf8parse v0.2.1
Checking siphasher v1.0.1
Checking base64 v0.21.7
Checking anstyle-parse v0.2.3
Checking anstyle v1.0.6
Checking colorchoice v1.0.0
Checking anstream v0.6.13
Checking snapbox-macros v0.3.8
Checking normalize-line-endings v0.3.0
Checking similar v2.5.0
Checking radicle-signals v0.10.0 (/50a6804a-5cbb-4713-a4fd-9f9f004eaba2/w/radicle-signals)
Checking snapbox v0.4.17
Checking numtoa v0.1.0
Checking unicode-segmentation v1.11.0
Compiling adler v1.0.2
Checking gix-trace v0.1.9
Checking diff v0.1.13
Checking yansi v0.5.1
Checking pretty_assertions v1.4.0
Compiling miniz_oxide v0.7.2
Compiling filetime v0.2.23
Compiling xattr v1.3.1
Checking lexopt v0.3.0
Checking shlex v1.3.0
Compiling escargot v0.5.10
Compiling flate2 v1.0.28
Compiling tar v0.4.40
Checking newline-converter v0.3.0
Checking termion v2.0.3
Checking fxhash v0.2.1
Checking unicode-width v0.1.11
Checking faster-hex v0.9.0
Checking dyn-clone v1.0.17
Compiling radicle-surf v0.22.0
Checking inquire v0.7.5
Checking unicode-display-width v0.3.0
Checking termion v3.0.0
Checking gix-utils v0.1.12
Compiling tree-sitter-c v0.20.8
Compiling tree-sitter-css v0.20.0
Compiling tree-sitter-toml v0.20.0
Compiling tree-sitter-json v0.20.2
Compiling tree-sitter-ruby v0.20.1
Compiling tree-sitter-md v0.1.7
Compiling tree-sitter-html v0.20.0
Compiling tree-sitter-python v0.20.4
Compiling tree-sitter-rust v0.20.4
Compiling tree-sitter-go v0.20.0
Compiling tree-sitter-typescript v0.20.5
Compiling tree-sitter-bash v0.20.5
Checking sqlite3-sys v0.15.2
Checking sqlite v0.32.0
Checking gix-hash v0.14.2
Checking nonempty v0.5.0
Checking same-file v1.0.6
Compiling radicle-cli v0.11.0 (/50a6804a-5cbb-4713-a4fd-9f9f004eaba2/w/radicle-cli)
Checking base64 v0.13.1
Checking walkdir v2.5.0
Checking tree-sitter-highlight v0.20.1
Checking timeago v0.4.2
Checking sha1_smol v1.0.0
Checking prodash v28.0.0
Checking smallvec v1.13.2
Compiling lock_api v0.4.11
Compiling parking_lot_core v0.9.9
Checking gix-features v0.38.2
Checking scopeguard v1.2.0
Compiling num-conv v0.1.0
Compiling time-core v0.1.2
Checking powerfmt v0.2.0
Compiling time-macros v0.2.18
Checking deranged v0.3.11
Checking num_threads v0.1.7
Checking home v0.5.9
Checking gix-path v0.10.9
Checking parking_lot v0.12.1
Checking winnow v0.6.8
Checking gix-validate v0.8.5
Checking gix-chunk v0.4.8
Checking memmap2 v0.9.4
Checking shell-words v1.1.0
Checking gix-command v0.3.6
Checking gix-commitgraph v0.24.3
Checking gix-hashtable v0.5.2
Checking gix-config-value v0.14.6
Checking time v0.3.36
Checking gix-url v0.27.3
Checking gix-fs v0.11.2
Checking gix-quote v0.4.12
Checking gix-sec v0.10.6
Checking gix-tempfile v14.0.1
Checking gix-prompt v0.8.4
Checking gix-packetline v0.17.5
Checking gix-credentials v0.24.2
Checking gix-transport v0.42.0
Compiling maybe-async v0.2.10
Checking gix-date v0.8.7
Checking arc-swap v1.7.1
Checking gix-actor v0.31.5
Checking gix-object v0.42.3
Checking popol v3.0.0
Checking either v1.11.0
Checking io-reactor v0.5.2
Checking salsa20 v0.10.2
Checking socket2 v0.5.7
Checking gix-revwalk v0.13.2
Checking gix-diff v0.44.1
Checking gix-traverse v0.39.2
Checking gix-protocol v0.45.0
Compiling radicle-node v0.10.0 (/50a6804a-5cbb-4713-a4fd-9f9f004eaba2/w/radicle-node)
Checking gix-pack v0.51.1
Checking siphasher v0.3.11
Checking netservices v0.8.0
Checking bloomy v1.2.0
Checking scrypt v0.11.0
Checking radicle-systemd v0.9.0 (/50a6804a-5cbb-4713-a4fd-9f9f004eaba2/w/radicle-systemd)
Compiling qcheck-macros v1.0.0
Compiling radicle-remote-helper v0.10.0 (/50a6804a-5cbb-4713-a4fd-9f9f004eaba2/w/radicle-remote-helper)
Checking gix-odb v0.61.1
Checking git2 v0.19.0
Checking radicle-git-ext v0.8.0
Checking radicle-term v0.11.0 (/50a6804a-5cbb-4713-a4fd-9f9f004eaba2/w/radicle-term)
Checking radicle-crypto v0.11.0 (/50a6804a-5cbb-4713-a4fd-9f9f004eaba2/w/radicle-crypto)
Checking radicle-cob v0.12.0 (/50a6804a-5cbb-4713-a4fd-9f9f004eaba2/w/radicle-cob)
Checking radicle-crdt v0.1.0 (/50a6804a-5cbb-4713-a4fd-9f9f004eaba2/w/radicle-crdt)
Checking radicle v0.13.0 (/50a6804a-5cbb-4713-a4fd-9f9f004eaba2/w/radicle)
Checking radicle-cli-test v0.10.0 (/50a6804a-5cbb-4713-a4fd-9f9f004eaba2/w/radicle-cli-test)
Checking radicle-fetch v0.10.0 (/50a6804a-5cbb-4713-a4fd-9f9f004eaba2/w/radicle-fetch)
error: all variants have the same prefix: `File`
--> radicle-cli/src/commands/patch/review/builder.rs:140:1
|
140 | / pub enum ReviewItem {
141 | | FileAdded {
142 | | path: PathBuf,
143 | | header: FileHeader,
... |
178 | | },
179 | | }
| |_^
|
= help: remove the prefixes and use full paths to the variants instead of glob imports
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#enum_variant_names
= note: `-D clippy::enum-variant-names` implied by `-D clippy::all`
= help: to override `-D clippy::all` add `#[allow(clippy::enum_variant_names)]`
error: very complex type used. Consider factoring parts into `type` definitions
--> radicle-cli/src/commands/patch/review/builder.rs:195:24
|
195 | fn paths(&self) -> (Option<(&Path, Oid)>, Option<(&Path, Oid)>) {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#type_complexity
= note: `-D clippy::type-complexity` implied by `-D clippy::all`
= help: to override `-D clippy::all` add `#[allow(clippy::type_complexity)]`
error: could not compile `radicle-cli` (lib) due to 2 previous errors
warning: build failed, waiting for other jobs to finish...
error: could not compile `radicle-cli` (lib test) due to 2 previous errors
Exit code: 101
{
"response": "finished",
"result": "failure"
}