rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5 heartwood002c5b65a9fa968913ad8cce5daaee99d28ba1fd
{
"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": "251971da8a4d1da6a4fc949b40b3e28655313929",
"author": {
"id": "did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
"alias": null
},
"title": "radicle/git: Canonical service",
"state": {
"status": "draft",
"conflicts": []
},
"before": "c3cc29b1c46980c4d5c775aa6e362029c2453e38",
"after": "002c5b65a9fa968913ad8cce5daaee99d28ba1fd",
"commits": [
"002c5b65a9fa968913ad8cce5daaee99d28ba1fd",
"30572e7f006dd4810fcfba1c97fded6435c4b50f",
"1a7972b83c8cdf78eabfa8e2606cf6fa7e366204"
],
"target": "d285eccb23f3986bfa88fc1af033e6dcb0dc3a65",
"labels": [],
"assignees": [],
"revisions": [
{
"id": "251971da8a4d1da6a4fc949b40b3e28655313929",
"author": {
"id": "did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
"alias": null
},
"description": "Canonical service implementation that utilises the recent [git abstractions](https://radicle.zulipchat.com/#narrow/channel/383670-Patches/topic/Git.20Repository.20Refactor/with/599419004).\n\nAs described by [issue: 68b88659](https://radicle.network/nodes/seed.radicle.dev/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5/issues/68b886599e5b46b81ab78d6da19823e153bfefbe).",
"base": "c3cc29b1c46980c4d5c775aa6e362029c2453e38",
"oid": "30572e7f006dd4810fcfba1c97fded6435c4b50f",
"timestamp": 1780655669
},
{
"id": "84b74b09f422006928ac3819fa9e4cb7bc2a1658",
"author": {
"id": "did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
"alias": null
},
"description": "REVIEW",
"base": "c3cc29b1c46980c4d5c775aa6e362029c2453e38",
"oid": "002c5b65a9fa968913ad8cce5daaee99d28ba1fd",
"timestamp": 1781855750
},
{
"id": "57b74384fa464e51c5619aad0e4b75806af71344",
"author": {
"id": "did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
"alias": null
},
"description": "Refactor away existing canonical evaluation code",
"base": "a65ac048cbda3473e7b372375d33e3a357965492",
"oid": "b6ef0fd3a517390615f293aab36a5d3b1295c0f2",
"timestamp": 1781884081
}
]
}
}
{
"response": "triggered",
"run_id": {
"id": "1bdf25dd-78d3-4459-b839-d3b442b94047"
},
"info_url": "https://cci.rad.levitte.org//1bdf25dd-78d3-4459-b839-d3b442b94047.html"
}
Started at: 2026-09-07 19:58:05.849619+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/1bdf25dd-78d3-4459-b839-d3b442b94047/w/
╭────────────────────────────────────╮
│ heartwood │
│ Radicle Heartwood Protocol & Stack │
│ 189 issues · 38 patches │
╰────────────────────────────────────╯
Run `cd ./.` to go to the repository directory.
Exit code: 0
$ rad patch checkout 251971da8a4d1da6a4fc949b40b3e28655313929
✓ Switched to branch patch/251971d at revision 57b7438
✓ Branch patch/251971d setup to track rad/patches/251971da8a4d1da6a4fc949b40b3e28655313929
Exit code: 0
$ git config advice.detachedHead false
Exit code: 0
$ git checkout 002c5b65a9fa968913ad8cce5daaee99d28ba1fd
HEAD is now at 002c5b65 REVIEW
Exit code: 0
$ rad patch show 251971da8a4d1da6a4fc949b40b3e28655313929 -p
╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ Title radicle/git: Canonical service │
│ Patch 251971da8a4d1da6a4fc949b40b3e28655313929 │
│ Author ade z6MkwGo…yS2aagA │
│ Head b6ef0fd3a517390615f293aab36a5d3b1295c0f2 │
│ Base a65ac048cbda3473e7b372375d33e3a357965492 │
│ Target master │
│ Branches patch/251971d │
│ Commits ahead 37, behind 166 │
│ Status draft │
│ │
│ Canonical service implementation that utilises the recent [git │
│ abstractions](https://radicle.zulipchat.com/#narrow/channel/383670-Patches/topic/Git.20Repository.20Refactor/with/599419004). │
│ │
│ As described by [issue: │
│ 68b88659](https://radicle.network/nodes/seed.radicle.dev/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5/issues/68b886599e5b46b81ab78d6da19823e153bfefbe). │
├──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
│ b6ef0fd radicle-remote-helper: Fix refactor breakages │
│ 99a0e67 radicle: Fix refactor breakages for identity and storage │
│ 5bdc48f radicle: Finalise `git::repository::canonical::Namespace` facade │
│ 33f3ede radicle: Refactor `git::canonical` into `git::repository::canonical::eval` │
│ 989c56b radicle/git/repo: Fix build errors for broken type names │
│ 1d7b1c4 radicle-node: Refactor usages of canonical references with facade │
│ 1ff8cd4 radicle-remote-helper: Refactor usages of canonical references with facade │
│ 03bf538 radicle: Introduce `git::repository::canonical::Namespace` facade │
│ c3cc29b git/repository/user: user::Namespace and user::Namespaces integration tests │
│ 8c263ba git/repository: git2 adapter integration tests │
│ 9462ede git/repository: Unit tests for git::repository domain types │
│ 6270c50 git/raw: Add composable test fixture │
│ fca3c51 radicle/git/canonical: Rename effects to objects │
│ 175e321 radicle/canonical/effects: Migrate to user::Namespace in FindObjects │
│ d990739 radicle/git/repository/user: Namespace::find_object │
│ d26c62e radicle/storage/git: Refactor remote_ids and remotes to use user::Namespaces │
│ af27f7f git/repository/user: Add listing of DIDs │
│ 2f84deb storage/git: migrate references_of to use user::Namespace │
│ 9a0bf85 radicle/storage/refs: impl FromIterator for Refs │
│ b333442 radicle/git/repository: introduce user::Namespace │
│ fb4d849 canonical: Replace FindObjects trait with struct │
│ 5b4da8a radicle/git/repository: Add object_kind to ObjectReader │
│ 4bfb04a canonical: replace FindMergeBase with repository::Ancestry │
│ 3a67854 canonical: replace effects::Ancestry with repository::Ancestry │
│ 2d5e5ec radicle/storage/sigrefs: Remove unused traits │
│ 37ac26b storage/refs/sigrefs: Refactor reference::Writer to repository::reference::Writer │
│ 8b8fe3e storage/refs/sigrefs: Refactor object::Writer to repository::object::Writer │
│ 0980c49 storage/refs/sigrefs: Refactor sigrefs::reference::Reader to repository::object::Reader │
│ 6bc19f8 storage/refs/sigrefs: Refactor sigrefs::object::Reader to repository::object::Reader │
│ e1a46dc storage/git: Implement git::repository traits for Repository │
│ a59ea44 radicle/git/repository: Implement git2 adapter for all traits │
│ bb2da17 radicle/git/repository: Define Revwalk trait │
│ 0ea99de radicle/git/repository: Define Ancestry trait │
│ 136cddf radicle/git/repository: Define reference::Reader, reference::Writer, symbolic::Writer │
│ dd20123 radicle/git/repository: Define object::Reader and object::Writer traits │
│ 3abcd3a radicle/git/repository: Define Git domain types │
│ d097c92 sigrefs/git: Remove doc link of `Committer::stable` │
├──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
│ ● Revision 251971d @ c3cc29b..30572e7 by ade z6MkwGo…yS2aagA 3 months ago │
│ ↑ Revision 84b74b0 @ c3cc29b..002c5b6 by fintohaps z6Mkire…SQZ3voM 2 months ago │
│ ↑ Revision 57b7438 @ a65ac04..b6ef0fd by ade z6MkwGo…yS2aagA 2 months ago │
╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
commit b6ef0fd3a517390615f293aab36a5d3b1295c0f2
Author: Adrian Duke <adrian.duke@gmail.com>
Date: Fri Jun 19 16:03:24 2026 +0100
radicle-remote-helper: Fix refactor breakages
diff --git a/crates/radicle-remote-helper/src/push.rs b/crates/radicle-remote-helper/src/push.rs
index 864cfb38a..2af84a4c4 100644
--- a/crates/radicle-remote-helper/src/push.rs
+++ b/crates/radicle-remote-helper/src/push.rs
@@ -101,9 +101,6 @@ pub(super) enum Error {
/// General repository error.
#[error(transparent)]
Repository(#[from] radicle::storage::RepositoryError),
- /// Quorum error.
- #[error(transparent)]
- Quorum(#[from] radicle::git::canonical::error::QuorumError),
#[error(transparent)]
CanonicalUpdate(#[from] git::repository::canonical::error::Update),
#[error(transparent)]
@@ -112,9 +109,6 @@ pub(super) enum Error {
PushAction(#[from] error::PushAction),
#[error(transparent)]
Canonical(#[from] error::CanonicalUnrecoverable),
- #[error(transparent)]
- FindObjects(#[from] git::canonical::error::FindObjectsError),
-
/// Error sending pack from the working copy to storage.
#[error(
"`git send-pack` failed with exit status {status}, stderr and stdout follow:\n{stderr}\n{stdout}"
@@ -292,7 +286,7 @@ pub(super) fn run(
}
}
let delegates = stored.delegates()?;
- let mut set_canonical_refs: Vec<(git::fmt::Qualified, git::canonical::Object)> =
+ let mut set_canonical_refs: Vec<(git::fmt::Qualified, git::repository::canonical::Object)> =
Vec::with_capacity(specs.len());
// Rely on the environment variable `GIT_DIR`.
@@ -379,9 +373,9 @@ pub(super) fn run(
match canonical_svc.propose(&dst, *src, me, LOG_MESSAGE) {
Ok(Some(obj)) => set_canonical_refs.push((dst.clone(), obj)),
Ok(None) => {}
- Err(git::repository::canonical::error::Update::Quorum(e)) => {
- canonical::io::handle_error(e)?
- }
+ Err(git::repository::canonical::error::Update::Evaluate(
+ git::repository::canonical::error::Error::Quorum(e),
+ )) => canonical::io::handle_error(e)?,
Err(e) => return Err(Error::from(e)),
}
}
diff --git a/crates/radicle-remote-helper/src/push/canonical.rs b/crates/radicle-remote-helper/src/push/canonical.rs
index 206f8ad77..7f5197c1c 100644
--- a/crates/radicle-remote-helper/src/push/canonical.rs
+++ b/crates/radicle-remote-helper/src/push/canonical.rs
@@ -1,5 +1,5 @@
pub(crate) mod io {
- use radicle::git::canonical::error::QuorumError;
+ use radicle::git::repository::canonical::error::QuorumError;
use crate::push::error;
use crate::warn;
diff --git a/crates/radicle-remote-helper/src/push/error.rs b/crates/radicle-remote-helper/src/push/error.rs
index 62f69c812..c5ee55376 100644
--- a/crates/radicle-remote-helper/src/push/error.rs
+++ b/crates/radicle-remote-helper/src/push/error.rs
@@ -1,5 +1,5 @@
use radicle::git;
-use radicle::git::canonical;
+use radicle::git::repository::canonical;
use thiserror::Error;
#[derive(Debug, Error)]
commit 99a0e67317fd23cbf5ba9eeec7d1101e8bb49ffe
Author: Adrian Duke <adrian.duke@gmail.com>
Date: Fri Jun 19 16:02:21 2026 +0100
radicle: Fix refactor breakages for identity and storage
diff --git a/crates/radicle/src/identity/crefs.rs b/crates/radicle/src/identity/crefs.rs
index cd7cbb5ef..8e64d8e85 100644
--- a/crates/radicle/src/identity/crefs.rs
+++ b/crates/radicle/src/identity/crefs.rs
@@ -1,9 +1,9 @@
use serde::{Deserialize, Serialize};
use thiserror::Error;
-use crate::git::canonical::rules::{self, RawRules, Rules};
-use crate::git::canonical::symbolic::{self, SymbolicRefs};
use crate::git::fmt::Qualified;
+use crate::git::repository::canonical::rules::{self, RawRules, Rules};
+use crate::git::repository::canonical::symbolic::{self, SymbolicRefs};
use super::doc::{Delegates, Payload};
diff --git a/crates/radicle/src/identity/doc.rs b/crates/radicle/src/identity/doc.rs
index ad9e39ae2..b193a0f63 100644
--- a/crates/radicle/src/identity/doc.rs
+++ b/crates/radicle/src/identity/doc.rs
@@ -19,11 +19,10 @@ use crate::cob::identity;
use crate::crypto;
use crate::crypto::Signature;
use crate::git;
-use crate::git::canonical::rules;
-use crate::git::canonical::symbolic;
use crate::git::fmt::Qualified;
use crate::git::fmt::RefString;
use crate::git::raw::ErrorExt as _;
+use crate::git::repository::canonical::{rules, symbolic};
use crate::identity::crefs;
use crate::identity::{Did, project::Project};
use crate::node::device::Device;
diff --git a/crates/radicle/src/storage.rs b/crates/radicle/src/storage.rs
index 081305fd8..9915935e5 100644
--- a/crates/radicle/src/storage.rs
+++ b/crates/radicle/src/storage.rs
@@ -18,9 +18,9 @@ pub use git::{Validation, Validations};
use crate::cob;
use crate::collections::RandomMap;
use crate::git::RefError;
-use crate::git::canonical;
use crate::git::fmt::{Qualified, RefStr, RefString, refspec::PatternString, refspec::Refspec};
use crate::git::raw::ErrorExt as _;
+use crate::git::repository::canonical;
use crate::identity::{Did, PayloadError, doc};
use crate::identity::{Doc, DocAt, DocError};
use crate::identity::{Identity, RepoId};
@@ -145,8 +145,6 @@ pub enum RepositoryError {
#[error(transparent)]
Git(#[from] crate::git::raw::Error),
#[error(transparent)]
- Quorum(#[from] canonical::error::QuorumError),
- #[error(transparent)]
Refs(Box<refs::Error>),
#[error("missing canonical reference rule for default branch")]
MissingBranchRule,
@@ -155,7 +153,7 @@ pub enum RepositoryError {
#[error("failed to get canonical reference rules: {0}")]
CanonicalRefs(#[from] doc::CanonicalRefsError),
#[error(transparent)]
- FindObjects(#[from] canonical::objects::FindObjectsError),
+ Canonical(#[from] canonical::error::Error),
}
impl From<Error> for RepositoryError {
diff --git a/crates/radicle/src/storage/git.rs b/crates/radicle/src/storage/git.rs
index 995b1a8c8..662342243 100644
--- a/crates/radicle/src/storage/git.rs
+++ b/crates/radicle/src/storage/git.rs
@@ -11,7 +11,6 @@ use std::path::{Path, PathBuf};
use std::sync::LazyLock;
use std::{fs, io};
-use crate::git::canonical::Quorum;
use crate::git::raw::ErrorExt as _;
use crate::git::repository::{self, user};
use crate::git::repository::{ancestry, object, reference, revwalk};
@@ -794,18 +793,16 @@ impl ReadRepository for Repository {
fn canonical_head(&self) -> Result<(Qualified<'_>, Oid), RepositoryError> {
let doc = self.identity_doc()?;
- Ok(doc
- .canonical_refs()?
- .rules()
- .canonical(doc.default_branch()?, self)
- .ok_or(RepositoryError::MissingBranchRule)?
- .find_objects()?
- .quorum()?)
- .map(
- |Quorum {
- refname, object, ..
- }| (refname.to_owned(), object.id()),
- )
+ let default_branch = doc.default_branch()?.to_owned();
+
+ let ns =
+ git::repository::canonical::Namespace::new(self, doc.canonical_refs()?.rules().clone());
+
+ let obj = ns
+ .quorum(&default_branch)?
+ .ok_or(RepositoryError::MissingBranchRule)?;
+
+ Ok((default_branch, obj.id()))
}
fn identity_head(&self) -> Result<Oid, RepositoryError> {
commit 5bdc48f550e14263411527d29a1bacff7ce9cc5a
Author: Adrian Duke <adrian.duke@gmail.com>
Date: Fri Jun 19 13:51:27 2026 +0100
radicle: Finalise `git::repository::canonical::Namespace` facade
Establishes `canonical.rs` as a module `canonical/mod.rs` facade.
Encapsulates the internal `eval` logic while re-exporting `rules` and
`symbolic` for external consumers.
Refactors error handling to introduce a read-only `Error` enum for
evaluation failures and wrap it in `Update::Evaluate`.
Re-exports specific inner errors so consumers can pattern-match without
accessing the private `eval` module.
Updates `ref_target` to return `Ok(None)` for non-canonical references,
and adds a test.
diff --git a/crates/radicle/src/git/repository/canonical/error.rs b/crates/radicle/src/git/repository/canonical/error.rs
index 2e776bd28..e3dad3925 100644
--- a/crates/radicle/src/git/repository/canonical/error.rs
+++ b/crates/radicle/src/git/repository/canonical/error.rs
@@ -1,18 +1,29 @@
use crate::git::Oid;
-use crate::git::canonical::error::{FindObjectsError, QuorumError};
use crate::git::repository::{object, reference};
-/// Error returned by [`Service::propose`] and [`Service::reevaluate`].
-///
-/// [`Service::propose`]: super::Service::propose
-/// [`Service::reevaluate`]: super::Service::reevaluate
+pub use crate::git::repository::canonical::eval::error::{
+ ConvergesError, FindObjectsError, MergeBaseError, QuorumError,
+};
+
+/// Errors that occur during read-only canonical evaluation.
#[derive(Debug, thiserror::Error)]
#[non_exhaustive]
-pub enum Update {
+pub enum Error {
#[error(transparent)]
Quorum(#[from] QuorumError),
#[error(transparent)]
FindObjects(#[from] FindObjectsError),
+}
+
+/// Error returned by [`Namespace::propose`] and [`Namespace::reevaluate`].
+///
+/// [`Namespace::propose`]: super::Namespace::propose
+/// [`Namespace::reevaluate`]: super::Namespace::reevaluate
+#[derive(Debug, thiserror::Error)]
+#[non_exhaustive]
+pub enum Update {
+ #[error(transparent)]
+ Evaluate(#[from] Error),
#[error(transparent)]
Write(#[from] reference::error::write::WriteRef),
#[error(transparent)]
@@ -24,3 +35,16 @@ pub enum Update {
#[error("invalid object kind for {0}")]
InvalidObjectKind(Oid),
}
+
+// Convenience implementations to keep `propose` clean
+impl From<QuorumError> for Update {
+ fn from(e: QuorumError) -> Self {
+ Self::Evaluate(e.into())
+ }
+}
+
+impl From<FindObjectsError> for Update {
+ fn from(e: FindObjectsError) -> Self {
+ Self::Evaluate(e.into())
+ }
+}
diff --git a/crates/radicle/src/git/repository/canonical.rs b/crates/radicle/src/git/repository/canonical/mod.rs
similarity index 74%
rename from crates/radicle/src/git/repository/canonical.rs
rename to crates/radicle/src/git/repository/canonical/mod.rs
index 6034aea17..ffcf63ba1 100644
--- a/crates/radicle/src/git/repository/canonical.rs
+++ b/crates/radicle/src/git/repository/canonical/mod.rs
@@ -1,6 +1,6 @@
//! Canonical Git reference access.
//!
-//! [`Service`] provides operations to evaluate and update canonical references
+//! [`Namespace`] provides operations to evaluate and update canonical references
//! within a Git repository. It acts as a facade over the underlying repository,
//! enforcing the rules defined in the identity document, ensuring that updates
//! only succeed if they meet the required quorum and convergence criteria.
@@ -9,14 +9,24 @@
mod test;
pub mod error;
+mod eval;
use crate::git::Oid;
-use crate::git::canonical::{Object, Rules};
use crate::git::fmt::Qualified;
use crate::git::repository::{Ancestry, object, reference};
use crate::prelude::Did;
-/// A service for managing and evaluating canonical references.
+pub use eval::{Object, Rules};
+
+pub mod rules {
+ pub use super::eval::rules::*;
+}
+
+pub mod symbolic {
+ pub use super::eval::symbolic::*;
+}
+
+/// A namespace for managing and evaluating canonical references.
///
/// This acts as a domain-specific facade over a Git repository. It enforces
/// the rules defined in an identity document (represented by [`Rules`]),
@@ -50,7 +60,8 @@ where
{
/// Resolve a reference to its target [`Oid`].
///
- /// Returns `None` if the reference does not exist for this user.
+ /// Returns `Ok(None)` if the reference does not exist, or if the reference
+ /// is not governed by the canonical rules of this namespace.
///
/// # Errors
///
@@ -64,13 +75,40 @@ where
if self.is_canonical(name) {
self.repo.ref_target(&name)
} else {
- // TODO: Consider whether throwing an error here. Other option would
- // be always try and resolve, or return `None`.
- todo!()
+ Ok(None)
}
}
}
+impl<'a, R> Namespace<'a, R>
+where
+ R: reference::Reader + object::Reader + Ancestry,
+{
+ /// Evaluate the current quorum of a canonical reference.
+ ///
+ /// This performs a read-only tally of the delegates' references to determine
+ /// the network's consensus for the given `name`. Unlike [`Namespace::propose`]
+ /// or [`Namespace::reevaluate`], this method does not attempt to update the
+ /// underlying repository with the resulting target.
+ ///
+ /// Returns `Ok(None)` if the reference is not governed by the canonical rules.
+ ///
+ /// # Errors
+ ///
+ /// Returns an [`error::Error`] if:
+ /// - The delegates have diverged and no consensus can be reached.
+ /// - The quorum threshold is not met.
+ /// - Reading from the underlying repository fails.
+ pub fn quorum(&self, name: &Qualified) -> Result<Option<Object>, error::Error> {
+ let Some(canonical_eval) = self.rules.canonical(name.clone(), self.repo) else {
+ return Ok(None);
+ };
+ let quorum = canonical_eval.find_objects()?.quorum()?;
+
+ Ok(Some(quorum.object))
+ }
+}
+
impl<'a, R> Namespace<'a, R>
where
R: reference::Writer + reference::Reader + object::Reader + Ancestry,
@@ -92,8 +130,8 @@ where
/// - The quorum threshold is not met ([`QuorumError::NoCandidates`]).
/// - Writing to the underlying repository fails.
///
- /// [`QuorumError::Convergence`]: crate::git::canonical::error::QuorumError::Convergence
- /// [`QuorumError::NoCandidates`]: crate::git::canonical::error::QuorumError::NoCandidates
+ /// [`QuorumError::Convergence`]: crate::git::repository::canonical::eval::error::QuorumError::Convergence
+ /// [`QuorumError::NoCandidates`]: crate::git::repository::canonical::eval::error::QuorumError::NoCandidates
pub fn propose(
&self,
name: &Qualified,
diff --git a/crates/radicle/src/git/repository/canonical/test.rs b/crates/radicle/src/git/repository/canonical/test.rs
index b67829869..eb7787d73 100644
--- a/crates/radicle/src/git/repository/canonical/test.rs
+++ b/crates/radicle/src/git/repository/canonical/test.rs
@@ -1,8 +1,8 @@
+use super::rules::{Allowed, Rule, Rules};
use super::*;
-use crate::git::canonical::rules::{Allowed, Rule, Rules};
use crate::git::fmt::{qualified, qualified_pattern};
use crate::git::raw::fixture;
-use crate::git::repository::reference::Reader;
+use crate::git::repository::reference::{Reader, Writer};
use crate::identity::doc::Delegates;
use crate::prelude::Did;
@@ -108,8 +108,66 @@ fn test_propose_evaluates_convergence_mismatch() {
assert!(matches!(
err,
- error::Update::Quorum(crate::git::canonical::error::QuorumError::Convergence(
- crate::git::canonical::error::ConvergesError::MismatchedObject(_)
+ error::Update::Evaluate(error::Error::Quorum(
+ crate::git::repository::canonical::eval::error::QuorumError::Convergence(
+ crate::git::repository::canonical::eval::error::ConvergesError::MismatchedObject(_)
+ )
))
));
}
+
+#[test]
+fn test_ref_target_hides_non_canonical_refs() {
+ let repo = fixture::Repository::new();
+ let c1 = repo.commit(&[], &[("f", b"x")]);
+
+ // Write directly to the underlying repo
+ repo.raw()
+ .write_ref(
+ &qualified!("refs/heads/main"),
+ crate::git::repository::reference::Target::Upsert { target: c1 },
+ "test",
+ )
+ .unwrap();
+ repo.raw()
+ .write_ref(
+ &qualified!("refs/heads/feature"),
+ crate::git::repository::reference::Target::Upsert { target: c1 },
+ "test",
+ )
+ .unwrap();
+
+ let rules = setup_rules(vec![did(1)], 1); // Only governs `refs/heads/main`
+ let ns = Namespace::new(repo.raw(), rules);
+
+ // Canonical ref should be visible
+ assert_eq!(
+ ns.ref_target(&qualified!("refs/heads/main")).unwrap(),
+ Some(c1)
+ );
+
+ // Non-canonical ref should be hidden (returns None), even though it exists in the repo
+ assert_eq!(
+ ns.ref_target(&qualified!("refs/heads/feature")).unwrap(),
+ None
+ );
+}
+
+#[test]
+fn test_quorum_evaluates_without_mutating() {
+ let mut repo = fixture::Repository::new();
+ let c1 = repo.commit(&[], &[("f", b"x")]);
+ let d1 = did(1);
+ let d2 = did(2);
+
+ // Delegates agree on c1
+ repo.namespaced_ref(d1, "refs/heads/main", c1);
+ repo.namespaced_ref(d2, "refs/heads/main", c1);
+
+ let rules = setup_rules(vec![d1, d2], 2);
+ let ns = Namespace::new(repo.raw(), rules);
+
+ // Quorum should successfully resolve to c1
+ let quorum_obj = ns.quorum(&qualified!("refs/heads/main")).unwrap();
+ assert_eq!(quorum_obj, Some(Object::Commit { id: c1 }));
+}
commit 33f3ede829f3b08aef361f0dbd08f663c0e8d21d
Author: Adrian Duke <adrian.duke@gmail.com>
Date: Fri Jun 19 13:38:27 2026 +0100
radicle: Refactor `git::canonical` into `git::repository::canonical::eval`
As part of providing the `git::repository::canonical::Namespace` facade;
refactor existing `git::canonical` into a private module
`git::repository::canonical::eval`.
Further commits will fix breakages related to this refactor.
diff --git a/crates/radicle/src/git.rs b/crates/radicle/src/git.rs
index 58ef8e9cb..96da0fdca 100644
--- a/crates/radicle/src/git.rs
+++ b/crates/radicle/src/git.rs
@@ -1,4 +1,3 @@
-pub mod canonical;
pub mod raw;
pub mod repository;
diff --git a/crates/radicle/src/git/canonical/convergence.rs b/crates/radicle/src/git/repository/canonical/eval/convergence.rs
similarity index 100%
rename from crates/radicle/src/git/canonical/convergence.rs
rename to crates/radicle/src/git/repository/canonical/eval/convergence.rs
diff --git a/crates/radicle/src/git/canonical/error.rs b/crates/radicle/src/git/repository/canonical/eval/error.rs
similarity index 100%
rename from crates/radicle/src/git/canonical/error.rs
rename to crates/radicle/src/git/repository/canonical/eval/error.rs
diff --git a/crates/radicle/src/git/canonical.rs b/crates/radicle/src/git/repository/canonical/eval/mod.rs
similarity index 98%
rename from crates/radicle/src/git/canonical.rs
rename to crates/radicle/src/git/repository/canonical/eval/mod.rs
index fb98ba735..1355599e8 100644
--- a/crates/radicle/src/git/canonical.rs
+++ b/crates/radicle/src/git/repository/canonical/eval/mod.rs
@@ -1,3 +1,11 @@
+//! Internal canonical evaluation engine.
+//!
+//! This module contains the low-level mechanics for calculating quorums,
+//! validating convergence, and applying delegate rules.
+//!
+//! **Note:** Types in this module should generally not be exposed directly.
+//! Consumers should interact with canonical state exclusively through the
+//! [`Namespace`](super::Namespace) facade.
pub mod error;
use error::*;
@@ -14,7 +22,7 @@ pub mod protect;
pub mod rules;
pub mod symbolic;
-pub use rules::{MatchedRule, RawRule, Rules, ValidRule};
+pub use rules::{Rules, ValidRule};
use std::collections::{BTreeMap, BTreeSet};
use std::fmt;
@@ -26,8 +34,8 @@ use crate::git::repository;
use crate::prelude::Did;
-use super::fmt::Qualified;
use crate::git::Oid;
+use crate::git::fmt::Qualified;
/// A marker for the initial state of [`Canonical`], after construction using
/// [`Canonical::new`].
@@ -429,6 +437,7 @@ impl Object {
matches!(self, Self::Commit { .. })
}
+ #[allow(rustdoc::private_intra_doc_links)]
/// Returns the [`ObjectType`] of the [`Object`].
pub fn object_type(&self) -> ObjectType {
match self {
@@ -482,6 +491,7 @@ impl Missing {
#[allow(clippy::unwrap_used)]
mod tests {
+ use super::rules::RawRule;
use super::*;
use crate::assert_matches;
use crate::git;
@@ -506,8 +516,8 @@ mod tests {
.unwrap();
}
- let rule: RawRule = crate::git::canonical::rules::Rule::new(
- crate::git::canonical::rules::Allowed::Delegates,
+ let rule: RawRule = crate::git::repository::canonical::eval::rules::Rule::new(
+ crate::git::repository::canonical::eval::rules::Allowed::Delegates,
threshold,
);
let delegates = crate::identity::doc::Delegates::new(delegates).unwrap();
diff --git a/crates/radicle/src/git/canonical/objects.rs b/crates/radicle/src/git/repository/canonical/eval/objects.rs
similarity index 98%
rename from crates/radicle/src/git/canonical/objects.rs
rename to crates/radicle/src/git/repository/canonical/eval/objects.rs
index 9ef993c1d..dd9544009 100644
--- a/crates/radicle/src/git/canonical/objects.rs
+++ b/crates/radicle/src/git/repository/canonical/eval/objects.rs
@@ -65,6 +65,7 @@ where
}
}
+#[allow(rustdoc::private_intra_doc_links)]
/// Error produced by [`FindObjects::resolve`].
#[derive(Debug, thiserror::Error)]
pub enum FindObjectsError {
diff --git a/crates/radicle/src/git/canonical/protect.rs b/crates/radicle/src/git/repository/canonical/eval/protect.rs
similarity index 100%
rename from crates/radicle/src/git/canonical/protect.rs
rename to crates/radicle/src/git/repository/canonical/eval/protect.rs
diff --git a/crates/radicle/src/git/canonical/quorum.rs b/crates/radicle/src/git/repository/canonical/eval/quorum.rs
similarity index 99%
rename from crates/radicle/src/git/canonical/quorum.rs
rename to crates/radicle/src/git/repository/canonical/eval/quorum.rs
index 6e805f76d..9c8a8c4cc 100644
--- a/crates/radicle/src/git/canonical/quorum.rs
+++ b/crates/radicle/src/git/repository/canonical/eval/quorum.rs
@@ -239,7 +239,7 @@ pub enum CommitQuorumFailure {
#[allow(clippy::unwrap_used)]
#[cfg(test)]
mod test {
- use crate::git::{Oid, canonical::MergeBase};
+ use crate::git::{Oid, repository::canonical::eval::MergeBase};
use super::MergeBases;
diff --git a/crates/radicle/src/git/canonical/rules.rs b/crates/radicle/src/git/repository/canonical/eval/rules.rs
similarity index 99%
rename from crates/radicle/src/git/canonical/rules.rs
rename to crates/radicle/src/git/repository/canonical/eval/rules.rs
index e9f4e94bb..f4a670d83 100644
--- a/crates/radicle/src/git/canonical/rules.rs
+++ b/crates/radicle/src/git/repository/canonical/eval/rules.rs
@@ -21,11 +21,11 @@ use serde_json as json;
use thiserror::Error;
use crate::git;
-use crate::git::canonical;
-use crate::git::canonical::Canonical;
use crate::git::fmt::Qualified;
use crate::git::fmt::refspec::QualifiedPattern;
use crate::git::repository;
+use crate::git::repository::canonical::eval as canonical;
+use crate::git::repository::canonical::eval::Canonical;
use crate::identity::{Did, doc};
use super::protect;
@@ -537,6 +537,7 @@ impl Rules {
.map(|(pattern, rule)| (pattern.as_ref(), rule))
}
+ #[allow(rustdoc::private_intra_doc_links)]
/// Match given refname, take the most specific rule, and prepare evaluation
/// as [`Canonical`]
///
diff --git a/crates/radicle/src/git/canonical/rules/test.rs b/crates/radicle/src/git/repository/canonical/eval/rules/test.rs
similarity index 100%
rename from crates/radicle/src/git/canonical/rules/test.rs
rename to crates/radicle/src/git/repository/canonical/eval/rules/test.rs
diff --git a/crates/radicle/src/git/canonical/rules/test/helper.rs b/crates/radicle/src/git/repository/canonical/eval/rules/test/helper.rs
similarity index 92%
rename from crates/radicle/src/git/canonical/rules/test/helper.rs
rename to crates/radicle/src/git/repository/canonical/eval/rules/test/helper.rs
index 502393607..7948fadf0 100644
--- a/crates/radicle/src/git/canonical/rules/test/helper.rs
+++ b/crates/radicle/src/git/repository/canonical/eval/rules/test/helper.rs
@@ -1,8 +1,8 @@
use radicle_git_ref_format::refspec::QualifiedPattern;
use crate::git;
-use crate::git::canonical::rules::{Allowed, Pattern, RawPattern, Rule};
use crate::git::fmt::RefString;
+use crate::git::repository::canonical::eval::rules::{Allowed, Pattern, RawPattern, Rule};
use crate::identity::doc::{self, Doc};
use crate::prelude::Did;
use crate::test::fixtures;
diff --git a/crates/radicle/src/git/canonical/rules/test/property.rs b/crates/radicle/src/git/repository/canonical/eval/rules/test/property.rs
similarity index 98%
rename from crates/radicle/src/git/canonical/rules/test/property.rs
rename to crates/radicle/src/git/repository/canonical/eval/rules/test/property.rs
index d87e11251..0c8226067 100644
--- a/crates/radicle/src/git/canonical/rules/test/property.rs
+++ b/crates/radicle/src/git/repository/canonical/eval/rules/test/property.rs
@@ -4,7 +4,7 @@ use qcheck::{Arbitrary, TestResult};
use qcheck_macros::quickcheck;
use crate::git;
-use crate::git::canonical::rules::{RawPattern, matches};
+use crate::git::repository::canonical::eval::rules::{RawPattern, matches};
/// Newtype wrapper around [`git::fmt::Component`].
///
diff --git a/crates/radicle/src/git/canonical/symbolic.rs b/crates/radicle/src/git/repository/canonical/eval/symbolic.rs
similarity index 100%
rename from crates/radicle/src/git/canonical/symbolic.rs
rename to crates/radicle/src/git/repository/canonical/eval/symbolic.rs
diff --git a/crates/radicle/src/git/canonical/voting.rs b/crates/radicle/src/git/repository/canonical/eval/voting.rs
similarity index 100%
rename from crates/radicle/src/git/canonical/voting.rs
rename to crates/radicle/src/git/repository/canonical/eval/voting.rs
commit 989c56b52ba55b8232d9368e3eb7d9e507e7e351
Author: Adrian Duke <adrian.duke@gmail.com>
Date: Fri Jun 5 11:27:27 2026 +0100
radicle/git/repo: Fix build errors for broken type names
diff --git a/crates/radicle/src/git/repository/adapter/git2/object.rs b/crates/radicle/src/git/repository/adapter/git2/object.rs
index aa80f7b5a..f501e7da4 100644
--- a/crates/radicle/src/git/repository/adapter/git2/object.rs
+++ b/crates/radicle/src/git/repository/adapter/git2/object.rs
@@ -66,12 +66,12 @@ impl object::Reader for raw::Repository {
.map_err(error::read::Exists::backend)
}
- fn object_kind(&self, oid: Oid) -> Result<Option<ObjectKind>, read::ObjectKind> {
- let odb = self.odb().map_err(read::ObjectKind::backend)?;
+ fn object_kind(&self, oid: Oid) -> Result<Option<ObjectKind>, error::read::ObjectKind> {
+ let odb = self.odb().map_err(error::read::ObjectKind::backend)?;
match odb.read(oid.into()) {
Ok(obj) => Ok(Some(object_kind(obj.kind()))),
Err(e) if matches!(e.code(), git2::ErrorCode::NotFound) => Ok(None),
- Err(e) => Err(read::ObjectKind::backend(e)),
+ Err(e) => Err(error::read::ObjectKind::backend(e)),
}
}
}
commit 1d7b1c498b540f2b038423732a12e5f93d86b635
Author: Adrian Duke <adrian.duke@gmail.com>
Date: Thu Jun 4 12:55:04 2026 +0100
radicle-node: Refactor usages of canonical references with facade
diff --git a/crates/radicle-node/src/worker/fetch.rs b/crates/radicle-node/src/worker/fetch.rs
index d63a4458b..d17d1ce6d 100644
--- a/crates/radicle-node/src/worker/fetch.rs
+++ b/crates/radicle-node/src/worker/fetch.rs
@@ -351,6 +351,7 @@ fn set_canonical_refs(
}
let rules = crefs.rules().clone();
+ let canonical_svc = git::repository::canonical::Namespace::new(repo, rules);
let mut updated_refs = UpdatedCanonicalRefs::default();
let refnames = applied
@@ -367,42 +368,20 @@ fn set_canonical_refs(
.collect::<BTreeSet<_>>();
for name in refnames {
- let canonical = match rules.canonical(name.clone(), repo) {
- Some(canonical) => canonical,
- None => continue,
- };
+ if !canonical_svc.is_canonical(&name) {
+ continue;
+ }
- let canonical = match canonical.find_objects() {
- Err(err) => {
- log::warn!(target: "worker", "Failed to find objects for canonical computation of `{name}`: {err}");
- continue;
+ match canonical_svc.reevaluate(&name, LOG_MESSAGE) {
+ Ok(Some(obj)) => {
+ updated_refs.updated(name, obj.id());
}
- Ok(canonical) => canonical,
- };
-
- match canonical.quorum() {
+ Ok(None) => {}
Err(err) => {
log::warn!(
target: "worker",
- "Failed to calculate canonical reference `{name}`: {err}",
+ "Failed to reevaluate canonical reference `{name}`: {err}",
);
- continue;
- }
- Ok(git::canonical::Quorum {
- refname, object, ..
- }) => {
- let oid = object.id();
- if let Err(e) =
- repo.backend
- .reference(refname.clone().as_str(), oid.into(), true, LOG_MESSAGE)
- {
- log::warn!(
- target: "worker",
- "Failed to set canonical reference {refname}->{oid}: {e}"
- );
- } else {
- updated_refs.updated(refname, oid);
- }
}
}
}
commit 1ff8cd436c81968f8db93cc17d43dbddb7273657
Author: Adrian Duke <adrian.duke@gmail.com>
Date: Thu Jun 4 12:55:04 2026 +0100
radicle-remote-helper: Refactor usages of canonical references with facade
diff --git a/crates/radicle-remote-helper/src/push.rs b/crates/radicle-remote-helper/src/push.rs
index 61c1f9017..864cfb38a 100644
--- a/crates/radicle-remote-helper/src/push.rs
+++ b/crates/radicle-remote-helper/src/push.rs
@@ -105,13 +105,13 @@ pub(super) enum Error {
#[error(transparent)]
Quorum(#[from] radicle::git::canonical::error::QuorumError),
#[error(transparent)]
+ CanonicalUpdate(#[from] git::repository::canonical::error::Update),
+ #[error(transparent)]
CanonicalRefs(#[from] radicle::identity::doc::CanonicalRefsError),
#[error(transparent)]
PushAction(#[from] error::PushAction),
#[error(transparent)]
Canonical(#[from] error::CanonicalUnrecoverable),
- #[error("could not determine object type for {oid}")]
- UnknownObjectType { oid: git::Oid },
#[error(transparent)]
FindObjects(#[from] git::canonical::error::FindObjectsError),
@@ -373,16 +373,16 @@ pub(super) fn run(
//
// Note that we *do* allow rolling back to a previous commit on the
// canonical branch.
- if let Some(canonical) = rules.canonical(dst.clone(), stored) {
- let object = working
- .find_object(src.into(), None)
- .map(|obj| git::canonical::Object::new(&obj))?
- .ok_or(Error::UnknownObjectType { oid: *src })?;
-
- let canonical = canonical::Canonical::new(me, object, canonical)?;
- match canonical.quorum() {
- Ok(quorum) => set_canonical_refs.push(quorum),
- Err(e) => canonical::io::handle_error(e)?,
+ let canonical_svc =
+ git::repository::canonical::Namespace::new(stored.raw(), rules.clone());
+ if canonical_svc.is_canonical(&dst) {
+ match canonical_svc.propose(&dst, *src, me, LOG_MESSAGE) {
+ Ok(Some(obj)) => set_canonical_refs.push((dst.clone(), obj)),
+ Ok(None) => {}
+ Err(git::repository::canonical::error::Update::Quorum(e)) => {
+ canonical::io::handle_error(e)?
+ }
+ Err(e) => return Err(Error::from(e)),
}
}
Ok(explorer)
@@ -411,33 +411,12 @@ pub(super) fn run(
for (refname, object) in &set_canonical_refs {
let oid = object.id();
let kind = object.object_type();
- let print_update = || {
- eprintln!(
- "{} Canonical reference {} updated to target {kind} {}",
- term::PREFIX_SUCCESS,
- term::format::secondary(refname),
- term::format::secondary(oid),
- )
- };
-
- match stored.backend.refname_to_id(refname.as_str()) {
- Ok(new) if oid != new => {
- stored
- .backend
- .reference(refname.as_str(), oid.into(), true, LOG_MESSAGE)?;
- print_update();
- }
- Err(e) if e.code() == git::raw::ErrorCode::NotFound => {
- stored.backend.reference(
- refname.as_str(),
- oid.into(),
- true,
- "set-canonical-reference from git-push (radicle)",
- )?;
- print_update();
- }
- _ => {}
- }
+ eprintln!(
+ "{} Canonical reference {} updated to target {kind} {}",
+ term::PREFIX_SUCCESS,
+ term::format::secondary(refname),
+ term::format::secondary(oid),
+ );
}
if !opts.no_sync {
diff --git a/crates/radicle-remote-helper/src/push/canonical.rs b/crates/radicle-remote-helper/src/push/canonical.rs
index c58f540dd..206f8ad77 100644
--- a/crates/radicle-remote-helper/src/push/canonical.rs
+++ b/crates/radicle-remote-helper/src/push/canonical.rs
@@ -1,56 +1,3 @@
-use radicle::git;
-use radicle::git::canonical;
-use radicle::git::canonical::QuorumWithConvergence;
-use radicle::git::canonical::error::QuorumError;
-use radicle::git::repository;
-use radicle::git::repository::object;
-use radicle::git::repository::reference;
-use radicle::prelude::Did;
-
-/// Validates a vote to update a canonical reference during push.
-pub(crate) struct Canonical<'a, 'b, 'r, R> {
- canonical: canonical::CanonicalWithConvergence<'a, 'b, 'r, R>,
-}
-
-impl<'a, 'b, 'r, R> Canonical<'a, 'b, 'r, R>
-where
- R: repository::Ancestry + reference::Reader + object::Reader,
-{
- pub(super) fn new(
- me: Did,
- object: canonical::Object,
- canonical: canonical::Canonical<'a, 'b, 'r, R, canonical::Initial>,
- ) -> Result<Self, canonical::error::FindObjectsError> {
- let canonical = canonical.find_objects()?;
- Ok(Self {
- canonical: canonical.with_convergence(me, object),
- })
- }
-
- /// Calculates the quorum of the [`git::canonical::Canonical`] provided.
- ///
- /// In some cases, it ensures that the head commit is attempting to converge
- /// with the set of commits of the other [`Did`]s.
- ///
- /// If a quorum is found, then it is also ensured that the new head commit
- /// is a descendant of the current canonical commit; otherwise, the commits
- /// are considered diverging.
- ///
- /// # Errors
- ///
- /// Ensures that the commits of the other [`Did`]s are in the working
- /// copy, and that checks that any two commits are related in the graph.
- ///
- /// Ensures that the new head and the canonical commit do not diverge.
- pub(super) fn quorum(
- self,
- ) -> Result<(git::fmt::Qualified<'a>, canonical::Object), QuorumError> {
- self.canonical
- .quorum()
- .map(|QuorumWithConvergence { quorum, .. }| (quorum.refname, quorum.object))
- }
-}
-
pub(crate) mod io {
use radicle::git::canonical::error::QuorumError;
commit 03bf538ea7cdbebdb0ae08ffdcef46ea27aa5cc7
Author: Adrian Duke <adrian.duke@gmail.com>
Date: Thu Jun 4 12:55:04 2026 +0100
radicle: Introduce `git::repository::canonical::Namespace` facade
Introduces `Namespace` as a domain-specific facade to encapsulate the evaluation and updating
of canonical references.
diff --git a/crates/radicle/src/git/repository.rs b/crates/radicle/src/git/repository.rs
index 993172078..f9749d17d 100644
--- a/crates/radicle/src/git/repository.rs
+++ b/crates/radicle/src/git/repository.rs
@@ -12,6 +12,7 @@
//! [`reference`]: self::reference
pub mod ancestry;
+pub mod canonical;
pub mod object;
pub mod reference;
pub mod revwalk;
diff --git a/crates/radicle/src/git/repository/canonical.rs b/crates/radicle/src/git/repository/canonical.rs
new file mode 100644
index 000000000..6034aea17
--- /dev/null
+++ b/crates/radicle/src/git/repository/canonical.rs
@@ -0,0 +1,174 @@
+//! Canonical Git reference access.
+//!
+//! [`Service`] provides operations to evaluate and update canonical references
+//! within a Git repository. It acts as a facade over the underlying repository,
+//! enforcing the rules defined in the identity document, ensuring that updates
+//! only succeed if they meet the required quorum and convergence criteria.
+
+#[cfg(test)]
+mod test;
+
+pub mod error;
+
+use crate::git::Oid;
+use crate::git::canonical::{Object, Rules};
+use crate::git::fmt::Qualified;
+use crate::git::repository::{Ancestry, object, reference};
+use crate::prelude::Did;
+
+/// A service for managing and evaluating canonical references.
+///
+/// This acts as a domain-specific facade over a Git repository. It enforces
+/// the rules defined in an identity document (represented by [`Rules`]),
+/// ensuring that updates to shared references (like `refs/heads/main`) only
+/// succeed if they meet the required delegate quorum and convergence criteria.
+pub struct Namespace<'a, R> {
+ repo: &'a R,
+ rules: Rules,
+}
+
+impl<'a, R> Namespace<'a, R> {
+ /// Construct a new canonical namespace using the provided rules.
+ pub fn new(repo: &'a R, rules: Rules) -> Self {
+ Self { repo, rules }
+ }
+
+ /// The rules governing this canonical namespace.
+ pub fn rules(&self) -> &Rules {
+ &self.rules
+ }
+
+ /// Returns `true` if the reference is governed by canonical rules.
+ pub fn is_canonical(&self, name: &Qualified) -> bool {
+ self.rules.matches(name).next().is_some()
+ }
+}
+
+impl<'a, R> Namespace<'a, R>
+where
+ R: reference::Reader,
+{
+ /// Resolve a reference to its target [`Oid`].
+ ///
+ /// Returns `None` if the reference does not exist for this user.
+ ///
+ /// # Errors
+ ///
+ /// - [`Backend`]: An unexpected error from the underlying git library.
+ ///
+ /// [`Backend`]: reference::error::read::RefTarget::Backend
+ pub fn ref_target(
+ &self,
+ name: &Qualified,
+ ) -> Result<Option<Oid>, reference::error::read::RefTarget> {
+ if self.is_canonical(name) {
+ self.repo.ref_target(&name)
+ } else {
+ // TODO: Consider whether throwing an error here. Other option would
+ // be always try and resolve, or return `None`.
+ todo!()
+ }
+ }
+}
+
+impl<'a, R> Namespace<'a, R>
+where
+ R: reference::Writer + reference::Reader + object::Reader + Ancestry,
+{
+ /// Propose an update to a canonical reference.
+ ///
+ /// This is typically used during a `git push` operation. It evaluates whether
+ /// the `target` object proposed by the `proposer` converges with the current
+ /// state of other delegates (e.g. ensuring there are no diverging commits).
+ ///
+ /// If the convergence check passes and the delegate quorum is met, the
+ /// canonical reference is updated in the underlying repository.
+ ///
+ /// # Errors
+ ///
+ /// Returns an [`error::Update`] if:
+ /// - The target object cannot be found or is of an invalid kind.
+ /// - The proposed update diverges from other delegates ([`QuorumError::Convergence`]).
+ /// - The quorum threshold is not met ([`QuorumError::NoCandidates`]).
+ /// - Writing to the underlying repository fails.
+ ///
+ /// [`QuorumError::Convergence`]: crate::git::canonical::error::QuorumError::Convergence
+ /// [`QuorumError::NoCandidates`]: crate::git::canonical::error::QuorumError::NoCandidates
+ pub fn propose(
+ &self,
+ name: &Qualified,
+ target: Oid,
+ proposer: Did,
+ reflog: &str,
+ ) -> Result<Option<Object>, error::Update> {
+ let Some(canonical_eval) = self.rules.canonical(name.clone(), self.repo) else {
+ return Ok(None);
+ };
+
+ let kind = self
+ .repo
+ .object_kind(target)?
+ .ok_or(error::Update::ObjectNotFound(target))?;
+ let obj =
+ Object::from_kind(target, kind).ok_or(error::Update::InvalidObjectKind(target))?;
+
+ let quorum = canonical_eval
+ .find_objects()?
+ .with_convergence(proposer, obj)
+ .quorum()?
+ .quorum;
+
+ self.write_if_changed(name, quorum.object, reflog)
+ }
+
+ /// Re-evaluate the quorum of a canonical reference.
+ ///
+ /// This is typically used during a `radicle-fetch` operation. It tallies the
+ /// current references of all delegates to determine the network's consensus.
+ ///
+ /// If a quorum is reached and the resulting target differs from the current
+ /// canonical reference, the reference is updated in the underlying repository.
+ ///
+ /// # Errors
+ ///
+ /// Returns an [`error::Update`] if:
+ /// - The delegates have diverged and no consensus can be reached.
+ /// - The quorum threshold is not met.
+ /// - Writing to the underlying repository fails.
+ pub fn reevaluate(
+ &self,
+ name: &Qualified,
+ reflog: &str,
+ ) -> Result<Option<Object>, error::Update> {
+ let Some(canonical_eval) = self.rules.canonical(name.clone(), self.repo) else {
+ return Ok(None);
+ };
+
+ let quorum = canonical_eval.find_objects()?.quorum()?;
+
+ self.write_if_changed(name, quorum.object, reflog)
+ }
+
+ /// Helper to only write to the repository if the OID actually changed.
+ fn write_if_changed(
+ &self,
+ name: &Qualified,
+ new_target: Object,
+ reflog: &str,
+ ) -> Result<Option<Object>, error::Update> {
+ let current_target = self.repo.ref_target(name)?;
+
+ if current_target != Some(new_target.id()) {
+ self.repo.write_ref(
+ name,
+ reference::Target::Upsert {
+ target: new_target.id(),
+ },
+ reflog,
+ )?;
+ Ok(Some(new_target))
+ } else {
+ Ok(None)
+ }
+ }
+}
diff --git a/crates/radicle/src/git/repository/canonical/error.rs b/crates/radicle/src/git/repository/canonical/error.rs
new file mode 100644
index 000000000..2e776bd28
--- /dev/null
+++ b/crates/radicle/src/git/repository/canonical/error.rs
@@ -0,0 +1,26 @@
+use crate::git::Oid;
+use crate::git::canonical::error::{FindObjectsError, QuorumError};
+use crate::git::repository::{object, reference};
+
+/// Error returned by [`Service::propose`] and [`Service::reevaluate`].
+///
+/// [`Service::propose`]: super::Service::propose
+/// [`Service::reevaluate`]: super::Service::reevaluate
+#[derive(Debug, thiserror::Error)]
+#[non_exhaustive]
+pub enum Update {
+ #[error(transparent)]
+ Quorum(#[from] QuorumError),
+ #[error(transparent)]
+ FindObjects(#[from] FindObjectsError),
+ #[error(transparent)]
+ Write(#[from] reference::error::write::WriteRef),
+ #[error(transparent)]
+ Read(#[from] reference::error::read::RefTarget),
+ #[error(transparent)]
+ ObjectKind(#[from] object::error::read::ObjectKind),
+ #[error("object {0} not found")]
+ ObjectNotFound(Oid),
+ #[error("invalid object kind for {0}")]
+ InvalidObjectKind(Oid),
+}
diff --git a/crates/radicle/src/git/repository/canonical/test.rs b/crates/radicle/src/git/repository/canonical/test.rs
new file mode 100644
index 000000000..b67829869
--- /dev/null
+++ b/crates/radicle/src/git/repository/canonical/test.rs
@@ -0,0 +1,115 @@
+use super::*;
+use crate::git::canonical::rules::{Allowed, Rule, Rules};
+use crate::git::fmt::{qualified, qualified_pattern};
+use crate::git::raw::fixture;
+use crate::git::repository::reference::Reader;
+use crate::identity::doc::Delegates;
+use crate::prelude::Did;
+
+fn did(n: u8) -> Did {
+ Did::from(crate::crypto::PublicKey::from([n; 32]))
+}
+
+fn setup_rules(dids: Vec<Did>, threshold: usize) -> Rules {
+ let rule = Rule::new(Allowed::Delegates, threshold);
+ Rules::from_raw([(qualified_pattern!("refs/heads/main"), rule)], &mut || {
+ Delegates::new(nonempty::NonEmpty::from_vec(dids.clone()).unwrap()).unwrap()
+ })
+ .unwrap()
+}
+
+#[test]
+fn test_is_canonical() {
+ let repo = fixture::Repository::new();
+ let rules = setup_rules(vec![did(1)], 1);
+ let ns = Namespace::new(repo.raw(), rules);
+
+ assert!(ns.is_canonical(&qualified!("refs/heads/main")));
+ assert!(!ns.is_canonical(&qualified!("refs/heads/feature")));
+}
+
+#[test]
+fn test_reevaluate_calculates_quorum() {
+ let mut repo = fixture::Repository::new();
+ let c1 = repo.commit(&[], &[("f", b"x")]);
+ let d1 = did(1);
+ let d2 = did(2);
+
+ repo.namespaced_ref(d1, "refs/heads/main", c1);
+ repo.namespaced_ref(d2, "refs/heads/main", c1);
+
+ let rules = setup_rules(vec![d1, d2], 2);
+
+ let ns = Namespace::new(repo.raw(), rules);
+
+ let updated = ns
+ .reevaluate(&qualified!("refs/heads/main"), "test")
+ .unwrap();
+ assert_eq!(updated, Some(Object::Commit { id: c1 }));
+
+ let target = repo
+ .raw()
+ .ref_target(&qualified!("refs/heads/main"))
+ .unwrap()
+ .unwrap();
+ assert_eq!(target, c1);
+}
+
+#[test]
+fn test_propose_evaluates_convergence_ignores_diverging() {
+ let mut repo = fixture::Repository::new();
+ let c0 = repo.commit(&[], &[("f", b"0")]);
+ let c1 = repo.commit(&[c0], &[("f", b"1")]);
+ let c2 = repo.commit(&[c0], &[("f", b"2")]);
+ let d1 = did(1);
+ let d2 = did(2);
+
+ repo.namespaced_ref(d1, "refs/heads/main", c1);
+
+ let rules = setup_rules(vec![d1, d2], 1);
+
+ let ns = Namespace::new(repo.raw(), rules);
+
+ // d2 proposes c2, which diverges from c1.
+ // Because it diverges, it won't be added to the quorum calculation.
+ // The quorum remains c1.
+ let updated = ns
+ .propose(&qualified!("refs/heads/main"), c2, d2, "test")
+ .unwrap();
+
+ // It should write c1 (the quorum)
+ assert_eq!(updated, Some(Object::Commit { id: c1 }));
+
+ let target = repo
+ .raw()
+ .ref_target(&qualified!("refs/heads/main"))
+ .unwrap()
+ .unwrap();
+ assert_eq!(target, c1);
+}
+
+#[test]
+fn test_propose_evaluates_convergence_mismatch() {
+ let mut repo = fixture::Repository::new();
+ let c1 = repo.commit(&[], &[("f", b"1")]);
+ let t1 = repo.tag("v1", c1, false);
+ let d1 = did(1);
+ let d2 = did(2);
+
+ repo.namespaced_ref(d1, "refs/heads/main", c1);
+
+ let rules = setup_rules(vec![d1, d2], 1);
+
+ let ns = Namespace::new(repo.raw(), rules);
+
+ let err = ns
+ .propose(&qualified!("refs/heads/main"), t1, d2, "test")
+ .unwrap_err();
+
+ assert!(matches!(
+ err,
+ error::Update::Quorum(crate::git::canonical::error::QuorumError::Convergence(
+ crate::git::canonical::error::ConvergesError::MismatchedObject(_)
+ ))
+ ));
+}
commit c3cc29b1c46980c4d5c775aa6e362029c2453e38
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Thu Apr 30 14:25:50 2026 +0000
git/repository/user: user::Namespace and user::Namespaces integration tests
Integration tests for user-scoped reference access and namespace
discovery.
diff --git a/crates/radicle/src/git/repository/user.rs b/crates/radicle/src/git/repository/user.rs
index b2d61d08a..674bff0ad 100644
--- a/crates/radicle/src/git/repository/user.rs
+++ b/crates/radicle/src/git/repository/user.rs
@@ -9,6 +9,9 @@
pub mod error;
+#[cfg(test)]
+mod test;
+
use std::collections::BTreeMap;
use crypto::PublicKey;
diff --git a/crates/radicle/src/git/repository/user/test.rs b/crates/radicle/src/git/repository/user/test.rs
new file mode 100644
index 000000000..97875f679
--- /dev/null
+++ b/crates/radicle/src/git/repository/user/test.rs
@@ -0,0 +1,2 @@
+mod namespace;
+mod namespaces;
diff --git a/crates/radicle/src/git/repository/user/test/namespace.rs b/crates/radicle/src/git/repository/user/test/namespace.rs
new file mode 100644
index 000000000..593b9890e
--- /dev/null
+++ b/crates/radicle/src/git/repository/user/test/namespace.rs
@@ -0,0 +1,151 @@
+use radicle_git_ref_format::{pattern, qualified};
+
+use crate::git::raw::fixture;
+use crate::git::repository::reference;
+use crate::prelude::Did;
+
+use super::super::Namespace;
+
+fn did(n: u8) -> Did {
+ Did::from(crypto::PublicKey::from([n; 32]))
+}
+
+#[test]
+fn ref_target_found() {
+ let mut repo = fixture::Repository::new();
+ let did_a = did(1);
+ let commit = repo.commit(&[], &[("f", b"x")]);
+ repo.namespaced_ref(did_a, "refs/heads/main", commit);
+
+ let ns = Namespace::new(did_a, repo.raw());
+ assert_eq!(
+ ns.ref_target(&qualified!("refs/heads/main")).unwrap(),
+ Some(commit)
+ );
+}
+
+#[test]
+fn ref_target_not_found() {
+ let repo = fixture::Repository::new();
+ let ns = Namespace::new(did(1), repo.raw());
+ assert!(
+ ns.ref_target(&qualified!("refs/heads/nope"))
+ .unwrap()
+ .is_none()
+ );
+}
+
+#[test]
+fn users_isolated() {
+ let mut repo = fixture::Repository::new();
+ let did_a = did(1);
+ let did_b = did(2);
+ let ca = repo.commit(&[], &[("f", b"a")]);
+ let cb = repo.commit(&[], &[("f", b"b")]);
+ repo.namespaced_ref(did_a, "refs/heads/main", ca);
+ repo.namespaced_ref(did_a, "refs/heads/feature", ca);
+ repo.namespaced_ref(did_b, "refs/heads/main", cb);
+
+ let ns_a = Namespace::new(did_a, repo.raw());
+ let ns_b = Namespace::new(did_b, repo.raw());
+
+ assert_eq!(
+ ns_a.ref_target(&qualified!("refs/heads/main")).unwrap(),
+ Some(ca)
+ );
+ assert_eq!(
+ ns_a.ref_target(&qualified!("refs/heads/feature")).unwrap(),
+ Some(ca)
+ );
+ assert_eq!(
+ ns_b.ref_target(&qualified!("refs/heads/main")).unwrap(),
+ Some(cb)
+ );
+ assert!(
+ ns_b.ref_target(&qualified!("refs/heads/feature"))
+ .unwrap()
+ .is_none()
+ );
+}
+
+#[test]
+fn references_all() {
+ let mut repo = fixture::Repository::new();
+ let did_a = did(1);
+ let c = repo.commit(&[], &[("f", b"x")]);
+ repo.namespaced_ref(did_a, "refs/heads/main", c);
+ repo.namespaced_ref(did_a, "refs/heads/feature", c);
+ repo.namespaced_ref(did_a, "refs/rad/sigrefs", c);
+
+ let ns = Namespace::new(did_a, repo.raw());
+ let refs = ns.references(&pattern!("refs/*")).unwrap();
+ let names: Vec<_> = refs.into_iter().map(|(q, _)| q.to_string()).collect();
+ assert_eq!(names.len(), 3);
+ assert!(names.contains(&"refs/heads/feature".to_string()));
+ assert!(names.contains(&"refs/heads/main".to_string()));
+ assert!(names.contains(&"refs/rad/sigrefs".to_string()));
+}
+
+#[test]
+fn references_filtered() {
+ let mut repo = fixture::Repository::new();
+ let did_a = did(1);
+ let c = repo.commit(&[], &[("f", b"x")]);
+ repo.namespaced_ref(did_a, "refs/heads/main", c);
+ repo.namespaced_ref(did_a, "refs/heads/feature", c);
+ repo.namespaced_ref(did_a, "refs/rad/sigrefs", c);
+
+ let ns = Namespace::new(did_a, repo.raw());
+ let refs = ns.references(&pattern!("refs/heads/*")).unwrap();
+ assert_eq!(refs.into_iter().count(), 2);
+}
+
+#[test]
+fn write_and_read() {
+ let mut repo = fixture::Repository::new();
+ let did_a = did(1);
+ let did_b = did(2);
+ let c = repo.commit(&[], &[("f", b"x")]);
+ repo.namespaced_ref(did_b, "refs/heads/main", c);
+
+ let ns = Namespace::new(did_a, repo.raw());
+ ns.write_ref(
+ &qualified!("refs/heads/new"),
+ reference::Target::create(c),
+ "test",
+ )
+ .unwrap();
+
+ assert_eq!(
+ ns.ref_target(&qualified!("refs/heads/new")).unwrap(),
+ Some(c)
+ );
+ let ns_b = Namespace::new(did_b, repo.raw());
+ assert!(
+ ns_b.ref_target(&qualified!("refs/heads/new"))
+ .unwrap()
+ .is_none()
+ );
+}
+
+#[test]
+fn delete() {
+ let mut repo = fixture::Repository::new();
+ let did_a = did(1);
+ let c = repo.commit(&[], &[("f", b"x")]);
+ repo.namespaced_ref(did_a, "refs/heads/main", c);
+ repo.namespaced_ref(did_a, "refs/heads/feature", c);
+
+ let ns = Namespace::new(did_a, repo.raw());
+ ns.delete_ref(&qualified!("refs/heads/feature")).unwrap();
+ assert!(
+ ns.ref_target(&qualified!("refs/heads/feature"))
+ .unwrap()
+ .is_none()
+ );
+ assert!(
+ ns.ref_target(&qualified!("refs/heads/main"))
+ .unwrap()
+ .is_some()
+ );
+}
diff --git a/crates/radicle/src/git/repository/user/test/namespaces.rs b/crates/radicle/src/git/repository/user/test/namespaces.rs
new file mode 100644
index 000000000..81d11becc
--- /dev/null
+++ b/crates/radicle/src/git/repository/user/test/namespaces.rs
@@ -0,0 +1,114 @@
+use radicle_git_ref_format::refname;
+
+use crate::git::raw::fixture;
+use crate::git::repository::user;
+use crate::git::repository::user::FilterBy;
+use crate::prelude::Did;
+
+use super::super::Namespaces;
+
+fn did(n: u8) -> Did {
+ Did::from(crypto::PublicKey::from([n; 32]))
+}
+
+#[test]
+fn dids_with_sigrefs_filter() {
+ let mut repo = fixture::Repository::new();
+ let did_a = did(1);
+ let did_b = did(2);
+ let c = repo.commit(&[], &[("f", b"x")]);
+ repo.namespaced_ref(did_a, "refs/heads/main", c);
+ repo.namespaced_ref(did_a, "refs/rad/sigrefs", c);
+ repo.namespaced_ref(did_b, "refs/heads/main", c);
+
+ let dids: Vec<Did> = Namespaces::new(repo.raw())
+ .dids(FilterBy::suffix(&refname!("rad/sigrefs")))
+ .unwrap()
+ .collect();
+ assert_eq!(dids, vec![did_a]);
+}
+
+#[test]
+fn dids_unfiltered() {
+ let mut repo = fixture::Repository::new();
+ let did_a = did(1);
+ let did_b = did(2);
+ let c = repo.commit(&[], &[("f", b"x")]);
+ repo.namespaced_ref(did_a, "refs/heads/main", c);
+ repo.namespaced_ref(did_b, "refs/heads/main", c);
+
+ let dids: Vec<Did> = Namespaces::new(repo.raw())
+ .dids(user::FilterBy::Empty)
+ .unwrap()
+ .collect();
+ assert_eq!(dids.len(), 2);
+ assert!(dids.contains(&did_a));
+ assert!(dids.contains(&did_b));
+}
+
+#[test]
+fn dids_empty_repo() {
+ let repo = fixture::Repository::new();
+ let dids: Vec<Did> = Namespaces::new(repo.raw())
+ .dids(user::FilterBy::Empty)
+ .unwrap()
+ .collect();
+ assert!(dids.is_empty());
+}
+
+#[test]
+fn dids_with_errors_ok() {
+ let mut repo = fixture::Repository::new();
+ let did_a = did(1);
+ let c = repo.commit(&[], &[("f", b"x")]);
+ repo.namespaced_ref(did_a, "refs/rad/sigrefs", c);
+
+ let results: Vec<Result<Did, _>> = Namespaces::new(repo.raw())
+ .dids_with_errors(FilterBy::suffix(&refname!("rad/sigrefs")))
+ .unwrap()
+ .collect();
+ assert_eq!(results.len(), 1);
+ assert_eq!(results[0].as_ref().unwrap(), &did_a);
+}
+
+#[test]
+fn dids_skips_invalid_namespace() {
+ let mut repo = fixture::Repository::new();
+ let valid = did(1);
+ let c = repo.commit(&[], &[("f", b"x")]);
+ repo.namespaced_ref(valid, "refs/heads/main", c);
+ repo.reference("refs/namespaces/not-a-key/refs/heads/main", c);
+
+ let dids: Vec<Did> = Namespaces::new(repo.raw())
+ .dids(user::FilterBy::Empty)
+ .unwrap()
+ .collect();
+ assert_eq!(dids, vec![valid]);
+}
+
+#[test]
+fn dids_with_errors_surfaces_invalid_namespace() {
+ let mut repo = fixture::Repository::new();
+ let valid = did(1);
+ let c = repo.commit(&[], &[("f", b"x")]);
+ repo.namespaced_ref(valid, "refs/heads/main", c);
+ repo.reference("refs/namespaces/not-a-key/refs/heads/main", c);
+
+ let results: Vec<Result<Did, _>> = Namespaces::new(repo.raw())
+ .dids_with_errors(user::FilterBy::Empty)
+ .unwrap()
+ .collect();
+ assert_eq!(results.len(), 2);
+
+ let mut oks = Vec::new();
+ let mut errs = Vec::new();
+ for r in results {
+ match r {
+ Ok(d) => oks.push(d),
+ Err(e) => errs.push(e),
+ }
+ }
+ assert_eq!(oks, vec![valid]);
+ assert_eq!(errs.len(), 1);
+ assert!(matches!(errs[0], user::NamespaceError::Did(_)));
+}
commit 8c263ba6a32c732a304af92ad7059d5629845ec0
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Thu Apr 30 14:19:19 2026 +0000
git/repository: git2 adapter integration tests
Integration tests for the git2 adapater of the `git::repository`
family of traits.
diff --git a/crates/radicle/src/git/repository/adapter/git2.rs b/crates/radicle/src/git/repository/adapter/git2.rs
index 56c8a078b..d80985440 100644
--- a/crates/radicle/src/git/repository/adapter/git2.rs
+++ b/crates/radicle/src/git/repository/adapter/git2.rs
@@ -12,6 +12,9 @@ mod object;
mod reference;
mod revwalk;
+#[cfg(test)]
+mod test;
+
/// Helper trait to enable method chaining to return `None` when the error
/// matches [`ErrorCode::NotFound`].
///
diff --git a/crates/radicle/src/git/repository/adapter/git2/test.rs b/crates/radicle/src/git/repository/adapter/git2/test.rs
new file mode 100644
index 000000000..11ecfaa1f
--- /dev/null
+++ b/crates/radicle/src/git/repository/adapter/git2/test.rs
@@ -0,0 +1,9 @@
+// TODO(finto): The tests within these submodules could be generic and form
+// contracts for any adapter of the Git interfaces. For now, since we only
+// define them for `crate::git::raw`, we will leave them as-is.
+
+mod ancestry;
+mod object;
+mod reference;
+mod revwalk;
+mod symbolic;
diff --git a/crates/radicle/src/git/repository/adapter/git2/test/ancestry.rs b/crates/radicle/src/git/repository/adapter/git2/test/ancestry.rs
new file mode 100644
index 000000000..25c35686a
--- /dev/null
+++ b/crates/radicle/src/git/repository/adapter/git2/test/ancestry.rs
@@ -0,0 +1,166 @@
+use radicle_oid::Oid;
+
+use crate::git::raw::fixture;
+use crate::git::repository::Ancestry;
+use crate::git::repository::ancestry::error;
+
+#[test]
+fn merge_base_parent_child() {
+ let repo = fixture::Repository::new();
+ let parent = repo.commit(&[], &[("f", b"v1")]);
+ let child = repo.commit(&[parent], &[("f", b"v2")]);
+ let base = Ancestry::merge_base(repo.raw(), parent, child).unwrap();
+ assert_eq!(base, Some(parent));
+}
+
+#[test]
+fn merge_base_identity() {
+ let repo = fixture::Repository::new();
+ let c = repo.commit(&[], &[("f", b"v1")]);
+ assert_eq!(Ancestry::merge_base(repo.raw(), c, c).unwrap(), Some(c));
+}
+
+#[test]
+fn merge_base_diverged() {
+ let repo = fixture::Repository::new();
+ let root = repo.commit(&[], &[("f", b"v1")]);
+ let left = repo.commit(&[root], &[("f", b"v2")]);
+ let right = repo.commit(&[root], &[("f", b"v3")]);
+ assert_eq!(
+ Ancestry::merge_base(repo.raw(), left, right).unwrap(),
+ Some(root)
+ );
+}
+
+#[test]
+fn merge_base_diamond() {
+ let repo = fixture::Repository::new();
+ let root = repo.commit(&[], &[("f", b"v1")]);
+ let left = repo.commit(&[root], &[("f", b"v2")]);
+ let right = repo.commit(&[root], &[("f", b"v3")]);
+ let merge = repo.commit(&[left, right], &[("f", b"v2")]);
+
+ assert_eq!(
+ Ancestry::merge_base(repo.raw(), merge, right).unwrap(),
+ Some(right),
+ );
+ assert_eq!(
+ Ancestry::merge_base(repo.raw(), merge, left).unwrap(),
+ Some(left)
+ );
+ assert_eq!(
+ Ancestry::merge_base(repo.raw(), merge, root).unwrap(),
+ Some(root),
+ );
+ assert_eq!(
+ Ancestry::merge_base(repo.raw(), left, right).unwrap(),
+ Some(root)
+ );
+}
+
+#[test]
+fn is_ancestor_true() {
+ let repo = fixture::Repository::new();
+ let parent = repo.commit(&[], &[("f", b"v1")]);
+ let child = repo.commit(&[parent], &[("f", b"v2")]);
+ assert!(Ancestry::is_ancestor(repo.raw(), parent, child).unwrap());
+}
+
+#[test]
+fn is_ancestor_false() {
+ let repo = fixture::Repository::new();
+ let parent = repo.commit(&[], &[("f", b"v1")]);
+ let child = repo.commit(&[parent], &[("f", b"v2")]);
+ assert!(!Ancestry::is_ancestor(repo.raw(), child, parent).unwrap());
+}
+
+#[test]
+fn merge_base_is_ancestor() {
+ let repo = fixture::Repository::new();
+ let grandparent = repo.commit(&[], &[("f", b"v1")]);
+ let parent = repo.commit(&[grandparent], &[("f", b"v2")]);
+ let child = repo.commit(&[parent], &[("f", b"v3")]);
+ assert!(
+ Ancestry::is_ancestor(
+ repo.raw(),
+ Ancestry::merge_base(repo.raw(), grandparent, child)
+ .unwrap()
+ .unwrap(),
+ child
+ )
+ .unwrap()
+ );
+ assert!(
+ Ancestry::is_ancestor(
+ repo.raw(),
+ Ancestry::merge_base(repo.raw(), grandparent, parent)
+ .unwrap()
+ .unwrap(),
+ parent
+ )
+ .unwrap()
+ )
+}
+
+#[test]
+fn ahead_behind_child_parent() {
+ let repo = fixture::Repository::new();
+ let parent = repo.commit(&[], &[("f", b"v1")]);
+ let child = repo.commit(&[parent], &[("f", b"v2")]);
+ let ab = Ancestry::ahead_behind(repo.raw(), child, parent).unwrap();
+ assert_eq!(ab.ahead, 1);
+ assert_eq!(ab.behind, 0);
+ assert!(ab.is_linear());
+ let ab = Ancestry::ahead_behind(repo.raw(), parent, child).unwrap();
+ assert_eq!(ab.ahead, 0);
+ assert_eq!(ab.behind, 1);
+ assert!(ab.is_linear());
+}
+
+#[test]
+fn ahead_behind_diverged() {
+ let repo = fixture::Repository::new();
+ let root = repo.commit(&[], &[("f", b"v1")]);
+ let left = repo.commit(&[root], &[("f", b"v2")]);
+ let right = repo.commit(&[root], &[("f", b"v3")]);
+ let ab = Ancestry::ahead_behind(repo.raw(), left, right).unwrap();
+ assert_eq!(ab.ahead, 1);
+ assert_eq!(ab.behind, 1);
+ assert!(!ab.is_linear());
+}
+
+#[test]
+fn merge_base_missing_commit() {
+ let repo = fixture::Repository::new();
+ let c = repo.commit(&[], &[("f", b"v1")]);
+ let missing = Oid::from_sha1([0xff; 20]);
+ let err = Ancestry::merge_base(repo.raw(), c, missing).unwrap_err();
+ assert!(matches!(err, error::MergeBase::CommitNotFound { oid } if oid == missing));
+}
+
+#[test]
+fn is_ancestor_missing_ancestor() {
+ let repo = fixture::Repository::new();
+ let c = repo.commit(&[], &[("f", b"v1")]);
+ let missing = Oid::from_sha1([0xff; 20]);
+ let err = Ancestry::is_ancestor(repo.raw(), missing, c).unwrap_err();
+ assert!(matches!(err, error::IsAncestor::CommitNotFound { oid } if oid == missing));
+}
+
+#[test]
+fn is_ancestor_missing_head() {
+ let repo = fixture::Repository::new();
+ let c = repo.commit(&[], &[("f", b"v1")]);
+ let missing = Oid::from_sha1([0xff; 20]);
+ let err = Ancestry::is_ancestor(repo.raw(), c, missing).unwrap_err();
+ assert!(matches!(err, error::IsAncestor::CommitNotFound { oid } if oid == missing));
+}
+
+#[test]
+fn ahead_behind_missing_commit() {
+ let repo = fixture::Repository::new();
+ let c = repo.commit(&[], &[("f", b"v1")]);
+ let missing = Oid::from_sha1([0xff; 20]);
+ let err = Ancestry::ahead_behind(repo.raw(), c, missing).unwrap_err();
+ assert!(matches!(err, error::AheadBehind::CommitNotFound { oid } if oid == missing));
+}
diff --git a/crates/radicle/src/git/repository/adapter/git2/test/object.rs b/crates/radicle/src/git/repository/adapter/git2/test/object.rs
new file mode 100644
index 000000000..3588def71
--- /dev/null
+++ b/crates/radicle/src/git/repository/adapter/git2/test/object.rs
@@ -0,0 +1,224 @@
+use std::path::Path;
+
+use radicle_git_metadata::author::{Author, Time};
+use radicle_git_metadata::commit::CommitData;
+use radicle_git_metadata::commit::headers::Headers;
+use radicle_git_metadata::commit::trailers::OwnedTrailer;
+use radicle_oid::Oid;
+
+use crate::git::raw::fixture;
+use crate::git::repository;
+use crate::git::repository::object;
+use crate::git::repository::types::TreeEntry;
+
+#[test]
+fn blob_found() {
+ let repo = fixture::Repository::new();
+ let blob_oid = repo.blob(b"hello");
+ let blob = object::Reader::blob(repo.raw(), blob_oid).unwrap().unwrap();
+ assert_eq!(blob.oid, blob_oid);
+ assert_eq!(blob.content, b"hello");
+}
+
+#[test]
+fn blob_not_found() {
+ let repo = fixture::Repository::new();
+ let missing = Oid::from_sha1([0xff; 20]);
+ assert!(object::Reader::blob(repo.raw(), missing).unwrap().is_none());
+}
+
+#[test]
+fn try_blob_not_found() {
+ let repo = fixture::Repository::new();
+ let missing = Oid::from_sha1([0xff; 20]);
+ let err = object::Reader::try_blob(repo.raw(), missing).unwrap_err();
+ assert!(matches!(err, object::error::read::Blob::NotFound { .. }));
+}
+
+#[test]
+fn blob_at() {
+ let repo = fixture::Repository::new();
+ let commit = repo.commit(&[], &[("hello.txt", b"content")]);
+ let blob = object::Reader::blob_at(repo.raw(), commit, &Path::new("hello.txt")).unwrap();
+ assert_eq!(blob.unwrap().content, b"content");
+}
+
+#[test]
+fn blob_at_nested() {
+ let repo = fixture::Repository::new();
+ let commit = repo.commit(&[], &[("sub/nested.txt", b"deep")]);
+ let blob = object::Reader::blob_at(repo.raw(), commit, &Path::new("sub/nested.txt")).unwrap();
+ assert_eq!(blob.unwrap().content, b"deep");
+}
+
+#[test]
+fn blob_at_missing_path() {
+ let repo = fixture::Repository::new();
+ let commit = repo.commit(&[], &[("file.txt", b"x")]);
+ assert!(
+ object::Reader::blob_at(repo.raw(), commit, &Path::new("nope.txt"))
+ .unwrap()
+ .is_none()
+ );
+}
+
+#[test]
+fn blob_at_missing_commit() {
+ let repo = fixture::Repository::new();
+ let missing = Oid::from_sha1([0xff; 20]);
+ let err = object::Reader::blob_at(repo.raw(), missing, &Path::new("f")).unwrap_err();
+ assert!(matches!(
+ err,
+ object::error::read::BlobAt::CommitNotFound { .. }
+ ));
+}
+
+#[test]
+fn commit() {
+ let repo = fixture::Repository::new();
+ let parent = repo.commit(&[], &[("f", b"v1")]);
+ let child = repo.commit(&[parent], &[("f", b"v2")]);
+ let commit = object::Reader::commit(repo.raw(), child).unwrap().unwrap();
+ assert_eq!(commit.parents().next(), Some(parent));
+}
+
+#[test]
+fn commit_not_found() {
+ let repo = fixture::Repository::new();
+ let missing = Oid::from_sha1([0xff; 20]);
+ assert!(
+ object::Reader::commit(repo.raw(), missing)
+ .unwrap()
+ .is_none()
+ );
+}
+
+#[test]
+fn exists_true() {
+ let repo = fixture::Repository::new();
+ let oid = repo.blob(b"exists");
+ assert!(object::Reader::exists(repo.raw(), oid).unwrap());
+}
+
+#[test]
+fn exists_false() {
+ let repo = fixture::Repository::new();
+ let missing = Oid::from_sha1([0xff; 20]);
+ assert!(!object::Reader::exists(repo.raw(), missing).unwrap());
+}
+
+#[test]
+fn object_kind_blob() {
+ let repo = fixture::Repository::new();
+ let oid = repo.blob(b"kind test");
+ assert_eq!(
+ object::Reader::object_kind(repo.raw(), oid).unwrap(),
+ Some(repository::ObjectKind::Blob)
+ );
+}
+
+#[test]
+fn object_kind_commit() {
+ let repo = fixture::Repository::new();
+ let commit = repo.commit(&[], &[("f", b"x")]);
+ assert_eq!(
+ object::Reader::object_kind(repo.raw(), commit).unwrap(),
+ Some(repository::ObjectKind::Commit)
+ );
+}
+
+#[test]
+fn object_kind_tag() {
+ let repo = fixture::Repository::new();
+ let commit = repo.commit(&[], &[("f", b"x")]);
+ let tag = repo.tag("v1", commit, true);
+ assert_eq!(
+ object::Reader::object_kind(repo.raw(), tag).unwrap(),
+ Some(repository::ObjectKind::Tag)
+ );
+}
+
+#[test]
+fn object_kind_missing() {
+ let repo = fixture::Repository::new();
+ let missing = Oid::from_sha1([0xff; 20]);
+ assert!(
+ object::Reader::object_kind(repo.raw(), missing)
+ .unwrap()
+ .is_none()
+ );
+}
+
+#[test]
+fn write_blob_roundtrip() {
+ let repo = fixture::Repository::new();
+ let oid = object::Writer::write_blob(repo.raw(), b"test content").unwrap();
+ let blob = object::Reader::blob(repo.raw(), oid).unwrap().unwrap();
+ assert_eq!(blob.content, b"test content");
+}
+
+#[test]
+fn write_tree_inline_blob() {
+ let repo = fixture::Repository::new();
+ let entries = vec![TreeEntry::Blob {
+ path: "file.txt".into(),
+ content: b"data".to_vec(),
+ }];
+ let tree_oid = object::Writer::write_tree(repo.raw(), &entries).unwrap();
+ assert!(object::Reader::exists(repo.raw(), tree_oid).unwrap());
+}
+
+#[test]
+fn write_tree_multi_component_path() {
+ let repo = fixture::Repository::new();
+ let entries = vec![TreeEntry::Blob {
+ path: "a/b/c.txt".into(),
+ content: b"deep".to_vec(),
+ }];
+ let tree_oid = object::Writer::write_tree(repo.raw(), &entries).unwrap();
+
+ let author = Author {
+ name: "t".into(),
+ email: "t@t".into(),
+ time: Time::new(0, 0),
+ };
+ let commit = CommitData::new::<_, _, OwnedTrailer>(
+ tree_oid,
+ None::<Oid>,
+ author.clone(),
+ author,
+ Headers::new(),
+ "t\n".to_string(),
+ vec![],
+ );
+ let commit_oid =
+ object::Writer::write_commit(repo.raw(), commit.to_string().as_bytes()).unwrap();
+ let blob = object::Reader::blob_at(repo.raw(), commit_oid, &Path::new("a/b/c.txt")).unwrap();
+ assert_eq!(blob.unwrap().content, b"deep");
+}
+
+#[test]
+fn write_tree_blob_ref() {
+ let repo = fixture::Repository::new();
+ let blob_oid = object::Writer::write_blob(repo.raw(), b"existing").unwrap();
+ let entries = vec![TreeEntry::BlobRef {
+ path: "ref.txt".into(),
+ oid: blob_oid,
+ }];
+ object::Writer::write_tree(repo.raw(), &entries).unwrap();
+}
+
+#[test]
+fn write_tree_blob_ref_missing() {
+ let repo = fixture::Repository::new();
+ let missing = Oid::from_sha1([0xff; 20]);
+ let entries = vec![TreeEntry::BlobRef {
+ path: "bad.txt".into(),
+ oid: missing,
+ }];
+ let err = object::Writer::write_tree(repo.raw(), &entries).unwrap_err();
+ assert!(matches!(
+ err,
+ object::error::write::Tree::MissingBlob { .. }
+ ));
+}
diff --git a/crates/radicle/src/git/repository/adapter/git2/test/reference.rs b/crates/radicle/src/git/repository/adapter/git2/test/reference.rs
new file mode 100644
index 000000000..01fcc4c88
--- /dev/null
+++ b/crates/radicle/src/git/repository/adapter/git2/test/reference.rs
@@ -0,0 +1,203 @@
+use radicle_git_ref_format::{pattern, refname};
+use radicle_oid::Oid;
+
+use crate::git::raw::fixture;
+use crate::git::repository::reference;
+
+#[test]
+fn ref_target_found() {
+ let repo = fixture::Repository::new();
+ let commit = repo.commit(&[], &[("f", b"x")]);
+ repo.reference("refs/heads/main", commit);
+
+ let oid = reference::Reader::ref_target(repo.raw(), &refname!("refs/heads/main")).unwrap();
+ assert_eq!(oid, Some(commit));
+}
+
+#[test]
+fn ref_target_not_found() {
+ let repo = fixture::Repository::new();
+ let oid = reference::Reader::ref_target(repo.raw(), &refname!("refs/heads/nope")).unwrap();
+ assert!(oid.is_none());
+}
+
+#[test]
+fn list_refs() {
+ let repo = fixture::Repository::new();
+ let a = repo.commit(&[], &[("f", b"a")]);
+ let b = repo.commit(&[], &[("f", b"b")]);
+ repo.reference("refs/heads/alpha", a);
+ repo.reference("refs/heads/beta", b);
+ repo.reference("refs/tags/v1", a);
+
+ let refs: Vec<_> = reference::Reader::list_refs(repo.raw(), &pattern!("refs/heads/*"))
+ .unwrap()
+ .collect::<Result<Vec<_>, _>>()
+ .unwrap();
+
+ assert_eq!(refs.len(), 2);
+ let names: Vec<_> = refs.iter().map(|(q, _)| q.as_str()).collect();
+ assert!(names.contains(&"refs/heads/alpha"));
+ assert!(names.contains(&"refs/heads/beta"));
+
+ let refs: Vec<_> = reference::Reader::list_refs(repo.raw(), &pattern!("refs/*"))
+ .unwrap()
+ .collect::<Result<Vec<_>, _>>()
+ .unwrap();
+
+ assert_eq!(refs.len(), 3);
+ let names: Vec<_> = refs.iter().map(|(q, _)| q.as_str()).collect();
+ assert!(names.contains(&"refs/heads/alpha"));
+ assert!(names.contains(&"refs/heads/beta"));
+ assert!(names.contains(&"refs/tags/v1"));
+
+ let refs: Vec<_> = reference::Reader::list_refs(repo.raw(), &pattern!("refs/nope/*"))
+ .unwrap()
+ .collect::<Result<Vec<_>, _>>()
+ .unwrap();
+ assert!(refs.is_empty())
+}
+
+#[test]
+fn list_refs_empty() {
+ let repo = fixture::Repository::new();
+ let refs: Vec<_> = reference::Reader::list_refs(repo.raw(), &pattern!("refs/*"))
+ .unwrap()
+ .collect::<Result<Vec<_>, _>>()
+ .unwrap();
+ assert!(refs.is_empty());
+}
+
+#[test]
+fn write_ref_create() {
+ let repo = fixture::Repository::new();
+ let commit = repo.commit(&[], &[("f", b"x")]);
+ let name = refname!("refs/heads/new");
+
+ reference::Writer::write_ref(repo.raw(), &name, reference::Target::create(commit), "test")
+ .unwrap();
+ assert_eq!(
+ reference::Reader::ref_target(repo.raw(), &name).unwrap(),
+ Some(commit)
+ );
+}
+
+#[test]
+fn write_ref_create_existing() {
+ let repo = fixture::Repository::new();
+ let a = repo.commit(&[], &[("f", b"a")]);
+ let b = repo.commit(&[], &[("f", b"b")]);
+ repo.reference("refs/heads/main", a);
+
+ let err = reference::Writer::write_ref(
+ repo.raw(),
+ &refname!("refs/heads/main"),
+ reference::Target::create(b),
+ "test",
+ )
+ .unwrap_err();
+ assert!(matches!(
+ err,
+ reference::error::write::WriteRef::ReferenceExists { .. }
+ ));
+}
+
+#[test]
+fn write_ref_upsert_new() {
+ let repo = fixture::Repository::new();
+ let commit = repo.commit(&[], &[("f", b"x")]);
+ let name = refname!("refs/heads/upserted");
+
+ reference::Writer::write_ref(
+ repo.raw(),
+ &name,
+ reference::Target::Upsert { target: commit },
+ "test",
+ )
+ .unwrap();
+ assert_eq!(
+ reference::Reader::ref_target(repo.raw(), &name).unwrap(),
+ Some(commit)
+ );
+}
+
+#[test]
+fn write_ref_upsert_existing() {
+ let repo = fixture::Repository::new();
+ let a = repo.commit(&[], &[("f", b"a")]);
+ let b = repo.commit(&[], &[("f", b"b")]);
+ repo.reference("refs/heads/main", a);
+
+ reference::Writer::write_ref(
+ repo.raw(),
+ &refname!("refs/heads/main"),
+ reference::Target::Upsert { target: b },
+ "test",
+ )
+ .unwrap();
+ assert_eq!(
+ reference::Reader::ref_target(repo.raw(), &refname!("refs/heads/main")).unwrap(),
+ Some(b)
+ );
+}
+
+#[test]
+fn write_ref_cas_success() {
+ let repo = fixture::Repository::new();
+ let a = repo.commit(&[], &[("f", b"a")]);
+ let b = repo.commit(&[], &[("f", b"b")]);
+ repo.reference("refs/heads/main", a);
+
+ reference::Writer::write_ref(
+ repo.raw(),
+ &refname!("refs/heads/main"),
+ reference::Target::cas(b, a),
+ "test",
+ )
+ .unwrap();
+ assert_eq!(
+ reference::Reader::ref_target(repo.raw(), &refname!("refs/heads/main")).unwrap(),
+ Some(b)
+ );
+}
+
+#[test]
+fn write_ref_cas_wrong_expected() {
+ let repo = fixture::Repository::new();
+ let a = repo.commit(&[], &[("f", b"a")]);
+ let b = repo.commit(&[], &[("f", b"b")]);
+ repo.reference("refs/heads/main", a);
+
+ let wrong = Oid::from_sha1([0xaa; 20]);
+ let err = reference::Writer::write_ref(
+ repo.raw(),
+ &refname!("refs/heads/main"),
+ reference::Target::cas(b, wrong),
+ "test",
+ )
+ .unwrap_err();
+ assert!(matches!(
+ err,
+ reference::error::write::WriteRef::CasFailed { .. }
+ ));
+}
+
+#[test]
+fn delete_ref_existing() {
+ let repo = fixture::Repository::new();
+ let commit = repo.commit(&[], &[("f", b"x")]);
+ repo.reference("refs/tags/v1.0", commit);
+
+ reference::Writer::delete_ref(repo.raw(), &refname!("refs/tags/v1.0")).unwrap();
+ assert!(
+ reference::Reader::ref_target(repo.raw(), &refname!("refs/tags/v1.0"))
+ .unwrap()
+ .is_none()
+ );
+}
+
+#[test]
+fn delete_ref_idempotent() {
+ let repo = fixture::Repository::new();
+ reference::Writer::delete_ref(repo.raw(), &refname!("refs/heads/nonexistent")).unwrap();
+}
diff --git a/crates/radicle/src/git/repository/adapter/git2/test/revwalk.rs b/crates/radicle/src/git/repository/adapter/git2/test/revwalk.rs
new file mode 100644
index 000000000..2416c440e
--- /dev/null
+++ b/crates/radicle/src/git/repository/adapter/git2/test/revwalk.rs
@@ -0,0 +1,198 @@
+use crate::git::raw::fixture;
+use crate::git::repository::{Revwalk, RevwalkPlan, SortOrder};
+
+/// Helper to build a diamond: root → left, root → right, merge(left, right)
+fn diamond(
+ repo: &fixture::Repository,
+) -> (
+ radicle_oid::Oid,
+ radicle_oid::Oid,
+ radicle_oid::Oid,
+ radicle_oid::Oid,
+) {
+ let root = repo.commit(&[], &[("f", b"v1")]);
+ let left = repo.commit(&[root], &[("f", b"v2")]);
+ let right = repo.commit(&[root], &[("f", b"v3")]);
+ let merge = repo.commit(&[left, right], &[("f", b"v2")]);
+ (root, left, right, merge)
+}
+
+#[test]
+fn linear_chain() {
+ let repo = fixture::Repository::new();
+ let root = repo.commit(&[], &[("f", b"v1")]);
+ let child = repo.commit(&[root], &[("f", b"v2")]);
+
+ let plan = RevwalkPlan::new().push(child);
+ let oids: Vec<_> = Revwalk::revwalk_oids(repo.raw(), &plan)
+ .unwrap()
+ .collect::<Result<Vec<_>, _>>()
+ .unwrap();
+ assert_eq!(oids.len(), 2);
+ assert_eq!(oids[0], child);
+ assert!(oids.contains(&root));
+}
+
+#[test]
+fn commit_data_iter() {
+ let repo = fixture::Repository::new();
+ let root = repo.commit(&[], &[("f", b"v1")]);
+ let child = repo.commit(&[root], &[("f", b"v2")]);
+
+ let plan = RevwalkPlan::new().push(child);
+ let commits: Vec<_> = Revwalk::revwalk_commits(repo.raw(), &plan)
+ .unwrap()
+ .collect::<Result<Vec<_>, _>>()
+ .unwrap();
+ assert_eq!(commits.len(), 2);
+}
+
+#[test]
+fn range() {
+ let repo = fixture::Repository::new();
+ let root = repo.commit(&[], &[("f", b"v1")]);
+ let child = repo.commit(&[root], &[("f", b"v2")]);
+ let grandchild = repo.commit(&[child], &[("f", b"v3")]);
+
+ let plan = RevwalkPlan::new().range(root, child);
+ let oids: Vec<_> = Revwalk::revwalk_oids(repo.raw(), &plan)
+ .unwrap()
+ .collect::<Result<Vec<_>, _>>()
+ .unwrap();
+ assert_eq!(oids, vec![child]);
+ assert!(!oids.contains(&root));
+ assert!(!oids.contains(&grandchild));
+}
+
+#[test]
+fn hide() {
+ let repo = fixture::Repository::new();
+ let root = repo.commit(&[], &[("f", b"v1")]);
+ let child = repo.commit(&[root], &[("f", b"v2")]);
+
+ let plan = RevwalkPlan::new().push(child).hide(root);
+ let oids: Vec<_> = Revwalk::revwalk_oids(repo.raw(), &plan)
+ .unwrap()
+ .collect::<Result<Vec<_>, _>>()
+ .unwrap();
+ assert_eq!(oids, vec![child]);
+}
+
+#[test]
+fn from_merge_sees_all() {
+ let repo = fixture::Repository::new();
+ let (root, left, right, merge) = diamond(&repo);
+
+ let plan = RevwalkPlan::new().push(merge);
+ let oids: Vec<_> = Revwalk::revwalk_oids(repo.raw(), &plan)
+ .unwrap()
+ .collect::<Result<Vec<_>, _>>()
+ .unwrap();
+ assert_eq!(oids.len(), 4);
+ assert!(oids.contains(&merge));
+ assert!(oids.contains(&left));
+ assert!(oids.contains(&right));
+ assert!(oids.contains(&root));
+}
+
+#[test]
+fn hide_one_branch() {
+ let repo = fixture::Repository::new();
+ let (root, left, right, merge) = diamond(&repo);
+
+ let plan = RevwalkPlan::new().push(merge).hide(left);
+ let oids: Vec<_> = Revwalk::revwalk_oids(repo.raw(), &plan)
+ .unwrap()
+ .collect::<Result<Vec<_>, _>>()
+ .unwrap();
+ assert!(oids.contains(&merge));
+ assert!(oids.contains(&right));
+ assert!(!oids.contains(&left));
+ // root hidden since root is reachable from left
+ assert!(!oids.contains(&root));
+}
+
+#[test]
+fn multiple_push_points() {
+ let repo = fixture::Repository::new();
+ let (root, left, right, _merge) = diamond(&repo);
+
+ let plan = RevwalkPlan::new().push(left).push(right);
+ let oids: Vec<_> = Revwalk::revwalk_oids(repo.raw(), &plan)
+ .unwrap()
+ .collect::<Result<Vec<_>, _>>()
+ .unwrap();
+ assert_eq!(oids.len(), 3);
+ assert!(oids.contains(&left));
+ assert!(oids.contains(&right));
+ assert!(oids.contains(&root));
+}
+
+#[test]
+fn push_and_hide_compose() {
+ let repo = fixture::Repository::new();
+ let (root, left, right, _merge) = diamond(&repo);
+
+ let plan = RevwalkPlan::new().push(left).push(right).hide(root);
+ let oids: Vec<_> = Revwalk::revwalk_oids(repo.raw(), &plan)
+ .unwrap()
+ .collect::<Result<Vec<_>, _>>()
+ .unwrap();
+ assert_eq!(oids.len(), 2);
+ assert!(oids.contains(&left));
+ assert!(oids.contains(&right));
+ assert!(!oids.contains(&root));
+}
+
+#[test]
+fn range_on_branch() {
+ let repo = fixture::Repository::new();
+ let (root, _left, right, _merge) = diamond(&repo);
+
+ let plan = RevwalkPlan::new().range(root, right);
+ let oids: Vec<_> = Revwalk::revwalk_oids(repo.raw(), &plan)
+ .unwrap()
+ .collect::<Result<Vec<_>, _>>()
+ .unwrap();
+ assert_eq!(oids, vec![right]);
+}
+
+#[test]
+fn topological_order() {
+ let repo = fixture::Repository::new();
+ let (root, left, right, merge) = diamond(&repo);
+
+ let plan = RevwalkPlan::new()
+ .push(merge)
+ .sort(SortOrder::Topological { reverse: false });
+ let oids: Vec<_> = Revwalk::revwalk_oids(repo.raw(), &plan)
+ .unwrap()
+ .collect::<Result<Vec<_>, _>>()
+ .unwrap();
+ assert_eq!(*oids.first().unwrap(), merge);
+ assert_eq!(*oids.last().unwrap(), root);
+
+ // root must come after both left and right
+ let root_pos = oids.iter().position(|o| *o == root).unwrap();
+ let left_pos = oids.iter().position(|o| *o == left).unwrap();
+ let right_pos = oids.iter().position(|o| *o == right).unwrap();
+ assert!(root_pos > left_pos);
+ assert!(root_pos > right_pos);
+}
+
+#[test]
+fn reverse_chronological() {
+ let repo = fixture::Repository::new();
+ let root = repo.commit(&[], &[("f", b"v1")]);
+ let child = repo.commit(&[root], &[("f", b"v2")]);
+
+ let plan = RevwalkPlan::new()
+ .push(child)
+ .sort(SortOrder::Chronological { reverse: true });
+ let oids: Vec<_> = Revwalk::revwalk_oids(repo.raw(), &plan)
+ .unwrap()
+ .collect::<Result<Vec<_>, _>>()
+ .unwrap();
+ assert_eq!(*oids.first().unwrap(), root);
+ assert_eq!(*oids.last().unwrap(), child);
+}
diff --git a/crates/radicle/src/git/repository/adapter/git2/test/symbolic.rs b/crates/radicle/src/git/repository/adapter/git2/test/symbolic.rs
new file mode 100644
index 000000000..94f8f9184
--- /dev/null
+++ b/crates/radicle/src/git/repository/adapter/git2/test/symbolic.rs
@@ -0,0 +1,168 @@
+use radicle_git_ref_format::refname;
+
+use crate::git::raw::fixture;
+use crate::git::repository::reference;
+use crate::git::repository::reference::symbolic;
+
+#[test]
+fn write_symbolic_ref_new() {
+ let repo = fixture::Repository::new();
+ let commit = repo.commit(&[], &[("f", b"x")]);
+ repo.reference("refs/heads/main", commit);
+
+ symbolic::Writer::write_symbolic_ref(
+ repo.raw(),
+ &refname!("refs/heads/sym"),
+ symbolic::Target::create(refname!("refs/heads/main")),
+ "test",
+ )
+ .unwrap();
+
+ let oid = reference::Reader::ref_target(repo.raw(), &refname!("refs/heads/sym")).unwrap();
+ assert_eq!(oid, Some(commit));
+}
+
+#[test]
+fn write_symbolic_ref_existing_fails() {
+ let repo = fixture::Repository::new();
+ let commit = repo.commit(&[], &[("f", b"x")]);
+ repo.reference("refs/heads/main", commit);
+
+ symbolic::Writer::write_symbolic_ref(
+ repo.raw(),
+ &refname!("refs/heads/sym"),
+ symbolic::Target::create(refname!("refs/heads/main")),
+ "test",
+ )
+ .unwrap();
+
+ let err = symbolic::Writer::write_symbolic_ref(
+ repo.raw(),
+ &refname!("refs/heads/sym"),
+ symbolic::Target::create(refname!("refs/heads/main")),
+ "test",
+ )
+ .unwrap_err();
+ assert!(matches!(
+ err,
+ reference::error::write::WriteSymbolicRef::ReferenceExists { .. }
+ ));
+}
+
+#[test]
+fn upsert_symbolic_ref_new() {
+ let repo = fixture::Repository::new();
+ let commit = repo.commit(&[], &[("f", b"x")]);
+ repo.reference("refs/heads/main", commit);
+
+ symbolic::Writer::write_symbolic_ref(
+ repo.raw(),
+ &refname!("refs/heads/sym"),
+ symbolic::Target::upsert(refname!("refs/heads/main")),
+ "test",
+ )
+ .unwrap();
+
+ let oid = reference::Reader::ref_target(repo.raw(), &refname!("refs/heads/sym")).unwrap();
+ assert_eq!(oid, Some(commit));
+}
+
+#[test]
+fn upsert_symbolic_ref_existing() {
+ let repo = fixture::Repository::new();
+ let a = repo.commit(&[], &[("f", b"a")]);
+ let b = repo.commit(&[], &[("f", b"b")]);
+ repo.reference("refs/heads/main", a);
+ repo.reference("refs/heads/other", b);
+
+ symbolic::Writer::write_symbolic_ref(
+ repo.raw(),
+ &refname!("refs/heads/sym"),
+ symbolic::Target::create(refname!("refs/heads/main")),
+ "test",
+ )
+ .unwrap();
+
+ symbolic::Writer::write_symbolic_ref(
+ repo.raw(),
+ &refname!("refs/heads/sym"),
+ symbolic::Target::upsert(refname!("refs/heads/other")),
+ "test",
+ )
+ .unwrap();
+
+ let oid = reference::Reader::ref_target(repo.raw(), &refname!("refs/heads/sym")).unwrap();
+ assert_eq!(oid, Some(b));
+}
+
+#[test]
+fn cas_symbolic_ref_success() {
+ let repo = fixture::Repository::new();
+ let a = repo.commit(&[], &[("f", b"a")]);
+ let b = repo.commit(&[], &[("f", b"b")]);
+ repo.reference("refs/heads/main", a);
+ repo.reference("refs/heads/other", b);
+
+ symbolic::Writer::write_symbolic_ref(
+ repo.raw(),
+ &refname!("refs/heads/sym"),
+ symbolic::Target::create(refname!("refs/heads/main")),
+ "test",
+ )
+ .unwrap();
+
+ symbolic::Writer::write_symbolic_ref(
+ repo.raw(),
+ &refname!("refs/heads/sym"),
+ symbolic::Target::cas(refname!("refs/heads/other"), refname!("refs/heads/main")),
+ "test",
+ )
+ .unwrap();
+
+ let oid = reference::Reader::ref_target(repo.raw(), &refname!("refs/heads/sym")).unwrap();
+ assert_eq!(oid, Some(b));
+}
+
+#[test]
+fn cas_symbolic_ref_wrong_expected() {
+ let repo = fixture::Repository::new();
+ let commit = repo.commit(&[], &[("f", b"x")]);
+ repo.reference("refs/heads/main", commit);
+ repo.reference("refs/tags/v1.0", commit);
+
+ symbolic::Writer::write_symbolic_ref(
+ repo.raw(),
+ &refname!("refs/heads/sym"),
+ symbolic::Target::create(refname!("refs/heads/main")),
+ "test",
+ )
+ .unwrap();
+
+ let err = symbolic::Writer::write_symbolic_ref(
+ repo.raw(),
+ &refname!("refs/heads/sym"),
+ symbolic::Target::cas(refname!("refs/tags/v1.0"), refname!("refs/tags/v1.0")),
+ "test",
+ )
+ .unwrap_err();
+ assert!(matches!(
+ err,
+ reference::error::write::WriteSymbolicRef::CasFailed { .. }
+ ));
+}
+
+#[test]
+fn symbolic_ref_missing_target() {
+ let repo = fixture::Repository::new();
+ let err = symbolic::Writer::write_symbolic_ref(
+ repo.raw(),
+ &refname!("refs/heads/sym"),
+ symbolic::Target::create(refname!("refs/heads/does-not-exist")),
+ "test",
+ )
+ .unwrap_err();
+ assert!(matches!(
+ err,
+ reference::error::write::WriteSymbolicRef::MissingTarget { .. }
+ ));
+}
commit 9462ede07e96136fea17383c73f4dff894e33083
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Thu Apr 30 14:10:51 2026 +0000
git/repository: Unit tests for git::repository domain types
Add unit tests for domain types:
- ancestry: AheadBehind::is_linear
- revwalk: RevwalkPlan builder
- reference: Target constructors
- symbolic: Target constructors
diff --git a/crates/radicle/src/git/repository/ancestry.rs b/crates/radicle/src/git/repository/ancestry.rs
index 660f09ed4..87bd0ccec 100644
--- a/crates/radicle/src/git/repository/ancestry.rs
+++ b/crates/radicle/src/git/repository/ancestry.rs
@@ -67,3 +67,52 @@ pub trait Ancestry {
/// [`Backend`]: error::AheadBehind::Backend
fn ahead_behind(&self, commit: Oid, upstream: Oid) -> Result<AheadBehind, error::AheadBehind>;
}
+
+#[cfg(test)]
+mod test {
+ use super::*;
+
+ #[test]
+ fn is_linear_ahead_only() {
+ assert!(
+ AheadBehind {
+ ahead: 3,
+ behind: 0
+ }
+ .is_linear()
+ );
+ }
+
+ #[test]
+ fn is_linear_behind_only() {
+ assert!(
+ AheadBehind {
+ ahead: 0,
+ behind: 5
+ }
+ .is_linear()
+ );
+ }
+
+ #[test]
+ fn is_linear_same_commit() {
+ assert!(
+ AheadBehind {
+ ahead: 0,
+ behind: 0
+ }
+ .is_linear()
+ );
+ }
+
+ #[test]
+ fn is_linear_diverged() {
+ assert!(
+ !AheadBehind {
+ ahead: 2,
+ behind: 1
+ }
+ .is_linear()
+ );
+ }
+}
diff --git a/crates/radicle/src/git/repository/reference.rs b/crates/radicle/src/git/repository/reference.rs
index 81f3fea8e..d5447a33c 100644
--- a/crates/radicle/src/git/repository/reference.rs
+++ b/crates/radicle/src/git/repository/reference.rs
@@ -185,3 +185,33 @@ pub trait Writer {
where
R: AsRef<RefStr>;
}
+
+#[cfg(test)]
+mod test {
+ use super::*;
+
+ fn oid(n: u8) -> Oid {
+ Oid::from_sha1([n; 20])
+ }
+
+ #[test]
+ fn target_create() {
+ let t = Target::create(oid(1));
+ assert_eq!(t.target(), oid(1));
+ assert!(matches!(t, Target::Create { .. }));
+ }
+
+ #[test]
+ fn target_upsert() {
+ let t = Target::Upsert { target: oid(2) };
+ assert_eq!(t.target(), oid(2));
+ assert!(matches!(t, Target::Upsert { .. }));
+ }
+
+ #[test]
+ fn target_cas() {
+ let t = Target::cas(oid(3), oid(4));
+ assert_eq!(t.target(), oid(3));
+ assert!(matches!(t, Target::Cas { expected, .. } if expected == oid(4)));
+ }
+}
diff --git a/crates/radicle/src/git/repository/reference/symbolic.rs b/crates/radicle/src/git/repository/reference/symbolic.rs
index 0dbc41a6f..4bf4440d6 100644
--- a/crates/radicle/src/git/repository/reference/symbolic.rs
+++ b/crates/radicle/src/git/repository/reference/symbolic.rs
@@ -113,3 +113,31 @@ pub trait Writer: super::Writer {
where
R: AsRef<RefStr>;
}
+
+#[cfg(test)]
+mod test {
+ use radicle_git_ref_format::refname;
+
+ use super::*;
+
+ #[test]
+ fn target_create() {
+ let t = Target::create(refname!("refs/heads/main"));
+ assert_eq!(t.target().as_str(), "refs/heads/main");
+ assert!(matches!(t, Target::Create { .. }));
+ }
+
+ #[test]
+ fn target_upsert() {
+ let t = Target::upsert(refname!("refs/heads/main"));
+ assert_eq!(t.target().as_str(), "refs/heads/main");
+ assert!(matches!(t, Target::Upsert { .. }));
+ }
+
+ #[test]
+ fn target_cas() {
+ let t = Target::cas(refname!("refs/heads/main"), refname!("refs/heads/old"));
+ assert_eq!(t.target().as_str(), "refs/heads/main");
+ assert!(matches!(t, Target::Cas { expected, .. } if expected.as_str() == "refs/heads/old"));
+ }
+}
diff --git a/crates/radicle/src/git/repository/revwalk.rs b/crates/radicle/src/git/repository/revwalk.rs
index f7c8372d6..0b215a1cb 100644
--- a/crates/radicle/src/git/repository/revwalk.rs
+++ b/crates/radicle/src/git/repository/revwalk.rs
@@ -141,3 +141,50 @@ pub trait Revwalk {
plan: &RevwalkPlan,
) -> Result<Self::RevwalkCommits<'a>, error::Init>;
}
+
+#[cfg(test)]
+mod test {
+ use super::*;
+
+ fn oid(n: u8) -> Oid {
+ Oid::from_sha1([n; 20])
+ }
+
+ #[test]
+ fn plan_push_accumulates() {
+ let plan = RevwalkPlan::new().push(oid(1)).push(oid(2));
+ assert_eq!(plan.starts(), &[oid(1), oid(2)]);
+ }
+
+ #[test]
+ fn plan_hide_accumulates() {
+ let plan = RevwalkPlan::new().hide(oid(3)).hide(oid(4));
+ assert_eq!(plan.hidden(), &[oid(3), oid(4)]);
+ }
+
+ #[test]
+ fn plan_range() {
+ let plan = RevwalkPlan::new().range(oid(1), oid(2));
+ assert_eq!(plan.range_bounds(), Some((oid(1), oid(2))));
+ }
+
+ #[test]
+ fn plan_sort() {
+ let plan = RevwalkPlan::new().sort(SortOrder::Topological { reverse: true });
+ assert_eq!(plan.sort_order(), SortOrder::Topological { reverse: true });
+ }
+
+ #[test]
+ fn plan_compose() {
+ let plan = RevwalkPlan::new()
+ .push(oid(1))
+ .hide(oid(2))
+ .range(oid(3), oid(4))
+ .sort(SortOrder::Topological { reverse: false });
+
+ assert_eq!(plan.starts(), &[oid(1)]);
+ assert_eq!(plan.hidden(), &[oid(2)]);
+ assert_eq!(plan.range_bounds(), Some((oid(3), oid(4))));
+ assert_eq!(plan.sort_order(), SortOrder::Topological { reverse: false });
+ }
+}
commit 6270c50328fce6508bc82da73e110a9240fe4b69
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Fri May 1 15:32:21 2026 +0000
git/raw: Add composable test fixture
Add git::raw::fixture::Repository — a bare git2::Repository in a TempDir
with helpers for constructing test state without boilerplate.
diff --git a/crates/radicle/src/git/raw.rs b/crates/radicle/src/git/raw.rs
index 8508b5487..f20f24027 100644
--- a/crates/radicle/src/git/raw.rs
+++ b/crates/radicle/src/git/raw.rs
@@ -42,6 +42,9 @@ pub(crate) mod transport {
};
}
+#[cfg(any(test, feature = "test"))]
+pub mod fixture;
+
/// An extension trait for [`git2::Error`] to more conveniently handle
/// errors with the code [`git2::ErrorCode::NotFound`].
pub trait ErrorExt {
diff --git a/crates/radicle/src/git/raw/fixture.rs b/crates/radicle/src/git/raw/fixture.rs
new file mode 100644
index 000000000..eae52c9c2
--- /dev/null
+++ b/crates/radicle/src/git/raw/fixture.rs
@@ -0,0 +1,169 @@
+#![allow(clippy::unwrap_used)]
+
+//! Composable test fixture for building Git repositories with known state.
+//!
+//! [`Repository`] wraps a bare [`super::Repository`] in a [`TempDir`] and
+//! provides helpers to create commits, references, and namespaced references
+//! without boilerplate.
+//!
+//! # Example
+//!
+//! ```rust,ignore
+//! let mut repo = Repository::new();
+//! let root = repo.commit(&[], &[("file.txt", b"hello")]);
+//! let child = repo.commit(&[root], &[("file.txt", b"updated")]);
+//! repo.reference("refs/heads/main", child);
+//! ```
+
+use std::collections::BTreeSet;
+
+use radicle_oid::Oid;
+use tempfile::TempDir;
+
+use crate::prelude::Did;
+
+/// A bare Git repository in a temporary directory, with helpers for
+/// constructing test state.
+///
+/// Use [`Repository::raw`] to get the raw handle on the underlying
+/// [`super::Repository`].
+///
+/// For manipulating the underlying repository with fixture data see:
+/// - [`Repository::commit`]
+/// - [`Repository::reference`]
+/// - [`Repository::namespaced_ref`]
+/// - [`Repository::blob`]
+pub struct Repository {
+ inner: super::Repository,
+ dids: BTreeSet<Did>,
+ _dir: TempDir,
+}
+
+impl Default for Repository {
+ fn default() -> Self {
+ Self::new()
+ }
+}
+
+impl Repository {
+ /// Create a new empty bare repository.
+ pub fn new() -> Self {
+ let dir = TempDir::new().expect("failed to create temp dir");
+ let inner = super::Repository::init_bare(dir.path()).expect("failed to init bare repo");
+ Self {
+ inner,
+ dids: BTreeSet::new(),
+ _dir: dir,
+ }
+ }
+
+ /// Access the underlying [`super::Repository`].
+ pub fn raw(&self) -> &super::Repository {
+ &self.inner
+ }
+
+ /// The set of [`Did`]s registered via [`Self::namespaced_ref`].
+ pub fn known_dids(&self) -> &BTreeSet<Did> {
+ &self.dids
+ }
+
+ /// Create a commit with the given tree content and parent commits.
+ ///
+ /// `files` is a list of `(path, content)` pairs. Each path may be
+ /// multi-component (e.g. `"a/b/c.txt"`) — intermediate trees are
+ /// created automatically via [`super::build::TreeUpdateBuilder`].
+ ///
+ /// Returns the [`Oid`] of the new commit.
+ pub fn commit(&self, parents: &[Oid], files: &[(&str, &[u8])]) -> Oid {
+ let sig = super::Signature::new("test", "test@test", &super::Time::new(0, 0))
+ .expect("valid signature");
+
+ let tree_oid = self.build_tree(files);
+ let tree = self.inner.find_tree(tree_oid).expect("tree just written");
+
+ let parent_commits: Vec<super::Commit<'_>> = parents
+ .iter()
+ .map(|oid| {
+ self.inner
+ .find_commit((*oid).into())
+ .unwrap_or_else(|_| panic!("parent commit {oid} not found"))
+ })
+ .collect();
+ let parent_refs: Vec<&super::Commit<'_>> = parent_commits.iter().collect();
+
+ self.inner
+ .commit(None, &sig, &sig, "test commit", &tree, &parent_refs)
+ .expect("failed to create commit")
+ .into()
+ }
+
+ /// Create a tag with the given `name`, pointing to the object identified by
+ /// the given [`Oid`].
+ ///
+ /// Returns the [`Oid`] of the tag object.
+ pub fn tag(&self, name: &str, oid: Oid, force: bool) -> Oid {
+ let sig = super::Signature::new("test", "test@test", &super::Time::new(0, 0))
+ .expect("valid signature");
+ let target = self.inner.find_object(oid.into(), None).unwrap();
+ self.inner
+ .tag(name, &target, &sig, "fixture tag", force)
+ .unwrap()
+ .into()
+ }
+
+ /// Create a direct reference pointing to `target`.
+ ///
+ /// Panics if the reference already exists. Use [`Self::raw`] for
+ /// more control.
+ pub fn reference(&self, name: &str, target: Oid) {
+ self.inner
+ .reference(name, target.into(), false, "fixture")
+ .unwrap_or_else(|e| panic!("failed to create reference {name}: {e}"));
+ }
+
+ /// Create a namespaced reference for a [`Did`].
+ ///
+ /// The `refname` is a qualified name like `refs/heads/main`. It is
+ /// prefixed with `refs/namespaces/<key>/` internally.
+ ///
+ /// The [`Did`] is recorded in [`Self::known_dids`].
+ pub fn namespaced_ref(&mut self, did: Did, refname: &str, target: Oid) {
+ let key = did.as_key();
+ let full = format!("refs/namespaces/{key}/{refname}");
+ self.inner
+ .reference(&full, target.into(), false, "fixture")
+ .unwrap_or_else(|e| panic!("failed to create namespaced ref {full}: {e}"));
+ self.dids.insert(did);
+ }
+
+ /// Write a blob and return its [`Oid`].
+ pub fn blob(&self, content: &[u8]) -> Oid {
+ self.inner
+ .blob(content)
+ .expect("failed to write blob")
+ .into()
+ }
+
+ fn build_tree(&self, files: &[(&str, &[u8])]) -> super::Oid {
+ // Start from the empty tree, then apply updates for each file.
+ let empty_tree = {
+ let oid = self
+ .inner
+ .treebuilder(None)
+ .expect("treebuilder")
+ .write()
+ .expect("write empty tree");
+ self.inner.find_tree(oid).expect("find empty tree")
+ };
+
+ let mut builder = super::build::TreeUpdateBuilder::new();
+ for (path, content) in files {
+ let blob_oid = self.inner.blob(content).expect("failed to write blob");
+ builder.upsert(path, blob_oid, super::FileMode::Blob);
+ }
+
+ builder
+ .create_updated(&self.inner, &empty_tree)
+ .expect("failed to build tree")
+ }
+}
commit fca3c519c64da0c0a79ce3f81bd035ad8b8a3c9a
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Thu Apr 30 14:38:16 2026 +0100
radicle/git/canonical: Rename effects to objects
The module no longer holds effects. Instead, it now contains a handler
for finding Git objects for a set of `Did`s.
diff --git a/crates/radicle/src/git/canonical.rs b/crates/radicle/src/git/canonical.rs
index 7b8a0559e..fb98ba735 100644
--- a/crates/radicle/src/git/canonical.rs
+++ b/crates/radicle/src/git/canonical.rs
@@ -9,7 +9,7 @@ use quorum::{CommitQuorum, CommitQuorumFailure, TagQuorum, TagQuorumFailure};
mod voting;
-pub mod effects;
+pub mod objects;
pub mod protect;
pub mod rules;
pub mod symbolic;
@@ -115,10 +115,10 @@ where
/// find the quorum.
pub fn find_objects(
self,
- ) -> Result<Canonical<'a, 'b, 'r, R, ObjectsFound>, effects::FindObjectsError> {
+ ) -> Result<Canonical<'a, 'b, 'r, R, ObjectsFound>, objects::FindObjectsError> {
let allowed: Vec<_> = self.rule.allowed().iter().copied().collect();
let FoundObjects { objects, missing } =
- effects::FindObjects::new(self.repo, &self.refname, &allowed).resolve()?;
+ objects::FindObjects::new(self.repo, &self.refname, &allowed).resolve()?;
let missing = Missing { missing };
Ok(Canonical {
refname: self.refname,
diff --git a/crates/radicle/src/git/canonical/error.rs b/crates/radicle/src/git/canonical/error.rs
index 5fb268549..50b5d8b2b 100644
--- a/crates/radicle/src/git/canonical/error.rs
+++ b/crates/radicle/src/git/canonical/error.rs
@@ -4,8 +4,8 @@ use crate::git::Oid;
use crate::git::repository::ancestry;
-use super::{ObjectType, effects};
-pub use effects::FindObjectsError;
+use super::{ObjectType, objects};
+pub use objects::FindObjectsError;
/// An error that occurred while computing a merge base.
///
diff --git a/crates/radicle/src/git/canonical/effects.rs b/crates/radicle/src/git/canonical/objects.rs
similarity index 100%
rename from crates/radicle/src/git/canonical/effects.rs
rename to crates/radicle/src/git/canonical/objects.rs
diff --git a/crates/radicle/src/storage.rs b/crates/radicle/src/storage.rs
index e36310c39..081305fd8 100644
--- a/crates/radicle/src/storage.rs
+++ b/crates/radicle/src/storage.rs
@@ -155,7 +155,7 @@ pub enum RepositoryError {
#[error("failed to get canonical reference rules: {0}")]
CanonicalRefs(#[from] doc::CanonicalRefsError),
#[error(transparent)]
- FindObjects(#[from] canonical::effects::FindObjectsError),
+ FindObjects(#[from] canonical::objects::FindObjectsError),
}
impl From<Error> for RepositoryError {
commit 175e3217b49f52d3542b9d9602c65d06a70e700a
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Thu Apr 30 08:48:43 2026 +0100
radicle/canonical/effects: Migrate to user::Namespace in FindObjects
With `Namespace::find_object`, the logic in `FindObjects::resolve` simplifies,
since it delegates to the domain.
However, this does have some knock on effects.
Note that there is an abstraction leak for keeping track of the missing references,
since the `Namespaced` reference is being constructed.
It is also no longer easy to keep track of missing objects, as well as missing references.
diff --git a/crates/radicle/src/git/canonical.rs b/crates/radicle/src/git/canonical.rs
index 322f01436..7b8a0559e 100644
--- a/crates/radicle/src/git/canonical.rs
+++ b/crates/radicle/src/git/canonical.rs
@@ -117,15 +117,9 @@ where
self,
) -> Result<Canonical<'a, 'b, 'r, R, ObjectsFound>, effects::FindObjectsError> {
let allowed: Vec<_> = self.rule.allowed().iter().copied().collect();
- let FoundObjects {
- objects,
- missing_refs,
- missing_objects,
- } = effects::FindObjects::new(self.repo, &self.refname, &allowed).resolve()?;
- let missing = Missing {
- refs: missing_refs,
- objects: missing_objects,
- };
+ let FoundObjects { objects, missing } =
+ effects::FindObjects::new(self.repo, &self.refname, &allowed).resolve()?;
+ let missing = Missing { missing };
Ok(Canonical {
refname: self.refname,
rule: self.rule,
@@ -468,25 +462,18 @@ pub struct FoundObjects {
/// The found objects, and under which [`Did`] they were found.
pub objects: BTreeMap<Did, Object>,
/// Any missing references while attempting to find the objects.
- pub missing_refs: BTreeSet<Namespaced<'static>>,
- // TODO(finto): I think this doesn't make sense now that we use only one
- // repository.
- /// Any missing objects, where the reference was found, but the object was
- /// missing.
- pub missing_objects: BTreeMap<Did, Oid>,
+ pub missing: BTreeSet<Namespaced<'static>>,
}
/// [`Missing`] marks whether there were any missing references or objects.
#[derive(Clone, Debug, Default, PartialEq, Eq)]
pub struct Missing {
- pub refs: BTreeSet<Namespaced<'static>>,
- pub objects: BTreeMap<Did, Oid>,
+ pub missing: BTreeSet<Namespaced<'static>>,
}
impl Missing {
fn found<'a>(&mut self, did: &Did, refname: &Qualified<'a>) {
- self.objects.remove(did);
- self.refs
+ self.missing
.remove(&refname.with_namespace((did.as_key()).into()).to_owned());
}
}
diff --git a/crates/radicle/src/git/canonical/effects.rs b/crates/radicle/src/git/canonical/effects.rs
index 39f8959c5..9ef993c1d 100644
--- a/crates/radicle/src/git/canonical/effects.rs
+++ b/crates/radicle/src/git/canonical/effects.rs
@@ -3,8 +3,10 @@ use std::collections::{BTreeMap, BTreeSet};
use crate::git;
use crate::git::Oid;
use crate::git::fmt::Qualified;
+use crate::git::repository;
use crate::git::repository::object;
use crate::git::repository::reference;
+use crate::git::repository::user;
use crate::prelude::Did;
use super::{FoundObjects, Object};
@@ -33,44 +35,33 @@ where
/// Resolve all references and produce the [`FoundObjects`].
pub fn resolve(self) -> Result<FoundObjects, FindObjectsError> {
let mut objects = BTreeMap::new();
- let mut missing_refs = BTreeSet::new();
- let mut missing_objects = BTreeMap::new();
+ let mut missing = BTreeSet::new();
for did in self.dids {
- let name = self.refname.with_namespace(did.as_key().into());
-
- let oid = match self.repository.ref_target(&name) {
- Ok(Some(oid)) => oid,
+ let user = user::Namespace::new(*did, self.repository);
+ match user.find_object(self.refname) {
+ Ok(Some(repository::types::Object { oid, kind })) => {
+ let object = Object::from_kind(oid, kind).ok_or_else(|| {
+ FindObjectsError::invalid_object_type(*did, oid, Some(kind.to_string()))
+ })?;
+
+ objects.insert(*did, object);
+ }
Ok(None) => {
- missing_refs.insert(name.to_owned());
+ // TODO(finto): this leaks the abstraction that we are using `refs/namespaces/<nid>`
+ let name = self.refname.with_namespace(did.as_key().into());
+ missing.insert(name.to_owned());
continue;
}
Err(e) => {
+ // TODO(finto): this leaks the abstraction that we are using `refs/namespaces/<nid>`
+ let name = self.refname.with_namespace(did.as_key().into());
return Err(FindObjectsError::find_reference(name.to_owned(), e));
}
- };
-
- let kind = match self.repository.object_kind(oid) {
- Ok(Some(kind)) => kind,
- Ok(None) => {
- missing_objects.insert(*did, oid);
- continue;
- }
- Err(e) => return Err(FindObjectsError::find_object(oid, e)),
- };
-
- let object = Object::from_kind(oid, kind).ok_or_else(|| {
- FindObjectsError::invalid_object_type(*did, oid, Some(kind.to_string()))
- })?;
-
- objects.insert(*did, object);
+ }
}
- Ok(FoundObjects {
- objects,
- missing_refs,
- missing_objects,
- })
+ Ok(FoundObjects { objects, missing })
}
}
commit d990739ade2fde235ba5698b5570bf6be5efa25e
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Thu Apr 30 13:05:20 2026 +0100
radicle/git/repository/user: Namespace::find_object
Introduce a new method `Namespace::find_object`, for finding the
object found at a `Qualified` reference in the user namespace.
diff --git a/crates/radicle/src/git/repository/types.rs b/crates/radicle/src/git/repository/types.rs
index 165ac8582..6e30d5da2 100644
--- a/crates/radicle/src/git/repository/types.rs
+++ b/crates/radicle/src/git/repository/types.rs
@@ -38,6 +38,14 @@ impl fmt::Display for ObjectKind {
}
}
+/// A resolved Git object.
+pub struct Object {
+ /// The content-addressed identifier of the object.
+ pub oid: Oid,
+ /// The kind of the object.
+ pub kind: ObjectKind,
+}
+
/// A Git blob object.
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
pub struct Blob {
diff --git a/crates/radicle/src/git/repository/user.rs b/crates/radicle/src/git/repository/user.rs
index 9f17285d7..b2d61d08a 100644
--- a/crates/radicle/src/git/repository/user.rs
+++ b/crates/radicle/src/git/repository/user.rs
@@ -12,14 +12,16 @@ pub mod error;
use std::collections::BTreeMap;
use crypto::PublicKey;
-use radicle_git_ref_format::{
- self as fmt, Component, Qualified, RefStr, pattern, refname, refspec,
-};
+use radicle_git_ref_format as fmt;
+use radicle_git_ref_format::{Component, Qualified, RefStr};
+use radicle_git_ref_format::{pattern, refname, refspec};
use radicle_oid::Oid;
use crate::prelude::Did;
-use super::reference;
+use super::ObjectKind;
+use super::types::Object;
+use super::{object, reference};
/// The set of references that exist for a user.
///
@@ -167,6 +169,47 @@ impl<'a, R: reference::Reader> Namespace<'a, R> {
}
}
+impl<'a, R: reference::Reader + object::Reader> Namespace<'a, R> {
+ /// Find the object that is pointed to by `refname`, in the user namespace.
+ ///
+ /// The resulting object should either be an [`ObjectKind::Commit`] or
+ /// [`ObjectKind::Tag`], but other [`ObjectKind`]'s may be returned.
+ ///
+ /// # Errors
+ ///
+ /// - [`FindObject::RefTarget`]: An error occurred when attempting to resolve the
+ /// [`Oid`] of the reference, identified by `refname`.
+ /// - [`FindObject::ObjectKind`]: An error occurred when attempting to resolve the
+ /// [`ObjectKind`] of the [`Oid`] that the reference is pointing to.
+ ///
+ /// [`FindObject::RefTarget`]: error::FindObject::RefTarget
+ /// [`FindObject::ObjectKind`]: error::FindObject::ObjectKind
+ pub fn find_object(&self, refname: &Qualified) -> Result<Option<Object>, error::FindObject> {
+ let oid = self
+ .ref_target(refname)
+ .map_err(|err| error::FindObject::RefTarget {
+ refname: refname.clone().to_owned(),
+ source: err,
+ })?;
+ oid.and_then(|oid| self.object(refname, oid).transpose())
+ .transpose()
+ }
+
+ fn object(&self, refname: &Qualified, oid: Oid) -> Result<Option<Object>, error::FindObject> {
+ self.object_kind(oid)
+ .map_err(|err| error::FindObject::ObjectKind {
+ oid,
+ refname: refname.clone().to_owned(),
+ source: err,
+ })
+ .map(|kind| kind.map(|kind| Object { oid, kind }))
+ }
+
+ fn object_kind(&self, oid: Oid) -> Result<Option<ObjectKind>, object::error::read::ObjectKind> {
+ self.repo.object_kind(oid)
+ }
+}
+
impl<'a, R: reference::Writer> Namespace<'a, R> {
/// Set a reference for this user.
///
diff --git a/crates/radicle/src/git/repository/user/error.rs b/crates/radicle/src/git/repository/user/error.rs
index 32ef2c8fb..57efe5033 100644
--- a/crates/radicle/src/git/repository/user/error.rs
+++ b/crates/radicle/src/git/repository/user/error.rs
@@ -1,4 +1,7 @@
-use crate::git::repository::reference;
+use radicle_git_ref_format::Qualified;
+use radicle_oid::Oid;
+
+use crate::git::repository::{object, reference};
/// Error returned by [`Namespace::references`].
///
@@ -11,6 +14,27 @@ pub enum References {
ListRefs(#[from] reference::error::read::ListRefs),
}
+/// Error returned by [`Namespace::find_object`]
+///
+/// [`Namespace::find_object`]: super::Namespace::find_object
+#[derive(Debug, thiserror::Error)]
+#[non_exhaustive]
+pub enum FindObject {
+ /// Failed to resolve the target of the reference.
+ #[error("failed to resolve {refname}: {source}")]
+ RefTarget {
+ refname: Qualified<'static>,
+ source: reference::error::read::RefTarget,
+ },
+ /// Failed to determine the kind of the object.
+ #[error("failed to determine object kind of {oid}, found at {refname}: {source}")]
+ ObjectKind {
+ oid: Oid,
+ refname: Qualified<'static>,
+ source: object::error::read::ObjectKind,
+ },
+}
+
/// Error returned by [`Namespaces::dids`] and [`Namespaces::dids_with_errors`].
///
/// [`Namespaces::dids`]: super::Namespaces::dids
commit d26c62e1fe159b9ea3cd694cef9a50b516196d4b
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Tue Apr 28 17:46:06 2026 +0100
radicle/storage/git: Refactor remote_ids and remotes to use user::Namespaces
The `user::Namespaces::dids` method is used to delegate finding the
set of `Did`s for `remote_ids` and `remotes`.
Important to note is that this method drops any errors while
attempting to get the `Did`, but they are logged.
This means the behaviour changes for these calls, where if a `remote`
failed, it would fail the whole function call, and now it does not.
diff --git a/crates/radicle-cli/src/commands/inspect.rs b/crates/radicle-cli/src/commands/inspect.rs
index 7f7f2e7b3..b69b747a3 100644
--- a/crates/radicle-cli/src/commands/inspect.rs
+++ b/crates/radicle-cli/src/commands/inspect.rs
@@ -64,7 +64,7 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
Target::Sigrefs => {
let (repo, _) = repo(rid, storage)?;
for remote in repo.remote_ids()? {
- let remote = remote?;
+ let remote = *remote.as_key();
let refs = RefsAt::new(&repo, remote)?;
let sigrefs = SignedRefs::load_at(refs.at, remote, &repo);
diff --git a/crates/radicle-cli/src/commands/remote/list.rs b/crates/radicle-cli/src/commands/remote/list.rs
index 1a4e997f6..a2fd9d835 100644
--- a/crates/radicle-cli/src/commands/remote/list.rs
+++ b/crates/radicle-cli/src/commands/remote/list.rs
@@ -68,16 +68,12 @@ pub fn untracked<'a>(
.collect::<HashSet<_>>();
Ok(remotes
.filter_map(|remote| {
- remote
- .map(|remote| {
- (!git_remotes.contains(&remote)).then_some(Untracked {
- remote,
- alias: aliases.alias(&remote),
- })
- })
- .transpose()
+ (!git_remotes.contains(&remote)).then_some(Untracked {
+ remote: *remote.as_key(),
+ alias: aliases.alias(&remote),
+ })
})
- .collect::<Result<Vec<_>, _>>()?)
+ .collect::<Vec<_>>())
}
pub fn print_tracked<'a>(tracked: impl Iterator<Item = &'a Tracked>) {
diff --git a/crates/radicle-cli/src/commands/stats.rs b/crates/radicle-cli/src/commands/stats.rs
index 0465c6012..d9f3daa77 100644
--- a/crates/radicle-cli/src/commands/stats.rs
+++ b/crates/radicle-cli/src/commands/stats.rs
@@ -67,7 +67,6 @@ pub fn run(_args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
stats.local.repos += 1;
for remote in repo.remote_ids()? {
- let remote = remote?;
let sigrefs = repo.reference_oid(&remote, &git::refs::storage::SIGREFS_BRANCH)?;
let mut walk = repo.raw().revwalk()?;
walk.push(sigrefs.into())?;
diff --git a/crates/radicle-cli/tests/commands/id.rs b/crates/radicle-cli/tests/commands/id.rs
index 24f0e8c27..a80129d18 100644
--- a/crates/radicle-cli/tests/commands/id.rs
+++ b/crates/radicle-cli/tests/commands/id.rs
@@ -358,8 +358,8 @@ fn rad_id_collaboration() {
let mut remotes = repo
.remote_ids()
.unwrap()
- .collect::<Result<Vec<_>, _>>()
- .unwrap();
+ .map(|did| *did.as_key())
+ .collect::<Vec<_>>();
let mut expected = vec![alice.id, bob.id, eve.id];
remotes.sort();
expected.sort();
@@ -369,8 +369,8 @@ fn rad_id_collaboration() {
let mut remotes = repo
.remote_ids()
.unwrap()
- .collect::<Result<Vec<_>, _>>()
- .unwrap();
+ .map(|did| *did.as_key())
+ .collect::<Vec<_>>();
let mut expected = vec![alice.id, bob.id, eve.id];
remotes.sort();
expected.sort();
diff --git a/crates/radicle-fetch/src/state.rs b/crates/radicle-fetch/src/state.rs
index bcec3c0d8..6f16fc4d8 100644
--- a/crates/radicle-fetch/src/state.rs
+++ b/crates/radicle-fetch/src/state.rs
@@ -71,7 +71,7 @@ pub mod error {
#[error(transparent)]
RemoteRefs(#[from] sigrefs::error::RemoteRefs),
#[error("failed to get remote namespaces: {0}")]
- RemoteIds(#[source] radicle::git::raw::Error),
+ RemoteIds(#[source] radicle::storage::refs::Error),
#[error(transparent)]
Step(#[from] Step),
#[error(transparent)]
@@ -465,7 +465,7 @@ impl FetchState {
.repository()
.remote_ids()
.map_err(error::Protocol::RemoteIds)?
- .filter_map(|id| id.ok())
+ .map(|did| *did.as_key())
.filter(|id| delegates.contains(id))
.collect::<BTreeSet<_>>();
let mut failed_delegates = BTreeSet::new();
diff --git a/crates/radicle-node/src/tests/e2e.rs b/crates/radicle-node/src/tests/e2e.rs
index 6ab9579d5..1a0b2d7bc 100644
--- a/crates/radicle-node/src/tests/e2e.rs
+++ b/crates/radicle-node/src/tests/e2e.rs
@@ -343,7 +343,7 @@ fn test_replication_invalid() {
let repo = alice.storage.repository(acme).unwrap();
let mut remotes = repo.remote_ids().unwrap();
- assert_eq!(remotes.next().unwrap().unwrap(), bob.id);
+ assert_eq!(*remotes.next().unwrap().as_key(), bob.id);
assert!(remotes.next().is_none());
assert!(repo.validate().unwrap().is_empty());
@@ -485,8 +485,8 @@ fn test_fetch_followed_remotes() {
let bob_remotes = bob_repo
.remote_ids()
.unwrap()
- .collect::<Result<HashSet<_>, _>>()
- .unwrap();
+ .map(|did| *did.as_key())
+ .collect::<HashSet<_>>();
assert_eq!(bob_remotes.len(), followed.len() + 1);
assert!(bob_remotes.is_superset(&followed));
diff --git a/crates/radicle/src/rad.rs b/crates/radicle/src/rad.rs
index 7af413b23..799bfa51f 100644
--- a/crates/radicle/src/rad.rs
+++ b/crates/radicle/src/rad.rs
@@ -549,8 +549,8 @@ mod tests {
.unwrap()
.remotes()
.unwrap()
- .collect::<Result<_, _>>()
- .unwrap();
+ .into_iter()
+ .collect();
let project_repo = storage.repository(proj).unwrap();
let (_, head) = project_repo.head().unwrap();
diff --git a/crates/radicle/src/storage/git.rs b/crates/radicle/src/storage/git.rs
index 28a389d19..995b1a8c8 100644
--- a/crates/radicle/src/storage/git.rs
+++ b/crates/radicle/src/storage/git.rs
@@ -209,7 +209,7 @@ impl WriteStorage for Storage {
if has_sigrefs {
repo.clean(&self.info.key)
} else {
- let remotes = repo.remote_ids()?.collect::<Result<_, _>>()?;
+ let remotes = repo.remote_ids()?.map(|did| *did.as_key()).collect();
repo.remove()?;
Ok(remotes)
}
@@ -451,14 +451,7 @@ impl Repository {
.collect::<BTreeSet<_>>();
let mut deleted = Vec::new();
for id in self.remote_ids()? {
- let id = match id {
- Ok(id) => id,
- Err(e) => {
- log::error!(target: "storage", "Failed to clean up remote: {e}");
- continue;
- }
- };
-
+ let id = *id.as_key();
// N.b. it is fatal to delete local or delegates
if *local == id || delegates.contains(&id) {
continue;
@@ -558,44 +551,24 @@ impl Repository {
pub fn remote_ids(
&self,
- ) -> Result<impl Iterator<Item = Result<RemoteId, refs::Error>> + '_, git::raw::Error> {
- let iter = self.backend.references_glob(SIGREFS_GLOB.as_str())?.map(
- |reference| -> Result<RemoteId, refs::Error> {
- let r = reference?;
- let name = r.name().ok_or(refs::Error::InvalidRef)?;
- let (id, _) = git::parse_ref_namespaced::<RemoteId>(name)?;
-
- Ok(id)
- },
- );
- Ok(iter)
+ ) -> Result<user::Dids<<Self as reference::Reader>::References<'_>>, refs::Error> {
+ let namespaces = user::Namespaces::new(self);
+ Ok(namespaces.dids(user::FilterBy::suffix(&git::fmt::refname!("rad/sigrefs")))?)
}
- pub fn remotes(
- &self,
- ) -> Result<impl Iterator<Item = Result<(RemoteId, Remote), refs::Error>> + '_, git::raw::Error>
- {
- let remotes =
- self.backend
- .references_glob(SIGREFS_GLOB.as_str())?
- .map(|reference| -> Result<_, _> {
- let r = reference?;
- let name = r.name().ok_or(refs::Error::InvalidRef)?;
- let (id, _) = git::parse_ref_namespaced::<RemoteId>(name)?;
- let remote = self.remote(&id)?;
-
- Ok((id, remote))
- });
+ pub fn remotes(&self) -> Result<Vec<(RemoteId, Remote)>, refs::Error> {
+ let mut remotes = Vec::new();
+ for id in self.remote_ids()? {
+ let remote = self.remote(&id)?;
+ remotes.push((*id.as_key(), remote));
+ }
Ok(remotes)
}
}
impl RemoteRepository for Repository {
fn remotes(&self) -> Result<Remotes, refs::Error> {
- let mut remotes = Vec::new();
- for remote in Repository::remotes(self)? {
- remotes.push(remote?);
- }
+ let remotes = Repository::remotes(self)?;
Ok(Remotes::from_iter(remotes))
}
@@ -613,8 +586,7 @@ impl RemoteRepository for Repository {
let mut all = Vec::new();
for remote in self.remote_ids()? {
- let remote = remote?;
- let refs_at = RefsAt::new(self, remote)?;
+ let refs_at = RefsAt::new(self, *remote)?;
all.push(refs_at);
}
@@ -676,7 +648,11 @@ impl ReadRepository for Repository {
}
fn is_empty(&self) -> Result<bool, git::raw::Error> {
- Ok(self.remotes()?.next().is_none())
+ Ok(self
+ .backend
+ .references_glob(SIGREFS_GLOB.as_str())?
+ .next()
+ .is_none())
}
fn path(&self) -> &Path {
@@ -876,7 +852,6 @@ impl ReadRepository for Repository {
fn canonical_identity_head(&self) -> Result<Oid, RepositoryError> {
for remote in self.remote_ids()? {
- let remote = remote?;
// Nb. A remote may not have an identity document if the user has not contributed
// any changes to the identity COB.
let Ok(root) = self.identity_root_of(&remote) else {
diff --git a/crates/radicle/src/storage/refs.rs b/crates/radicle/src/storage/refs.rs
index b0164ab05..dbeb3d82a 100644
--- a/crates/radicle/src/storage/refs.rs
+++ b/crates/radicle/src/storage/refs.rs
@@ -44,6 +44,8 @@ pub enum Error {
#[error(transparent)]
UserReferences(#[from] git::repository::user::error::References),
#[error(transparent)]
+ Dids(#[from] git::repository::user::error::Dids),
+ #[error(transparent)]
Read(#[from] sigrefs::read::error::Read),
#[error(transparent)]
Write(#[from] sigrefs::write::error::Write),
commit af27f7fbcc9cbb0224f3b25222662fcbc3a84590
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Tue Apr 28 17:46:06 2026 +0100
git/repository/user: Add listing of DIDs
Add `user::Namespaces` that provides a way to discover the DIDs that
are associated with the repository through references.
Since the current implementation uses `refs/namespaces` listing all
the references provides multiple of the same `Did`.
This can be managed by providing a filter for a well-known, unique
referece, i.e. `rad/sigrefs`; thus, the API supports a filter.
diff --git a/crates/radicle/src/git/repository/user.rs b/crates/radicle/src/git/repository/user.rs
index 3cc921320..9f17285d7 100644
--- a/crates/radicle/src/git/repository/user.rs
+++ b/crates/radicle/src/git/repository/user.rs
@@ -11,7 +11,10 @@ pub mod error;
use std::collections::BTreeMap;
-use radicle_git_ref_format::{self as fmt, Component, Qualified, refname, refspec};
+use crypto::PublicKey;
+use radicle_git_ref_format::{
+ self as fmt, Component, Qualified, RefStr, pattern, refname, refspec,
+};
use radicle_oid::Oid;
use crate::prelude::Did;
@@ -190,3 +193,177 @@ impl<'a, R: reference::Writer> Namespace<'a, R> {
self.repo.delete_ref(&self.namespaced(name))
}
}
+
+/// Discovery of users (namespaces) in a Git repository.
+///
+/// [`Namespaces`] provides iterator-based access to the [`Did`]s that have
+/// references in the repository. The optional `filter_by` suffix narrows the
+/// search — for example, passing `refs/rad/sigrefs` limits discovery to
+/// users that have a signed-refs branch.
+pub struct Namespaces<'a, R> {
+ repo: &'a R,
+}
+
+/// Provide a filter for [`Namespaces::dids`] and
+/// [`Namespaces::dids_with_errors`].
+pub enum FilterBy<'a> {
+ /// Provide a suffix to filter the [`Did`]s by.
+ Suffix(&'a RefStr),
+ /// No filter is provided, returning all [`Did`]s.
+ Empty,
+}
+
+impl<'a> FilterBy<'a> {
+ /// Constructs a [`FilterBy::Suffix`].
+ pub fn suffix<R>(suffix: &'a R) -> Self
+ where
+ R: AsRef<RefStr>,
+ {
+ Self::Suffix(suffix.as_ref())
+ }
+
+ /// Constructs a [`FilterBy::Empty`].
+ pub fn empty() -> Self {
+ Self::Empty
+ }
+}
+
+impl<'a, R> Namespaces<'a, R>
+where
+ R: reference::Reader,
+{
+ /// Create a new [`Namespaces`] handle backed by `repo`.
+ pub fn new(repo: &'a R) -> Self {
+ Self { repo }
+ }
+
+ /// Iterate over discovered [`Did`]s, logging and skipping errors.
+ ///
+ /// When `filter_by` is [`Empty`], all namespaces are returned. When a [`Suffix`]
+ /// is provided (e.g. `refs/rad/sigrefs`), only namespaces containing a
+ /// reference matching that suffix are returned.
+ ///
+ /// **Note**: the returned [`Did`]s may contain duplicates when
+ /// `filter_by` is [`Empty`], since a single namespace can contain multiple
+ /// references.
+ ///
+ /// # Errors
+ ///
+ /// Returns an error if the reference iterator cannot be initialised.
+ ///
+ /// [`Empty`]: FilterBy::Empty
+ /// [`Suffix`]: FilterBy::Suffix
+ pub fn dids(self, filter_by: FilterBy<'_>) -> Result<Dids<R::References<'a>>, error::Dids> {
+ let inner = self.refs_iter(filter_by)?;
+ Ok(Dids { inner })
+ }
+
+ /// Like [`Self::dids`], but yields `Result<Did, NamespaceError>` so the
+ /// caller can handle per-reference failures.
+ ///
+ /// # Errors
+ ///
+ /// Returns an error if the reference iterator cannot be initialised.
+ pub fn dids_with_errors(
+ self,
+ filter_by: FilterBy<'_>,
+ ) -> Result<DidsWithErrors<R::References<'a>>, error::Dids> {
+ let inner = self.refs_iter(filter_by)?;
+ Ok(DidsWithErrors { inner })
+ }
+
+ fn refs_iter(
+ &self,
+ filter_by: FilterBy<'_>,
+ ) -> Result<R::References<'a>, reference::error::read::ListRefs> {
+ let pattern = pattern!("refs/namespaces/*");
+ let pattern = match filter_by {
+ FilterBy::Suffix(suffix) => pattern.join(suffix),
+ FilterBy::Empty => pattern,
+ };
+ self.repo.list_refs(&pattern)
+ }
+}
+
+/// Extract a [`Did`] from a namespaced [`Qualified`] reference name.
+///
+/// Returns `None` if the reference is not namespaced.
+fn to_did(refname: &Qualified<'_>) -> Option<Result<Did, crypto::PublicKeyError>> {
+ let namespaced = refname.to_namespaced()?;
+ let did = namespaced
+ .namespace()
+ .as_str()
+ .parse::<PublicKey>()
+ .map(Did::from);
+ Some(did)
+}
+
+/// Iterator yielding [`Did`]s, logging and skipping errors.
+///
+/// Produced by [`Namespaces::dids`].
+pub struct Dids<I> {
+ inner: I,
+}
+
+impl<I> Iterator for Dids<I>
+where
+ I: Iterator<Item = Result<(Qualified<'static>, Oid), reference::error::read::ListReference>>,
+{
+ type Item = Did;
+
+ fn next(&mut self) -> Option<Self::Item> {
+ loop {
+ match self.inner.next()? {
+ Ok((name, _)) => match to_did(&name) {
+ Some(Ok(did)) => return Some(did),
+ Some(Err(e)) => {
+ log::warn!(target: "radicle", "Skipping namespace with invalid key: {e}");
+ }
+ None => {}
+ },
+ Err(e) => {
+ log::warn!(target: "radicle", "Skipping malformed reference: {e}");
+ }
+ }
+ }
+ }
+}
+
+/// Error produced by [`DidsWithErrors`].
+#[derive(Debug, thiserror::Error)]
+#[non_exhaustive]
+pub enum NamespaceError {
+ /// The namespace component could not be parsed as a [`Did`].
+ #[error("invalid namespace key: {0}")]
+ Did(#[from] crypto::PublicKeyError),
+ /// A reference could not be read or resolved.
+ #[error(transparent)]
+ Reference(#[from] reference::error::read::ListReference),
+}
+
+/// Iterator yielding `Result<Did, NamespaceError>`.
+///
+/// Produced by [`Namespaces::dids_with_errors`].
+pub struct DidsWithErrors<I> {
+ inner: I,
+}
+
+impl<I> Iterator for DidsWithErrors<I>
+where
+ I: Iterator<Item = Result<(Qualified<'static>, Oid), reference::error::read::ListReference>>,
+{
+ type Item = Result<Did, NamespaceError>;
+
+ fn next(&mut self) -> Option<Self::Item> {
+ loop {
+ match self.inner.next()? {
+ Ok((name, _)) => match to_did(&name) {
+ Some(Ok(did)) => return Some(Ok(did)),
+ Some(Err(e)) => return Some(Err(NamespaceError::Did(e))),
+ None => continue,
+ },
+ Err(e) => return Some(Err(NamespaceError::Reference(e))),
+ }
+ }
+ }
+}
diff --git a/crates/radicle/src/git/repository/user/error.rs b/crates/radicle/src/git/repository/user/error.rs
index c794ab90e..32ef2c8fb 100644
--- a/crates/radicle/src/git/repository/user/error.rs
+++ b/crates/radicle/src/git/repository/user/error.rs
@@ -10,3 +10,15 @@ pub enum References {
#[error(transparent)]
ListRefs(#[from] reference::error::read::ListRefs),
}
+
+/// Error returned by [`Namespaces::dids`] and [`Namespaces::dids_with_errors`].
+///
+/// [`Namespaces::dids`]: super::Namespaces::dids
+/// [`Namespaces::dids_with_errors`]: super::Namespaces::dids_with_errors
+#[derive(Debug, thiserror::Error)]
+#[non_exhaustive]
+pub enum Dids {
+ /// Failed to initialise the reference iterator.
+ #[error(transparent)]
+ ListRefs(#[from] reference::error::read::ListRefs),
+}
commit 2f84deba9aa1d1b7aeaf1efba35616592d51df47
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Tue Apr 21 17:23:07 2026 +0100
storage/git: migrate references_of to use user::Namespace
The method `references_of` is refactored to use the `user::Namespace`
mechanism for listing a set of references for a given `Did`.
In this case, the pattern is `refs/*`, i.e. all references.
diff --git a/crates/radicle/src/storage/git.rs b/crates/radicle/src/storage/git.rs
index d85ed2d38..28a389d19 100644
--- a/crates/radicle/src/storage/git.rs
+++ b/crates/radicle/src/storage/git.rs
@@ -13,8 +13,9 @@ use std::{fs, io};
use crate::git::canonical::Quorum;
use crate::git::raw::ErrorExt as _;
-use crate::git::repository;
+use crate::git::repository::{self, user};
use crate::git::repository::{ancestry, object, reference, revwalk};
+use crate::identity::Did;
use crate::identity::doc::DocError;
use crate::identity::{Doc, DocAt, RepoId};
use crate::identity::{Identity, Project};
@@ -758,26 +759,22 @@ impl ReadRepository for Repository {
///
/// [`staging::patch`]: crate::git::refs::storage::staging::patch
fn references_of(&self, remote: &RemoteId) -> Result<Refs, Error> {
- let entries = self
- .backend
- .references_glob(format!("refs/namespaces/{remote}/*").as_str())?;
-
- let mut refs = Refs::new();
+ let did = Did::from(*remote);
+ let user = user::Namespace::new(did, self);
+ let all = user
+ .references(&git::fmt::pattern!("refs/*"))
+ .map_err(|e| Error::from(refs::Error::from(e)))?;
- for e in entries {
- let e = e?;
- let name = e.name().ok_or(Error::InvalidRef)?;
- let (_, refname) = git::parse_ref::<RemoteId>(name)?;
- let oid = e.resolve()?.target().ok_or(Error::InvalidRef)?;
- let (_, category, subcategory, _) = refname.non_empty_components();
-
- match (category.as_str(), subcategory.as_str()) {
- ("tmp", "heads") => continue,
- _ => {
- refs.insert(refname.into(), oid.into());
+ let refs = all
+ .into_iter()
+ .filter_map(|(refname, oid)| {
+ let (_, category, subcategory, _) = refname.non_empty_components();
+ match (category.as_str(), subcategory.as_str()) {
+ ("tmp", "heads") => None,
+ _ => Some((refname.to_ref_string(), oid)),
}
- }
- }
+ })
+ .collect::<Refs>();
Ok(refs)
}
diff --git a/crates/radicle/src/storage/refs.rs b/crates/radicle/src/storage/refs.rs
index 730ec6b9d..b0164ab05 100644
--- a/crates/radicle/src/storage/refs.rs
+++ b/crates/radicle/src/storage/refs.rs
@@ -42,6 +42,8 @@ pub enum Error {
#[error(transparent)]
Git(#[from] git::raw::Error),
#[error(transparent)]
+ UserReferences(#[from] git::repository::user::error::References),
+ #[error(transparent)]
Read(#[from] sigrefs::read::error::Read),
#[error(transparent)]
Write(#[from] sigrefs::write::error::Write),
commit 9a0bf85dfcb17625cfec0b564d5091e26a04982a
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Tue Apr 28 17:29:02 2026 +0100
radicle/storage/refs: impl FromIterator for Refs
Implement the more common form of `FromIterator` for the `Refs` type.
Its idiosyncratic `impl From<I> where I: Iterator` is now implemented
using `collect`.
diff --git a/crates/radicle/src/storage/refs.rs b/crates/radicle/src/storage/refs.rs
index cec31f072..730ec6b9d 100644
--- a/crates/radicle/src/storage/refs.rs
+++ b/crates/radicle/src/storage/refs.rs
@@ -252,6 +252,16 @@ impl IntoIterator for Refs {
}
}
+impl FromIterator<(git::fmt::RefString, Oid)> for Refs {
+ fn from_iter<T: IntoIterator<Item = (git::fmt::RefString, Oid)>>(iter: T) -> Self {
+ iter.into_iter()
+ .fold(Refs::new(), |mut refs, (refname, target)| {
+ refs.insert(refname, target);
+ refs
+ })
+ }
+}
+
impl From<Refs> for BTreeMap<git::fmt::RefString, Oid> {
fn from(refs: Refs) -> Self {
refs.0
@@ -263,11 +273,7 @@ where
I: Iterator<Item = (git::fmt::RefString, Oid)>,
{
fn from(value: I) -> Self {
- let mut refs = Self::new();
- for (refname, target) in value {
- refs.insert(refname, target);
- }
- refs
+ value.into_iter().collect()
}
}
commit b3334426dc9ee4d1432dc78fad681b81f5bd87e4
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Tue Apr 14 15:51:19 2026 +0000
radicle/git/repository: introduce user::Namespace
Introduce a new module under `repository`, called `user`.
The module holds a `Namespace` struct that encapsulates scoping
repository queries to a single given user.
The approach opts to use `Did` to move away from assuming that user's
space is just a single `NodeId` namespace.
For now, the `Did` is a 1-to-1 mapping to `NodeId`, and thus maps to a
single namespace. The hope is that in the future, the `Did` type can
capture an evolvable identity, that could map differently to how to
query a user's references. This API would then, roughly, stay the same.
diff --git a/crates/radicle/src/git/repository.rs b/crates/radicle/src/git/repository.rs
index 73423a00f..993172078 100644
--- a/crates/radicle/src/git/repository.rs
+++ b/crates/radicle/src/git/repository.rs
@@ -16,6 +16,7 @@ pub mod object;
pub mod reference;
pub mod revwalk;
pub mod types;
+pub mod user;
mod adapter;
diff --git a/crates/radicle/src/git/repository/user.rs b/crates/radicle/src/git/repository/user.rs
new file mode 100644
index 000000000..3cc921320
--- /dev/null
+++ b/crates/radicle/src/git/repository/user.rs
@@ -0,0 +1,192 @@
+//! User-scoped Git reference access.
+//!
+//! [`Namespace`] provides read and write access to a single user's references
+//! within a Git repository. Consumers work with [`Qualified`] names (e.g.
+//! `refs/heads/main`); the namespace mapping (`refs/namespaces/<key>/…`) is
+//! handled internally.
+//!
+//! [`Qualified`]: radicle_git_ref_format::Qualified
+
+pub mod error;
+
+use std::collections::BTreeMap;
+
+use radicle_git_ref_format::{self as fmt, Component, Qualified, refname, refspec};
+use radicle_oid::Oid;
+
+use crate::prelude::Did;
+
+use super::reference;
+
+/// The set of references that exist for a user.
+///
+/// See [`Namespace::references`].
+pub struct References {
+ inner: BTreeMap<Qualified<'static>, Oid>,
+}
+
+impl References {
+ fn new() -> Self {
+ Self {
+ inner: BTreeMap::new(),
+ }
+ }
+
+ fn insert(&mut self, refname: Qualified<'static>, oid: Oid) {
+ self.inner.insert(refname, oid);
+ }
+}
+
+impl References {
+ /// Get the target [`Oid`] of the given `refname`, if it exists.
+ pub fn target_of(&self, refname: &Qualified<'static>) -> Option<&Oid> {
+ self.inner.get(refname)
+ }
+}
+
+impl<'a> IntoIterator for &'a References {
+ type Item = (&'a Qualified<'static>, &'a Oid);
+ type IntoIter = std::collections::btree_map::Iter<'a, Qualified<'static>, Oid>;
+
+ fn into_iter(self) -> Self::IntoIter {
+ self.inner.iter()
+ }
+}
+
+impl IntoIterator for References {
+ type Item = (Qualified<'static>, Oid);
+ type IntoIter = std::collections::btree_map::IntoIter<Qualified<'static>, Oid>;
+
+ fn into_iter(self) -> Self::IntoIter {
+ self.inner.into_iter()
+ }
+}
+
+/// User-scoped reference handle.
+///
+/// Wraps a repository `R` and a [`Did`], translating [`Qualified`] reference
+/// names into their namespaced physical location.
+pub struct Namespace<'a, R> {
+ did: Did,
+ repo: &'a R,
+}
+
+impl<'a, R> Namespace<'a, R> {
+ /// Create a new [`Namespace`] for `did` backed by `repo`.
+ pub fn new(did: Did, repo: &'a R) -> Self {
+ Self { did, repo }
+ }
+
+ /// The [`Did`] this handle is scoped to.
+ pub fn did(&self) -> Did {
+ self.did
+ }
+
+ /// Map a [`Qualified`] reference to its namespaced form.
+ fn namespaced<'b>(&self, name: &Qualified<'b>) -> fmt::Namespaced<'b> {
+ name.with_namespace(fmt::Component::from(self.did.as_key()))
+ }
+}
+
+impl<'a, R: reference::Reader> Namespace<'a, R> {
+ /// Resolve a reference to its target [`Oid`].
+ ///
+ /// Returns `None` if the reference does not exist for this user.
+ ///
+ /// # Errors
+ ///
+ /// - [`Backend`]: An unexpected error from the underlying git library.
+ ///
+ /// [`Backend`]: reference::error::read::RefTarget::Backend
+ pub fn ref_target(
+ &self,
+ name: &Qualified,
+ ) -> Result<Option<Oid>, reference::error::read::RefTarget> {
+ self.repo.ref_target(&self.namespaced(name))
+ }
+
+ /// Resolve a reference to its target [`Oid`], returning an error if it does
+ /// not exist.
+ ///
+ /// # Errors
+ ///
+ /// - [`NotFound`]: The reference does not exist for this user.
+ /// - [`Backend`]: An unexpected error from the underlying git library.
+ ///
+ /// [`NotFound`]: reference::error::read::RefTarget::NotFound
+ /// [`Backend`]: reference::error::read::RefTarget::Backend
+ pub fn try_ref_target(
+ &self,
+ name: &Qualified,
+ ) -> Result<Oid, reference::error::read::RefTarget> {
+ self.repo.try_ref_target(&self.namespaced(name))
+ }
+
+ /// List all references for this user matching a glob pattern.
+ ///
+ /// The `pattern` is relative to the user's namespace. For example,
+ /// `refs/*` matches all references, and `refs/heads/*` matches only
+ /// branches.
+ ///
+ /// Each returned [`Qualified`] has the namespace stripped — callers see
+ /// `refs/heads/main`, not `refs/namespaces/<key>/refs/heads/main`.
+ ///
+ /// Per-reference failures (parse or peel errors) are logged and skipped.
+ ///
+ /// # Errors
+ ///
+ /// - [`ListRefs`]: An unexpected error when initialising the iterator.
+ ///
+ /// [`ListRefs`]: error::References::ListRefs
+ pub fn references(
+ &self,
+ pattern: &refspec::PatternStr,
+ ) -> Result<References, error::References> {
+ let namespaced = refname!("refs/namespaces")
+ .join(Component::from(self.did.as_key()))
+ .to_pattern(pattern);
+
+ let refs = self.repo.list_refs(&namespaced)?;
+ let references = refs.fold(References::new(), |mut refs, entry| {
+ match entry {
+ Ok((name, oid)) => {
+ if let Some(ns) = name.to_namespaced() {
+ refs.insert(ns.strip_namespace(), oid);
+ }
+ }
+ Err(e) => {
+ log::warn!("Skipping reference: {e}");
+ }
+ }
+ refs
+ });
+ Ok(references)
+ }
+}
+
+impl<'a, R: reference::Writer> Namespace<'a, R> {
+ /// Set a reference for this user.
+ ///
+ /// # Errors
+ ///
+ /// See [`reference::Writer::write_ref`] for error details.
+ pub fn write_ref(
+ &self,
+ name: &Qualified,
+ target: reference::Target,
+ reflog: &str,
+ ) -> Result<(), reference::error::write::WriteRef> {
+ self.repo.write_ref(&self.namespaced(name), target, reflog)
+ }
+
+ /// Delete a reference for this user.
+ ///
+ /// This operation is idempotent.
+ ///
+ /// # Errors
+ ///
+ /// See [`reference::Writer::delete_ref`] for error details.
+ pub fn delete_ref(&self, name: &Qualified) -> Result<(), reference::error::write::DeleteRef> {
+ self.repo.delete_ref(&self.namespaced(name))
+ }
+}
diff --git a/crates/radicle/src/git/repository/user/error.rs b/crates/radicle/src/git/repository/user/error.rs
new file mode 100644
index 000000000..c794ab90e
--- /dev/null
+++ b/crates/radicle/src/git/repository/user/error.rs
@@ -0,0 +1,12 @@
+use crate::git::repository::reference;
+
+/// Error returned by [`Namespace::references`].
+///
+/// [`Namespace::references`]: super::Namespace::references
+#[derive(Debug, thiserror::Error)]
+#[non_exhaustive]
+pub enum References {
+ /// Failed to initialise the reference iterator.
+ #[error(transparent)]
+ ListRefs(#[from] reference::error::read::ListRefs),
+}
commit fb4d84927c228d59d48afb997ff35385a2898f95
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Tue Apr 14 15:36:06 2026 +0000
canonical: Replace FindObjects trait with struct
Convert `FindObjects` from an effect trait into a struct parameterised
over `RefReader` and `ObjectReader`.
The struct provides a `FindObjects::resolve` method for determining
the objects, same as before.
diff --git a/crates/radicle-remote-helper/src/push/canonical.rs b/crates/radicle-remote-helper/src/push/canonical.rs
index be603f6e2..c58f540dd 100644
--- a/crates/radicle-remote-helper/src/push/canonical.rs
+++ b/crates/radicle-remote-helper/src/push/canonical.rs
@@ -1,9 +1,10 @@
use radicle::git;
use radicle::git::canonical;
use radicle::git::canonical::QuorumWithConvergence;
-use radicle::git::canonical::effects;
use radicle::git::canonical::error::QuorumError;
use radicle::git::repository;
+use radicle::git::repository::object;
+use radicle::git::repository::reference;
use radicle::prelude::Did;
/// Validates a vote to update a canonical reference during push.
@@ -13,7 +14,7 @@ pub(crate) struct Canonical<'a, 'b, 'r, R> {
impl<'a, 'b, 'r, R> Canonical<'a, 'b, 'r, R>
where
- R: repository::Ancestry + effects::FindObjects,
+ R: repository::Ancestry + reference::Reader + object::Reader,
{
pub(super) fn new(
me: Did,
diff --git a/crates/radicle/src/git/canonical.rs b/crates/radicle/src/git/canonical.rs
index 06d15eb2d..322f01436 100644
--- a/crates/radicle/src/git/canonical.rs
+++ b/crates/radicle/src/git/canonical.rs
@@ -95,7 +95,7 @@ impl<'a, 'b, 'r, R> AsRef<Canonical<'a, 'b, 'r, R, ObjectsFound>>
impl<'a, 'b, 'r, R> Canonical<'a, 'b, 'r, R, Initial>
where
- R: repository::Ancestry + effects::FindObjects,
+ R: repository::Ancestry + repository::reference::Reader + repository::object::Reader,
{
/// Construct a new [`Canonical`] with the given [`Qualified`] reference, a
/// canonical reference [`ValidRule`] for that reference, and the Git
@@ -116,13 +116,12 @@ where
pub fn find_objects(
self,
) -> Result<Canonical<'a, 'b, 'r, R, ObjectsFound>, effects::FindObjectsError> {
+ let allowed: Vec<_> = self.rule.allowed().iter().copied().collect();
let FoundObjects {
objects,
missing_refs,
missing_objects,
- } = self
- .repo
- .find_objects(&self.refname, self.rule.allowed().iter())?;
+ } = effects::FindObjects::new(self.repo, &self.refname, &allowed).resolve()?;
let missing = Missing {
refs: missing_refs,
objects: missing_objects,
@@ -140,7 +139,7 @@ where
impl<'a, 'b, 'r, R> Canonical<'a, 'b, 'r, R, ObjectsFound>
where
- R: repository::Ancestry + effects::FindObjects,
+ R: repository::Ancestry + repository::reference::Reader + repository::object::Reader,
{
/// Adds the check for convergence before finding the quorum.
pub fn with_convergence(
@@ -243,7 +242,7 @@ where
impl<'a, 'b, 'r, R> CanonicalWithConvergence<'a, 'b, 'r, R>
where
- R: repository::Ancestry + effects::FindObjects,
+ R: repository::Ancestry + repository::reference::Reader + repository::object::Reader,
{
/// Find the [`QuorumWithConvergence`] for the canonical computation.
pub fn quorum(mut self) -> Result<QuorumWithConvergence<'a>, QuorumError> {
@@ -405,6 +404,19 @@ impl Object {
})
}
+ /// Construct an [`Object`] from an [`Oid`] and its [`ObjectKind`].
+ ///
+ /// Returns `None` if the kind is not a commit or tag.
+ ///
+ /// [`ObjectKind`]: repository::ObjectKind
+ pub fn from_kind(id: Oid, kind: repository::ObjectKind) -> Option<Self> {
+ match kind {
+ repository::ObjectKind::Commit => Some(Self::Commit { id }),
+ repository::ObjectKind::Tag => Some(Self::Tag { id }),
+ _ => None,
+ }
+ }
+
/// The [`Oid`] of the [`Object`]
pub fn id(&self) -> Oid {
match self {
diff --git a/crates/radicle/src/git/canonical/effects.rs b/crates/radicle/src/git/canonical/effects.rs
index 334b654ed..39f8959c5 100644
--- a/crates/radicle/src/git/canonical/effects.rs
+++ b/crates/radicle/src/git/canonical/effects.rs
@@ -3,51 +3,94 @@ use std::collections::{BTreeMap, BTreeSet};
use crate::git;
use crate::git::Oid;
use crate::git::fmt::Qualified;
-use crate::git::raw::ErrorExt as _;
+use crate::git::repository::object;
+use crate::git::repository::reference;
use crate::prelude::Did;
use super::{FoundObjects, Object};
-/// Find objects for the canonical computation.
-///
-/// Typically implemented by a Git repository.
-pub trait FindObjects {
- /// Find the objects for the given [`Qualified`] reference name, for each
- /// [`Did`]'s namespace.
- ///
- /// The resulting [`FoundObjects`] includes all objects that were found, the
- /// references that were missing, and the objects that were missing (if the
- /// reference was found).
- fn find_objects<'a, 'b, I>(
- &self,
- refname: &Qualified<'a>,
- dids: I,
- ) -> Result<FoundObjects, FindObjectsError>
- where
- I: Iterator<Item = &'b Did>;
+/// Finds objects for the canonical computation by resolving namespaced
+/// references and determining their object types.
+pub struct FindObjects<'a, 'b, R> {
+ repository: &'a R,
+ refname: &'b Qualified<'b>,
+ dids: &'b [Did],
}
-/// Error produced by the [`FindObjects::find_objects`] method.
+impl<'a, 'b, R> FindObjects<'a, 'b, R>
+where
+ R: reference::Reader + object::Reader,
+{
+ /// Construct a new [`FindObjects`] query.
+ pub fn new(repository: &'a R, refname: &'b Qualified<'b>, dids: &'b [Did]) -> Self {
+ Self {
+ repository,
+ refname,
+ dids,
+ }
+ }
+
+ /// Resolve all references and produce the [`FoundObjects`].
+ pub fn resolve(self) -> Result<FoundObjects, FindObjectsError> {
+ let mut objects = BTreeMap::new();
+ let mut missing_refs = BTreeSet::new();
+ let mut missing_objects = BTreeMap::new();
+
+ for did in self.dids {
+ let name = self.refname.with_namespace(did.as_key().into());
+
+ let oid = match self.repository.ref_target(&name) {
+ Ok(Some(oid)) => oid,
+ Ok(None) => {
+ missing_refs.insert(name.to_owned());
+ continue;
+ }
+ Err(e) => {
+ return Err(FindObjectsError::find_reference(name.to_owned(), e));
+ }
+ };
+
+ let kind = match self.repository.object_kind(oid) {
+ Ok(Some(kind)) => kind,
+ Ok(None) => {
+ missing_objects.insert(*did, oid);
+ continue;
+ }
+ Err(e) => return Err(FindObjectsError::find_object(oid, e)),
+ };
+
+ let object = Object::from_kind(oid, kind).ok_or_else(|| {
+ FindObjectsError::invalid_object_type(*did, oid, Some(kind.to_string()))
+ })?;
+
+ objects.insert(*did, object);
+ }
+
+ Ok(FoundObjects {
+ objects,
+ missing_refs,
+ missing_objects,
+ })
+ }
+}
+
+/// Error produced by [`FindObjects::resolve`].
#[derive(Debug, thiserror::Error)]
pub enum FindObjectsError {
#[error(transparent)]
InvalidObjectType(#[from] InvalidObjectType),
#[error(transparent)]
MissingObject(#[from] MissingObject),
- #[error("failed to find object {oid} due to: {source}")]
+ #[error("failed to find object {oid}: {source}")]
FindObject {
oid: Oid,
source: Box<dyn std::error::Error + Send + Sync + 'static>,
},
- #[error("failed to find reference {refname} due to: {source}")]
+ #[error("failed to find reference {refname}: {source}")]
FindReference {
refname: git::fmt::Namespaced<'static>,
source: Box<dyn std::error::Error + Send + Sync + 'static>,
},
- #[error("failed to find objects")]
- Other {
- source: Box<dyn std::error::Error + Send + Sync + 'static>,
- },
}
impl FindObjectsError {
@@ -86,15 +129,6 @@ impl FindObjectsError {
pub fn invalid_object_type(did: Did, oid: Oid, kind: Option<String>) -> Self {
InvalidObjectType { did, oid, kind }.into()
}
-
- pub fn other<E>(err: E) -> Self
- where
- E: std::error::Error + Send + Sync + 'static,
- {
- Self::Other {
- source: Box::new(err),
- }
- }
}
#[derive(Debug, thiserror::Error)]
@@ -112,59 +146,3 @@ pub struct MissingObject {
commit: Oid,
source: Box<dyn std::error::Error + Send + Sync + 'static>,
}
-
-// ===========================================
-// `git2` implementations of the above effects
-// ===========================================
-
-impl FindObjects for git::raw::Repository {
- fn find_objects<'a, 'b, I>(
- &self,
- refname: &Qualified,
- dids: I,
- ) -> Result<FoundObjects, FindObjectsError>
- where
- I: Iterator<Item = &'b Did>,
- {
- let mut objects = BTreeMap::new();
- let mut missing_refs = BTreeSet::new();
- let mut missing_objects = BTreeMap::new();
- for did in dids {
- let name = &refname.with_namespace(did.as_key().into());
- let reference = match self.find_reference(name.as_str()) {
- Ok(reference) => reference,
- Err(e) if e.is_not_found() => {
- missing_refs.insert(name.to_owned());
- continue;
- }
- Err(e) => {
- return Err(FindObjectsError::find_reference(name.to_owned(), e));
- }
- };
- let Some(oid) = reference.target().map(Oid::from) else {
- log::warn!(target: "radicle", "Missing target for reference `{name}`");
- continue;
- };
- let object = match self.find_object(oid.into(), None) {
- Ok(object) => Object::new(&object).ok_or_else(|| {
- FindObjectsError::invalid_object_type(
- *did,
- oid,
- object.kind().map(|kind| kind.to_string()),
- )
- }),
- Err(err) if err.is_not_found() => {
- missing_objects.insert(*did, oid);
- continue;
- }
- Err(err) => Err(FindObjectsError::find_object(oid, err)),
- };
- objects.insert(*did, object?);
- }
- Ok(FoundObjects {
- objects,
- missing_refs,
- missing_objects,
- })
- }
-}
diff --git a/crates/radicle/src/git/canonical/rules.rs b/crates/radicle/src/git/canonical/rules.rs
index 8760af8f6..e9f4e94bb 100644
--- a/crates/radicle/src/git/canonical/rules.rs
+++ b/crates/radicle/src/git/canonical/rules.rs
@@ -20,11 +20,12 @@ use serde::{Deserialize, Serialize};
use serde_json as json;
use thiserror::Error;
+use crate::git;
use crate::git::canonical;
use crate::git::canonical::Canonical;
use crate::git::fmt::Qualified;
use crate::git::fmt::refspec::QualifiedPattern;
-use crate::git::{self, repository};
+use crate::git::repository;
use crate::identity::{Did, doc};
use super::protect;
@@ -547,7 +548,7 @@ impl Rules {
repo: &'r R,
) -> Option<Canonical<'b, 'a, 'r, R, canonical::Initial>>
where
- R: repository::Ancestry + canonical::effects::FindObjects,
+ R: repository::Ancestry + repository::reference::Reader + repository::object::Reader,
{
self.matches(&refname)
.next()
diff --git a/crates/radicle/src/storage/git.rs b/crates/radicle/src/storage/git.rs
index 8fe2c75de..d85ed2d38 100644
--- a/crates/radicle/src/storage/git.rs
+++ b/crates/radicle/src/storage/git.rs
@@ -308,19 +308,6 @@ impl AsRef<Repository> for Repository {
}
}
-impl git::canonical::effects::FindObjects for Repository {
- fn find_objects<'a, 'b, I>(
- &self,
- refname: &Qualified<'a>,
- dids: I,
- ) -> Result<git::canonical::FoundObjects, git::canonical::effects::FindObjectsError>
- where
- I: Iterator<Item = &'b crate::prelude::Did>,
- {
- git::canonical::effects::FindObjects::find_objects(&self.backend, refname, dids)
- }
-}
-
/// A set of [`Validation`] errors that a caller **must use**.
#[must_use]
#[derive(Debug, Default)]
commit 5b4da8a660884c7d5b486e4a6580512b1c347b80
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Tue Apr 14 16:31:30 2026 +0100
radicle/git/repository: Add object_kind to ObjectReader
Add another method, `ObjectReader::object_kind`, to inspect the kind
of object for a give `Oid`, if it exists.
This is useful if a caller wants to inspect the kind of the object
without loading the whole object itself.
diff --git a/crates/radicle/src/git/repository/adapter/git2/object.rs b/crates/radicle/src/git/repository/adapter/git2/object.rs
index af63908f7..aa80f7b5a 100644
--- a/crates/radicle/src/git/repository/adapter/git2/object.rs
+++ b/crates/radicle/src/git/repository/adapter/git2/object.rs
@@ -65,6 +65,15 @@ impl object::Reader for raw::Repository {
.map(|odb| odb.exists(oid.into()))
.map_err(error::read::Exists::backend)
}
+
+ fn object_kind(&self, oid: Oid) -> Result<Option<ObjectKind>, read::ObjectKind> {
+ let odb = self.odb().map_err(read::ObjectKind::backend)?;
+ match odb.read(oid.into()) {
+ Ok(obj) => Ok(Some(object_kind(obj.kind()))),
+ Err(e) if matches!(e.code(), git2::ErrorCode::NotFound) => Ok(None),
+ Err(e) => Err(read::ObjectKind::backend(e)),
+ }
+ }
}
impl object::Writer for raw::Repository {
diff --git a/crates/radicle/src/git/repository/object.rs b/crates/radicle/src/git/repository/object.rs
index b4983855a..b7e701d62 100644
--- a/crates/radicle/src/git/repository/object.rs
+++ b/crates/radicle/src/git/repository/object.rs
@@ -10,7 +10,7 @@ use std::path::Path;
use radicle_oid::Oid;
-use super::types::{Blob, Commit, TreeEntry};
+use super::types::{Blob, Commit, ObjectKind, TreeEntry};
/// A handle for reading Git objects from the Git object database.
pub trait Reader {
@@ -129,6 +129,17 @@ pub trait Reader {
///
/// [`Backend`]: error::read::Exists::Backend
fn exists(&self, oid: Oid) -> Result<bool, error::read::Exists>;
+
+ /// Determine the kind of an object without reading its full content.
+ ///
+ /// Returns `None` if the object does not exist.
+ ///
+ /// # Errors
+ ///
+ /// - [`Backend`]: An unexpected error from the underlying git library.
+ ///
+ /// [`Backend`]: error::read::ObjectKind::Backend
+ fn object_kind(&self, oid: Oid) -> Result<Option<ObjectKind>, error::read::ObjectKind>;
}
/// Write Git objects to the Git object database.
diff --git a/crates/radicle/src/git/repository/object/error/read.rs b/crates/radicle/src/git/repository/object/error/read.rs
index f61ada570..175b3b529 100644
--- a/crates/radicle/src/git/repository/object/error/read.rs
+++ b/crates/radicle/src/git/repository/object/error/read.rs
@@ -121,3 +121,20 @@ impl Exists {
Self::Backend(Box::new(err))
}
}
+
+/// Error returned by [`ObjectReader::object_kind`].
+///
+/// [`ObjectReader::object_kind`]: super::super::Reader::object_kind
+#[derive(Debug, Error)]
+#[non_exhaustive]
+pub enum ObjectKind {
+ /// An error from the underlying git library.
+ #[error(transparent)]
+ Backend(Box<dyn std::error::Error + Send + Sync + 'static>),
+}
+
+impl ObjectKind {
+ pub fn backend<E: std::error::Error + Send + Sync + 'static>(err: E) -> Self {
+ Self::Backend(Box::new(err))
+ }
+}
diff --git a/crates/radicle/src/storage/git.rs b/crates/radicle/src/storage/git.rs
index 525e366f1..8fe2c75de 100644
--- a/crates/radicle/src/storage/git.rs
+++ b/crates/radicle/src/storage/git.rs
@@ -1089,6 +1089,13 @@ impl object::Reader for Repository {
fn exists(&self, oid: Oid) -> Result<bool, object::error::read::Exists> {
object::Reader::exists(&self.backend, oid)
}
+
+ fn object_kind(
+ &self,
+ oid: Oid,
+ ) -> Result<Option<git::repository::ObjectKind>, object::error::read::ObjectKind> {
+ object::Reader::object_kind(&self.backend, oid)
+ }
}
impl object::Writer for Repository {
diff --git a/crates/radicle/src/storage/refs/sigrefs/read/test/mock.rs b/crates/radicle/src/storage/refs/sigrefs/read/test/mock.rs
index ae1aec026..dbdb4a895 100644
--- a/crates/radicle/src/storage/refs/sigrefs/read/test/mock.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/read/test/mock.rs
@@ -213,6 +213,13 @@ impl object::Reader for MockRepository {
fn exists(&self, _oid: Oid) -> Result<bool, object::error::read::Exists> {
unimplemented!("MockRepository::exists")
}
+
+ fn object_kind(
+ &self,
+ _oid: Oid,
+ ) -> Result<Option<crate::git::repository::ObjectKind>, object::error::read::ObjectKind> {
+ unimplemented!("MockRepository::object_kind")
+ }
}
impl reference::Reader for MockRepository {
diff --git a/crates/radicle/src/storage/refs/sigrefs/write/test/mock.rs b/crates/radicle/src/storage/refs/sigrefs/write/test/mock.rs
index 9054dee2a..7d2917548 100644
--- a/crates/radicle/src/storage/refs/sigrefs/write/test/mock.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/write/test/mock.rs
@@ -240,6 +240,13 @@ impl object::Reader for MockRepository {
fn exists(&self, _oid: Oid) -> Result<bool, object::error::read::Exists> {
unimplemented!("MockRepository::exists")
}
+
+ fn object_kind(
+ &self,
+ _oid: Oid,
+ ) -> Result<Option<crate::git::repository::ObjectKind>, object::error::read::ObjectKind> {
+ unimplemented!("MockRepository::object_kind")
+ }
}
impl reference::Reader for MockRepository {
commit 4bfb04aed08820690cf927c6ae5620e08a40b219
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Tue Apr 14 16:11:40 2026 +0100
canonical: replace FindMergeBase with repository::Ancestry
Remove the FindMergeBase effect trait entirely. The canonical quorum
code now calls repository::Ancestry::merge_base directly.
diff --git a/crates/radicle-remote-helper/src/push/canonical.rs b/crates/radicle-remote-helper/src/push/canonical.rs
index 70748d628..be603f6e2 100644
--- a/crates/radicle-remote-helper/src/push/canonical.rs
+++ b/crates/radicle-remote-helper/src/push/canonical.rs
@@ -13,7 +13,7 @@ pub(crate) struct Canonical<'a, 'b, 'r, R> {
impl<'a, 'b, 'r, R> Canonical<'a, 'b, 'r, R>
where
- R: repository::Ancestry + effects::FindMergeBase + effects::FindObjects,
+ R: repository::Ancestry + effects::FindObjects,
{
pub(super) fn new(
me: Did,
diff --git a/crates/radicle/src/git/canonical.rs b/crates/radicle/src/git/canonical.rs
index a49e1466c..06d15eb2d 100644
--- a/crates/radicle/src/git/canonical.rs
+++ b/crates/radicle/src/git/canonical.rs
@@ -95,7 +95,7 @@ impl<'a, 'b, 'r, R> AsRef<Canonical<'a, 'b, 'r, R, ObjectsFound>>
impl<'a, 'b, 'r, R> Canonical<'a, 'b, 'r, R, Initial>
where
- R: repository::Ancestry + effects::FindMergeBase + effects::FindObjects,
+ R: repository::Ancestry + effects::FindObjects,
{
/// Construct a new [`Canonical`] with the given [`Qualified`] reference, a
/// canonical reference [`ValidRule`] for that reference, and the Git
@@ -140,7 +140,7 @@ where
impl<'a, 'b, 'r, R> Canonical<'a, 'b, 'r, R, ObjectsFound>
where
- R: repository::Ancestry + effects::FindMergeBase + effects::FindObjects,
+ R: repository::Ancestry + effects::FindObjects,
{
/// Adds the check for convergence before finding the quorum.
pub fn with_convergence(
@@ -161,7 +161,10 @@ where
while let ControlFlow::Continue(pairs) = finder.find_merge_bases() {
let mut bases = Vec::with_capacity(pairs.size_hint().0);
for (a, b) in pairs {
- bases.push(effects::FindMergeBase::merge_base(self.repo, a, b)?);
+ let base = repository::Ancestry::merge_base(self.repo, a, b)
+ .map_err(|e| MergeBaseError::new(a, b, e))?
+ .ok_or_else(|| MergeBaseError::no_common_ancestor(a, b))?;
+ bases.push(MergeBase { a, b, base });
}
finder.found_merge_bases(bases.into_iter());
}
@@ -232,11 +235,7 @@ where
head: candidate,
},
(CommitQuorumFailure::NoMergeBase { a, b }, _) => {
- #[derive(thiserror::Error, Debug)]
- #[error("no existing merge base found for commit quorum")]
- struct NoMergeBase;
-
- effects::MergeBaseError::new(a, b, NoMergeBase).into()
+ MergeBaseError::no_merge_base(a, b).into()
}
}
}
@@ -244,7 +243,7 @@ where
impl<'a, 'b, 'r, R> CanonicalWithConvergence<'a, 'b, 'r, R>
where
- R: repository::Ancestry + effects::FindMergeBase + effects::FindObjects,
+ R: repository::Ancestry + effects::FindObjects,
{
/// Find the [`QuorumWithConvergence`] for the canonical computation.
pub fn quorum(mut self) -> Result<QuorumWithConvergence<'a>, QuorumError> {
diff --git a/crates/radicle/src/git/canonical/effects.rs b/crates/radicle/src/git/canonical/effects.rs
index dbbbfcafc..334b654ed 100644
--- a/crates/radicle/src/git/canonical/effects.rs
+++ b/crates/radicle/src/git/canonical/effects.rs
@@ -6,7 +6,7 @@ use crate::git::fmt::Qualified;
use crate::git::raw::ErrorExt as _;
use crate::prelude::Did;
-use super::{FoundObjects, MergeBase, Object};
+use super::{FoundObjects, Object};
/// Find objects for the canonical computation.
///
@@ -113,55 +113,10 @@ pub struct MissingObject {
source: Box<dyn std::error::Error + Send + Sync + 'static>,
}
-/// Find the merge base of two commits.
-///
-/// Typically implemented by a Git repository.
-pub trait FindMergeBase {
- /// Produce the [`MergeBase`] of commits `a` and `b`.
- fn merge_base(&self, a: Oid, b: Oid) -> Result<MergeBase, MergeBaseError>;
-}
-
-#[derive(Debug, thiserror::Error)]
-#[error("failed to find merge base for {a} and {b} due to: {source}")]
-pub struct MergeBaseError {
- a: Oid,
- b: Oid,
- source: Box<dyn std::error::Error + Send + Sync + 'static>,
-}
-
-impl MergeBaseError {
- pub fn new<E>(a: Oid, b: Oid, source: E) -> Self
- where
- E: std::error::Error + Send + Sync + 'static,
- {
- Self {
- a,
- b,
- source: Box::new(source),
- }
- }
-}
-
// ===========================================
// `git2` implementations of the above effects
// ===========================================
-impl FindMergeBase for git::raw::Repository {
- fn merge_base(&self, a: Oid, b: Oid) -> Result<MergeBase, MergeBaseError> {
- self.merge_base(a.into(), b.into())
- .map_err(|err| MergeBaseError {
- a,
- b,
- source: Box::new(err),
- })
- .map(|base| MergeBase {
- a,
- b,
- base: base.into(),
- })
- }
-}
-
impl FindObjects for git::raw::Repository {
fn find_objects<'a, 'b, I>(
&self,
diff --git a/crates/radicle/src/git/canonical/error.rs b/crates/radicle/src/git/canonical/error.rs
index b80f9a814..5fb268549 100644
--- a/crates/radicle/src/git/canonical/error.rs
+++ b/crates/radicle/src/git/canonical/error.rs
@@ -5,7 +5,47 @@ use crate::git::Oid;
use crate::git::repository::ancestry;
use super::{ObjectType, effects};
-pub use effects::{FindObjectsError, MergeBaseError};
+pub use effects::FindObjectsError;
+
+/// An error that occurred while computing a merge base.
+///
+/// Carries the two commit OIDs for context.
+#[derive(Debug, thiserror::Error)]
+#[error("failed to find merge base for {a} and {b}: {source}")]
+pub struct MergeBaseError {
+ a: Oid,
+ b: Oid,
+ source: Box<dyn std::error::Error + Send + Sync + 'static>,
+}
+
+#[derive(thiserror::Error, Debug)]
+#[error("no existing merge base found for commit quorum")]
+struct NoMergeBase;
+
+#[derive(thiserror::Error, Debug)]
+#[error("no common ancestor")]
+struct NoCommonAncestor;
+
+impl MergeBaseError {
+ pub fn new<E>(a: Oid, b: Oid, source: E) -> Self
+ where
+ E: std::error::Error + Send + Sync + 'static,
+ {
+ Self {
+ a,
+ b,
+ source: Box::new(source),
+ }
+ }
+
+ pub(super) fn no_merge_base(a: Oid, b: Oid) -> Self {
+ Self::new(a, b, NoMergeBase)
+ }
+
+ pub(super) fn no_common_ancestor(a: Oid, b: Oid) -> Self {
+ Self::new(a, b, NoCommonAncestor)
+ }
+}
#[derive(Debug, Error)]
pub enum QuorumError {
diff --git a/crates/radicle/src/git/canonical/rules.rs b/crates/radicle/src/git/canonical/rules.rs
index d44b3adb6..8760af8f6 100644
--- a/crates/radicle/src/git/canonical/rules.rs
+++ b/crates/radicle/src/git/canonical/rules.rs
@@ -547,9 +547,7 @@ impl Rules {
repo: &'r R,
) -> Option<Canonical<'b, 'a, 'r, R, canonical::Initial>>
where
- R: repository::Ancestry
- + canonical::effects::FindMergeBase
- + canonical::effects::FindObjects,
+ R: repository::Ancestry + canonical::effects::FindObjects,
{
self.matches(&refname)
.next()
diff --git a/crates/radicle/src/storage/git.rs b/crates/radicle/src/storage/git.rs
index ad5403b49..525e366f1 100644
--- a/crates/radicle/src/storage/git.rs
+++ b/crates/radicle/src/storage/git.rs
@@ -308,16 +308,6 @@ impl AsRef<Repository> for Repository {
}
}
-impl git::canonical::effects::FindMergeBase for Repository {
- fn merge_base(
- &self,
- a: Oid,
- b: Oid,
- ) -> Result<git::canonical::MergeBase, git::canonical::effects::MergeBaseError> {
- git::canonical::effects::FindMergeBase::merge_base(&self.backend, a, b)
- }
-}
-
impl git::canonical::effects::FindObjects for Repository {
fn find_objects<'a, 'b, I>(
&self,
commit 3a6785419cab8139fe998cc7d47ba7b1bdc8c727
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Tue Apr 14 15:10:20 2026 +0000
canonical: replace effects::Ancestry with repository::Ancestry
Replace the canonical-specific effects::Ancestry trait with the shared
git::repository::Ancestry trait.
This is the first step to remove the need for individual effects for
canonical computation.
diff --git a/crates/radicle-remote-helper/src/push/canonical.rs b/crates/radicle-remote-helper/src/push/canonical.rs
index 63331646e..70748d628 100644
--- a/crates/radicle-remote-helper/src/push/canonical.rs
+++ b/crates/radicle-remote-helper/src/push/canonical.rs
@@ -3,6 +3,7 @@ use radicle::git::canonical;
use radicle::git::canonical::QuorumWithConvergence;
use radicle::git::canonical::effects;
use radicle::git::canonical::error::QuorumError;
+use radicle::git::repository;
use radicle::prelude::Did;
/// Validates a vote to update a canonical reference during push.
@@ -12,7 +13,7 @@ pub(crate) struct Canonical<'a, 'b, 'r, R> {
impl<'a, 'b, 'r, R> Canonical<'a, 'b, 'r, R>
where
- R: effects::Ancestry + effects::FindMergeBase + effects::FindObjects,
+ R: repository::Ancestry + effects::FindMergeBase + effects::FindObjects,
{
pub(super) fn new(
me: Did,
diff --git a/crates/radicle/src/git/canonical.rs b/crates/radicle/src/git/canonical.rs
index ce49a0e48..a49e1466c 100644
--- a/crates/radicle/src/git/canonical.rs
+++ b/crates/radicle/src/git/canonical.rs
@@ -22,6 +22,7 @@ use std::marker::PhantomData;
use std::ops::ControlFlow;
use crate::git::fmt::Namespaced;
+use crate::git::repository;
use crate::prelude::Did;
@@ -94,7 +95,7 @@ impl<'a, 'b, 'r, R> AsRef<Canonical<'a, 'b, 'r, R, ObjectsFound>>
impl<'a, 'b, 'r, R> Canonical<'a, 'b, 'r, R, Initial>
where
- R: effects::Ancestry + effects::FindMergeBase + effects::FindObjects,
+ R: repository::Ancestry + effects::FindMergeBase + effects::FindObjects,
{
/// Construct a new [`Canonical`] with the given [`Qualified`] reference, a
/// canonical reference [`ValidRule`] for that reference, and the Git
@@ -139,7 +140,7 @@ where
impl<'a, 'b, 'r, R> Canonical<'a, 'b, 'r, R, ObjectsFound>
where
- R: effects::Ancestry + effects::FindMergeBase + effects::FindObjects,
+ R: repository::Ancestry + effects::FindMergeBase + effects::FindObjects,
{
/// Adds the check for convergence before finding the quorum.
pub fn with_convergence(
@@ -160,7 +161,7 @@ where
while let ControlFlow::Continue(pairs) = finder.find_merge_bases() {
let mut bases = Vec::with_capacity(pairs.size_hint().0);
for (a, b) in pairs {
- bases.push(self.repo.merge_base(a, b)?);
+ bases.push(effects::FindMergeBase::merge_base(self.repo, a, b)?);
}
finder.found_merge_bases(bases.into_iter());
}
@@ -243,7 +244,7 @@ where
impl<'a, 'b, 'r, R> CanonicalWithConvergence<'a, 'b, 'r, R>
where
- R: effects::Ancestry + effects::FindMergeBase + effects::FindObjects,
+ R: repository::Ancestry + effects::FindMergeBase + effects::FindObjects,
{
/// Find the [`QuorumWithConvergence`] for the canonical computation.
pub fn quorum(mut self) -> Result<QuorumWithConvergence<'a>, QuorumError> {
@@ -450,28 +451,6 @@ impl fmt::Display for ObjectType {
}
}
-/// The result of checking the relationship between two commits in the commit graph.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
-pub struct GraphAheadBehind {
- /// The number of commits the given commit is ahead of the other.
- pub ahead: usize,
- /// The number of commits the given commit is behind the other.
- pub behind: usize,
-}
-
-impl GraphAheadBehind {
- /// Whether self represents a linear history between two commits.
- ///
- /// The following three conditions are equivalent characterizations of
- /// a linear history:
- /// 1. One commit is ahead and not behind of the other.
- /// 2. One commit is behind and not ahead of the other.
- /// 3. One commit can be "fast-forwarded" to the other.
- pub fn is_linear(&self) -> bool {
- self.ahead * self.behind == 0
- }
-}
-
/// The result of finding a set of objects in a Git repository.
#[derive(Clone, Debug, PartialEq, Eq)]
pub struct FoundObjects {
diff --git a/crates/radicle/src/git/canonical/convergence.rs b/crates/radicle/src/git/canonical/convergence.rs
index 90fcba226..5cf16e1fe 100644
--- a/crates/radicle/src/git/canonical/convergence.rs
+++ b/crates/radicle/src/git/canonical/convergence.rs
@@ -3,7 +3,9 @@ use std::{fmt, ops::ControlFlow};
use crate::git::Oid;
use crate::prelude::Did;
-use super::{Object, effects, error};
+use crate::git::repository;
+
+use super::{Object, error};
/// Checks for convergence and ensures that compared objects are of the same
/// type, i.e. commit or tag, to the [`Candidate`].
@@ -22,7 +24,7 @@ impl<'r, R> fmt::Debug for Convergence<'r, R> {
impl<'r, R> Convergence<'r, R>
where
- R: effects::Ancestry,
+ R: repository::Ancestry,
{
pub fn new(repo: &'r R, candidate: Did, object: Object) -> Self {
Self {
@@ -50,7 +52,7 @@ where
match self.checker.compare_to_candidate(did, *object) {
ControlFlow::Continue(c) => match c {
Effect::GraphCheck { commit, upstream } => {
- converges |= self.repo.graph_ahead_behind(commit, upstream)?.is_linear();
+ converges |= self.repo.ahead_behind(commit, upstream)?.is_linear();
}
Effect::TagConverges => {
converges = true;
diff --git a/crates/radicle/src/git/canonical/effects.rs b/crates/radicle/src/git/canonical/effects.rs
index b63a8118e..dbbbfcafc 100644
--- a/crates/radicle/src/git/canonical/effects.rs
+++ b/crates/radicle/src/git/canonical/effects.rs
@@ -6,7 +6,7 @@ use crate::git::fmt::Qualified;
use crate::git::raw::ErrorExt as _;
use crate::prelude::Did;
-use super::{FoundObjects, GraphAheadBehind, MergeBase, Object};
+use super::{FoundObjects, MergeBase, Object};
/// Find objects for the canonical computation.
///
@@ -142,29 +142,6 @@ impl MergeBaseError {
}
}
-/// Calculate the ancestry of two commits.
-///
-/// Typically implemented by a Git repository.
-pub trait Ancestry {
- /// Produce the [`GraphAheadBehind`] of `commit` and `upstream`.
- ///
- /// The result should provide how many commits are ahead and behind when
- /// comparing the `commit` and `upstream`.
- fn graph_ahead_behind(
- &self,
- commit: Oid,
- upstream: Oid,
- ) -> Result<GraphAheadBehind, GraphDescendant>;
-}
-
-#[derive(Debug, thiserror::Error)]
-#[error("failed to check if {commit} is an ancestor of {upstream} due to: {source}")]
-pub struct GraphDescendant {
- commit: Oid,
- upstream: Oid,
- source: Box<dyn std::error::Error + Send + Sync + 'static>,
-}
-
// ===========================================
// `git2` implementations of the above effects
// ===========================================
@@ -185,22 +162,6 @@ impl FindMergeBase for git::raw::Repository {
}
}
-impl Ancestry for git::raw::Repository {
- fn graph_ahead_behind(
- &self,
- commit: Oid,
- upstream: Oid,
- ) -> Result<GraphAheadBehind, GraphDescendant> {
- self.graph_ahead_behind(commit.into(), upstream.into())
- .map_err(|err| GraphDescendant {
- commit,
- upstream,
- source: Box::new(err),
- })
- .map(|(ahead, behind)| GraphAheadBehind { ahead, behind })
- }
-}
-
impl FindObjects for git::raw::Repository {
fn find_objects<'a, 'b, I>(
&self,
diff --git a/crates/radicle/src/git/canonical/error.rs b/crates/radicle/src/git/canonical/error.rs
index b482f32d3..b80f9a814 100644
--- a/crates/radicle/src/git/canonical/error.rs
+++ b/crates/radicle/src/git/canonical/error.rs
@@ -2,6 +2,8 @@ use thiserror::Error;
use crate::git::Oid;
+use crate::git::repository::ancestry;
+
use super::{ObjectType, effects};
pub use effects::{FindObjectsError, MergeBaseError};
@@ -50,7 +52,7 @@ pub struct MismatchedObject {
#[derive(Debug, Error)]
pub enum ConvergesError {
#[error(transparent)]
- GraphDescendant(#[from] effects::GraphDescendant),
+ AheadBehind(#[from] ancestry::error::AheadBehind),
#[error(transparent)]
MismatchedObject(#[from] MismatchedObject),
}
diff --git a/crates/radicle/src/git/canonical/rules.rs b/crates/radicle/src/git/canonical/rules.rs
index 1df5e4e03..d44b3adb6 100644
--- a/crates/radicle/src/git/canonical/rules.rs
+++ b/crates/radicle/src/git/canonical/rules.rs
@@ -20,11 +20,11 @@ use serde::{Deserialize, Serialize};
use serde_json as json;
use thiserror::Error;
-use crate::git;
use crate::git::canonical;
use crate::git::canonical::Canonical;
use crate::git::fmt::Qualified;
use crate::git::fmt::refspec::QualifiedPattern;
+use crate::git::{self, repository};
use crate::identity::{Did, doc};
use super::protect;
@@ -547,7 +547,7 @@ impl Rules {
repo: &'r R,
) -> Option<Canonical<'b, 'a, 'r, R, canonical::Initial>>
where
- R: canonical::effects::Ancestry
+ R: repository::Ancestry
+ canonical::effects::FindMergeBase
+ canonical::effects::FindObjects,
{
diff --git a/crates/radicle/src/git/repository/ancestry.rs b/crates/radicle/src/git/repository/ancestry.rs
index ca5f353e5..660f09ed4 100644
--- a/crates/radicle/src/git/repository/ancestry.rs
+++ b/crates/radicle/src/git/repository/ancestry.rs
@@ -15,6 +15,19 @@ pub struct AheadBehind {
pub behind: usize,
}
+impl AheadBehind {
+ /// Whether `self` represents a linear history between two commits.
+ ///
+ /// The following three conditions are equivalent characterisations of
+ /// a linear history:
+ /// 1. One commit is ahead and not behind of the other.
+ /// 2. One commit is behind and not ahead of the other.
+ /// 3. One commit can be "fast-forwarded" to the other.
+ pub fn is_linear(&self) -> bool {
+ self.ahead * self.behind == 0
+ }
+}
+
/// Git commit graph operations.
///
/// Provides merge-base computation and ancestor checks.
diff --git a/crates/radicle/src/storage/git.rs b/crates/radicle/src/storage/git.rs
index 743b43b29..ad5403b49 100644
--- a/crates/radicle/src/storage/git.rs
+++ b/crates/radicle/src/storage/git.rs
@@ -308,16 +308,6 @@ impl AsRef<Repository> for Repository {
}
}
-impl git::canonical::effects::Ancestry for Repository {
- fn graph_ahead_behind(
- &self,
- commit: Oid,
- upstream: Oid,
- ) -> Result<git::canonical::GraphAheadBehind, git::canonical::effects::GraphDescendant> {
- git::canonical::effects::Ancestry::graph_ahead_behind(&self.backend, commit, upstream)
- }
-}
-
impl git::canonical::effects::FindMergeBase for Repository {
fn merge_base(
&self,
commit 2d5e5ec70cbea37c1439f997083fd4f0b00fc89c
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Tue Apr 14 15:32:25 2026 +0100
radicle/storage/sigrefs: Remove unused traits
The `sigrefs` module is migrated to using the `git::repository` family
of traits.
The previous traits are removed and the `RefsEntry` and
`SignatureEntry` types move into the `sigrefs::git` module.
diff --git a/crates/radicle/src/storage/git.rs b/crates/radicle/src/storage/git.rs
index 23495324a..743b43b29 100644
--- a/crates/radicle/src/storage/git.rs
+++ b/crates/radicle/src/storage/git.rs
@@ -34,7 +34,7 @@ use crate::git::fmt::{
};
pub use crate::storage::{Error, RepositoryError};
-use super::refs::{RefsAt, sigrefs};
+use super::refs::RefsAt;
use super::{RemoteId, RemoteRepository, ValidateRepository};
pub static NAMESPACES_GLOB: LazyLock<PatternString> =
@@ -1083,59 +1083,6 @@ impl Repository {
}
}
-impl sigrefs::git::object::Reader for Repository {
- fn read_commit(
- &self,
- oid: &Oid,
- ) -> Result<Option<Vec<u8>>, sigrefs::git::object::error::ReadCommit> {
- self.backend.read_commit(oid)
- }
-
- fn read_blob(
- &self,
- commit: &Oid,
- path: &Path,
- ) -> Result<Option<sigrefs::git::object::Blob>, sigrefs::git::object::error::ReadBlob> {
- self.backend.read_blob(commit, path)
- }
-}
-
-impl sigrefs::git::object::Writer for Repository {
- fn write_tree(
- &self,
- refs: sigrefs::git::object::RefsEntry,
- signature: sigrefs::git::object::SignatureEntry,
- ) -> Result<Oid, sigrefs::git::object::error::WriteTree> {
- self.backend.write_tree(refs, signature)
- }
-
- fn write_commit(&self, bytes: &[u8]) -> Result<Oid, sigrefs::git::object::error::WriteCommit> {
- self.backend.write_commit(bytes)
- }
-}
-
-impl sigrefs::git::reference::Reader for Repository {
- fn find_reference(
- &self,
- reference: &git::fmt::Namespaced,
- ) -> Result<Option<Oid>, sigrefs::git::reference::error::FindReference> {
- sigrefs::git::reference::Reader::find_reference(&self.backend, reference)
- }
-}
-
-impl sigrefs::git::reference::Writer for Repository {
- fn write_reference(
- &self,
- reference: &git::fmt::Namespaced,
- commit: Oid,
- parent: Option<Oid>,
- reflog: String,
- ) -> Result<(), sigrefs::git::reference::error::WriteReference> {
- self.backend
- .write_reference(reference, commit, parent, reflog)
- }
-}
-
impl object::Reader for Repository {
fn blob(&self, oid: Oid) -> Result<Option<git::repository::Blob>, object::error::read::Blob> {
object::Reader::blob(&self.backend, oid)
diff --git a/crates/radicle/src/storage/refs/sigrefs/git.rs b/crates/radicle/src/storage/refs/sigrefs/git.rs
index 2a0ab3c6e..ea762c6ec 100644
--- a/crates/radicle/src/storage/refs/sigrefs/git.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/git.rs
@@ -1,9 +1,9 @@
-//! Signed References are encoded in the Git commit graph.
-//! This module provides traits for interacting with a Git
-//! repository to read and write data for Signed References.
+//! Domain data for creating signed reference updates.
+//!
+//! [`Committer`] is used for the author of the commit in a signed references commit.
+//! It provides a way to create a stable author and timestamp for deterministic commits.
-pub mod object;
-pub mod reference;
+use std::path::Path;
#[cfg(test)]
mod properties;
@@ -12,6 +12,46 @@ use crypto::PublicKey;
use radicle_git_metadata::author::Author;
use radicle_git_metadata::author::Time;
+use crate::git::repository::types::TreeEntry;
+
+/// A [`TreeEntry`] for the signed references payload blob.
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+pub(super) struct RefsEntry(TreeEntry);
+
+impl RefsEntry {
+ /// Create a new entry with the canonical refs bytes.
+ pub fn new(content: Vec<u8>) -> Self {
+ Self(TreeEntry::Blob {
+ path: Path::new(crate::storage::refs::REFS_BLOB_PATH).into(),
+ content,
+ })
+ }
+
+ /// Unwrap into the underlying [`TreeEntry`].
+ pub fn into_inner(self) -> TreeEntry {
+ self.0
+ }
+}
+
+/// A [`TreeEntry`] for the cryptographic signature blob.
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+pub(super) struct SignatureEntry(TreeEntry);
+
+impl SignatureEntry {
+ /// Create a new entry with the signature bytes.
+ pub fn new(content: Vec<u8>) -> Self {
+ Self(TreeEntry::Blob {
+ path: Path::new(crate::storage::refs::SIGNATURE_BLOB_PATH).into(),
+ content,
+ })
+ }
+
+ /// Unwrap into the underlying [`TreeEntry`].
+ pub fn into_inner(self) -> TreeEntry {
+ self.0
+ }
+}
+
/// Convenience type that corresponds to an [`Author`].
///
/// Most users will want to instantiate this via [`Committer::from_env_or_now`],
@@ -105,142 +145,3 @@ impl Committer {
})
}
}
-
-mod git2_impls {
- //! [`git2::Repository`] implementations of the [`object`] and [`reference`] traits.
- //!
- //! [`object`]: super::object
- //! [`reference`]: super::reference
-
- use std::path::Path;
-
- use radicle_oid::Oid;
-
- use crate::git;
-
- use super::object;
- use super::object::{RefsEntry, SignatureEntry};
- use super::reference;
-
- impl object::Reader for git2::Repository {
- fn read_commit(&self, oid: &Oid) -> Result<Option<Vec<u8>>, object::error::ReadCommit> {
- use object::error::ReadCommit;
-
- let odb = self.odb().map_err(ReadCommit::other)?;
- let object = odb.read(git2::Oid::from(*oid));
- match object {
- Ok(object) => {
- if object.kind() != git2::ObjectType::Commit {
- return Err(ReadCommit::incorrect_object_error(*oid, object.kind()));
- }
- Ok(Some(object.data().to_vec()))
- }
- Err(e) if e.code() == git2::ErrorCode::NotFound => Ok(None),
- Err(e) => Err(ReadCommit::other(e)),
- }
- }
-
- fn read_blob(
- &self,
- oid: &Oid,
- path: &Path,
- ) -> Result<Option<object::Blob>, object::error::ReadBlob> {
- use object::error::ReadBlob;
-
- let commit = match self.find_commit(git2::Oid::from(*oid)) {
- Ok(c) => c,
- Err(e) if e.code() == git2::ErrorCode::NotFound => {
- return Err(ReadBlob::commit_not_found_error(*oid));
- }
- Err(e) => return Err(ReadBlob::other(e)),
- };
-
- let tree = commit.tree().map_err(ReadBlob::other)?;
-
- let entry = match tree.get_path(path) {
- Ok(e) => e,
- Err(e) if e.code() == git2::ErrorCode::NotFound => return Ok(None),
- Err(e) => return Err(ReadBlob::other(e)),
- };
-
- let object = entry.to_object(self).map_err(ReadBlob::other)?;
- let blob = object.as_blob().ok_or(ReadBlob::incorrect_object_error(
- *oid,
- path.to_path_buf(),
- object.kind().unwrap_or(git2::ObjectType::Any),
- ))?;
-
- Ok(Some(object::Blob {
- oid: blob.id().into(),
- bytes: blob.content().to_vec(),
- }))
- }
- }
-
- impl object::Writer for git2::Repository {
- fn write_tree(
- &self,
- refs: RefsEntry,
- signature: SignatureEntry,
- ) -> Result<Oid, object::error::WriteTree> {
- crate::git::repository::object::Writer::write_tree(
- self,
- &[refs.into_inner(), signature.into_inner()],
- )
- .map_err(|e| object::error::WriteTree::Write(Box::new(e)))
- }
-
- fn write_commit(&self, bytes: &[u8]) -> Result<Oid, object::error::WriteCommit> {
- use object::error::WriteCommit;
-
- let odb = self.odb().map_err(WriteCommit::other)?;
-
- let oid = odb
- .write(git2::ObjectType::Commit, bytes)
- .map_err(WriteCommit::other)?;
-
- Ok(Oid::from(oid))
- }
- }
-
- impl reference::Reader for git2::Repository {
- fn find_reference(
- &self,
- reference: &git::fmt::Namespaced,
- ) -> Result<Option<Oid>, reference::error::FindReference> {
- match self.refname_to_id(reference.as_str()) {
- Ok(oid) => Ok(Some(Oid::from(oid))),
- Err(e) if e.code() == git2::ErrorCode::NotFound => Ok(None),
- Err(e) => Err(reference::error::FindReference::other(e)),
- }
- }
- }
-
- impl reference::Writer for git2::Repository {
- fn write_reference(
- &self,
- reference: &git::fmt::Namespaced,
- commit: Oid,
- parent: Option<Oid>,
- reflog: String,
- ) -> Result<(), reference::error::WriteReference> {
- let new = git2::Oid::from(commit);
-
- match parent {
- Some(parent) => {
- let old = git2::Oid::from(parent);
- // The old OID provides a guard, which gives us a compare-and-swap —
- // the write will fail if the ref has moved since we read it.
- self.reference_matching(reference.as_str(), new, true, old, &reflog)
- .map_err(reference::error::WriteReference::other)?;
- }
- None => {
- self.reference(reference.as_str(), new, false, &reflog)
- .map_err(reference::error::WriteReference::other)?;
- }
- }
-
- Ok(())
- }
- }
-}
diff --git a/crates/radicle/src/storage/refs/sigrefs/git/object.rs b/crates/radicle/src/storage/refs/sigrefs/git/object.rs
deleted file mode 100644
index b98d84c29..000000000
--- a/crates/radicle/src/storage/refs/sigrefs/git/object.rs
+++ /dev/null
@@ -1,116 +0,0 @@
-//! Traits for interacting with Git objects, necessary for implementing Radicle
-//! Signed References.
-// TODO(finto): I think these are more generally useful than just being used for
-// Signed References. They might be worth moving into a crate,
-// `radicle-git-traits`, but for now they can live here.
-
-pub mod error;
-
-use std::path::Path;
-
-use radicle_oid::Oid;
-
-use crate::git::repository::types::TreeEntry;
-
-/// A Git blob object, returned by [`Reader::read_blob`].
-pub struct Blob {
- /// The [`Oid`] of the Git blob.
- pub oid: Oid,
- /// The contents of the Git blob.
- pub bytes: Vec<u8>,
-}
-
-/// Git object reader, generally a Git repository, or its corresponding Object
-/// Database (ODB).
-pub trait Reader {
- /// Read the raw bytes of a commit object identified by `oid`.
- ///
- /// Returns `None` if no such object exists.
- ///
- /// # Errors
- ///
- /// - [`error::ReadCommit::IncorrectObject`]: the object identified by the
- /// [`Oid`] was found, but was not a commit.
- /// - [`error::ReadCommit::Other`]: failed to read the Git commit.
- fn read_commit(&self, oid: &Oid) -> Result<Option<Vec<u8>>, error::ReadCommit>;
-
- /// Read the raw bytes of the blob at `path` within the tree of `commit`.
- ///
- /// Returns `None` if the path does not exist in that tree.
- ///
- /// # Errors
- ///
- /// - [`error::ReadBlob::CommitNotFound`]: failed to find the commit
- /// identified by the [`Oid`].
- /// - [`error::ReadBlob::IncorrectObject`]: the object identified by the
- /// [`Oid`] was found, but was not a commit.
- /// - [`error::ReadBlob::Other`]: failed to read the Git blob.
- fn read_blob(&self, commit: &Oid, path: &Path) -> Result<Option<Blob>, error::ReadBlob>;
-}
-
-/// A [`TreeEntry`] for the signed references payload blob.
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
-pub struct RefsEntry(TreeEntry);
-
-impl RefsEntry {
- /// Create a new entry with the canonical refs bytes.
- pub fn new(content: Vec<u8>) -> Self {
- Self(TreeEntry::Blob {
- path: Path::new(crate::storage::refs::REFS_BLOB_PATH).into(),
- content,
- })
- }
-
- /// Unwrap into the underlying [`TreeEntry`].
- pub fn into_inner(self) -> TreeEntry {
- self.0
- }
-}
-
-/// A [`TreeEntry`] for the cryptographic signature blob.
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
-pub struct SignatureEntry(TreeEntry);
-
-impl SignatureEntry {
- /// Create a new entry with the signature bytes.
- pub fn new(content: Vec<u8>) -> Self {
- Self(TreeEntry::Blob {
- path: Path::new(crate::storage::refs::SIGNATURE_BLOB_PATH).into(),
- content,
- })
- }
-
- /// Unwrap into the underlying [`TreeEntry`].
- pub fn into_inner(self) -> TreeEntry {
- self.0
- }
-}
-
-/// Git object writer, generally a Git repository, or its corresponding Object
-/// Database (ODB).
-pub trait Writer {
- /// Write the [`RefsEntry`] and [`SignatureEntry`] to two separate Git blobs
- /// within a shared Git tree.
- ///
- /// Returns the [`Oid`] of the Git tree.
- ///
- /// # Errors
- ///
- /// - [`error::WriteTree::Refs`]: failed to write the references Git blob.
- /// - [`error::WriteTree::Signature`]: failed to write the signature Git blob.
- /// - [`error::WriteTree::Write`]: failed to write the Git tree.
- fn write_tree(
- &self,
- refs: RefsEntry,
- signature: SignatureEntry,
- ) -> Result<Oid, error::WriteTree>;
-
- /// Write the given Git commit, as bytes, to the Git object database.
- ///
- /// Returns the [`Oid`] of the Git commit.
- ///
- /// # Errors
- ///
- /// - [`error::WriteCommit`]: failed to write the Git commit.
- fn write_commit(&self, bytes: &[u8]) -> Result<Oid, error::WriteCommit>;
-}
diff --git a/crates/radicle/src/storage/refs/sigrefs/git/object/error.rs b/crates/radicle/src/storage/refs/sigrefs/git/object/error.rs
deleted file mode 100644
index 583048d5c..000000000
--- a/crates/radicle/src/storage/refs/sigrefs/git/object/error.rs
+++ /dev/null
@@ -1,146 +0,0 @@
-use std::path::PathBuf;
-
-use radicle_oid::Oid;
-use thiserror::Error;
-
-type StdError = dyn std::error::Error + Send + Sync + 'static;
-
-#[derive(Debug, Error)]
-#[non_exhaustive]
-pub enum ReadCommit {
- #[error(transparent)]
- IncorrectObject(NotCommit),
- #[error(transparent)]
- Other(Box<StdError>),
-}
-
-impl ReadCommit {
- pub fn incorrect_object_error<K>(oid: Oid, kind: K) -> Self
- where
- K: ToString,
- {
- Self::IncorrectObject(NotCommit {
- oid,
- kind: kind.to_string(),
- })
- }
-
- pub fn other<E>(err: E) -> Self
- where
- E: std::error::Error + Send + Sync + 'static,
- {
- Self::Other(Box::new(err))
- }
-}
-
-#[derive(Debug, Error)]
-#[non_exhaustive]
-#[error("the object {oid} is a {kind}, not a commit")]
-pub struct NotCommit {
- oid: Oid,
- kind: String,
-}
-
-#[derive(Debug, Error)]
-#[non_exhaustive]
-#[error(transparent)]
-pub enum ReadBlob {
- #[error(transparent)]
- CommitNotFound(CommitNotFound),
- #[error(transparent)]
- IncorrectObject(NotBlob),
- #[error(transparent)]
- Other(Box<StdError>),
-}
-
-#[derive(Debug, Error)]
-#[non_exhaustive]
-#[error("could not find commit {oid}")]
-pub struct CommitNotFound {
- oid: Oid,
-}
-
-#[derive(Debug, Error)]
-#[non_exhaustive]
-#[error("the object at {path:?} in commit {commit} is a {kind}, not a blob")]
-pub struct NotBlob {
- commit: Oid,
- path: PathBuf,
- kind: String,
-}
-
-impl ReadBlob {
- pub fn commit_not_found_error(oid: Oid) -> Self {
- Self::CommitNotFound(CommitNotFound { oid })
- }
-
- pub fn incorrect_object_error<K>(commit: Oid, path: PathBuf, kind: K) -> Self
- where
- K: ToString,
- {
- Self::IncorrectObject(NotBlob {
- commit,
- path,
- kind: kind.to_string(),
- })
- }
-
- pub fn other<E>(err: E) -> Self
- where
- E: std::error::Error + Send + Sync + 'static,
- {
- Self::Other(Box::new(err))
- }
-}
-
-#[derive(Debug, Error)]
-#[non_exhaustive]
-pub enum WriteTree {
- #[error("failed to write reference blob for signed references")]
- Refs(Box<StdError>),
- #[error("failed to write signature blob for signed references")]
- Signature(Box<StdError>),
- #[error(transparent)]
- Write(Box<StdError>),
-}
-
-impl WriteTree {
- pub fn refs_error<E>(err: E) -> Self
- where
- E: std::error::Error + Send + Sync + 'static,
- {
- Self::Refs(Box::new(err))
- }
-
- pub fn signature_error<E>(err: E) -> Self
- where
- E: std::error::Error + Send + Sync + 'static,
- {
- Self::Signature(Box::new(err))
- }
-
- pub fn write_error<E>(err: E) -> Self
- where
- E: std::error::Error + Send + Sync + 'static,
- {
- Self::Write(Box::new(err))
- }
-}
-
-#[derive(Debug, Error)]
-#[non_exhaustive]
-#[error(transparent)]
-pub struct WriteCommit {
- source: Box<StdError>,
-}
-
-impl WriteCommit {
- pub fn other<E>(err: E) -> Self
- where
- E: std::error::Error + Send + Sync + 'static,
- {
- Self {
- source: Box::new(err),
- }
- }
-}
diff --git a/crates/radicle/src/storage/refs/sigrefs/git/reference.rs b/crates/radicle/src/storage/refs/sigrefs/git/reference.rs
deleted file mode 100644
index 4f46c829a..000000000
--- a/crates/radicle/src/storage/refs/sigrefs/git/reference.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-//! Traits for interacting with Git references, necessary for implementing
-//! Radicle Signed References.
-// TODO(finto): I think these are more generally useful than just being used for
-// Signed References. They might be worth moving into a crate,
-// `radicle-git-traits`, but for now they can live here.
-
-pub mod error;
-
-use radicle_oid::Oid;
-
-use crate::git;
-
-/// Git reference reader, generally a Git repository, or its corresponding Reference
-/// Database (Ref DB).
-pub trait Reader {
- /// Find the head [`Oid`] of the sigrefs reference for the given namespace.
- ///
- /// Returns `None` if the reference does not yet exist.
- /// # Errors
- ///
- /// - [`error::FindReference`]: failed to write the Git reference.
- fn find_reference(
- &self,
- reference: &git::fmt::Namespaced,
- ) -> Result<Option<Oid>, error::FindReference>;
-}
-
-/// Git reference writer, generally a Git repository, or its corresponding Reference
-/// Database (Ref DB).
-pub trait Writer {
- /// Write the given commit [`Oid`], and its parent, to the given
- /// `reference`.
- ///
- /// The `reflog` given can used as the Git reflog message of the reference.
- ///
- /// # Concurrency
- ///
- /// It is up to the implementer to ensure the safety of writing the
- /// reference safely in a concurrent environment.
- ///
- /// # Errors
- ///
- /// - [`error::WriteReference`]: failed to write the Git reference.
- fn write_reference(
- &self,
- reference: &git::fmt::Namespaced,
- commit: Oid,
- parent: Option<Oid>,
- reflog: String,
- ) -> Result<(), error::WriteReference>;
-}
diff --git a/crates/radicle/src/storage/refs/sigrefs/git/reference/error.rs b/crates/radicle/src/storage/refs/sigrefs/git/reference/error.rs
deleted file mode 100644
index cd6af9fd6..000000000
--- a/crates/radicle/src/storage/refs/sigrefs/git/reference/error.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use thiserror::Error;
-
-#[derive(Debug, Error)]
-#[non_exhaustive]
-#[error(transparent)]
-pub struct FindReference(Box<dyn std::error::Error + Send + Sync + 'static>);
-
-impl FindReference {
- pub fn other<E>(err: E) -> Self
- where
- E: std::error::Error + Send + Sync + 'static,
- {
- Self(Box::new(err))
- }
-}
-
-#[derive(Debug, Error)]
-#[non_exhaustive]
-#[error(transparent)]
-pub struct WriteReference(Box<dyn std::error::Error + Send + Sync + 'static>);
-
-impl WriteReference {
- pub fn other<E>(err: E) -> Self
- where
- E: std::error::Error + Send + Sync + 'static,
- {
- Self(Box::new(err))
- }
-}
diff --git a/crates/radicle/src/storage/refs/sigrefs/write.rs b/crates/radicle/src/storage/refs/sigrefs/write.rs
index 341923721..5a7bd4325 100644
--- a/crates/radicle/src/storage/refs/sigrefs/write.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/write.rs
@@ -19,7 +19,7 @@ use crate::storage::refs::sigrefs::read::CommitReader;
use crate::storage::refs::sigrefs::{VerifiedCommit, read};
use crate::storage::refs::{FeatureLevel, IDENTITY_ROOT, Refs, SIGREFS_BRANCH, SIGREFS_PARENT};
-use super::git::object::{RefsEntry, SignatureEntry};
+use super::git::{RefsEntry, SignatureEntry};
/// The result of attempting to write signed references using
/// [`SignedRefsWriter`].
commit 37ac26b003f188933a0eb372682ea54710692404
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Tue Apr 14 12:18:57 2026 +0000
storage/refs/sigrefs: Refactor reference::Writer to repository::reference::Writer
Replace the sigrefs-specific reference::Writer trait with the shared
git::repository::reference::Writer for all sigrefs handlers.
The `write_reference` method is replaced by `write_ref` using:
* `RefTarget::Cas` when the commit has a parent. This ensures that the
parent value is not modified when updating in concurrent
environments.
* `RefTarget::Create` when there is no parent, i.e. it is the first
commit of the `rad/sigrefs` reference.
The mock RefWriter impl uses unimplemented!() for `delete_ref`.
diff --git a/crates/radicle/src/storage/refs.rs b/crates/radicle/src/storage/refs.rs
index 6e5fbb140..cec31f072 100644
--- a/crates/radicle/src/storage/refs.rs
+++ b/crates/radicle/src/storage/refs.rs
@@ -19,7 +19,7 @@ use thiserror::Error;
use crate::git;
use crate::git::Oid;
use crate::git::raw::ErrorExt as _;
-use crate::git::repository;
+use crate::git::repository::{object, reference};
use crate::storage;
use crate::storage::RemoteId;
use crate::storage::refs::sigrefs::read::Tip;
@@ -79,8 +79,8 @@ impl Refs {
signer: &S,
) -> Result<SignedRefs, Error>
where
- R: repository::object::Reader + repository::object::Writer,
- R: repository::reference::Reader + sigrefs::git::reference::Writer,
+ R: object::Reader + object::Writer,
+ R: reference::Reader + reference::Writer,
R: HasRepoId,
S: signature::Signer<crypto::Signature>,
S: signature::Verifier<crypto::Signature>,
@@ -97,8 +97,8 @@ impl Refs {
signer: &S,
) -> Result<SignedRefs, Error>
where
- R: repository::object::Reader + repository::object::Writer,
- R: repository::reference::Reader + sigrefs::git::reference::Writer,
+ R: object::Reader + object::Writer,
+ R: reference::Reader + reference::Writer,
R: HasRepoId,
S: signature::Signer<crypto::Signature>,
S: signature::Verifier<crypto::Signature>,
@@ -115,8 +115,8 @@ impl Refs {
force: bool,
) -> Result<SignedRefs, Error>
where
- R: repository::object::Reader + repository::object::Writer,
- R: repository::reference::Reader + sigrefs::git::reference::Writer,
+ R: object::Reader + object::Writer,
+ R: reference::Reader + reference::Writer,
R: HasRepoId,
S: signature::Signer<crypto::Signature>,
S: signature::Verifier<crypto::Signature>,
@@ -349,7 +349,7 @@ pub struct RefsAt {
impl RefsAt {
pub fn new<R>(repo: &R, remote: RemoteId) -> Result<Self, sigrefs::read::error::Read>
where
- R: repository::reference::Reader,
+ R: reference::Reader,
{
let at = repo
.ref_target(
@@ -426,7 +426,7 @@ impl SignedRefs {
pub fn load<R>(remote: RemoteId, repo: &R) -> Result<Option<Self>, sigrefs::read::error::Read>
where
R: HasRepoId,
- R: repository::object::Reader + repository::reference::Reader,
+ R: object::Reader + reference::Reader,
{
Self::load_internal(remote, repo, sigrefs::read::Tip::Reference(remote))
}
@@ -438,7 +438,7 @@ impl SignedRefs {
) -> Result<Option<Self>, sigrefs::read::error::Read>
where
R: HasRepoId,
- R: repository::object::Reader + repository::reference::Reader,
+ R: object::Reader + reference::Reader,
{
Self::load_internal(remote, repo, sigrefs::read::Tip::Commit(oid))
}
@@ -450,7 +450,7 @@ impl SignedRefs {
) -> Result<Option<Self>, sigrefs::read::error::Read>
where
R: HasRepoId,
- R: repository::object::Reader + repository::reference::Reader,
+ R: object::Reader + reference::Reader,
{
let root = repo.rid();
match sigrefs::SignedRefsReader::new(root, tip, repo, &remote).read() {
diff --git a/crates/radicle/src/storage/refs/sigrefs/write.rs b/crates/radicle/src/storage/refs/sigrefs/write.rs
index 612572a56..341923721 100644
--- a/crates/radicle/src/storage/refs/sigrefs/write.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/write.rs
@@ -12,9 +12,9 @@ use radicle_oid::Oid;
use crate::git;
use crate::git::repository;
-use crate::git::repository::object;
+use crate::git::repository::{object, reference};
use crate::storage::refs::SignedRefs;
-use crate::storage::refs::sigrefs::git::{Committer, reference};
+use crate::storage::refs::sigrefs::git::Committer;
use crate::storage::refs::sigrefs::read::CommitReader;
use crate::storage::refs::sigrefs::{VerifiedCommit, read};
use crate::storage::refs::{FeatureLevel, IDENTITY_ROOT, Refs, SIGREFS_BRANCH, SIGREFS_PARENT};
@@ -71,7 +71,13 @@ pub struct SignedRefsWriter<'a, R, S> {
impl<'a, R, S> SignedRefsWriter<'a, R, S>
where
- R: object::Writer + object::Reader + reference::Writer + repository::reference::Reader,
+ R: object::Writer
+ + object::Writer
+ + object::Reader
+ + object::Reader
+ + reference::Writer
+ + repository::reference::Reader
+ + reference::Reader,
S: Signer<crypto::Signature>,
S: signature::Verifier<crypto::Signature>,
{
@@ -178,8 +184,12 @@ where
Err(err) => return Err(error::Write::Head(err)),
};
let commit = commit_writer.write().map_err(error::Write::Commit)?;
+ let target = match commit.parent {
+ Some(expected) => reference::Target::cas(commit.oid, expected),
+ None => reference::Target::create(commit.oid),
+ };
repository
- .write_reference(&reference, commit.oid, commit.parent, reflog)
+ .write_ref(&reference, target, &reflog)
.map_err(error::Write::Reference)?;
Ok(Update::changed(commit, FeatureLevel::Parent))
}
diff --git a/crates/radicle/src/storage/refs/sigrefs/write/error.rs b/crates/radicle/src/storage/refs/sigrefs/write/error.rs
index 18f1102e9..5e3234e09 100644
--- a/crates/radicle/src/storage/refs/sigrefs/write/error.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/write/error.rs
@@ -1,9 +1,8 @@
use radicle_oid::Oid;
use thiserror::Error;
-use crate::git::repository;
use crate::git::repository::object;
-use crate::storage::refs::sigrefs::git::reference;
+use crate::git::repository::reference;
// TODO: use commit NID (and RID?) for traceability
#[derive(Debug, Error)]
@@ -14,7 +13,7 @@ pub enum Write {
#[error(transparent)]
Commit(Commit),
#[error(transparent)]
- Reference(reference::error::WriteReference),
+ Reference(reference::error::write::WriteRef),
}
// TODO: use commit OID for traceability
@@ -43,7 +42,7 @@ pub enum Tree {
#[error(transparent)]
pub enum Head {
#[error(transparent)]
- Reference(repository::reference::error::read::RefTarget),
+ Reference(reference::error::read::RefTarget),
#[error(transparent)]
Commit(super::read::error::Commit),
#[error("failed to verify commit {commit}: {source}")]
diff --git a/crates/radicle/src/storage/refs/sigrefs/write/test/mock.rs b/crates/radicle/src/storage/refs/sigrefs/write/test/mock.rs
index 2d7f22164..9054dee2a 100644
--- a/crates/radicle/src/storage/refs/sigrefs/write/test/mock.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/write/test/mock.rs
@@ -10,12 +10,11 @@ use radicle_git_metadata::commit::trailers::OwnedTrailer;
use radicle_oid::Oid;
use crate::git;
-use crate::git::repository;
use crate::git::repository::object;
+use crate::git::repository::reference;
use crate::git::repository::types::{Blob, Commit, TreeEntry};
use crate::identity::doc;
use crate::storage::HasRepoId;
-use crate::storage::refs::sigrefs::git::reference;
use crate::storage::refs::{REFS_BLOB_PATH, Refs, SIGNATURE_BLOB_PATH, SIGREFS_BRANCH};
const MOCKED_IDENTITY: u8 = 99u8;
@@ -31,9 +30,9 @@ enum WriteTreeBehavior {
struct WriteCommitBehavior(Oid);
enum WriteReferenceBehavior {
- /// [`reference::Writer::write_reference`] returns `Ok(())`.
+ /// [`RefWriter::write_ref`] returns `Ok(())`.
Ok,
- /// [`reference::Writer::write_reference`] returns `Err(…)`.
+ /// [`RefWriter::write_ref`] returns `Err(…)`.
Error,
}
@@ -243,33 +242,28 @@ impl object::Reader for MockRepository {
}
}
-impl repository::reference::Reader for MockRepository {
+impl reference::Reader for MockRepository {
type References<'a> = std::iter::Empty<
- Result<
- (git::fmt::Qualified<'static>, Oid),
- repository::reference::error::read::ListReference,
- >,
+ Result<(git::fmt::Qualified<'static>, Oid), reference::error::read::ListReference>,
>;
fn ref_target<R: AsRef<git::fmt::RefStr>>(
&self,
name: &R,
- ) -> Result<Option<Oid>, repository::reference::error::read::RefTarget> {
+ ) -> Result<Option<Oid>, reference::error::read::RefTarget> {
match self.references.get(name.as_ref().as_str()) {
Some(RefBehavior::Present(oid)) => Ok(Some(*oid)),
Some(RefBehavior::Missing) | None => Ok(None),
- Some(RefBehavior::Error) => {
- Err(repository::reference::error::read::RefTarget::backend(
- std::io::Error::other("mock reference error"),
- ))
- }
+ Some(RefBehavior::Error) => Err(reference::error::read::RefTarget::backend(
+ std::io::Error::other("mock reference error"),
+ )),
}
}
fn list_refs<'a, P: AsRef<git::fmt::refspec::PatternStr>>(
&'a self,
_pattern: &P,
- ) -> Result<Self::References<'a>, repository::reference::error::read::ListRefs> {
+ ) -> Result<Self::References<'a>, reference::error::read::ListRefs> {
unimplemented!("MockRepository::list_refs")
}
}
@@ -299,22 +293,28 @@ impl object::Writer for MockRepository {
}
impl reference::Writer for MockRepository {
- fn write_reference(
+ fn write_ref<R: AsRef<git::fmt::RefStr>>(
&self,
- _reference: &git::fmt::Namespaced,
- _commit: Oid,
- _parent: Option<Oid>,
- _reflog: String,
- ) -> Result<(), reference::error::WriteReference> {
+ _name: &R,
+ _target: reference::Target,
+ _reflog: &str,
+ ) -> Result<(), reference::error::write::WriteRef> {
match &self.write_reference {
Some(WriteReferenceBehavior::Ok) => Ok(()),
Some(WriteReferenceBehavior::Error) | None => {
- Err(reference::error::WriteReference::other(
- std::io::Error::other("mock write_reference error"),
+ Err(reference::error::write::WriteRef::backend(
+ std::io::Error::other("mock write_ref error"),
))
}
}
}
+
+ fn delete_ref<R: AsRef<git::fmt::RefStr>>(
+ &self,
+ _name: &R,
+ ) -> Result<(), reference::error::write::DeleteRef> {
+ unimplemented!("MockRepository::delete_ref")
+ }
}
/// Always signs successfully, returning a fixed 64-byte signature.
commit 8b8fe3e4a4fcd10a41cd877ebc2426f780f6d456
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Tue Apr 14 12:18:57 2026 +0000
storage/refs/sigrefs: Refactor object::Writer to repository::object::Writer
Replace the sigrefs-specific object::Writer trait with the shared
git::repository::object::Writer trait across all sigrefs handlers.
Notably, `RefsEntry` and `SignatureEntry` become newtype wrappers
around `TreeEntry`, with constructors that embed the canonical paths
`REFS_BLOB_PATH` and `SIGNATURE_BLOB_PATH`, respectively.
diff --git a/crates/radicle/src/storage/refs.rs b/crates/radicle/src/storage/refs.rs
index f189ff467..6e5fbb140 100644
--- a/crates/radicle/src/storage/refs.rs
+++ b/crates/radicle/src/storage/refs.rs
@@ -79,7 +79,7 @@ impl Refs {
signer: &S,
) -> Result<SignedRefs, Error>
where
- R: repository::object::Reader + sigrefs::git::object::Writer,
+ R: repository::object::Reader + repository::object::Writer,
R: repository::reference::Reader + sigrefs::git::reference::Writer,
R: HasRepoId,
S: signature::Signer<crypto::Signature>,
@@ -97,7 +97,7 @@ impl Refs {
signer: &S,
) -> Result<SignedRefs, Error>
where
- R: repository::object::Reader + sigrefs::git::object::Writer,
+ R: repository::object::Reader + repository::object::Writer,
R: repository::reference::Reader + sigrefs::git::reference::Writer,
R: HasRepoId,
S: signature::Signer<crypto::Signature>,
@@ -115,7 +115,7 @@ impl Refs {
force: bool,
) -> Result<SignedRefs, Error>
where
- R: repository::object::Reader + sigrefs::git::object::Writer,
+ R: repository::object::Reader + repository::object::Writer,
R: repository::reference::Reader + sigrefs::git::reference::Writer,
R: HasRepoId,
S: signature::Signer<crypto::Signature>,
diff --git a/crates/radicle/src/storage/refs/sigrefs/git.rs b/crates/radicle/src/storage/refs/sigrefs/git.rs
index 4b1c7d6bc..2a0ab3c6e 100644
--- a/crates/radicle/src/storage/refs/sigrefs/git.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/git.rs
@@ -183,31 +183,11 @@ mod git2_impls {
refs: RefsEntry,
signature: SignatureEntry,
) -> Result<Oid, object::error::WriteTree> {
- use object::error::WriteTree;
-
- let odb = self.odb().map_err(WriteTree::write_error)?;
-
- let refs_oid = odb
- .write(git2::ObjectType::Blob, &refs.content)
- .map_err(WriteTree::refs_error)?;
-
- let sig_oid = odb
- .write(git2::ObjectType::Blob, &signature.content)
- .map_err(WriteTree::signature_error)?;
-
- let mut builder = self.treebuilder(None).map_err(WriteTree::write_error)?;
-
- builder
- .insert(&refs.path, refs_oid, git2::FileMode::Blob.into())
- .map_err(WriteTree::refs_error)?;
-
- builder
- .insert(&signature.path, sig_oid, git2::FileMode::Blob.into())
- .map_err(WriteTree::signature_error)?;
-
- let tree_oid = builder.write().map_err(WriteTree::write_error)?;
-
- Ok(Oid::from(tree_oid))
+ crate::git::repository::object::Writer::write_tree(
+ self,
+ &[refs.into_inner(), signature.into_inner()],
+ )
+ .map_err(|e| object::error::WriteTree::Write(Box::new(e)))
}
fn write_commit(&self, bytes: &[u8]) -> Result<Oid, object::error::WriteCommit> {
diff --git a/crates/radicle/src/storage/refs/sigrefs/git/object.rs b/crates/radicle/src/storage/refs/sigrefs/git/object.rs
index f997314af..b98d84c29 100644
--- a/crates/radicle/src/storage/refs/sigrefs/git/object.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/git/object.rs
@@ -6,10 +6,12 @@
pub mod error;
-use std::path::{Path, PathBuf};
+use std::path::Path;
use radicle_oid::Oid;
+use crate::git::repository::types::TreeEntry;
+
/// A Git blob object, returned by [`Reader::read_blob`].
pub struct Blob {
/// The [`Oid`] of the Git blob.
@@ -46,30 +48,42 @@ pub trait Reader {
fn read_blob(&self, commit: &Oid, path: &Path) -> Result<Option<Blob>, error::ReadBlob>;
}
-/// Input to the [`Writer::write_tree`] method.
-///
-/// The entry describes where in the Git tree to write the [`Refs`] content
-/// blob.
-///
-/// [`Refs`]: crate::storage::refs::Refs
+/// A [`TreeEntry`] for the signed references payload blob.
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
-pub struct RefsEntry {
- /// Path in the Git tree to write to.
- pub path: PathBuf,
- /// The contents of the Git blob.
- pub content: Vec<u8>,
+pub struct RefsEntry(TreeEntry);
+
+impl RefsEntry {
+ /// Create a new entry with the canonical refs bytes.
+ pub fn new(content: Vec<u8>) -> Self {
+ Self(TreeEntry::Blob {
+ path: Path::new(crate::storage::refs::REFS_BLOB_PATH).into(),
+ content,
+ })
+ }
+
+ /// Unwrap into the underlying [`TreeEntry`].
+ pub fn into_inner(self) -> TreeEntry {
+ self.0
+ }
}
-/// Input to the [`Writer::write_tree`] method.
-///
-/// The entry describes where in the Git tree to write the signature content
-/// blob.
+/// A [`TreeEntry`] for the cryptographic signature blob.
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
-pub struct SignatureEntry {
- /// Path in the Git tree to write to.
- pub path: PathBuf,
- /// The contents of the Git blob.
- pub content: Vec<u8>,
+pub struct SignatureEntry(TreeEntry);
+
+impl SignatureEntry {
+ /// Create a new entry with the signature bytes.
+ pub fn new(content: Vec<u8>) -> Self {
+ Self(TreeEntry::Blob {
+ path: Path::new(crate::storage::refs::SIGNATURE_BLOB_PATH).into(),
+ content,
+ })
+ }
+
+ /// Unwrap into the underlying [`TreeEntry`].
+ pub fn into_inner(self) -> TreeEntry {
+ self.0
+ }
}
/// Git object writer, generally a Git repository, or its corresponding Object
diff --git a/crates/radicle/src/storage/refs/sigrefs/write.rs b/crates/radicle/src/storage/refs/sigrefs/write.rs
index 6f2da6ac6..612572a56 100644
--- a/crates/radicle/src/storage/refs/sigrefs/write.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/write.rs
@@ -3,8 +3,6 @@ pub mod error;
#[cfg(test)]
mod test;
-use std::path::Path;
-
use crypto::PublicKey;
use crypto::signature::{self, Signer};
use radicle_core::{NodeId, RepoId};
@@ -14,14 +12,14 @@ use radicle_oid::Oid;
use crate::git;
use crate::git::repository;
+use crate::git::repository::object;
use crate::storage::refs::SignedRefs;
-use crate::storage::refs::sigrefs::git::{Committer, object, reference};
+use crate::storage::refs::sigrefs::git::{Committer, reference};
use crate::storage::refs::sigrefs::read::CommitReader;
use crate::storage::refs::sigrefs::{VerifiedCommit, read};
-use crate::storage::refs::{
- FeatureLevel, IDENTITY_ROOT, REFS_BLOB_PATH, Refs, SIGNATURE_BLOB_PATH, SIGREFS_BRANCH,
- SIGREFS_PARENT,
-};
+use crate::storage::refs::{FeatureLevel, IDENTITY_ROOT, Refs, SIGREFS_BRANCH, SIGREFS_PARENT};
+
+use super::git::object::{RefsEntry, SignatureEntry};
/// The result of attempting to write signed references using
/// [`SignedRefsWriter`].
@@ -73,10 +71,7 @@ pub struct SignedRefsWriter<'a, R, S> {
impl<'a, R, S> SignedRefsWriter<'a, R, S>
where
- R: object::Writer
- + repository::object::Reader
- + reference::Writer
- + repository::reference::Reader,
+ R: object::Writer + object::Reader + reference::Writer + repository::reference::Reader,
S: Signer<crypto::Signature>,
S: signature::Verifier<crypto::Signature>,
{
@@ -336,17 +331,11 @@ where
.signer
.try_sign(&canonical)
.map_err(error::Tree::Sign)?;
- let refs = object::RefsEntry {
- path: Path::new(REFS_BLOB_PATH).to_path_buf(),
- content: canonical,
- };
- let sig = object::SignatureEntry {
- path: Path::new(SIGNATURE_BLOB_PATH).to_path_buf(),
- content: signature.to_vec(),
- };
+ let refs = RefsEntry::new(canonical);
+ let sig = SignatureEntry::new(signature.to_vec());
let oid = self
.repository
- .write_tree(refs, sig)
+ .write_tree(&[refs.into_inner(), sig.into_inner()])
.map_err(error::Tree::Write)?;
Ok(Tree {
oid,
diff --git a/crates/radicle/src/storage/refs/sigrefs/write/error.rs b/crates/radicle/src/storage/refs/sigrefs/write/error.rs
index 10e4ea9d5..18f1102e9 100644
--- a/crates/radicle/src/storage/refs/sigrefs/write/error.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/write/error.rs
@@ -2,7 +2,8 @@ use radicle_oid::Oid;
use thiserror::Error;
use crate::git::repository;
-use crate::storage::refs::sigrefs::git::{object, reference};
+use crate::git::repository::object;
+use crate::storage::refs::sigrefs::git::reference;
// TODO: use commit NID (and RID?) for traceability
#[derive(Debug, Error)]
@@ -23,7 +24,7 @@ pub enum Commit {
#[error(transparent)]
Tree(Tree),
#[error(transparent)]
- Write(object::error::WriteCommit),
+ Write(object::error::write::Commit),
}
// TODO: use commit OID for traceability
@@ -33,7 +34,7 @@ pub enum Tree {
#[error("failed to sign references payload")]
Sign(crypto::signature::Error),
#[error(transparent)]
- Write(object::error::WriteTree),
+ Write(object::error::write::Tree),
}
// TODO: use commit OID for traceability
diff --git a/crates/radicle/src/storage/refs/sigrefs/write/test/mock.rs b/crates/radicle/src/storage/refs/sigrefs/write/test/mock.rs
index 14193d7ff..2d7f22164 100644
--- a/crates/radicle/src/storage/refs/sigrefs/write/test/mock.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/write/test/mock.rs
@@ -11,10 +11,11 @@ use radicle_oid::Oid;
use crate::git;
use crate::git::repository;
-use crate::git::repository::types::{Blob, Commit};
+use crate::git::repository::object;
+use crate::git::repository::types::{Blob, Commit, TreeEntry};
use crate::identity::doc;
use crate::storage::HasRepoId;
-use crate::storage::refs::sigrefs::git::{object, reference};
+use crate::storage::refs::sigrefs::git::reference;
use crate::storage::refs::{REFS_BLOB_PATH, Refs, SIGNATURE_BLOB_PATH, SIGREFS_BRANCH};
const MOCKED_IDENTITY: u8 = 99u8;
@@ -202,8 +203,8 @@ impl HasRepoId for MockRepository {
}
}
-impl repository::object::Reader for MockRepository {
- fn blob(&self, _oid: Oid) -> Result<Option<Blob>, repository::object::error::read::Blob> {
+impl object::Reader for MockRepository {
+ fn blob(&self, _oid: Oid) -> Result<Option<Blob>, object::error::read::Blob> {
unimplemented!("MockRepository::blob")
}
@@ -211,7 +212,7 @@ impl repository::object::Reader for MockRepository {
&self,
commit: Oid,
path: &P,
- ) -> Result<Option<Blob>, repository::object::error::read::BlobAt> {
+ ) -> Result<Option<Blob>, object::error::read::BlobAt> {
let key = (commit, path.as_ref().to_path_buf());
match self.blobs.get(&key) {
Some(BlobBehavior::Present(bytes)) => Ok(Some(Blob {
@@ -219,26 +220,25 @@ impl repository::object::Reader for MockRepository {
content: bytes.clone(),
})),
Some(BlobBehavior::Missing) | None => Ok(None),
- Some(BlobBehavior::Error) => Err(repository::object::error::read::BlobAt::backend(
+ Some(BlobBehavior::Error) => Err(object::error::read::BlobAt::backend(
std::io::Error::other("mock blob error"),
)),
}
}
- fn commit(&self, oid: Oid) -> Result<Option<Commit>, repository::object::error::read::Commit> {
+ fn commit(&self, oid: Oid) -> Result<Option<Commit>, object::error::read::Commit> {
match self.commits.get(&oid) {
Some(CommitBehavior::Present(data)) => {
let bytes = data.to_string();
- let parsed = Commit::from_bytes(bytes.as_bytes()).map_err(|e| {
- repository::object::error::read::Commit::Parse { oid, source: e }
- })?;
+ let parsed = Commit::from_bytes(bytes.as_bytes())
+ .map_err(|e| object::error::read::Commit::Parse { oid, source: e })?;
Ok(Some(parsed))
}
None => Ok(None),
}
}
- fn exists(&self, _oid: Oid) -> Result<bool, repository::object::error::read::Exists> {
+ fn exists(&self, _oid: Oid) -> Result<bool, object::error::read::Exists> {
unimplemented!("MockRepository::exists")
}
}
@@ -275,25 +275,25 @@ impl repository::reference::Reader for MockRepository {
}
impl object::Writer for MockRepository {
- fn write_tree(
- &self,
- _refs: object::RefsEntry,
- _signature: object::SignatureEntry,
- ) -> Result<Oid, object::error::WriteTree> {
+ fn write_blob(&self, _content: &[u8]) -> Result<Oid, object::error::write::Blob> {
+ unimplemented!("MockRepository::write_blob")
+ }
+
+ fn write_tree(&self, _entries: &[TreeEntry]) -> Result<Oid, object::error::write::Tree> {
match &self.write_tree {
Some(WriteTreeBehavior::Ok(oid)) => Ok(*oid),
- Some(WriteTreeBehavior::Error) | None => Err(object::error::WriteTree::write_error(
+ Some(WriteTreeBehavior::Error) | None => Err(object::error::write::Tree::backend(
std::io::Error::other("mock write_tree error"),
)),
}
}
- fn write_commit(&self, _bytes: &[u8]) -> Result<Oid, object::error::WriteCommit> {
+ fn write_commit(&self, _bytes: &[u8]) -> Result<Oid, object::error::write::Commit> {
match &self.write_commit {
Some(WriteCommitBehavior(oid)) => Ok(*oid),
- None => Err(object::error::WriteCommit::other(std::io::Error::other(
- "mock write_commit error",
- ))),
+ None => Err(object::error::write::Commit::backend(
+ std::io::Error::other("mock write_commit error"),
+ )),
}
}
}
commit 0980c4974a3b0447a910f3ecb7f059ed1e01c913
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Tue Apr 14 12:13:06 2026 +0000
storage/refs/sigrefs: Refactor sigrefs::reference::Reader to repository::object::Reader
Replace the sigrefs-specific sigrefs::reference::Reader trait with the shared
git::repository::reference::Reader trait across all sigrefs handlers.
The implementation of the mock `reference::Reader` methods use
unimplemented!() for `list_refs`.
diff --git a/crates/radicle/src/storage.rs b/crates/radicle/src/storage.rs
index 99c99a69c..e36310c39 100644
--- a/crates/radicle/src/storage.rs
+++ b/crates/radicle/src/storage.rs
@@ -11,6 +11,7 @@ use serde::{Deserialize, Serialize};
use thiserror::Error;
pub use crate::git::Oid;
+use crate::git::repository::reference;
use crypto::PublicKey;
pub use git::{Validation, Validations};
@@ -436,7 +437,7 @@ impl Deref for Remote {
/// Read-only operations on a storage instance.
pub trait ReadStorage {
- type Repository: ReadRepository + self::refs::sigrefs::git::reference::Reader;
+ type Repository: ReadRepository + reference::Reader;
/// Get user info for this storage.
fn info(&self) -> &UserInfo;
diff --git a/crates/radicle/src/storage/refs.rs b/crates/radicle/src/storage/refs.rs
index 5d603af63..f189ff467 100644
--- a/crates/radicle/src/storage/refs.rs
+++ b/crates/radicle/src/storage/refs.rs
@@ -80,7 +80,7 @@ impl Refs {
) -> Result<SignedRefs, Error>
where
R: repository::object::Reader + sigrefs::git::object::Writer,
- R: sigrefs::git::reference::Reader + sigrefs::git::reference::Writer,
+ R: repository::reference::Reader + sigrefs::git::reference::Writer,
R: HasRepoId,
S: signature::Signer<crypto::Signature>,
S: signature::Verifier<crypto::Signature>,
@@ -98,7 +98,7 @@ impl Refs {
) -> Result<SignedRefs, Error>
where
R: repository::object::Reader + sigrefs::git::object::Writer,
- R: sigrefs::git::reference::Reader + sigrefs::git::reference::Writer,
+ R: repository::reference::Reader + sigrefs::git::reference::Writer,
R: HasRepoId,
S: signature::Signer<crypto::Signature>,
S: signature::Verifier<crypto::Signature>,
@@ -116,7 +116,7 @@ impl Refs {
) -> Result<SignedRefs, Error>
where
R: repository::object::Reader + sigrefs::git::object::Writer,
- R: sigrefs::git::reference::Reader + sigrefs::git::reference::Writer,
+ R: repository::reference::Reader + sigrefs::git::reference::Writer,
R: HasRepoId,
S: signature::Signer<crypto::Signature>,
S: signature::Verifier<crypto::Signature>,
@@ -349,10 +349,10 @@ pub struct RefsAt {
impl RefsAt {
pub fn new<R>(repo: &R, remote: RemoteId) -> Result<Self, sigrefs::read::error::Read>
where
- R: sigrefs::git::reference::Reader,
+ R: repository::reference::Reader,
{
let at = repo
- .find_reference(
+ .ref_target(
&storage::refs::SIGREFS_BRANCH.with_namespace(git::fmt::Component::from(&remote)),
)
.map_err(sigrefs::read::error::Read::FindReference)?
@@ -426,7 +426,7 @@ impl SignedRefs {
pub fn load<R>(remote: RemoteId, repo: &R) -> Result<Option<Self>, sigrefs::read::error::Read>
where
R: HasRepoId,
- R: repository::object::Reader + sigrefs::git::reference::Reader,
+ R: repository::object::Reader + repository::reference::Reader,
{
Self::load_internal(remote, repo, sigrefs::read::Tip::Reference(remote))
}
@@ -438,7 +438,7 @@ impl SignedRefs {
) -> Result<Option<Self>, sigrefs::read::error::Read>
where
R: HasRepoId,
- R: repository::object::Reader + sigrefs::git::reference::Reader,
+ R: repository::object::Reader + repository::reference::Reader,
{
Self::load_internal(remote, repo, sigrefs::read::Tip::Commit(oid))
}
@@ -450,7 +450,7 @@ impl SignedRefs {
) -> Result<Option<Self>, sigrefs::read::error::Read>
where
R: HasRepoId,
- R: repository::object::Reader + sigrefs::git::reference::Reader,
+ R: repository::object::Reader + repository::reference::Reader,
{
let root = repo.rid();
match sigrefs::SignedRefsReader::new(root, tip, repo, &remote).read() {
diff --git a/crates/radicle/src/storage/refs/sigrefs/read.rs b/crates/radicle/src/storage/refs/sigrefs/read.rs
index ae69a5e70..6fc295552 100644
--- a/crates/radicle/src/storage/refs/sigrefs/read.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/read.rs
@@ -16,9 +16,8 @@ use radicle_git_metadata::commit::CommitData;
use radicle_oid::Oid;
use crate::git;
-use crate::git::repository::object;
+use crate::git::repository::{object, reference};
use crate::identity::doc;
-use crate::storage::refs::sigrefs::git::reference;
use crate::storage::refs::{
FeatureLevel, IDENTITY_ROOT, REFS_BLOB_PATH, Refs, SIGNATURE_BLOB_PATH, SIGREFS_BRANCH,
SignedRefs,
@@ -305,7 +304,7 @@ where
SIGREFS_BRANCH.with_namespace(git::fmt::Component::from(&namespace));
let head = self
.repository
- .find_reference(&reference)
+ .ref_target(&reference)
.map_err(error::Read::FindReference)?
.ok_or_else(|| error::Read::MissingSigrefs { namespace })?;
Ok(head)
diff --git a/crates/radicle/src/storage/refs/sigrefs/read/error.rs b/crates/radicle/src/storage/refs/sigrefs/read/error.rs
index e79cb1cbe..6405de833 100644
--- a/crates/radicle/src/storage/refs/sigrefs/read/error.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/read/error.rs
@@ -7,7 +7,7 @@ use radicle_oid::Oid;
use thiserror::Error;
use crate::git::repository::object;
-use crate::storage::refs::sigrefs::git::reference;
+use crate::git::repository::reference;
use crate::storage::refs::sigrefs::read::FeatureLevels;
use crate::storage::refs::{FeatureLevel, canonical};
@@ -17,7 +17,7 @@ pub enum Read {
#[error(transparent)]
Commit(Commit),
#[error(transparent)]
- FindReference(reference::error::FindReference),
+ FindReference(reference::error::read::RefTarget),
#[error("failed to find `refs/namespaces/{namespace}/refs/rad/sigrefs`")]
MissingSigrefs { namespace: NodeId },
#[error(transparent)]
@@ -67,7 +67,7 @@ impl fmt::Display for Parent {
.iter()
.map(|oid| oid.to_string())
.collect::<Vec<_>>()
- .join(", ")
+ .join(", "),
)
}
}
diff --git a/crates/radicle/src/storage/refs/sigrefs/read/test/mock.rs b/crates/radicle/src/storage/refs/sigrefs/read/test/mock.rs
index 4fe02d477..ae1aec026 100644
--- a/crates/radicle/src/storage/refs/sigrefs/read/test/mock.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/read/test/mock.rs
@@ -15,9 +15,9 @@ use radicle_oid::Oid;
use crate::git;
use crate::git::repository::object;
+use crate::git::repository::reference;
use crate::git::repository::types::{Blob, Commit};
use crate::identity::doc;
-use crate::storage::refs::sigrefs::git::reference;
use crate::storage::refs::{REFS_BLOB_PATH, Refs, SIGNATURE_BLOB_PATH, SIGREFS_BRANCH};
pub(crate) const MOCKED_IDENTITY: u8 = 99u8;
@@ -216,18 +216,29 @@ impl object::Reader for MockRepository {
}
impl reference::Reader for MockRepository {
- fn find_reference(
+ type References<'a> = std::iter::Empty<
+ Result<(git::fmt::Qualified<'static>, Oid), reference::error::read::ListReference>,
+ >;
+
+ fn ref_target<R: AsRef<git::fmt::RefStr>>(
&self,
- reference: &git::fmt::Namespaced,
- ) -> Result<Option<Oid>, reference::error::FindReference> {
- match self.references.get(reference.as_str()) {
+ name: &R,
+ ) -> Result<Option<Oid>, reference::error::read::RefTarget> {
+ match self.references.get(name.as_ref().as_str()) {
Some(RefBehavior::Present(oid)) => Ok(Some(*oid)),
Some(RefBehavior::Missing) | None => Ok(None),
- Some(RefBehavior::Error) => Err(reference::error::FindReference::other(
+ Some(RefBehavior::Error) => Err(reference::error::read::RefTarget::backend(
std::io::Error::other("mock reference error"),
)),
}
}
+
+ fn list_refs<'a, P: AsRef<git::fmt::refspec::PatternStr>>(
+ &'a self,
+ _pattern: &P,
+ ) -> Result<Self::References<'a>, reference::error::read::ListRefs> {
+ unimplemented!("MockRepository::list_refs")
+ }
}
/// Accepts every (message, signature) pair without inspecting either.
diff --git a/crates/radicle/src/storage/refs/sigrefs/write.rs b/crates/radicle/src/storage/refs/sigrefs/write.rs
index 63464fe3e..6f2da6ac6 100644
--- a/crates/radicle/src/storage/refs/sigrefs/write.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/write.rs
@@ -73,7 +73,10 @@ pub struct SignedRefsWriter<'a, R, S> {
impl<'a, R, S> SignedRefsWriter<'a, R, S>
where
- R: object::Writer + repository::object::Reader + reference::Writer + reference::Reader,
+ R: object::Writer
+ + repository::object::Reader
+ + reference::Writer
+ + repository::reference::Reader,
S: Signer<crypto::Signature>,
S: signature::Verifier<crypto::Signature>,
{
@@ -378,7 +381,7 @@ struct HeadReader<'a, 'b, 'c, R, V> {
impl<'a, 'b, 'c, R, V> HeadReader<'a, 'b, 'c, R, V>
where
- R: repository::object::Reader + reference::Reader,
+ R: repository::object::Reader + repository::reference::Reader,
V: signature::Verifier<crypto::Signature>,
{
/// Construct a [`HeadReader`] with the `reference` that is being read from
@@ -406,7 +409,7 @@ where
fn read(self) -> Result<Option<Head>, error::Head> {
let Some(oid) = self
.repository
- .find_reference(self.reference)
+ .ref_target(self.reference)
.map_err(error::Head::Reference)?
else {
return Ok(None);
diff --git a/crates/radicle/src/storage/refs/sigrefs/write/error.rs b/crates/radicle/src/storage/refs/sigrefs/write/error.rs
index 12ba0f005..10e4ea9d5 100644
--- a/crates/radicle/src/storage/refs/sigrefs/write/error.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/write/error.rs
@@ -1,6 +1,7 @@
use radicle_oid::Oid;
use thiserror::Error;
+use crate::git::repository;
use crate::storage::refs::sigrefs::git::{object, reference};
// TODO: use commit NID (and RID?) for traceability
@@ -41,7 +42,7 @@ pub enum Tree {
#[error(transparent)]
pub enum Head {
#[error(transparent)]
- Reference(reference::error::FindReference),
+ Reference(repository::reference::error::read::RefTarget),
#[error(transparent)]
Commit(super::read::error::Commit),
#[error("failed to verify commit {commit}: {source}")]
diff --git a/crates/radicle/src/storage/refs/sigrefs/write/test/mock.rs b/crates/radicle/src/storage/refs/sigrefs/write/test/mock.rs
index da5485b88..14193d7ff 100644
--- a/crates/radicle/src/storage/refs/sigrefs/write/test/mock.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/write/test/mock.rs
@@ -243,19 +243,35 @@ impl repository::object::Reader for MockRepository {
}
}
-impl reference::Reader for MockRepository {
- fn find_reference(
+impl repository::reference::Reader for MockRepository {
+ type References<'a> = std::iter::Empty<
+ Result<
+ (git::fmt::Qualified<'static>, Oid),
+ repository::reference::error::read::ListReference,
+ >,
+ >;
+
+ fn ref_target<R: AsRef<git::fmt::RefStr>>(
&self,
- reference: &git::fmt::Namespaced,
- ) -> Result<Option<Oid>, reference::error::FindReference> {
- match self.references.get(reference.as_str()) {
+ name: &R,
+ ) -> Result<Option<Oid>, repository::reference::error::read::RefTarget> {
+ match self.references.get(name.as_ref().as_str()) {
Some(RefBehavior::Present(oid)) => Ok(Some(*oid)),
Some(RefBehavior::Missing) | None => Ok(None),
- Some(RefBehavior::Error) => Err(reference::error::FindReference::other(
- std::io::Error::other("mock reference error"),
- )),
+ Some(RefBehavior::Error) => {
+ Err(repository::reference::error::read::RefTarget::backend(
+ std::io::Error::other("mock reference error"),
+ ))
+ }
}
}
+
+ fn list_refs<'a, P: AsRef<git::fmt::refspec::PatternStr>>(
+ &'a self,
+ _pattern: &P,
+ ) -> Result<Self::References<'a>, repository::reference::error::read::ListRefs> {
+ unimplemented!("MockRepository::list_refs")
+ }
}
impl object::Writer for MockRepository {
diff --git a/crates/radicle/src/test/storage.rs b/crates/radicle/src/test/storage.rs
index fb5ee4978..87622d8dc 100644
--- a/crates/radicle/src/test/storage.rs
+++ b/crates/radicle/src/test/storage.rs
@@ -152,16 +152,29 @@ impl MockRepository {
}
}
-impl self::refs::sigrefs::git::reference::Reader for MockRepository {
- fn find_reference(
+impl crate::git::repository::reference::Reader for MockRepository {
+ type References<'a> = std::iter::Empty<
+ Result<
+ (git::fmt::Qualified<'static>, Oid),
+ crate::git::repository::reference::error::read::ListReference,
+ >,
+ >;
+
+ fn ref_target<R: AsRef<git::fmt::RefStr>>(
&self,
- reference: &git::fmt::Namespaced,
- ) -> Result<Option<Oid>, refs::sigrefs::git::reference::error::FindReference> {
- use refs::sigrefs::git::reference::error::FindReference;
- let ns = reference.namespace();
+ name: &R,
+ ) -> Result<Option<Oid>, crate::git::repository::reference::error::read::RefTarget> {
+ use crate::git::repository::reference::error::read::RefTarget;
+
+ let name = name.as_ref();
+ let namespaced = match name.to_namespaced() {
+ Some(ns) => ns,
+ None => return Ok(None),
+ };
- let remote: PublicKey = ns.as_str().parse().map_err(FindReference::other)?;
- let reference = reference.strip_namespace();
+ let ns = namespaced.namespace();
+ let remote: PublicKey = ns.as_str().parse().map_err(RefTarget::backend)?;
+ let reference = namespaced.strip_namespace();
match self.remotes.get(&remote) {
None => Ok(None),
@@ -174,6 +187,14 @@ impl self::refs::sigrefs::git::reference::Reader for MockRepository {
}
}
}
+
+ fn list_refs<'a, P: AsRef<git::fmt::refspec::PatternStr>>(
+ &'a self,
+ _pattern: &P,
+ ) -> Result<Self::References<'a>, crate::git::repository::reference::error::read::ListRefs>
+ {
+ unimplemented!("MockRepository::list_refs")
+ }
}
impl RemoteRepository for MockRepository {
commit 6bc19f88a704e198e99b5d7e25343c59d42c15c6
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Tue Apr 14 12:01:39 2026 +0100
storage/refs/sigrefs: Refactor sigrefs::object::Reader to repository::object::Reader
Replace the sigrefs-specific sigrefs::object::Reader trait with the shared
git::repository::Reader trait across all sigrefs handlers.
Trait bounds are updated in `storage::refs`, which are satisfied by
`storage::git::Repository`.
The implementation of the mock `object::Reader` methods use
unimplemented!() for unused methods, i.e. `blob`, `exists`.
diff --git a/crates/radicle/src/storage/refs.rs b/crates/radicle/src/storage/refs.rs
index 639dd5f92..5d603af63 100644
--- a/crates/radicle/src/storage/refs.rs
+++ b/crates/radicle/src/storage/refs.rs
@@ -19,6 +19,7 @@ use thiserror::Error;
use crate::git;
use crate::git::Oid;
use crate::git::raw::ErrorExt as _;
+use crate::git::repository;
use crate::storage;
use crate::storage::RemoteId;
use crate::storage::refs::sigrefs::read::Tip;
@@ -78,7 +79,7 @@ impl Refs {
signer: &S,
) -> Result<SignedRefs, Error>
where
- R: sigrefs::git::object::Reader + sigrefs::git::object::Writer,
+ R: repository::object::Reader + sigrefs::git::object::Writer,
R: sigrefs::git::reference::Reader + sigrefs::git::reference::Writer,
R: HasRepoId,
S: signature::Signer<crypto::Signature>,
@@ -96,7 +97,7 @@ impl Refs {
signer: &S,
) -> Result<SignedRefs, Error>
where
- R: sigrefs::git::object::Reader + sigrefs::git::object::Writer,
+ R: repository::object::Reader + sigrefs::git::object::Writer,
R: sigrefs::git::reference::Reader + sigrefs::git::reference::Writer,
R: HasRepoId,
S: signature::Signer<crypto::Signature>,
@@ -114,7 +115,7 @@ impl Refs {
force: bool,
) -> Result<SignedRefs, Error>
where
- R: sigrefs::git::object::Reader + sigrefs::git::object::Writer,
+ R: repository::object::Reader + sigrefs::git::object::Writer,
R: sigrefs::git::reference::Reader + sigrefs::git::reference::Writer,
R: HasRepoId,
S: signature::Signer<crypto::Signature>,
@@ -425,7 +426,7 @@ impl SignedRefs {
pub fn load<R>(remote: RemoteId, repo: &R) -> Result<Option<Self>, sigrefs::read::error::Read>
where
R: HasRepoId,
- R: sigrefs::git::object::Reader + sigrefs::git::reference::Reader,
+ R: repository::object::Reader + sigrefs::git::reference::Reader,
{
Self::load_internal(remote, repo, sigrefs::read::Tip::Reference(remote))
}
@@ -437,7 +438,7 @@ impl SignedRefs {
) -> Result<Option<Self>, sigrefs::read::error::Read>
where
R: HasRepoId,
- R: sigrefs::git::object::Reader + sigrefs::git::reference::Reader,
+ R: repository::object::Reader + sigrefs::git::reference::Reader,
{
Self::load_internal(remote, repo, sigrefs::read::Tip::Commit(oid))
}
@@ -449,7 +450,7 @@ impl SignedRefs {
) -> Result<Option<Self>, sigrefs::read::error::Read>
where
R: HasRepoId,
- R: sigrefs::git::object::Reader + sigrefs::git::reference::Reader,
+ R: repository::object::Reader + sigrefs::git::reference::Reader,
{
let root = repo.rid();
match sigrefs::SignedRefsReader::new(root, tip, repo, &remote).read() {
diff --git a/crates/radicle/src/storage/refs/sigrefs/read.rs b/crates/radicle/src/storage/refs/sigrefs/read.rs
index a22bd3703..ae69a5e70 100644
--- a/crates/radicle/src/storage/refs/sigrefs/read.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/read.rs
@@ -16,8 +16,9 @@ use radicle_git_metadata::commit::CommitData;
use radicle_oid::Oid;
use crate::git;
+use crate::git::repository::object;
use crate::identity::doc;
-use crate::storage::refs::sigrefs::git::{object, reference};
+use crate::storage::refs::sigrefs::git::reference;
use crate::storage::refs::{
FeatureLevel, IDENTITY_ROOT, REFS_BLOB_PATH, Refs, SIGNATURE_BLOB_PATH, SIGREFS_BRANCH,
SignedRefs,
@@ -466,15 +467,10 @@ where
}
fn read_commit_data(&self) -> Result<CommitData<Oid, Oid>, error::Commit> {
- let bytes = self
- .repository
- .read_commit(&self.commit)
+ self.repository
+ .commit(self.commit)
.map_err(error::Commit::Read)?
- .ok_or(error::Commit::Missing { oid: self.commit })?;
- CommitData::from_bytes(&bytes).map_err(|err| error::Commit::Parse {
- oid: self.commit,
- source: err,
- })
+ .ok_or(error::Commit::Missing { oid: self.commit })
}
/// Extract the single parent [`Oid`] from a [`CommitData`], if any.
@@ -517,40 +513,42 @@ where
fn read(self) -> Result<Tree, error::Tree> {
let (refs, signature) = self.try_handle_blobs()?;
- let refs = Refs::from_canonical(&refs.bytes).map_err(error::Tree::ParseRefs)?;
- let signature = crypto::Signature::try_from(signature.bytes.as_slice())
+ let refs = Refs::from_canonical(&refs.content).map_err(error::Tree::ParseRefs)?;
+ let signature = crypto::Signature::try_from(signature.content.as_slice())
.map_err(error::Tree::ParseSignature)?;
Ok(Tree { refs, signature })
}
/// Fetch the refs blob and signature blob from the repository, returning a
/// descriptive error if either or both are missing.
- fn try_handle_blobs(&self) -> Result<(object::Blob, object::Blob), error::Tree> {
- let commit = &self.commit;
+ fn try_handle_blobs(
+ &self,
+ ) -> Result<(git::repository::Blob, git::repository::Blob), error::Tree> {
+ let commit = self.commit;
let refs_path = Path::new(REFS_BLOB_PATH);
let sig_path = Path::new(SIGNATURE_BLOB_PATH);
- let refs_bytes = self
+ let refs_blob = self
.repository
- .read_blob(commit, refs_path)
+ .blob_at(commit, &refs_path)
.map_err(error::Tree::Refs)?;
- let sig_bytes = self
+ let sig_blob = self
.repository
- .read_blob(commit, sig_path)
+ .blob_at(commit, &sig_path)
.map_err(error::Tree::Signature)?;
- let result = match (refs_bytes, sig_bytes) {
+ let result = match (refs_blob, sig_blob) {
(None, None) => Err(error::MissingBlobs::Both {
- commit: *commit,
+ commit,
refs: refs_path.to_path_buf(),
signature: sig_path.to_path_buf(),
}),
(None, Some(_)) => Err(error::MissingBlobs::Signature {
- commit: *commit,
+ commit,
path: sig_path.to_path_buf(),
}),
(Some(_), None) => Err(error::MissingBlobs::Refs {
- commit: *commit,
+ commit,
path: refs_path.to_path_buf(),
}),
(Some(refs), Some(sig)) => Ok((refs, sig)),
@@ -590,11 +588,11 @@ where
fn read_blob(&self, commit: &Oid) -> Result<RepoId, error::IdentityRoot> {
let path = Path::new("embeds").join(*doc::PATH);
- let object::Blob { oid, .. } = self
+ let blob = self
.repository
- .read_blob(commit, &path)
+ .blob_at(*commit, &path)
.map_err(error::IdentityRoot::Blob)?
.ok_or_else(|| error::IdentityRoot::MissingIdentity { commit: *commit })?;
- Ok(RepoId::from(oid))
+ Ok(RepoId::from(blob.oid))
}
}
diff --git a/crates/radicle/src/storage/refs/sigrefs/read/error.rs b/crates/radicle/src/storage/refs/sigrefs/read/error.rs
index c7a8c0626..e79cb1cbe 100644
--- a/crates/radicle/src/storage/refs/sigrefs/read/error.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/read/error.rs
@@ -6,7 +6,8 @@ use radicle_git_metadata::commit;
use radicle_oid::Oid;
use thiserror::Error;
-use crate::storage::refs::sigrefs::git::{object, reference};
+use crate::git::repository::object;
+use crate::storage::refs::sigrefs::git::reference;
use crate::storage::refs::sigrefs::read::FeatureLevels;
use crate::storage::refs::{FeatureLevel, canonical};
@@ -48,7 +49,7 @@ pub enum Commit {
#[error(transparent)]
TooManyParents(Parent),
#[error(transparent)]
- Read(object::error::ReadCommit),
+ Read(object::error::read::Commit),
}
#[derive(Debug, Error)]
@@ -75,9 +76,9 @@ impl fmt::Display for Parent {
#[non_exhaustive]
pub enum Tree {
#[error(transparent)]
- Refs(object::error::ReadBlob),
+ Refs(object::error::read::BlobAt),
#[error(transparent)]
- Signature(object::error::ReadBlob),
+ Signature(object::error::read::BlobAt),
#[error(transparent)]
ParseRefs(canonical::Error),
#[error(transparent)]
@@ -104,7 +105,7 @@ pub enum MissingBlobs {
#[non_exhaustive]
pub enum IdentityRoot {
#[error(transparent)]
- Blob(object::error::ReadBlob),
+ Blob(object::error::read::BlobAt),
#[error("missing repository identity commit '{commit}'")]
MissingIdentity { commit: Oid },
}
diff --git a/crates/radicle/src/storage/refs/sigrefs/read/iter.rs b/crates/radicle/src/storage/refs/sigrefs/read/iter.rs
index 5807575f1..2f711e750 100644
--- a/crates/radicle/src/storage/refs/sigrefs/read/iter.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/read/iter.rs
@@ -1,6 +1,6 @@
use radicle_oid::Oid;
-use crate::storage::refs::sigrefs::git::object;
+use crate::git::repository::object;
use super::{Commit, CommitReader, error};
diff --git a/crates/radicle/src/storage/refs/sigrefs/read/test/mock.rs b/crates/radicle/src/storage/refs/sigrefs/read/test/mock.rs
index 651c3782a..4fe02d477 100644
--- a/crates/radicle/src/storage/refs/sigrefs/read/test/mock.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/read/test/mock.rs
@@ -1,5 +1,7 @@
-//! Mock implementations of [`object::Reader`] and [`reference::Reader`] for
+//! Mock implementations of [`ObjectReader`] and [`reference::Reader`] for
//! unit-testing.
+//!
+//! [`ObjectReader`]: crate::git::repository::ObjectReader
use std::collections::HashMap;
use std::path::{Path, PathBuf};
@@ -12,13 +14,15 @@ use radicle_git_metadata::commit::trailers::OwnedTrailer;
use radicle_oid::Oid;
use crate::git;
+use crate::git::repository::object;
+use crate::git::repository::types::{Blob, Commit};
use crate::identity::doc;
-use crate::storage::refs::sigrefs::git::{object, reference};
+use crate::storage::refs::sigrefs::git::reference;
use crate::storage::refs::{REFS_BLOB_PATH, Refs, SIGNATURE_BLOB_PATH, SIGREFS_BRANCH};
pub(crate) const MOCKED_IDENTITY: u8 = 99u8;
-/// A configurable in-memory repository implementing [`object::Reader`] and
+/// A configurable in-memory repository implementing [`ObjectReader`] and
/// [`reference::Reader`].
/// All behaviour is set at construction time via the builder methods; the mock
/// is fully deterministic.
@@ -29,20 +33,20 @@ pub struct MockRepository {
}
enum CommitBehavior {
- /// [`object::Reader::read_commit`] returns `Ok(Some(bytes))`.
+ /// [`ObjectReader::commit`] returns `Ok(Some(commit))`.
Present(Box<CommitData<Oid, Oid>>),
- /// [`object::Reader::read_commit`] returns `Ok(None)`.
+ /// [`ObjectReader::commit`] returns `Ok(None)`.
Missing,
- /// [`object::Reader::read_commit`] returns `Err(…)`.
+ /// [`ObjectReader::commit`] returns `Err(…)`.
Error,
}
enum BlobBehavior {
- /// [`object::Reader::read_blob`] returns `Ok(Some(blob))`.
+ /// [`ObjectReader::blob_at`] returns `Ok(Some(blob))`.
Present(Vec<u8>),
- /// [`object::Reader::read_blob`] returns `Ok(None)`.
+ /// [`ObjectReader::blob_at`] returns `Ok(None)`.
Missing,
- /// [`object::Reader::read_blob`] returns `Err(…)`.
+ /// [`ObjectReader::blob_at`] returns `Err(…)`.
Error,
}
@@ -165,37 +169,50 @@ impl MockRepository {
}
impl object::Reader for MockRepository {
- fn read_commit(&self, oid: &Oid) -> Result<Option<Vec<u8>>, object::error::ReadCommit> {
- match self.commits.get(oid) {
- Some(CommitBehavior::Present(data)) => Ok(Some(data.to_string().as_bytes().to_vec())),
- Some(CommitBehavior::Missing) | None => Ok(None),
- Some(CommitBehavior::Error) => Err(object::error::ReadCommit::other(
- std::io::Error::other("mock commit error"),
- )),
- }
+ fn blob(&self, _oid: Oid) -> Result<Option<Blob>, object::error::read::Blob> {
+ unimplemented!("MockRepository::blob")
}
- fn read_blob(
+ fn blob_at<P: AsRef<Path>>(
&self,
- commit: &Oid,
- path: &Path,
- ) -> Result<Option<object::Blob>, object::error::ReadBlob> {
- let key = (*commit, path.to_path_buf());
+ commit: Oid,
+ path: &P,
+ ) -> Result<Option<Blob>, object::error::read::BlobAt> {
+ let key = (commit, path.as_ref().to_path_buf());
match self.blobs.get(&key) {
- Some(BlobBehavior::Present(bytes)) => Ok(Some(object::Blob {
+ Some(BlobBehavior::Present(bytes)) => Ok(Some(Blob {
// The blob OID is returned as the commit OID. This is
// intentional: IdentityRootReader converts blob.oid into a
// RepoId, so callers can predict which RepoId results from a
// given identity-root commit OID.
- oid: *commit,
- bytes: bytes.clone(),
+ oid: commit,
+ content: bytes.clone(),
})),
Some(BlobBehavior::Missing) | None => Ok(None),
- Some(BlobBehavior::Error) => Err(object::error::ReadBlob::other(
+ Some(BlobBehavior::Error) => Err(object::error::read::BlobAt::backend(
std::io::Error::other("mock blob error"),
)),
}
}
+
+ fn commit(&self, oid: Oid) -> Result<Option<Commit>, object::error::read::Commit> {
+ match self.commits.get(&oid) {
+ Some(CommitBehavior::Present(data)) => {
+ let bytes = data.to_string();
+ let parsed = Commit::from_bytes(bytes.as_bytes())
+ .map_err(|e| object::error::read::Commit::Parse { oid, source: e })?;
+ Ok(Some(parsed))
+ }
+ Some(CommitBehavior::Missing) | None => Ok(None),
+ Some(CommitBehavior::Error) => Err(object::error::read::Commit::backend(
+ std::io::Error::other("mock commit error"),
+ )),
+ }
+ }
+
+ fn exists(&self, _oid: Oid) -> Result<bool, object::error::read::Exists> {
+ unimplemented!("MockRepository::exists")
+ }
}
impl reference::Reader for MockRepository {
diff --git a/crates/radicle/src/storage/refs/sigrefs/write.rs b/crates/radicle/src/storage/refs/sigrefs/write.rs
index a427fb7fb..63464fe3e 100644
--- a/crates/radicle/src/storage/refs/sigrefs/write.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/write.rs
@@ -13,6 +13,7 @@ use radicle_git_metadata::commit::{CommitData, headers::Headers, trailers::Owned
use radicle_oid::Oid;
use crate::git;
+use crate::git::repository;
use crate::storage::refs::SignedRefs;
use crate::storage::refs::sigrefs::git::{Committer, object, reference};
use crate::storage::refs::sigrefs::read::CommitReader;
@@ -72,7 +73,7 @@ pub struct SignedRefsWriter<'a, R, S> {
impl<'a, R, S> SignedRefsWriter<'a, R, S>
where
- R: object::Writer + object::Reader + reference::Writer + reference::Reader,
+ R: object::Writer + repository::object::Reader + reference::Writer + reference::Reader,
S: Signer<crypto::Signature>,
S: signature::Verifier<crypto::Signature>,
{
@@ -377,7 +378,7 @@ struct HeadReader<'a, 'b, 'c, R, V> {
impl<'a, 'b, 'c, R, V> HeadReader<'a, 'b, 'c, R, V>
where
- R: object::Reader + reference::Reader,
+ R: repository::object::Reader + reference::Reader,
V: signature::Verifier<crypto::Signature>,
{
/// Construct a [`HeadReader`] with the `reference` that is being read from
diff --git a/crates/radicle/src/storage/refs/sigrefs/write/test/mock.rs b/crates/radicle/src/storage/refs/sigrefs/write/test/mock.rs
index 23ff266a4..da5485b88 100644
--- a/crates/radicle/src/storage/refs/sigrefs/write/test/mock.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/write/test/mock.rs
@@ -10,6 +10,8 @@ use radicle_git_metadata::commit::trailers::OwnedTrailer;
use radicle_oid::Oid;
use crate::git;
+use crate::git::repository;
+use crate::git::repository::types::{Blob, Commit};
use crate::identity::doc;
use crate::storage::HasRepoId;
use crate::storage::refs::sigrefs::git::{object, reference};
@@ -200,31 +202,45 @@ impl HasRepoId for MockRepository {
}
}
-impl object::Reader for MockRepository {
- fn read_commit(&self, oid: &Oid) -> Result<Option<Vec<u8>>, object::error::ReadCommit> {
- match self.commits.get(oid) {
- Some(CommitBehavior::Present(data)) => Ok(Some(data.to_string().as_bytes().to_vec())),
- None => Ok(None),
- }
+impl repository::object::Reader for MockRepository {
+ fn blob(&self, _oid: Oid) -> Result<Option<Blob>, repository::object::error::read::Blob> {
+ unimplemented!("MockRepository::blob")
}
- fn read_blob(
+ fn blob_at<P: AsRef<Path>>(
&self,
- commit: &Oid,
- path: &Path,
- ) -> Result<Option<object::Blob>, object::error::ReadBlob> {
- let key = (*commit, path.to_path_buf());
+ commit: Oid,
+ path: &P,
+ ) -> Result<Option<Blob>, repository::object::error::read::BlobAt> {
+ let key = (commit, path.as_ref().to_path_buf());
match self.blobs.get(&key) {
- Some(BlobBehavior::Present(bytes)) => Ok(Some(object::Blob {
- oid: *commit,
- bytes: bytes.clone(),
+ Some(BlobBehavior::Present(bytes)) => Ok(Some(Blob {
+ oid: commit,
+ content: bytes.clone(),
})),
Some(BlobBehavior::Missing) | None => Ok(None),
- Some(BlobBehavior::Error) => Err(object::error::ReadBlob::other(
+ Some(BlobBehavior::Error) => Err(repository::object::error::read::BlobAt::backend(
std::io::Error::other("mock blob error"),
)),
}
}
+
+ fn commit(&self, oid: Oid) -> Result<Option<Commit>, repository::object::error::read::Commit> {
+ match self.commits.get(&oid) {
+ Some(CommitBehavior::Present(data)) => {
+ let bytes = data.to_string();
+ let parsed = Commit::from_bytes(bytes.as_bytes()).map_err(|e| {
+ repository::object::error::read::Commit::Parse { oid, source: e }
+ })?;
+ Ok(Some(parsed))
+ }
+ None => Ok(None),
+ }
+ }
+
+ fn exists(&self, _oid: Oid) -> Result<bool, repository::object::error::read::Exists> {
+ unimplemented!("MockRepository::exists")
+ }
}
impl reference::Reader for MockRepository {
commit e1a46dcd7ad4ac6b53179ed7b0b6bdbe57ebabb3
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Tue Apr 14 12:43:49 2026 +0000
storage/git: Implement git::repository traits for Repository
diff --git a/crates/radicle/src/storage/git.rs b/crates/radicle/src/storage/git.rs
index 56b185435..23495324a 100644
--- a/crates/radicle/src/storage/git.rs
+++ b/crates/radicle/src/storage/git.rs
@@ -13,6 +13,8 @@ use std::{fs, io};
use crate::git::canonical::Quorum;
use crate::git::raw::ErrorExt as _;
+use crate::git::repository;
+use crate::git::repository::{ancestry, object, reference, revwalk};
use crate::identity::doc::DocError;
use crate::identity::{Doc, DocAt, RepoId};
use crate::identity::{Identity, Project};
@@ -1134,6 +1136,151 @@ impl sigrefs::git::reference::Writer for Repository {
}
}
+impl object::Reader for Repository {
+ fn blob(&self, oid: Oid) -> Result<Option<git::repository::Blob>, object::error::read::Blob> {
+ object::Reader::blob(&self.backend, oid)
+ }
+
+ fn blob_at<P>(
+ &self,
+ commit: Oid,
+ path: &P,
+ ) -> Result<Option<git::repository::Blob>, object::error::read::BlobAt>
+ where
+ P: AsRef<Path>,
+ {
+ object::Reader::blob_at(&self.backend, commit, path)
+ }
+
+ fn commit(
+ &self,
+ oid: Oid,
+ ) -> Result<Option<git::repository::Commit>, object::error::read::Commit> {
+ object::Reader::commit(&self.backend, oid)
+ }
+
+ fn exists(&self, oid: Oid) -> Result<bool, object::error::read::Exists> {
+ object::Reader::exists(&self.backend, oid)
+ }
+}
+
+impl object::Writer for Repository {
+ fn write_blob(&self, content: &[u8]) -> Result<Oid, object::error::write::Blob> {
+ object::Writer::write_blob(&self.backend, content)
+ }
+
+ fn write_tree(
+ &self,
+ entries: &[repository::types::TreeEntry],
+ ) -> Result<Oid, object::error::write::Tree> {
+ object::Writer::write_tree(&self.backend, entries)
+ }
+
+ fn write_commit(&self, bytes: &[u8]) -> Result<Oid, object::error::write::Commit> {
+ object::Writer::write_commit(&self.backend, bytes)
+ }
+}
+
+impl reference::Reader for Repository {
+ type References<'a> = <git::raw::Repository as reference::Reader>::References<'a>;
+
+ fn ref_target<R>(&self, name: &R) -> Result<Option<Oid>, reference::error::read::RefTarget>
+ where
+ R: AsRef<git::fmt::RefStr>,
+ {
+ reference::Reader::ref_target(&self.backend, name)
+ }
+
+ fn list_refs<'a, P>(
+ &'a self,
+ pattern: &P,
+ ) -> Result<Self::References<'a>, reference::error::read::ListRefs>
+ where
+ P: AsRef<git::fmt::refspec::PatternStr>,
+ {
+ reference::Reader::list_refs(&self.backend, pattern)
+ }
+}
+
+impl reference::Writer for Repository {
+ fn write_ref<R>(
+ &self,
+ name: &R,
+ target: reference::Target,
+ reflog: &str,
+ ) -> Result<(), reference::error::write::WriteRef>
+ where
+ R: AsRef<git::fmt::RefStr>,
+ {
+ reference::Writer::write_ref(&self.backend, name, target, reflog)
+ }
+
+ fn delete_ref<R>(&self, name: &R) -> Result<(), reference::error::write::DeleteRef>
+ where
+ R: AsRef<git::fmt::RefStr>,
+ {
+ reference::Writer::delete_ref(&self.backend, name)
+ }
+}
+
+impl reference::symbolic::Writer for Repository {
+ fn write_symbolic_ref<R>(
+ &self,
+ name: &R,
+ target: reference::symbolic::Target,
+ reflog: &str,
+ ) -> Result<(), reference::error::write::WriteSymbolicRef>
+ where
+ R: AsRef<radicle_git_ref_format::RefStr>,
+ {
+ reference::symbolic::Writer::write_symbolic_ref(&self.backend, name, target, reflog)
+ }
+}
+
+impl repository::Ancestry for Repository {
+ fn merge_base(&self, a: Oid, b: Oid) -> Result<Option<Oid>, ancestry::error::MergeBase> {
+ repository::Ancestry::merge_base(&self.backend, a, b)
+ }
+
+ fn is_ancestor(&self, ancestor: Oid, head: Oid) -> Result<bool, ancestry::error::IsAncestor> {
+ repository::Ancestry::is_ancestor(&self.backend, ancestor, head)
+ }
+
+ fn ahead_behind(
+ &self,
+ commit: Oid,
+ upstream: Oid,
+ ) -> Result<repository::AheadBehind, ancestry::error::AheadBehind> {
+ repository::Ancestry::ahead_behind(&self.backend, commit, upstream)
+ }
+}
+
+impl repository::Revwalk for Repository {
+ type RevwalkOids<'a>
+ = <git::raw::Repository as repository::Revwalk>::RevwalkOids<'a>
+ where
+ Self: 'a;
+
+ type RevwalkCommits<'a>
+ = <git::raw::Repository as repository::Revwalk>::RevwalkCommits<'a>
+ where
+ Self: 'a;
+
+ fn revwalk_oids<'a>(
+ &'a self,
+ plan: &repository::RevwalkPlan,
+ ) -> Result<Self::RevwalkOids<'a>, revwalk::error::Init> {
+ repository::Revwalk::revwalk_oids(&self.backend, plan)
+ }
+
+ fn revwalk_commits<'a>(
+ &'a self,
+ plan: &repository::RevwalkPlan,
+ ) -> Result<Self::RevwalkCommits<'a>, revwalk::error::Init> {
+ repository::Revwalk::revwalk_commits(&self.backend, plan)
+ }
+}
+
pub mod trailers {
use std::str::FromStr;
commit a59ea448cd8bfd126fcea3c3316eece8a3c6ea9c
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Sun Apr 12 07:22:56 2026 +0000
radicle/git/repository: Implement git2 adapter for all traits
Implement the git repository abstraction traits for
`git::raw::Repository`, adapting git2 to the domain types.
diff --git a/crates/radicle/src/git/raw.rs b/crates/radicle/src/git/raw.rs
index 68f589ed0..8508b5487 100644
--- a/crates/radicle/src/git/raw.rs
+++ b/crates/radicle/src/git/raw.rs
@@ -6,7 +6,8 @@
// Re-exports that are only used within this crate.
pub(crate) use git2::{
- AutotagOption, Blob, FetchOptions, FetchPrune, Object, Revwalk, Sort, message_trailers_strs,
+ AutotagOption, Blob, FetchOptions, FetchPrune, Object, Revwalk, Sort, TreeEntry,
+ message_trailers_strs,
};
#[cfg(unix)]
@@ -19,8 +20,8 @@ pub(crate) use git2::RemoteCallbacks;
// Re-exports that are used by other crates in the workspace, including this crate.
pub use git2::{
Branch, BranchType, Commit, Direction, Error, ErrorClass, ErrorCode, FileMode, ObjectType, Oid,
- Reference, Remote, Repository, RepositoryInitOptions, RepositoryOpenFlags, Signature, Time,
- Tree,
+ Reference, References, Remote, Repository, RepositoryInitOptions, RepositoryOpenFlags,
+ Signature, Time, Tree,
};
// Re-exports that are used by other crates in the workspace, but *not* this crate.
@@ -32,7 +33,6 @@ pub mod build {
// Re-exports for `radicle-cli`.
pub use git2::build::CheckoutBuilder;
- #[cfg(test)]
pub(crate) use git2::build::TreeUpdateBuilder;
}
diff --git a/crates/radicle/src/git/repository.rs b/crates/radicle/src/git/repository.rs
index aa7f2d7ce..73423a00f 100644
--- a/crates/radicle/src/git/repository.rs
+++ b/crates/radicle/src/git/repository.rs
@@ -17,6 +17,8 @@ pub mod reference;
pub mod revwalk;
pub mod types;
+mod adapter;
+
pub use ancestry::{AheadBehind, Ancestry};
pub use revwalk::{Revwalk, RevwalkPlan, SortOrder};
pub use types::{Blob, Commit, ObjectKind, TreeEntry};
diff --git a/crates/radicle/src/git/repository/adapter.rs b/crates/radicle/src/git/repository/adapter.rs
new file mode 100644
index 000000000..523ee2d4b
--- /dev/null
+++ b/crates/radicle/src/git/repository/adapter.rs
@@ -0,0 +1,5 @@
+//! Adapters for the traits defined in [`git::repository`].
+//!
+//! [`git::repository`]: crate::git::repository
+
+mod git2;
diff --git a/crates/radicle/src/git/repository/adapter/git2.rs b/crates/radicle/src/git/repository/adapter/git2.rs
new file mode 100644
index 000000000..56c8a078b
--- /dev/null
+++ b/crates/radicle/src/git/repository/adapter/git2.rs
@@ -0,0 +1,44 @@
+//! The [`Repository`] adapters for the various repository traits.
+//!
+//! [`Repository`]: crate::git::raw::Repository
+
+use crate::git;
+use crate::git::raw;
+
+use crate::git::repository::ObjectKind;
+
+mod ancestry;
+mod object;
+mod reference;
+mod revwalk;
+
+/// Helper trait to enable method chaining to return `None` when the error
+/// matches [`ErrorCode::NotFound`].
+///
+/// [`ErrorCode::NotFound`]: crate::git::raw::ErrorCode::NotFound
+trait NotFound<T> {
+ fn or_is_not_found(self) -> Result<Option<T>, raw::Error>;
+}
+
+impl<T> NotFound<T> for Result<T, raw::Error> {
+ fn or_is_not_found(self) -> Result<Option<T>, git::raw::Error> {
+ self.map(|t| Ok(Some(t))).unwrap_or_else(|e| {
+ if matches!(e.code(), raw::ErrorCode::NotFound) {
+ Ok(None)
+ } else {
+ Err(e)
+ }
+ })
+ }
+}
+
+/// Map a [`raw::ObjectType`] to an [`ObjectKind`].
+fn object_kind(kind: raw::ObjectType) -> ObjectKind {
+ match kind {
+ raw::ObjectType::Blob => ObjectKind::Blob,
+ raw::ObjectType::Tree => ObjectKind::Tree,
+ raw::ObjectType::Commit => ObjectKind::Commit,
+ raw::ObjectType::Tag => ObjectKind::Tag,
+ raw::ObjectType::Any => unreachable!("git2 does not expose other object types"),
+ }
+}
diff --git a/crates/radicle/src/git/repository/adapter/git2/ancestry.rs b/crates/radicle/src/git/repository/adapter/git2/ancestry.rs
new file mode 100644
index 000000000..de5746c40
--- /dev/null
+++ b/crates/radicle/src/git/repository/adapter/git2/ancestry.rs
@@ -0,0 +1,58 @@
+use radicle_oid::Oid;
+
+use crate::git::raw;
+use crate::git::repository::ancestry::error;
+use crate::git::repository::ancestry::{AheadBehind, Ancestry};
+
+use super::NotFound as _;
+
+impl Ancestry for raw::Repository {
+ fn merge_base(&self, a: Oid, b: Oid) -> Result<Option<Oid>, error::MergeBase> {
+ let odb = self.odb().map_err(error::MergeBase::backend)?;
+
+ if !odb.exists(a.into()) {
+ return Err(error::MergeBase::CommitNotFound { oid: a });
+ }
+
+ if !odb.exists(b.into()) {
+ return Err(error::MergeBase::CommitNotFound { oid: b });
+ }
+
+ self.merge_base(a.into(), b.into())
+ .map(Oid::from)
+ .or_is_not_found()
+ .map_err(error::MergeBase::backend)
+ }
+
+ fn is_ancestor(&self, ancestor: Oid, head: Oid) -> Result<bool, error::IsAncestor> {
+ let odb = self.odb().map_err(error::IsAncestor::backend)?;
+
+ if !odb.exists(ancestor.into()) {
+ return Err(error::IsAncestor::CommitNotFound { oid: ancestor });
+ }
+
+ if !odb.exists(head.into()) {
+ return Err(error::IsAncestor::CommitNotFound { oid: head });
+ }
+
+ self.graph_descendant_of(head.into(), ancestor.into())
+ .map_err(error::IsAncestor::backend)
+ }
+
+ fn ahead_behind(&self, commit: Oid, upstream: Oid) -> Result<AheadBehind, error::AheadBehind> {
+ let odb = self.odb().map_err(error::AheadBehind::backend)?;
+
+ if !odb.exists(commit.into()) {
+ return Err(error::AheadBehind::CommitNotFound { oid: commit });
+ }
+
+ if !odb.exists(upstream.into()) {
+ return Err(error::AheadBehind::CommitNotFound { oid: upstream });
+ }
+
+ let (ahead, behind) = self
+ .graph_ahead_behind(commit.into(), upstream.into())
+ .map_err(error::AheadBehind::backend)?;
+ Ok(AheadBehind { ahead, behind })
+ }
+}
diff --git a/crates/radicle/src/git/repository/adapter/git2/object.rs b/crates/radicle/src/git/repository/adapter/git2/object.rs
new file mode 100644
index 000000000..af63908f7
--- /dev/null
+++ b/crates/radicle/src/git/repository/adapter/git2/object.rs
@@ -0,0 +1,175 @@
+use std::path::Path;
+
+use radicle_oid::Oid;
+
+use crate::git;
+use crate::git::raw;
+use crate::git::repository::object;
+use crate::git::repository::object::error;
+use crate::git::repository::types::{Blob, Commit, ObjectKind, TreeEntry};
+
+use super::NotFound as _;
+use super::object_kind;
+
+impl object::Reader for raw::Repository {
+ fn blob(&self, oid: Oid) -> Result<Option<Blob>, error::read::Blob> {
+ self.find_blob(oid.into())
+ .map(|blob| Blob {
+ oid,
+ content: blob.content().to_vec(),
+ })
+ .or_is_not_found()
+ .map_err(error::read::Blob::backend)
+ }
+
+ fn blob_at<P: AsRef<Path>>(
+ &self,
+ oid: Oid,
+ path: &P,
+ ) -> Result<Option<Blob>, error::read::BlobAt> {
+ let path = path.as_ref();
+ let commit = find_commit(self, oid, &path)?;
+ let tree = commit.tree().map_err(|e| error::read::BlobAt::Tree {
+ commit: oid,
+ source: Box::new(e),
+ })?;
+ let entry =
+ tree.get_path(path)
+ .or_is_not_found()
+ .map_err(|e| error::read::BlobAt::TreeEntry {
+ commit: oid,
+ path: path.to_path_buf(),
+ source: Box::new(e),
+ })?;
+ entry
+ .map(|entry| try_entry_to_blob(self, oid, path, entry))
+ .transpose()
+ }
+
+ fn commit(&self, oid: Oid) -> Result<Option<Commit>, error::read::Commit> {
+ let odb = self.odb().map_err(error::read::Commit::backend)?;
+ let commit = odb
+ .read(oid.into())
+ .or_is_not_found()
+ .map_err(error::read::Commit::backend)?;
+ commit
+ .map(|obj| {
+ Commit::from_bytes(obj.data())
+ .map_err(|e| error::read::Commit::Parse { oid, source: e })
+ })
+ .transpose()
+ }
+
+ fn exists(&self, oid: Oid) -> Result<bool, error::read::Exists> {
+ self.odb()
+ .map(|odb| odb.exists(oid.into()))
+ .map_err(error::read::Exists::backend)
+ }
+}
+
+impl object::Writer for raw::Repository {
+ fn write_blob(&self, content: &[u8]) -> Result<Oid, error::write::Blob> {
+ self.blob(content)
+ .map(Oid::from)
+ .map_err(error::write::Blob::backend)
+ }
+
+ fn write_tree(&self, entries: &[TreeEntry]) -> Result<Oid, error::write::Tree> {
+ let empty_tree = empty_tree(self)?;
+ let mut builder = raw::build::TreeUpdateBuilder::new();
+ let odb = self.odb().map_err(error::write::Tree::backend)?;
+ for entry in entries {
+ match entry {
+ TreeEntry::Blob { path, content } => {
+ let oid = self
+ .blob(content)
+ .map_err(|e| error::write::Tree::WriteBlob {
+ path: path.to_path_buf(),
+ source: Box::new(e),
+ })?;
+ builder.upsert(path, oid, raw::FileMode::Blob);
+ }
+ TreeEntry::BlobRef { path, oid } => {
+ if !odb.exists(oid.into()) {
+ return Err(error::write::Tree::MissingBlob { oid: *oid });
+ }
+ builder.upsert(path, (*oid).into(), raw::FileMode::Blob);
+ }
+ }
+ }
+
+ builder
+ .create_updated(self, &empty_tree)
+ .map(Oid::from)
+ .map_err(error::write::Tree::backend)
+ }
+
+ fn write_commit(&self, bytes: &[u8]) -> Result<Oid, error::write::Commit> {
+ let odb = self.odb().map_err(error::write::Commit::backend)?;
+ odb.write(raw::ObjectType::Commit, bytes)
+ .map(Oid::from)
+ .map_err(error::write::Commit::backend)
+ }
+}
+
+/// Get or create the empty tree for use as a baseline.
+fn empty_tree(repo: &raw::Repository) -> Result<git::raw::Tree<'_>, error::write::Tree> {
+ let empty_oid = repo
+ .treebuilder(None)
+ .map_err(error::write::Tree::backend)?
+ .write()
+ .map_err(error::write::Tree::backend)?;
+ repo.find_tree(empty_oid)
+ .map_err(error::write::Tree::backend)
+}
+
+fn find_commit<'a, P: AsRef<Path>>(
+ repository: &'a git::raw::Repository,
+ commit: Oid,
+ path: &P,
+) -> Result<git::raw::Commit<'a>, error::read::BlobAt> {
+ match repository.find_commit(commit.into()) {
+ Ok(c) => Ok(c),
+ Err(e) if matches!(e.code(), git::raw::ErrorCode::NotFound) => {
+ Err(error::read::BlobAt::CommitNotFound {
+ commit,
+ path: path.as_ref().to_path_buf(),
+ })
+ }
+ Err(e) => Err(error::read::BlobAt::backend(e)),
+ }
+}
+
+fn try_object_to_blob(obj: git::raw::Object) -> Result<Blob, error::read::BlobAt> {
+ let blob = obj.into_blob().map_err(|obj| {
+ let actual = obj
+ .kind()
+ .map(|k| object_kind(k).to_string())
+ .unwrap_or_else(|| "unknown".to_string());
+ error::read::BlobAt::TypeMismatch {
+ oid: Oid::from(obj.id()),
+ expected: ObjectKind::Blob,
+ actual,
+ }
+ })?;
+ Ok(Blob {
+ oid: Oid::from(blob.id()),
+ content: blob.content().to_vec(),
+ })
+}
+
+fn try_entry_to_blob(
+ repository: &git::raw::Repository,
+ oid: Oid,
+ path: &Path,
+ entry: raw::TreeEntry<'_>,
+) -> Result<Blob, error::read::BlobAt> {
+ let obj = entry
+ .to_object(repository)
+ .map_err(|e| error::read::BlobAt::Object {
+ commit: oid,
+ path: path.to_path_buf(),
+ source: Box::new(e),
+ })?;
+ try_object_to_blob(obj)
+}
diff --git a/crates/radicle/src/git/repository/adapter/git2/reference.rs b/crates/radicle/src/git/repository/adapter/git2/reference.rs
new file mode 100644
index 000000000..814893505
--- /dev/null
+++ b/crates/radicle/src/git/repository/adapter/git2/reference.rs
@@ -0,0 +1,300 @@
+use radicle_git_ref_format::{Qualified, RefStr, refspec};
+use radicle_oid::Oid;
+
+use crate::git;
+use crate::git::raw;
+use crate::git::repository::reference::error;
+use crate::git::repository::reference::{self, symbolic};
+
+use super::NotFound as _;
+
+/// Iterator adapter for [`reference::Reader::list_refs`].
+pub struct References<'a> {
+ inner: git::raw::References<'a>,
+}
+
+impl Iterator for References<'_> {
+ type Item = Result<(Qualified<'static>, Oid), error::read::ListReference>;
+
+ fn next(&mut self) -> Option<Self::Item> {
+ loop {
+ let r = match self.inner.next()? {
+ Ok(r) => r,
+ Err(e) => {
+ return Some(Err(error::read::ListReference::backend(e)));
+ }
+ };
+
+ let name = match r.name() {
+ Some(n) => n,
+ None => continue,
+ };
+
+ let refstr = match RefStr::try_from_str(name) {
+ Ok(r) => r,
+ Err(e) => {
+ return Some(Err(error::read::ListReference::Parse {
+ name: name.to_string(),
+ source: e,
+ }));
+ }
+ };
+
+ let qualified = match Qualified::from_refstr(refstr) {
+ Some(q) => q.to_owned(),
+ None => continue,
+ };
+
+ let oid = match r.resolve().map(|r| r.target()) {
+ Ok(Some(oid)) => Oid::from(oid),
+ Ok(None) => continue,
+ Err(e) => {
+ return Some(Err(error::read::ListReference::Peel {
+ name: qualified,
+ source: Box::new(e),
+ }));
+ }
+ };
+
+ return Some(Ok((qualified, oid)));
+ }
+ }
+}
+
+impl reference::Reader for raw::Repository {
+ type References<'a> = References<'a>;
+
+ fn ref_target<R: AsRef<RefStr>>(
+ &self,
+ name: &R,
+ ) -> Result<Option<Oid>, error::read::RefTarget> {
+ self.refname_to_id(name.as_ref().as_str())
+ .map(Oid::from)
+ .or_is_not_found()
+ .map_err(error::read::RefTarget::backend)
+ }
+
+ fn list_refs<'a, P>(
+ &'a self,
+ pattern: &P,
+ ) -> Result<Self::References<'a>, error::read::ListRefs>
+ where
+ P: AsRef<refspec::PatternStr>,
+ {
+ let inner = self
+ .references_glob(pattern.as_ref().as_str())
+ .map_err(error::read::ListRefs::backend)?;
+ Ok(References { inner })
+ }
+}
+
+impl reference::Writer for raw::Repository {
+ fn write_ref<R>(
+ &self,
+ name: &R,
+ target: reference::Target,
+ reflog: &str,
+ ) -> Result<(), error::write::WriteRef>
+ where
+ R: AsRef<RefStr>,
+ {
+ let name = name.as_ref();
+
+ // Verify the target object exists.
+ {
+ let odb = self.odb().map_err(error::write::WriteRef::backend)?;
+ let target_oid = target.target();
+ if !odb.exists(target_oid.into()) {
+ return Err(error::write::WriteRef::MissingTarget {
+ name: name.to_string(),
+ target: target_oid,
+ });
+ }
+ }
+
+ match target {
+ reference::Target::Create { target } => {
+ create_reference(self, reflog, name, target)?;
+ }
+ reference::Target::Upsert { target } => {
+ upsert_reference(self, reflog, name, target)?;
+ }
+ reference::Target::Cas { target, expected } => {
+ cas_reference(self, reflog, name, target, expected)?;
+ }
+ }
+
+ Ok(())
+ }
+
+ fn delete_ref<R>(&self, name: &R) -> Result<(), error::write::DeleteRef>
+ where
+ R: AsRef<RefStr>,
+ {
+ match self.find_reference(name.as_ref().as_str()) {
+ Ok(mut r) => r.delete().map_err(error::write::DeleteRef::backend),
+ Err(e) if matches!(e.code(), git::raw::ErrorCode::NotFound) => Ok(()),
+ Err(e) => Err(error::write::DeleteRef::backend(e)),
+ }
+ }
+}
+
+fn create_reference(
+ repository: &git::raw::Repository,
+ reflog: &str,
+ name: &RefStr,
+ target: Oid,
+) -> Result<(), error::write::WriteRef> {
+ repository
+ .reference(name, target.into(), false, reflog)
+ .map_err(|e| {
+ if matches!(e.code(), raw::ErrorCode::Exists) {
+ error::write::WriteRef::ReferenceExists {
+ name: name.to_string(),
+ }
+ } else {
+ error::write::WriteRef::backend(e)
+ }
+ })?;
+ Ok(())
+}
+
+fn upsert_reference(
+ repository: &git::raw::Repository,
+ reflog: &str,
+ name: &RefStr,
+ target: Oid,
+) -> Result<(), error::write::WriteRef> {
+ repository
+ .reference(name, target.into(), true, reflog)
+ .map_err(error::write::WriteRef::backend)?;
+ Ok(())
+}
+
+fn cas_reference(
+ repository: &git::raw::Repository,
+ reflog: &str,
+ name: &RefStr,
+ target: Oid,
+ expected: Oid,
+) -> Result<(), error::write::WriteRef> {
+ // CAS requires `force=true` so that libgit2 skips the existence
+ // check in `reference_path_available` and instead compares the
+ // current value via `cmp_old_ref`. With `force=false`, an existing
+ // reference would always fail with `GIT_EEXISTS` before the old
+ // value is ever compared.
+ repository
+ .reference_matching(name, target.into(), true, expected.into(), reflog)
+ .map_err(|e| {
+ if matches!(e.code(), raw::ErrorCode::Modified) {
+ error::write::WriteRef::CasFailed {
+ name: name.to_string(),
+ expected,
+ }
+ } else {
+ error::write::WriteRef::backend(e)
+ }
+ })?;
+ Ok(())
+}
+
+impl symbolic::Writer for raw::Repository {
+ fn write_symbolic_ref<R>(
+ &self,
+ name: &R,
+ target: symbolic::Target,
+ reflog: &str,
+ ) -> Result<(), error::write::WriteSymbolicRef>
+ where
+ R: AsRef<RefStr>,
+ {
+ let name = name.as_ref();
+
+ // Ensure the target reference exists.
+ {
+ let target = target.target();
+ match self.find_reference(target) {
+ Ok(_) => {}
+ Err(e) if matches!(e.code(), git::raw::ErrorCode::NotFound) => {
+ return Err(error::write::WriteSymbolicRef::MissingTarget {
+ name: name.to_ref_string(),
+ target: target.to_owned(),
+ });
+ }
+ Err(e) => {
+ return Err(error::write::WriteSymbolicRef::backend(e));
+ }
+ }
+ }
+
+ match target {
+ symbolic::Target::Create { target } => {
+ create_symbolic_reference(self, reflog, name, &target)?;
+ }
+ symbolic::Target::Upsert { target } => {
+ upsert_symbolic_reference(self, reflog, name, &target)?;
+ }
+ symbolic::Target::Cas { target, expected } => {
+ cas_symbolic_reference(self, reflog, name, &target, &expected)?;
+ }
+ }
+
+ Ok(())
+ }
+}
+
+fn create_symbolic_reference(
+ repository: &git::raw::Repository,
+ reflog: &str,
+ name: &RefStr,
+ target: &RefStr,
+) -> Result<(), error::write::WriteSymbolicRef> {
+ repository
+ .reference_symbolic(name, target, false, reflog)
+ .map_err(|e| {
+ if matches!(e.code(), raw::ErrorCode::Exists) {
+ error::write::WriteSymbolicRef::ReferenceExists {
+ name: name.to_ref_string(),
+ target: target.to_ref_string(),
+ }
+ } else {
+ error::write::WriteSymbolicRef::backend(e)
+ }
+ })?;
+ Ok(())
+}
+
+fn upsert_symbolic_reference(
+ repository: &git::raw::Repository,
+ reflog: &str,
+ name: &RefStr,
+ target: &RefStr,
+) -> Result<(), error::write::WriteSymbolicRef> {
+ repository
+ .reference_symbolic(name, target, true, reflog)
+ .map_err(error::write::WriteSymbolicRef::backend)?;
+ Ok(())
+}
+
+fn cas_symbolic_reference(
+ repository: &git::raw::Repository,
+ reflog: &str,
+ name: &RefStr,
+ target: &RefStr,
+ expected: &RefStr,
+) -> Result<(), error::write::WriteSymbolicRef> {
+ // See `cas_reference` for why `force=true` is required for CAS.
+ repository
+ .reference_symbolic_matching(name, target, true, expected, reflog)
+ .map_err(|e| {
+ if matches!(e.code(), raw::ErrorCode::Modified) {
+ error::write::WriteSymbolicRef::CasFailed {
+ name: name.to_ref_string(),
+ expected: expected.to_ref_string(),
+ }
+ } else {
+ error::write::WriteSymbolicRef::backend(e)
+ }
+ })?;
+ Ok(())
+}
diff --git a/crates/radicle/src/git/repository/adapter/git2/revwalk.rs b/crates/radicle/src/git/repository/adapter/git2/revwalk.rs
new file mode 100644
index 000000000..1b8500a03
--- /dev/null
+++ b/crates/radicle/src/git/repository/adapter/git2/revwalk.rs
@@ -0,0 +1,113 @@
+use radicle_oid::Oid;
+
+use crate::git;
+use crate::git::raw;
+
+use crate::git::repository::revwalk::error;
+use crate::git::repository::revwalk::{Revwalk, RevwalkPlan, SortOrder};
+use crate::git::repository::types::Commit;
+
+/// [`Revwalk::RevwalkOids`] iterator using [`raw::Revwalk`].
+pub struct RevwalkOids<'a> {
+ inner: raw::Revwalk<'a>,
+}
+
+impl<'a> RevwalkOids<'a> {
+ pub fn hide(&mut self, oid: Oid) -> Result<(), error::Oids> {
+ self.inner.hide(oid.into()).map_err(error::Oids::backend)
+ }
+}
+
+impl Iterator for RevwalkOids<'_> {
+ type Item = Result<Oid, error::Oids>;
+
+ fn next(&mut self) -> Option<Self::Item> {
+ self.inner
+ .next()
+ .map(|r| r.map(Oid::from).map_err(error::Oids::backend))
+ }
+}
+
+/// [`Revwalk::RevwalkCommits`] iterator using [`raw::Revwalk`].
+pub struct RevwalkCommits<'a> {
+ oids: RevwalkOids<'a>,
+ backend: &'a raw::Repository,
+}
+
+impl<'a> RevwalkCommits<'a> {
+ pub fn hide(&mut self, oid: Oid) -> Result<(), error::Oids> {
+ self.oids.hide(oid)
+ }
+
+ fn read(backend: &raw::Repository, oid: Oid) -> Result<Commit, error::Commit> {
+ let odb = backend.odb().map_err(error::Commit::backend)?;
+ let obj = odb.read(oid.into()).map_err(error::Commit::backend)?;
+ Commit::from_bytes(obj.data()).map_err(|e| error::Commit::Parse { oid, source: e })
+ }
+}
+
+impl Iterator for RevwalkCommits<'_> {
+ type Item = Result<Commit, error::Commit>;
+
+ fn next(&mut self) -> Option<Self::Item> {
+ let oid = match self.oids.next()? {
+ Ok(oid) => oid,
+ Err(e) => return Some(Err(error::Commit::backend(e))),
+ };
+ Some(Self::read(self.backend, oid))
+ }
+}
+
+/// Configure a [`raw::Revwalk`] from a [`RevwalkPlan`].
+fn configure_revwalk(walk: &mut raw::Revwalk<'_>, plan: &RevwalkPlan) -> Result<(), error::Init> {
+ let sort = match plan.sort_order() {
+ SortOrder::Chronological { reverse: false } => git::raw::Sort::TIME,
+ SortOrder::Topological { reverse: false } => git::raw::Sort::TOPOLOGICAL,
+ SortOrder::Chronological { reverse: true } => git::raw::Sort::REVERSE,
+ SortOrder::Topological { reverse: true } => {
+ git::raw::Sort::TOPOLOGICAL | git::raw::Sort::REVERSE
+ }
+ };
+ walk.set_sorting(sort).map_err(error::Init::backend)?;
+
+ if let Some((from, to)) = plan.range_bounds() {
+ walk.push_range(&format!("{from}..{to}"))
+ .map_err(error::Init::backend)?;
+ }
+
+ for oid in plan.starts() {
+ walk.push((*oid).into()).map_err(error::Init::backend)?;
+ }
+
+ for oid in plan.hidden() {
+ walk.hide((*oid).into()).map_err(error::Init::backend)?;
+ }
+
+ Ok(())
+}
+
+impl Revwalk for raw::Repository {
+ type RevwalkOids<'a> = RevwalkOids<'a>;
+ type RevwalkCommits<'a> = RevwalkCommits<'a>;
+
+ fn revwalk_oids<'a>(
+ &'a self,
+ plan: &RevwalkPlan,
+ ) -> Result<Self::RevwalkOids<'a>, error::Init> {
+ let mut walk = self.revwalk().map_err(error::Init::backend)?;
+ configure_revwalk(&mut walk, plan)?;
+ Ok(RevwalkOids { inner: walk })
+ }
+
+ fn revwalk_commits<'a>(
+ &'a self,
+ plan: &RevwalkPlan,
+ ) -> Result<Self::RevwalkCommits<'a>, error::Init> {
+ let mut walk = self.revwalk().map_err(error::Init::backend)?;
+ configure_revwalk(&mut walk, plan)?;
+ Ok(RevwalkCommits {
+ oids: RevwalkOids { inner: walk },
+ backend: self,
+ })
+ }
+}
commit bb2da17906f2107fb5795feef4186545d9f03b75
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Sun Apr 12 07:21:55 2026 +0000
radicle/git/repository: Define Revwalk trait
Provides revision walk operations for walking over a commit graph.
There are two methods:
- `revwalk_oids`: returns an iterator of `Oid`s of the commit graph,
- `revwalk_commits`: returns an iterator of `CommitData` of the commit graph.
The `RevwalkPlan` describes a builder for translating into the
adapters revision walk builder.
diff --git a/crates/radicle/src/git/repository.rs b/crates/radicle/src/git/repository.rs
index aedd59005..aa7f2d7ce 100644
--- a/crates/radicle/src/git/repository.rs
+++ b/crates/radicle/src/git/repository.rs
@@ -7,13 +7,16 @@
//! - [`types`] — Git domain types, i.e. Blob, Commit, TreeEntry, etc.
//! - [`object`] — The Git object store; providing read and write capabilities of Git objects.
//! - [`reference`] — The Git reference store; providing read and write capabilities of Git references.
+//! - [`revwalk`] – Git commit graph walk operations, i.e. "revwalk".
//!
//! [`reference`]: self::reference
pub mod ancestry;
pub mod object;
pub mod reference;
+pub mod revwalk;
pub mod types;
pub use ancestry::{AheadBehind, Ancestry};
+pub use revwalk::{Revwalk, RevwalkPlan, SortOrder};
pub use types::{Blob, Commit, ObjectKind, TreeEntry};
diff --git a/crates/radicle/src/git/repository/revwalk.rs b/crates/radicle/src/git/repository/revwalk.rs
new file mode 100644
index 000000000..f7c8372d6
--- /dev/null
+++ b/crates/radicle/src/git/repository/revwalk.rs
@@ -0,0 +1,143 @@
+//! Git commit graph walk trait.
+//!
+//! [`Revwalk`] provides commit iterators, given a [`RevwalkPlan`].
+
+pub mod error;
+
+use radicle_oid::Oid;
+
+use super::types::Commit;
+
+/// The sort order for a [`RevwalkPlan`].
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum SortOrder {
+ /// Chronological order (newest first, by commit time).
+ Chronological {
+ /// Setting `reverse` to `true` will sort in reverse-chronological
+ /// order (oldest first, by commit time).
+ reverse: bool,
+ },
+ /// Topological order (parents before children).
+ Topological {
+ /// Setting `reverse` to `true` will sort in reverse-topological order
+ /// (children before parents).
+ reverse: bool,
+ },
+}
+
+impl Default for SortOrder {
+ fn default() -> Self {
+ Self::Chronological { reverse: false }
+ }
+}
+
+/// A plan for walking the commit graph.
+///
+/// Accumulates configuration (start points, hidden commits, sort order)
+/// and is finalised by passing it to an [`Revwalk`] implementation.
+#[derive(Clone, Debug, Default)]
+pub struct RevwalkPlan {
+ start: Vec<Oid>,
+ hide: Vec<Oid>,
+ range: Option<(Oid, Oid)>,
+ sort: SortOrder,
+}
+
+impl RevwalkPlan {
+ /// Create a default walk, that walks all commits in chronological order.
+ pub fn new() -> Self {
+ Self::default()
+ }
+
+ /// Add a starting point for the walk.
+ pub fn push(mut self, oid: Oid) -> Self {
+ self.start.push(oid);
+ self
+ }
+
+ /// Exclude commits reachable from this [`Oid`].
+ pub fn hide(mut self, oid: Oid) -> Self {
+ self.hide.push(oid);
+ self
+ }
+
+ /// Walk only commits in the range `from..to` (commits reachable from
+ /// `to` but not from `from`).
+ pub fn range(mut self, from: Oid, to: Oid) -> Self {
+ self.range = Some((from, to));
+ self
+ }
+
+ /// Set the sort order for the walk.
+ pub fn sort(mut self, order: SortOrder) -> Self {
+ self.sort = order;
+ self
+ }
+
+ /// The starting points for the walk.
+ pub fn starts(&self) -> &[Oid] {
+ &self.start
+ }
+
+ /// The commits to hide (exclude reachable commits).
+ pub fn hidden(&self) -> &[Oid] {
+ &self.hide
+ }
+
+ /// The range, if set.
+ pub fn range_bounds(&self) -> Option<(Oid, Oid)> {
+ self.range
+ }
+
+ /// The sort order.
+ pub fn sort_order(&self) -> SortOrder {
+ self.sort
+ }
+}
+
+/// Git commit graph walks.
+pub trait Revwalk {
+ /// Iterator of commit [`Oid`]s.
+ type RevwalkOids<'a>: Iterator<Item = Result<Oid, error::Oids>> + 'a
+ where
+ Self: 'a;
+
+ /// Iterator of [`Commit`]s.
+ type RevwalkCommits<'a>: Iterator<Item = Result<Commit, error::Commit>> + 'a
+ where
+ Self: 'a;
+
+ /// Execute a revwalk plan, returning an iterator of commit [`Oid`]s.
+ ///
+ /// The returned iterator yields [`Oids`] for per-step failures:
+ /// - [`Oids::Backend`]: An unexpected error during iteration.
+ ///
+ /// # Errors
+ ///
+ /// - [`Backend`]: An unexpected error when initialising the walk.
+ ///
+ /// [`Backend`]: error::Init::Backend
+ /// [`Oids`]: error::Oids
+ /// [`Oids::Backend`]: error::Oids::Backend
+ fn revwalk_oids<'a>(&'a self, plan: &RevwalkPlan)
+ -> Result<Self::RevwalkOids<'a>, error::Init>;
+
+ /// Execute a revwalk plan, returning an iterator of full [`Commit`] data.
+ ///
+ /// More expensive than [`Self::revwalk_oids`] since each commit is fully
+ /// parsed during iteration.
+ ///
+ /// The returned iterator yields [`error::Commit`] for per-step failures:
+ /// - [`error::Commit::Parse`]: A commit's raw bytes could not be parsed.
+ /// - [`error::Commit::Backend`]: An unexpected error during iteration.
+ ///
+ /// # Errors
+ ///
+ /// - [`Backend`]: An unexpected error when initialising the walk.
+ ///
+ /// [`Backend`]: error::Init::Backend
+ fn revwalk_commits<'a>(
+ &'a self,
+ plan: &RevwalkPlan,
+ ) -> Result<Self::RevwalkCommits<'a>, error::Init>;
+}
diff --git a/crates/radicle/src/git/repository/revwalk/error.rs b/crates/radicle/src/git/repository/revwalk/error.rs
new file mode 100644
index 000000000..b9e087161
--- /dev/null
+++ b/crates/radicle/src/git/repository/revwalk/error.rs
@@ -0,0 +1,74 @@
+//! Errors returned by [`Revwalk`] methods and iterators.
+//!
+//! [`Revwalk`]: super::Revwalk
+
+use radicle_oid::Oid;
+use thiserror::Error;
+
+/// Error returned by [`Revwalk::revwalk_oids`] and
+/// [`Revwalk::revwalk_commits`] when initialising the walk.
+///
+/// [`Revwalk::revwalk_oids`]: super::Revwalk::revwalk_oids
+/// [`Revwalk::revwalk_commits`]: super::Revwalk::revwalk_commits
+#[derive(Debug, Error)]
+#[non_exhaustive]
+pub enum Init {
+ /// An error from the underlying git library.
+ #[error(transparent)]
+ Backend(Box<dyn std::error::Error + Send + Sync + 'static>),
+}
+
+impl Init {
+ pub fn backend<E>(err: E) -> Self
+ where
+ E: std::error::Error + Send + Sync + 'static,
+ {
+ Self::Backend(Box::new(err))
+ }
+}
+
+/// Error yielded by the [`Revwalk::RevwalkOids`] iterator.
+///
+/// [`Revwalk::RevwalkOids`]: super::Revwalk::RevwalkOids
+#[derive(Debug, Error)]
+#[non_exhaustive]
+pub enum Oids {
+ /// An error from the underlying git library.
+ #[error(transparent)]
+ Backend(Box<dyn std::error::Error + Send + Sync + 'static>),
+}
+
+impl Oids {
+ pub fn backend<E>(err: E) -> Self
+ where
+ E: std::error::Error + Send + Sync + 'static,
+ {
+ Self::Backend(Box::new(err))
+ }
+}
+
+/// Error yielded by the [`Revwalk::RevwalkCommits`] iterator.
+///
+/// [`Revwalk::RevwalkCommits`]: super::Revwalk::RevwalkCommits
+#[derive(Debug, Error)]
+#[non_exhaustive]
+pub enum Commit {
+ /// Failed to parse the raw commit bytes.
+ #[error("failed to parse commit '{oid}': {source}")]
+ Parse {
+ oid: Oid,
+ source: radicle_git_metadata::commit::ParseError,
+ },
+ /// An error from the underlying git library.
+ #[error(transparent)]
+ Backend(Box<dyn std::error::Error + Send + Sync + 'static>),
+}
+
+impl Commit {
+ pub fn backend<E>(err: E) -> Self
+ where
+ E: std::error::Error + Send + Sync + 'static,
+ {
+ Self::Backend(Box::new(err))
+ }
+}
commit 0ea99deb2b33d13745d7df50b98c573b34244b8b
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Sun Apr 12 07:21:55 2026 +0000
radicle/git/repository: Define Ancestry trait
Provides ancestry operations for ancestry checks, merge base check.
diff --git a/crates/radicle/src/git/repository.rs b/crates/radicle/src/git/repository.rs
index 7f95a69f1..aedd59005 100644
--- a/crates/radicle/src/git/repository.rs
+++ b/crates/radicle/src/git/repository.rs
@@ -3,14 +3,17 @@
//! Provides a library-agnostic interface for git repository operations,
//! separating concerns into:
//!
+//! - [`ancestry`] – Git ancestry operations.
//! - [`types`] — Git domain types, i.e. Blob, Commit, TreeEntry, etc.
//! - [`object`] — The Git object store; providing read and write capabilities of Git objects.
//! - [`reference`] — The Git reference store; providing read and write capabilities of Git references.
//!
//! [`reference`]: self::reference
+pub mod ancestry;
pub mod object;
pub mod reference;
pub mod types;
+pub use ancestry::{AheadBehind, Ancestry};
pub use types::{Blob, Commit, ObjectKind, TreeEntry};
diff --git a/crates/radicle/src/git/repository/ancestry.rs b/crates/radicle/src/git/repository/ancestry.rs
new file mode 100644
index 000000000..ca5f353e5
--- /dev/null
+++ b/crates/radicle/src/git/repository/ancestry.rs
@@ -0,0 +1,56 @@
+//! Git commit graph ancestry trait.
+//!
+//! [`Ancestry`] provides merge-base, ancestor checks, and ahead/behind counts.
+
+pub mod error;
+
+use radicle_oid::Oid;
+
+/// The result of [`Ancestry::ahead_behind`].
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+pub struct AheadBehind {
+ /// The given commit was ahead of the upstream by this many commits.
+ pub ahead: usize,
+ /// The given commit was behind the upstream by this many commits.
+ pub behind: usize,
+}
+
+/// Git commit graph operations.
+///
+/// Provides merge-base computation and ancestor checks.
+pub trait Ancestry {
+ /// Find the merge base (common ancestor) of two commits.
+ ///
+ /// Returns `Ok(None)` if there is no common ancestor.
+ ///
+ /// # Errors
+ ///
+ /// - [`CommitNotFound`]: One of the commits was not found.
+ /// - [`Backend`]: An unexpected error from the underlying git library.
+ ///
+ /// [`CommitNotFound`]: error::MergeBase::CommitNotFound
+ /// [`Backend`]: error::MergeBase::Backend
+ fn merge_base(&self, a: Oid, b: Oid) -> Result<Option<Oid>, error::MergeBase>;
+
+ /// Check whether `ancestor` is an ancestor of `head`.
+ ///
+ /// # Errors
+ ///
+ /// - [`CommitNotFound`]: One of the commits was not found.
+ /// - [`Backend`]: An unexpected error from the underlying git library.
+ ///
+ /// [`CommitNotFound`]: error::IsAncestor::CommitNotFound
+ /// [`Backend`]: error::IsAncestor::Backend
+ fn is_ancestor(&self, ancestor: Oid, head: Oid) -> Result<bool, error::IsAncestor>;
+
+ /// Count how many commits `commit` is ahead of and behind `upstream`.
+ ///
+ /// # Errors
+ ///
+ /// - [`CommitNotFound`]: One of the commits was not found.
+ /// - [`Backend`]: An unexpected error from the underlying git library.
+ ///
+ /// [`CommitNotFound`]: error::AheadBehind::CommitNotFound
+ /// [`Backend`]: error::AheadBehind::Backend
+ fn ahead_behind(&self, commit: Oid, upstream: Oid) -> Result<AheadBehind, error::AheadBehind>;
+}
diff --git a/crates/radicle/src/git/repository/ancestry/error.rs b/crates/radicle/src/git/repository/ancestry/error.rs
new file mode 100644
index 000000000..a04ccc9cd
--- /dev/null
+++ b/crates/radicle/src/git/repository/ancestry/error.rs
@@ -0,0 +1,75 @@
+//! Errors returned by [`Ancestry`] methods.
+//!
+//! [`Ancestry`]: super::Ancestry
+
+use radicle_oid::Oid;
+use thiserror::Error;
+
+/// Error returned by [`Ancestry::merge_base`].
+///
+/// [`Ancestry::merge_base`]: super::Ancestry::merge_base
+#[derive(Debug, Error)]
+#[non_exhaustive]
+pub enum MergeBase {
+ /// One of the commits could not be found
+ #[error("failed to find commit '{oid}' during merge base calculation")]
+ CommitNotFound { oid: Oid },
+ /// An error from the underlying git library.
+ #[error(transparent)]
+ Backend(Box<dyn std::error::Error + Send + Sync + 'static>),
+}
+
+impl MergeBase {
+ pub fn backend<E>(err: E) -> Self
+ where
+ E: std::error::Error + Send + Sync + 'static,
+ {
+ Self::Backend(Box::new(err))
+ }
+}
+
+/// Error returned by [`Ancestry::is_ancestor`].
+///
+/// [`Ancestry::is_ancestor`]: super::Ancestry::is_ancestor
+#[derive(Debug, Error)]
+#[non_exhaustive]
+pub enum IsAncestor {
+ /// One of the commits could not be found.
+ #[error("failed to find commit '{oid}'")]
+ CommitNotFound { oid: Oid },
+ /// An error from the underlying git library.
+ #[error(transparent)]
+ Backend(Box<dyn std::error::Error + Send + Sync + 'static>),
+}
+
+impl IsAncestor {
+ pub fn backend<E>(err: E) -> Self
+ where
+ E: std::error::Error + Send + Sync + 'static,
+ {
+ Self::Backend(Box::new(err))
+ }
+}
+
+/// Error returned by [`Ancestry::ahead_behind`].
+///
+/// [`Ancestry::ahead_behind`]: super::Ancestry::ahead_behind
+#[derive(Debug, Error)]
+#[non_exhaustive]
+pub enum AheadBehind {
+ /// One of the commits was not found.
+ #[error("commit '{oid}' was not found")]
+ CommitNotFound { oid: Oid },
+ /// An error from the underlying git library.
+ #[error(transparent)]
+ Backend(Box<dyn std::error::Error + Send + Sync + 'static>),
+}
+
+impl AheadBehind {
+ pub fn backend<E>(err: E) -> Self
+ where
+ E: std::error::Error + Send + Sync + 'static,
+ {
+ Self::Backend(Box::new(err))
+ }
+}
commit 136cddfb741e1dedb407551c0d9fc4c3c5813646
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Sun Apr 12 07:19:50 2026 +0000
radicle/git/repository: Define reference::Reader, reference::Writer, symbolic::Writer
Introduce the reference reader, writer, and symbolic extension trait for Git
reference databases.
The reader captures resolving reference targets, and listing references.
The writers capture writing and deleting direct references, an
extension trait for writing a symbolic reference.
diff --git a/crates/radicle/src/git/repository/reference.rs b/crates/radicle/src/git/repository/reference.rs
index 439f52ac2..81f3fea8e 100644
--- a/crates/radicle/src/git/repository/reference.rs
+++ b/crates/radicle/src/git/repository/reference.rs
@@ -1 +1,187 @@
//! Git reference operations.
+//!
+//! The module provides the following traits:
+//! - [`Reader`] for reading references,
+//! - [`Writer`] for writing references, and
+//! - [`symbolic::Writer`], which extends [`Writer`], for writing symbolic references.
+
+pub mod error;
+pub mod symbolic;
+
+use radicle_oid::Oid;
+
+use radicle_git_ref_format::refspec::PatternStr;
+use radicle_git_ref_format::{Qualified, RefStr};
+
+/// Read Git references.
+///
+/// # Target Resolution
+///
+/// Direct references point to a target [`Oid`]. For most references, this is a
+/// commit object. In the case of annotated tags, this will be a tag object.
+/// In both cases, the target returned will be a commit [`Oid`]; where, in the
+/// case of an annotated tag, it is the commit of the tag itself.
+///
+/// Symbolic references point to another reference. These references are peeled
+/// until they find the target [`Oid`] of a direct reference.
+pub trait Reader {
+ type References<'a>: Iterator<Item = Result<(Qualified<'static>, Oid), error::read::ListReference>>
+ + 'a
+ where
+ Self: 'a;
+
+ /// Resolve a reference to its target [`Oid`].
+ ///
+ /// Returns `None` if the reference does not exist.
+ ///
+ /// # Errors
+ ///
+ /// - [`Backend`]: An unexpected error from the underlying git library.
+ ///
+ /// [`Backend`]: error::read::RefTarget::Backend
+ fn ref_target<R>(&self, name: &R) -> Result<Option<Oid>, error::read::RefTarget>
+ where
+ R: AsRef<RefStr>;
+
+ /// Resolve a reference to its target [`Oid`], returning an error if it does
+ /// not exist.
+ ///
+ /// # Errors
+ ///
+ /// - [`NotFound`]: The reference identified by `name` was not found.
+ /// - [`Backend`]: An unexpected error from the underlying git library.
+ ///
+ /// [`NotFound`]: error::read::RefTarget::NotFound
+ /// [`Backend`]: error::read::RefTarget::Backend
+ fn try_ref_target<R>(&self, name: &R) -> Result<Oid, error::read::RefTarget>
+ where
+ R: AsRef<RefStr>,
+ {
+ self.ref_target(name)?
+ .ok_or_else(|| error::read::RefTarget::NotFound(name.as_ref().to_ref_string()))
+ }
+
+ /// List all references matching a glob pattern.
+ ///
+ /// Each reference is parsed and peeled to its target commit. If either of
+ /// these operations fails, it is returned in the iterator. The caller may
+ /// choose to log these failures and skip the entry.
+ ///
+ /// # Errors
+ ///
+ /// - [`Backend`]: An unexpected error when initialising the reference
+ /// iterator.
+ ///
+ /// The iterator itself yields [`ListReference`] for per-reference
+ /// failures:
+ /// - [`Parse`]: A reference name could not be parsed as a [`Qualified`].
+ /// - [`Peel`]: A reference could not be peeled to a target commit.
+ /// - [`ListReference::Backend`]: An unexpected error during iteration.
+ ///
+ /// [`Backend`]: error::read::ListRefs::Backend
+ /// [`ListReference`]: error::read::ListReference
+ /// [`Parse`]: error::read::ListReference::Parse
+ /// [`Peel`]: error::read::ListReference::Peel
+ /// [`ListReference::Backend`]: error::read::ListReference::Backend
+ fn list_refs<'a, P>(
+ &'a self,
+ pattern: &P,
+ ) -> Result<Self::References<'a>, error::read::ListRefs>
+ where
+ P: AsRef<PatternStr>;
+}
+
+/// The mode of operation for writing a reference.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+pub enum Target {
+ /// Set the reference to the given `target`, only if the reference does not
+ /// already exist.
+ Create { target: Oid },
+ /// Set the reference to the given `target`, the reference may exist
+ /// already.
+ Upsert { target: Oid },
+ /// Set the reference to the given `target`, only if the reference's
+ /// current value matches `expected`.
+ Cas { target: Oid, expected: Oid },
+}
+
+impl Target {
+ /// Construct the [`Create`] variant, which creates a new reference pointing
+ /// to the `target`. This variant will only succeed if the reference
+ /// pointing to `target` does not already exist.
+ ///
+ /// [`Create`]: Target::Create
+ pub fn create(target: Oid) -> Self {
+ Self::Create { target }
+ }
+
+ /// Construct the [`Upsert`] variant, which creates a new reference pointing
+ /// to the `target`. This variant will succeed even if the reference
+ /// pointing to `target` already exists.
+ ///
+ /// [`Upsert`]: Target::Upsert
+ pub fn upsert<R>(target: Oid) -> Self
+ where
+ R: AsRef<RefStr>,
+ {
+ Self::Upsert { target }
+ }
+
+ /// Construct the [`Cas`] variant, which creates a new reference pointing to
+ /// the `target`. This variant will succeed only when the `expected` value
+ /// matches the previously existing target value.
+ ///
+ /// [`Cas`]: Target::Cas
+ pub fn cas(target: Oid, expected: Oid) -> Self {
+ Self::Cas { target, expected }
+ }
+
+ /// The target [`Oid`] that the reference should point to after the write.
+ pub fn target(&self) -> Oid {
+ match self {
+ Self::Create { target } | Self::Upsert { target } | Self::Cas { target, .. } => *target,
+ }
+ }
+}
+
+/// Write Git references.
+pub trait Writer {
+ /// Set a reference to the given [`Target`].
+ ///
+ /// # Errors
+ ///
+ /// - [`MissingTarget`]: The target [`Oid`] does not exist in the object
+ /// database.
+ /// - [`ReferenceExists`]: The reference already exists (for
+ /// [`Target::Create`]).
+ /// - [`CasFailed`]: The reference's current value did not match the
+ /// expected value (for [`Target::Cas`]).
+ /// - [`Backend`]: An unexpected error from the underlying git library.
+ ///
+ /// [`MissingTarget`]: error::write::WriteRef::MissingTarget
+ /// [`ReferenceExists`]: error::write::WriteRef::ReferenceExists
+ /// [`CasFailed`]: error::write::WriteRef::CasFailed
+ /// [`Backend`]: error::write::WriteRef::Backend
+ fn write_ref<R>(
+ &self,
+ name: &R,
+ target: Target,
+ reflog: &str,
+ ) -> Result<(), error::write::WriteRef>
+ where
+ R: AsRef<RefStr>;
+
+ /// Delete a reference from the Git repository.
+ ///
+ /// This operation must be idempotent, i.e. successive deletes of the same
+ /// reference name must succeed.
+ ///
+ /// # Errors
+ ///
+ /// - [`Backend`]: An unexpected error from the underlying git library.
+ ///
+ /// [`Backend`]: error::write::DeleteRef::Backend
+ fn delete_ref<R>(&self, name: &R) -> Result<(), error::write::DeleteRef>
+ where
+ R: AsRef<RefStr>;
+}
diff --git a/crates/radicle/src/git/repository/reference/error.rs b/crates/radicle/src/git/repository/reference/error.rs
new file mode 100644
index 000000000..fd3e27c15
--- /dev/null
+++ b/crates/radicle/src/git/repository/reference/error.rs
@@ -0,0 +1,4 @@
+//! Errors for Git reference operations, namespaced by read and write.
+
+pub mod read;
+pub mod write;
diff --git a/crates/radicle/src/git/repository/reference/error/read.rs b/crates/radicle/src/git/repository/reference/error/read.rs
new file mode 100644
index 000000000..ec8dfa78d
--- /dev/null
+++ b/crates/radicle/src/git/repository/reference/error/read.rs
@@ -0,0 +1,72 @@
+//! Errors returned by [`Reader`] methods.
+//!
+//! [`Reader`]: super::super::Reader
+
+use radicle_git_ref_format::RefString;
+use thiserror::Error;
+
+/// Error returned by [`Reader::ref_target`].
+///
+/// [`Reader::ref_target`]: super::super::Reader::ref_target
+#[derive(Debug, Error)]
+#[non_exhaustive]
+pub enum RefTarget {
+ /// The requested reference was not found.
+ #[error("failed to find reference '{0}'")]
+ NotFound(RefString),
+ /// An error from the underlying git library.
+ #[error(transparent)]
+ Backend(Box<dyn std::error::Error + Send + Sync + 'static>),
+}
+
+impl RefTarget {
+ pub fn backend<E: std::error::Error + Send + Sync + 'static>(err: E) -> Self {
+ Self::Backend(Box::new(err))
+ }
+}
+
+/// Error returned by [`Reader::list_refs`].
+///
+/// [`Reader::list_refs`]: super::super::Reader::list_refs
+#[derive(Debug, Error)]
+#[non_exhaustive]
+pub enum ListRefs {
+ /// An error from the underlying git library.
+ #[error(transparent)]
+ Backend(Box<dyn std::error::Error + Send + Sync + 'static>),
+}
+
+impl ListRefs {
+ pub fn backend<E: std::error::Error + Send + Sync + 'static>(err: E) -> Self {
+ Self::Backend(Box::new(err))
+ }
+}
+
+/// Error yielded by the [`Reader::list_refs`] iterator.
+///
+/// [`Reader::list_refs`]: super::super::Reader::list_refs
+#[derive(Debug, Error)]
+#[non_exhaustive]
+pub enum ListReference {
+ /// The reference database provided a malformed reference name.
+ #[error("failed to parse reference '{name}': {source}")]
+ Parse {
+ name: String,
+ source: radicle_git_ref_format::Error,
+ },
+ /// The reference could not be peeled to a target commit.
+ #[error("failed to peel '{name}' to target commit: {source}")]
+ Peel {
+ name: radicle_git_ref_format::Qualified<'static>,
+ source: Box<dyn std::error::Error + Send + Sync + 'static>,
+ },
+ /// An error from the underlying git library.
+ #[error(transparent)]
+ Backend(Box<dyn std::error::Error + Send + Sync + 'static>),
+}
+
+impl ListReference {
+ pub fn backend<E: std::error::Error + Send + Sync + 'static>(err: E) -> Self {
+ Self::Backend(Box::new(err))
+ }
+}
diff --git a/crates/radicle/src/git/repository/reference/error/write.rs b/crates/radicle/src/git/repository/reference/error/write.rs
new file mode 100644
index 000000000..a654e04c7
--- /dev/null
+++ b/crates/radicle/src/git/repository/reference/error/write.rs
@@ -0,0 +1,86 @@
+//! Errors returned by [`Writer`] and [`symbolic::Writer`] methods.
+//!
+//! [`Writer`]: super::super::Writer
+//! [`symbolic::Writer`]: super::super::symbolic::Writer
+
+use radicle_git_ref_format::RefString;
+use radicle_oid::Oid;
+use thiserror::Error;
+
+/// Error returned by [`Writer::write_ref`].
+///
+/// [`Writer::write_ref`]: super::super::Writer::write_ref
+#[derive(Debug, Error)]
+#[non_exhaustive]
+pub enum WriteRef {
+ /// Compare-and-swap failed.
+ #[error(
+ "failed to update reference '{name}' due to compare-and-swap failure with expected value {expected}"
+ )]
+ CasFailed { name: String, expected: Oid },
+ /// The target OID does not exist in the object database.
+ #[error("target object {target} not found when writing reference `{name}`")]
+ MissingTarget { name: String, target: Oid },
+ /// The reference already exists (for create-only writes).
+ #[error("reference '{name}' already exists")]
+ ReferenceExists { name: String },
+ /// An error from the underlying git library.
+ #[error(transparent)]
+ Backend(Box<dyn std::error::Error + Send + Sync + 'static>),
+}
+
+impl WriteRef {
+ pub fn backend<E: std::error::Error + Send + Sync + 'static>(err: E) -> Self {
+ Self::Backend(Box::new(err))
+ }
+}
+
+/// Error returned by [`Writer::delete_ref`].
+///
+/// [`Writer::delete_ref`]: super::super::Writer::delete_ref
+#[derive(Debug, Error)]
+#[non_exhaustive]
+pub enum DeleteRef {
+ /// An error from the underlying git library.
+ #[error(transparent)]
+ Backend(Box<dyn std::error::Error + Send + Sync + 'static>),
+}
+
+impl DeleteRef {
+ pub fn backend<E: std::error::Error + Send + Sync + 'static>(err: E) -> Self {
+ Self::Backend(Box::new(err))
+ }
+}
+
+/// Error returned by [`Writer::write_symbolic_ref`].
+///
+/// [`Writer::write_symbolic_ref`]: super::super::symbolic::Writer::write_symbolic_ref
+#[derive(Debug, Error)]
+#[non_exhaustive]
+pub enum WriteSymbolicRef {
+ /// The target reference does not exist.
+ #[error("could not create symbolic reference '{name}' due to missing target '{target}'")]
+ MissingTarget { name: RefString, target: RefString },
+ /// The named reference already exists.
+ #[error(
+ "could not create symbolic reference from '{name}' to '{target}', the reference already exists"
+ )]
+ ReferenceExists { name: RefString, target: RefString },
+ /// Compare-and-swap failed.
+ #[error(
+ "failed to update reference '{name}' due to compare-and-swap failure with expected value {expected}"
+ )]
+ CasFailed {
+ name: RefString,
+ expected: RefString,
+ },
+ /// An error from the underlying git library.
+ #[error(transparent)]
+ Backend(Box<dyn std::error::Error + Send + Sync + 'static>),
+}
+
+impl WriteSymbolicRef {
+ pub fn backend<E: std::error::Error + Send + Sync + 'static>(err: E) -> Self {
+ Self::Backend(Box::new(err))
+ }
+}
diff --git a/crates/radicle/src/git/repository/reference/symbolic.rs b/crates/radicle/src/git/repository/reference/symbolic.rs
new file mode 100644
index 000000000..0dbc41a6f
--- /dev/null
+++ b/crates/radicle/src/git/repository/reference/symbolic.rs
@@ -0,0 +1,115 @@
+//! Git symbolic reference operations.
+//!
+//! The module provides the following traits:
+//! - [`Writer`] for writing symbolic references.
+
+use radicle_git_ref_format::{RefStr, RefString};
+
+use super::error;
+
+/// The mode of operation for writing a symbolic reference.
+///
+/// See [`Writer::write_symbolic_ref`].
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum Target {
+ /// Set the reference to the given `target`, only if the reference does not
+ /// already exist.
+ Create { target: RefString },
+ /// Set the reference to the given `target`, the reference may exist
+ /// already.
+ Upsert { target: RefString },
+ /// Set the reference to the given `target`, only if the current value of
+ /// the reference matches `expected`.
+ Cas {
+ target: RefString,
+ expected: RefString,
+ },
+}
+
+impl Target {
+ /// Construct the [`Create`] variant, which creates a new symbolic reference
+ /// pointing to the `target`. This variant will only succeed if the
+ /// reference pointing to `target` does not already exist.
+ ///
+ /// [`Create`]: Target::Create
+ pub fn create<R>(target: R) -> Self
+ where
+ R: AsRef<RefStr>,
+ {
+ Self::Create {
+ target: target.as_ref().to_ref_string(),
+ }
+ }
+
+ /// Construct the [`Upsert`] variant, which creates a new symbolic reference
+ /// pointing to the `target`. This variant will succeed even if the
+ /// reference pointing to `target` already exists.
+ ///
+ /// [`Upsert`]: Target::Upsert
+ pub fn upsert<R>(target: R) -> Self
+ where
+ R: AsRef<RefStr>,
+ {
+ Self::Upsert {
+ target: target.as_ref().to_ref_string(),
+ }
+ }
+
+ /// Construct the [`Cas`] variant, which creates a new symbolic reference
+ /// pointing to the `target`. This variant will succeed only when the
+ /// `expected` value matches the previously existing target value.
+ ///
+ /// [`Cas`]: Target::Cas
+ pub fn cas<T, E>(target: T, expected: E) -> Self
+ where
+ T: AsRef<RefStr>,
+ E: AsRef<RefStr>,
+ {
+ Self::Cas {
+ target: target.as_ref().to_ref_string(),
+ expected: expected.as_ref().to_ref_string(),
+ }
+ }
+
+ /// The target [`RefString`] that the symbolic reference should point to
+ /// after the write.
+ pub fn target(&self) -> &RefString {
+ match self {
+ Self::Create { target } | Self::Upsert { target } | Self::Cas { target, .. } => target,
+ }
+ }
+}
+
+/// Extension trait for symbolic reference support.
+///
+/// A symbolic reference is one that points to another reference name rather
+/// than directly to an [`Oid`] (e.g. `HEAD → refs/heads/main`).
+///
+/// [`Oid`]: radicle_oid::Oid
+pub trait Writer: super::Writer {
+ /// Create or update a symbolic reference, identified by `name`, with the
+ /// given [`Target`].
+ ///
+ /// # Errors
+ ///
+ /// - [`MissingTarget`]: The target reference does not exist in the
+ /// reference database.
+ /// - [`ReferenceExists`]: The symbolic reference `name` already exists
+ /// (for [`Target::Create`]).
+ /// - [`CasFailed`]: The current target did not match the expected value
+ /// (for [`Target::Cas`]).
+ /// - [`Backend`]: An unexpected error from the underlying git library.
+ ///
+ /// [`MissingTarget`]: error::write::WriteSymbolicRef::MissingTarget
+ /// [`ReferenceExists`]: error::write::WriteSymbolicRef::ReferenceExists
+ /// [`CasFailed`]: error::write::WriteSymbolicRef::CasFailed
+ /// [`Backend`]: error::write::WriteSymbolicRef::Backend
+ fn write_symbolic_ref<R>(
+ &self,
+ name: &R,
+ target: Target,
+ reflog: &str,
+ ) -> Result<(), error::write::WriteSymbolicRef>
+ where
+ R: AsRef<RefStr>;
+}
commit dd20123275ccdef27a582180a5390223f4e4de6b
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Sun Apr 12 07:18:52 2026 +0000
radicle/git/repository: Define object::Reader and object::Writer traits
Introduce the object reader and writer traits for Git object databases.
The reader captures methods for reading blobs and commits, as well as
checking the existence of objects.
The writer captures methods for writing blobs, trees, and commits.
diff --git a/crates/radicle/src/git/repository/object.rs b/crates/radicle/src/git/repository/object.rs
index 745082222..b4983855a 100644
--- a/crates/radicle/src/git/repository/object.rs
+++ b/crates/radicle/src/git/repository/object.rs
@@ -1 +1,176 @@
//! Git object database abstraction.
+//!
+//! The module provides two traits:
+//! - [`Reader`] for reading objects, and
+//! - [`Writer`] for writing objects
+
+pub mod error;
+
+use std::path::Path;
+
+use radicle_oid::Oid;
+
+use super::types::{Blob, Commit, TreeEntry};
+
+/// A handle for reading Git objects from the Git object database.
+pub trait Reader {
+ /// Find a blob by its [`Oid`].
+ ///
+ /// Returns `None` if the blob does not exist.
+ ///
+ /// # Errors
+ ///
+ /// - [`Backend`]: An unexpected error from the underlying git library.
+ ///
+ /// [`Backend`]: error::read::Blob::Backend
+ fn blob(&self, oid: Oid) -> Result<Option<Blob>, error::read::Blob>;
+
+ /// Find a blob by its [`Oid`], returning an error if it does not exist.
+ ///
+ /// # Errors
+ ///
+ /// - [`NotFound`]: The blob identified by `oid` does not exist.
+ /// - [`Backend`]: An unexpected error from the underlying git library.
+ ///
+ /// [`NotFound`]: error::read::Blob::NotFound
+ /// [`Backend`]: error::read::Blob::Backend
+ fn try_blob(&self, oid: Oid) -> Result<Blob, error::read::Blob> {
+ self.blob(oid)?.ok_or(error::read::Blob::NotFound { oid })
+ }
+
+ /// Find a blob at a `path` within a commit's tree.
+ ///
+ /// Returns `None` if the path does not exist in the commit's tree.
+ ///
+ /// # Errors
+ ///
+ /// - [`CommitNotFound`]: The commit identified by `commit` does not exist.
+ /// - [`Tree`]: Failed to get the commit's tree.
+ /// - [`TreeEntry`]: Failed to look up the entry at `path` in the tree.
+ /// - [`Object`]: The entry was found but failed to resolve to an object.
+ /// - [`TypeMismatch`]: The resolved object is not a blob.
+ /// - [`Backend`]: An unexpected error from the underlying git library.
+ ///
+ /// [`CommitNotFound`]: error::read::BlobAt::CommitNotFound
+ /// [`Tree`]: error::read::BlobAt::Tree
+ /// [`TreeEntry`]: error::read::BlobAt::TreeEntry
+ /// [`Object`]: error::read::BlobAt::Object
+ /// [`TypeMismatch`]: error::read::BlobAt::TypeMismatch
+ /// [`Backend`]: error::read::BlobAt::Backend
+ fn blob_at<P>(&self, commit: Oid, path: &P) -> Result<Option<Blob>, error::read::BlobAt>
+ where
+ P: AsRef<Path>;
+
+ /// Find a blob at a `path` within a commit's tree, returning an error if
+ /// the path does not exist.
+ ///
+ /// # Errors
+ ///
+ /// - [`CommitNotFound`]: The commit identified by `commit` does not exist.
+ /// - [`MissingBlob`]: The path does not exist in the commit's tree.
+ /// - [`Tree`]: Failed to get the commit's tree.
+ /// - [`TreeEntry`]: Failed to look up the entry at `path` in the tree.
+ /// - [`Object`]: The entry was found but failed to resolve to an object.
+ /// - [`TypeMismatch`]: The resolved object is not a blob.
+ /// - [`Backend`]: An unexpected error from the underlying git library.
+ ///
+ /// [`CommitNotFound`]: error::read::BlobAt::CommitNotFound
+ /// [`MissingBlob`]: error::read::BlobAt::MissingBlob
+ /// [`Tree`]: error::read::BlobAt::Tree
+ /// [`TreeEntry`]: error::read::BlobAt::TreeEntry
+ /// [`Object`]: error::read::BlobAt::Object
+ /// [`TypeMismatch`]: error::read::BlobAt::TypeMismatch
+ /// [`Backend`]: error::read::BlobAt::Backend
+ fn try_blob_at<P>(&self, commit: Oid, path: &P) -> Result<Blob, error::read::BlobAt>
+ where
+ P: AsRef<Path>,
+ {
+ self.blob_at(commit, path)?
+ .ok_or_else(|| error::read::BlobAt::MissingBlob {
+ commit,
+ path: path.as_ref().to_path_buf(),
+ })
+ }
+
+ /// Read a commit by its [`Oid`].
+ ///
+ /// Returns `None` if the commit does not exist.
+ ///
+ /// # Errors
+ ///
+ /// - [`Parse`]: The object was found but could not be parsed as a commit.
+ /// - [`Backend`]: An unexpected error from the underlying git library.
+ ///
+ /// [`Parse`]: error::read::Commit::Parse
+ /// [`Backend`]: error::read::Commit::Backend
+ fn commit(&self, oid: Oid) -> Result<Option<Commit>, error::read::Commit>;
+
+ /// Read a commit by its [`Oid`], returning an error if it does not exist.
+ ///
+ /// # Errors
+ ///
+ /// - [`NotFound`]: The commit identified by `oid` does not exist.
+ /// - [`Parse`]: The object was found but could not be parsed as a commit.
+ /// - [`Backend`]: An unexpected error from the underlying git library.
+ ///
+ /// [`NotFound`]: error::read::Commit::NotFound
+ /// [`Parse`]: error::read::Commit::Parse
+ /// [`Backend`]: error::read::Commit::Backend
+ fn try_commit(&self, oid: Oid) -> Result<Commit, error::read::Commit> {
+ self.commit(oid)?
+ .ok_or(error::read::Commit::NotFound { oid })
+ }
+
+ /// Check whether an object exists in the object database.
+ ///
+ /// # Errors
+ ///
+ /// - [`Backend`]: An unexpected error from the underlying git library.
+ ///
+ /// [`Backend`]: error::read::Exists::Backend
+ fn exists(&self, oid: Oid) -> Result<bool, error::read::Exists>;
+}
+
+/// Write Git objects to the Git object database.
+///
+/// Every method returns the content-addressed [`Oid`] of the written object.
+pub trait Writer {
+ /// Write a blob given its raw bytes content.
+ ///
+ /// # Errors
+ ///
+ /// - [`Backend`]: An unexpected error from the underlying git library.
+ ///
+ /// [`Backend`]: error::write::Blob::Backend
+ fn write_blob(&self, content: &[u8]) -> Result<Oid, error::write::Blob>;
+
+ /// Write a tree from a set of entries.
+ ///
+ /// [`TreeEntry::Blob`] entries have their content written as blobs first.
+ /// [`TreeEntry::BlobRef`] entries reference existing blobs by [`Oid`].
+ ///
+ /// # Errors
+ ///
+ /// - [`MissingBlob`]: A [`TreeEntry::BlobRef`] references an [`Oid`] that
+ /// does not exist in the object database.
+ /// - [`WriteBlob`]: Failed to write a blob for a [`TreeEntry::Blob`] entry.
+ /// - [`Backend`]: An unexpected error from the underlying git library.
+ ///
+ /// [`MissingBlob`]: error::write::Tree::MissingBlob
+ /// [`WriteBlob`]: error::write::Tree::WriteBlob
+ /// [`Backend`]: error::write::Tree::Backend
+ fn write_tree(&self, entries: &[TreeEntry]) -> Result<Oid, error::write::Tree>;
+
+ /// Write a commit from raw bytes.
+ ///
+ /// The caller is responsible for producing valid Git commit bytes
+ /// (e.g. via [`radicle_git_metadata`]). This is necessary for signed
+ /// commits where the exact byte representation must be controlled.
+ ///
+ /// # Errors
+ ///
+ /// - [`Backend`]: An unexpected error from the underlying git library.
+ ///
+ /// [`Backend`]: error::write::Commit::Backend
+ fn write_commit(&self, bytes: &[u8]) -> Result<Oid, error::write::Commit>;
+}
diff --git a/crates/radicle/src/git/repository/object/error.rs b/crates/radicle/src/git/repository/object/error.rs
new file mode 100644
index 000000000..fbb348c4d
--- /dev/null
+++ b/crates/radicle/src/git/repository/object/error.rs
@@ -0,0 +1,4 @@
+//! Errors for Git object operations, namespaced by read and write.
+
+pub mod read;
+pub mod write;
diff --git a/crates/radicle/src/git/repository/object/error/read.rs b/crates/radicle/src/git/repository/object/error/read.rs
new file mode 100644
index 000000000..f61ada570
--- /dev/null
+++ b/crates/radicle/src/git/repository/object/error/read.rs
@@ -0,0 +1,123 @@
+//! Errors returned by [`Reader`] methods.
+//!
+//! [`Reader`]: super::super::Reader
+
+use std::path::PathBuf;
+
+use radicle_oid::Oid;
+use thiserror::Error;
+
+use crate::git::repository::types;
+
+/// Error returned by [`Reader::blob`].
+///
+/// [`Reader::blob`]: super::super::Reader::blob
+#[derive(Debug, Error)]
+#[non_exhaustive]
+pub enum Blob {
+ /// The blob was not found.
+ #[error("failed to find blob '{oid}'")]
+ NotFound { oid: Oid },
+ /// An error from the underlying git library.
+ #[error(transparent)]
+ Backend(Box<dyn std::error::Error + Send + Sync + 'static>),
+}
+
+impl Blob {
+ pub fn backend<E: std::error::Error + Send + Sync + 'static>(err: E) -> Self {
+ Self::Backend(Box::new(err))
+ }
+}
+
+/// Error returned by [`Reader::blob_at`].
+///
+/// [`Reader::blob_at`]: super::super::Reader::blob_at
+#[derive(Debug, Error)]
+#[non_exhaustive]
+pub enum BlobAt {
+ /// Failed to find the commit.
+ #[error("failed to find commit '{commit}' to retrieve blob at {path:?}")]
+ CommitNotFound { commit: Oid, path: PathBuf },
+ /// Failed to get the associated tree of the commit.
+ #[error("failed to get associated tree of the commit '{commit}'")]
+ Tree {
+ commit: Oid,
+ source: Box<dyn std::error::Error + Send + Sync + 'static>,
+ },
+ /// Failed to get the entry at `path` in the commit's tree.
+ #[error("failed to get tree entry {path:?} in the commit '{commit}'")]
+ TreeEntry {
+ commit: Oid,
+ path: PathBuf,
+ source: Box<dyn std::error::Error + Send + Sync + 'static>,
+ },
+ /// Failed to resolve the object at the given path.
+ #[error("failed to resolve the object at {path:?} in the commit '{commit}'")]
+ Object {
+ commit: Oid,
+ path: PathBuf,
+ source: Box<dyn std::error::Error + Send + Sync + 'static>,
+ },
+ /// The object exists but is not a blob.
+ #[error("object {oid} has type `{actual}`, expected `{expected}`")]
+ TypeMismatch {
+ oid: Oid,
+ expected: types::ObjectKind,
+ actual: String,
+ },
+ /// The path does not exist in the commit's tree.
+ #[error("the blob identified by {path:?} does not exist in the commit '{commit}'")]
+ MissingBlob { commit: Oid, path: PathBuf },
+ /// An error from the underlying git library.
+ #[error(transparent)]
+ Backend(Box<dyn std::error::Error + Send + Sync + 'static>),
+}
+
+impl BlobAt {
+ pub fn backend<E: std::error::Error + Send + Sync + 'static>(err: E) -> Self {
+ Self::Backend(Box::new(err))
+ }
+}
+
+/// Error returned by [`Reader::commit`].
+///
+/// [`Reader::commit`]: super::super::Reader::commit
+#[derive(Debug, Error)]
+#[non_exhaustive]
+pub enum Commit {
+ /// The commit was not found.
+ #[error("failed to find commit '{oid}'")]
+ NotFound { oid: Oid },
+ /// Failed to parse the raw commit bytes.
+ #[error("failed to parse commit '{oid}': {source}")]
+ Parse {
+ oid: Oid,
+ source: radicle_git_metadata::commit::ParseError,
+ },
+ /// An error from the underlying git library.
+ #[error(transparent)]
+ Backend(Box<dyn std::error::Error + Send + Sync + 'static>),
+}
+
+impl Commit {
+ pub fn backend<E: std::error::Error + Send + Sync + 'static>(err: E) -> Self {
+ Self::Backend(Box::new(err))
+ }
+}
+
+/// Error returned by [`Reader::exists`].
+///
+/// [`Reader::exists`]: super::super::Reader::exists
+#[derive(Debug, Error)]
+#[non_exhaustive]
+pub enum Exists {
+ /// An error from the underlying git library.
+ #[error(transparent)]
+ Backend(Box<dyn std::error::Error + Send + Sync + 'static>),
+}
+
+impl Exists {
+ pub fn backend<E: std::error::Error + Send + Sync + 'static>(err: E) -> Self {
+ Self::Backend(Box::new(err))
+ }
+}
diff --git a/crates/radicle/src/git/repository/object/error/write.rs b/crates/radicle/src/git/repository/object/error/write.rs
new file mode 100644
index 000000000..bf3d6f87a
--- /dev/null
+++ b/crates/radicle/src/git/repository/object/error/write.rs
@@ -0,0 +1,70 @@
+//! Errors returned by [`Writer`] methods.
+//!
+//! [`Writer`]: super::super::Writer
+
+use std::path::PathBuf;
+
+use radicle_oid::Oid;
+use thiserror::Error;
+
+/// Error returned by [`Writer::write_blob`].
+///
+/// [`Writer::write_blob`]: super::super::Writer::write_blob
+#[derive(Debug, Error)]
+#[non_exhaustive]
+pub enum Blob {
+ /// An error from the underlying git library.
+ #[error(transparent)]
+ Backend(Box<dyn std::error::Error + Send + Sync + 'static>),
+}
+
+impl Blob {
+ pub fn backend<E: std::error::Error + Send + Sync + 'static>(err: E) -> Self {
+ Self::Backend(Box::new(err))
+ }
+}
+
+/// Error returned by [`Writer::write_tree`].
+///
+/// [`Writer::write_tree`]: super::super::Writer::write_tree
+#[derive(Debug, Error)]
+#[non_exhaustive]
+pub enum Tree {
+ /// A `BlobRef` entry references an OID that does not exist.
+ #[error("blob reference '{oid}' does not exist in the object database")]
+ MissingBlob { oid: Oid },
+ /// Failed to write blob contents for a [`TreeEntry::Blob`] entry.
+ ///
+ /// [`TreeEntry::Blob`]: crate::git::repository::types::TreeEntry::Blob
+ #[error("failed to write blob contents to {path:?}")]
+ WriteBlob {
+ path: PathBuf,
+ source: Box<dyn std::error::Error + Send + Sync + 'static>,
+ },
+ /// An error from the underlying git library.
+ #[error(transparent)]
+ Backend(Box<dyn std::error::Error + Send + Sync + 'static>),
+}
+
+impl Tree {
+ pub fn backend<E: std::error::Error + Send + Sync + 'static>(err: E) -> Self {
+ Self::Backend(Box::new(err))
+ }
+}
+
+/// Error returned by [`Writer::write_commit`].
+///
+/// [`Writer::write_commit`]: super::super::Writer::write_commit
+#[derive(Debug, Error)]
+#[non_exhaustive]
+pub enum Commit {
+ /// An error from the underlying git library.
+ #[error(transparent)]
+ Backend(Box<dyn std::error::Error + Send + Sync + 'static>),
+}
+
+impl Commit {
+ pub fn backend<E: std::error::Error + Send + Sync + 'static>(err: E) -> Self {
+ Self::Backend(Box::new(err))
+ }
+}
commit 3abcd3a40fe2c52e52f551e1039b4afdb06f1e44
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Sun Apr 12 07:04:27 2026 +0000
radicle/git/repository: Define Git domain types
Introduce `git::repository` module.
A skeleton is created for the submodules:
- `object`,
- `reference`, and
- `types`
The Git domain `types` are added in this change, and cover:
- `ObjectKind` – an enumeration of the Git object kinds.
- `Commit` – a type alias to `CommitData<Oid, Oid>`.
- `Blob` – a simple type capturing a blob's `Oid` and content.
- `TreeEntry` – an enum representing the inputs for writing a tree.
- `RefUpdate` – a type for representing batch updates of references
for Git repositories.
diff --git a/crates/radicle/src/git.rs b/crates/radicle/src/git.rs
index 6c5cceb6e..58ef8e9cb 100644
--- a/crates/radicle/src/git.rs
+++ b/crates/radicle/src/git.rs
@@ -1,5 +1,6 @@
pub mod canonical;
pub mod raw;
+pub mod repository;
use std::io;
use std::path::Path;
diff --git a/crates/radicle/src/git/repository.rs b/crates/radicle/src/git/repository.rs
new file mode 100644
index 000000000..7f95a69f1
--- /dev/null
+++ b/crates/radicle/src/git/repository.rs
@@ -0,0 +1,16 @@
+//! Git repository abstraction layer.
+//!
+//! Provides a library-agnostic interface for git repository operations,
+//! separating concerns into:
+//!
+//! - [`types`] — Git domain types, i.e. Blob, Commit, TreeEntry, etc.
+//! - [`object`] — The Git object store; providing read and write capabilities of Git objects.
+//! - [`reference`] — The Git reference store; providing read and write capabilities of Git references.
+//!
+//! [`reference`]: self::reference
+
+pub mod object;
+pub mod reference;
+pub mod types;
+
+pub use types::{Blob, Commit, ObjectKind, TreeEntry};
diff --git a/crates/radicle/src/git/repository/object.rs b/crates/radicle/src/git/repository/object.rs
new file mode 100644
index 000000000..745082222
--- /dev/null
+++ b/crates/radicle/src/git/repository/object.rs
@@ -0,0 +1 @@
+//! Git object database abstraction.
diff --git a/crates/radicle/src/git/repository/reference.rs b/crates/radicle/src/git/repository/reference.rs
new file mode 100644
index 000000000..439f52ac2
--- /dev/null
+++ b/crates/radicle/src/git/repository/reference.rs
@@ -0,0 +1 @@
+//! Git reference operations.
diff --git a/crates/radicle/src/git/repository/types.rs b/crates/radicle/src/git/repository/types.rs
new file mode 100644
index 000000000..165ac8582
--- /dev/null
+++ b/crates/radicle/src/git/repository/types.rs
@@ -0,0 +1,84 @@
+//! Domain types for Git repository operations.
+//!
+//! # Objects
+//!
+//! The following object types are defined in this module:
+//! - [`Blob`]
+//! - [`Commit`]
+//! - [`TreeEntry`]
+
+use core::fmt;
+use std::path::PathBuf;
+
+use radicle_git_metadata as metadata;
+use radicle_oid::Oid;
+
+/// An enumeration of the kinds of Git objects
+#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
+#[non_exhaustive]
+pub enum ObjectKind {
+ /// A Git blob object.
+ Blob,
+ /// A Git tree object.
+ Tree,
+ /// A Git commit object.
+ Commit,
+ /// A Git tag object.
+ Tag,
+}
+
+impl fmt::Display for ObjectKind {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ match self {
+ ObjectKind::Blob => f.write_str("blob"),
+ ObjectKind::Tree => f.write_str("tree"),
+ ObjectKind::Commit => f.write_str("commit"),
+ ObjectKind::Tag => f.write_str("tag"),
+ }
+ }
+}
+
+/// A Git blob object.
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+pub struct Blob {
+ /// The content-addressed identifier of the blob.
+ pub oid: Oid,
+ /// The blob's content.
+ pub content: Vec<u8>,
+}
+
+/// A Git commit, with all metadata parsed.
+///
+/// This is a type alias for [`radicle_git_metadata::commit::CommitData`]
+/// specialised to [`Oid`] for both tree and parent identifiers.
+pub type Commit = metadata::commit::CommitData<Oid, Oid>;
+
+/// An entry to be written into a Git tree.
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+pub enum TreeEntry {
+ /// A blob entry with inline content.
+ ///
+ /// The contents of the blob must be written to the Git repository before
+ /// creating the tree entry.
+ Blob {
+ /// The path of the entry within the tree.
+ ///
+ /// Multi-component paths (e.g. `a/b/c.txt`) are supported;
+ /// intermediate sub-trees are created automatically.
+ path: PathBuf,
+ /// The contents of the blob.
+ content: Vec<u8>,
+ },
+ /// A reference to an existing blob by [`Oid`].
+ ///
+ /// Used when the blob already exists in the Git object database.
+ BlobRef {
+ /// The path of the entry within the tree.
+ ///
+ /// Multi-component paths (e.g. `a/b/c.txt`) are supported;
+ /// intermediate sub-trees are created automatically.
+ path: PathBuf,
+ /// The [`Oid`] of the existing blob.
+ oid: Oid,
+ },
+}
commit d097c92aa56e73cec4c48e2962308505581e37e0
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Tue Apr 21 08:44:16 2026 +0100
sigrefs/git: Remove doc link of `Committer::stable`
The `Committer::stable` method is behind the `test` feature, or test build.
Do not link to it, so that it does not error for a regular build.
diff --git a/crates/radicle/src/storage/refs/sigrefs/git.rs b/crates/radicle/src/storage/refs/sigrefs/git.rs
index 6a4152911..4b1c7d6bc 100644
--- a/crates/radicle/src/storage/refs/sigrefs/git.rs
+++ b/crates/radicle/src/storage/refs/sigrefs/git.rs
@@ -34,7 +34,7 @@ impl Committer {
///
/// The given [`PublicKey`] is always used for the email.
///
- /// In test code, [`Committer::stable`] is returned.
+ /// In test code, `Committer::stable` is returned.
///
/// [`GIT_COMMITTER_DATE`]: crate::profile::env::GIT_COMMITTER_DATE
pub fn from_env_or_now(public_key: &PublicKey) -> Self {
Exit code: 0
shell: 'export RUSTDOCFLAGS=''-D warnings'' cargo --version rustc --version cargo fmt --check cargo clippy --all-targets --workspace -- --deny warnings cargo build --all-targets --workspace cargo doc --workspace --no-deps --all-features cargo test --workspace --no-fail-fast '
Commands:
$ podman run --name 1bdf25dd-78d3-4459-b839-d3b442b94047 -v /opt/radcis/ci.rad.levitte.org/cci/state/1bdf25dd-78d3-4459-b839-d3b442b94047/s:/1bdf25dd-78d3-4459-b839-d3b442b94047/s:ro -v /opt/radcis/ci.rad.levitte.org/cci/state/1bdf25dd-78d3-4459-b839-d3b442b94047/w:/1bdf25dd-78d3-4459-b839-d3b442b94047/w -w /1bdf25dd-78d3-4459-b839-d3b442b94047/w -v /opt/radcis/ci.rad.levitte.org/.radicle:/${id}/.radicle:ro -e RAD_HOME=/${id}/.radicle rust:trixie bash /1bdf25dd-78d3-4459-b839-d3b442b94047/s/script.sh
+ export 'RUSTDOCFLAGS=-D warnings'
+ RUSTDOCFLAGS='-D warnings'
+ cargo --version
info: syncing channel updates for '1.95-x86_64-unknown-linux-gnu'
info: latest update on 2026-04-16, rust version 1.95.0 (59807616e 2026-04-14)
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.95.0 (f2d3ce0bd 2026-03-21)
+ rustc --version
rustc 1.95.0 (59807616e 2026-04-14)
+ cargo fmt --check
+ cargo clippy --all-targets --workspace -- --deny warnings
Updating crates.io index
Downloading crates ...
Downloaded aead v0.5.2
Downloaded ahash v0.8.12
Downloaded bytesize v2.3.1
Downloaded aes v0.8.4
Downloaded ff v0.13.1
Downloaded errno v0.3.14
Downloaded cpufeatures v0.2.17
Downloaded aho-corasick v1.1.4
Downloaded escargot v0.5.15
Downloaded erased-serde v0.4.10
Downloaded env_filter v1.0.0
Downloaded icu_properties v2.1.2
Downloaded either v1.15.0
Downloaded cyphernet v0.5.4
Downloaded fast-glob v0.3.3
Downloaded document-features v0.2.12
Downloaded gix-odb v0.80.0
Downloaded memmap2 v0.9.10
Downloaded match-lookup v0.1.2
Downloaded displaydoc v0.2.5
Downloaded gix-validate v0.11.1
Downloaded gix-quote v0.7.1
Downloaded gix-utils v0.3.2
Downloaded gix-shallow v0.12.0
Downloaded is_terminal_polyfill v1.70.2
Downloaded nu-ansi-term v0.50.3
Downloaded noise-framework v0.4.1
Downloaded num-integer v0.1.46
Downloaded gix-negotiate v0.31.0
Downloaded num v0.4.3
Downloaded num-rational v0.4.2
Downloaded num-traits v0.2.19
Downloaded pem-rfc7468 v0.7.0
Downloaded potential_utf v0.1.4
Downloaded phf v0.11.3
Downloaded qcheck-macros v1.0.0
Downloaded heck v0.5.0
Downloaded itoa v1.0.17
Downloaded pkcs1 v0.7.5
Downloaded percent-encoding v2.3.2
Downloaded ref-cast-impl v1.0.25
Downloaded multibase v0.9.2
Downloaded rustc_version v0.4.1
Downloaded proc-macro-error2 v2.0.1
Downloaded secrecy v0.10.3
Downloaded human-panic v2.0.6
Downloaded rustversion v1.0.22
Downloaded sha1 v0.10.6
Downloaded parking_lot_core v0.9.12
Downloaded rfc6979 v0.4.0
Downloaded regex v1.12.3
Downloaded streaming-iterator v0.1.9
Downloaded stable_deref_trait v1.2.1
Downloaded sval_json v2.17.0
Downloaded siphasher v1.0.2
Downloaded sval_nested v2.17.0
Downloaded subtle v2.6.1
Downloaded sval_buffer v2.17.0
Downloaded sval_fmt v2.17.0
Downloaded gix-protocol v0.61.0
Downloaded thread_local v1.1.9
Downloaded similar v2.7.0
Downloaded tinyvec_macros v0.1.1
Downloaded universal-hash v0.5.1
Downloaded unicode-display-width v0.3.0
Downloaded test-log v0.2.19
Downloaded semver v1.0.27
Downloaded toml_datetime v0.7.5+spec-1.1.0
Downloaded thiserror v2.0.18
Downloaded utf8_iter v1.0.4
Downloaded utf8parse v0.2.2
Downloaded value-bag-serde1 v1.12.0
Downloaded value-bag-sval2 v1.12.0
Downloaded zerofrom v0.1.6
Downloaded zerofrom-derive v0.1.6
Downloaded tree-sitter-highlight v0.24.7
Downloaded toml_writer v1.0.7+spec-1.1.0
Downloaded systemd-journal-logger v2.2.2
Downloaded tracing-log v0.2.0
Downloaded socket2 v0.5.10
Downloaded sval v2.17.0
Downloaded value-bag v1.12.0
Downloaded uuid v1.22.0
Downloaded xattr v1.6.1
Downloaded yoke-derive v0.8.1
Downloaded wait-timeout v0.2.1
Downloaded yoke v0.8.1
Downloaded walkdir v2.5.0
Downloaded icu_locale_core v2.1.1
Downloaded zmij v1.0.21
Downloaded fraction v0.15.3
Downloaded syn v1.0.109
Downloaded yansi v1.0.1
Downloaded zerocopy v0.8.42
Downloaded zeroize v1.8.2
Downloaded unicode-width v0.2.2
Downloaded indexmap v2.13.0
Downloaded icu_properties_data v2.1.2
Downloaded typenum v1.19.0
Downloaded zerotrie v0.2.3
Downloaded url v2.5.8
Downloaded jsonschema v0.30.0
Downloaded tree-sitter-go v0.23.4
Downloaded hashbrown v0.16.1
Downloaded zerovec v0.11.5
Downloaded serde_json v1.0.149
Downloaded itertools v0.14.0
Downloaded portable-atomic v1.13.1
Downloaded regex-automata v0.4.14
Downloaded tracing-subscriber v0.3.23
Downloaded zlib-rs v0.6.3
Downloaded vcpkg v0.2.15
Downloaded gimli v0.32.3
Downloaded syn v2.0.117
Downloaded sha1-checked v0.10.0
Downloaded tree-sitter-c v0.23.4
Downloaded tree-sitter-md v0.3.2
Downloaded sysinfo v0.37.2
Downloaded tree-sitter-rust v0.23.3
Downloaded proptest v1.10.0
Downloaded tree-sitter-bash v0.23.3
Downloaded git2 v0.20.4
Downloaded tracing v0.1.44
Downloaded idna v1.1.0
Downloaded rustix v1.1.4
Downloaded tree-sitter-ruby v0.23.1
Downloaded serde v1.0.228
Downloaded num-bigint v0.4.6
Downloaded mio v1.1.1
Downloaded libm v0.2.16
Downloaded gix-pack v0.70.0
Downloaded inquire v0.9.4
Downloaded icu_collections v2.1.1
Downloaded tree-sitter-css v0.23.2
Downloaded tracing-core v0.1.36
Downloaded jiff-static v0.2.23
Downloaded jiff v0.2.23
Downloaded libc v0.2.183
Downloaded tinyvec v1.11.0
Downloaded ssh-agent-lib v0.6.0
Downloaded zerovec-derive v0.11.2
Downloaded tree-sitter-typescript v0.23.2
Downloaded sha3 v0.10.8
Downloaded tree-sitter-python v0.23.6
Downloaded tree-sitter v0.24.7
Downloaded tokio v1.50.0
Downloaded libz-sys v1.1.25
Downloaded indicatif v0.18.4
Downloaded vsimd v0.8.0
Downloaded sha2 v0.10.9
Downloaded writeable v0.6.2
Downloaded version_check v0.9.5
Downloaded unicode-normalization v0.1.25
Downloaded serde_derive v1.0.228
Downloaded gix-ref v0.63.0
Downloaded unicode-segmentation v1.12.0
Downloaded tree-sitter-toml-ng v0.6.0
Downloaded ssh-key v0.6.7
Downloaded rsa v0.9.10
Downloaded heapless v0.8.0
Downloaded tree-sitter-html v0.23.2
Downloaded unicode-ident v1.0.24
Downloaded tar v0.4.45
Downloaded p256 v0.13.2
Downloaded sharded-slab v0.1.7
Downloaded serde_core v1.0.228
Downloaded sqlite3-sys v0.18.0
Downloaded signal-hook-registry v1.4.8
Downloaded signal-hook v0.3.18
Downloaded uuid-simd v0.8.0
Downloaded unarray v0.1.4
Downloaded thiserror-impl v1.0.69
Downloaded simd-adler32 v0.3.8
Downloaded sval_ref v2.17.0
Downloaded strsim v0.11.1
Downloaded gix-object v0.60.0
Downloaded fluent-uri v0.3.2
Downloaded unit-prefix v0.5.2
Downloaded typeid v1.0.3
Downloaded toml v0.9.12+spec-1.1.0
Downloaded tinystr v0.8.2
Downloaded timeago v0.4.2
Downloaded thiserror-impl v2.0.18
Downloaded thiserror v1.0.69
Downloaded synstructure v0.13.2
Downloaded sval_serde v2.17.0
Downloaded sval_dynamic v2.17.0
Downloaded spin v0.9.8
Downloaded smallvec v1.15.1
Downloaded scopeguard v1.2.0
Downloaded gix-diff v0.63.0
Downloaded tempfile v3.27.0
Downloaded snapbox v0.4.17
Downloaded sec1 v0.7.3
Downloaded spki v0.7.3
Downloaded tree-sitter-language v0.1.7
Downloaded tree-sitter-json v0.24.8
Downloaded libgit2-sys v0.18.3+1.9.2
Downloaded referencing v0.30.0
Downloaded gix-url v0.36.0
Downloaded getrandom v0.2.17
Downloaded test-log-macros v0.2.19
Downloaded litrs v1.0.0
Downloaded litemap v0.8.1
Downloaded shlex v1.3.0
Downloaded jobserver v0.1.34
Downloaded getrandom v0.3.4
Downloaded signature v2.2.0
Downloaded serde_spanned v1.0.4
Downloaded rusty-fork v0.3.1
Downloaded radicle-std-ext v0.2.0
Downloaded icu_provider v2.1.1
Downloaded gix-packetline v0.21.3
Downloaded gix-features v0.48.0
Downloaded rand v0.9.2
Downloaded qcheck v1.0.0
Downloaded signature v1.6.4
Downloaded rand_xorshift v0.4.0
Downloaded primeorder v0.13.6
Downloaded gix-path v0.12.0
Downloaded structured-logger v1.0.5
Downloaded sqlite v0.37.0
Downloaded socks5-client v0.4.3
Downloaded snapbox-macros v0.3.10
Downloaded regex-syntax v0.8.10
Downloaded signals_receipts v0.2.5
Downloaded shell-words v1.1.1
Downloaded sem_safe v0.2.1
Downloaded signal-hook-mio v0.2.5
Downloaded serde_fmt v1.1.0
Downloaded scrypt v0.11.0
Downloaded serde_derive_internals v0.29.1
Downloaded schemars v1.2.1
Downloaded ryu v1.0.23
Downloaded rand_chacha v0.9.0
Downloaded sqlite3-src v0.7.0
Downloaded rand v0.8.5
Downloaded radicle-surf v0.27.1
Downloaded quote v1.0.45
Downloaded quick-error v1.2.3
Downloaded proc-macro2 v1.0.106
Downloaded pretty_assertions v1.4.1
Downloaded pbkdf2 v0.12.2
Downloaded p521 v0.13.3
Downloaded p384 v0.13.1
Downloaded object v0.37.3
Downloaded group v0.13.0
Downloaded gix-revision v0.45.0
Downloaded gix-fs v0.21.1
Downloaded generic-array v0.14.7
Downloaded clap_builder v4.6.0
Downloaded ssh-encoding v0.2.0
Downloaded ssh-cipher v0.2.0
Downloaded siphasher v0.3.11
Downloaded serde-untagged v0.1.9
Downloaded schemars_derive v1.2.1
Downloaded salsa20 v0.10.2
Downloaded rustc-demangle v0.1.27
Downloaded rand_core v0.6.4
Downloaded rand_chacha v0.3.1
Downloaded ppv-lite86 v0.2.21
Downloaded polyval v0.6.2
Downloaded linux-raw-sys v0.12.1
Downloaded pkcs8 v0.10.2
Downloaded humantime v2.3.0
Downloaded gix-traverse v0.57.0
Downloaded gix-revwalk v0.31.0
Downloaded pkg-config v0.3.32
Downloaded pin-project-lite v0.2.17
Downloaded phf_shared v0.11.3
Downloaded gix-commitgraph v0.37.0
Downloaded fancy-regex v0.14.0
Downloaded same-file v1.0.6
Downloaded ref-cast v1.0.25
Downloaded rand_core v0.9.5
Downloaded radicle-git-ext v0.12.0
Downloaded proc-macro-error-attr2 v2.0.0
Downloaded poly1305 v0.8.0
Downloaded lexopt v0.3.2
Downloaded gix-error v0.2.3
Downloaded prodash v31.0.0
Downloaded outref v0.5.2
Downloaded nonempty v0.9.0
Downloaded inout v0.1.4
Downloaded lazy_static v1.5.0
Downloaded gix-trace v0.1.19
Downloaded keccak v0.1.6
Downloaded hmac v0.12.1
Downloaded gix-lock v23.0.0
Downloaded getrandom v0.4.2
Downloaded iana-time-zone v0.1.65
Downloaded gix-hashtable v0.15.0
Downloaded git-ref-format-macro v0.6.0
Downloaded git-ref-format v0.6.0
Downloaded chrono v0.4.44
Downloaded cc v1.2.57
Downloaded pastey v0.2.1
Downloaded parking_lot v0.12.5
Downloaded num-bigint-dig v0.8.6
Downloaded icu_normalizer_data v2.1.1
Downloaded gix-hash v0.25.0
Downloaded find-msvc-tools v0.1.9
Downloaded once_cell v1.21.4
Downloaded num-iter v0.1.45
Downloaded git-ref-format-core v0.6.0
Downloaded form_urlencoded v1.2.2
Downloaded derive_more v2.1.1
Downloaded base64 v0.22.1
Downloaded opaque-debug v0.3.1
Downloaded memchr v2.8.0
Downloaded idna_adapter v1.2.1
Downloaded gix-sec v0.14.0
Downloaded gix-glob v0.26.0
Downloaded elliptic-curve v0.13.8
Downloaded num-cmp v0.1.0
Downloaded gix-config-value v0.18.0
Downloaded gix-chunk v0.7.1
Downloaded chacha20poly1305 v0.10.1
Downloaded anstyle-parse v0.2.7
Downloaded num-complex v0.4.6
Downloaded miniz_oxide v0.8.9
Downloaded maybe-async v0.2.10
Downloaded lock_api v0.4.14
Downloaded normalize-line-endings v0.3.0
Downloaded gix-tempfile v23.0.0
Downloaded gix-refspec v0.41.0
Downloaded gix-credentials v0.38.0
Downloaded ed25519-dalek v2.2.0
Downloaded nonempty v0.12.0
Downloaded gix-command v0.9.0
Downloaded faster-hex v0.10.0
Downloaded diff v0.1.13
Downloaded bcrypt-pbkdf v0.10.0
Downloaded bloomy v1.2.0
Downloaded icu_normalizer v2.1.1
Downloaded derive_more-impl v2.1.1
Downloaded curve25519-dalek v4.1.3
Downloaded crossbeam-utils v0.8.21
Downloaded crossbeam-channel v0.5.15
Downloaded bit-set v0.8.0
Downloaded dunce v1.0.5
Downloaded matchers v0.2.0
Downloaded fnv v1.0.7
Downloaded ghash v0.5.1
Downloaded emojis v0.6.4
Downloaded bytes v1.11.1
Downloaded crossterm v0.29.0
Downloaded clap v4.6.0
Downloaded colorchoice v1.0.5
Downloaded backtrace v0.3.76
Downloaded gix-prompt v0.15.0
Downloaded env_logger v0.11.9
Downloaded data-encoding-macro v0.1.19
Downloaded cyphergraphy v0.3.1
Downloaded curve25519-dalek-derive v0.1.1
Downloaded ctr v0.9.2
Downloaded crypto-common v0.1.7
Downloaded crypto-bigint v0.5.5
Downloaded cfg-if v1.0.4
Downloaded block-buffer v0.10.4
Downloaded bitflags v2.11.0
Downloaded anstyle v1.0.14
Downloaded anstream v1.0.0
Downloaded filetime v0.2.27
Downloaded ed25519 v1.5.3
Downloaded digest v0.10.7
Downloaded ct-codecs v1.1.6
Downloaded bstr v1.12.1
Downloaded base16ct v0.2.0
Downloaded anstyle-query v1.1.5
Downloaded log v0.4.29
Downloaded hash32 v0.3.1
Downloaded gix-transport v0.57.0
Downloaded flate2 v1.1.9
Downloaded ed25519 v2.2.3
Downloaded ecdsa v0.16.9
Downloaded der v0.7.10
Downloaded data-encoding-macro-internal v0.1.17
Downloaded data-encoding v2.10.0
Downloaded cypheraddr v0.4.1
Downloaded const-str v0.4.3
Downloaded clap_derive v4.6.0
Downloaded clap_complete v4.6.0
Downloaded base32 v0.4.0
Downloaded gix-date v0.15.3
Downloaded email_address v0.2.9
Downloaded colored v2.2.0
Downloaded block-padding v0.3.3
Downloaded amplify_syn v2.0.1
Downloaded convert_case v0.10.0
Downloaded arc-swap v1.9.1
Downloaded anstyle-parse v1.0.0
Downloaded ec25519 v0.1.0
Downloaded dyn-clone v1.0.20
Downloaded clap_lex v1.1.0
Downloaded cbc v0.1.2
Downloaded autocfg v1.5.0
Downloaded const-oid v0.9.6
Downloaded console v0.16.3
Downloaded cipher v0.4.4
Downloaded chacha20 v0.9.1
Downloaded bytecount v0.6.9
Downloaded blowfish v0.9.1
Downloaded anyhow v1.0.102
Downloaded amplify_num v0.5.3
Downloaded base64ct v1.8.3
Downloaded gix-actor v0.41.0
Downloaded amplify v4.9.0
Downloaded crc32fast v1.5.0
Downloaded bit-vec v0.8.0
Downloaded equivalent v1.0.2
Downloaded base64 v0.21.7
Downloaded base-x v0.2.11
Downloaded ascii v1.1.0
Downloaded anstream v0.6.21
Downloaded byteorder v1.5.0
Downloaded borrow-or-share v0.2.4
Downloaded base256emoji v1.0.2
Downloaded fastrand v2.3.0
Downloaded aes-gcm v0.10.3
Downloaded adler2 v2.0.1
Downloaded amplify_derive v4.0.1
Downloaded addr2line v0.25.1
Compiling libc v0.2.183
Compiling proc-macro2 v1.0.106
Compiling unicode-ident v1.0.24
Compiling quote v1.0.45
Checking cfg-if v1.0.4
Checking zeroize v1.8.2
Compiling version_check v0.9.5
Compiling typenum v1.19.0
Compiling generic-array v0.14.7
Checking getrandom v0.2.17
Compiling syn v2.0.117
Checking rand_core v0.6.4
Checking memchr v2.8.0
Compiling shlex v1.3.0
Compiling jobserver v0.1.34
Compiling find-msvc-tools v0.1.9
Checking crypto-common v0.1.7
Compiling cc v1.2.57
Checking subtle v2.6.1
Compiling serde_core v1.0.228
Checking regex-syntax v0.8.10
Checking aho-corasick v1.1.4
Checking const-oid v0.9.6
Checking smallvec v1.15.1
Checking block-buffer v0.10.4
Checking digest v0.10.7
Checking cpufeatures v0.2.17
Checking stable_deref_trait v1.2.1
Compiling thiserror v2.0.18
Checking fastrand v2.3.0
Checking regex-automata v0.4.14
Compiling parking_lot_core v0.9.12
Checking scopeguard v1.2.0
Checking lock_api v0.4.14
Checking bitflags v2.11.0
Checking parking_lot v0.12.5
Compiling typeid v1.0.3
Compiling crc32fast v1.5.0
Compiling erased-serde v0.4.10
Checking tinyvec_macros v0.1.1
Checking gix-trace v0.1.19
Checking tinyvec v1.11.0
Compiling serde v1.0.228
Checking unicode-normalization v0.1.25
Checking byteorder v1.5.0
Checking itoa v1.0.17
Compiling thiserror-impl v2.0.18
Compiling serde_derive v1.0.228
Checking gix-utils v0.3.2
Checking serde_fmt v1.1.0
Checking hashbrown v0.16.1
Checking bstr v1.12.1
Checking value-bag-serde1 v1.12.0
Checking gix-validate v0.11.1
Compiling synstructure v0.13.2
Checking value-bag v1.12.0
Checking gix-path v0.12.0
Checking log v0.4.29
Checking same-file v1.0.6
Checking walkdir v2.5.0
Compiling zerofrom-derive v0.1.6
Compiling yoke-derive v0.8.1
Checking prodash v31.0.0
Checking zlib-rs v0.6.3
Compiling heapless v0.8.0
Checking zerofrom v0.1.6
Compiling pkg-config v0.3.32
Checking yoke v0.8.1
Compiling rustix v1.1.4
Compiling zerovec-derive v0.11.2
Checking hash32 v0.3.1
Compiling autocfg v1.5.0
Checking gix-features v0.48.0
Checking linux-raw-sys v0.12.1
Compiling libm v0.2.16
Compiling num-traits v0.2.19
Compiling displaydoc v0.2.5
Checking zerovec v0.11.5
Compiling getrandom v0.4.2
Checking faster-hex v0.10.0
Checking block-padding v0.3.3
Compiling zerocopy v0.8.42
Checking inout v0.1.4
Checking sha2 v0.10.9
Checking sha1 v0.10.6
Checking sha1-checked v0.10.0
Checking cipher v0.4.4
Checking tinystr v0.8.2
Checking percent-encoding v2.3.2
Checking writeable v0.6.2
Checking once_cell v1.21.4
Checking litemap v0.8.1
Checking gix-hash v0.25.0
Checking icu_locale_core v2.1.1
Checking potential_utf v0.1.4
Checking zerotrie v0.2.3
Compiling zmij v1.0.21
Compiling icu_properties_data v2.1.2
Compiling icu_normalizer_data v2.1.1
Checking icu_provider v2.1.1
Checking icu_collections v2.1.1
Checking der v0.7.10
Compiling serde_json v1.0.149
Checking equivalent v1.0.2
Checking indexmap v2.13.0
Compiling thiserror v1.0.69
Compiling syn v1.0.109
Compiling vcpkg v0.2.15
Compiling ref-cast v1.0.25
Checking ppv-lite86 v0.2.21
Checking icu_normalizer v2.1.1
Compiling libz-sys v1.1.25
Checking icu_properties v2.1.2
Checking tempfile v3.27.0
Compiling thiserror-impl v1.0.69
Compiling ref-cast-impl v1.0.25
Checking spin v0.9.8
Checking lazy_static v1.5.0
Checking num-integer v0.1.46
Checking hmac v0.12.1
Checking idna_adapter v1.2.1
Checking universal-hash v0.5.1
Compiling tree-sitter-language v0.1.7
Checking dyn-clone v1.0.20
Checking utf8_iter v1.0.4
Checking opaque-debug v0.3.1
Checking idna v1.1.0
Checking spki v0.7.3
Compiling libgit2-sys v0.18.3+1.9.2
Checking signature v2.2.0
Checking ff v0.13.1
Checking base16ct v0.2.0
Checking group v0.13.0
Checking sec1 v0.7.3
Checking rand_chacha v0.3.1
Checking form_urlencoded v1.2.2
Compiling serde_derive_internals v0.29.1
Checking crypto-bigint v0.5.5
Checking elliptic-curve v0.13.8
Compiling schemars_derive v1.2.1
Compiling amplify_syn v2.0.1
Checking url v2.5.8
Checking rand v0.8.5
Checking num-iter v0.1.45
Checking aead v0.5.2
Compiling semver v1.0.27
Checking signature v1.6.4
Checking schemars v1.2.1
Checking ed25519 v1.5.3
Compiling rustc_version v0.4.1
Compiling amplify_derive v4.0.1
Checking poly1305 v0.8.0
Checking rfc6979 v0.4.0
Checking chacha20 v0.9.1
Checking ct-codecs v1.1.6
Checking amplify_num v0.5.3
Checking ascii v1.1.0
Checking ec25519 v0.1.0
Checking ecdsa v0.16.9
Compiling curve25519-dalek v4.1.3
Checking git-ref-format-core v0.6.0
Checking primeorder v0.13.6
Checking polyval v0.6.2
Compiling num-bigint-dig v0.8.6
Checking amplify v4.9.0
Checking base64ct v1.8.3
Checking ghash v0.5.1
Checking pkcs8 v0.10.2
Checking cyphergraphy v0.3.1
Checking pbkdf2 v0.12.2
Checking pem-rfc7468 v0.7.0
Checking ctr v0.9.2
Checking aes v0.8.4
Compiling sqlite3-src v0.7.0
Checking gix-error v0.2.3
Compiling curve25519-dalek-derive v0.1.1
Checking keccak v0.1.6
Checking aes-gcm v0.10.3
Checking sha3 v0.10.8
Checking ssh-encoding v0.2.0
Checking pkcs1 v0.7.5
Checking ed25519 v2.2.3
Checking cbc v0.1.2
Checking blowfish v0.9.1
Compiling data-encoding v2.10.0
Checking base32 v0.4.0
Compiling crossbeam-utils v0.8.21
Checking cypheraddr v0.4.1
Compiling data-encoding-macro-internal v0.1.17
Checking rsa v0.9.10
Checking bcrypt-pbkdf v0.10.0
Checking ssh-cipher v0.2.0
Checking ed25519-dalek v2.2.0
Checking p384 v0.13.1
Checking p521 v0.13.3
Checking p256 v0.13.2
Checking chacha20poly1305 v0.10.1
Checking qcheck v1.0.0
Compiling match-lookup v0.1.2
Checking const-str v0.4.3
Checking base256emoji v1.0.2
Checking data-encoding-macro v0.1.19
Checking ssh-key v0.6.7
Checking noise-framework v0.4.1
Checking socks5-client v0.4.3
Checking secrecy v0.10.3
Checking base-x v0.2.11
Checking ssh-agent-lib v0.6.0
Checking multibase v0.9.2
Checking crossbeam-channel v0.5.15
Checking cyphernet v0.5.4
Checking anstyle-query v1.1.5
Checking errno v0.3.14
Checking utf8parse v0.2.2
Checking jiff v0.2.23
Checking nonempty v0.9.0
Checking siphasher v1.0.2
Checking radicle-localtime v0.1.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-localtime)
Checking radicle-git-metadata v0.2.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-git-metadata)
Checking radicle-dag v0.10.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-dag)
Checking is_terminal_polyfill v1.70.2
Checking colorchoice v1.0.5
Checking anstyle v1.0.14
Checking radicle-git-ref-format v0.1.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-git-ref-format)
Checking gix-hashtable v0.15.0
Checking base64 v0.21.7
Compiling unicode-segmentation v1.12.0
Compiling radicle v0.24.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle)
Compiling signal-hook v0.3.18
Compiling convert_case v0.10.0
Checking gix-date v0.15.3
Checking gix-actor v0.41.0
Checking signal-hook-registry v1.4.8
Checking serde-untagged v0.1.9
Checking gix-object v0.60.0
Checking bytesize v2.3.1
Checking memmap2 v0.9.10
Checking dunce v1.0.5
Checking fast-glob v0.3.3
Checking nonempty v0.12.0
Compiling derive_more-impl v2.1.1
Checking gix-chunk v0.7.1
Checking mio v1.1.1
Checking regex v1.12.3
Checking sem_safe v0.2.1
Compiling portable-atomic v1.13.1
Checking unicode-width v0.2.2
Compiling litrs v1.0.0
Checking signals_receipts v0.2.5
Checking derive_more v2.1.1
Checking signal-hook-mio v0.2.5
Checking gix-commitgraph v0.37.0
Compiling document-features v0.2.12
Checking anstyle-parse v0.2.7
Checking crossterm v0.29.0
Checking anstream v0.6.21
Checking gix-revwalk v0.31.0
Checking console v0.16.3
Checking gix-fs v0.21.1
Checking unit-prefix v0.5.2
Checking indicatif v0.18.4
Checking gix-tempfile v23.0.0
Checking inquire v0.9.4
Checking unicode-display-width v0.3.0
Checking radicle-signals v0.11.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-signals)
Checking gix-quote v0.7.1
Checking either v1.15.0
Checking shell-words v1.1.1
Checking iana-time-zone v0.1.65
Checking gix-command v0.9.0
Checking chrono v0.4.44
Checking colored v2.2.0
Compiling object v0.37.3
Compiling rustversion v1.0.22
Checking gix-lock v23.0.0
Checking gix-url v0.36.0
Checking gix-config-value v0.18.0
Checking gix-sec v0.14.0
Checking adler2 v2.0.1
Checking gimli v0.32.3
Checking miniz_oxide v0.8.9
Checking gix-prompt v0.15.0
Checking addr2line v0.25.1
Checking gix-revision v0.45.0
Checking gix-traverse v0.57.0
Checking gix-diff v0.63.0
Checking gix-packetline v0.21.3
Checking gix-glob v0.26.0
Compiling tree-sitter v0.24.7
Compiling anyhow v1.0.102
Checking rustc-demangle v0.1.27
Checking backtrace v0.3.76
Checking gix-refspec v0.41.0
Checking gix-transport v0.57.0
Checking gix-pack v0.70.0
Checking arc-swap v1.9.1
Checking gix-credentials v0.38.0
Checking gix-ref v0.63.0
Checking gix-shallow v0.12.0
Checking gix-negotiate v0.31.0
Compiling maybe-async v0.2.10
Compiling proc-macro-error-attr2 v2.0.0
Compiling getrandom v0.3.4
Compiling simd-adler32 v0.3.8
Checking gix-protocol v0.61.0
Compiling proc-macro-error2 v2.0.1
Checking gix-odb v0.80.0
Compiling xattr v1.6.1
Compiling filetime v0.2.27
Checking anstyle-parse v1.0.0
Checking uuid v1.22.0
Checking bytes v1.11.1
Checking anstream v1.0.0
Compiling tar v0.4.45
Compiling flate2 v1.1.9
Compiling git-ref-format-macro v0.6.0
Checking snapbox-macros v0.3.10
Checking salsa20 v0.10.2
Checking similar v2.7.0
Checking strsim v0.11.1
Checking streaming-iterator v0.1.9
Compiling heck v0.5.0
Checking siphasher v0.3.11
Checking normalize-line-endings v0.3.0
Checking clap_lex v1.1.0
Checking snapbox v0.4.17
Checking clap_builder v4.6.0
Compiling clap_derive v4.6.0
Checking sqlite3-sys v0.18.0
Checking sqlite v0.37.0
Checking radicle-crypto v0.17.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-crypto)
Checking bloomy v1.2.0
Compiling radicle-surf v0.27.1
Checking scrypt v0.11.0
Checking git-ref-format v0.6.0
Checking systemd-journal-logger v2.2.2
Checking toml_datetime v0.7.5+spec-1.1.0
Checking serde_spanned v1.0.4
Compiling tree-sitter-md v0.3.2
Compiling tree-sitter-toml-ng v0.6.0
Compiling tree-sitter-python v0.23.6
Compiling tree-sitter-rust v0.23.3
Compiling tree-sitter-typescript v0.23.2
Compiling tree-sitter-json v0.24.8
Compiling tree-sitter-ruby v0.23.1
Compiling tree-sitter-bash v0.23.3
Compiling tree-sitter-css v0.23.2
Compiling tree-sitter-go v0.23.4
Compiling tree-sitter-html v0.23.2
Compiling tree-sitter-c v0.23.4
Checking radicle-std-ext v0.2.0
Checking toml_writer v1.0.7+spec-1.1.0
Checking pin-project-lite v0.2.17
Checking tokio v1.50.0
Checking toml v0.9.12+spec-1.1.0
Checking clap v4.6.0
Checking sysinfo v0.37.2
Checking yansi v1.0.1
Compiling radicle-node v0.20.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-node)
Compiling radicle-cli v0.21.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-cli)
Checking diff v0.1.13
Checking pretty_assertions v1.4.1
Checking human-panic v2.0.6
Checking clap_complete v4.6.0
Checking structured-logger v1.0.5
Checking radicle-systemd v0.13.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-systemd)
Checking tree-sitter-highlight v0.24.7
Checking itertools v0.14.0
Compiling qcheck-macros v1.0.0
Checking socket2 v0.5.10
Compiling escargot v0.5.15
Checking humantime v2.3.0
Checking timeago v0.4.2
Checking lexopt v0.3.2
Checking bit-vec v0.8.0
Checking bit-set v0.8.0
Checking rand_core v0.9.5
Checking num-bigint v0.4.6
Compiling ahash v0.8.12
Checking num-complex v0.4.6
Checking env_filter v1.0.0
Checking borrow-or-share v0.2.4
Checking fluent-uri v0.3.2
Checking env_logger v0.11.9
Checking phf_shared v0.11.3
Checking num-rational v0.4.2
Compiling test-log-macros v0.2.19
Checking wait-timeout v0.2.1
Checking outref v0.5.2
Checking num v0.4.3
Checking vsimd v0.8.0
Compiling radicle-remote-helper v0.17.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-remote-helper)
Checking quick-error v1.2.3
Checking fnv v1.0.7
Checking rusty-fork v0.3.1
Checking uuid-simd v0.8.0
Checking fraction v0.15.3
Checking test-log v0.2.19
Checking referencing v0.30.0
Checking phf v0.11.3
Checking rand_chacha v0.9.0
Checking rand v0.9.2
Checking rand_xorshift v0.4.0
Checking fancy-regex v0.14.0
Checking email_address v0.2.9
Checking base64 v0.22.1
Checking unarray v0.1.4
Checking bytecount v0.6.9
Checking num-cmp v0.1.0
Checking proptest v1.10.0
Checking emojis v0.6.4
Checking jsonschema v0.30.0
Compiling pastey v0.2.1
Checking radicle-windows v0.1.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-windows)
Checking git2 v0.20.4
Checking radicle-oid v0.2.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-oid)
Checking radicle-term v0.18.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-term)
Checking radicle-git-ext v0.12.0
Checking radicle-cob v0.20.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-cob)
Checking radicle-core v0.3.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-core)
Checking radicle-log v0.1.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-log)
Checking radicle-fetch v0.20.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-fetch)
Checking radicle-cli-test v0.13.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-cli-test)
Checking radicle-protocol v0.8.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-protocol)
Checking radicle-schemars v0.8.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-schemars)
Finished `dev` profile [unoptimized + debuginfo] target(s) in 51.61s
+ cargo build --all-targets --workspace
Compiling libc v0.2.183
Compiling cfg-if v1.0.4
Compiling zeroize v1.8.2
Compiling typenum v1.19.0
Compiling memchr v2.8.0
Compiling shlex v1.3.0
Compiling subtle v2.6.1
Compiling regex-syntax v0.8.10
Compiling generic-array v0.14.7
Compiling getrandom v0.2.17
Compiling rand_core v0.6.4
Compiling jobserver v0.1.34
Compiling aho-corasick v1.1.4
Compiling crypto-common v0.1.7
Compiling cc v1.2.57
Compiling serde_core v1.0.228
Compiling const-oid v0.9.6
Compiling regex-automata v0.4.14
Compiling smallvec v1.15.1
Compiling block-buffer v0.10.4
Compiling digest v0.10.7
Compiling cpufeatures v0.2.17
Compiling stable_deref_trait v1.2.1
Compiling fastrand v2.3.0
Compiling bitflags v2.11.0
Compiling thiserror v2.0.18
Compiling scopeguard v1.2.0
Compiling parking_lot_core v0.9.12
Compiling gix-trace v0.1.19
Compiling lock_api v0.4.14
Compiling tinyvec_macros v0.1.1
Compiling tinyvec v1.11.0
Compiling typeid v1.0.3
Compiling parking_lot v0.12.5
Compiling erased-serde v0.4.10
Compiling unicode-normalization v0.1.25
Compiling byteorder v1.5.0
Compiling itoa v1.0.17
Compiling gix-utils v0.3.2
Compiling serde v1.0.228
Compiling crc32fast v1.5.0
Compiling serde_fmt v1.1.0
Compiling hashbrown v0.16.1
Compiling value-bag-serde1 v1.12.0
Compiling same-file v1.0.6
Compiling value-bag v1.12.0
Compiling walkdir v2.5.0
Compiling log v0.4.29
Compiling zerofrom v0.1.6
Compiling prodash v31.0.0
Compiling zlib-rs v0.6.3
Compiling yoke v0.8.1
Compiling bstr v1.12.1
Compiling hash32 v0.3.1
Compiling linux-raw-sys v0.12.1
Compiling gix-validate v0.11.1
Compiling gix-path v0.12.0
Compiling zerovec v0.11.5
Compiling rustix v1.1.4
Compiling heapless v0.8.0
Compiling faster-hex v0.10.0
Compiling libm v0.2.16
Compiling block-padding v0.3.3
Compiling inout v0.1.4
Compiling getrandom v0.4.2
Compiling sha2 v0.10.9
Compiling num-traits v0.2.19
Compiling sha1 v0.10.6
Compiling gix-features v0.48.0
Compiling sha1-checked v0.10.0
Compiling cipher v0.4.4
Compiling zerocopy v0.8.42
Compiling tinystr v0.8.2
Compiling percent-encoding v2.3.2
Compiling once_cell v1.21.4
Compiling litemap v0.8.1
Compiling writeable v0.6.2
Compiling gix-hash v0.25.0
Compiling icu_locale_core v2.1.1
Compiling zerotrie v0.2.3
Compiling potential_utf v0.1.4
Compiling icu_collections v2.1.1
Compiling der v0.7.10
Compiling icu_provider v2.1.1
Compiling equivalent v1.0.2
Compiling icu_normalizer_data v2.1.1
Compiling indexmap v2.13.0
Compiling icu_properties_data v2.1.2
Compiling zmij v1.0.21
Compiling libz-sys v1.1.25
Compiling icu_properties v2.1.2
Compiling icu_normalizer v2.1.1
Compiling serde_json v1.0.149
Compiling tempfile v3.27.0
Compiling ppv-lite86 v0.2.21
Compiling spin v0.9.8
Compiling ref-cast v1.0.25
Compiling lazy_static v1.5.0
Compiling idna_adapter v1.2.1
Compiling num-integer v0.1.46
Compiling hmac v0.12.1
Compiling universal-hash v0.5.1
Compiling utf8_iter v1.0.4
Compiling opaque-debug v0.3.1
Compiling dyn-clone v1.0.20
Compiling idna v1.1.0
Compiling thiserror v1.0.69
Compiling spki v0.7.3
Compiling libgit2-sys v0.18.3+1.9.2
Compiling signature v2.2.0
Compiling ff v0.13.1
Compiling base16ct v0.2.0
Compiling group v0.13.0
Compiling sec1 v0.7.3
Compiling rand_chacha v0.3.1
Compiling form_urlencoded v1.2.2
Compiling crypto-bigint v0.5.5
Compiling url v2.5.8
Compiling rand v0.8.5
Compiling num-iter v0.1.45
Compiling aead v0.5.2
Compiling signature v1.6.4
Compiling ed25519 v1.5.3
Compiling schemars v1.2.1
Compiling elliptic-curve v0.13.8
Compiling poly1305 v0.8.0
Compiling rfc6979 v0.4.0
Compiling chacha20 v0.9.1
Compiling amplify_num v0.5.3
Compiling ct-codecs v1.1.6
Compiling ascii v1.1.0
Compiling ec25519 v0.1.0
Compiling ecdsa v0.16.9
Compiling amplify v4.9.0
Compiling primeorder v0.13.6
Compiling git-ref-format-core v0.6.0
Compiling polyval v0.6.2
Compiling base64ct v1.8.3
Compiling ghash v0.5.1
Compiling cyphergraphy v0.3.1
Compiling pkcs8 v0.10.2
Compiling pem-rfc7468 v0.7.0
Compiling pbkdf2 v0.12.2
Compiling ctr v0.9.2
Compiling aes v0.8.4
Compiling gix-error v0.2.3
Compiling sqlite3-src v0.7.0
Compiling keccak v0.1.6
Compiling curve25519-dalek v4.1.3
Compiling sha3 v0.10.8
Compiling aes-gcm v0.10.3
Compiling ssh-encoding v0.2.0
Compiling pkcs1 v0.7.5
Compiling num-bigint-dig v0.8.6
Compiling ed25519 v2.2.3
Compiling cbc v0.1.2
Compiling blowfish v0.9.1
Compiling base32 v0.4.0
Compiling cypheraddr v0.4.1
Compiling rsa v0.9.10
Compiling bcrypt-pbkdf v0.10.0
Compiling ssh-cipher v0.2.0
Compiling ed25519-dalek v2.2.0
Compiling p256 v0.13.2
Compiling p384 v0.13.1
Compiling p521 v0.13.3
Compiling chacha20poly1305 v0.10.1
Compiling qcheck v1.0.0
Compiling const-str v0.4.3
Compiling data-encoding v2.10.0
Compiling base256emoji v1.0.2
Compiling data-encoding-macro v0.1.19
Compiling ssh-key v0.6.7
Compiling noise-framework v0.4.1
Compiling socks5-client v0.4.3
Compiling crossbeam-utils v0.8.21
Compiling secrecy v0.10.3
Compiling base-x v0.2.11
Compiling multibase v0.9.2
Compiling ssh-agent-lib v0.6.0
Compiling crossbeam-channel v0.5.15
Compiling cyphernet v0.5.4
Compiling anstyle-query v1.1.5
Compiling errno v0.3.14
Compiling utf8parse v0.2.2
Compiling jiff v0.2.23
Compiling nonempty v0.9.0
Compiling siphasher v1.0.2
Compiling radicle-localtime v0.1.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-localtime)
Compiling radicle-git-metadata v0.2.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-git-metadata)
Compiling radicle-dag v0.10.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-dag)
Compiling is_terminal_polyfill v1.70.2
Compiling anstyle v1.0.14
Compiling colorchoice v1.0.5
Compiling unicode-segmentation v1.12.0
Compiling radicle-git-ref-format v0.1.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-git-ref-format)
Compiling gix-hashtable v0.15.0
Compiling base64 v0.21.7
Compiling radicle v0.24.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle)
Compiling gix-date v0.15.3
Compiling gix-actor v0.41.0
Compiling gix-object v0.60.0
Compiling convert_case v0.10.0
Compiling signal-hook-registry v1.4.8
Compiling tree-sitter-language v0.1.7
Compiling serde-untagged v0.1.9
Compiling bytesize v2.3.1
Compiling memmap2 v0.9.10
Compiling nonempty v0.12.0
Compiling dunce v1.0.5
Compiling fast-glob v0.3.3
Compiling signal-hook v0.3.18
Compiling derive_more-impl v2.1.1
Compiling gix-chunk v0.7.1
Compiling regex v1.12.3
Compiling mio v1.1.1
Compiling sem_safe v0.2.1
Compiling unicode-width v0.2.2
Compiling signals_receipts v0.2.5
Compiling signal-hook-mio v0.2.5
Compiling derive_more v2.1.1
Compiling gix-commitgraph v0.37.0
Compiling anstyle-parse v0.2.7
Compiling adler2 v2.0.1
Compiling gix-revwalk v0.31.0
Compiling anstream v0.6.21
Compiling crossterm v0.29.0
Compiling console v0.16.3
Compiling portable-atomic v1.13.1
Compiling gix-fs v0.21.1
Compiling unit-prefix v0.5.2
Compiling gix-tempfile v23.0.0
Compiling indicatif v0.18.4
Compiling inquire v0.9.4
Compiling radicle-signals v0.11.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-signals)
Compiling unicode-display-width v0.3.0
Compiling gix-quote v0.7.1
Compiling shell-words v1.1.1
Compiling either v1.15.0
Compiling iana-time-zone v0.1.65
Compiling gix-command v0.9.0
Compiling chrono v0.4.44
Compiling colored v2.2.0
Compiling gix-lock v23.0.0
Compiling gix-url v0.36.0
Compiling gix-config-value v0.18.0
Compiling gix-sec v0.14.0
Compiling gimli v0.32.3
Compiling gix-prompt v0.15.0
Compiling object v0.37.3
Compiling addr2line v0.25.1
Compiling gix-traverse v0.57.0
Compiling gix-revision v0.45.0
Compiling miniz_oxide v0.8.9
Compiling gix-diff v0.63.0
Compiling gix-glob v0.26.0
Compiling gix-packetline v0.21.3
Compiling tree-sitter v0.24.7
Compiling rustc-demangle v0.1.27
Compiling sqlite3-sys v0.18.0
Compiling sqlite v0.37.0
Compiling radicle-crypto v0.17.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-crypto)
Compiling backtrace v0.3.76
Compiling gix-transport v0.57.0
Compiling gix-refspec v0.41.0
Compiling gix-pack v0.70.0
Compiling arc-swap v1.9.1
Compiling gix-credentials v0.38.0
Compiling gix-ref v0.63.0
Compiling gix-shallow v0.12.0
Compiling gix-negotiate v0.31.0
Compiling gix-protocol v0.61.0
Compiling gix-odb v0.80.0
Compiling xattr v1.6.1
Compiling anstyle-parse v1.0.0
Compiling uuid v1.22.0
Compiling filetime v0.2.27
Compiling bytes v1.11.1
Compiling tar v0.4.45
Compiling git-ref-format-macro v0.6.0
Compiling anstream v1.0.0
Compiling flate2 v1.1.9
Compiling anyhow v1.0.102
Compiling getrandom v0.3.4
Compiling snapbox-macros v0.3.10
Compiling salsa20 v0.10.2
Compiling strsim v0.11.1
Compiling normalize-line-endings v0.3.0
Compiling siphasher v0.3.11
Compiling clap_lex v1.1.0
Compiling similar v2.7.0
Compiling streaming-iterator v0.1.9
Compiling clap_builder v4.6.0
Compiling snapbox v0.4.17
Compiling bloomy v1.2.0
Compiling scrypt v0.11.0
Compiling radicle-surf v0.27.1
Compiling git-ref-format v0.6.0
Compiling systemd-journal-logger v2.2.2
Compiling toml_datetime v0.7.5+spec-1.1.0
Compiling serde_spanned v1.0.4
Compiling tree-sitter-md v0.3.2
Compiling tree-sitter-typescript v0.23.2
Compiling tree-sitter-json v0.24.8
Compiling tree-sitter-c v0.23.4
Compiling tree-sitter-toml-ng v0.6.0
Compiling tree-sitter-rust v0.23.3
Compiling tree-sitter-python v0.23.6
Compiling tree-sitter-css v0.23.2
Compiling tree-sitter-html v0.23.2
Compiling tree-sitter-go v0.23.4
Compiling tree-sitter-bash v0.23.3
Compiling tree-sitter-ruby v0.23.1
Compiling toml_writer v1.0.7+spec-1.1.0
Compiling pin-project-lite v0.2.17
Compiling radicle-std-ext v0.2.0
Compiling tokio v1.50.0
Compiling toml v0.9.12+spec-1.1.0
Compiling clap v4.6.0
Compiling sysinfo v0.37.2
Compiling radicle-node v0.20.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-node)
Compiling radicle-cli v0.21.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-cli)
Compiling diff v0.1.13
Compiling yansi v1.0.1
Compiling pretty_assertions v1.4.1
Compiling human-panic v2.0.6
Compiling clap_complete v4.6.0
Compiling structured-logger v1.0.5
Compiling radicle-systemd v0.13.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-systemd)
Compiling tree-sitter-highlight v0.24.7
Compiling itertools v0.14.0
Compiling socket2 v0.5.10
Compiling lexopt v0.3.2
Compiling timeago v0.4.2
Compiling humantime v2.3.0
Compiling bit-vec v0.8.0
Compiling bit-set v0.8.0
Compiling escargot v0.5.15
Compiling rand_core v0.9.5
Compiling num-bigint v0.4.6
Compiling num-complex v0.4.6
Compiling env_filter v1.0.0
Compiling borrow-or-share v0.2.4
Compiling fluent-uri v0.3.2
Compiling num-rational v0.4.2
Compiling env_logger v0.11.9
Compiling ahash v0.8.12
Compiling num v0.4.3
Compiling phf_shared v0.11.3
Compiling wait-timeout v0.2.1
Compiling vsimd v0.8.0
Compiling radicle-remote-helper v0.17.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-remote-helper)
Compiling fnv v1.0.7
Compiling quick-error v1.2.3
Compiling outref v0.5.2
Compiling rusty-fork v0.3.1
Compiling uuid-simd v0.8.0
Compiling test-log v0.2.19
Compiling phf v0.11.3
Compiling fraction v0.15.3
Compiling referencing v0.30.0
Compiling rand_xorshift v0.4.0
Compiling rand_chacha v0.9.0
Compiling rand v0.9.2
Compiling fancy-regex v0.14.0
Compiling email_address v0.2.9
Compiling git2 v0.20.4
Compiling num-cmp v0.1.0
Compiling unarray v0.1.4
Compiling base64 v0.22.1
Compiling bytecount v0.6.9
Compiling proptest v1.10.0
Compiling jsonschema v0.30.0
Compiling emojis v0.6.4
Compiling radicle-oid v0.2.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-oid)
Compiling radicle-cob v0.20.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-cob)
Compiling radicle-core v0.3.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-core)
Compiling radicle-term v0.18.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-term)
Compiling radicle-git-ext v0.12.0
Compiling radicle-log v0.1.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-log)
Compiling radicle-windows v0.1.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-windows)
Compiling radicle-fetch v0.20.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-fetch)
Compiling radicle-protocol v0.8.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-protocol)
Compiling radicle-cli-test v0.13.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-cli-test)
Compiling radicle-schemars v0.8.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-schemars)
Finished `dev` profile [unoptimized + debuginfo] target(s) in 1m 15s
+ cargo doc --workspace --no-deps --all-features
Downloading crates ...
Downloaded rustc-hash v1.1.0
Downloaded mintex v0.1.4
Downloaded thousands v0.2.0
Downloaded dhat v0.3.3
Checking regex-automata v0.4.14
Compiling num-traits v0.2.19
Checking once_cell v1.21.4
Compiling syn v1.0.109
Checking tempfile v3.27.0
Checking idna v1.1.0
Checking url v2.5.8
Checking git2 v0.20.4
Checking num-integer v0.1.46
Checking num-iter v0.1.45
Compiling amplify_syn v2.0.1
Checking bstr v1.12.1
Checking num-bigint-dig v0.8.6
Compiling amplify_derive v4.0.1
Checking gix-validate v0.11.1
Checking gix-path v0.12.0
Checking gix-features v0.48.0
Checking gix-hash v0.25.0
Checking git-ref-format-core v0.6.0
Checking gix-error v0.2.3
Checking rsa v0.9.10
Checking radicle-git-ref-format v0.1.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-git-ref-format)
Checking gix-date v0.15.3
Checking radicle-oid v0.2.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-oid)
Checking rusty-fork v0.3.1
Checking gix-actor v0.41.0
Checking gix-hashtable v0.15.0
Checking proptest v1.10.0
Checking ssh-key v0.6.7
Checking gix-object v0.60.0
Checking radicle-localtime v0.1.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-localtime)
Checking radicle-git-metadata v0.2.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-git-metadata)
Checking radicle-dag v0.10.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-dag)
Checking amplify v4.9.0
Checking ssh-agent-lib v0.6.0
Checking gix-chunk v0.7.1
Checking gix-commitgraph v0.37.0
Checking cyphergraphy v0.3.1
Checking gix-fs v0.21.1
Checking gix-revwalk v0.31.0
Checking cypheraddr v0.4.1
Checking noise-framework v0.4.1
Checking gix-tempfile v23.0.0
Checking gix-quote v0.7.1
Checking regex v1.12.3
Checking inquire v0.9.4
Checking socks5-client v0.4.3
Checking cyphernet v0.5.4
Checking radicle-crypto v0.17.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-crypto)
Checking radicle-signals v0.11.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-signals)
Checking gix-command v0.9.0
Checking chrono v0.4.44
Checking gix-lock v23.0.0
Checking radicle-term v0.18.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-term)
Checking gix-url v0.36.0
Checking radicle-core v0.3.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-core)
Checking radicle-cob v0.20.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-cob)
Checking gix-config-value v0.18.0
Checking gix-prompt v0.15.0
Checking gix-traverse v0.57.0
Checking radicle v0.24.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle)
Checking gix-revision v0.45.0
Checking gix-diff v0.63.0
Checking gix-glob v0.26.0
Checking gix-packetline v0.21.3
Checking tree-sitter v0.24.7
Checking gix-refspec v0.41.0
Checking gix-transport v0.57.0
Checking gix-pack v0.70.0
Checking radicle-log v0.1.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-log)
Checking git-ref-format v0.6.0
Checking gix-credentials v0.38.0
Checking gix-ref v0.63.0
Checking gix-shallow v0.12.0
Checking gix-negotiate v0.31.0
Checking radicle-git-ext v0.12.0
Checking uuid v1.22.0
Compiling radicle-cli v0.21.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-cli)
Checking gix-protocol v0.61.0
Checking gix-odb v0.80.0
Checking human-panic v2.0.6
Checking radicle-surf v0.27.1
Checking tree-sitter-toml-ng v0.6.0
Checking tree-sitter-highlight v0.24.7
Checking thousands v0.2.0
Checking mintex v0.1.4
Checking rustc-hash v1.1.0
Compiling radicle-node v0.20.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-node)
Checking radicle-systemd v0.13.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-systemd)
Checking dhat v0.3.3
Documenting radicle-systemd v0.13.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-systemd)
Documenting radicle-log v0.1.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-log)
Documenting radicle v0.24.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle)
Documenting radicle-core v0.3.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-core)
Documenting radicle-cob v0.20.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-cob)
Documenting radicle-term v0.18.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-term)
Documenting radicle-crypto v0.17.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-crypto)
Documenting radicle-signals v0.11.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-signals)
Documenting radicle-oid v0.2.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-oid)
Documenting radicle-git-ref-format v0.1.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-git-ref-format)
Documenting radicle-localtime v0.1.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-localtime)
Documenting radicle-git-metadata v0.2.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-git-metadata)
Documenting radicle-dag v0.10.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-dag)
error: unresolved link to `Service`
--> crates/radicle/src/git/repository/canonical.rs:3:7
|
3 | //! [`Service`] provides operations to evaluate and update canonical references
| ^^^^^^^ no item named `Service` in scope
|
= help: to escape `[` and `]` characters, add '\' before them like `\[` or `\]`
= note: `-D rustdoc::broken-intra-doc-links` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(rustdoc::broken_intra_doc_links)]`
error: unresolved link to `super::Service::propose`
--> crates/radicle/src/git/repository/canonical/error.rs:7:27
|
7 | /// [`Service::propose`]: super::Service::propose
| ^^^^^^^^^^^^^^^^^^^^^^^ no item named `Service` in module `canonical`
error: unresolved link to `super::Service::reevaluate`
--> crates/radicle/src/git/repository/canonical/error.rs:8:30
|
8 | /// [`Service::reevaluate`]: super::Service::reevaluate
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ no item named `Service` in module `canonical`
Documenting radicle-windows v0.1.0 (/1bdf25dd-78d3-4459-b839-d3b442b94047/w/crates/radicle-windows)
error: could not document `radicle`
warning: build failed, waiting for other jobs to finish...
Exit code: 101
{
"response": "finished",
"result": "failure"
}