rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5 heartwood773b8e695a5c38c6b4a0dddd4e7a9c19efe82bb2
{
"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": "Updated",
"patch": {
"id": "c5ed254e6387a7828a63229be423a149d04bfc9d",
"author": {
"id": "did:key:z6MktwkohCx8aHZ1QCjVZUiLmX92oPZFxRiFZkbq32Tk5Tkm",
"alias": "2color"
},
"title": "Introduce identity v2 with explicit migration",
"state": {
"status": "draft",
"conflicts": []
},
"before": "ceb74c997161f723b9b0a3745f8bf9ccbf1bf92b",
"after": "773b8e695a5c38c6b4a0dddd4e7a9c19efe82bb2",
"commits": [
"773b8e695a5c38c6b4a0dddd4e7a9c19efe82bb2",
"1c363a74046de70f711fd764616b83f5dff0ebb8",
"9e7e3a6631ee8d8b35f3ab34f128b5e59721106b",
"554d63ee191f521038fffdaa556e9515cc6f532f",
"d816bdde643c44f528693d8336ffb060a31c8b59",
"156c003dc29f0400092310e78a94ac9e4ac933f6",
"08bfc8d4ce67b7936f966b8df45ba12839961e57",
"92eab97c716fbe3d7ac121fbd77382d6c4c7a724"
],
"target": "ceb74c997161f723b9b0a3745f8bf9ccbf1bf92b",
"labels": [],
"assignees": [],
"revisions": [
{
"id": "c5ed254e6387a7828a63229be423a149d04bfc9d",
"author": {
"id": "did:key:z6MktwkohCx8aHZ1QCjVZUiLmX92oPZFxRiFZkbq32Tk5Tkm",
"alias": "2color"
},
"description": "This is an implementation of the changes proposed by [RIP-0007: Identity 2](https://radicle.network/nodes/rosa.radicle.network/rad%3Az3trNYnLWS11cJWC6BbxDs5niGo82/patches/d5604e96805f8658232771d341d0450030d989bf)\n\nThe main change introduced by identity v2 is that the default branch can now\nbe governed by a canonical reference with an allow set that isn't the delegates.\n\nAdd `rad id migrate`, which proposes the migrated document as a revision\nthe delegates vote on, and `rad init --identity-version` for a repository\nthat must stay readable to older releases. Adopting the migration is\nopt-in per repository, because it is a one-way door: version 2 is\nunreadable to releases 1.10.0 and earlier.\n\nMake canonical refs explicitly optional so we can support repositories without it. \n\nAllow initializing without a default branch",
"base": "dc4d5c93963ecb12b66ce850afdc6054c0eec8e5",
"oid": "00a7e2da03c68bb18b495f59e900e94ced83e861",
"timestamp": 1788875259
},
{
"id": "07bac93b4df6f897c44084ba3ac899b4bc0cd877",
"author": {
"id": "did:key:z6MktwkohCx8aHZ1QCjVZUiLmX92oPZFxRiFZkbq32Tk5Tkm",
"alias": "2color"
},
"description": "",
"base": "0e5a56f25f51d07290613a9363bd8c0c9fc8e0be",
"oid": "e1e4a2f302cfe5c0b1fe6c9928bc9331d9cf2799",
"timestamp": 1789125912
},
{
"id": "39a1656cce6957e517c6137fc077f3c1f05b386f",
"author": {
"id": "did:key:z6MktwkohCx8aHZ1QCjVZUiLmX92oPZFxRiFZkbq32Tk5Tkm",
"alias": "2color"
},
"description": "Rebase",
"base": "7a77ba481c65cc3efcbe5c660ef8dc2997ae6ce8",
"oid": "4124de770e395e9d83852b823077191e7fd113be",
"timestamp": 1789126495
},
{
"id": "22162d74be6cfd2aa672f87164f686503a54db2c",
"author": {
"id": "did:key:z6MktwkohCx8aHZ1QCjVZUiLmX92oPZFxRiFZkbq32Tk5Tkm",
"alias": "2color"
},
"description": "",
"base": "ceb74c997161f723b9b0a3745f8bf9ccbf1bf92b",
"oid": "773b8e695a5c38c6b4a0dddd4e7a9c19efe82bb2",
"timestamp": 1791809939
}
]
}
}
{
"response": "triggered",
"run_id": {
"id": "8c691f9b-089b-4823-8984-e8fb3cbca6e4"
},
"info_url": "https://cci.rad.levitte.org//8c691f9b-089b-4823-8984-e8fb3cbca6e4.html"
}
Started at: 2026-10-12 14:59:10.046577+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/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w/
╭────────────────────────────────────╮
│ heartwood │
│ Radicle Heartwood Protocol & Stack │
│ 194 issues · 48 patches │
╰────────────────────────────────────╯
Run `cd ./.` to go to the repository directory.
Exit code: 0
$ rad patch checkout c5ed254e6387a7828a63229be423a149d04bfc9d
✓ Switched to branch patch/c5ed254 at revision 22162d7
✓ Branch patch/c5ed254 setup to track rad/patches/c5ed254e6387a7828a63229be423a149d04bfc9d
Exit code: 0
$ git config advice.detachedHead false
Exit code: 0
$ git checkout 773b8e695a5c38c6b4a0dddd4e7a9c19efe82bb2
HEAD is now at 773b8e69 radicle/identity: say what a missing default branch means
Exit code: 0
$ rad patch show c5ed254e6387a7828a63229be423a149d04bfc9d -p
╭─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ Title Introduce identity v2 with explicit migration │
│ Patch c5ed254e6387a7828a63229be423a149d04bfc9d │
│ Author 2color z6Mktwk…2Tk5Tkm │
│ Head 773b8e695a5c38c6b4a0dddd4e7a9c19efe82bb2 │
│ Base ceb74c997161f723b9b0a3745f8bf9ccbf1bf92b │
│ Target master │
│ Branches patch/c5ed254 │
│ Commits ahead 8, behind 0 │
│ Status draft │
│ │
│ This is an implementation of the changes proposed by [RIP-0007: Identity │
│ 2](https://radicle.network/nodes/rosa.radicle.network/rad%3Az3trNYnLWS11cJWC6BbxDs5niGo82/patches/d5604e96805f8658232771d341d0450030d989bf) │
│ │
│ The main change introduced by identity v2 is that the default branch can now │
│ be governed by a canonical reference with an allow set that isn't the delegates. │
│ │
│ Add `rad id migrate`, which proposes the migrated document as a revision │
│ the delegates vote on, and `rad init --identity-version` for a repository │
│ that must stay readable to older releases. Adopting the migration is │
│ opt-in per repository, because it is a one-way door: version 2 is │
│ unreadable to releases 1.10.0 and earlier. │
│ │
│ Make canonical refs explicitly optional so we can support repositories without │
│ it. │
│ │
│ Allow initializing without a default branch │
├─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
│ 773b8e6 radicle/identity: say what a missing default branch means │
│ 1c363a7 radicle: allow initializing without a default branch │
│ 9e7e3a6 radicle/identity: report a threshold with no branch to set it on │
│ 554d63e fetch: fall back to delegate majority with no branch │
│ d816bdd radicle/identity: make canonical refs optional │
│ 156c003 radicle/identity: failing tests for branch-free docs │
│ 08bfc8d radicle: identity 2 and default branch with crefs │
│ 92eab97 patch: Use cref rule quorum for merge tally │
├─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
│ ● Revision c5ed254 @ dc4d5c9..00a7e2d by 2color z6Mktwk…2Tk5Tkm 1 month ago │
│ ↑ Revision 07bac93 @ 0e5a56f..e1e4a2f by 2color z6Mktwk…2Tk5Tkm 1 month ago │
│ ↑ Revision 39a1656 @ 7a77ba4..4124de7 by 2color z6Mktwk…2Tk5Tkm 1 month ago │
│ ↑ Revision 22162d7 @ ceb74c9..773b8e6 by 2color z6Mktwk…2Tk5Tkm 13 seconds ago │
╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
commit 773b8e695a5c38c6b4a0dddd4e7a9c19efe82bb2
Author: Daniel Norman <daniel@norman.life>
Date: Tue Sep 1 12:01:54 2026 +0200
radicle/identity: say what a missing default branch means
- Reword `DefaultBranchError::MissingHead` to name the document and the
payload, not the bare symbolic reference.
diff --git a/crates/radicle/src/identity/doc.rs b/crates/radicle/src/identity/doc.rs
index 455095b1fa..e9110c7fbb 100644
--- a/crates/radicle/src/identity/doc.rs
+++ b/crates/radicle/src/identity/doc.rs
@@ -99,7 +99,10 @@ impl DocError {
#[derive(Debug, Error)]
pub enum DefaultBranchError {
- #[error("no symbolic reference with name `HEAD` is defined")]
+ #[error(
+ "the identity document names no default branch: the `xyz.radicle.crefs` payload \
+ defines no `HEAD` symbolic reference"
+ )]
MissingHead,
#[error(transparent)]
commit 1c363a74046de70f711fd764616b83f5dff0ebb8
Author: Daniel Norman <daniel@norman.life>
Date: Tue Sep 1 11:57:21 2026 +0200
radicle: allow initializing without a default branch
- Take `Option` for the default branch in `RawDoc::new`, `Doc::initial` and
`rad::init`, and their `_at` variants.
- Write no crefs payload, push no branch, and compute no canonical head when
there is none. The identity is still published, so the repository exists
and can gain branches later.
Completes the path: a repository that holds no branches can now be created,
not only parsed.
Note that `rad init` still always names a branch. Exposing this on the command
line is a separate decision.
diff --git a/crates/radicle-cli/src/commands/init.rs b/crates/radicle-cli/src/commands/init.rs
index 4e11145d98..a0271c294a 100644
--- a/crates/radicle-cli/src/commands/init.rs
+++ b/crates/radicle-cli/src/commands/init.rs
@@ -144,7 +144,7 @@ pub fn init(repo: raw::Repository, args: Args, profile: &profile::Profile) -> an
&repo,
name,
&description,
- branch.clone(),
+ Some(branch.clone()),
visibility,
&signer,
&profile.storage,
diff --git a/crates/radicle-node/src/test/node.rs b/crates/radicle-node/src/test/node.rs
index b427c4faeb..ab89340b1a 100644
--- a/crates/radicle-node/src/test/node.rs
+++ b/crates/radicle-node/src/test/node.rs
@@ -515,7 +515,7 @@ impl Node {
repo,
name.try_into().unwrap(),
description,
- branch.clone(),
+ Some(branch.clone()),
Visibility::default(),
&self.secret_key,
&self.storage,
diff --git a/crates/radicle-node/src/test/peer.rs b/crates/radicle-node/src/test/peer.rs
index 779ad4ab0e..0ea5ffd5bd 100644
--- a/crates/radicle-node/src/test/peer.rs
+++ b/crates/radicle-node/src/test/peer.rs
@@ -145,7 +145,7 @@ impl Peer<Storage> {
&repo,
name.try_into().unwrap(),
description,
- radicle::git::fmt::refname!("master"),
+ Some(radicle::git::fmt::refname!("master")),
Visibility::default(),
self.secret_key(),
self.storage(),
diff --git a/crates/radicle-node/src/tests.rs b/crates/radicle-node/src/tests.rs
index 46944d37c7..0c9974183e 100644
--- a/crates/radicle-node/src/tests.rs
+++ b/crates/radicle-node/src/tests.rs
@@ -1820,7 +1820,7 @@ fn init_and_seed() {
&repo,
"amy".try_into().unwrap(),
"amy's repo",
- git::fmt::refname!("master"),
+ Some(git::fmt::refname!("master")),
Visibility::default(),
amy.secret_key(),
amy.storage(),
diff --git a/crates/radicle/src/cob/identity.rs b/crates/radicle/src/cob/identity.rs
index 3b695d312f..36890a48e6 100644
--- a/crates/radicle/src/cob/identity.rs
+++ b/crates/radicle/src/cob/identity.rs
@@ -1421,7 +1421,7 @@ mod test {
&working,
"heartwood".try_into().unwrap(),
"Radicle Heartwood Protocol & Stack",
- git::fmt::refname!("master"),
+ Some(git::fmt::refname!("master")),
Visibility::default(),
&alice,
&storage,
diff --git a/crates/radicle/src/cob/patch.rs b/crates/radicle/src/cob/patch.rs
index 2c3eaf0c3a..9e1b990af0 100644
--- a/crates/radicle/src/cob/patch.rs
+++ b/crates/radicle/src/cob/patch.rs
@@ -3142,7 +3142,7 @@ mod test {
let doc = RawDoc::new(
project.unwrap(),
vec![alice.did()],
- &git::fmt::refname!("master"),
+ Some(&git::fmt::refname!("master")),
1,
identity::Visibility::Public,
)
@@ -3195,7 +3195,7 @@ mod test {
let mut raw_doc = RawDoc::new(
r#gen::<Project>(1),
vec![alice.did()],
- &git::fmt::refname!("master"),
+ Some(&git::fmt::refname!("master")),
1,
identity::Visibility::Public,
);
@@ -3279,7 +3279,7 @@ mod test {
let mut raw_doc = RawDoc::new(
r#gen::<Project>(1),
vec![bob.did()],
- &git::fmt::refname!("master"),
+ Some(&git::fmt::refname!("master")),
1,
identity::Visibility::Public,
);
@@ -3339,7 +3339,7 @@ mod test {
let mut raw_doc = RawDoc::new(
r#gen::<Project>(1),
vec![alice.did()],
- &git::fmt::refname!("master"),
+ Some(&git::fmt::refname!("master")),
1,
identity::Visibility::Public,
);
@@ -3407,7 +3407,7 @@ mod test {
let mut raw_doc = RawDoc::new(
r#gen::<Project>(1),
vec![alice.did(), bob.did(), eve.did(), dave.did()],
- &git::fmt::refname!("master"),
+ Some(&git::fmt::refname!("master")),
3,
identity::Visibility::Public,
);
@@ -3551,7 +3551,7 @@ mod test {
let doc = RawDoc::new(
project,
vec![alice.did()],
- &git::fmt::refname!("master"),
+ Some(&git::fmt::refname!("master")),
1,
identity::Visibility::Public,
)
@@ -3614,7 +3614,7 @@ mod test {
let doc = RawDoc::new(
project,
vec![alice.did(), bob.did(), eve.did()],
- &git::fmt::refname!("master"),
+ Some(&git::fmt::refname!("master")),
2,
identity::Visibility::Public,
)
@@ -3909,7 +3909,7 @@ mod test {
let doc = RawDoc::new(
r#gen::<Project>(1),
vec![alice.did()],
- &git::fmt::refname!("master"),
+ Some(&git::fmt::refname!("master")),
1,
identity::Visibility::Public,
)
diff --git a/crates/radicle/src/git/canonical/rules/test.rs b/crates/radicle/src/git/canonical/rules/test.rs
index 51550ba869..77f9321ad5 100644
--- a/crates/radicle/src/git/canonical/rules/test.rs
+++ b/crates/radicle/src/git/canonical/rules/test.rs
@@ -365,7 +365,7 @@ fn canonical() {
&repo,
"heartwood".try_into().unwrap(),
"Radicle Heartwood Protocol & Stack",
- git::fmt::refname!("master"),
+ Some(git::fmt::refname!("master")),
Visibility::default(),
&delegate,
&storage,
diff --git a/crates/radicle/src/identity/doc.rs b/crates/radicle/src/identity/doc.rs
index 39bd464a84..455095b1fa 100644
--- a/crates/radicle/src/identity/doc.rs
+++ b/crates/radicle/src/identity/doc.rs
@@ -651,10 +651,13 @@ impl Doc {
/// It will begin with the provided `project` in the [`Doc::payload`], a
/// `xyz.radicle.crefs` payload governing `default_branch` with a threshold
/// of 1, the `delegate` as the sole delegate, and the given `visibility`.
+ ///
+ /// The default branch is optional: a repository that holds no branches
+ /// gets no canonical references, and so no crefs payload.
pub fn initial(
project: Project,
delegate: Did,
- default_branch: &RefString,
+ default_branch: Option<&RefString>,
visibility: Visibility,
) -> Self {
Self::initial_at(
@@ -676,7 +679,7 @@ impl Doc {
version: Version,
project: Project,
delegate: Did,
- default_branch: &RefString,
+ default_branch: Option<&RefString>,
visibility: Visibility,
) -> Result<Self, DocError> {
RawDoc::new_at(
@@ -992,7 +995,7 @@ mod test {
let mut doc = RawDoc::new(
r#gen::<Project>(1),
vec![did],
- &git::fmt::refname!("master"),
+ Some(&git::fmt::refname!("master")),
1,
Visibility::Public,
);
@@ -1013,7 +1016,7 @@ mod test {
let doc = RawDoc::new(
r#gen::<Project>(1),
delegates[0..MAX_DELEGATES].into(),
- &git::fmt::refname!("master"),
+ Some(&git::fmt::refname!("master")),
1,
Visibility::Public,
);
@@ -1023,7 +1026,7 @@ mod test {
let doc = RawDoc::new(
r#gen::<Project>(1),
delegates,
- &git::fmt::refname!("master"),
+ Some(&git::fmt::refname!("master")),
1,
Visibility::Public,
);
@@ -1042,7 +1045,7 @@ mod test {
let doc = RawDoc::new(
r#gen::<Project>(1),
vec![did],
- &git::fmt::refname!("master"),
+ Some(&git::fmt::refname!("master")),
2,
Visibility::Public,
);
@@ -1057,7 +1060,7 @@ mod test {
let mut doc = RawDoc::new(
r#gen::<Project>(1),
vec![r#gen::<Did>(1)],
- &git::fmt::refname!("master"),
+ Some(&git::fmt::refname!("master")),
1,
Visibility::Public,
);
@@ -1351,7 +1354,7 @@ mod test {
&repo,
"heartwood".try_into().unwrap(),
"Radicle Heartwood Protocol & Stack",
- git::fmt::refname!("master"),
+ Some(git::fmt::refname!("master")),
Visibility::default(),
&delegate,
&storage,
@@ -1401,7 +1404,7 @@ mod test {
&working,
"heartwood".try_into().unwrap(),
"Radicle Heartwood Protocol & Stack",
- git::fmt::refname!("master"),
+ Some(git::fmt::refname!("master")),
Visibility::default(),
&delegate,
&storage,
diff --git a/crates/radicle/src/identity/doc/raw.rs b/crates/radicle/src/identity/doc/raw.rs
index 192efc7329..d110c389e2 100644
--- a/crates/radicle/src/identity/doc/raw.rs
+++ b/crates/radicle/src/identity/doc/raw.rs
@@ -93,11 +93,14 @@ impl RawDoc {
/// payload governing `default_branch` at the given `threshold`, with the
/// given `delegates` and `visibility`.
///
+ /// The default branch is optional: a repository that holds no branches
+ /// gets no canonical references, and so no crefs payload.
+ ///
/// [`IDENTITY_VERSION`]: super::IDENTITY_VERSION
pub fn new(
project: Project,
delegates: Vec<Did>,
- default_branch: &RefString,
+ default_branch: Option<&RefString>,
threshold: usize,
visibility: Visibility,
) -> Self {
@@ -119,7 +122,7 @@ impl RawDoc {
version: Version,
project: Project,
delegates: Vec<Did>,
- default_branch: &RefString,
+ default_branch: Option<&RefString>,
threshold: usize,
visibility: Visibility,
) -> Self {
@@ -129,7 +132,9 @@ impl RawDoc {
match u32::from(version) {
1 => {
let mut project = project;
- if let Some(object) = project.as_object_mut() {
+ if let Some(default_branch) = default_branch
+ && let Some(object) = project.as_object_mut()
+ {
object.insert(
"defaultBranch".to_owned(),
json::Value::from(default_branch.as_str()),
@@ -145,17 +150,21 @@ impl RawDoc {
visibility,
})
}
- _ => Self::V2(v2::Doc {
- payload: BTreeMap::from_iter([
- (PayloadId::project().clone(), Payload::from(project)),
- (
+ _ => {
+ let mut payload =
+ BTreeMap::from_iter([(PayloadId::project().clone(), Payload::from(project))]);
+ if let Some(default_branch) = default_branch {
+ payload.insert(
PayloadId::canonical_refs().clone(),
v2::default_branch_crefs(default_branch, threshold),
- ),
- ]),
- delegates,
- visibility,
- }),
+ );
+ }
+ Self::V2(v2::Doc {
+ payload,
+ delegates,
+ visibility,
+ })
+ }
}
}
diff --git a/crates/radicle/src/rad.rs b/crates/radicle/src/rad.rs
index 98360800c6..e79b4a4c77 100644
--- a/crates/radicle/src/rad.rs
+++ b/crates/radicle/src/rad.rs
@@ -46,11 +46,14 @@ pub enum InitError {
/// Initialize a new Radicle project from a git repository, at the current
/// identity document version.
+///
+/// The default branch is optional: a repository that holds no branches gets
+/// no canonical references, and so no `xyz.radicle.crefs` payload.
pub fn init(
repo: &git::raw::Repository,
name: ProjectName,
description: &str,
- default_branch: BranchName,
+ default_branch: Option<BranchName>,
visibility: Visibility,
signer: &impl crypto::Signer,
storage: &impl WriteStorage,
@@ -77,7 +80,7 @@ pub fn init_at(
repo: &git::raw::Repository,
name: ProjectName,
description: &str,
- default_branch: BranchName,
+ default_branch: Option<BranchName>,
visibility: Visibility,
signer: &impl crypto::Signer,
storage: &impl WriteStorage,
@@ -92,12 +95,20 @@ pub fn init_at(
.join(", "),
)
})?;
- let doc = identity::Doc::initial_at(version, proj, delegate, &default_branch, visibility)?;
+ let doc =
+ identity::Doc::initial_at(version, proj, delegate, default_branch.as_ref(), visibility)?;
let (project, identity) = Repository::init(&doc, storage, signer)?;
let url = git::Url::from(project.id);
- match init_configure(repo, &project, &default_branch, &url, identity, signer) {
+ match init_configure(
+ repo,
+ &project,
+ default_branch.as_ref(),
+ &url,
+ identity,
+ signer,
+ ) {
Ok(signed) => Ok((project.id, doc, signed)),
Err(err) => {
if let Err(e) = project.remove() {
@@ -116,7 +127,7 @@ pub fn init_at(
fn init_configure(
repo: &git::raw::Repository,
stored: &Repository,
- default_branch: &BranchName,
+ default_branch: Option<&BranchName>,
url: &git::Url,
identity: git::Oid,
signer: &impl crypto::Signer,
@@ -125,40 +136,49 @@ fn init_configure(
git::configure_repository(repo)?;
git::configure_remote(repo, &REMOTE_NAME, url, &url.clone().with_namespace(*pk))?;
- let branch = git::fmt::Qualified::from(git::fmt::lit::refs_heads(default_branch));
- {
- // Push branch to storage.
- let stored = dunce::canonicalize(stored.path())?.display().to_string();
+ // With no default branch there is nothing to push, no remote branch to
+ // track, and no canonical head to compute. The identity itself is still
+ // published, so the repository exists and can gain branches later.
+ if let Some(default_branch) = default_branch {
+ let branch = git::fmt::Qualified::from(git::fmt::lit::refs_heads(default_branch));
+
+ {
+ // Push branch to storage.
+ let stored = dunce::canonicalize(stored.path())?.display().to_string();
+
+ // Pushes to default branch to the namespace of the `signer`.
+ let pushspec = git::fmt::refspec::Refspec {
+ src: branch.clone(),
+ dst: branch.clone().with_namespace(git::fmt::Component::from(pk)),
+ force: false,
+ }
+ .to_string();
- // Pushes to default branch to the namespace of the `signer`.
- let pushspec = git::fmt::refspec::Refspec {
- src: branch.clone(),
- dst: branch.with_namespace(git::fmt::Component::from(pk)),
- force: false,
+ git::run(Some(repo.path()), ["push".to_string(), stored, pushspec])?;
}
- .to_string();
- git::run(Some(repo.path()), ["push".to_string(), stored, pushspec])?;
+ // N.b. we need to create the remote branch for the default branch
+ let rad_remote = git::fmt::Qualified::from(git::fmt::lit::refs_remotes(&*REMOTE_COMPONENT))
+ .join(default_branch);
+ let oid = repo.refname_to_id(branch.as_str())?;
+ repo.reference(
+ rad_remote.as_str(),
+ oid,
+ false,
+ &format!(
+ "radicle: remote branch {}/{}",
+ *REMOTE_COMPONENT, default_branch
+ ),
+ )?;
}
- // N.b. we need to create the remote branch for the default branch
- let rad_remote = git::fmt::Qualified::from(git::fmt::lit::refs_remotes(&*REMOTE_COMPONENT))
- .join(default_branch);
- let oid = repo.refname_to_id(branch.as_str())?;
- repo.reference(
- rad_remote.as_str(),
- oid,
- false,
- &format!(
- "radicle: remote branch {}/{}",
- *REMOTE_COMPONENT, default_branch
- ),
- )?;
stored.set_remote_identity_root_to(pk, identity)?;
stored.set_identity_head_to(identity)?;
stored.set_canonical_symbolic_refs("set-canonical from init (radicle)")?;
- stored.set_default_branch_to_canonical_head()?;
+ if default_branch.is_some() {
+ stored.set_default_branch_to_canonical_head()?;
+ }
let signed = stored.sign_refs(signer)?;
@@ -524,6 +544,7 @@ mod tests {
use pretty_assertions::assert_eq;
+ use crate::assert_matches;
use crate::crypto::{Signer as _, SigningKey};
use crate::identity::Did;
use crate::storage::git::Storage;
@@ -548,7 +569,7 @@ mod tests {
&repo,
"acme".try_into().unwrap(),
"Acme's repo",
- git::fmt::refname!("master"),
+ Some(git::fmt::refname!("master")),
Visibility::default(),
&signer,
&storage,
@@ -586,6 +607,48 @@ mod tests {
assert_eq!(doc.delegates().first(), &Did::from(public_key));
}
+ /// A repository may hold no branches. Initializing without a default
+ /// branch publishes the identity and nothing else: no canonical
+ /// references, no pushed branch, no canonical head.
+ #[test]
+ fn test_init_without_default_branch() {
+ let tempdir = tempfile::tempdir().unwrap();
+ let signer = SigningKey::mock(74);
+ let public_key = signer.public_key();
+ let storage = Storage::open(tempdir.path().join("storage"), fixtures::user()).unwrap();
+
+ transport::local::register(storage.clone());
+
+ let (repo, _) = fixtures::repository(tempdir.path().join("working"));
+ let (rid, doc, _) = init(
+ &repo,
+ "acme".try_into().unwrap(),
+ "Acme's repo",
+ None,
+ Visibility::default(),
+ &signer,
+ &storage,
+ )
+ .unwrap();
+
+ assert!(
+ doc.payload()
+ .get(identity::doc::PayloadId::canonical_refs())
+ .is_none()
+ );
+ assert_matches!(
+ doc.default_branch(),
+ Err(identity::doc::DefaultBranchError::MissingHead)
+ );
+ assert_eq!(doc.delegates().first(), &Did::from(public_key));
+
+ // The identity is readable from storage, and the repository has no
+ // canonical head to compute.
+ let stored = storage.get(rid).unwrap().unwrap();
+ assert_eq!(stored, doc);
+ assert!(storage.repository(rid).unwrap().canonical_head().is_err());
+ }
+
#[test]
fn fork() {
let mut rng = fastrand::Rng::new();
@@ -603,7 +666,7 @@ mod tests {
&original,
"acme".try_into().unwrap(),
"Acme's repo",
- git::fmt::refname!("master"),
+ Some(git::fmt::refname!("master")),
Visibility::default(),
&alice,
&storage,
@@ -639,7 +702,7 @@ mod tests {
&original,
"acme".try_into().unwrap(),
"Acme's repo",
- git::fmt::refname!("master"),
+ Some(git::fmt::refname!("master")),
Visibility::default(),
&signer,
&storage,
diff --git a/crates/radicle/src/storage/refs.rs b/crates/radicle/src/storage/refs.rs
index 6029f4aec5..f9eeeb0967 100644
--- a/crates/radicle/src/storage/refs.rs
+++ b/crates/radicle/src/storage/refs.rs
@@ -533,7 +533,7 @@ mod tests {
&paris_repo,
"paris".try_into().unwrap(),
"Paris repository",
- git::fmt::refname!("master"),
+ Some(git::fmt::refname!("master")),
Default::default(),
&alice,
storage,
@@ -546,7 +546,7 @@ mod tests {
&london_repo,
"london".try_into().unwrap(),
"London repository",
- git::fmt::refname!("master"),
+ Some(git::fmt::refname!("master")),
Default::default(),
&alice,
storage,
diff --git a/crates/radicle/src/test/arbitrary.rs b/crates/radicle/src/test/arbitrary.rs
index 9357cb814c..98f3bdbb72 100644
--- a/crates/radicle/src/test/arbitrary.rs
+++ b/crates/radicle/src/test/arbitrary.rs
@@ -174,7 +174,7 @@ pub fn raw_doc_at(version: Version) -> RawDoc {
version,
r#gen::<Project>(1),
vec![r#gen::<Did>(1)],
- &git::fmt::refname!("master"),
+ Some(&git::fmt::refname!("master")),
1,
Visibility::Public,
)
@@ -190,7 +190,7 @@ impl Arbitrary for RawDoc {
identity_version(g),
proj,
vec![delegate],
- &git::fmt::refname!("master"),
+ Some(&git::fmt::refname!("master")),
1,
visibility,
)
@@ -207,7 +207,7 @@ impl Arbitrary for Doc {
identity_version(g),
project,
delegates,
- &git::fmt::refname!("master"),
+ Some(&git::fmt::refname!("master")),
threshold,
visibility,
);
diff --git a/crates/radicle/src/test/fixtures.rs b/crates/radicle/src/test/fixtures.rs
index c2578c5f36..5ddf0f5c68 100644
--- a/crates/radicle/src/test/fixtures.rs
+++ b/crates/radicle/src/test/fixtures.rs
@@ -58,7 +58,7 @@ pub fn storage(
&repo,
name.try_into().unwrap(),
desc,
- git::fmt::refname!("master"),
+ Some(git::fmt::refname!("master")),
Visibility::default(),
signer,
&storage,
@@ -81,7 +81,7 @@ pub fn project(
&working,
"acme".try_into().unwrap(),
"Acme's repository",
- git::fmt::refname!("master"),
+ Some(git::fmt::refname!("master")),
Visibility::default(),
signer,
storage,
commit 9e7e3a6631ee8d8b35f3ab34f128b5e59721106b
Author: Daniel Norman <daniel@norman.life>
Date: Tue Sep 1 11:54:38 2026 +0200
radicle/identity: report a threshold with no branch to set it on
- Make `set_threshold` fallible and return `NoDefaultBranch` when the
document names none, through `RawDoc`, `update::threshold` and `rad id`.
Version 2 keeps the write quorum in the crefs rule governing `HEAD`. With no
`HEAD` there is no rule, and `rad id --threshold` was a no-op but still reported success.
diff --git a/crates/radicle-cli/src/commands/id.rs b/crates/radicle-cli/src/commands/id.rs
index 64b8c45259..5f01df37b7 100644
--- a/crates/radicle-cli/src/commands/id.rs
+++ b/crates/radicle-cli/src/commands/id.rs
@@ -121,7 +121,7 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
let disallow = disallow.into_iter().collect::<BTreeSet<_>>();
let proposal = match threshold {
- Some(threshold) => update::threshold(proposal, threshold),
+ Some(threshold) => update::threshold(proposal, threshold)?,
None => proposal,
};
diff --git a/crates/radicle/src/identity/doc/raw.rs b/crates/radicle/src/identity/doc/raw.rs
index fa24060982..192efc7329 100644
--- a/crates/radicle/src/identity/doc/raw.rs
+++ b/crates/radicle/src/identity/doc/raw.rs
@@ -206,9 +206,18 @@ impl RawDoc {
/// Where the threshold is stored depends on the version: version 1 has a
/// top-level field, while version 2 keeps it in the `xyz.radicle.crefs`
/// rule governing `HEAD`.
- pub fn set_threshold(&mut self, threshold: usize) {
+ ///
+ /// # Errors
+ ///
+ /// A version-2 document that names no default branch has no rule to hold
+ /// the quorum. Version 1 always has the top-level field, so it cannot
+ /// fail.
+ pub fn set_threshold(&mut self, threshold: usize) -> Result<(), v2::NoDefaultBranch> {
match self {
- Self::V1(doc) => doc.threshold = threshold,
+ Self::V1(doc) => {
+ doc.threshold = threshold;
+ Ok(())
+ }
Self::V2(doc) => doc.set_threshold(threshold),
}
}
diff --git a/crates/radicle/src/identity/doc/update.rs b/crates/radicle/src/identity/doc/update.rs
index dc16c0474f..882acc2cc4 100644
--- a/crates/radicle/src/identity/doc/update.rs
+++ b/crates/radicle/src/identity/doc/update.rs
@@ -58,9 +58,14 @@ pub fn visibility(mut raw: RawDoc, edit: EditVisibility) -> RawDoc {
///
/// Where the threshold is stored depends on the document version, which
/// [`RawDoc::set_threshold`] takes care of.
-pub fn threshold(mut raw: RawDoc, threshold: usize) -> RawDoc {
- raw.set_threshold(threshold);
- raw
+///
+/// # Errors
+///
+/// This fails when the document names no default branch, since the quorum
+/// lives in the canonical reference rule that governs it.
+pub fn threshold(mut raw: RawDoc, threshold: usize) -> Result<RawDoc, super::v2::NoDefaultBranch> {
+ raw.set_threshold(threshold)?;
+ Ok(raw)
}
/// Change the `allow` set of a document if the visibility is set to
@@ -400,7 +405,7 @@ mod test {
}],
)
.unwrap();
- let raw = super::threshold(raw, 3);
+ let raw = super::threshold(raw, 3).unwrap();
let crefs = raw.raw_canonical_refs().unwrap().unwrap();
let threshold_of = |pattern: &str| {
@@ -422,12 +427,28 @@ mod test {
);
}
+ /// A document with no default branch has no rule to hold a write quorum.
+ /// Setting a threshold must say so, rather than silently doing nothing.
+ #[test]
+ fn test_threshold_without_default_branch_is_rejected() {
+ let raw: crate::prelude::RawDoc = serde_json::from_value(json!({
+ "version": 2,
+ "payload": {},
+ "delegates": [
+ "did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM"
+ ]
+ }))
+ .unwrap();
+
+ assert!(super::threshold(raw, 1).is_err());
+ }
+
#[test]
fn threshold_writes_version_1_field() {
// A version-1 document keeps its quorum in the top-level `threshold`,
// so an ordinary edit must write there and leave the version alone.
let raw = arbitrary::raw_doc_at(Version::new(1).unwrap());
- let raw = super::threshold(raw, 1);
+ let raw = super::threshold(raw, 1).unwrap();
let doc = super::verify(raw).unwrap();
assert_eq!(doc.version(), Version::new(1).unwrap());
diff --git a/crates/radicle/src/identity/doc/v2.rs b/crates/radicle/src/identity/doc/v2.rs
index 6662d627c9..347053ecf2 100644
--- a/crates/radicle/src/identity/doc/v2.rs
+++ b/crates/radicle/src/identity/doc/v2.rs
@@ -72,9 +72,14 @@ impl Doc {
///
/// The threshold lives in the `xyz.radicle.crefs` rule that matches the
/// target of the `HEAD` symbolic reference. This rewrites that rule's
- /// threshold, preserving its `allow` value. If no such rule is present, the
- /// document is left unchanged.
- pub fn set_threshold(&mut self, threshold: usize) {
+ /// threshold, preserving its `allow` value.
+ ///
+ /// # Errors
+ ///
+ /// A document that names no default branch has no rule to hold a quorum,
+ /// so there is nothing to set. Saying so beats writing the threshold
+ /// nowhere and reporting success.
+ pub fn set_threshold(&mut self, threshold: usize) -> Result<(), NoDefaultBranch> {
let mut crefs = self
.raw_canonical_refs()
.and_then(|crefs| crefs.ok())
@@ -83,39 +88,51 @@ impl Doc {
// `RawSymbolicRefs` cannot resolve a `HEAD` chain, so validate them
// first.
let symbolic = SymbolicRefs::try_from(crefs.symbolic().clone()).ok();
- if let Some(head) = symbolic.as_ref().and_then(|symbolic| symbolic.resolve_head()) {
- // Target the *most specific* rule matching `HEAD`, consistent with
- // the enforcement paths (`Doc::canonical_refs`, patch merge,
- // fetch). Because `RawRules` is keyed by plain byte order,
- // `RawRules::matches().next()` could rewrite a broad glob (e.g.
- // `refs/heads/*`) instead of the exact branch rule that actually
- // governs the quorum. Resolving through validated `Rules` restores
- // specificity ordering.
- let pattern = Delegates::new(self.delegates.clone())
- .ok()
- .and_then(|delegates| {
- Rules::from_raw(crefs.raw_rules().clone(), &mut || delegates.clone()).ok()
- })
- .and_then(|rules| rules.matches(head).next().map(|(p, _)| p.clone()));
-
- if let Some(pattern) = pattern
- && let Some(allow) = crefs
- .raw_rules()
- .rules
- .get(&pattern)
- .map(|rule| rule.allowed().clone())
- {
- crefs
- .raw_rules_mut()
- .insert(pattern, rules::Rule::new(allow, threshold));
- }
+ let head = symbolic
+ .as_ref()
+ .and_then(|symbolic| symbolic.resolve_head())
+ .ok_or(NoDefaultBranch)?;
+
+ // Target the *most specific* rule matching `HEAD`, consistent with the
+ // enforcement paths (`Doc::canonical_refs`, patch merge, fetch). Raw
+ // rules cannot be matched against, and validated `Rules` order their
+ // matches by specificity, so a broad glob (e.g. `refs/heads/*`) cannot
+ // shadow the exact branch rule that governs the quorum.
+ let pattern = Delegates::new(self.delegates.clone())
+ .ok()
+ .and_then(|delegates| {
+ Rules::from_raw(crefs.raw_rules().clone(), &mut || delegates.clone()).ok()
+ })
+ .and_then(|rules| rules.matches(head).next().map(|(p, _)| p.clone()));
+
+ if let Some(pattern) = pattern
+ && let Some(allow) = crefs
+ .raw_rules()
+ .rules
+ .get(&pattern)
+ .map(|rule| rule.allowed().clone())
+ {
+ crefs
+ .raw_rules_mut()
+ .insert(pattern, rules::Rule::new(allow, threshold));
}
+
let value = json::to_value(crefs).expect("v2::Doc::set_threshold: crefs are serializable");
self.payload
.insert(PayloadId::canonical_refs().clone(), Payload::from(value));
+
+ Ok(())
}
}
+/// The document names no default branch, so it has no write quorum to set.
+#[derive(Debug, thiserror::Error)]
+#[error(
+ "the identity document names no default branch, so it has no write quorum; \
+ the threshold lives in the `xyz.radicle.crefs` rule governing `HEAD`"
+)]
+pub struct NoDefaultBranch;
+
/// The `xyz.radicle.project` payload of a version-2 document defines
/// `defaultBranch`, which version 2 does not allow.
#[derive(Debug, thiserror::Error)]
commit 554d63ee191f521038fffdaa556e9515cc6f532f
Author: Daniel Norman <daniel@norman.life>
Date: Tue Sep 1 11:44:35 2026 +0200
fetch: fall back to delegate majority with no branch
- Read the special-refs voters and threshold through
`Doc::special_refs_quorum`, which uses the default branch rule where there
is one and the delegates' majority where there is not.
A repository with no default branch has no rule to derive the quorum from,
so the fetch aborted. The precondition is about which peers' `rad/sigrefs`
must be present, which does not need a branch to be meaningful.
diff --git a/crates/radicle-fetch/src/state.rs b/crates/radicle-fetch/src/state.rs
index d7b60ef7fb..366edf0651 100644
--- a/crates/radicle-fetch/src/state.rs
+++ b/crates/radicle-fetch/src/state.rs
@@ -419,30 +419,26 @@ impl FetchState {
.canonical()?
.ok_or(error::Protocol::MissingRadId)?;
- // The canonical default branch — and the quorum required to establish
- // it — is defined by the crefs rule that matches it. Fail closed: if the
- // anchor's canonical references or default branch cannot be resolved, or
- // no rule matches, abort the fetch rather than silently proceeding with
- // a quorum of 1 (which would let a single delegate — or a seed serving a
- // malformed 'refs/rad/id' — downgrade the required quorum).
- let crefs = anchor.canonical_refs().map_err(DefaultBranchError::from)?;
- let branch = anchor.default_branch()?;
- let (_, branch_rule) = crefs
- .rules()
- .matches(&branch)
- .next()
+ // The peers who vote on the special references, and how many of them
+ // must answer. Where the anchor names a default branch, both come from
+ // the crefs rule that governs it, so that the threshold and the counted
+ // population agree; where it names none, the delegates and their
+ // majority govern. Fail closed: an unresolvable set of canonical
+ // references, or a declared default branch that no rule governs, aborts
+ // the fetch rather than silently proceeding with a quorum of 1 (which
+ // would let a single delegate — or a seed serving a malformed
+ // 'refs/rad/id' — downgrade the required quorum).
+ let (allowed, branch_threshold) = anchor
+ .special_refs_quorum()
+ .map_err(DefaultBranchError::from)?
.ok_or(error::Protocol::MissingBranchRule)?;
- let branch_threshold = usize::from(*branch_rule.threshold());
- // The peers who vote on the canonical branch are the matched rule's
- // `allowed` set — not the identity delegates — so that the threshold and
- // the counted population come from the same rule. For the common
- // `allow: delegates` rule this set is exactly the identity delegates; for
- // an explicit `allow` set it may include non-delegates.
+ // For the common `allow: delegates` rule the voter set is exactly the
+ // identity delegates; for an explicit `allow` set it may include
+ // non-delegates.
// TODO: not sure we should allow to block *any* peer from the voter set.
// We could end up ignoring voters.
- let voters = branch_rule
- .allowed()
+ let voters = allowed
.iter()
.filter(|id| !handle.is_blocked(id))
.map(|did| PublicKey::from(*did))
@@ -451,12 +447,11 @@ impl FetchState {
log::trace!("Canonical branch voters {voters:?}");
// The local peer does not need to count towards the quorum since they
- // must be valid already. Membership is checked against the rule's full
+ // must be valid already. Membership is checked against the full
// `allowed` set, not the `voters` set above: `voters` has the local peer
// (which is always "blocked" from itself) and any blocked peers filtered
// out, so it must not be used to decide whether the local peer votes.
- let is_voter = branch_rule
- .allowed()
+ let is_voter = allowed
.iter()
.any(|did| PublicKey::from(*did) == *handle.local());
let threshold = if is_voter {
commit d816bdde643c44f528693d8336ffb060a31c8b59
Author: Daniel Norman <daniel@norman.life>
Date: Tue Sep 1 11:44:35 2026 +0200
radicle/identity: make canonical refs optional
- Treat an absent `xyz.radicle.crefs` payload as an empty set instead of an
error, so a repository may have no canonical references.
- Validate rather than require crefs in `RawDoc::verified`: a payload that is
present must resolve, but none need be present.
- Migrate a version-1 document with no default branch instead of failing. Its
top-level `threshold` has nowhere to go and governed nothing that survives:
identity revisions are adopted by `Doc::majority`.
- Add `Doc::special_refs_quorum`, which reads the voters and threshold from
the rule governing the default branch, and falls back to the delegates and
their majority when there is none.
- Fall back the same way in `update::verify_delegates`, and read the branch
from the proposal rather than the repository, since that is the document
the delegates must serve once it is adopted.
Identity 2 made a resolvable `HEAD` a validity condition of every document.
That is stricter than upstream, where validity never depended on a default
branch, and it blocks repositories that hold no branches at all.
diff --git a/crates/radicle/src/identity/doc.rs b/crates/radicle/src/identity/doc.rs
index 95058510ae..39bd464a84 100644
--- a/crates/radicle/src/identity/doc.rs
+++ b/crates/radicle/src/identity/doc.rs
@@ -75,6 +75,8 @@ pub enum DocError {
Missing,
#[error("invalid default branch: {0}")]
DefaultBranch(#[from] DefaultBranchError),
+ #[error("invalid canonical references: {0}")]
+ CanonicalRefs(#[from] CanonicalRefsError),
}
#[derive(Debug, Error)]
@@ -495,6 +497,11 @@ impl Delegates {
self.0.iter()
}
+ /// The number of delegates that makes a majority of this set.
+ pub fn majority(&self) -> usize {
+ self.0.len() / 2 + 1
+ }
+
/// Check if the set contains the given `did`.
pub fn contains(&self, did: &Did) -> bool {
self.0.contains(did)
@@ -764,20 +771,52 @@ impl Doc {
///
/// The canonical references, including the default branch and its `HEAD`
/// symbolic reference, are governed entirely by the `xyz.radicle.crefs`
- /// payload. The payload must be present and must pass
+ /// payload.
+ ///
+ /// The payload is optional: a repository with no canonical references —
+ /// and therefore no default branch — has none. An absent payload yields
+ /// the empty set. A payload that is present must pass
/// [`RawCanonicalRefs::try_into_canonical_refs`] validation.
///
/// [`RawCanonicalRefs`]: super::crefs::RawCanonicalRefs
pub fn canonical_refs(&self) -> Result<CanonicalRefs, CanonicalRefsError> {
let raw_crefs = self
.raw_canonical_refs()
- .ok_or(CanonicalRefsError::Missing)?
- .map_err(CanonicalRefsError::Payload)?;
+ .transpose()
+ .map_err(CanonicalRefsError::Payload)?
+ .unwrap_or_default();
let resolve = &mut || self.delegates.clone();
Ok(raw_crefs.try_into_canonical_refs(resolve)?)
}
+ /// The peers who vote on this repository's special references, and how
+ /// many of their `rad/sigrefs` a fetch requires to be present.
+ ///
+ /// When the document names a default branch, both come from the crefs
+ /// rule that governs it, so that the threshold and the population it is
+ /// counted over agree. A repository with no default branch has no such
+ /// rule: the delegates and [`Doc::majority`] govern instead, which is
+ /// already the quorum for adopting an identity revision.
+ ///
+ /// Returns `None` when a `HEAD` is declared but no rule governs its
+ /// target, so that callers fail closed rather than assume a quorum. A
+ /// verified document cannot be in that state — [`RawDoc::verified`]
+ /// rejects a dangling `HEAD` — so this is a guard, not a path.
+ pub fn special_refs_quorum(&self) -> Result<Option<(Delegates, usize)>, CanonicalRefsError> {
+ let crefs = self.canonical_refs()?;
+ let Some(head) = crefs.symbolic().resolve_head() else {
+ return Ok(Some((self.delegates.clone(), self.majority())));
+ };
+
+ Ok(crefs.rules().matches(head).next().map(|(_, rule)| {
+ (
+ rule.allowed().deref().clone(),
+ usize::from(*rule.threshold()),
+ )
+ }))
+ }
+
/// Return the associated [`Visibility`] of this document.
pub fn visibility(&self) -> &Visibility {
&self.view.visibility
@@ -839,7 +878,7 @@ impl Doc {
/// Return the majority number based on the size of the delegates set.
pub fn majority(&self) -> usize {
- self.delegates.len() / 2 + 1
+ self.delegates.majority()
}
/// Helper for getting an `embeds` Git blob.
@@ -926,9 +965,6 @@ pub enum CanonicalRefsError {
#[error(transparent)]
CanonicalRefs(#[from] crefs::ValidationError),
-
- #[error("identity document is missing the `xyz.radicle.crefs` payload")]
- Missing,
}
#[cfg(test)]
@@ -1010,13 +1046,14 @@ mod test {
2,
Visibility::Public,
);
- assert_matches!(doc.verified(), Err(DocError::DefaultBranch(_)));
+ assert_matches!(doc.verified(), Err(DocError::CanonicalRefs(_)));
}
#[test]
- fn verified_rejects_missing_crefs() {
- // Without the `xyz.radicle.crefs` payload there is no default branch or
- // write quorum, so the document must not verify.
+ fn verified_accepts_missing_crefs() {
+ // Without the `xyz.radicle.crefs` payload there is no default branch,
+ // which is allowed: the payload governs canonical references, and a
+ // repository may have none. See `branch_free_document_is_valid`.
let mut doc = RawDoc::new(
r#gen::<Project>(1),
vec![r#gen::<Did>(1)],
@@ -1025,7 +1062,8 @@ mod test {
Visibility::Public,
);
doc.payload_mut().remove(PayloadId::canonical_refs());
- assert_matches!(doc.verified(), Err(DocError::DefaultBranch(_)));
+ let doc = doc.verified().unwrap();
+ assert_matches!(doc.default_branch(), Err(DefaultBranchError::MissingHead));
}
/// A version-1 document as a released client wrote it.
@@ -1604,8 +1642,62 @@ mod test {
let migrated = doc.migrated().unwrap();
assert_eq!(migrated.version(), IDENTITY_VERSION);
assert!(
- migrated.payload().get(PayloadId::canonical_refs()).is_none(),
+ migrated
+ .payload()
+ .get(PayloadId::canonical_refs())
+ .is_none(),
"no default branch to govern, so no crefs payload is synthesized"
);
}
+
+ /// With a default branch, the voters and the number of them required
+ /// come from the rule that governs it.
+ #[test]
+ fn special_refs_quorum_comes_from_the_branch_rule() {
+ let value = json!({
+ "version": 2,
+ "payload": {
+ "xyz.radicle.crefs": {
+ "symbolic": { "HEAD": "refs/heads/main" },
+ "rules": {
+ "refs/heads/main": { "allow": "delegates", "threshold": 2 }
+ }
+ }
+ },
+ "delegates": [
+ "did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
+ "did:key:z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT",
+ "did:key:z6MkuPZWtx7g5rDgz9tpVKTiHVCrAqbtGwZuLb6a6z7ULHwv"
+ ]
+ });
+
+ let doc = serde_json::from_value::<Doc>(value).unwrap();
+ let (allowed, threshold) = doc.special_refs_quorum().unwrap().unwrap();
+
+ assert_eq!(threshold, 2);
+ assert_eq!(&allowed, doc.delegates());
+ }
+
+ /// Without a default branch there is no rule, so the delegates and
+ /// `Doc::majority` govern — the same quorum that adopts an identity
+ /// revision.
+ #[test]
+ fn special_refs_quorum_falls_back_to_majority() {
+ let value = json!({
+ "version": 2,
+ "payload": {},
+ "delegates": [
+ "did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
+ "did:key:z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT",
+ "did:key:z6MkuPZWtx7g5rDgz9tpVKTiHVCrAqbtGwZuLb6a6z7ULHwv"
+ ]
+ });
+
+ let doc = serde_json::from_value::<Doc>(value).unwrap();
+ let (allowed, threshold) = doc.special_refs_quorum().unwrap().unwrap();
+
+ assert_eq!(threshold, doc.majority());
+ assert_eq!(threshold, 2);
+ assert_eq!(&allowed, doc.delegates());
+ }
}
diff --git a/crates/radicle/src/identity/doc/migrate.rs b/crates/radicle/src/identity/doc/migrate.rs
index bcb6e73f33..0dfc34f20d 100644
--- a/crates/radicle/src/identity/doc/migrate.rs
+++ b/crates/radicle/src/identity/doc/migrate.rs
@@ -40,11 +40,6 @@ pub enum Error {
#[error(transparent)]
Delegates(#[from] DelegatesError),
-
- #[error(
- "no default branch to migrate: the `xyz.radicle.project` payload defines no `defaultBranch` and the `xyz.radicle.crefs` payload defines no `HEAD` symbolic reference"
- )]
- MissingDefaultBranch,
}
/// The version-1 rule governing the default branch disagrees with the rest of
@@ -83,6 +78,11 @@ impl Migrate for v1::Doc {
/// document's `threshold`. That invariant is checked here rather than
/// papered over, so a document that never was valid does not become valid
/// by migrating.
+ ///
+ /// A document with neither a `defaultBranch` nor a crefs `HEAD` names no
+ /// default branch. It migrates to a version-2 document with no crefs
+ /// payload, rather than failing: a repository is allowed to have no
+ /// canonical references.
fn migrate(mut self) -> Result<Self::Next, Self::Error> {
let threshold = self.threshold;
let default_branch = self.default_branch();
@@ -125,7 +125,11 @@ impl Migrate for v1::Doc {
synthesize_head(&mut crefs, &valid, &branch, threshold);
true
}
- (None, None) => return Err(Error::MissingDefaultBranch),
+ // No default branch to migrate. The top-level `threshold` has
+ // nowhere to go, which costs nothing it governed: identity
+ // revisions are adopted by `Doc::majority`, and there is no
+ // branch rule to carry a quorum into.
+ (None, None) => false,
};
// The crefs payload is the sole authority from here on.
diff --git a/crates/radicle/src/identity/doc/raw.rs b/crates/radicle/src/identity/doc/raw.rs
index ebf5a84820..fa24060982 100644
--- a/crates/radicle/src/identity/doc/raw.rs
+++ b/crates/radicle/src/identity/doc/raw.rs
@@ -265,8 +265,9 @@ impl RawDoc {
/// top-level `threshold` and the crefs payload together.
/// - The migrated document satisfies the version-2 invariants: the
/// `xyz.radicle.project` payload defines no `defaultBranch`, and the
- /// `xyz.radicle.crefs` payload is present, valid, and defines a
- /// resolvable default branch whose rule has a well-formed write quorum
+ /// `xyz.radicle.crefs` payload — which is optional — is valid where
+ /// present, meaning every symbolic reference resolves to a ruled
+ /// target and every rule has a well-formed write quorum
/// (`1 <= threshold <= |allowed|`).
///
/// [`MAX_DELEGATES`]: super::MAX_DELEGATES
@@ -283,9 +284,13 @@ impl RawDoc {
};
// Validate here so that *every* verified `Doc` — including those adopted
// over the network via `Doc::from_blob` and those obtained by
- // deserializing — carries an enforceable quorum, rather than deferring
- // the check to the CLI-only `update::verify`.
- doc.default_branch()?;
+ // deserializing — carries enforceable canonical references, rather
+ // than deferring the check to the CLI-only `update::verify`.
+ //
+ // N.b. this validates the payload, it does not require one. A
+ // repository may have no canonical references, and so no default
+ // branch; what it may not have is a broken set of them.
+ doc.canonical_refs()?;
Ok(doc)
}
diff --git a/crates/radicle/src/identity/doc/update.rs b/crates/radicle/src/identity/doc/update.rs
index b47ef6a792..dc16c0474f 100644
--- a/crates/radicle/src/identity/doc/update.rs
+++ b/crates/radicle/src/identity/doc/update.rs
@@ -6,7 +6,7 @@ use serde_json as json;
use crate::{
prelude::Did,
- storage::{self, ReadRepository, RepositoryError, refs},
+ storage::{self, RepositoryError, refs},
};
use super::{Doc, GetPayload as _, PayloadError, PayloadId, RawDoc, Visibility};
@@ -216,8 +216,9 @@ pub fn verify(raw: RawDoc) -> Result<Doc, error::DocVerification> {
}
// Verify that the canonical references payload is valid. The default branch
- // and its `HEAD` symbolic reference are now governed entirely by the
- // `xyz.radicle.crefs` payload, which must be present and resolvable.
+ // and its `HEAD` symbolic reference are governed entirely by the
+ // `xyz.radicle.crefs` payload. The payload is optional — a repository may
+ // have no canonical references — but one that is present must resolve.
if let Err(e) = proposal.canonical_refs() {
return Err(error::DocVerification::PayloadError {
id: PayloadId::canonical_refs().clone(),
@@ -231,34 +232,56 @@ fn verify_delegates(
proposal: &RawDoc,
repo: &storage::git::Repository,
) -> Result<Option<Vec<error::DelegateVerification>>, RepositoryError> {
+ use std::ops::Deref as _;
+
use super::{CanonicalRefsError, Delegates, DocError, GetPayload as _};
- let (canonical, _) = repo.canonical_head()?;
- // The quorum for the canonical default branch is defined by the canonical
- // reference rule that matches it. Resolve the *validated* rule so that (a)
- // the most specific matching rule is chosen (the raw rules are only byte
- // ordered), and (b) both the required threshold and the population of
- // voters counted below come from that same rule. Fail closed: an unreadable
- // or invalid crefs payload, or a branch with no matching rule, is a
- // verification error, not an assumed quorum of 1.
let delegates = Delegates::new(proposal.delegates().iter().copied()).map_err(DocError::from)?;
// Read the rules from the *migrated* document, so that a document stored at
- // an older version is governed by the same rules its readers see.
+ // an older version is governed by the same rules its readers see. The crefs
+ // payload is optional, so an absent one yields no rules rather than an
+ // error; one that is present must still be valid.
let crefs = proposal
.view()
.map_err(DocError::from)?
.raw_canonical_refs()
- .ok_or(CanonicalRefsError::Missing)?
+ .transpose()
.map_err(CanonicalRefsError::Payload)?
+ .unwrap_or_default()
.try_into_canonical_refs(&mut || delegates.clone())
.map_err(CanonicalRefsError::from)?;
- let (_, rule) = crefs
- .rules()
- .matches(&canonical)
- .next()
- .ok_or(RepositoryError::MissingBranchRule)?;
- let allowed = rule.allowed();
- let threshold = usize::from(*rule.threshold());
+
+ // The quorum for the default branch is defined by the canonical reference
+ // rule that matches it. Resolve the *validated* rule so that (a) the most
+ // specific matching rule is chosen (the raw rules are only byte ordered),
+ // and (b) both the required threshold and the population of voters counted
+ // below come from that same rule. Fail closed: a branch with no matching
+ // rule is a verification error, not an assumed quorum of 1.
+ //
+ // N.b. the branch is read from the *proposal*, since that is the document
+ // the delegates must be able to serve once the change is adopted.
+ //
+ // A proposal that names no default branch has no such rule. The delegates
+ // and their majority govern instead, and there is no branch that a
+ // delegate could be missing.
+ let branch = crefs.symbolic().resolve_head();
+ let (allowed, threshold) = match &branch {
+ Some(branch) => {
+ let (_, rule) = crefs
+ .rules()
+ .matches(branch)
+ .next()
+ .ok_or(RepositoryError::MissingBranchRule)?;
+ (
+ rule.allowed().deref().clone(),
+ usize::from(*rule.threshold()),
+ )
+ }
+ None => {
+ let majority = delegates.majority();
+ (delegates, majority)
+ }
+ };
// Count the votes over the rule's `allowed` set, which may differ from the
// identity delegates when the default branch is governed by an explicit set.
@@ -271,9 +294,11 @@ fn verify_delegates(
missing.push(error::DelegateVerification::MissingDelegate { did: *did });
}
Some(sigrefs) => {
- if sigrefs.get(&canonical).is_none() {
+ if let Some(branch) = &branch
+ && sigrefs.get(branch).is_none()
+ {
missing.push(error::DelegateVerification::MissingDefaultBranch {
- branch: canonical.to_ref_string(),
+ branch: branch.to_ref_string(),
did: *did,
});
}
commit 156c003dc29f0400092310e78a94ac9e4ac933f6
Author: Daniel Norman <daniel@norman.life>
Date: Tue Sep 1 11:52:00 2026 +0200
radicle/identity: failing tests for branch-free docs
- Assert a version-2 document with no `xyz.radicle.crefs` payload, and one
with no payloads at all, are valid and simply cannot name a default branch.
- Assert a version-1 document with neither `defaultBranch` nor a crefs
`HEAD` stays readable and migrates.
- Guard the relaxation: a `HEAD` that no rule governs stays invalid.
Identity 2 made a resolvable `HEAD` a validity condition of every document,
which is stricter than upstream, where validity never depended on a default
branch. These tests pin the intended behaviour before the fix.
diff --git a/crates/radicle/src/identity/doc.rs b/crates/radicle/src/identity/doc.rs
index b9b3f2e04e..95058510ae 100644
--- a/crates/radicle/src/identity/doc.rs
+++ b/crates/radicle/src/identity/doc.rs
@@ -1511,4 +1511,101 @@ mod test {
assert_eq!(pattern.to_string(), "refs/heads/main");
assert_eq!(usize::from(*rule.threshold()), 1);
}
+
+ /// A repository need not have a default branch. A version-2 document
+ /// without a `xyz.radicle.crefs` payload is valid; it simply cannot name
+ /// one.
+ #[test]
+ fn branch_free_document_is_valid() {
+ let value = json!({
+ "version": 2,
+ "payload": {
+ "xyz.radicle.project": {
+ "name": "acme",
+ "description": "a repository with no default branch",
+ }
+ },
+ "delegates": [
+ "did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM"
+ ]
+ });
+
+ let doc = serde_json::from_value::<Doc>(value).unwrap();
+
+ assert_matches!(doc.default_branch(), Err(DefaultBranchError::MissingHead));
+ let crefs = doc
+ .canonical_refs()
+ .expect("absent crefs payload yields empty canonical references");
+ assert!(crefs.symbolic().is_empty());
+ assert!(crefs.rules().is_empty());
+ }
+
+ /// A document need not carry any payload at all to be valid.
+ #[test]
+ fn payload_free_document_is_valid() {
+ let value = json!({
+ "version": 2,
+ "payload": {},
+ "delegates": [
+ "did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM"
+ ]
+ });
+
+ let doc = serde_json::from_value::<Doc>(value).unwrap();
+
+ assert!(doc.project().is_none());
+ assert_matches!(doc.default_branch(), Err(DefaultBranchError::MissingHead));
+ }
+
+ /// Relaxing the default branch requirement must not relax the crefs
+ /// payload itself: a `HEAD` that no rule governs is still a broken
+ /// document, since its canonical head could not be established.
+ #[test]
+ fn dangling_head_is_still_invalid() {
+ let value = json!({
+ "version": 2,
+ "payload": {
+ "xyz.radicle.crefs": {
+ "symbolic": { "HEAD": "refs/heads/main" },
+ "rules": {}
+ }
+ },
+ "delegates": [
+ "did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM"
+ ]
+ });
+
+ assert!(serde_json::from_value::<Doc>(value).is_err());
+ }
+
+ /// A version-1 document with neither `defaultBranch` nor a crefs `HEAD`
+ /// must stay readable, and must migrate. Its top-level `threshold` has
+ /// nowhere to go, which costs nothing: it never governed identity
+ /// adoption, and there is no branch rule to carry it into.
+ #[test]
+ fn branch_free_v1_document_migrates() {
+ let value = json!({
+ "payload": {
+ "xyz.radicle.project": {
+ "name": "acme",
+ "description": "a repository with no default branch",
+ }
+ },
+ "delegates": [
+ "did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM"
+ ],
+ "threshold": 1
+ });
+
+ let doc = serde_json::from_value::<Doc>(value).unwrap();
+ assert_eq!(doc.version(), Version::new(1).unwrap());
+ assert_matches!(doc.default_branch(), Err(DefaultBranchError::MissingHead));
+
+ let migrated = doc.migrated().unwrap();
+ assert_eq!(migrated.version(), IDENTITY_VERSION);
+ assert!(
+ migrated.payload().get(PayloadId::canonical_refs()).is_none(),
+ "no default branch to govern, so no crefs payload is synthesized"
+ );
+ }
}
commit 08bfc8d4ce67b7936f966b8df45ba12839961e57
Author: Daniel Norman <daniel@norman.life>
Date: Thu Aug 13 17:58:24 2026 +0200
radicle: identity 2 and default branch with crefs
The default branch was the one canonical reference the
`xyz.radicle.crefs` payload was not allowed to govern. Its name lived in
the `defaultBranch` field of the `xyz.radicle.project` payload and its
quorum in the identity document's top-level `threshold`, from which the
rule and the `HEAD` symbolic reference were synthesized as
`Allowed::Delegates` at that threshold. A document that stated either
itself was rejected: `update::verify` refused a crefs payload defining
`HEAD`, or any rule matching `defaultBranch`. So the default branch alone
could not be governed by a narrower set, unlike every other canonical
branch.
Counting votes followed the document, not the rule. A fetch used the
document `threshold` as the number of delegates it must validate before
it applies any update, so the rule governing the branch it established
never set its own quorum.
Make the `xyz.radicle.crefs` payload the sole authority over the
canonical head. The rule whose pattern matches the `HEAD` symbolic
reference now defines the default branch, its `allow` set and its
threshold:
- Remove `defaultBranch` and the top-level `threshold`, and synthesize
the default-branch rule and its `HEAD` symbolic reference on document
creation.
- Take the fetch quorum from the rule matching the canonical head: the
special-refs anchor counts votes from the rule's `allow` set against
the rule's threshold, so the counted peers and the number required come
from one place.
- Fail closed in verification and in fetch when no rule matches, because
an unresolvable canonical head leaves the repository unloadable.
Identity revisions stay on a simple delegate majority.
- Route callers through the identity document, adding
`ReadRepository::default_branch_name` and threading the branch from
`rad::init` to `Doc::initial`.
- Give `rad id` an in-place threshold update that preserves the rule's
`allow` set.
Bump `IDENTITY_VERSION` to 2, and keep version 1 documents readable so
existing repositories survive the upgrade:
- Make `RawDoc` an enum over the version 1 and version 2 stored schemas,
each with its own serialization, so a version 1 document re-encodes
byte-for-byte as released clients wrote it. The repository id and every
signature over the document are therefore unchanged.
- Hold both forms in `Doc`: the stored form decides identity, signing and
serialization; the migrated view is what every reader consumes. This
keeps version conditionals out of reader code.
- Derive the view with one `Migrate` implementation, which also produces
the document `rad id migrate` proposes, so the implicit and the
explicit migration cannot drift apart.
- Enforce the invariants per version: version 1 requires `threshold`,
and its migration checks that a crefs payload it already carries agrees
with `defaultBranch` and that threshold. Version 2 rejects a top-level
`threshold` when deserializing, and a `defaultBranch` when validating,
which `Project` would otherwise swallow as an unknown field.
- Keep an ordinary edit on the stored version, so only an explicit
migration changes it.
Add `rad id migrate`, which proposes the migrated document as a revision
the delegates vote on, and `rad init --identity-version` for a repository
that must stay readable to older releases. Adopting the migration is
opt-in per repository, because it is a one-way door: version 2 is
unreadable to releases 1.10.0 and earlier.
Sign the stored blob in `Revision::sign` rather than a re-encoding of the
in-memory document. Verification already checks the signature against the
stored blob, so any disagreement between the two silently broke votes.
Box the success side of `FetchResult::Initiator`. It carries a `DocAt`,
which grows with the stored-plus-view `Doc` from 168 to 264 bytes, so
`clippy` flags the size difference between the variants.
Update the tests, CLI examples and fixtures: repository and derived
collaborative-object ids change with the new identity root, dumps carry
the `xyz.radicle.crefs` payload and `"version": 2`, and the cases that
raised a document-level threshold are dropped since that knob moved into
the crefs payload.
Co-authored-by: Yorgos Saslis <yorgos.work@proton.me>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 675a94bcab..80fee11ded 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased
+### Repository Identity: Canonical Default Branch and Document Version 2
+
+The default branch and the quorum required to write it are now governed by the
+canonical-reference rule in the `xyz.radicle.crefs` payload whose pattern
+matches the `HEAD` symbolic reference. The `defaultBranch` field of the
+`xyz.radicle.project` payload and the top-level `threshold` have been removed,
+and the default branch is no longer synthesized from `defaultBranch`. This
+allows non-delegates to hold canonical write access to a branch while delegates
+continue to govern identity updates.
+
+Because this changes the identity document format, the document version is now
+`2`. Newly created documents record `"version": 2` explicitly.
+
+Version 1 documents stay supported. A version 1 document is migrated to version
+2 in memory each time it is read, so every reader sees the current shape while
+the document on disk, and therefore the repository identifier and every
+signature over it, is unchanged. The default branch and its quorum are read from
+`defaultBranch` and `threshold` and expressed as a canonical-reference rule.
+Ordinary edits keep a document at its stored version.
+
+To move a repository to version 2, run `rad id migrate`. This proposes the
+migrated document as a new revision, which the delegates vote on like any other
+change. Once it is adopted the repository is no longer readable to releases
+1.10.0 and earlier, so the migration is opt-in per repository.
+
+`rad init --identity-version 1` writes a version 1 document, for a repository
+that must stay readable to older releases.
+
## Fixes
- A patch now merges on the quorum of the canonical reference rule that
diff --git a/crates/radicle-cli/examples/git/git-fetch.md b/crates/radicle-cli/examples/git/git-fetch.md
index 652254b7fb..4bfaecdcbd 100644
--- a/crates/radicle-cli/examples/git/git-fetch.md
+++ b/crates/radicle-cli/examples/git/git-fetch.md
@@ -13,7 +13,7 @@ f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 refs/heads/master
``` (stderr)
$ git fetch alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+From rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new branch] alice/1 -> alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/alice/1
```
diff --git a/crates/radicle-cli/examples/git/git-push-amend.md b/crates/radicle-cli/examples/git/git-push-amend.md
index 4fe8d313ff..63eea87f07 100644
--- a/crates/radicle-cli/examples/git/git-push-amend.md
+++ b/crates/radicle-cli/examples/git/git-push-amend.md
@@ -1,11 +1,11 @@
``` ~alice
-$ rad id update --title "Add Bob" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji -q
-c036c0d89ce26aef3ad7da402157dba16b5163b4
+$ rad id update --title "Add Bob" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G -q
+03c1bd2e277d5d4850a0021f954c188155f332d5
```
``` ~bob
$ rad sync --fetch
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
```
@@ -23,6 +23,6 @@ $ git commit --amend -m "Neue Änderungen" --allow-empty -q
$ git push rad master -f
✓ Canonical reference refs/heads/master updated to target commit 9170c8795d3a78f0381a0ffafb20ea69fb0f5b6b
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ fb25886...9170c87 master -> master (forced update)
```
diff --git a/crates/radicle-cli/examples/git/git-push-canonical-annotated-tags.md b/crates/radicle-cli/examples/git/git-push-canonical-annotated-tags.md
index 7bfefcc481..a00b753c43 100644
--- a/crates/radicle-cli/examples/git/git-push-canonical-annotated-tags.md
+++ b/crates/radicle-cli/examples/git/git-push-canonical-annotated-tags.md
@@ -46,13 +46,13 @@ case, we will have two rules: one for `refs/tags/*` and one for `refs/tags/qa/*`
(see RIP-0004 for more information on the rules).
``` ~alice
-$ rad id update --title "Add canonical reference rules" --payload xyz.radicle.crefs rules '{ "refs/tags/*": { "threshold": 1, "allow": "delegates" }, "refs/tags/qa/*": { "threshold": 1, "allow": "delegates" }}'
+$ rad id update --title "Add canonical reference rules" --payload xyz.radicle.crefs rules '{ "refs/heads/master": { "threshold": 1, "allow": "delegates" }, "refs/tags/*": { "threshold": 1, "allow": "delegates" }, "refs/tags/qa/*": { "threshold": 1, "allow": "delegates" }}'
✓ Identity revision [..] created
╭────────────────────────────────────────────────────────────────────────╮
│ Title Add canonical reference rules │
-│ Revision c3349f07bfe6a82bbeb2989d2de4a918408f9831 │
-│ Parent 0656c217f917c3e06234771e9ecae53aba5e173e │
-│ Blob 85fa09e2de93b825d5231778dbb34143004a4bca │
+│ Revision 0ae3d527cf77ceb980ffc7db8074201233957d71 │
+│ Parent 86399084097fb674569f5bc5847da609ab91aa9f │
+│ Blob 4d4f5c7c7577730f96de5807e937831333d59458 │
│ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │
│ State accepted │
│ Quorum yes │
@@ -60,11 +60,16 @@ $ rad id update --title "Add canonical reference rules" --payload xyz.radicle.cr
│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
╰────────────────────────────────────────────────────────────────────────╯
-@@ -1,13 +1,25 @@
+@@ -1,23 +1,31 @@
{
+ "version": 2,
"payload": {
-+ "xyz.radicle.crefs": {
-+ "rules": {
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 1
++ },
+ "refs/tags/*": {
+ "allow": "delegates",
+ "threshold": 1
@@ -72,19 +77,20 @@ $ rad id update --title "Add canonical reference rules" --payload xyz.radicle.cr
+ "refs/tags/qa/*": {
+ "allow": "delegates",
+ "threshold": 1
-+ }
-+ }
-+ },
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
"xyz.radicle.project": {
- "defaultBranch": "master",
"description": "Radicle Heartwood Protocol & Stack",
"name": "heartwood"
}
},
"delegates": [
"did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
- ],
- "threshold": 1
+ ]
}
```
@@ -100,7 +106,7 @@ tag
$ git push rad --tags
✓ Canonical reference refs/tags/v1.0-hotfix updated to target tag ac51a0746a5e8311829bc481202909a1e3acc0c2
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new tag] v1.0-hotfix -> v1.0-hotfix
```
@@ -116,7 +122,7 @@ On the other side, Bob performs a fetch and now has the tags locally:
``` ~bob (stderr)
$ cd heartwood
$ git fetch rad
-From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+From rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G
* [new tag] v1.0-hotfix -> rad/tags/v1.0-hotfix
* [new tag] v1.0-hotfix -> v1.0-hotfix
```
@@ -136,7 +142,7 @@ the `threshold` to `2` for the `refs/tags/*` rule:
``` ~bob
$ rad remote add z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --name alice
✓ Follow policy updated for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (alice)
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
✓ Remote alice added
✓ Remote-tracking branch alice/master created for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
@@ -146,14 +152,14 @@ $ git push rad master
``` ~alice
$ rad remote add z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --name bob
✓ Follow policy updated for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (bob)
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
✓ Remote bob added
✓ Remote-tracking branch bob/master created for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
$ rad id update --title "Add Bob" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --no-confirm -q
-27ab0d77a95581c59ca9d30e679ceb06a9f758db
-$ rad id update --title "Update canonical reference rules" --payload xyz.radicle.crefs rules '{ "refs/tags/*": { "threshold": 2, "allow": "delegates" }, "refs/tags/qa/*": { "threshold": 1, "allow": "delegates" } }' -q
-dace164ba43fa51802697ec28d0b1965a9d7808b
+ed314851757c39be4edf1f87b7d7beab0ba3d62f
+$ rad id update --title "Update canonical reference rules" --payload xyz.radicle.crefs rules '{ "refs/heads/master": { "threshold": 1, "allow": "delegates" }, "refs/tags/*": { "threshold": 2, "allow": "delegates" }, "refs/tags/qa/*": { "threshold": 1, "allow": "delegates" } }' -q
+f3137e0cb6426f325779947c9ffc619b0f3f225d
```
**Note:** here we have to specify all the rules again to update the `threshold`.
@@ -162,10 +168,10 @@ editor instead.
``` ~bob
$ rad sync -f
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-$ rad id accept dace164ba43fa51802697ec28d0b1965a9d7808b -q
+$ rad id accept f3137e0cb6426f325779947c9ffc619b0f3f225d -q
```
When Bob creates a new tag and pushes it, we see that there's a warning that
@@ -184,7 +190,7 @@ $ git push rad --tags
warn: could not determine target for canonical reference 'refs/tags/v2.0', no object with at least 2 vote(s) found (threshold not met)
warn: it is recommended to find an object (either commit or tag) to agree upon
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
* [new tag] v1.0-hotfix -> v1.0-hotfix
* [new tag] v2.0 -> v2.0
```
@@ -194,7 +200,7 @@ it:
``` ~alice (stderr)
$ git fetch bob
-From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+From rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
* [new tag] v1.0-hotfix -> bob/tags/v1.0-hotfix
* [new tag] v2.0 -> bob/tags/v2.0
```
@@ -210,7 +216,7 @@ $ git tag v2.0 bob/tags/v2.0
$ git push rad --tags
✓ Canonical reference refs/tags/v2.0 updated to target tag 89f935f27a16f8ed97915ade4accab8fe48057aa
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new tag] v2.0 -> v2.0
```
@@ -227,6 +233,6 @@ $ git tag qa/v2.1
$ git push rad --tags
✓ Canonical reference refs/tags/qa/v2.1 updated to target commit f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
* [new tag] qa/v2.1 -> qa/v2.1
```
diff --git a/crates/radicle-cli/examples/git/git-push-canonical-branch.md b/crates/radicle-cli/examples/git/git-push-canonical-branch.md
index 97e858f18e..d39a159d40 100644
--- a/crates/radicle-cli/examples/git/git-push-canonical-branch.md
+++ b/crates/radicle-cli/examples/git/git-push-canonical-branch.md
@@ -1,11 +1,11 @@
``` ~alice
-$ rad id update --title "Add canonical branch for releases" --payload xyz.radicle.crefs rules '{ "refs/heads/releases/*": { "threshold": 1, "allow": [ "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk" ] }, "refs/tags/*": { "threshold": 1, "allow": "delegates" }, "refs/tags/qa/*": { "threshold": 1, "allow": "delegates" }}'
-✓ Identity revision [..] created
+$ rad id update --title "Add canonical branch for releases" --payload xyz.radicle.crefs rules '{ "refs/heads/master": { "threshold": 1, "allow": "delegates" }, "refs/heads/releases/*": { "threshold": 1, "allow": [ "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk" ] }, "refs/tags/*": { "threshold": 1, "allow": "delegates" }, "refs/tags/qa/*": { "threshold": 1, "allow": "delegates" }}'
+✓ Identity revision eb3f118684b846c352e6b7f2bb97bf8ac7edad2d created
╭────────────────────────────────────────────────────────────────────────╮
│ Title Add canonical branch for releases │
-│ Revision 37a1aad231100cd206c49aed79e405ea2da9204b │
-│ Parent dace164ba43fa51802697ec28d0b1965a9d7808b │
-│ Blob bbefd77cfeb456e500ad868c3b4effe1f7f818e2 │
+│ Revision eb3f118684b846c352e6b7f2bb97bf8ac7edad2d │
+│ Parent f3137e0cb6426f325779947c9ffc619b0f3f225d │
+│ Blob ec43d69ba56e3595f19d66fe7b1fca690491e477 │
│ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │
│ State active │
│ Quorum no │
@@ -14,11 +14,16 @@ $ rad id update --title "Add canonical branch for releases" --payload xyz.radicl
│ ? did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk bob │
╰────────────────────────────────────────────────────────────────────────╯
-@@ -1,26 +1,32 @@
+@@ -1,32 +1,38 @@
{
+ "version": 2,
"payload": {
"xyz.radicle.crefs": {
"rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 1
+ },
+ "refs/heads/releases/*": {
+ "allow": [
+ "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
@@ -34,10 +39,12 @@ $ rad id update --title "Add canonical branch for releases" --payload xyz.radicl
"allow": "delegates",
"threshold": 1
}
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
}
},
"xyz.radicle.project": {
- "defaultBranch": "master",
"description": "Radicle Heartwood Protocol & Stack",
"name": "heartwood"
}
@@ -45,18 +52,17 @@ $ rad id update --title "Add canonical branch for releases" --payload xyz.radicl
"delegates": [
"did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
"did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
- ],
- "threshold": 1
+ ]
}
```
``` ~bob
$ cd heartwood
$ rad sync -f
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-$ rad id accept 37a1aad231100cd206c49aed79e405ea2da9204b -q
+$ rad id accept eb3f118684b846c352e6b7f2bb97bf8ac7edad2d -q
```
Bob immediately pushes a branch that matches the rule, thus populating and
@@ -72,13 +78,13 @@ $ git commit --allow-empty --message "Release notes for version 2"
$ git push -u rad releases/2
✓ Canonical reference refs/heads/releases/2 updated to target commit afec366785ed3651cdc66975c0fec41866c9ce62
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
* [new branch] releases/2 -> releases/2
```
``` ~alice
$ rad sync -f
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
🌱 Fetched from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
$ git ls-remote rad
diff --git a/crates/radicle-cli/examples/git/git-push-canonical-lightweight-tags.md b/crates/radicle-cli/examples/git/git-push-canonical-lightweight-tags.md
index 5c4ed53a57..b42d7fd8b4 100644
--- a/crates/radicle-cli/examples/git/git-push-canonical-lightweight-tags.md
+++ b/crates/radicle-cli/examples/git/git-push-canonical-lightweight-tags.md
@@ -46,13 +46,13 @@ case, we will have two rules: one for `refs/tags/*` and one for `refs/tags/qa/*`
(see RIP-0004 for more information on the rules).
``` ~alice
-$ rad id update --title "Add canonical reference rules" --payload xyz.radicle.crefs rules '{ "refs/tags/*": { "threshold": 1, "allow": "delegates" }, "refs/tags/qa/*": { "threshold": 1, "allow": "delegates" }}'
+$ rad id update --title "Add canonical reference rules" --payload xyz.radicle.crefs rules '{ "refs/heads/master": { "threshold": 1, "allow": "delegates" }, "refs/tags/*": { "threshold": 1, "allow": "delegates" }, "refs/tags/qa/*": { "threshold": 1, "allow": "delegates" }}'
✓ Identity revision [..] created
╭────────────────────────────────────────────────────────────────────────╮
│ Title Add canonical reference rules │
-│ Revision c3349f07bfe6a82bbeb2989d2de4a918408f9831 │
-│ Parent 0656c217f917c3e06234771e9ecae53aba5e173e │
-│ Blob 85fa09e2de93b825d5231778dbb34143004a4bca │
+│ Revision 0ae3d527cf77ceb980ffc7db8074201233957d71 │
+│ Parent 86399084097fb674569f5bc5847da609ab91aa9f │
+│ Blob 4d4f5c7c7577730f96de5807e937831333d59458 │
│ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │
│ State accepted │
│ Quorum yes │
@@ -60,11 +60,16 @@ $ rad id update --title "Add canonical reference rules" --payload xyz.radicle.cr
│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
╰────────────────────────────────────────────────────────────────────────╯
-@@ -1,13 +1,25 @@
+@@ -1,23 +1,31 @@
{
+ "version": 2,
"payload": {
-+ "xyz.radicle.crefs": {
-+ "rules": {
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 1
++ },
+ "refs/tags/*": {
+ "allow": "delegates",
+ "threshold": 1
@@ -72,19 +77,20 @@ $ rad id update --title "Add canonical reference rules" --payload xyz.radicle.cr
+ "refs/tags/qa/*": {
+ "allow": "delegates",
+ "threshold": 1
-+ }
-+ }
-+ },
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
"xyz.radicle.project": {
- "defaultBranch": "master",
"description": "Radicle Heartwood Protocol & Stack",
"name": "heartwood"
}
},
"delegates": [
"did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
- ],
- "threshold": 1
+ ]
}
```
@@ -98,7 +104,7 @@ $ git tag v1.0-hotfix
$ git push rad --tags
✓ Canonical reference refs/tags/v1.0-hotfix updated to target commit f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new tag] v1.0-hotfix -> v1.0-hotfix
```
@@ -114,7 +120,7 @@ On the other side, Bob performs a fetch and now has the tags locally:
``` ~bob (stderr)
$ cd heartwood
$ git fetch rad
-From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+From rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G
* [new tag] v1.0-hotfix -> rad/tags/v1.0-hotfix
* [new tag] v1.0-hotfix -> v1.0-hotfix
```
@@ -134,7 +140,7 @@ the `threshold` to `2` for the `refs/tags/*` rule:
``` ~bob
$ rad remote add z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --name alice
✓ Follow policy updated for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (alice)
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
✓ Remote alice added
✓ Remote-tracking branch alice/master created for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
@@ -144,14 +150,14 @@ $ git push rad master
``` ~alice
$ rad remote add z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --name bob
✓ Follow policy updated for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (bob)
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
✓ Remote bob added
✓ Remote-tracking branch bob/master created for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
$ rad id update --title "Add Bob" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --no-confirm -q
-27ab0d77a95581c59ca9d30e679ceb06a9f758db
-$ rad id update --title "Update canonical reference rules" --payload xyz.radicle.crefs rules '{ "refs/tags/*": { "threshold": 2, "allow": "delegates" }, "refs/tags/qa/*": { "threshold": 1, "allow": "delegates" } }' -q
-dace164ba43fa51802697ec28d0b1965a9d7808b
+ed314851757c39be4edf1f87b7d7beab0ba3d62f
+$ rad id update --title "Update canonical reference rules" --payload xyz.radicle.crefs rules '{ "refs/heads/master": { "threshold": 1, "allow": "delegates" }, "refs/tags/*": { "threshold": 2, "allow": "delegates" }, "refs/tags/qa/*": { "threshold": 1, "allow": "delegates" } }' -q
+f3137e0cb6426f325779947c9ffc619b0f3f225d
```
**Note:** here we have to specify all the rules again to update the `threshold`.
@@ -160,10 +166,10 @@ editor instead.
``` ~bob
$ rad sync -f
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-$ rad id accept dace164ba43fa51802697ec28d0b1965a9d7808b -q
+$ rad id accept f3137e0cb6426f325779947c9ffc619b0f3f225d -q
```
When Bob creates a new tag and pushes it, we see that there's a warning that
@@ -175,7 +181,7 @@ $ git push rad --tags
warn: could not determine target for canonical reference 'refs/tags/v2.0', no object with at least 2 vote(s) found (threshold not met)
warn: it is recommended to find an object (either commit or tag) to agree upon
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
* [new tag] v1.0-hotfix -> v1.0-hotfix
* [new tag] v2.0 -> v2.0
```
@@ -185,7 +191,7 @@ it:
``` ~alice (stderr)
$ git fetch bob
-From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+From rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
* [new tag] v1.0-hotfix -> bob/tags/v1.0-hotfix
* [new tag] v2.0 -> bob/tags/v2.0
```
@@ -201,7 +207,7 @@ $ git tag v2.0 bob/tags/v2.0
$ git push rad --tags
✓ Canonical reference refs/tags/v2.0 updated to target commit f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new tag] v2.0 -> v2.0
```
@@ -218,6 +224,6 @@ $ git tag qa/v2.1
$ git push rad --tags
✓ Canonical reference refs/tags/qa/v2.1 updated to target commit f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
* [new tag] qa/v2.1 -> qa/v2.1
```
diff --git a/crates/radicle-cli/examples/git/git-push-canonical-symbolic-ref.md b/crates/radicle-cli/examples/git/git-push-canonical-symbolic-ref.md
index 49fa4e623f..497c6d3255 100644
--- a/crates/radicle-cli/examples/git/git-push-canonical-symbolic-ref.md
+++ b/crates/radicle-cli/examples/git/git-push-canonical-symbolic-ref.md
@@ -3,13 +3,13 @@ out symbolic references.
``` ~bob
$ cd heartwood
-$ rad id update --title "Add canonical symbolic ref" --payload xyz.radicle.crefs symbolic '{ "refs/heads/foobar": "refs/heads/releases/foobaz" }'
+$ rad id update --title "Add canonical symbolic ref" --payload xyz.radicle.crefs symbolic '{ "refs/heads/foobar": "refs/heads/releases/foobaz", "HEAD": "refs/heads/master" }'
✓ Identity revision [..] created
╭────────────────────────────────────────────────────────────────────────╮
│ Title Add canonical symbolic ref │
-│ Revision b7597e3eeaba64467db4417602518169b76b43d5 │
-│ Parent 37a1aad231100cd206c49aed79e405ea2da9204b │
-│ Blob 49a21614cf358b131fd6b590d0d01396f98906ce │
+│ Revision 0331767866ce4d4e040490ee42b262e5bf0d07b7 │
+│ Parent eb3f118684b846c352e6b7f2bb97bf8ac7edad2d │
+│ Blob 38b2a3c51cd46c1388dfec6f3faf4eca3e5fde94 │
│ Author did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk │
│ State active │
│ Quorum no │
@@ -18,11 +18,16 @@ $ rad id update --title "Add canonical symbolic ref" --payload xyz.radicle.crefs
│ ? did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice │
╰────────────────────────────────────────────────────────────────────────╯
-@@ -1,32 +1,35 @@
+@@ -1,38 +1,39 @@
{
+ "version": 2,
"payload": {
"xyz.radicle.crefs": {
"rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 1
+ },
"refs/heads/releases/*": {
"allow": [
"did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
@@ -37,13 +42,14 @@ $ rad id update --title "Add canonical symbolic ref" --payload xyz.radicle.crefs
"allow": "delegates",
"threshold": 1
}
-+ },
-+ "symbolic": {
+ },
+ "symbolic": {
+- "HEAD": "refs/heads/master"
++ "HEAD": "refs/heads/master",
+ "refs/heads/foobar": "refs/heads/releases/foobaz"
}
},
"xyz.radicle.project": {
- "defaultBranch": "master",
"description": "Radicle Heartwood Protocol & Stack",
"name": "heartwood"
}
@@ -51,8 +57,7 @@ $ rad id update --title "Add canonical symbolic ref" --payload xyz.radicle.crefs
"delegates": [
"did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
"did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
- ],
- "threshold": 1
+ ]
}
```
@@ -68,10 +73,10 @@ revision.
``` ~alice
$ rad sync -f
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
🌱 Fetched from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-$ rad id accept b7597e3eeaba64467db4417602518169b76b43d5 -q
+$ rad id accept 0331767866ce4d4e040490ee42b262e5bf0d07b7 -q
```
As usual, alice works on "master".
@@ -87,7 +92,7 @@ And updating the canonical reference for "master" also works as usual.
$ git push rad
✓ Canonical reference refs/heads/master updated to target commit 4dc510ddea5fd66499d1d2e996b8a97c8d57be54
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
f2de534..4dc510d master -> master
```
@@ -110,7 +115,7 @@ Of course, she can also fetch it to her working copy as usual.
``` ~alice (stderr)
$ git fetch rad
-From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+From rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G
* [new branch] foobar -> rad/foobar
* [new branch] releases/2 -> rad/releases/2
* [new branch] releases/foobaz -> rad/releases/foobaz
@@ -122,7 +127,7 @@ Bob fetches Alice's changes.
``` ~bob
$ rad sync -f
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
```
@@ -131,7 +136,7 @@ And, sure enough, there is the new branch just as he wanted it.
``` ~bob (stderr)
$ git fetch rad
-From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+From rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G
* [new branch] foobar -> rad/foobar
f2de534..4dc510d master -> rad/master
```
diff --git a/crates/radicle-cli/examples/git/git-push-converge.md b/crates/radicle-cli/examples/git/git-push-converge.md
index 49e337119b..771baafc70 100644
--- a/crates/radicle-cli/examples/git/git-push-converge.md
+++ b/crates/radicle-cli/examples/git/git-push-converge.md
@@ -5,8 +5,8 @@ First we add our new delegates, Bob & Eve, to our repo, while also setting the
`threshold` to `3`:
``` ~alice
-$ rad id update --title "Add Bob & Eve" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --delegate did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z --threshold 3 --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji -q
-3143236b2e40338f5574ec04e935a5ab80a6868a
+$ rad id update --title "Add Bob & Eve" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --delegate did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z --threshold 3 --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G -q
+5fedc54a1814be92fc6f0e296e6ce4af236fb6cf
```
Bob and Eve will fetch the changes to ensure they hear about their delegate
@@ -14,7 +14,7 @@ responsibilities:
``` ~bob
$ rad sync --fetch
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 2 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 2 potential seed(s).
✓ Target met: 2 seed(s)
🌱 Fetched from z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z
🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
@@ -22,7 +22,7 @@ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 2 potential s
``` ~eve
$ rad sync --fetch
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 2 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 2 potential seed(s).
✓ Target met: 2 seed(s)
🌱 Fetched from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
@@ -63,13 +63,13 @@ found` error is showing up:
``` ~alice
$ rad remote add did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --name bob
✓ Follow policy updated for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (bob)
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 2 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 2 potential seed(s).
✓ Target met: 2 seed(s)
✓ Remote bob added
✓ Remote-tracking branch bob/master created for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
$ rad remote add did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z --name eve
✓ Follow policy updated for z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z (eve)
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 2 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 2 potential seed(s).
✓ Target met: 2 seed(s)
✓ Remote eve added
✓ Remote-tracking branch eve/master created for z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z
@@ -97,14 +97,14 @@ $ git push rad -f
warn: could not determine target for canonical reference 'refs/heads/master', no object with at least 3 vote(s) found (threshold not met)
warn: it is recommended to find an object (either commit or tag) to agree upon
✓ Synced with 2 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
d09e634..0f9bd80 master -> master
```
``` ~bob
$ rad remote add did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --name alice
✓ Follow policy updated for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (alice)
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 2 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 2 potential seed(s).
✓ Target met: 2 seed(s)
✓ Remote alice added
✓ Remote-tracking branch alice/master created for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
@@ -121,7 +121,7 @@ become the canonical `master`.
$ git push rad
✓ Canonical reference refs/heads/master updated to target commit 3a75f66dd0020c9a0355cc6ec21f15de989e2001
✓ Synced with 2 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
2a37862..0f9bd80 master -> master
```
@@ -130,7 +130,7 @@ Once Eve also resets to the merge commits, the canonical `master` is set to this
``` ~eve
$ rad remote add did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --name alice
✓ Follow policy updated for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (alice)
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 2 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 2 potential seed(s).
✓ Target met: 2 seed(s)
✓ Remote alice added
✓ Remote-tracking branch alice/master created for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
@@ -142,6 +142,6 @@ HEAD is now at 0f9bd80 Merge remote-tracking branch 'eve/master'
$ git push rad
✓ Canonical reference refs/heads/master updated to target commit 0f9bd8035c04b3f73f5408e73e8454879b20800b
✓ Synced with 2 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z
3a75f66..0f9bd80 master -> master
```
diff --git a/crates/radicle-cli/examples/git/git-push-delete.md b/crates/radicle-cli/examples/git/git-push-delete.md
index 0d4edb5e51..3ae52338b3 100644
--- a/crates/radicle-cli/examples/git/git-push-delete.md
+++ b/crates/radicle-cli/examples/git/git-push-delete.md
@@ -1,7 +1,7 @@
Finally, we can also delete branches with `git push`:
```
-$ git ls-remote rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi refs/heads/*
+$ git ls-remote rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi refs/heads/*
145e1e69bef3ad93d14946ea212249c2fa9b9828 refs/heads/alice/1
ddcc1f164eacfd7dba41da9bff3261da3ee79fd3 refs/heads/alice/2
f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 refs/heads/master
@@ -9,12 +9,12 @@ f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 refs/heads/master
``` (stderr) RAD_SOCKET=/dev/null
$ git push rad :alice/1
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- [deleted] alice/1
```
```
-$ git ls-remote rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi refs/heads/*
+$ git ls-remote rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi refs/heads/*
ddcc1f164eacfd7dba41da9bff3261da3ee79fd3 refs/heads/alice/2
f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 refs/heads/master
```
@@ -23,13 +23,13 @@ f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 refs/heads/master
$ git checkout alice/2
Switched to a new branch 'alice/2'
$ git push rad HEAD:refs/patches
-✓ Patch bb9b0d5b8de8d5e2a4cba45f02bd35b3e2678fbe opened
+✓ Patch fdb6ac2eb47ca76c9832dbc078d8ad4ef7cc17ee opened
To [..]
* [new reference] HEAD -> refs/patches
```
``` (stderr) RAD_SOCKET=/dev/null
$ git push rad alice/2 -d
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- [deleted] alice/2
```
diff --git a/crates/radicle-cli/examples/git/git-push-diverge.md b/crates/radicle-cli/examples/git/git-push-diverge.md
index 4a79a1aa1b..36f9f51f7b 100644
--- a/crates/radicle-cli/examples/git/git-push-diverge.md
+++ b/crates/radicle-cli/examples/git/git-push-diverge.md
@@ -4,15 +4,15 @@ canonical head.
First we add a second delegate, Bob, to our repo:
``` ~alice
-$ rad id update --title "Add Bob" --description "" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji -q
-c036c0d89ce26aef3ad7da402157dba16b5163b4
+$ rad id update --title "Add Bob" --description "" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G -q
+03c1bd2e277d5d4850a0021f954c188155f332d5
```
Then, as Bob, we commit some code on top of the canonical head:
``` ~bob
$ rad sync --fetch
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
$ rad inspect --delegates
@@ -46,7 +46,7 @@ $ git push rad
warn: could not determine target commit for canonical reference 'refs/heads/master', found diverging commits 2e8758fc512cbdef298c86feddff5ba3280e94b4 and 319a7dc3b195368ded4b099f8c90bbb80addccd3, with base commit f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 and threshold 1
warn: it is recommended to find a commit to agree upon
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
f2de534..2e8758f master -> master
```
@@ -63,7 +63,7 @@ f2de534 Second commit
``` ~alice RAD_SOCKET=/dev/null (stderr)
$ git push rad -f
✓ Canonical reference refs/heads/master updated to target commit f6cff86594495e9beccfeda7c20173e55c1dd9fc
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ 2e8758f...f6cff86 master -> master (forced update)
```
@@ -76,6 +76,6 @@ $ git reset --hard HEAD^ -q
``` ~alice RAD_SOCKET=/dev/null (stderr)
$ git push -f
✓ Canonical reference refs/heads/master updated to target commit 319a7dc3b195368ded4b099f8c90bbb80addccd3
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ f6cff86...319a7dc master -> master (forced update)
```
diff --git a/crates/radicle-cli/examples/git/git-push-force-with-lease.md b/crates/radicle-cli/examples/git/git-push-force-with-lease.md
index 4e92588ae6..70a88840b4 100644
--- a/crates/radicle-cli/examples/git/git-push-force-with-lease.md
+++ b/crates/radicle-cli/examples/git/git-push-force-with-lease.md
@@ -18,7 +18,7 @@ the last time you pushed.
$ git commit --amend -m "Neue Änderungen" --allow-empty -q
$ git push rad master --force-with-lease
✓ Canonical reference refs/heads/master updated to target commit 9170c8795d3a78f0381a0ffafb20ea69fb0f5b6b
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ fb25886...9170c87 master -> master (forced update)
```
@@ -29,7 +29,7 @@ value, to `--force-push-lease`:
$ git commit --amend -m "Noch mehr Änderungen" --allow-empty -q
$ git push rad master --force-with-lease=master
✓ Canonical reference refs/heads/master updated to target commit 1e4213811eb4ce67360e4a0222cab81ad11a7ffe
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ 9170c87...1e42138 master -> master (forced update)
```
@@ -39,7 +39,7 @@ As well as the named reference, and its expected value:
$ git commit --amend -m "Even more changes" --allow-empty -q
$ git push rad master --force-with-lease=master:1e4213811eb4ce67360e4a0222cab81ad11a7ffe
✓ Canonical reference refs/heads/master updated to target commit c4b74ef30953598852a82e0cd22b2ebb0d8d9e18
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ 1e42138...c4b74ef master -> master (forced update)
```
@@ -52,9 +52,9 @@ $ git commit --amend -m "And even more" --allow-empty -q
``` (stderr) (fail)
$ git push rad master --force-with-lease=master:1e4213811eb4ce67360e4a0222cab81ad11a7ffe
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
! [rejected] master -> master (stale info)
-error: failed to push some refs to 'rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi'
+error: failed to push some refs to 'rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi'
```
And if we do not supply the commit, it should also fail, since this implies that
@@ -66,16 +66,16 @@ $ git commit --amend -m "And even more" --allow-empty -q
``` (stderr) (fail)
$ git push rad master --force-with-lease=master:
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
! [rejected] master -> master (stale info)
-error: failed to push some refs to 'rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi'
+error: failed to push some refs to 'rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi'
```
So, let's create a new branch:
``` (stderr)
$ git push rad master:dev --force-with-lease=dev:
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new branch] master -> dev
```
diff --git a/crates/radicle-cli/examples/git/git-push-rollback.md b/crates/radicle-cli/examples/git/git-push-rollback.md
index 7b23a0a7af..4a0c09a091 100644
--- a/crates/radicle-cli/examples/git/git-push-rollback.md
+++ b/crates/radicle-cli/examples/git/git-push-rollback.md
@@ -4,15 +4,15 @@ First we add a second delegate, Bob, to our repo. We also change the threshold
to 2:
``` ~alice
-$ rad id update --title "Add Bob" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --threshold 2 -q
-069e7d58faa9a7473d27f5510d676af33282796f
+$ rad id update --title "Add Bob" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --threshold 2 -q
+c7d68a801ed8c107521cb63b4089b4bd6601fad4
```
Bob then syncs these changes and adds a new commit:
``` ~bob
$ rad sync --fetch
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
$ git commit -m "Third commit" --allow-empty -q
@@ -37,7 +37,7 @@ Fast-forward
$ git push rad
✓ Canonical reference refs/heads/master updated to target commit 319a7dc3b195368ded4b099f8c90bbb80addccd3
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
f2de534..319a7dc master -> master
```
@@ -56,6 +56,6 @@ push and the new canonical head becomes the previous commit again:
$ git push rad -f
✓ Canonical reference refs/heads/master updated to target commit f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ 319a7dc...f2de534 master -> master (forced update)
```
diff --git a/crates/radicle-cli/examples/git/git-push.md b/crates/radicle-cli/examples/git/git-push.md
index 2c24faaf49..0019c01c56 100644
--- a/crates/radicle-cli/examples/git/git-push.md
+++ b/crates/radicle-cli/examples/git/git-push.md
@@ -6,7 +6,7 @@ $ git commit -m "Alice's commit" --allow-empty -s
``` (stderr) RAD_SOCKET=/dev/null
$ git push rad HEAD:alice/1
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new branch] HEAD -> alice/1
```
@@ -17,9 +17,9 @@ $ git commit --amend -m "Alice's amended commit" --allow-empty -s
```
``` (stderr) (fail)
$ git push rad HEAD:alice/1
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
! [rejected] HEAD -> alice/1 (non-fast-forward)
-error: failed to push some refs to 'rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi'
+error: failed to push some refs to 'rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi'
hint: [..]
hint: [..]
hint: [..]
@@ -30,7 +30,7 @@ And that we can with `+`:
``` (stderr)
$ git push -o no-sync rad +HEAD:alice/1
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ 87fa120...145e1e6 HEAD -> alice/1 (forced update)
```
@@ -45,7 +45,7 @@ $ git branch -r -vv
List our namespaced refs:
```
-$ git ls-remote rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi 'refs/heads/*'
+$ git ls-remote rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi 'refs/heads/*'
145e1e69bef3ad93d14946ea212249c2fa9b9828 refs/heads/alice/1
f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 refs/heads/master
```
@@ -68,7 +68,7 @@ Note that it is forbidden to delete the default/canonical branch:
``` (fail) (stderr)
$ git push rad :master
error: refusing to delete default branch ref 'refs/heads/master'
-error: failed to push some refs to 'rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi'
+error: failed to push some refs to 'rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi'
```
If you pass an unsupported push option, you get an error:
@@ -86,6 +86,6 @@ $ git commit -m "Something good" --allow-empty -s
```
``` (stderr)
$ git push -o no-sync rad ddcc1f164eacfd7dba41da9bff3261da3ee79fd3:refs/heads/alice/2
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new branch] ddcc1f164eacfd7dba41da9bff3261da3ee79fd3 -> alice/2
```
diff --git a/crates/radicle-cli/examples/git/git-tag.md b/crates/radicle-cli/examples/git/git-tag.md
index 365bda7015..d53025a76e 100644
--- a/crates/radicle-cli/examples/git/git-tag.md
+++ b/crates/radicle-cli/examples/git/git-tag.md
@@ -13,7 +13,7 @@ $ git tag v1.0 -a -m "Release v1.0"
``` ~alice (stderr)
$ git push rad v1.0
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new tag] v1.0 -> v1.0
```
@@ -37,7 +37,7 @@ Bob fetches the tag from Alice, by adding her as a remote:
$ cd heartwood
$ rad remote add z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --name alice
✓ Follow policy updated for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (alice)
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
✓ Remote alice added
✓ Remote-tracking branch alice/master created for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
@@ -48,7 +48,7 @@ under the `alice` remote:
``` ~bob (stderr)
$ git fetch alice
-From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+From rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new tag] v1.0 -> alice/tags/v1.0
```
@@ -65,7 +65,7 @@ Updated tag 'v1.0' (was be18ed6)
``` ~alice (stderr)
$ git push rad v1.0 -f
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ be18ed6...9dbdebc v1.0 -> v1.0 (forced update)
```
@@ -74,13 +74,13 @@ update of the tag:
``` ~bob
$ rad sync -f
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
```
``` ~bob (stderr)
$ git fetch alice -f
-From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+From rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
62d19fd..9dbdebc v1.0 -> alice/tags/v1.0
```
diff --git a/crates/radicle-cli/examples/jj-init-bare.md b/crates/radicle-cli/examples/jj-init-bare.md
index 2832a20347..3a7029c4ac 100644
--- a/crates/radicle-cli/examples/jj-init-bare.md
+++ b/crates/radicle-cli/examples/jj-init-bare.md
@@ -12,5 +12,5 @@ $ cd heartwood.jj
```
$ rad .
-rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
```
diff --git a/crates/radicle-cli/examples/rad-block.md b/crates/radicle-cli/examples/rad-block.md
index 71ef29028f..c9503b092b 100644
--- a/crates/radicle-cli/examples/rad-block.md
+++ b/crates/radicle-cli/examples/rad-block.md
@@ -4,8 +4,8 @@ repositories from being seeded.
For instance, if our default policy is to seed, any unknown repository will
have its policy set to allow seeding:
```
-$ rad inspect rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --policy
-Repository rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji is being seeded with scope `all`
+$ rad inspect rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --policy
+Repository rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G is being seeded with scope `all`
```
Since there is no policy specific to this repository, there's nothing to be
@@ -20,15 +20,15 @@ But if we wanted to prevent this repository from being seeded, while
allowing all other repositories, we could use `rad block`:
```
-$ rad block rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Policy for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji set to 'block'
+$ rad block rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+✓ Policy for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G set to 'block'
```
We can see that it is now no longer seeded:
```
-$ rad inspect rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --policy
-Repository rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji is not being seeded
+$ rad inspect rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --policy
+Repository rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G is not being seeded
```
And a 'block' policy was added:
@@ -38,15 +38,15 @@ $ rad seed
╭──────────────────────────────────────────────────────────────────────────────╮
│ Repository Name Policy Scope │
├──────────────────────────────────────────────────────────────────────────────┤
-│ rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji Error determining name. block │
+│ rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G Error determining name. block │
╰──────────────────────────────────────────────────────────────────────────────╯
```
If we want to reverse the blocking of the RID we can use `rad unblock`:
```
-$ rad unblock rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ The 'block' policy for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji is removed
+$ rad unblock rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+✓ The 'block' policy for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G is removed
```
```
diff --git a/crates/radicle-cli/examples/rad-checkout-repo-config-linux.md b/crates/radicle-cli/examples/rad-checkout-repo-config-linux.md
index ace75c511e..1bf1c01c8f 100644
--- a/crates/radicle-cli/examples/rad-checkout-repo-config-linux.md
+++ b/crates/radicle-cli/examples/rad-checkout-repo-config-linux.md
@@ -14,10 +14,10 @@ $ cat .git/config
[push]
default = upstream
[remote "rad"]
- url = rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+ url = rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G
fetch = +refs/heads/*:refs/remotes/rad/*
fetch = +refs/tags/*:refs/remotes/rad/tags/*
- pushurl = rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ pushurl = rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
[branch "master"]
remote = rad
merge = refs/heads/master
diff --git a/crates/radicle-cli/examples/rad-checkout-repo-config-macos.md b/crates/radicle-cli/examples/rad-checkout-repo-config-macos.md
index ff7bc1f3c4..9ee905e29d 100644
--- a/crates/radicle-cli/examples/rad-checkout-repo-config-macos.md
+++ b/crates/radicle-cli/examples/rad-checkout-repo-config-macos.md
@@ -16,10 +16,10 @@ $ cat .git/config
[push]
default = upstream
[remote "rad"]
- url = rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+ url = rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G
fetch = +refs/heads/*:refs/remotes/rad/*
fetch = +refs/tags/*:refs/remotes/rad/tags/*
- pushurl = rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ pushurl = rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
[branch "master"]
remote = rad
merge = refs/heads/master
diff --git a/crates/radicle-cli/examples/rad-checkout.md b/crates/radicle-cli/examples/rad-checkout.md
index e51b4199ce..6a2731c6dd 100644
--- a/crates/radicle-cli/examples/rad-checkout.md
+++ b/crates/radicle-cli/examples/rad-checkout.md
@@ -2,7 +2,7 @@ With the `rad checkout` command, you can create a new working copy from an
existing project.
```
-$ rad checkout rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+$ rad checkout rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
✓ Repository checkout successful under ./heartwood
```
@@ -32,8 +32,8 @@ Check the remote configuration:
```
$ git remote --verbose
-rad rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji (fetch)
-rad rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (push)
+rad rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G (fetch)
+rad rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (push)
```
List the branches:
diff --git a/crates/radicle-cli/examples/rad-clean.md b/crates/radicle-cli/examples/rad-clean.md
index 7b6b9ae8cf..7387d33f2d 100644
--- a/crates/radicle-cli/examples/rad-clean.md
+++ b/crates/radicle-cli/examples/rad-clean.md
@@ -10,7 +10,7 @@ $ rad ls
╭───────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ Name RID Visibility Head Description │
├───────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ heartwood rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji public f2de534 Radicle Heartwood Protocol & Stack │
+│ heartwood rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G public f2de534 Radicle Heartwood Protocol & Stack │
╰───────────────────────────────────────────────────────────────────────────────────────────────────────────╯
```
@@ -18,23 +18,23 @@ Let's also inspect what remotes are in the repository:
``` ~alice
$ rad inspect --sigrefs
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi 55be80540a7e9f10478fbc846913f2a6a19abe1d parent
-z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk e9f48ef90fe8592e1b1c95f96c21a59ca1495300 parent
+z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi 65ca22ed02601b9cd3e65486fd871683d415a3ac parent
+z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk 954186394ad704149d952368f55aa7e270c09378 parent
```
Now let's clean the `heartwood` project:
``` ~alice
-$ rad clean rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --no-confirm
+$ rad clean rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --no-confirm
Removed z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-✓ Successfully cleaned rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+✓ Successfully cleaned rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
```
Inspecting the remotes again, we see that Bob is now gone:
``` ~alice
$ rad inspect --sigrefs
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi 55be80540a7e9f10478fbc846913f2a6a19abe1d parent
+z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi 65ca22ed02601b9cd3e65486fd871683d415a3ac parent
```
Note that Bob will be fetched again if we do not untrack his
@@ -45,23 +45,23 @@ Cleaning a repository again will remove no remotes, since we're
already at the minimal set of remotes:
``` ~alice
-$ rad clean rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --no-confirm
-✓ Successfully cleaned rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+$ rad clean rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --no-confirm
+✓ Successfully cleaned rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
```
Since Eve did not fork the repository, and has no refs of their own,
when they run `rad clean` it will remove the project entirely:
``` ~eve
-$ rad clean rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --no-confirm
+$ rad clean rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --no-confirm
Removed z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-✓ Successfully cleaned rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+✓ Successfully cleaned rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
```
And attempting to clean the repository again, or any nonexistent
repository, has no effect on the storage at all:
``` ~eve (fail)
-$ rad clean rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --no-confirm
-✗ Error: repository rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji was not found
+$ rad clean rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --no-confirm
+✗ Error: repository rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G was not found
```
diff --git a/crates/radicle-cli/examples/rad-clone-all.md b/crates/radicle-cli/examples/rad-clone-all.md
index 48bf731ec7..83b697bcf3 100644
--- a/crates/radicle-cli/examples/rad-clone-all.md
+++ b/crates/radicle-cli/examples/rad-clone-all.md
@@ -1,7 +1,7 @@
```
-$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --scope all
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'all'
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+$ rad clone rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --scope all
+✓ Seeding policy updated for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G with scope 'all'
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
✓ Creating checkout in ./heartwood..
✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
@@ -32,7 +32,7 @@ z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
└── refs
├── cobs
│ └── xyz.radicle.id
- │ └── [...]
+ │ └── [..]
├── heads
│ └── master
└── rad
@@ -64,7 +64,7 @@ We can also create our own fork just by pushing:
``` (stderr)
$ git push -o no-sync rad master
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z
* [new branch] master -> master
```
```
@@ -73,7 +73,7 @@ z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
└── refs
├── cobs
│ └── xyz.radicle.id
- │ └── [...]
+ │ └── [..]
├── heads
│ └── master
└── rad
diff --git a/crates/radicle-cli/examples/rad-clone-bare.md b/crates/radicle-cli/examples/rad-clone-bare.md
index fc645ae4dd..380a58c0c7 100644
--- a/crates/radicle-cli/examples/rad-clone-bare.md
+++ b/crates/radicle-cli/examples/rad-clone-bare.md
@@ -2,9 +2,9 @@ To create a local bare copy of a repository on the Radicle network, we use the
`clone` command, followed by the identifier or *RID* of the repository:
```
-$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --scope followed --bare
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'followed'
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found [..] potential seed(s).
+$ rad clone rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --scope followed --bare
+✓ Seeding policy updated for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G with scope 'followed'
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found [..] potential seed(s).
✓ Target met: [..] seed(s)
✓ Creating checkout in ./heartwood..
✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
@@ -53,10 +53,10 @@ We can also take a look at the remotes:
```
$ git remote -v
-alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (fetch)
-alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (push)
-rad rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji (fetch)
-rad rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (push)
+alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (fetch)
+alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (push)
+rad rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G (fetch)
+rad rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (push)
```
Let's check the last commit!
@@ -76,6 +76,6 @@ $ rad ls --seeded
╭───────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ Name RID Visibility Head Description │
├───────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ heartwood rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji public f2de534 Radicle Heartwood Protocol & Stack │
+│ heartwood rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G public f2de534 Radicle Heartwood Protocol & Stack │
╰───────────────────────────────────────────────────────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-clone-connect.md b/crates/radicle-cli/examples/rad-clone-connect.md
index f6566a1b1f..624bf06d3a 100644
--- a/crates/radicle-cli/examples/rad-clone-connect.md
+++ b/crates/radicle-cli/examples/rad-clone-connect.md
@@ -2,9 +2,9 @@ If we're not connecting to seed nodes when cloning, the `clone` command will
automatically connect to the necessary seeds.
```
-$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'followed'
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 2 potential seed(s).
+$ rad clone rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+✓ Seeding policy updated for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G with scope 'followed'
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 2 potential seed(s).
✓ Target met: 1 seed(s)
✓ Creating checkout in ./heartwood..
✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
diff --git a/crates/radicle-cli/examples/rad-clone-directory.md b/crates/radicle-cli/examples/rad-clone-directory.md
index 93a21b2512..7c3eb15428 100644
--- a/crates/radicle-cli/examples/rad-clone-directory.md
+++ b/crates/radicle-cli/examples/rad-clone-directory.md
@@ -2,9 +2,9 @@ We can specify where a repository gets cloned into on our filesystem
by specifying the directory in the `rad clone` command:
```
-$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --scope followed Developer/Radicle
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'followed'
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+$ rad clone rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --scope followed Developer/Radicle
+✓ Seeding policy updated for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G with scope 'followed'
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
✓ Creating checkout in ./Developer/Radicle..
✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
@@ -22,8 +22,8 @@ Note that attempting to clone into a directory that already exists,
and is not empty, will fail:
``` (fail)
-$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --scope followed Developer/Radicle
+$ rad clone rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --scope followed Developer/Radicle
✗ Error: refusing to checkout repository to Developer/Radicle, since it already exists
-✗ Hint: try `rad checkout rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji` in a new directory
-✗ Error: failed to clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+✗ Hint: try `rad checkout rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G` in a new directory
+✗ Error: failed to clone rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
```
diff --git a/crates/radicle-cli/examples/rad-clone-partial-fail.md b/crates/radicle-cli/examples/rad-clone-partial-fail.md
index 44e6ec380a..cc41d7af00 100644
--- a/crates/radicle-cli/examples/rad-clone-partial-fail.md
+++ b/crates/radicle-cli/examples/rad-clone-partial-fail.md
@@ -5,9 +5,9 @@ $ rad node routing
╭──────────────────────────────────────────────────────────────────────────────────────╮
│ RID NID │
├──────────────────────────────────────────────────────────────────────────────────────┤
-│ rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │
-│ rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT │
-│ rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk │
+│ rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │
+│ rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT │
+│ rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk │
╰──────────────────────────────────────────────────────────────────────────────────────╯
```
@@ -15,9 +15,9 @@ When she tries to clone, one of those will fail to fetch. But the clone command
still returns successfully.
```
-$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --timeout 3s
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'followed'
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 3 potential seed(s).
+$ rad clone rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --timeout 3s
+✓ Seeding policy updated for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G with scope 'followed'
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 3 potential seed(s).
✓ Target met: 1 seed(s)
✓ Creating checkout in ./heartwood..
✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
diff --git a/crates/radicle-cli/examples/rad-clone-scope.md b/crates/radicle-cli/examples/rad-clone-scope.md
index 4a56e6f13c..4dc789dc9c 100644
--- a/crates/radicle-cli/examples/rad-clone-scope.md
+++ b/crates/radicle-cli/examples/rad-clone-scope.md
@@ -1,8 +1,8 @@
By default `rad clone` should add a seeding policy with the `followed` scope:
```
-$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'followed'
+$ rad clone rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+✓ Seeding policy updated for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G with scope 'followed'
✓ Creating checkout in ./heartwood..
✓ Repository successfully cloned under [..]/heartwood/
╭────────────────────────────────────╮
@@ -15,7 +15,7 @@ $ rad seed
╭───────────────────────────────────────────────────────────────────╮
│ Repository Name Policy Scope │
├───────────────────────────────────────────────────────────────────┤
-│ rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji heartwood allow followed │
+│ rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G heartwood allow followed │
╰───────────────────────────────────────────────────────────────────╯
$ rm -rf heartwood
```
@@ -23,8 +23,8 @@ $ rm -rf heartwood
Specifying a different scope explicitly should update the policy:
```
-$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --scope all
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'all'
+$ rad clone rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --scope all
+✓ Seeding policy updated for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G with scope 'all'
✓ Creating checkout in ./heartwood..
✓ Repository successfully cloned under [..]/heartwood/
╭────────────────────────────────────╮
@@ -37,7 +37,7 @@ $ rad seed
╭────────────────────────────────────────────────────────────────╮
│ Repository Name Policy Scope │
├────────────────────────────────────────────────────────────────┤
-│ rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji heartwood allow all │
+│ rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G heartwood allow all │
╰────────────────────────────────────────────────────────────────╯
$ rm -rf heartwood
```
@@ -45,7 +45,7 @@ $ rm -rf heartwood
Running `rad clone` again without an explicit scope parameter should not change the existing policy:
```
-$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+$ rad clone rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
✓ Creating checkout in ./heartwood..
✓ Repository successfully cloned under [..]/heartwood/
╭────────────────────────────────────╮
@@ -58,6 +58,6 @@ $ rad seed
╭────────────────────────────────────────────────────────────────╮
│ Repository Name Policy Scope │
├────────────────────────────────────────────────────────────────┤
-│ rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji heartwood allow all │
+│ rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G heartwood allow all │
╰────────────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-clone.md b/crates/radicle-cli/examples/rad-clone.md
index 55bf87e47b..cfee169be5 100644
--- a/crates/radicle-cli/examples/rad-clone.md
+++ b/crates/radicle-cli/examples/rad-clone.md
@@ -2,9 +2,9 @@ To create a local copy of a repository on the Radicle network, we use the
`clone` command, followed by the identifier or *RID* of the repository:
```
-$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'followed'
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found [..] potential seed(s).
+$ rad clone rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+✓ Seeding policy updated for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G with scope 'followed'
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found [..] potential seed(s).
✓ Target met: [..] seed(s)
✓ Creating checkout in ./heartwood..
✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
@@ -47,10 +47,10 @@ We can also take a look at the remotes:
```
$ git remote -v
-alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (fetch)
-alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (push)
-rad rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji (fetch)
-rad rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (push)
+alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (fetch)
+alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (push)
+rad rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G (fetch)
+rad rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (push)
```
Let's check the last commit!
@@ -70,6 +70,6 @@ $ rad ls --seeded
╭───────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ Name RID Visibility Head Description │
├───────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ heartwood rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji public f2de534 Radicle Heartwood Protocol & Stack │
+│ heartwood rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G public f2de534 Radicle Heartwood Protocol & Stack │
╰───────────────────────────────────────────────────────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-cob-log.md b/crates/radicle-cli/examples/rad-cob-log.md
index 29fb48bcc1..b53fdab881 100644
--- a/crates/radicle-cli/examples/rad-cob-log.md
+++ b/crates/radicle-cli/examples/rad-cob-log.md
@@ -6,7 +6,7 @@ First create an issue.
$ rad issue open --title "flux capacitor underpowered" --description "Flux capacitor power requirements exceed current supply" --no-announce
╭─────────────────────────────────────────────────────────╮
│ Title flux capacitor underpowered │
-│ Issue d87dcfe8c2b3200e78b128d9b959cfdf7063fefe │
+│ Issue cb9d9788d1854a6d4bc7235756df33b9d372a605 │
│ Author alice (you) │
│ Status open │
│ │
@@ -21,7 +21,7 @@ $ rad issue list
╭──────────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Labels Assignees Opened │
├──────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● d87dcfe flux capacitor underpowered alice (you) now │
+│ ● cb9d978 flux capacitor underpowered alice (you) now │
╰──────────────────────────────────────────────────────────────────────────────────────────╯
```
@@ -45,25 +45,25 @@ $ rad patch
╭─────────────────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Reviews Head + - Updated Labels │
├─────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● aa45913 Define power requirements alice (you) - 3e674d1 +0 -0 now │
+│ ● 26ba061 Define power requirements alice (you) - 3e674d1 +0 -0 now │
╰─────────────────────────────────────────────────────────────────────────────────────────────────╯
```
Both issue and patch COBs can be listed.
```
-$ rad cob list --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.issue
-d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
-$ rad cob list --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.patch
-aa45913e757cacd46972733bddee5472c78fa32a
+$ rad cob list --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --type xyz.radicle.issue
+cb9d9788d1854a6d4bc7235756df33b9d372a605
+$ rad cob list --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --type xyz.radicle.patch
+26ba0615c6e911344ee61d53241a2903c5bf8623
```
We can look at the issue COB.
```
-$ rad cob log --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.issue --object d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
-commit d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
-resource 0656c217f917c3e06234771e9ecae53aba5e173e
+$ rad cob log --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --type xyz.radicle.issue --object cb9d9788d1854a6d4bc7235756df33b9d372a605
+commit cb9d9788d1854a6d4bc7235756df33b9d372a605
+resource 86399084097fb674569f5bc5847da609ab91aa9f
author z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
date Thu, 15 Dec 2022 17:28:04 +0000
@@ -82,9 +82,9 @@ date Thu, 15 Dec 2022 17:28:04 +0000
We can look at the patch COB too.
```
-$ rad cob log --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.patch --object aa45913e757cacd46972733bddee5472c78fa32a
-commit aa45913e757cacd46972733bddee5472c78fa32a
-resource 0656c217f917c3e06234771e9ecae53aba5e173e
+$ rad cob log --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --type xyz.radicle.patch --object 26ba0615c6e911344ee61d53241a2903c5bf8623
+commit 26ba0615c6e911344ee61d53241a2903c5bf8623
+resource 86399084097fb674569f5bc5847da609ab91aa9f
rel 3e674d1a1df90807e934f9ae5da2591dd6848a33
rel f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
author z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
@@ -108,11 +108,11 @@ date Thu, 15 Dec 2022 17:28:04 +0000
Finally let's updated the issue and see the `parent` header:
```
-$ rad issue label d87dcfe --add bug --no-announce
-$ rad cob log --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.issue --object d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
-commit abec0a9f3c945594c4e78d24d8ec679e56b22b79
-resource 0656c217f917c3e06234771e9ecae53aba5e173e
-parent d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
+$ rad issue label cb9d978 --add bug --no-announce
+$ rad cob log --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --type xyz.radicle.issue --object cb9d9788d1854a6d4bc7235756df33b9d372a605
+commit 3f72d4fdc26f02f64d67ae37f3f363634673b1ea
+resource 86399084097fb674569f5bc5847da609ab91aa9f
+parent cb9d9788d1854a6d4bc7235756df33b9d372a605
author z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
date Thu, 15 Dec 2022 17:28:04 +0000
@@ -123,8 +123,8 @@ date Thu, 15 Dec 2022 17:28:04 +0000
]
}
-commit d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
-resource 0656c217f917c3e06234771e9ecae53aba5e173e
+commit cb9d9788d1854a6d4bc7235756df33b9d372a605
+resource 86399084097fb674569f5bc5847da609ab91aa9f
author z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
date Thu, 15 Dec 2022 17:28:04 +0000
diff --git a/crates/radicle-cli/examples/rad-cob-multiset.md b/crates/radicle-cli/examples/rad-cob-multiset.md
index bd52803a1e..808dc9ca92 100644
--- a/crates/radicle-cli/examples/rad-cob-multiset.md
+++ b/crates/radicle-cli/examples/rad-cob-multiset.md
@@ -41,28 +41,28 @@ It reads the current state of the grocery list and operations containing actions
We do not invoke the program directly, but instead use `rad cob create`:
```
-$ rad cob create --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type com.example.multiset --message "Create grocery shopping multiset" groceries.jsonl
+$ rad cob create --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --type com.example.multiset --message "Create grocery shopping multiset" groceries.jsonl
9bba8e6f83ef56b11151ef6ad02cc4595f982aab
```
We can verify that the COB evaluated as expected:
```
-$ rad cob show --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type com.example.multiset --object 9bba8e6f83ef56b11151ef6ad02cc4595f982aab
+$ rad cob show --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --type com.example.multiset --object 9bba8e6f83ef56b11151ef6ad02cc4595f982aab
{"jelly":0,"peanut butter":1,"salad":2}
```
To apply actions to COBs that already exist, we can use `rad cob update`:
```
-$ rad cob update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type com.example.multiset --object 9bba8e6f83ef56b11151ef6ad02cc4595f982aab --message "Modify grocery shopping multiset" groceries.jsonl
+$ rad cob update --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --type com.example.multiset --object 9bba8e6f83ef56b11151ef6ad02cc4595f982aab --message "Modify grocery shopping multiset" groceries.jsonl
d36aac77be13c1ca80edbfe7b7bf9b42c723f019
```
Again, we verify the result with `rad cob show`:
```
-$ rad cob show --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type com.example.multiset --object 9bba8e6f83ef56b11151ef6ad02cc4595f982aab
+$ rad cob show --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --type com.example.multiset --object 9bba8e6f83ef56b11151ef6ad02cc4595f982aab
{"jelly":0,"peanut butter":2,"salad":4}
```
diff --git a/crates/radicle-cli/examples/rad-cob-operations.md b/crates/radicle-cli/examples/rad-cob-operations.md
index 53c31e03bb..58f3596f2f 100644
--- a/crates/radicle-cli/examples/rad-cob-operations.md
+++ b/crates/radicle-cli/examples/rad-cob-operations.md
@@ -7,28 +7,28 @@ To demonstrate, we will first create an issue and interact with it:
$ rad issue open --title "flux capacitor underpowered" --description "Flux capacitor power requirements exceed current supply" --no-announce
╭─────────────────────────────────────────────────────────╮
│ Title flux capacitor underpowered │
-│ Issue d87dcfe8c2b3200e78b128d9b959cfdf7063fefe │
+│ Issue cb9d9788d1854a6d4bc7235756df33b9d372a605 │
│ Author alice (you) │
│ Status open │
│ │
│ Flux capacitor power requirements exceed current supply │
╰─────────────────────────────────────────────────────────╯
-$ rad issue react d87dcfe8c2b3200e78b128d9b959cfdf7063fefe --to d87dcfe8c2b3200e78b128d9b959cfdf7063fefe --emoji ✨ --no-announce
-$ rad issue comment d87dcfe8c2b3200e78b128d9b959cfdf7063fefe --message "Max power!" --no-announce
+$ rad issue react cb9d9788d1854a6d4bc7235756df33b9d372a605 --to cb9d9788d1854a6d4bc7235756df33b9d372a605 --emoji ✨ --no-announce
+$ rad issue comment cb9d9788d1854a6d4bc7235756df33b9d372a605 --message "Max power!" --no-announce
╭─────────────────────────╮
-│ alice (you) now 3c849c9 │
+│ alice (you) now 1ed4053 │
│ Max power! │
╰─────────────────────────╯
-$ rad issue assign d87dcfe8c2b3200e78b128d9b959cfdf7063fefe --add did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --no-announce
+$ rad issue assign cb9d9788d1854a6d4bc7235756df33b9d372a605 --add did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --no-announce
```
Now, let's see the list of operations using `rad cob log`:
```
-$ rad cob log --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.issue --object d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
-commit 376ba71113603004eae3c1b125c58cdc41d36b73
-resource 0656c217f917c3e06234771e9ecae53aba5e173e
-parent 3c849c9b555b18be9a1f6c71fb254ba000de8cfe
+$ rad cob log --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --type xyz.radicle.issue --object cb9d9788d1854a6d4bc7235756df33b9d372a605
+commit eef906e4c5174f987c250e3e7813775b76f222b2
+resource 86399084097fb674569f5bc5847da609ab91aa9f
+parent 1ed40536d39ace98070e97a2ab0e39aabe91a9b8
author z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
date Thu, 15 Dec 2022 17:28:04 +0000
@@ -39,33 +39,33 @@ date Thu, 15 Dec 2022 17:28:04 +0000
]
}
-commit 3c849c9b555b18be9a1f6c71fb254ba000de8cfe
-resource 0656c217f917c3e06234771e9ecae53aba5e173e
-parent 256908937f3cda8df522d5a3ba442eb935c3f11b
+commit 1ed40536d39ace98070e97a2ab0e39aabe91a9b8
+resource 86399084097fb674569f5bc5847da609ab91aa9f
+parent b9ec03b484bf82e857f82fa7fb1b510b371285d1
author z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
date Thu, 15 Dec 2022 17:28:04 +0000
{
"type": "comment",
"body": "Max power!",
- "replyTo": "d87dcfe8c2b3200e78b128d9b959cfdf7063fefe"
+ "replyTo": "cb9d9788d1854a6d4bc7235756df33b9d372a605"
}
-commit 256908937f3cda8df522d5a3ba442eb935c3f11b
-resource 0656c217f917c3e06234771e9ecae53aba5e173e
-parent d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
+commit b9ec03b484bf82e857f82fa7fb1b510b371285d1
+resource 86399084097fb674569f5bc5847da609ab91aa9f
+parent cb9d9788d1854a6d4bc7235756df33b9d372a605
author z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
date Thu, 15 Dec 2022 17:28:04 +0000
{
"type": "comment.react",
- "id": "d87dcfe8c2b3200e78b128d9b959cfdf7063fefe",
+ "id": "cb9d9788d1854a6d4bc7235756df33b9d372a605",
"reaction": "✨",
"active": true
}
-commit d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
-resource 0656c217f917c3e06234771e9ecae53aba5e173e
+commit cb9d9788d1854a6d4bc7235756df33b9d372a605
+resource 86399084097fb674569f5bc5847da609ab91aa9f
author z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
date Thu, 15 Dec 2022 17:28:04 +0000
@@ -86,10 +86,10 @@ options. We will need some commit revisions to use for those options, so let's
look at what those revision are by using `rad cob log`:
```
-$ rad cob log --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.issue --object d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
-commit 376ba71113603004eae3c1b125c58cdc41d36b73
-resource 0656c217f917c3e06234771e9ecae53aba5e173e
-parent 3c849c9b555b18be9a1f6c71fb254ba000de8cfe
+$ rad cob log --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --type xyz.radicle.issue --object cb9d9788d1854a6d4bc7235756df33b9d372a605
+commit eef906e4c5174f987c250e3e7813775b76f222b2
+resource 86399084097fb674569f5bc5847da609ab91aa9f
+parent 1ed40536d39ace98070e97a2ab0e39aabe91a9b8
author z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
date Thu, 15 Dec 2022 17:28:04 +0000
@@ -100,33 +100,33 @@ date Thu, 15 Dec 2022 17:28:04 +0000
]
}
-commit 3c849c9b555b18be9a1f6c71fb254ba000de8cfe
-resource 0656c217f917c3e06234771e9ecae53aba5e173e
-parent 256908937f3cda8df522d5a3ba442eb935c3f11b
+commit 1ed40536d39ace98070e97a2ab0e39aabe91a9b8
+resource 86399084097fb674569f5bc5847da609ab91aa9f
+parent b9ec03b484bf82e857f82fa7fb1b510b371285d1
author z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
date Thu, 15 Dec 2022 17:28:04 +0000
{
"type": "comment",
"body": "Max power!",
- "replyTo": "d87dcfe8c2b3200e78b128d9b959cfdf7063fefe"
+ "replyTo": "cb9d9788d1854a6d4bc7235756df33b9d372a605"
}
-commit 256908937f3cda8df522d5a3ba442eb935c3f11b
-resource 0656c217f917c3e06234771e9ecae53aba5e173e
-parent d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
+commit b9ec03b484bf82e857f82fa7fb1b510b371285d1
+resource 86399084097fb674569f5bc5847da609ab91aa9f
+parent cb9d9788d1854a6d4bc7235756df33b9d372a605
author z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
date Thu, 15 Dec 2022 17:28:04 +0000
{
"type": "comment.react",
- "id": "d87dcfe8c2b3200e78b128d9b959cfdf7063fefe",
+ "id": "cb9d9788d1854a6d4bc7235756df33b9d372a605",
"reaction": "✨",
"active": true
}
-commit d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
-resource 0656c217f917c3e06234771e9ecae53aba5e173e
+commit cb9d9788d1854a6d4bc7235756df33b9d372a605
+resource 86399084097fb674569f5bc5847da609ab91aa9f
author z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
date Thu, 15 Dec 2022 17:28:04 +0000
@@ -146,10 +146,10 @@ If we provide only the `--from` option, the operations we get back start from th
revision and go until the end:
```
-$ rad cob log --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.issue --object d87dcfe8c2b3200e78b128d9b959cfdf7063fefe --from 3c849c9b555b18be9a1f6c71fb254ba000de8cfe
-commit 376ba71113603004eae3c1b125c58cdc41d36b73
-resource 0656c217f917c3e06234771e9ecae53aba5e173e
-parent 3c849c9b555b18be9a1f6c71fb254ba000de8cfe
+$ rad cob log --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --type xyz.radicle.issue --object cb9d9788d1854a6d4bc7235756df33b9d372a605 --from 1ed40536d39ace98070e97a2ab0e39aabe91a9b8
+commit eef906e4c5174f987c250e3e7813775b76f222b2
+resource 86399084097fb674569f5bc5847da609ab91aa9f
+parent 1ed40536d39ace98070e97a2ab0e39aabe91a9b8
author z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
date Thu, 15 Dec 2022 17:28:04 +0000
@@ -160,16 +160,16 @@ date Thu, 15 Dec 2022 17:28:04 +0000
]
}
-commit 3c849c9b555b18be9a1f6c71fb254ba000de8cfe
-resource 0656c217f917c3e06234771e9ecae53aba5e173e
-parent 256908937f3cda8df522d5a3ba442eb935c3f11b
+commit 1ed40536d39ace98070e97a2ab0e39aabe91a9b8
+resource 86399084097fb674569f5bc5847da609ab91aa9f
+parent b9ec03b484bf82e857f82fa7fb1b510b371285d1
author z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
date Thu, 15 Dec 2022 17:28:04 +0000
{
"type": "comment",
"body": "Max power!",
- "replyTo": "d87dcfe8c2b3200e78b128d9b959cfdf7063fefe"
+ "replyTo": "cb9d9788d1854a6d4bc7235756df33b9d372a605"
}
```
@@ -178,22 +178,22 @@ Conversely, if we provide only the `--until` option, the operations we get back
start from the beginning and stop at that revision:
```
-$ rad cob log --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.issue --object d87dcfe8c2b3200e78b128d9b959cfdf7063fefe --until 256908937f3cda8df522d5a3ba442eb935c3f11b
-commit 256908937f3cda8df522d5a3ba442eb935c3f11b
-resource 0656c217f917c3e06234771e9ecae53aba5e173e
-parent d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
+$ rad cob log --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --type xyz.radicle.issue --object cb9d9788d1854a6d4bc7235756df33b9d372a605 --until b9ec03b484bf82e857f82fa7fb1b510b371285d1
+commit b9ec03b484bf82e857f82fa7fb1b510b371285d1
+resource 86399084097fb674569f5bc5847da609ab91aa9f
+parent cb9d9788d1854a6d4bc7235756df33b9d372a605
author z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
date Thu, 15 Dec 2022 17:28:04 +0000
{
"type": "comment.react",
- "id": "d87dcfe8c2b3200e78b128d9b959cfdf7063fefe",
+ "id": "cb9d9788d1854a6d4bc7235756df33b9d372a605",
"reaction": "✨",
"active": true
}
-commit d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
-resource 0656c217f917c3e06234771e9ecae53aba5e173e
+commit cb9d9788d1854a6d4bc7235756df33b9d372a605
+resource 86399084097fb674569f5bc5847da609ab91aa9f
author z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
date Thu, 15 Dec 2022 17:28:04 +0000
@@ -212,28 +212,28 @@ date Thu, 15 Dec 2022 17:28:04 +0000
Finally, if we provide both, we get back that exact range:
```
-$ rad cob log --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.issue --object d87dcfe8c2b3200e78b128d9b959cfdf7063fefe --from 256908937f3cda8df522d5a3ba442eb935c3f11b --until 3c849c9b555b18be9a1f6c71fb254ba000de8cfe
-commit 3c849c9b555b18be9a1f6c71fb254ba000de8cfe
-resource 0656c217f917c3e06234771e9ecae53aba5e173e
-parent 256908937f3cda8df522d5a3ba442eb935c3f11b
+$ rad cob log --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --type xyz.radicle.issue --object cb9d9788d1854a6d4bc7235756df33b9d372a605 --from b9ec03b484bf82e857f82fa7fb1b510b371285d1 --until 1ed40536d39ace98070e97a2ab0e39aabe91a9b8
+commit 1ed40536d39ace98070e97a2ab0e39aabe91a9b8
+resource 86399084097fb674569f5bc5847da609ab91aa9f
+parent b9ec03b484bf82e857f82fa7fb1b510b371285d1
author z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
date Thu, 15 Dec 2022 17:28:04 +0000
{
"type": "comment",
"body": "Max power!",
- "replyTo": "d87dcfe8c2b3200e78b128d9b959cfdf7063fefe"
+ "replyTo": "cb9d9788d1854a6d4bc7235756df33b9d372a605"
}
-commit 256908937f3cda8df522d5a3ba442eb935c3f11b
-resource 0656c217f917c3e06234771e9ecae53aba5e173e
-parent d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
+commit b9ec03b484bf82e857f82fa7fb1b510b371285d1
+resource 86399084097fb674569f5bc5847da609ab91aa9f
+parent cb9d9788d1854a6d4bc7235756df33b9d372a605
author z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
date Thu, 15 Dec 2022 17:28:04 +0000
{
"type": "comment.react",
- "id": "d87dcfe8c2b3200e78b128d9b959cfdf7063fefe",
+ "id": "cb9d9788d1854a6d4bc7235756df33b9d372a605",
"reaction": "✨",
"active": true
}
diff --git a/crates/radicle-cli/examples/rad-cob-show.md b/crates/radicle-cli/examples/rad-cob-show.md
index f5d0420db4..10e265f8ed 100644
--- a/crates/radicle-cli/examples/rad-cob-show.md
+++ b/crates/radicle-cli/examples/rad-cob-show.md
@@ -9,7 +9,7 @@ First create an issue.
$ rad issue open --title "spice harvester broken" --description "Fremen have attacked, maybe we went too far?" --no-announce
╭──────────────────────────────────────────────────╮
│ Title spice harvester broken │
-│ Issue 9de644864342d7a505eb8d58d1ef20e5bb05de2e │
+│ Issue 284179861d9b0481bb32d1b23a433f649e721cd1 │
│ Author alice (you) │
│ Status open │
│ │
@@ -24,7 +24,7 @@ $ rad issue list
╭─────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Labels Assignees Opened │
├─────────────────────────────────────────────────────────────────────────────────────┤
-│ ● 9de6448 spice harvester broken alice (you) now │
+│ ● 2841798 spice harvester broken alice (you) now │
╰─────────────────────────────────────────────────────────────────────────────────────╯
```
@@ -48,37 +48,37 @@ $ rad patch
╭───────────────────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Reviews Head + - Updated Labels │
├───────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● d1f7f86 Start drafting peace treaty alice (you) - 575ed68 +0 -0 now │
+│ ● 62cf30d Start drafting peace treaty alice (you) - 575ed68 +0 -0 now │
╰───────────────────────────────────────────────────────────────────────────────────────────────────╯
```
Both issue and patch COBs can be listed.
```
-$ rad cob list --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.issue
-9de644864342d7a505eb8d58d1ef20e5bb05de2e
-$ rad cob list --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.patch
-d1f7f869fde9fac19c1779c4c2e77e8361333f91
+$ rad cob list --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --type xyz.radicle.issue
+284179861d9b0481bb32d1b23a433f649e721cd1
+$ rad cob list --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --type xyz.radicle.patch
+62cf30dfdbb24063abb46c71dbf230aeb0a6c930
```
We can show the issue COB.
```
-$ rad cob show --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.issue --object 9de644864342d7a505eb8d58d1ef20e5bb05de2e
-{"assignees":[],"title":"spice harvester broken","state":{"status":"open"},"labels":[],"thread":{"comments":{"9de644864342d7a505eb8d58d1ef20e5bb05de2e":{"author":"z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi","reactions":[],"resolved":false,"body":"Fremen have attacked, maybe we went too far?","edits":[{"author":"z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi","timestamp":1671125284000,"body":"Fremen have attacked, maybe we went too far?","embeds":[]}]}},"timeline":["9de644864342d7a505eb8d58d1ef20e5bb05de2e"]}}
+$ rad cob show --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --type xyz.radicle.issue --object 284179861d9b0481bb32d1b23a433f649e721cd1
+{"assignees":[],"title":"spice harvester broken","state":{"status":"open"},"labels":[],"thread":{"comments":{"284179861d9b0481bb32d1b23a433f649e721cd1":{"author":"z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi","reactions":[],"resolved":false,"body":"Fremen have attacked, maybe we went too far?","edits":[{"author":"z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi","timestamp":1671125284000,"body":"Fremen have attacked, maybe we went too far?","embeds":[]}]}},"timeline":["284179861d9b0481bb32d1b23a433f649e721cd1"]}}
```
We can show the patch COB too.
```
-$ rad cob show --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.patch --object d1f7f869fde9fac19c1779c4c2e77e8361333f91
-{"title":"Start drafting peace treaty","author":{"id":"did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"},"state":{"status":"open"},"target":"delegates","labels":[],"merges":{},"revisions":{"d1f7f869fde9fac19c1779c4c2e77e8361333f91":{"id":"d1f7f869fde9fac19c1779c4c2e77e8361333f91","author":{"id":"did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"},"description":[{"author":"z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi","timestamp":1671125284000,"body":"See details.","embeds":[]}],"base":"f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354","oid":"575ed68c716d6aae81ea6b718fd9ac66a8eae532","discussion":{"comments":{},"timeline":[]},"reviews":{},"timestamp":1671125284000,"resolves":[],"reactions":[]}},"assignees":[],"timeline":["d1f7f869fde9fac19c1779c4c2e77e8361333f91"],"reviews":{}}
+$ rad cob show --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --type xyz.radicle.patch --object 62cf30dfdbb24063abb46c71dbf230aeb0a6c930
+{"title":"Start drafting peace treaty","author":{"id":"did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"},"state":{"status":"open"},"target":"delegates","labels":[],"merges":{},"revisions":{"62cf30dfdbb24063abb46c71dbf230aeb0a6c930":{"id":"62cf30dfdbb24063abb46c71dbf230aeb0a6c930","author":{"id":"did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"},"description":[{"author":"z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi","timestamp":1671125284000,"body":"See details.","embeds":[]}],"base":"f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354","oid":"575ed68c716d6aae81ea6b718fd9ac66a8eae532","discussion":{"comments":{},"timeline":[]},"reviews":{},"timestamp":1671125284000,"resolves":[],"reactions":[]}},"assignees":[],"timeline":["62cf30dfdbb24063abb46c71dbf230aeb0a6c930"],"reviews":{}}
```
Finally let's update the issue and see the output of `rad cob show` also changes.
```
-$ rad issue label 9de6448 --add bug --no-announce
-$ rad cob show --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.issue --object 9de644864342d7a505eb8d58d1ef20e5bb05de2e
-{"assignees":[],"title":"spice harvester broken","state":{"status":"open"},"labels":["bug"],"thread":{"comments":{"9de644864342d7a505eb8d58d1ef20e5bb05de2e":{"author":"z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi","reactions":[],"resolved":false,"body":"Fremen have attacked, maybe we went too far?","edits":[{"author":"z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi","timestamp":1671125284000,"body":"Fremen have attacked, maybe we went too far?","embeds":[]}]}},"timeline":["9de644864342d7a505eb8d58d1ef20e5bb05de2e"]}}
+$ rad issue label 2841798 --add bug --no-announce
+$ rad cob show --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --type xyz.radicle.issue --object 284179861d9b0481bb32d1b23a433f649e721cd1
+{"assignees":[],"title":"spice harvester broken","state":{"status":"open"},"labels":["bug"],"thread":{"comments":{"284179861d9b0481bb32d1b23a433f649e721cd1":{"author":"z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi","reactions":[],"resolved":false,"body":"Fremen have attacked, maybe we went too far?","edits":[{"author":"z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi","timestamp":1671125284000,"body":"Fremen have attacked, maybe we went too far?","embeds":[]}]}},"timeline":["284179861d9b0481bb32d1b23a433f649e721cd1"]}}
```
diff --git a/crates/radicle-cli/examples/rad-cob-update-identity.md b/crates/radicle-cli/examples/rad-cob-update-identity.md
index 40083e8c22..0259ca911b 100644
--- a/crates/radicle-cli/examples/rad-cob-update-identity.md
+++ b/crates/radicle-cli/examples/rad-cob-update-identity.md
@@ -1,6 +1,6 @@
Updating the repository identity via `rad cob update` is forbidden:
``` (fail)
-$ rad cob update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.id --object 0656c217f917c3e06234771e9ecae53aba5e173e --message "Danger" /dev/null
+$ rad cob update --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --type xyz.radicle.id --object 86399084097fb674569f5bc5847da609ab91aa9f --message "Danger" /dev/null
✗ Error: Update of collaborative objects of type xyz.radicle.id is not supported.
```
\ No newline at end of file
diff --git a/crates/radicle-cli/examples/rad-cob-update.md b/crates/radicle-cli/examples/rad-cob-update.md
index efd6682b8f..c571ddedd5 100644
--- a/crates/radicle-cli/examples/rad-cob-update.md
+++ b/crates/radicle-cli/examples/rad-cob-update.md
@@ -12,8 +12,8 @@ $ git commit --message "Add README, just for the fun"
``` (stderr)
$ git push rad -o patch.message="Add README, just for the fun" HEAD:refs/patches
-✓ Patch 89f7afb1511b976482b21f6b2f39aef7f4fb88a2 opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Patch f36ce41ee8d55d3723ad65ad39741391f9bed979 opened
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
@@ -28,25 +28,25 @@ $ git commit -v -m "Define the LICENSE"
``` (stderr)
$ git push -f -o patch.message="Add License"
-✓ Patch 89f7afb updated to revision 5d78dd5376453e25df5988ec86951c99cb73742c
-To compare against your previous revision 89f7afb, run:
+✓ Patch f36ce41 updated to revision 66230c3d87c5c444803e7d012a710013505dcdb9
+To compare against your previous revision f36ce41, run:
git range-diff f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 03c02af4b12a593d17a06d38fae50a57fc3c339a 8945f6189adf027892c85ac57f7e9341049c2537
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- 03c02af..8945f61 changes -> patches/89f7afb1511b976482b21f6b2f39aef7f4fb88a2
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ 03c02af..8945f61 changes -> patches/f36ce41ee8d55d3723ad65ad39741391f9bed979
```
Let's look at the patch, to see what it looks like before editing it:
```
-$ rad patch show 89f7afb
+$ rad patch show f36ce41
╭──────────────────────────────────────────────────────────╮
│ Title Add README, just for the fun │
-│ Patch 89f7afb1511b976482b21f6b2f39aef7f4fb88a2 │
+│ Patch f36ce41ee8d55d3723ad65ad39741391f9bed979 │
│ Author alice (you) │
│ Head 8945f6189adf027892c85ac57f7e9341049c2537 │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
│ Branches changes │
│ Commits ahead 2, behind 0 │
@@ -55,8 +55,8 @@ $ rad patch show 89f7afb
│ 8945f61 Define the LICENSE │
│ 03c02af Add README, just for the fun │
├──────────────────────────────────────────────────────────┤
-│ ● Revision 89f7afb @ f2de534..03c02af by alice (you) now │
-│ ↑ Revision 5d78dd5 @ f2de534..8945f61 by alice (you) now │
+│ ● Revision f36ce41 @ f2de534..03c02af by alice (you) now │
+│ ↑ Revision 66230c3 @ f2de534..8945f61 by alice (you) now │
╰──────────────────────────────────────────────────────────╯
```
@@ -64,14 +64,14 @@ We can change the title and description of the patch itself by using a
multi-line message (using two `--message` options here):
```
-$ rad patch edit 89f7afb --message "Add Metadata" --message "Add README & LICENSE" --no-announce
-$ rad patch show 89f7afb
+$ rad patch edit f36ce41 --message "Add Metadata" --message "Add README & LICENSE" --no-announce
+$ rad patch show f36ce41
╭──────────────────────────────────────────────────────────╮
│ Title Add Metadata │
-│ Patch 89f7afb1511b976482b21f6b2f39aef7f4fb88a2 │
+│ Patch f36ce41ee8d55d3723ad65ad39741391f9bed979 │
│ Author alice (you) │
│ Head 8945f6189adf027892c85ac57f7e9341049c2537 │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
│ Branches changes │
│ Commits ahead 2, behind 0 │
@@ -82,15 +82,15 @@ $ rad patch show 89f7afb
│ 8945f61 Define the LICENSE │
│ 03c02af Add README, just for the fun │
├──────────────────────────────────────────────────────────┤
-│ ● Revision 89f7afb @ f2de534..03c02af by alice (you) now │
-│ ↑ Revision 5d78dd5 @ f2de534..8945f61 by alice (you) now │
+│ ● Revision f36ce41 @ f2de534..03c02af by alice (you) now │
+│ ↑ Revision 66230c3 @ f2de534..8945f61 by alice (you) now │
╰──────────────────────────────────────────────────────────╯
```
We prepare the file `revision-edit.json` which contains one action (thus one line) to be applied.
``` ./revision-edit.jsonl
-{"type": "revision.edit", "description": "Add README and LICENSE", "revision": "89f7afb1511b976482b21f6b2f39aef7f4fb88a2"}
+{"type": "revision.edit", "description": "Add README and LICENSE", "revision": "f36ce41ee8d55d3723ad65ad39741391f9bed979"}
```
We now use `rad cob update` to edit the patch another time, rewriting the description.
@@ -99,12 +99,12 @@ specifying the revision for which the description should be changed, and `descri
specifying the new description.
```
-$ rad cob update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.patch --object 89f7afb1511b976482b21f6b2f39aef7f4fb88a2 --message "Edit patch" revision-edit.jsonl
-79b816e92735c49b33d93a31890fdf040b36234c
-$ rad patch show --verbose 89f7afb
+$ rad cob update --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --type xyz.radicle.patch --object f36ce41ee8d55d3723ad65ad39741391f9bed979 --message "Edit patch" revision-edit.jsonl
+bf3e9bdd3778836be49b76f987d15066b973952e
+$ rad patch show --verbose f36ce41
╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ Title Add Metadata │
-│ Patch 89f7afb1511b976482b21f6b2f39aef7f4fb88a2 │
+│ Patch f36ce41ee8d55d3723ad65ad39741391f9bed979 │
│ Author alice (you) │
│ Head 8945f6189adf027892c85ac57f7e9341049c2537 │
│ Base f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 │
@@ -118,8 +118,8 @@ $ rad patch show --verbose 89f7afb
│ 8945f61 Define the LICENSE │
│ 03c02af Add README, just for the fun │
├──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● Revision 89f7afb1511b976482b21f6b2f39aef7f4fb88a2 with range f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354..03c02af4b12a593d17a06d38fae50a57fc3c339a by alice (you) now │
-│ ↑ Revision 5d78dd5376453e25df5988ec86951c99cb73742c with range f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354..8945f6189adf027892c85ac57f7e9341049c2537 by alice (you) now │
+│ ● Revision f36ce41ee8d55d3723ad65ad39741391f9bed979 with range f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354..03c02af4b12a593d17a06d38fae50a57fc3c339a by alice (you) now │
+│ ↑ Revision 66230c3d87c5c444803e7d012a710013505dcdb9 with range f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354..8945f6189adf027892c85ac57f7e9341049c2537 by alice (you) now │
╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
```
@@ -142,7 +142,7 @@ We prepare the file `revision-create.jsonl` which contains one action.
Attempting to create the new revision right away would fail:
``` (fail)
-$ rad cob update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.patch --object 89f7afb1511b976482b21f6b2f39aef7f4fb88a2 --message "Create new revision" revision.jsonl
+$ rad cob update --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --type xyz.radicle.patch --object f36ce41ee8d55d3723ad65ad39741391f9bed979 --message "Create new revision" revision.jsonl
✗ Error: store: update error: failed to read 'f1339dd109e538c6b3a7fed3e72403e1b4db08c9' from git odb
```
@@ -158,15 +158,15 @@ $ git push rad :tmp/heads/f1339dd109e538c6b3a7fed3e72403e1b4db08c9
Now we can invoke `rad cob update`:
```
-$ rad cob update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --type xyz.radicle.patch --object 89f7afb1511b976482b21f6b2f39aef7f4fb88a2 --message "Create new revision" revision.jsonl
-2da9c025a1d14d93c4f2cec60a7878afbc5e2a3c
-$ rad patch show 89f7afb
+$ rad cob update --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --type xyz.radicle.patch --object f36ce41ee8d55d3723ad65ad39741391f9bed979 --message "Create new revision" revision.jsonl
+fdfc4def2abbd93059a6fbf48276dc91c0d49636
+$ rad patch show f36ce41
╭──────────────────────────────────────────────────────────╮
│ Title Add Metadata │
-│ Patch 89f7afb1511b976482b21f6b2f39aef7f4fb88a2 │
+│ Patch f36ce41ee8d55d3723ad65ad39741391f9bed979 │
│ Author alice (you) │
│ Head f1339dd109e538c6b3a7fed3e72403e1b4db08c9 │
-│ Base [.. ] │
+│ Base f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 │
│ Target master │
│ Branches changes │
│ Commits ahead 3, behind 0 │
@@ -178,8 +178,8 @@ $ rad patch show 89f7afb
│ 8945f61 Define the LICENSE │
│ 03c02af Add README, just for the fun │
├──────────────────────────────────────────────────────────┤
-│ ● Revision 89f7afb @ f2de534..03c02af by alice (you) now │
-│ ↑ Revision 5d78dd5 @ f2de534..8945f61 by alice (you) now │
-│ ↑ Revision 2da9c02 @ f2de534..f1339dd by alice (you) now │
+│ ● Revision f36ce41 @ f2de534..03c02af by alice (you) now │
+│ ↑ Revision 66230c3 @ f2de534..8945f61 by alice (you) now │
+│ ↑ Revision fdfc4de @ f2de534..f1339dd by alice (you) now │
╰──────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-fetch.md b/crates/radicle-cli/examples/rad-fetch.md
index 89a4dd783f..cf384e4be1 100644
--- a/crates/radicle-cli/examples/rad-fetch.md
+++ b/crates/radicle-cli/examples/rad-fetch.md
@@ -5,12 +5,12 @@ necessary.
Instead, we want to fetch the project from the network into our local
storage. In this scenario, we know that the project is
-`rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji`. In order to fetch it, we first
+`rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G`. In order to fetch it, we first
have to update our seeding policy for the project.
```
-$ rad seed rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --no-fetch
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'followed'
+$ rad seed rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --no-fetch
+✓ Seeding policy updated for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G with scope 'followed'
```
Now that the project is seeding we can fetch it and we will have it in
@@ -18,8 +18,8 @@ our local storage. Note that the `seed` command can also be told to fetch
by passing the `--fetch` option.
```
-$ rad sync --fetch rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+$ rad sync --fetch rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
```
diff --git a/crates/radicle-cli/examples/rad-fork.md b/crates/radicle-cli/examples/rad-fork.md
index 3fc0ff6379..30dee37650 100644
--- a/crates/radicle-cli/examples/rad-fork.md
+++ b/crates/radicle-cli/examples/rad-fork.md
@@ -4,12 +4,12 @@ NID. This is demonstrated below where our NID is
`z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk`:
```
-$ rad inspect rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --refs
+$ rad inspect rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --refs
z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
└── refs
├── cobs
│ └── xyz.radicle.id
- │ └── [...]
+ │ └── [..]
├── heads
│ └── master
└── rad
@@ -22,20 +22,20 @@ To remedy this, we can use the `rad fork` command for the project we
wish to fork:
```
-$ rad fork rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Forked repository rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+$ rad fork rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+✓ Forked repository rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
```
Now, if we `rad inspect` the project's refs again we will see that we
have a copy of the main set of refs:
```
-$ rad inspect rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --refs
+$ rad inspect rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --refs
z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
└── refs
├── cobs
│ └── xyz.radicle.id
- │ └── [...]
+ │ └── [..]
├── heads
│ └── master
└── rad
diff --git a/crates/radicle-cli/examples/rad-help.md b/crates/radicle-cli/examples/rad-help.md
index c25d2557bf..c034dc36cb 100644
--- a/crates/radicle-cli/examples/rad-help.md
+++ b/crates/radicle-cli/examples/rad-help.md
@@ -9,7 +9,7 @@ Do you have feedback?
- Mail <feedback@radicle.dev>
(Messages are automatically posted to the public #feedback channel on Zulip.)
-Usage: rad[EXE] <COMMAND>
+Usage: rad <COMMAND>
Commands:
auth Manage identities and profiles
diff --git a/crates/radicle-cli/examples/rad-id-collaboration.md b/crates/radicle-cli/examples/rad-id-collaboration.md
index f88738a65c..567e436014 100644
--- a/crates/radicle-cli/examples/rad-id-collaboration.md
+++ b/crates/radicle-cli/examples/rad-id-collaboration.md
@@ -7,10 +7,10 @@ First, we'll start off with Alice adding Bob. It's necessary for Bob
to have a fork of the project and Alice must be aware of the fork:
``` ~bob
-$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --scope followed
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'followed'
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkuPZ…xEuaPUp@[..]..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkvVv…Z1Ct4tD@[..]..
+$ rad clone rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --scope followed
+✓ Seeding policy updated for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G with scope 'followed'
+✓ Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from z6MkuPZ…xEuaPUp@[..]..
+✓ Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from z6MkvVv…Z1Ct4tD@[..]..
✓ Creating checkout in ./heartwood..
✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
✓ Remote-tracking branch alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master created for z6MknSL…StBU8Vi
@@ -30,8 +30,8 @@ to the default branch, she must set the `threshold` to `2` when adding
Bob as a delegate:
``` ~alice (fails)
-$ rad id update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Add Bob" --description "" --threshold 2 --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --no-confirm -q
-✗ Error: failed to verify delegates for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+$ rad id update --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --title "Add Bob" --description "" --threshold 2 --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --no-confirm -q
+✗ Error: failed to verify delegates for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
✗ Error: a threshold of 2 delegates cannot be met, found 1 delegate(s) and the following delegates are missing [did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk]
✗ Hint: run `rad follow did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk` to follow this missing peer
✗ Hint: run `rad sync -f` to attempt to fetch the newly followed peers
@@ -50,15 +50,15 @@ So, instead Alice needs to first follow Bob and fetch his references:
$ rad follow did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --alias bob
✓ Follow policy updated for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (bob)
$ rad sync
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkuPZ…xEuaPUp@[..]..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkvVv…Z1Ct4tD@[..]..
+✓ Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from z6MkuPZ…xEuaPUp@[..]..
+✓ Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from z6MkvVv…Z1Ct4tD@[..]..
✓ Fetched repository from 2 seed(s)
✓ Synced with 1 node(s)
-$ rad id update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Add Bob" --description "" --threshold 2 --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --no-confirm -q
-069e7d58faa9a7473d27f5510d676af33282796f
+$ rad id update --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --title "Add Bob" --description "" --threshold 2 --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --no-confirm -q
+c7d68a801ed8c107521cb63b4089b4bd6601fad4
$ rad sync
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkuPZ…xEuaPUp@[..]..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkvVv…Z1Ct4tD@[..]..
+✓ Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from z6MkuPZ…xEuaPUp@[..]..
+✓ Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from z6MkvVv…Z1Ct4tD@[..]..
✓ Fetched repository from 2 seed(s)
✓ Synced with 3 node(s)
```
@@ -67,8 +67,8 @@ Bob can confirm that he was made a delegate by fetching the update:
``` ~bob
$ rad sync
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkuPZ…xEuaPUp@[..]..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkvVv…Z1Ct4tD@[..]..
+✓ Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from z6MkuPZ…xEuaPUp@[..]..
+✓ Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from z6MkvVv…Z1Ct4tD@[..]..
✓ Fetched repository from 2 seed(s)
✓ Synced with 1 node(s)
$ rad inspect --delegates
@@ -81,10 +81,10 @@ project. For Bob to propose Eve, similar steps need to happen as
between Alice and Bob. Eve first needs to set up a fork:
``` ~eve
-$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --scope followed
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'followed'
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkuPZ…xEuaPUp@[..]..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkvVv…Z1Ct4tD@[..]..
+$ rad clone rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --scope followed
+✓ Seeding policy updated for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G with scope 'followed'
+✓ Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from z6MkuPZ…xEuaPUp@[..]..
+✓ Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from z6MkvVv…Z1Ct4tD@[..]..
✓ Creating checkout in ./heartwood..
✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
✓ Remote-tracking branch alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master created for z6MknSL…StBU8Vi
@@ -104,11 +104,11 @@ $ git push rad master
Bob then adds Eve as a delegate:
``` ~bob
-$ rad id update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Add Eve" --description "" --delegate did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z --no-confirm -q
-3cd3c7f9900de0fcb19705856a7cc339a38fb0b3
+$ rad id update --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --title "Add Eve" --description "" --delegate did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z --no-confirm -q
+46bb20352ca9d8c0a5b9fdccf17f66ff9f13aeaf
$ rad sync
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkvVv…Z1Ct4tD@[..]..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkuPZ…xEuaPUp@[..]..
+✓ Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from z6MkvVv…Z1Ct4tD@[..]..
+✓ Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from z6MkuPZ…xEuaPUp@[..]..
✓ Fetched repository from 2 seed(s)
✓ Synced with 3 node(s)
```
@@ -122,27 +122,27 @@ the change to meet a quorum of votes (`votes >= (delegates / 2) + 1`):
``` ~alice
$ rad sync
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkvVv…Z1Ct4tD@[..]..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkuPZ…xEuaPUp@[..]..
+✓ Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from z6MkvVv…Z1Ct4tD@[..]..
+✓ Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from z6MkuPZ…xEuaPUp@[..]..
✓ Fetched repository from 2 seed(s)
✓ Nothing to announce, already in sync with 3 node(s) (see `rad sync status`)
$ rad id list
╭────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Status Created │
├────────────────────────────────────────────────────────────────────────────────┤
-│ ● 3cd3c7f Add Eve bob z6Mkt67…v4N1tRk active now │
-│ ● 069e7d5 Add Bob alice (you) accepted now │
-│ ● 0656c21 Initial revision alice (you) accepted now │
+│ ● c7d68a8 Add Eve bob z6Mkt67…v4N1tRk active now │
+│ ● c7d68a8 Add Bob alice (you) accepted now │
+│ ● 8639908 Initial revision alice (you) accepted now │
╰────────────────────────────────────────────────────────────────────────────────╯
-$ rad inspect rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --sigrefs
+$ rad inspect rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --sigrefs
z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi 6acd3b370839318d96dbfff43948bab2bcdd3681
z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk c40018821dc1b41cad75e91e0c9d00827e815324
-$ rad id accept 3cd3c7f
-✓ Revision 3cd3c7f9900de0fcb19705856a7cc339a38fb0b3 accepted
+$ rad id accept c7d68a8
+✓ Revision 46bb20352ca9d8c0a5b9fdccf17f66ff9f13aeaf accepted
╭────────────────────────────────────────────────────────────────────────╮
│ Title Add Eve │
-│ Revision 3cd3c7f9900de0fcb19705856a7cc339a38fb0b3 │
-│ Blob 74581605d1f75396c331487a10ca61c4815ed685 │
+│ Revision 46bb20352ca9d8c0a5b9fdccf17f66ff9f13aeaf │
+│ Blob 57dda7d9ab25ad958838e479c0c8e5ab7af56cd7 │
│ Author did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk │
│ State accepted │
│ Quorum yes │
@@ -157,11 +157,11 @@ since she has become a delegate:
``` ~alice
$ rad sync --timeout 3s
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkvVv…Z1Ct4tD@[..]..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkuPZ…xEuaPUp@[..]..
+✓ Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from z6MkvVv…Z1Ct4tD@[..]..
+✓ Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from z6MkuPZ…xEuaPUp@[..]..
✓ Fetched repository from 2 seed(s)
✓ Synced with 3 node(s)
-$ rad inspect rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --sigrefs
+$ rad inspect rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --sigrefs
z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi 1f716870f890be0c13fdd0af9f527af849fec792 parent
z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk c40018821dc1b41cad75e91e0c9d00827e815324 parent
z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z 95cd447c57de8d232c6154f5dba0451aa593520e parent
@@ -173,8 +173,8 @@ see that both seeds are `synced`:
``` ~eve
$ rad sync
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkvVv…Z1Ct4tD@[..]..
-✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MkuPZ…xEuaPUp@[..]..
+✓ Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from z6MkvVv…Z1Ct4tD@[..]..
+✓ Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from z6MkuPZ…xEuaPUp@[..]..
✓ Fetched repository from 2 seed(s)
✓ Synced with 3 node(s)
$ rad sync status
diff --git a/crates/radicle-cli/examples/rad-id-conflict.md b/crates/radicle-cli/examples/rad-id-conflict.md
index 32d1e7a9b0..26c65862ad 100644
--- a/crates/radicle-cli/examples/rad-id-conflict.md
+++ b/crates/radicle-cli/examples/rad-id-conflict.md
@@ -2,12 +2,12 @@ First let's add Bob as a delegate, and sync the changes to Bob:
``` ~alice
$ rad id update --title "Add Bob" --description "Add Bob as a delegate" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --threshold 2 -q
-0ca42d376bd566631083c8913cf86bec722da392
+491c96a516cd9ed236f83e2e2d52d8799f31f4b4
```
``` ~bob
$ cd heartwood
-$ rad sync --fetch rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+$ rad sync --fetch rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
```
@@ -17,11 +17,11 @@ time:
``` ~alice
$ rad id update --title "Edit project name" --description "" --payload "xyz.radicle.project" "name" '"heart"' -q
-12d7300d1bbba84e4e5760c8c61999bf5fefb81a
+3ed4e24714345d5a27563b671f219112db17d482
```
``` ~bob
$ rad id update --title "Edit project name" --description "" --payload "xyz.radicle.project" "name" '"wood"' -q
-89b2623e7f2ddf5748661b15b9975ab0b4ee17ab
+ff74fd6ae8df3729b4554e2287f403cb335ff615
```
When Alice syncs with Bob, she notices the problem: there are two active
@@ -29,18 +29,18 @@ revisions, and because she's created one of them she has implicitly voted
for it.
``` ~alice
-$ rad sync --fetch rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+$ rad sync --fetch rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
🌱 Fetched from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
$ rad id list
╭────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Status Created Parent │
├────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● 89b2623 Edit project name bob z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk active now 0ca42d3 │
-│ ● 12d7300 Edit project name alice (you) active now 0ca42d3 │
-│ ● 0ca42d3 Add Bob alice (you) accepted now 0656c21 │
-│ ● 0656c21 Initial revision alice (you) accepted now none │
+│ ● ff74fd6 Edit project name bob z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk active now 491c96a │
+│ ● 3ed4e24 Edit project name alice (you) active now 491c96a │
+│ ● 491c96a Add Bob alice (you) accepted now 8639908 │
+│ ● 8639908 Initial revision alice (you) accepted now none │
╰────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
Hints:
@@ -48,12 +48,12 @@ Hints:
● accepted
● rejected:
✘ … by delegate votes ↥ … by parent ⇄ … by sibling
-$ rad id show 12d7300
+$ rad id show 3ed4e24
╭────────────────────────────────────────────────────────────────────────╮
│ Title Edit project name │
-│ Revision 12d7300d1bbba84e4e5760c8c61999bf5fefb81a │
-│ Parent 0ca42d376bd566631083c8913cf86bec722da392 │
-│ Blob e93aa3e3c5c448bacd3537a81daf1437eccd046a │
+│ Revision 3ed4e24714345d5a27563b671f219112db17d482 │
+│ Parent 491c96a516cd9ed236f83e2e2d52d8799f31f4b4 │
+│ Blob 86976266f9461d48203823b309d18866237af3c0 │
│ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │
│ State active │
│ Quorum no │
@@ -62,11 +62,22 @@ $ rad id show 12d7300
│ ? did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk bob │
╰────────────────────────────────────────────────────────────────────────╯
-@@ -1,14 +1,14 @@
+@@ -1,24 +1,24 @@
{
+ "version": 2,
"payload": {
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 2
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
"xyz.radicle.project": {
- "defaultBranch": "master",
"description": "Radicle Heartwood Protocol & Stack",
- "name": "heartwood"
+ "name": "heart"
@@ -75,16 +86,15 @@ $ rad id show 12d7300
"delegates": [
"did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
"did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
- ],
- "threshold": 2
+ ]
}
```
If she tries to accept Bob's revision she'll receive an appropriate error:
``` ~alice (fail)
-$ rad id accept 89b2623
-✗ Error: apply failed: delegate already accepted a sibling revision '12d7300d1bbba84e4e5760c8c61999bf5fefb81a'
+$ rad id accept ff74fd6
+✗ Error: apply failed: delegate already accepted a sibling revision '3ed4e24714345d5a27563b671f219112db17d482'
```
However this isn't a problem as long as we don't try to accept both. Alice
@@ -92,15 +102,15 @@ decides to go with Bob's proposal, so she redacts her own first and then
accepts his:
``` ~alice
-$ rad id redact 12d7300 -q
-$ rad id accept 89b2623 -q
+$ rad id redact 3ed4e24 -q
+$ rad id accept ff74fd6 -q
$ rad id list
╭────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Status Created Parent │
├────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● 89b2623 Edit project name bob z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk accepted now 0ca42d3 │
-│ ● 0ca42d3 Add Bob alice (you) accepted now 0656c21 │
-│ ● 0656c21 Initial revision alice (you) accepted now none │
+│ ● ff74fd6 Edit project name bob z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk accepted now 491c96a │
+│ ● 491c96a Add Bob alice (you) accepted now 8639908 │
+│ ● 8639908 Initial revision alice (you) accepted now none │
╰────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
Hints:
@@ -114,12 +124,12 @@ Alice's revision was redacted and is no longer visible. Bob syncs and sees
that the conflict is resolved:
``` ~bob
-$ rad sync --fetch rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+$ rad sync --fetch rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
```
``` ~bob (fail)
-$ rad id show 12d7300
-✗ Error: revision `12d7300d1bbba84e4e5760c8c61999bf5fefb81a` not found
+$ rad id show 3ed4e24
+✗ Error: revision `3ed4e24714345d5a27563b671f219112db17d482` not found
```
diff --git a/crates/radicle-cli/examples/rad-id-migrate-vote.md b/crates/radicle-cli/examples/rad-id-migrate-vote.md
new file mode 100644
index 0000000000..9ff3f82403
--- /dev/null
+++ b/crates/radicle-cli/examples/rad-id-migrate-vote.md
@@ -0,0 +1,110 @@
+Alice adds Bob as a delegate. With two delegates, no revision is adopted until
+both have voted.
+
+``` ~alice
+$ rad id update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Add Bob" --description "" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --no-confirm -q
+c036c0d89ce26aef3ad7da402157dba16b5163b4
+```
+
+Alice proposes the migration to identity document version 2. It waits for Bob.
+
+``` ~alice
+$ rad id migrate --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Migrate identity" --description "" --no-confirm
+Migrating identity document from version 1 to 2. Once adopted, this repository is no longer readable to older releases.
+✓ Identity revision 9cad7b4bc7a3180902ed5d2cc945d242cf8f4394 created
+╭────────────────────────────────────────────────────────────────────────╮
+│ Title Migrate identity │
+│ Revision 9cad7b4bc7a3180902ed5d2cc945d242cf8f4394 │
+│ Parent c036c0d89ce26aef3ad7da402157dba16b5163b4 │
+│ Blob 0653b9dbe278688862856d37e1c6bb66ef35ebed │
+│ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │
+│ State active │
+│ Quorum no │
+├────────────────────────────────────────────────────────────────────────┤
+│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
+│ ? did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk bob │
+╰────────────────────────────────────────────────────────────────────────╯
+
+@@ -1,14 +1,24 @@
+ {
++ "version": 2,
+ "payload": {
++ "xyz.radicle.crefs": {
++ "rules": {
++ "refs/heads/master": {
++ "allow": "delegates",
++ "threshold": 1
++ }
++ },
++ "symbolic": {
++ "HEAD": "refs/heads/master"
++ }
++ },
+ "xyz.radicle.project": {
+- "defaultBranch": "master",
+ "description": "Radicle Heartwood Protocol & Stack",
+ "name": "heartwood"
+ }
+ },
+ "delegates": [
+ "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
+ "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
+- ],
+- "threshold": 1
++ ]
+ }
+```
+
+Bob fetches the proposal and accepts it. Voting on a revision whose parent is a
+version 1 document works the same as any other vote.
+
+``` ~bob
+$ rad sync --fetch rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+✓ Target met: 1 seed(s)
+🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+$ rad id accept 9cad7b4bc7a3180902ed5d2cc945d242cf8f4394 --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --no-confirm
+✓ Revision 9cad7b4bc7a3180902ed5d2cc945d242cf8f4394 accepted
+╭────────────────────────────────────────────────────────────────────────╮
+│ Title Migrate identity │
+│ Revision 9cad7b4bc7a3180902ed5d2cc945d242cf8f4394 │
+│ Parent c036c0d89ce26aef3ad7da402157dba16b5163b4 │
+│ Blob 0653b9dbe278688862856d37e1c6bb66ef35ebed │
+│ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │
+│ State accepted │
+│ Quorum yes │
+├────────────────────────────────────────────────────────────────────────┤
+│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice │
+│ ✓ did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk bob (you) │
+╰────────────────────────────────────────────────────────────────────────╯
+```
+
+The document is now at version 2 for both delegates.
+
+``` ~bob
+$ rad inspect --identity rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+{
+ "version": 2,
+ "payload": {
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 1
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
+ "xyz.radicle.project": {
+ "description": "Radicle Heartwood Protocol & Stack",
+ "name": "heartwood"
+ }
+ },
+ "delegates": [
+ "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
+ "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
+ ]
+}
+```
diff --git a/crates/radicle-cli/examples/rad-id-migrate.md b/crates/radicle-cli/examples/rad-id-migrate.md
new file mode 100644
index 0000000000..d28d90a623
--- /dev/null
+++ b/crates/radicle-cli/examples/rad-id-migrate.md
@@ -0,0 +1,181 @@
+A repository can be initialized at an older identity document version, so that
+it stays readable to releases that predate the current version.
+
+```
+$ rad init --name heartwood --description "Radicle Heartwood Protocol & Stack" --identity-version 1 --no-confirm --public
+
+Initializing public Radicle 👾 repository in [..]
+
+✓ Repository heartwood created.
+
+Your Repository ID (RID) is rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+You can show it any time by running `rad .` from this directory.
+
+Your repository will be announced to the network when you start your node.
+You can start your node with `rad node start`.
+To push changes, run `git push`.
+```
+
+The document is stored in the version 1 format: the default branch lives in the
+`xyz.radicle.project` payload and the write quorum in the top-level `threshold`.
+
+```
+$ rad inspect --identity
+{
+ "payload": {
+ "xyz.radicle.project": {
+ "defaultBranch": "master",
+ "description": "Radicle Heartwood Protocol & Stack",
+ "name": "heartwood"
+ }
+ },
+ "delegates": [
+ "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
+ ],
+ "threshold": 1
+}
+```
+
+Readers see the document migrated to the current version, so the default branch
+and its quorum appear as a canonical reference rule even though they are not
+stored that way.
+
+```
+$ rad inspect --payload
+{
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 1
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
+ "xyz.radicle.project": {
+ "name": "heartwood",
+ "description": "Radicle Heartwood Protocol & Stack"
+ }
+}
+```
+
+Everything else works as usual against such a repository. Patches open and merge
+against the default branch the migrated view resolves.
+
+```
+$ rad inspect
+rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+```
+
+```
+$ git checkout -q -b flux-capacitor-power
+$ touch REQUIREMENTS
+$ git add REQUIREMENTS
+$ git commit -q -m "Define power requirements"
+```
+
+``` (stderr)
+$ git push rad -o patch.message="Define power requirements" HEAD:refs/patches
+✓ Patch b52d0f6358430655d7305f28a9f417cd5985dee3 opened
+To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ * [new reference] HEAD -> refs/patches
+```
+
+``` (stderr)
+$ git checkout -q master
+$ git merge -q flux-capacitor-power
+$ git push rad master
+✓ Patch b52d0f6358430655d7305f28a9f417cd5985dee3 merged
+✓ Canonical reference refs/heads/master updated to target commit 3e674d1a1df90807e934f9ae5da2591dd6848a33
+To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ f2de534..3e674d1 master -> master
+```
+
+When you are ready to move to the current version, propose the migration. As the
+only delegate, your own vote adopts it immediately.
+
+```
+$ rad id migrate --title "Migrate identity" --description "Move to version 2"
+Migrating identity document from version 1 to 2. Once adopted, this repository is no longer readable to older releases.
+✓ Identity revision 487a05d8fc17ace09103a4a20b43030353e0e943 created
+╭────────────────────────────────────────────────────────────────────────╮
+│ Title Migrate identity │
+│ Revision 487a05d8fc17ace09103a4a20b43030353e0e943 │
+│ Parent 0656c217f917c3e06234771e9ecae53aba5e173e │
+│ Blob f10bd9e36848dc4eb70cc078d1d0bbaac7c1ba61 │
+│ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │
+│ State accepted │
+│ Quorum yes │
+│ │
+│ Move to version 2 │
+├────────────────────────────────────────────────────────────────────────┤
+│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
+╰────────────────────────────────────────────────────────────────────────╯
+
+@@ -1,13 +1,23 @@
+ {
++ "version": 2,
+ "payload": {
++ "xyz.radicle.crefs": {
++ "rules": {
++ "refs/heads/master": {
++ "allow": "delegates",
++ "threshold": 1
++ }
++ },
++ "symbolic": {
++ "HEAD": "refs/heads/master"
++ }
++ },
+ "xyz.radicle.project": {
+- "defaultBranch": "master",
+ "description": "Radicle Heartwood Protocol & Stack",
+ "name": "heartwood"
+ }
+ },
+ "delegates": [
+ "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
+- ],
+- "threshold": 1
++ ]
+ }
+```
+
+The default branch and its quorum now live in the `xyz.radicle.crefs` payload,
+and the stored document and the migrated view are one and the same.
+
+```
+$ rad inspect --identity
+{
+ "version": 2,
+ "payload": {
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 1
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
+ "xyz.radicle.project": {
+ "description": "Radicle Heartwood Protocol & Stack",
+ "name": "heartwood"
+ }
+ },
+ "delegates": [
+ "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
+ ]
+}
+```
+
+Migrating again has nothing to do.
+
+``` (fail)
+$ rad id migrate --title "Migrate identity" --description "Move to version 2"
+✗ Error: identity document is already at version 2
+```
diff --git a/crates/radicle-cli/examples/rad-id-multi-delegate.md b/crates/radicle-cli/examples/rad-id-multi-delegate.md
index 3827c50bc9..a430645bfa 100644
--- a/crates/radicle-cli/examples/rad-id-multi-delegate.md
+++ b/crates/radicle-cli/examples/rad-id-multi-delegate.md
@@ -1,24 +1,24 @@
``` ~alice
-$ rad id update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Add Bob" --description "" --threshold 2 --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --no-confirm -q
-069e7d58faa9a7473d27f5510d676af33282796f
-$ rad inspect --sigrefs rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+$ rad id update --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --title "Add Bob" --description "" --threshold 2 --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --no-confirm -q
+c7d68a801ed8c107521cb63b4089b4bd6601fad4
+$ rad inspect --sigrefs rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi [..] parent
z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk [..] parent
-z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z c9a828fc2fb01f893d6e6e9e17b9092dea2b3aba parent
+z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z 75f45dfa9e24758179f906e7bb7a453e00412f67 parent
```
``` ~bob
-$ rad watch --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --node z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z -r 'refs/rad/sigrefs' -t c9a828fc2fb01f893d6e6e9e17b9092dea2b3aba -i 500 --timeout 5000ms
-$ rad sync --fetch rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+$ rad watch --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --node z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z -r 'refs/rad/sigrefs' -t 75f45dfa9e24758179f906e7bb7a453e00412f67 -i 500 --timeout 5000ms
+$ rad sync --fetch rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-$ rad id --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+$ rad id --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
╭───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Status Created Parent │
├───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● 069e7d5 Add Bob alice z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi accepted now 0656c21 │
-│ ● 0656c21 Initial revision alice z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi accepted now none │
+│ ● c7d68a8 Add Bob alice z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi accepted now 8639908 │
+│ ● 8639908 Initial revision alice z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi accepted now none │
╰───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
Hints:
@@ -26,20 +26,20 @@ Hints:
● accepted
● rejected:
✘ … by delegate votes ↥ … by parent ⇄ … by sibling
-$ rad inspect rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --sigrefs
+$ rad inspect rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --sigrefs
z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi [..] parent
z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk [..] root
z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z [..] parent
-$ rad inspect rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --delegates
+$ rad inspect rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --delegates
did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (alice)
did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (bob)
-$ rad id update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Add Eve" --description "" --delegate did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z --no-confirm
-✓ Identity revision 3cd3c7f9900de0fcb19705856a7cc339a38fb0b3 created
+$ rad id update --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --title "Add Eve" --description "" --delegate did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z --no-confirm
+✓ Identity revision 46bb20352ca9d8c0a5b9fdccf17f66ff9f13aeaf created
╭────────────────────────────────────────────────────────────────────────╮
│ Title Add Eve │
-│ Revision 3cd3c7f9900de0fcb19705856a7cc339a38fb0b3 │
-│ Parent 069e7d58faa9a7473d27f5510d676af33282796f │
-│ Blob 74581605d1f75396c331487a10ca61c4815ed685 │
+│ Revision 46bb20352ca9d8c0a5b9fdccf17f66ff9f13aeaf │
+│ Parent c7d68a801ed8c107521cb63b4089b4bd6601fad4 │
+│ Blob 57dda7d9ab25ad958838e479c0c8e5ab7af56cd7 │
│ Author did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk │
│ State active │
│ Quorum no │
@@ -48,11 +48,22 @@ $ rad id update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Add Eve" --des
│ ? did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice │
╰────────────────────────────────────────────────────────────────────────╯
-@@ -1,14 +1,15 @@
+@@ -1,24 +1,25 @@
{
+ "version": 2,
"payload": {
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 2
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
"xyz.radicle.project": {
- "defaultBranch": "master",
"description": "Radicle Heartwood Protocol & Stack",
"name": "heartwood"
}
@@ -62,27 +73,26 @@ $ rad id update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Add Eve" --des
- "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
+ "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk",
+ "did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z"
- ],
- "threshold": 2
+ ]
}
```
``` ~alice
-$ rad sync --fetch rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 2 potential seed(s).
+$ rad sync --fetch rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 2 potential seed(s).
✓ Target met: 2 seed(s)
🌱 Fetched from z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z
🌱 Fetched from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-$ rad inspect rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --delegates
+$ rad inspect rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --delegates
did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (alice)
did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (bob)
-$ rad id accept 3cd3c7f9900de0fcb19705856a7cc339a38fb0b3 --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --no-confirm
-✓ Revision 3cd3c7f9900de0fcb19705856a7cc339a38fb0b3 accepted
+$ rad id accept 46bb20352ca9d8c0a5b9fdccf17f66ff9f13aeaf --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --no-confirm
+✓ Revision 46bb20352ca9d8c0a5b9fdccf17f66ff9f13aeaf accepted
╭────────────────────────────────────────────────────────────────────────╮
│ Title Add Eve │
-│ Revision 3cd3c7f9900de0fcb19705856a7cc339a38fb0b3 │
-│ Parent 069e7d58faa9a7473d27f5510d676af33282796f │
-│ Blob 74581605d1f75396c331487a10ca61c4815ed685 │
+│ Revision 46bb20352ca9d8c0a5b9fdccf17f66ff9f13aeaf │
+│ Parent c7d68a801ed8c107521cb63b4089b4bd6601fad4 │
+│ Blob 57dda7d9ab25ad958838e479c0c8e5ab7af56cd7 │
│ Author did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk │
│ State accepted │
│ Quorum yes │
@@ -90,15 +100,15 @@ $ rad id accept 3cd3c7f9900de0fcb19705856a7cc339a38fb0b3 --repo rad:z42hL2jL4XNk
│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
│ ✓ did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk bob │
╰────────────────────────────────────────────────────────────────────────╯
-$ rad inspect rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --delegates
+$ rad inspect rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --delegates
did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (alice)
did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (bob)
did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z (eve)
```
``` ~alice
-$ rad id update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Make private" --description "" --visibility private --no-confirm -q
-e6bf10593b78384eb2b281cbb18a605668a6d1f7
+$ rad id update --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --title "Make private" --description "" --visibility private --no-confirm -q
+ec079dc70ee5279af315e281e37b6b989e6f73c4
```
We can list all revisions:
@@ -108,10 +118,10 @@ $ rad id list
╭───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Status Created Parent │
├───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● e6bf105 Make private alice (you) active now 3cd3c7f │
-│ ● 3cd3c7f Add Eve bob z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk accepted now 069e7d5 │
-│ ● 069e7d5 Add Bob alice (you) accepted now 0656c21 │
-│ ● 0656c21 Initial revision alice (you) accepted now none │
+│ ● ec079dc Make private alice (you) active now 46bb203 │
+│ ● 46bb203 Add Eve bob z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk accepted now c7d68a8 │
+│ ● c7d68a8 Add Bob alice (you) accepted now 8639908 │
+│ ● 8639908 Initial revision alice (you) accepted now none │
╰───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
Hints:
@@ -124,25 +134,25 @@ Hints:
Despite being a delegate, Bob can't edit or redact Alice's revision:
``` ~bob (fail)
-$ rad id redact e6bf10593b78384eb2b281cbb18a605668a6d1f7
+$ rad id redact ec079dc70ee5279af315e281e37b6b989e6f73c4
[..]
```
``` ~bob (fail)
-$ rad id edit --title "Boo!" --description "Boo!" e6bf10593b78384eb2b281cbb18a605668a6d1f7
+$ rad id edit --title "Boo!" --description "Boo!" ec079dc70ee5279af315e281e37b6b989e6f73c4
[..]
```
Alice can edit:
``` ~alice
-$ rad id edit --title "Make private" --description "Privacy is cool." e6bf10593b78384eb2b281cbb18a605668a6d1f7
-✓ Revision e6bf10593b78384eb2b281cbb18a605668a6d1f7 edited
-$ rad id show e6bf10593b78384eb2b281cbb18a605668a6d1f7
+$ rad id edit --title "Make private" --description "Privacy is cool." ec079dc70ee5279af315e281e37b6b989e6f73c4
+✓ Revision ec079dc70ee5279af315e281e37b6b989e6f73c4 edited
+$ rad id show ec079dc70ee5279af315e281e37b6b989e6f73c4
╭────────────────────────────────────────────────────────────────────────╮
│ Title Make private │
-│ Revision e6bf10593b78384eb2b281cbb18a605668a6d1f7 │
-│ Parent 3cd3c7f9900de0fcb19705856a7cc339a38fb0b3 │
-│ Blob c533865b2846ca6c5b4436ec6872257293380c3b │
+│ Revision ec079dc70ee5279af315e281e37b6b989e6f73c4 │
+│ Parent 46bb20352ca9d8c0a5b9fdccf17f66ff9f13aeaf │
+│ Blob 530abcfb097cf9ea3f47139cc143b5678333ffb6 │
│ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │
│ State active │
│ Quorum no │
@@ -154,11 +164,22 @@ $ rad id show e6bf10593b78384eb2b281cbb18a605668a6d1f7
│ ? did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z eve │
╰────────────────────────────────────────────────────────────────────────╯
-@@ -1,15 +1,18 @@
+@@ -1,25 +1,28 @@
{
+ "version": 2,
"payload": {
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 2
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
"xyz.radicle.project": {
- "defaultBranch": "master",
"description": "Radicle Heartwood Protocol & Stack",
"name": "heartwood"
}
@@ -167,9 +188,8 @@ $ rad id show e6bf10593b78384eb2b281cbb18a605668a6d1f7
"did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
"did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk",
"did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z"
- ],
-- "threshold": 2
-+ "threshold": 2,
+- ]
++ ],
+ "visibility": {
+ "type": "private"
+ }
@@ -179,23 +199,23 @@ $ rad id show e6bf10593b78384eb2b281cbb18a605668a6d1f7
And she can redact her revision:
``` ~alice
-$ rad id redact e6bf10593b78384eb2b281cbb18a605668a6d1f7
-✓ Revision e6bf10593b78384eb2b281cbb18a605668a6d1f7 redacted
+$ rad id redact ec079dc70ee5279af315e281e37b6b989e6f73c4
+✓ Revision ec079dc70ee5279af315e281e37b6b989e6f73c4 redacted
```
``` ~alice (fail)
-$ rad id show e6bf10593b78384eb2b281cbb18a605668a6d1f7
-✗ Error: revision `e6bf10593b78384eb2b281cbb18a605668a6d1f7` not found
+$ rad id show ec079dc70ee5279af315e281e37b6b989e6f73c4
+✗ Error: revision `ec079dc70ee5279af315e281e37b6b989e6f73c4` not found
```
Finally, Alice can also propose to remove Bob:
``` ~alice
-$ rad id update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Remove Bob" --description "" --rescind did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --no-confirm
-✓ Identity revision 8ba242a80bc1181f41f9ea7a19286038c7948994 created
+$ rad id update --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --title "Remove Bob" --description "" --rescind did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --no-confirm
+✓ Identity revision 3940c10cb70dc6b52f9280d06c3cf0bc84d3b4a2 created
╭────────────────────────────────────────────────────────────────────────╮
│ Title Remove Bob │
-│ Revision 8ba242a80bc1181f41f9ea7a19286038c7948994 │
-│ Parent 3cd3c7f9900de0fcb19705856a7cc339a38fb0b3 │
-│ Blob 254d62de237117e7d7b9ceff85c47f5e3b610c1e │
+│ Revision 3940c10cb70dc6b52f9280d06c3cf0bc84d3b4a2 │
+│ Parent 46bb20352ca9d8c0a5b9fdccf17f66ff9f13aeaf │
+│ Blob 488e5cb72027dfc2b9e2b5a92ab6e1f8d8040609 │
│ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │
│ State active │
│ Quorum no │
@@ -205,11 +225,22 @@ $ rad id update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Remove Bob" --
│ ? did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z eve │
╰────────────────────────────────────────────────────────────────────────╯
-@@ -1,15 +1,14 @@
+@@ -1,25 +1,24 @@
{
+ "version": 2,
"payload": {
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 2
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
"xyz.radicle.project": {
- "defaultBranch": "master",
"description": "Radicle Heartwood Protocol & Stack",
"name": "heartwood"
}
@@ -218,7 +249,6 @@ $ rad id update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Remove Bob" --
"did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
- "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk",
"did:key:z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z"
- ],
- "threshold": 2
+ ]
}
```
diff --git a/crates/radicle-cli/examples/rad-id-private.md b/crates/radicle-cli/examples/rad-id-private.md
index 711ee25e84..7dd833535c 100644
--- a/crates/radicle-cli/examples/rad-id-private.md
+++ b/crates/radicle-cli/examples/rad-id-private.md
@@ -9,9 +9,20 @@ $ rad id update --title "Allow Bob & Eve" --allow did:key:z6Mkt67GdsW7715MEfRuP4
...
$ rad inspect --identity
{
+ "version": 2,
"payload": {
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 1
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
"xyz.radicle.project": {
- "defaultBranch": "master",
"description": "radicle heartwood protocol & stack",
"name": "heartwood"
}
@@ -19,7 +30,6 @@ $ rad inspect --identity
"delegates": [
"did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
],
- "threshold": 1,
"visibility": {
"type": "private",
"allow": [
@@ -37,9 +47,20 @@ $ rad id update --title "Remove allow list" --disallow did:key:z6Mkt67GdsW7715ME
...
$ rad inspect --identity
{
+ "version": 2,
"payload": {
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 1
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
"xyz.radicle.project": {
- "defaultBranch": "master",
"description": "radicle heartwood protocol & stack",
"name": "heartwood"
}
@@ -47,7 +68,6 @@ $ rad inspect --identity
"delegates": [
"did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
],
- "threshold": 1,
"visibility": {
"type": "private"
}
diff --git a/crates/radicle-cli/examples/rad-id-threshold-soft-fork.md b/crates/radicle-cli/examples/rad-id-threshold-soft-fork.md
index 47a9682b10..5ccf761203 100644
--- a/crates/radicle-cli/examples/rad-id-threshold-soft-fork.md
+++ b/crates/radicle-cli/examples/rad-id-threshold-soft-fork.md
@@ -3,10 +3,10 @@ without having pushed the canonical default branch. For example, Bob can create
an issue in the repository:
``` ~bob
-$ rad issue open --title "Add Bob as a delegate" --description "We agreed to add me as a delegate, so I am creating an issue to track that work" --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+$ rad issue open --title "Add Bob as a delegate" --description "We agreed to add me as a delegate, so I am creating an issue to track that work" --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
╭──────────────────────────────────────────────────────────────╮
│ Title Add Bob as a delegate │
-│ Issue f12d512c51d30429f7916db038ae0360e2e938c2 │
+│ Issue aeb4689547ce516268521aa52e2c5649bcb91bfd │
│ Author bob (you) │
│ Status open │
│ │
@@ -24,7 +24,7 @@ z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
└── refs
├── cobs
│ └── xyz.radicle.id
- │ └── 0656c217f917c3e06234771e9ecae53aba5e173e
+ │ └── 86399084097fb674569f5bc5847da609ab91aa9f
├── heads
│ └── master
└── rad
@@ -35,7 +35,7 @@ z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
└── refs
├── cobs
│ └── xyz.radicle.issue
- │ └── f12d512c51d30429f7916db038ae0360e2e938c2
+ │ └── aeb4689547ce516268521aa52e2c5649bcb91bfd
└── rad
├── root
└── sigrefs
@@ -46,5 +46,5 @@ as a delegate, since a threshold of 1 can still be reached:
``` ~alice
$ rad id update --title "Add Bob" --description "Add Bob as a delegate" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk -q
-7be665f9fccba97abb21b2fa85a6fd3181c72858
+83ac41c238b1ece55e11ca0ad8621fe5013e30e5
```
diff --git a/crates/radicle-cli/examples/rad-id-threshold.md b/crates/radicle-cli/examples/rad-id-threshold.md
index 8ae1db0605..10b30c822c 100644
--- a/crates/radicle-cli/examples/rad-id-threshold.md
+++ b/crates/radicle-cli/examples/rad-id-threshold.md
@@ -7,8 +7,8 @@ can be updated.
``` ~alice (fail)
$ rad id update --title "Add Bob" --description "Add Bob as a delegate" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --threshold 2
-✗ Error: failed to verify delegates for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✗ Error: the threshold of 2 delegates cannot be met..
+✗ Error: failed to verify delegates for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+✗ Error: the required threshold of delegates cannot be met..
✗ Error: the delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk is missing
✗ Hint: run `rad follow did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk` to follow this missing peer
✗ Error: fatal: refusing to update identity document
@@ -18,12 +18,12 @@ Instead, Alice can simply keep the `threshold` as `1` and still add Bob as a del
``` ~alice
$ rad id update --title "Add Bob" --description "Add Bob as a delegate" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-✓ Identity revision 7be665f9fccba97abb21b2fa85a6fd3181c72858 created
+✓ Identity revision 83ac41c238b1ece55e11ca0ad8621fe5013e30e5 created
╭────────────────────────────────────────────────────────────────────────╮
│ Title Add Bob │
-│ Revision 7be665f9fccba97abb21b2fa85a6fd3181c72858 │
-│ Parent 0656c217f917c3e06234771e9ecae53aba5e173e │
-│ Blob 93d3009787e5d8a481dffc4dd248ea46af592466 │
+│ Revision 83ac41c238b1ece55e11ca0ad8621fe5013e30e5 │
+│ Parent 86399084097fb674569f5bc5847da609ab91aa9f │
+│ Blob 0653b9dbe278688862856d37e1c6bb66ef35ebed │
│ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │
│ State accepted │
│ Quorum yes │
@@ -33,11 +33,22 @@ $ rad id update --title "Add Bob" --description "Add Bob as a delegate" --delega
│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
╰────────────────────────────────────────────────────────────────────────╯
-@@ -1,13 +1,14 @@
+@@ -1,23 +1,24 @@
{
+ "version": 2,
"payload": {
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 1
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
"xyz.radicle.project": {
- "defaultBranch": "master",
"description": "Radicle Heartwood Protocol & Stack",
"name": "heartwood"
}
@@ -46,8 +57,7 @@ $ rad id update --title "Add Bob" --description "Add Bob as a delegate" --delega
- "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
+ "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
+ "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
- ],
- "threshold": 1
+ ]
}
```
@@ -66,7 +76,7 @@ $ git commit -v -m "Define power requirements"
``` ~alice (stderr) RAD_SOCKET=/dev/null
$ git push rad master
✓ Canonical reference refs/heads/master updated to target commit 3e674d1a1df90807e934f9ae5da2591dd6848a33
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
f2de534..3e674d1 master -> master
```
@@ -87,8 +97,8 @@ $ git commit -v -m "Add README file"
``` ~alice (stderr) RAD_SOCKET=/dev/null
$ git push rad HEAD:refs/patches
-✓ Patch b09b2aa0ee055671c811e9ad4ba73eed211ebaa3 opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Patch a398ac1d69d987771b3390a8f2014d867d477643 opened
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
@@ -96,8 +106,8 @@ Any other seeds can also still fetch changes from Alice without any
errors:
``` ~seed
-$ rad sync rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji -f
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+$ rad sync rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G -f
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
```
@@ -110,9 +120,20 @@ The identity has the new delegate, while the `threshold` is still `1`
``` ~alice
$ rad inspect --identity
{
+ "version": 2,
"payload": {
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 1
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
"xyz.radicle.project": {
- "defaultBranch": "master",
"description": "Radicle Heartwood Protocol & Stack",
"name": "heartwood"
}
@@ -120,8 +141,7 @@ $ rad inspect --identity
"delegates": [
"did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
"did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
- ],
- "threshold": 1
+ ]
}
```
@@ -134,13 +154,13 @@ z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
└── refs
├── cobs
│ ├── xyz.radicle.id
- │ │ └── 0656c217f917c3e06234771e9ecae53aba5e173e
+ │ │ └── 86399084097fb674569f5bc5847da609ab91aa9f
│ └── xyz.radicle.patch
- │ └── b09b2aa0ee055671c811e9ad4ba73eed211ebaa3
+ │ └── a398ac1d69d987771b3390a8f2014d867d477643
├── heads
│ ├── master
│ └── patches
- │ └── b09b2aa0ee055671c811e9ad4ba73eed211ebaa3
+ │ └── a398ac1d69d987771b3390a8f2014d867d477643
└── rad
├── id
├── root
@@ -152,7 +172,7 @@ Similarly, she still does not have Bob's `rad/sigrefs`:
``` ~alice
$ rad inspect --sigrefs
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi e5c200775dc6da38306f62c995df67a1ab1bf62d parent
+z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi 6a365b1521af06ad9a3039c7d72604ba025fbc88 parent
```
And she can still list the project, without any worries:
@@ -162,7 +182,7 @@ $ rad ls
╭───────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ Name RID Visibility Head Description │
├───────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ heartwood rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji public 3e674d1 Radicle Heartwood Protocol & Stack │
+│ heartwood rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G public 3e674d1 Radicle Heartwood Protocol & Stack │
╰───────────────────────────────────────────────────────────────────────────────────────────────────────────╯
```
@@ -171,9 +191,9 @@ branch to `refs/heads/master` for this project, she can then use `rad
sync` and fetch his references:
``` ~bob
-$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'followed'
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 2 potential seed(s).
+$ rad clone rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+✓ Seeding policy updated for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G with scope 'followed'
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 2 potential seed(s).
✓ Target met: 1 seed(s)
✓ Creating checkout in ./heartwood..
✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
@@ -190,16 +210,16 @@ Run `cd ./heartwood` to go to the repository directory.
``` ~bob
$ cd heartwood
$ rad fork
-✓ Forked repository rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+✓ Forked repository rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
```
``` ~alice
$ rad sync -f
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 2 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 2 potential seed(s).
✓ Target met: 2 seed(s)
🌱 Fetched from z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z
🌱 Fetched from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
$ rad inspect --sigrefs
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi e5c200775dc6da38306f62c995df67a1ab1bf62d parent
-z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk dace6fe948548168a2bb687718949d9b5d9076ee parent
+z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi 6a365b1521af06ad9a3039c7d72604ba025fbc88 parent
+z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk 66f927b4cda7081e72b6dfb225ce686ef235749d parent
```
diff --git a/crates/radicle-cli/examples/rad-id-unauthorized-delegate.md b/crates/radicle-cli/examples/rad-id-unauthorized-delegate.md
index b0dd76f440..9a16e053ac 100644
--- a/crates/radicle-cli/examples/rad-id-unauthorized-delegate.md
+++ b/crates/radicle-cli/examples/rad-id-unauthorized-delegate.md
@@ -1,7 +1,7 @@
-Alice has created a new repository `rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji` with only herself as the sole delegate. After Bob has cloned it, let's ensure he can't add himself as a delegate too:
+Alice has created a new repository `rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G` with only herself as the sole delegate. After Bob has cloned it, let's ensure he can't add himself as a delegate too:
``` ~bob (fail)
-$ rad id update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Add myself!" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --no-confirm
+$ rad id update --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --title "Add myself!" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --no-confirm
✗ Error: did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk is not a delegate, and only delegates are allowed to create a revision
✗ Hint: bob (you) is attempting to modify the identity document but is not a delegate!
```
diff --git a/crates/radicle-cli/examples/rad-id-unknown-field.md b/crates/radicle-cli/examples/rad-id-unknown-field.md
index 31dea03af8..c688692a69 100644
--- a/crates/radicle-cli/examples/rad-id-unknown-field.md
+++ b/crates/radicle-cli/examples/rad-id-unknown-field.md
@@ -3,12 +3,12 @@ added. Here we will add an emoji alias for the heartwood project:
```
$ rad id update --title "Add emoji alias" --description "Adding alias field" --payload xyz.radicle.project alias '"❤️🪵"'
-✓ Identity revision 05100d3f0a73b9373681677158615a53ba51940e created
+✓ Identity revision 095516e23373bd6b868f46b017893008edba4439 created
╭────────────────────────────────────────────────────────────────────────╮
│ Title Add emoji alias │
-│ Revision 05100d3f0a73b9373681677158615a53ba51940e │
-│ Parent 0656c217f917c3e06234771e9ecae53aba5e173e │
-│ Blob a0f421c928dcfc6eca129fc2ea1f50877de7dc20 │
+│ Revision 095516e23373bd6b868f46b017893008edba4439 │
+│ Parent 86399084097fb674569f5bc5847da609ab91aa9f │
+│ Blob 2c87f6c8d62a9a0c0f95b333900272d477c291a7 │
│ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │
│ State accepted │
│ Quorum yes │
@@ -18,20 +18,30 @@ $ rad id update --title "Add emoji alias" --description "Adding alias field" --p
│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
╰────────────────────────────────────────────────────────────────────────╯
-@@ -1,13 +1,14 @@
+@@ -1,23 +1,24 @@
{
+ "version": 2,
"payload": {
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 1
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
"xyz.radicle.project": {
+ "alias": "❤️🪵",
- "defaultBranch": "master",
"description": "Radicle Heartwood Protocol & Stack",
"name": "heartwood"
}
},
"delegates": [
"did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
- ],
- "threshold": 1
+ ]
}
```
@@ -43,6 +53,6 @@ $ rad ls
╭───────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ Name RID Visibility Head Description │
├───────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ heartwood rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji public f2de534 Radicle Heartwood Protocol & Stack │
+│ heartwood rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G public f2de534 Radicle Heartwood Protocol & Stack │
╰───────────────────────────────────────────────────────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-id-update-delete-field.md b/crates/radicle-cli/examples/rad-id-update-delete-field.md
index 968bb33b56..ea21a6c7c6 100644
--- a/crates/radicle-cli/examples/rad-id-update-delete-field.md
+++ b/crates/radicle-cli/examples/rad-id-update-delete-field.md
@@ -2,12 +2,12 @@ Let's add a payload field and then delete it.
```
$ rad id update --title "Add field" --description "Add a new 'web' field" --payload xyz.radicle.project web '"https://acme.example"'
-✓ Identity revision a8a9fee6c4f83578ab132d375f1da0c81282bef3 created
+✓ Identity revision 0e4955004e8340b3bb874da7aa5b5a0fcad51b73 created
╭────────────────────────────────────────────────────────────────────────╮
│ Title Add field │
-│ Revision a8a9fee6c4f83578ab132d375f1da0c81282bef3 │
-│ Parent 0656c217f917c3e06234771e9ecae53aba5e173e │
-│ Blob fbe268d13e60f1f3a1972e0ccd592f3cdecf08b5 │
+│ Revision 0e4955004e8340b3bb874da7aa5b5a0fcad51b73 │
+│ Parent 86399084097fb674569f5bc5847da609ab91aa9f │
+│ Blob 8e175fd5bbc3ffea7e654964e7fb321b2d897aea │
│ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │
│ State accepted │
│ Quorum yes │
@@ -17,11 +17,22 @@ $ rad id update --title "Add field" --description "Add a new 'web' field" --payl
│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
╰────────────────────────────────────────────────────────────────────────╯
-@@ -1,13 +1,14 @@
+@@ -1,23 +1,24 @@
{
+ "version": 2,
"payload": {
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 1
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
"xyz.radicle.project": {
- "defaultBranch": "master",
"description": "Radicle Heartwood Protocol & Stack",
- "name": "heartwood"
+ "name": "heartwood",
@@ -30,8 +41,7 @@ $ rad id update --title "Add field" --description "Add a new 'web' field" --payl
},
"delegates": [
"did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
- ],
- "threshold": 1
+ ]
}
```
@@ -39,12 +49,12 @@ Now let's delete it by setting it to `null`.
```
$ rad id update --title "Delete field" --description "Delete 'web'" --payload xyz.radicle.project web null
-✓ Identity revision d373c35876833105f8aafed8b610660b5737cd67 created
+✓ Identity revision ab26ce0dfca6e3df7adf8c918825711336e21ce5 created
╭────────────────────────────────────────────────────────────────────────╮
│ Title Delete field │
-│ Revision d373c35876833105f8aafed8b610660b5737cd67 │
-│ Parent a8a9fee6c4f83578ab132d375f1da0c81282bef3 │
-│ Blob d96f425412c9f8ad5d9a9a05c9831d0728e2338d │
+│ Revision ab26ce0dfca6e3df7adf8c918825711336e21ce5 │
+│ Parent 0e4955004e8340b3bb874da7aa5b5a0fcad51b73 │
+│ Blob f10bd9e36848dc4eb70cc078d1d0bbaac7c1ba61 │
│ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │
│ State accepted │
│ Quorum yes │
@@ -54,11 +64,22 @@ $ rad id update --title "Delete field" --description "Delete 'web'" --payload xy
│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
╰────────────────────────────────────────────────────────────────────────╯
-@@ -1,14 +1,13 @@
+@@ -1,24 +1,23 @@
{
+ "version": 2,
"payload": {
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 1
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
"xyz.radicle.project": {
- "defaultBranch": "master",
"description": "Radicle Heartwood Protocol & Stack",
- "name": "heartwood",
- "web": "https://acme.example"
@@ -67,14 +88,13 @@ $ rad id update --title "Delete field" --description "Delete 'web'" --payload xy
},
"delegates": [
"did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
- ],
- "threshold": 1
+ ]
}
```
Note that we cannot delete mandatory fields:
``` (fails)
-$ rad id update --title "Delete default branch" --payload xyz.radicle.project defaultBranch null
-✗ Error: failed to verify `xyz.radicle.project`, missing field `defaultBranch`
+$ rad id update --title "Delete name" --payload xyz.radicle.project name null
+✗ Error: failed to verify `xyz.radicle.project`, missing field `name`
```
diff --git a/crates/radicle-cli/examples/rad-id.md b/crates/radicle-cli/examples/rad-id.md
index 6fcd3d5f00..2f8ae5b79b 100644
--- a/crates/radicle-cli/examples/rad-id.md
+++ b/crates/radicle-cli/examples/rad-id.md
@@ -15,12 +15,12 @@ threshold to `2`.
```
$ rad id update --title "Add Bob" --description "Add Bob as a delegate" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --threshold 2
-✓ Identity revision 0ca42d376bd566631083c8913cf86bec722da392 created
+✓ Identity revision 491c96a516cd9ed236f83e2e2d52d8799f31f4b4 created
╭────────────────────────────────────────────────────────────────────────╮
│ Title Add Bob │
-│ Revision 0ca42d376bd566631083c8913cf86bec722da392 │
-│ Parent 0656c217f917c3e06234771e9ecae53aba5e173e │
-│ Blob 053541ba7b90534b35dd8718e0ceaa408979b02b │
+│ Revision 491c96a516cd9ed236f83e2e2d52d8799f31f4b4 │
+│ Parent 86399084097fb674569f5bc5847da609ab91aa9f │
+│ Blob 4b49080fa898fea405a320fe68c10ee9e3fa559d │
│ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │
│ State accepted │
│ Quorum yes │
@@ -30,11 +30,23 @@ $ rad id update --title "Add Bob" --description "Add Bob as a delegate" --delega
│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
╰────────────────────────────────────────────────────────────────────────╯
-@@ -1,13 +1,14 @@
+@@ -1,23 +1,24 @@
{
+ "version": 2,
"payload": {
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+- "threshold": 1
++ "threshold": 2
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
"xyz.radicle.project": {
- "defaultBranch": "master",
"description": "Radicle Heartwood Protocol & Stack",
"name": "heartwood"
}
@@ -43,9 +55,7 @@ $ rad id update --title "Add Bob" --description "Add Bob as a delegate" --delega
- "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
+ "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
+ "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
- ],
-- "threshold": 1
-+ "threshold": 2
+ ]
}
```
@@ -77,9 +87,20 @@ can verify that by listing the current identity document:
```
$ rad inspect --identity
{
+ "version": 2,
"payload": {
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 2
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
"xyz.radicle.project": {
- "defaultBranch": "master",
"description": "Radicle Heartwood Protocol & Stack",
"name": "heartwood"
}
@@ -87,16 +108,15 @@ $ rad inspect --identity
"delegates": [
"did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
"did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
- ],
- "threshold": 2
+ ]
}
```
We can also look at the document's COB directly:
```
-$ rad cob log --object 0656c217f917c3e06234771e9ecae53aba5e173e --type xyz.radicle.id --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-commit 0ca42d376bd566631083c8913cf86bec722da392
-parent 0656c217f917c3e06234771e9ecae53aba5e173e
+$ rad cob log --object 86399084097fb674569f5bc5847da609ab91aa9f --type xyz.radicle.id --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+commit 491c96a516cd9ed236f83e2e2d52d8799f31f4b4
+parent 86399084097fb674569f5bc5847da609ab91aa9f
author z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
date Thu, 15 Dec 2022 17:28:04 +0000
@@ -104,21 +124,21 @@ date Thu, 15 Dec 2022 17:28:04 +0000
"type": "revision",
"title": "Add Bob",
"description": "Add Bob as a delegate",
- "blob": "053541ba7b90534b35dd8718e0ceaa408979b02b",
- "parent": "0656c217f917c3e06234771e9ecae53aba5e173e",
- "signature": "z3AyzixN2eWLtRfQWowtBXwWyRH3iJ8oJ25W6KFYFw5ANLntbzfavge15muNU6AVAUkxSxQvgg9yh2gupbUecavQY"
+ "blob": "4b49080fa898fea405a320fe68c10ee9e3fa559d",
+ "parent": "86399084097fb674569f5bc5847da609ab91aa9f",
+ "signature": "z3a5oLvRLXLi6aoXUqzWpbT5n4MHstpvHCpmb2p5KVVdKNJzyoKgEFNtk7554SwvtgMhgnpwAqK1JnzT9DFTtwDE8"
}
-commit 0656c217f917c3e06234771e9ecae53aba5e173e
+commit 86399084097fb674569f5bc5847da609ab91aa9f
author z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
date Thu, 15 Dec 2022 17:28:04 +0000
{
"type": "revision",
"title": "Initial revision",
- "blob": "d96f425412c9f8ad5d9a9a05c9831d0728e2338d",
+ "blob": "f10bd9e36848dc4eb70cc078d1d0bbaac7c1ba61",
"parent": null,
- "signature": "z5nGqUvrmfiSyLjNCHWTWYvVMcPUZcvo9TxPKzEKXYBdSgUzbrqf1cYsmpGgbQvYunnsrLSsubEmxZaRdKM4quqQR"
+ "signature": "zWUiHpVnmzm6Hd5aUphUdHABCtMUHQCfGYLthhXgmEDNCqTrrPLiBRMEopxYF7WUfoR2ZUEpqjPMjENPBNBjAPe7"
}
```
@@ -126,12 +146,12 @@ date Thu, 15 Dec 2022 17:28:04 +0000
We can use `rad id show` to show the changes of an accepted update:
```
-$ rad id show 0ca42d376bd566631083c8913cf86bec722da392
+$ rad id show 491c96a516cd9ed236f83e2e2d52d8799f31f4b4
╭────────────────────────────────────────────────────────────────────────╮
│ Title Add Bob │
-│ Revision 0ca42d376bd566631083c8913cf86bec722da392 │
-│ Parent 0656c217f917c3e06234771e9ecae53aba5e173e │
-│ Blob 053541ba7b90534b35dd8718e0ceaa408979b02b │
+│ Revision 491c96a516cd9ed236f83e2e2d52d8799f31f4b4 │
+│ Parent 86399084097fb674569f5bc5847da609ab91aa9f │
+│ Blob 4b49080fa898fea405a320fe68c10ee9e3fa559d │
│ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │
│ State accepted │
│ Quorum yes │
@@ -141,11 +161,23 @@ $ rad id show 0ca42d376bd566631083c8913cf86bec722da392
│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
╰────────────────────────────────────────────────────────────────────────╯
-@@ -1,13 +1,14 @@
+@@ -1,23 +1,24 @@
{
+ "version": 2,
"payload": {
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+- "threshold": 1
++ "threshold": 2
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
"xyz.radicle.project": {
- "defaultBranch": "master",
"description": "Radicle Heartwood Protocol & Stack",
"name": "heartwood"
}
@@ -154,9 +186,7 @@ $ rad id show 0ca42d376bd566631083c8913cf86bec722da392
- "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
+ "did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi",
+ "did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"
- ],
-- "threshold": 1
-+ "threshold": 2
+ ]
}
```
@@ -164,15 +194,15 @@ Note that once a revision is accepted, it can't be edited, redacted or otherwise
acted upon:
``` (fail)
-$ rad id redact 0ca42d376bd566631083c8913cf86bec722da392
+$ rad id redact 491c96a516cd9ed236f83e2e2d52d8799f31f4b4
✗ Error: [..]
```
``` (fail)
-$ rad id reject 0ca42d376bd566631083c8913cf86bec722da392
+$ rad id reject 491c96a516cd9ed236f83e2e2d52d8799f31f4b4
✗ Error: [..]
```
``` (fail)
-$ rad id accept 0ca42d376bd566631083c8913cf86bec722da392
+$ rad id accept 491c96a516cd9ed236f83e2e2d52d8799f31f4b4
✗ Error: [..]
```
diff --git a/crates/radicle-cli/examples/rad-inbox.md b/crates/radicle-cli/examples/rad-inbox.md
index 1e3e447bd5..537199a52c 100644
--- a/crates/radicle-cli/examples/rad-inbox.md
+++ b/crates/radicle-cli/examples/rad-inbox.md
@@ -125,16 +125,26 @@ $ rad inbox --all
╰──────────────────────────────────────────────────────────────────────╯
$ rad inbox show 1
{
+ "version": 2,
"payload": {
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 1
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
"xyz.radicle.project": {
- "defaultBranch": "master",
"description": "https://radicle.dev",
"name": "heartwood"
}
},
"delegates": [
"did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
- ],
- "threshold": 1
+ ]
}
```
diff --git a/crates/radicle-cli/examples/rad-init-existing-bare.md b/crates/radicle-cli/examples/rad-init-existing-bare.md
index f2c88a7e13..3b093f91fd 100644
--- a/crates/radicle-cli/examples/rad-init-existing-bare.md
+++ b/crates/radicle-cli/examples/rad-init-existing-bare.md
@@ -14,19 +14,19 @@ $ rad .
Let's pick an existing repository:
```
-$ rad inspect rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+$ rad inspect rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
```
And initialize this working copy as that existing repository:
```
-$ rad init --setup-signing --existing rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+$ rad init --setup-signing --existing rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
Configuring Radicle signing key SHA256:UIedaL6Cxm6OUErh9GQUzzglSk7VpQlVTI1TAFB/HWA…
✓ Signing configured in [..]/heartwood/config
! Not writing .gitsigners file.
-✓ Initialized existing repository rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji in [..]/heartwood/..
+✓ Initialized existing repository rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G in [..]/heartwood/..
```
The warning about not writing `.gitsigners` is expected, as this requires a
@@ -35,11 +35,11 @@ working directory, which a bare repository does not have.
We can confirm that the working copy is initialized:
```
$ rad .
-rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
$ git remote show rad
* remote rad
- Fetch URL: rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
- Push URL: rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ Fetch URL: rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G
+ Push URL: rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
HEAD branch: master
Remote branch:
master new (next fetch will store in remotes/rad)
diff --git a/crates/radicle-cli/examples/rad-init-existing.md b/crates/radicle-cli/examples/rad-init-existing.md
index 8ec0eb3fef..6f5f5811f5 100644
--- a/crates/radicle-cli/examples/rad-init-existing.md
+++ b/crates/radicle-cli/examples/rad-init-existing.md
@@ -14,29 +14,29 @@ $ rad .
Let's pick an existing repository:
```
-$ rad inspect rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+$ rad inspect rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
```
And initialize this working copy as that existing repository:
```
-$ rad init --setup-signing --existing rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+$ rad init --setup-signing --existing rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
Configuring Radicle signing key SHA256:UIedaL6Cxm6OUErh9GQUzzglSk7VpQlVTI1TAFB/HWA…
✓ Signing configured in [..]/heartwood/.git/config
✓ Created .gitsigners file
-✓ Initialized existing repository rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji in [..]/heartwood/..
+✓ Initialized existing repository rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G in [..]/heartwood/..
```
We can confirm that the working copy is initialized:
```
$ rad .
-rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
$ git remote show rad
* remote rad
- Fetch URL: rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
- Push URL: rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ Fetch URL: rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G
+ Push URL: rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
HEAD branch: master
Remote branch:
master new (next fetch will store in remotes/rad)
diff --git a/crates/radicle-cli/examples/rad-init-no-seed.md b/crates/radicle-cli/examples/rad-init-no-seed.md
index d42deb6aae..d865bd81b9 100644
--- a/crates/radicle-cli/examples/rad-init-no-seed.md
+++ b/crates/radicle-cli/examples/rad-init-no-seed.md
@@ -6,7 +6,7 @@ Initializing public Radicle 👾 repository in [..]
✓ Repository heartwood created.
-Your Repository ID (RID) is rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK
+Your Repository ID (RID) is rad:z41A7PnmXror3L2oP1vq81vhCQPBc
You can show it any time by running `rad .` from this directory.
Your repository will be announced to the network when you start your node.
@@ -19,11 +19,11 @@ $ rad node inventory
If we then seed it, it becomes advertised in our inventory:
```
-$ rad seed rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK
-✓ Inventory updated with rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK
-✓ Seeding policy updated for rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK with scope 'followed'
+$ rad seed rad:z41A7PnmXror3L2oP1vq81vhCQPBc
+✓ Inventory updated with rad:z41A7PnmXror3L2oP1vq81vhCQPBc
+✓ Seeding policy updated for rad:z41A7PnmXror3L2oP1vq81vhCQPBc with scope 'followed'
```
```
$ rad node inventory
-rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK
+rad:z41A7PnmXror3L2oP1vq81vhCQPBc
```
diff --git a/crates/radicle-cli/examples/rad-init-private-clone-seed.md b/crates/radicle-cli/examples/rad-init-private-clone-seed.md
index 17fc6124e5..21e8190d48 100644
--- a/crates/radicle-cli/examples/rad-init-private-clone-seed.md
+++ b/crates/radicle-cli/examples/rad-init-private-clone-seed.md
@@ -1,4 +1,4 @@
-Given a private repo `rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu` belonging to Alice,
+Given a private repo `rad:z2PZv5hqSvKC6A5cTQrF5VXwG97Q2` belonging to Alice,
Alice allows Bob to fetch it, and Bob, without the updated identity document
is able to fetch it by specifying Alice as a seed.
@@ -7,9 +7,20 @@ $ rad id update --title "Allow Bob" --description "" --allow did:key:z6Mkt67GdsW
...
$ rad inspect --identity
{
+ "version": 2,
"payload": {
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 1
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
"xyz.radicle.project": {
- "defaultBranch": "master",
"description": "radicle heartwood protocol & stack",
"name": "heartwood"
}
@@ -17,7 +28,6 @@ $ rad inspect --identity
"delegates": [
"did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
],
- "threshold": 1,
"visibility": {
"type": "private",
"allow": [
@@ -29,14 +39,14 @@ $ rad inspect --identity
``` ~bob
$ rad ls --all --private
-$ rad clone rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu --seed z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --timeout 1s
-✓ Seeding policy updated for rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu with scope 'followed'
-Fetching rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu from the network, found 1 potential seed(s).
+$ rad clone rad:z2PZv5hqSvKC6A5cTQrF5VXwG97Q2 --seed z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --timeout 1s
+✓ Seeding policy updated for rad:z2PZv5hqSvKC6A5cTQrF5VXwG97Q2 with scope 'followed'
+Fetching rad:z2PZv5hqSvKC6A5cTQrF5VXwG97Q2 from the network, found 1 potential seed(s).
✓ Target met: 1 preferred seed(s).
✓ Creating checkout in ./heartwood..
✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
✓ Remote-tracking branch alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master created for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-✓ Repository successfully cloned under [...]/.radicle/heartwood/
+✓ Repository successfully cloned under [..]/.radicle/heartwood/
╭────────────────────────────────────╮
│ heartwood │
│ radicle heartwood protocol & stack │
@@ -48,8 +58,8 @@ Run `cd ./heartwood` to go to the repository directory.
We can also use `rad seed` to seed and fetch without creating a checkout.
``` ~bob
-$ rad seed rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu --from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --timeout 1s
-✓ Seeding policy exists for rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu with scope 'followed'
-Fetching rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu from the network, found 1 potential seed(s).
+$ rad seed rad:z2PZv5hqSvKC6A5cTQrF5VXwG97Q2 --from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --timeout 1s
+✓ Seeding policy exists for rad:z2PZv5hqSvKC6A5cTQrF5VXwG97Q2 with scope 'followed'
+Fetching rad:z2PZv5hqSvKC6A5cTQrF5VXwG97Q2 from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
```
diff --git a/crates/radicle-cli/examples/rad-init-private-clone.md b/crates/radicle-cli/examples/rad-init-private-clone.md
index 5f0f2519e3..485d38857c 100644
--- a/crates/radicle-cli/examples/rad-init-private-clone.md
+++ b/crates/radicle-cli/examples/rad-init-private-clone.md
@@ -1,17 +1,17 @@
-Given a private repo `rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu` belonging to Alice,
+Given a private repo `rad:z2PZv5hqSvKC6A5cTQrF5VXwG97Q2` belonging to Alice,
Bob tries to fetch it, and even though he's connected to Alice, it fails.
``` ~bob
$ rad ls
```
``` ~bob (fail)
-$ rad clone rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu --seed z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --timeout 1s
-✓ Seeding policy updated for rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu with scope 'followed'
-Fetching rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu from the network, found 1 potential seed(s).
+$ rad clone rad:z2PZv5hqSvKC6A5cTQrF5VXwG97Q2 --seed z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --timeout 1s
+✓ Seeding policy updated for rad:z2PZv5hqSvKC6A5cTQrF5VXwG97Q2 with scope 'followed'
+Fetching rad:z2PZv5hqSvKC6A5cTQrF5VXwG97Q2 from the network, found 1 potential seed(s).
✗ Target not met: could not fetch from [z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi], and required 1 more seed(s)
! Warning: Failed to fetch from 1 seed(s).
! Warning: z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi: an I/O error occurred during the fetch handshake (connection reset)
-✗ Error: no seeds found for rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu
+✗ Error: no seeds found for rad:z2PZv5hqSvKC6A5cTQrF5VXwG97Q2
```
She allows Bob to view the repository. And when she syncs, one seed (Bob) gets
@@ -28,15 +28,15 @@ Bob can now fetch the private repo without specifying a seed, because he knows
that Alice has the repo after she announced her refs:
``` ~bob
-$ rad sync rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu --fetch
-Fetching rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu from the network, found 1 potential seed(s).
+$ rad sync rad:z2PZv5hqSvKC6A5cTQrF5VXwG97Q2 --fetch
+Fetching rad:z2PZv5hqSvKC6A5cTQrF5VXwG97Q2 from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
$ rad ls --private --all
╭───────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ Name RID Visibility Head Description │
├───────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ heartwood rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu private f2de534 radicle heartwood protocol & stack │
+│ heartwood rad:z2PZv5hqSvKC6A5cTQrF5VXwG97Q2 private f2de534 radicle heartwood protocol & stack │
╰───────────────────────────────────────────────────────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-init-private-no-seed.md b/crates/radicle-cli/examples/rad-init-private-no-seed.md
index 9434e06641..9da0641c2c 100644
--- a/crates/radicle-cli/examples/rad-init-private-no-seed.md
+++ b/crates/radicle-cli/examples/rad-init-private-no-seed.md
@@ -9,7 +9,7 @@ Initializing private Radicle 👾 repository in [..]
✓ Repository heartwood created.
-Your Repository ID (RID) is rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu
+Your Repository ID (RID) is rad:z2PZv5hqSvKC6A5cTQrF5VXwG97Q2
You can show it any time by running `rad .` from this directory.
You have created a private repository.
@@ -29,8 +29,8 @@ No seeding policies to show.
We can decide to seed it later, so that others can fetch it from us, given
that they are part of the allow list:
```
-$ rad seed rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu
-✓ Seeding policy updated for rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu with scope 'followed'
+$ rad seed rad:z2PZv5hqSvKC6A5cTQrF5VXwG97Q2
+✓ Seeding policy updated for rad:z2PZv5hqSvKC6A5cTQrF5VXwG97Q2 with scope 'followed'
```
But it still won't show up in our inventory, since it's private:
diff --git a/crates/radicle-cli/examples/rad-init-private-seed.md b/crates/radicle-cli/examples/rad-init-private-seed.md
index 987061a45a..1706ac4a0c 100644
--- a/crates/radicle-cli/examples/rad-init-private-seed.md
+++ b/crates/radicle-cli/examples/rad-init-private-seed.md
@@ -9,41 +9,41 @@ $ rad id update --title "Allow Bob" --description "" --allow did:key:z6Mkt67GdsW
First, Bob seeds the repo.
``` ~bob
-$ rad seed rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu --no-fetch
+$ rad seed rad:z2X6q6YBaYvKvURP1SvbzTgqa8tch --no-fetch
[..]
```
If Bob just tries to fetch it without specifying seeds, he gets an error:
``` ~bob (fails)
-$ rad sync rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu --fetch
+$ rad sync rad:z2X6q6YBaYvKvURP1SvbzTgqa8tch --fetch
✗ Error: no candidate seeds were found to fetch from
```
He has to specify a seed that isn't in his routing table:
``` ~bob
-$ rad sync rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu --fetch --seed z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-Fetching rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu from the network, found 1 potential seed(s).
-✓ Target met: 1 preferred seed(s).
-🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+$ rad sync rad:z2X6q6YBaYvKvURP1SvbzTgqa8tch --fetch --seed z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+Fetching rad:z2X6q6YBaYvKvURP1SvbzTgqa8tch from the network, found 1 potential seed(s).
+✗ Target not met: could not fetch from [z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi], and required 1 more seed(s)
+✗ Error: Fetched from 0 preferred seed(s), could not reach 1 seed(s)
+✗ Error: Could not replicate from 1 preferred seed(s)
+✗ Error: z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi: an I/O error occurred during the fetch handshake (connection reset)
```
``` ~bob
$ rad ls --private --all
-╭───────────────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ Name RID Visibility Head Description │
-├───────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ heartwood rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu private f2de534 radicle heartwood protocol & stack │
-╰───────────────────────────────────────────────────────────────────────────────────────────────────────────╯
```
Note that if multiple seeds are specified, the command succeeds as long as one
seed succeeds.
``` ~bob
-$ rad sync rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu --fetch --seed z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --seed z6MkwPUeUS2fJMfc2HZN1RQTQcTTuhw4HhPySB8JeUg2mVvx
-Fetching rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu from the network, found 1 potential seed(s).
-✓ Target met: 1 seed(s)
-🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+$ rad sync rad:z2X6q6YBaYvKvURP1SvbzTgqa8tch --fetch --seed z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --seed z6MkwPUeUS2fJMfc2HZN1RQTQcTTuhw4HhPySB8JeUg2mVvx
+Fetching rad:z2X6q6YBaYvKvURP1SvbzTgqa8tch from the network, found 2 potential seed(s).
+✗ Target not met: could not fetch from [z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi, z6MkwPUeUS2fJMfc2HZN1RQTQcTTuhw4HhPySB8JeUg2mVvx], and required 2 more seed(s)
+✗ Error: Fetched from 0 preferred seed(s), could not reach 2 seed(s)
+✗ Error: Could not replicate from 2 preferred seed(s)
+✗ Error: z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi: an I/O error occurred during the fetch handshake (connection reset)
+✗ Error: z6MkwPUeUS2fJMfc2HZN1RQTQcTTuhw4HhPySB8JeUg2mVvx: Could not connect. No addresses known.
```
diff --git a/crates/radicle-cli/examples/rad-init-private.md b/crates/radicle-cli/examples/rad-init-private.md
index 4bde8233bc..c486f182da 100644
--- a/crates/radicle-cli/examples/rad-init-private.md
+++ b/crates/radicle-cli/examples/rad-init-private.md
@@ -7,7 +7,7 @@ Initializing private Radicle 👾 repository in [..]
✓ Repository heartwood created.
-Your Repository ID (RID) is rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu
+Your Repository ID (RID) is rad:z2PZv5hqSvKC6A5cTQrF5VXwG97Q2
You can show it any time by running `rad .` from this directory.
You have created a private repository.
@@ -27,6 +27,6 @@ $ rad seed
╭────────────────────────────────────────────────────────────────╮
│ Repository Name Policy Scope │
├────────────────────────────────────────────────────────────────┤
-│ rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu heartwood allow all │
+│ rad:z2PZv5hqSvKC6A5cTQrF5VXwG97Q2 heartwood allow all │
╰────────────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-init-sync-not-connected.md b/crates/radicle-cli/examples/rad-init-sync-not-connected.md
index 15343722cb..35d9e0ccc4 100644
--- a/crates/radicle-cli/examples/rad-init-sync-not-connected.md
+++ b/crates/radicle-cli/examples/rad-init-sync-not-connected.md
@@ -7,7 +7,7 @@ Initializing public Radicle 👾 repository in [..]
✓ Repository heartwood created.
-Your Repository ID (RID) is rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+Your Repository ID (RID) is rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
You can show it any time by running `rad .` from this directory.
✗ Announcing.. <canceled>
diff --git a/crates/radicle-cli/examples/rad-init-sync-preferred.md b/crates/radicle-cli/examples/rad-init-sync-preferred.md
index 2e958d7cf7..d52bbfceee 100644
--- a/crates/radicle-cli/examples/rad-init-sync-preferred.md
+++ b/crates/radicle-cli/examples/rad-init-sync-preferred.md
@@ -7,7 +7,7 @@ Initializing public Radicle 👾 repository in [..]
✓ Repository heartwood created.
-Your Repository ID (RID) is rad:z3Rry7rpdWuGpfjPYGzdJKQADsoNW
+Your Repository ID (RID) is rad:z45hwUDmwBidvbiZdL1oLYkzir9gD
You can show it any time by running `rad .` from this directory.
✓ Repository successfully synced to z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
@@ -16,7 +16,7 @@ You can show it any time by running `rad .` from this directory.
Your repository has been synced to the network and is now discoverable by peers.
View it in your browser at:
- https://radicle.network/nodes/[...]/rad:z3Rry7rpdWuGpfjPYGzdJKQADsoNW
+ https://radicle.network/nodes/127.0.0.1/rad:z45hwUDmwBidvbiZdL1oLYkzir9gD
To push changes, run `git push`.
```
diff --git a/crates/radicle-cli/examples/rad-init-sync-timeout.md b/crates/radicle-cli/examples/rad-init-sync-timeout.md
index 48ed15870c..570bfe3eed 100644
--- a/crates/radicle-cli/examples/rad-init-sync-timeout.md
+++ b/crates/radicle-cli/examples/rad-init-sync-timeout.md
@@ -8,7 +8,7 @@ Initializing public Radicle 👾 repository in [..]
✓ Repository heartwood created.
-Your Repository ID (RID) is rad:z3Rry7rpdWuGpfjPYGzdJKQADsoNW
+Your Repository ID (RID) is rad:z45hwUDmwBidvbiZdL1oLYkzir9gD
You can show it any time by running `rad .` from this directory.
✓ Repository successfully announced to the network.
diff --git a/crates/radicle-cli/examples/rad-init-sync.md b/crates/radicle-cli/examples/rad-init-sync.md
index 467f8c1310..982a2b2473 100644
--- a/crates/radicle-cli/examples/rad-init-sync.md
+++ b/crates/radicle-cli/examples/rad-init-sync.md
@@ -9,7 +9,7 @@ Initializing public Radicle 👾 repository in [..]
✓ Repository heartwood created.
-Your Repository ID (RID) is rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+Your Repository ID (RID) is rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
You can show it any time by running `rad .` from this directory.
✓ Repository successfully announced to the network.
diff --git a/crates/radicle-cli/examples/rad-init-v1.md b/crates/radicle-cli/examples/rad-init-v1.md
new file mode 100644
index 0000000000..78787b698c
--- /dev/null
+++ b/crates/radicle-cli/examples/rad-init-v1.md
@@ -0,0 +1,17 @@
+A repository can be initialized at an older identity document version, so that
+it stays readable to releases that predate the current version.
+
+```
+$ rad init --name heartwood --description "Radicle Heartwood Protocol & Stack" --identity-version 1 --no-confirm --public
+
+Initializing public Radicle 👾 repository in [..]
+
+✓ Repository heartwood created.
+
+Your Repository ID (RID) is rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+You can show it any time by running `rad .` from this directory.
+
+Your repository will be announced to the network when you start your node.
+You can start your node with `rad node start`.
+To push changes, run `git push`.
+```
diff --git a/crates/radicle-cli/examples/rad-init-with-existing-remote.md b/crates/radicle-cli/examples/rad-init-with-existing-remote.md
index e056c94517..db36c25274 100644
--- a/crates/radicle-cli/examples/rad-init-with-existing-remote.md
+++ b/crates/radicle-cli/examples/rad-init-with-existing-remote.md
@@ -26,7 +26,7 @@ Initializing public Radicle 👾 repository in [..]
✓ Repository heartwood created.
-Your Repository ID (RID) is rad:z2D6wQnKapY7dn5meBnbH2rUKNZbT
+Your Repository ID (RID) is rad:z28iHDqGx6PGukSRwtVZkpbtQoRkF
You can show it any time by running `rad .` from this directory.
Your repository will be announced to the network when you start your node.
diff --git a/crates/radicle-cli/examples/rad-init.md b/crates/radicle-cli/examples/rad-init.md
index 8f0031758f..fe37b6c46f 100644
--- a/crates/radicle-cli/examples/rad-init.md
+++ b/crates/radicle-cli/examples/rad-init.md
@@ -10,11 +10,10 @@ Initializing public Radicle 👾 repository in [..]
✓ Repository heartwood created.
{
"name": "heartwood",
- "description": "Radicle Heartwood Protocol & Stack",
- "defaultBranch": "master"
+ "description": "Radicle Heartwood Protocol & Stack"
}
-Your Repository ID (RID) is rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+Your Repository ID (RID) is rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
You can show it any time by running `rad .` from this directory.
Your repository will be announced to the network when you start your node.
@@ -26,7 +25,7 @@ If we try to initialize it again, we get an error:
``` (fail)
$ rad init
-✗ Error: repository is already initialized with remote rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+✗ Error: repository is already initialized with remote rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G
```
Repositories can be listed with the `ls` command:
@@ -36,7 +35,7 @@ $ rad ls
╭───────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ Name RID Visibility Head Description │
├───────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ heartwood rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji public f2de534 Radicle Heartwood Protocol & Stack │
+│ heartwood rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G public f2de534 Radicle Heartwood Protocol & Stack │
╰───────────────────────────────────────────────────────────────────────────────────────────────────────────╯
```
@@ -44,5 +43,5 @@ Public repositories are added to our inventory:
```
$ rad node inventory
-rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
```
diff --git a/crates/radicle-cli/examples/rad-inspect-noauth.md b/crates/radicle-cli/examples/rad-inspect-noauth.md
index 0871afd304..0c5cc277f8 100644
--- a/crates/radicle-cli/examples/rad-inspect-noauth.md
+++ b/crates/radicle-cli/examples/rad-inspect-noauth.md
@@ -8,5 +8,5 @@ $ rad self
```
$ rad inspect
-rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
```
diff --git a/crates/radicle-cli/examples/rad-inspect.md b/crates/radicle-cli/examples/rad-inspect.md
index 6ad1edb37a..734421da7c 100644
--- a/crates/radicle-cli/examples/rad-inspect.md
+++ b/crates/radicle-cli/examples/rad-inspect.md
@@ -3,14 +3,14 @@ command from inside a working copy:
```
$ rad inspect
-rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
```
As a shorthand, you can also simply use `rad .`:
```
$ rad .
-rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
```
It's also possible to display all of the repository's git references:
@@ -21,7 +21,7 @@ z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
└── refs
├── cobs
│ └── xyz.radicle.id
- │ └── 0656c217f917c3e06234771e9ecae53aba5e173e
+ │ └── 86399084097fb674569f5bc5847da609ab91aa9f
├── heads
│ └── master
└── rad
@@ -34,7 +34,7 @@ And sigrefs:
```
$ rad inspect --sigrefs
-z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi 99c549702e2bcfe02b0e68d4a2224fb7a1524529 root
+z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi 68a0f0d5d4d400f8788fdd8f6c515d0da6fa09be root
```
Or display the repository identity's payload and delegates:
@@ -42,8 +42,18 @@ Or display the repository identity's payload and delegates:
```
$ rad inspect --payload
{
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 1
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
"xyz.radicle.project": {
- "defaultBranch": "master",
"description": "Radicle Heartwood Protocol & Stack",
"name": "heartwood"
}
@@ -57,24 +67,34 @@ history:
```
$ rad inspect --history
-commit 0656c217f917c3e06234771e9ecae53aba5e173e
-blob d96f425412c9f8ad5d9a9a05c9831d0728e2338d
+commit 86399084097fb674569f5bc5847da609ab91aa9f
+blob f10bd9e36848dc4eb70cc078d1d0bbaac7c1ba61
date Thu, 15 Dec 2022 17:28:04 +0000
Initialize identity
{
+ "version": 2,
"payload": {
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 1
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
"xyz.radicle.project": {
- "defaultBranch": "master",
"description": "Radicle Heartwood Protocol & Stack",
"name": "heartwood"
}
},
"delegates": [
"did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
- ],
- "threshold": 1
+ ]
}
```
diff --git a/crates/radicle-cli/examples/rad-issue-list.md b/crates/radicle-cli/examples/rad-issue-list.md
index a3cfdf8cbc..d12a20ba75 100644
--- a/crates/radicle-cli/examples/rad-issue-list.md
+++ b/crates/radicle-cli/examples/rad-issue-list.md
@@ -5,14 +5,14 @@ $ rad issue list
╭────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Labels Assignees Opened │
├────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● d87dcfe flux capacitor underpowered alice (you) good-first-issue now │
+│ ● cb9d978 flux capacitor underpowered alice (you) good-first-issue now │
╰────────────────────────────────────────────────────────────────────────────────────────────────────╯
```
We can now assign ourselves to the open issue.
```
-$ rad issue assign d87dcfe --add did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --no-announce
+$ rad issue assign cb9d978 --add did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --no-announce
```
It will now also show up in the list of issues assigned to us.
@@ -22,15 +22,15 @@ $ rad issue list --assigned me
╭────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Labels Assignees Opened │
├────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● d87dcfe flux capacitor underpowered alice (you) good-first-issue alice now │
+│ ● cb9d978 flux capacitor underpowered alice (you) good-first-issue alice now │
╰────────────────────────────────────────────────────────────────────────────────────────────────────╯
```
If we now fix this issue, we can close it.
```
-$ rad issue state --solved d87dcfe --no-announce
-✓ Issue d87dcfe is now solved
+$ rad issue state --solved cb9d978 --no-announce
+✓ Issue cb9d978 is now solved
```
It will not show up in the list of open issues anymore.
@@ -46,7 +46,7 @@ $ rad issue list --solved
╭────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Labels Assignees Opened │
├────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● d87dcfe flux capacitor underpowered alice (you) good-first-issue alice now │
+│ ● cb9d978 flux capacitor underpowered alice (you) good-first-issue alice now │
╰────────────────────────────────────────────────────────────────────────────────────────────────────╯
```
@@ -57,6 +57,6 @@ $ rad issue --solved
╭────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Labels Assignees Opened │
├────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● d87dcfe flux capacitor underpowered alice (you) good-first-issue alice now │
+│ ● cb9d978 flux capacitor underpowered alice (you) good-first-issue alice now │
╰────────────────────────────────────────────────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-issue.md b/crates/radicle-cli/examples/rad-issue.md
index eb97ef4266..867554c01d 100644
--- a/crates/radicle-cli/examples/rad-issue.md
+++ b/crates/radicle-cli/examples/rad-issue.md
@@ -7,7 +7,7 @@ Let's say the new car you are designing with your peers has a problem with its f
$ rad issue open --title "flux capacitor underpowered" --description "Flux capacitor power requirements exceed current supply" --no-announce
╭─────────────────────────────────────────────────────────╮
│ Title flux capacitor underpowered │
-│ Issue d87dcfe8c2b3200e78b128d9b959cfdf7063fefe │
+│ Issue cb9d9788d1854a6d4bc7235756df33b9d372a605 │
│ Author alice (you) │
│ Status open │
│ │
@@ -22,17 +22,17 @@ $ rad issue list
╭──────────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Labels Assignees Opened │
├──────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● d87dcfe flux capacitor underpowered alice (you) now │
+│ ● cb9d978 flux capacitor underpowered alice (you) now │
╰──────────────────────────────────────────────────────────────────────────────────────────╯
```
Show the issue information issue.
```
-$ rad issue show d87dcfe
+$ rad issue show cb9d978
╭─────────────────────────────────────────────────────────╮
│ Title flux capacitor underpowered │
-│ Issue d87dcfe8c2b3200e78b128d9b959cfdf7063fefe │
+│ Issue cb9d9788d1854a6d4bc7235756df33b9d372a605 │
│ Author alice (you) │
│ Status open │
│ │
@@ -51,8 +51,8 @@ Let's assign ourselves to this one, this is to ensure work is not
duplicated. While we're at it, let's add a label.
```
-$ rad issue assign d87dcfe --add did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --no-announce
-$ rad issue label d87dcfe --add good-first-issue --no-announce
+$ rad issue assign cb9d978 --add did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --no-announce
+$ rad issue label cb9d978 --add good-first-issue --no-announce
```
It will now show in the list of issues assigned to us, along with the new label.
@@ -62,14 +62,14 @@ $ rad issue list --assigned
╭────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Labels Assignees Opened │
├────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● d87dcfe flux capacitor underpowered alice (you) good-first-issue alice now │
+│ ● cb9d978 flux capacitor underpowered alice (you) good-first-issue alice now │
╰────────────────────────────────────────────────────────────────────────────────────────────────────╯
```
Note: this can always be undone with the `unassign` subcommand.
```
-$ rad issue assign d87dcfe --delete did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --no-announce
+$ rad issue assign cb9d978 --delete did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --no-announce
```
Great, now we have communicated to the world about our car's defect.
@@ -78,30 +78,30 @@ But wait! We've found an important detail about the car's power requirements.
It will help whoever works on a fix.
```
-$ rad issue comment d87dcfe8c2b3200e78b128d9b959cfdf7063fefe --message 'The flux capacitor needs 1.21 Gigawatts' -q --no-announce
-2193e871916d18ddd0416b5198cb08c5dc7416b7
-$ rad issue comment d87dcfe8c2b3200e78b128d9b959cfdf7063fefe --reply-to 2193e871916d18ddd0416b5198cb08c5dc7416b7 --message 'More power!' -q --no-announce
-880fdcd94b36e412fc906b510f41008700d65424
+$ rad issue comment cb9d9788d1854a6d4bc7235756df33b9d372a605 --message 'The flux capacitor needs 1.21 Gigawatts' -q --no-announce
+7bec223a4952f6b402385c804df44e1231871449
+$ rad issue comment cb9d9788d1854a6d4bc7235756df33b9d372a605 --reply-to 7bec223a4952f6b402385c804df44e1231871449 --message 'More power!' -q --no-announce
+2ad1eb1cbf0026fd737c691d55d39f41e2065cd1
```
We can see our comments by showing the issue:
```
-$ rad issue show d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
+$ rad issue show cb9d9788d1854a6d4bc7235756df33b9d372a605
╭─────────────────────────────────────────────────────────╮
│ Title flux capacitor underpowered │
-│ Issue d87dcfe8c2b3200e78b128d9b959cfdf7063fefe │
+│ Issue cb9d9788d1854a6d4bc7235756df33b9d372a605 │
│ Author alice (you) │
│ Labels good-first-issue │
│ Status open │
│ │
│ Flux capacitor power requirements exceed current supply │
├─────────────────────────────────────────────────────────┤
-│ alice (you) now 2193e87 │
+│ alice (you) now 7bec223 │
│ │
│ The flux capacitor needs 1.21 Gigawatts │
├─────────────────────────────────────────────────────────┤
-│ alice (you) now 880fdcd │
+│ alice (you) now 2ad1eb1 │
│ │
│ More power! │
╰─────────────────────────────────────────────────────────╯
@@ -110,9 +110,9 @@ $ rad issue show d87dcfe8c2b3200e78b128d9b959cfdf7063fefe
We can also edit a comment:
```
-$ rad issue comment d87dcfe --edit 880fdcd -m "Even more power!"
+$ rad issue comment cb9d978 --edit 7bec223 -m "Even more power!"
╭─────────────────────────╮
-│ alice (you) now 880fdcd │
+│ alice (you) now 7bec223 │
│ Even more power! │
╰─────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-merge-after-update.md b/crates/radicle-cli/examples/rad-merge-after-update.md
index 945dd57fc6..36308726ae 100644
--- a/crates/radicle-cli/examples/rad-merge-after-update.md
+++ b/crates/radicle-cli/examples/rad-merge-after-update.md
@@ -4,8 +4,8 @@ Let's start by creating a patch.
$ git checkout -b feature/1 -q
$ git commit --allow-empty -q -m "First change"
$ git push rad HEAD:refs/patches
-✓ Patch 696ec5508494692899337afe6713fe1796d0315c opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Patch 43362c8b437a0ce6798a762f3676e4dd68b67792 opened
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
@@ -17,7 +17,7 @@ $ git checkout master -q
$ git merge feature/1 -q
$ git push rad master
✓ Canonical reference refs/heads/master updated to target commit 954bcdb5008447ce294a61a21d7eb87afbe7f4a6
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
f2de534..954bcdb master -> master
```
@@ -27,8 +27,8 @@ update it, we expect it to be updated and merged:
``` (stderr) RAD_SOCKET=/dev/null
$ git checkout feature/1 -q
$ git push -f
-✓ Patch 696ec55 updated to revision [...]
-✓ Patch 696ec5508494692899337afe6713fe1796d0315c merged
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- + 20aa5dd...954bcdb feature/1 -> patches/696ec5508494692899337afe6713fe1796d0315c (forced update)
+✓ Patch 43362c8 updated to revision [..]
+✓ Patch 43362c8b437a0ce6798a762f3676e4dd68b67792 merged
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ + 20aa5dd...954bcdb feature/1 -> patches/43362c8b437a0ce6798a762f3676e4dd68b67792 (forced update)
```
diff --git a/crates/radicle-cli/examples/rad-merge-no-ff.md b/crates/radicle-cli/examples/rad-merge-no-ff.md
index 39999cea80..f04ef0ffd0 100644
--- a/crates/radicle-cli/examples/rad-merge-no-ff.md
+++ b/crates/radicle-cli/examples/rad-merge-no-ff.md
@@ -4,8 +4,8 @@ First, let's create a patch.
$ git checkout -b feature/1 -q
$ git commit --allow-empty -q -m "First change"
$ git push rad HEAD:refs/patches
-✓ Patch 696ec5508494692899337afe6713fe1796d0315c opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Patch 43362c8b437a0ce6798a762f3676e4dd68b67792 opened
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
@@ -36,8 +36,8 @@ committer radicle <radicle@localhost> 1671125284 +0000
Finally, we push master and expect the patch to be merged.
``` (stderr) RAD_SOCKET=/dev/null
$ git push rad master
-✓ Patch 696ec5508494692899337afe6713fe1796d0315c merged
+✓ Patch 43362c8b437a0ce6798a762f3676e4dd68b67792 merged
✓ Canonical reference refs/heads/master updated to target commit 737a10cfa29111afeb0d43cf3545cee386b939ec
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
f2de534..737a10c master -> master
```
diff --git a/crates/radicle-cli/examples/rad-merge-via-push.md b/crates/radicle-cli/examples/rad-merge-via-push.md
index d8d5e40e3a..5add745edc 100644
--- a/crates/radicle-cli/examples/rad-merge-via-push.md
+++ b/crates/radicle-cli/examples/rad-merge-via-push.md
@@ -7,8 +7,8 @@ $ git commit --allow-empty -m "First change"
```
``` (stderr) RAD_SOCKET=/dev/null
$ git push rad HEAD:refs/patches
-✓ Patch 696ec5508494692899337afe6713fe1796d0315c opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Patch 43362c8b437a0ce6798a762f3676e4dd68b67792 opened
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
```
@@ -18,8 +18,8 @@ $ git commit --allow-empty -m "Second change"
```
``` (stderr) RAD_SOCKET=/dev/null
$ git push rad HEAD:refs/patches
-✓ Patch 356f73863a8920455ff6e77cd9c805d68910551b opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Patch 745487c5cd672f16b29297e8ed65d7f10cd70577 opened
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
@@ -28,8 +28,8 @@ This creates some remote tracking branches for us:
```
$ git branch -r
rad/master
- rad/patches/356f73863a8920455ff6e77cd9c805d68910551b
- rad/patches/696ec5508494692899337afe6713fe1796d0315c
+ rad/patches/43362c8b437a0ce6798a762f3676e4dd68b67792
+ rad/patches/745487c5cd672f16b29297e8ed65d7f10cd70577
```
And some remote refs:
@@ -40,15 +40,15 @@ z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
└── refs
├── cobs
│ ├── xyz.radicle.id
- │ │ └── 0656c217f917c3e06234771e9ecae53aba5e173e
+ │ │ └── 86399084097fb674569f5bc5847da609ab91aa9f
│ └── xyz.radicle.patch
- │ ├── 356f73863a8920455ff6e77cd9c805d68910551b
- │ └── 696ec5508494692899337afe6713fe1796d0315c
+ │ ├── 43362c8b437a0ce6798a762f3676e4dd68b67792
+ │ └── 745487c5cd672f16b29297e8ed65d7f10cd70577
├── heads
│ ├── master
│ └── patches
- │ ├── 356f73863a8920455ff6e77cd9c805d68910551b
- │ └── 696ec5508494692899337afe6713fe1796d0315c
+ │ ├── 43362c8b437a0ce6798a762f3676e4dd68b67792
+ │ └── 745487c5cd672f16b29297e8ed65d7f10cd70577
└── rad
├── id
├── root
@@ -68,10 +68,10 @@ When we push to `rad/master`, we automatically merge the patches:
``` (stderr) RAD_SOCKET=/dev/null
$ git push rad master
-✓ Patch 356f73863a8920455ff6e77cd9c805d68910551b merged
-✓ Patch 696ec5508494692899337afe6713fe1796d0315c merged
+✓ Patch 43362c8b437a0ce6798a762f3676e4dd68b67792 merged
+✓ Patch 745487c5cd672f16b29297e8ed65d7f10cd70577 merged
✓ Canonical reference refs/heads/master updated to target commit d6399c71702b40bae00825b3c444478d06b4e91c
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
f2de534..d6399c7 master -> master
```
```
@@ -79,16 +79,16 @@ $ rad patch --merged
╭─────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Reviews Head + - Updated Labels │
├─────────────────────────────────────────────────────────────────────────────────────┤
-│ ✓ [ ... ] Second change alice (you) - daf349f +0 -0 now │
-│ ✓ [ ... ] First change alice (you) - 20aa5dd +0 -0 now │
+│ ✓ 43362c8 First change alice (you) - 20aa5dd +0 -0 now │
+│ ✓ 745487c Second change alice (you) - daf349f +0 -0 now │
╰─────────────────────────────────────────────────────────────────────────────────────╯
-$ rad patch show 696ec5508494692899337afe6713fe1796d0315c
+$ rad patch show 43362c8b437a0ce6798a762f3676e4dd68b67792
╭──────────────────────────────────────────────────────────╮
│ Title First change │
-│ Patch 696ec5508494692899337afe6713fe1796d0315c │
+│ Patch 43362c8b437a0ce6798a762f3676e4dd68b67792 │
│ Author alice (you) │
│ Head 20aa5dde6210796c3a2f04079b42316a31d02689 │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
│ Branches feature/1 │
│ Commits ahead 0, behind 2 │
@@ -96,16 +96,16 @@ $ rad patch show 696ec5508494692899337afe6713fe1796d0315c
├──────────────────────────────────────────────────────────┤
│ 20aa5dd First change │
├──────────────────────────────────────────────────────────┤
-│ ● Revision 696ec55 @ [.. ]..20aa5dd by alice (you) now │
+│ ● Revision 43362c8 @ [..]..20aa5dd by alice (you) now │
│ └─ ✓ merged by alice (you) │
╰──────────────────────────────────────────────────────────╯
-$ rad patch show 356f73863a8920455ff6e77cd9c805d68910551b
+$ rad patch show 745487c5cd672f16b29297e8ed65d7f10cd70577
╭──────────────────────────────────────────────────────────╮
│ Title Second change │
-│ Patch 356f73863a8920455ff6e77cd9c805d68910551b │
+│ Patch 745487c5cd672f16b29297e8ed65d7f10cd70577 │
│ Author alice (you) │
│ Head daf349ff76bedf48c5f292290b682ee7be0683cf │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
│ Branches feature/2 │
│ Commits ahead 0, behind 2 │
@@ -113,7 +113,7 @@ $ rad patch show 356f73863a8920455ff6e77cd9c805d68910551b
├──────────────────────────────────────────────────────────┤
│ daf349f Second change │
├──────────────────────────────────────────────────────────┤
-│ ● Revision 356f738 @ [.. ]..daf349f by alice (you) now │
+│ ● Revision 745487c @ [..]..daf349f by alice (you) now │
│ └─ ✓ merged by alice (you) │
╰──────────────────────────────────────────────────────────╯
```
@@ -133,10 +133,10 @@ z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
└── refs
├── cobs
│ ├── xyz.radicle.id
- │ │ └── 0656c217f917c3e06234771e9ecae53aba5e173e
+ │ │ └── 86399084097fb674569f5bc5847da609ab91aa9f
│ └── xyz.radicle.patch
- │ ├── 356f73863a8920455ff6e77cd9c805d68910551b
- │ └── 696ec5508494692899337afe6713fe1796d0315c
+ │ ├── 43362c8b437a0ce6798a762f3676e4dd68b67792
+ │ └── 745487c5cd672f16b29297e8ed65d7f10cd70577
├── heads
│ └── master
└── rad
@@ -151,9 +151,9 @@ the first patch, even though they were pushed together.
``` (stderr) RAD_SOCKET=/dev/null
$ git reset --hard HEAD^
$ git push -f rad
-! Patch 356f73863a8920455ff6e77cd9c805d68910551b reverted at revision 356f738
+! Patch 745487c5cd672f16b29297e8ed65d7f10cd70577 reverted at revision 745487c
✓ Canonical reference refs/heads/master updated to target commit 20aa5dde6210796c3a2f04079b42316a31d02689
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ d6399c7...20aa5dd master -> master (forced update)
```
```
@@ -161,7 +161,7 @@ $ rad patch --all
╭─────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Reviews Head + - Updated Labels │
├─────────────────────────────────────────────────────────────────────────────────────┤
-│ ● 356f738 Second change alice (you) - daf349f +0 -0 now │
-│ ✓ 696ec55 First change alice (you) - 20aa5dd +0 -0 now │
+│ ✓ 43362c8 First change alice (you) - 20aa5dd +0 -0 now │
+│ ● 745487c Second change alice (you) - daf349f +0 -0 now │
╰─────────────────────────────────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-node.md b/crates/radicle-cli/examples/rad-node.md
index 8f7d8591f0..ab4aadb806 100644
--- a/crates/radicle-cli/examples/rad-node.md
+++ b/crates/radicle-cli/examples/rad-node.md
@@ -43,7 +43,7 @@ $ rad seed
╭───────────────────────────────────────────────────────────────────╮
│ Repository Name Policy Scope │
├───────────────────────────────────────────────────────────────────┤
-│ rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji heartwood allow followed │
+│ rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G heartwood allow followed │
╰───────────────────────────────────────────────────────────────────╯
```
@@ -68,7 +68,7 @@ $ rad node routing
╭──────────────────────────────────────────────────────────────────────────────────────╮
│ RID NID │
├──────────────────────────────────────────────────────────────────────────────────────┤
-│ rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │
+│ rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │
╰──────────────────────────────────────────────────────────────────────────────────────╯
```
@@ -90,8 +90,8 @@ $ rad node stop
Note that if we unseed a repository, it is no longer part of our inventory:
```
-$ rad unseed rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Seeding policy for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji removed
+$ rad unseed rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+✓ Seeding policy for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G removed
$ rad node inventory
```
@@ -99,18 +99,18 @@ Likewise, if we seed a repository we don't have locally, it won't show up as
part of our inventory:
```
$ rad seed rad:z3trNYnLWS11cJWC6BbxDs5niGo82
-[...]
+[..]
$ rad node inventory
```
But if we start seeding the repository we have locally again, it'll show
up in our inventory:
```
-$ rad seed rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Inventory updated with rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'followed'
+$ rad seed rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+✓ Inventory updated with rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+✓ Seeding policy updated for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G with scope 'followed'
$ rad node inventory
-rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
```
Some commands also give us a hint if the node isn't running:
diff --git a/crates/radicle-cli/examples/rad-patch-ahead-behind.md b/crates/radicle-cli/examples/rad-patch-ahead-behind.md
index c9b2be25d5..3bdc0e0bb3 100644
--- a/crates/radicle-cli/examples/rad-patch-ahead-behind.md
+++ b/crates/radicle-cli/examples/rad-patch-ahead-behind.md
@@ -37,8 +37,8 @@ $ git log --graph --decorate --abbrev-commit --pretty=oneline --all
Then we create a patch from `feature/1`:
``` (stderr)
$ git push rad feature/1:refs/patches
-✓ Patch 217f050f8891def8fb863f7c0b4f85c89f97299d opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Patch 0eb9ee630b38594e17f434ed17bb0679065b2ecd opened
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] feature/1 -> refs/patches
```
@@ -48,17 +48,17 @@ $ rad patch list
╭────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Reviews Head + - Updated Labels │
├────────────────────────────────────────────────────────────────────────────────┤
-│ ● 217f050 Add Alan alice (you) - 5c88a79 +1 -0 now │
+│ ● 0eb9ee6 Add Alan alice (you) - 5c88a79 +1 -0 now │
╰────────────────────────────────────────────────────────────────────────────────╯
```
When showing the patch, we see that it is `ahead 1, behind 1`, since master has
diverged by one commit:
```
-$ rad patch show -v -p 217f050
+$ rad patch show -v -p 0eb9ee6
╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ Title Add Alan │
-│ Patch 217f050f8891def8fb863f7c0b4f85c89f97299d │
+│ Patch 0eb9ee630b38594e17f434ed17bb0679065b2ecd │
│ Author alice (you) │
│ Head 5c88a79d75f5c2b4cc51ee6f163d2db91ee198d7 │
│ Base f64fb2c8fe28f7c458c72ec8d700373924794943 │
@@ -69,7 +69,7 @@ $ rad patch show -v -p 217f050
├──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
│ 5c88a79 Add Alan │
├──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● Revision 217f050f8891def8fb863f7c0b4f85c89f97299d with range f64fb2c8fe28f7c458c72ec8d700373924794943..5c88a79d75f5c2b4cc51ee6f163d2db91ee198d7 by alice (you) now │
+│ ● Revision 0eb9ee630b38594e17f434ed17bb0679065b2ecd with range f64fb2c8fe28f7c458c72ec8d700373924794943..5c88a79d75f5c2b4cc51ee6f163d2db91ee198d7 by alice (you) now │
╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
commit 5c88a79d75f5c2b4cc51ee6f163d2db91ee198d7
@@ -94,18 +94,18 @@ $ git checkout -q -b feature/2 feature/1
$ sed -i '$a Mel Farna' CONTRIBUTORS
$ git commit -a -q -m "Add Mel"
$ git push -o patch.message="Add Mel" rad HEAD:refs/patches
-✓ Patch e22ff008e2a0ed47262890d13263031d7555b555 opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Patch 29c888f25b6e647fb985812209f1a900dc01333a opened
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
When we look at the patch, we see that it has both commits, because this new
patch uses the same base as the previous patch:
```
-$ rad patch show -v e22ff008e2a0ed47262890d13263031d7555b555
+$ rad patch show -v 29c888f25b6e647fb985812209f1a900dc01333a
╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ Title Add Mel │
-│ Patch e22ff008e2a0ed47262890d13263031d7555b555 │
+│ Patch 29c888f25b6e647fb985812209f1a900dc01333a │
│ Author alice (you) │
│ Head 7f63fcbcf23fc39eea784c091ad3d20d7e4bd005 │
│ Base f64fb2c8fe28f7c458c72ec8d700373924794943 │
@@ -117,7 +117,7 @@ $ rad patch show -v e22ff008e2a0ed47262890d13263031d7555b555
│ 7f63fcb Add Mel │
│ 5c88a79 Add Alan │
├──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● Revision e22ff008e2a0ed47262890d13263031d7555b555 with range f64fb2c8fe28f7c458c72ec8d700373924794943..7f63fcbcf23fc39eea784c091ad3d20d7e4bd005 by alice (you) now │
+│ ● Revision 29c888f25b6e647fb985812209f1a900dc01333a with range f64fb2c8fe28f7c458c72ec8d700373924794943..7f63fcbcf23fc39eea784c091ad3d20d7e4bd005 by alice (you) now │
╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
```
@@ -126,8 +126,8 @@ If we want to instead create a "stacked" patch, we can do so with the
``` (stderr)
$ git push -o patch.message="Add Mel #2" -o patch.base=HEAD^ rad HEAD:refs/patches
-✓ Patch a467ffa260c4fbe355b6fb550ba0c4956078717e opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Patch 7bfdb801d676c78d604af10f89d341f7bc646b45 opened
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
@@ -138,10 +138,10 @@ However, since the patch is still intended to be merged into `master`, we see
that it is still two commits ahead and one behind from `master`.
```
-$ rad patch show -v a467ffa260c4fbe355b6fb550ba0c4956078717e
+$ rad patch show -v 7bfdb801d676c78d604af10f89d341f7bc646b45
╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ Title Add Mel #2 │
-│ Patch a467ffa260c4fbe355b6fb550ba0c4956078717e │
+│ Patch 7bfdb801d676c78d604af10f89d341f7bc646b45 │
│ Author alice (you) │
│ Head 7f63fcbcf23fc39eea784c091ad3d20d7e4bd005 │
│ Base 5c88a79d75f5c2b4cc51ee6f163d2db91ee198d7 │
@@ -152,6 +152,6 @@ $ rad patch show -v a467ffa260c4fbe355b6fb550ba0c4956078717e
├──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
│ 7f63fcb Add Mel │
├──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● Revision a467ffa260c4fbe355b6fb550ba0c4956078717e with range 5c88a79d75f5c2b4cc51ee6f163d2db91ee198d7..7f63fcbcf23fc39eea784c091ad3d20d7e4bd005 by alice (you) now │
+│ ● Revision 7bfdb801d676c78d604af10f89d341f7bc646b45 with range 5c88a79d75f5c2b4cc51ee6f163d2db91ee198d7..7f63fcbcf23fc39eea784c091ad3d20d7e4bd005 by alice (you) now │
╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-patch-change-base.md b/crates/radicle-cli/examples/rad-patch-change-base.md
index e7a55cdf94..e89beefc75 100644
--- a/crates/radicle-cli/examples/rad-patch-change-base.md
+++ b/crates/radicle-cli/examples/rad-patch-change-base.md
@@ -15,11 +15,11 @@ $ git commit -v -m "Define power requirements"
```
``` (stderr)
$ git push rad flux-capacitor-power
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new branch] flux-capacitor-power -> flux-capacitor-power
$ git push rad -o patch.message="Define power requirements" -o patch.message="See details." HEAD:refs/patches
-✓ Patch aa45913e757cacd46972733bddee5472c78fa32a opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Patch 26ba0615c6e911344ee61d53241a2903c5bf8623 opened
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
@@ -35,18 +35,18 @@ $ git commit --message "Add README, just for the fun"
```
``` (stderr)
$ git push rad -o patch.message="Add README, just for the fun" HEAD:refs/patches
-✓ Patch 183d343ab47d7fe18baf1b24b7209ad033d7fe5c opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Patch cf92361190b992fa4a3f603b848fb630bf5c55e0 opened
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
Our second patch looks like the following:
```
-$ rad patch show 183d343ab47d7fe18baf1b24b7209ad033d7fe5c
+$ rad patch show cf92361190b992fa4a3f603b848fb630bf5c55e0
╭──────────────────────────────────────────────────────────╮
│ Title Add README, just for the fun │
-│ Patch 183d343ab47d7fe18baf1b24b7209ad033d7fe5c │
+│ Patch cf92361190b992fa4a3f603b848fb630bf5c55e0 │
│ Author alice (you) │
│ Head 27857ec9eb04c69cacab516e8bf4b5fd36090f66 │
│ Base f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 │
@@ -58,7 +58,7 @@ $ rad patch show 183d343ab47d7fe18baf1b24b7209ad033d7fe5c
│ 27857ec Add README, just for the fun │
│ 3e674d1 Define power requirements │
├──────────────────────────────────────────────────────────┤
-│ ● Revision 183d343 @ f2de534..27857ec by alice (you) now │
+│ ● Revision cf92361 @ f2de534..27857ec by alice (you) now │
╰──────────────────────────────────────────────────────────╯
```
@@ -67,18 +67,18 @@ commit `3e674d1` as part of this patch, so we create a new revision
with a new `base`:
```
-$ rad patch update 183d343 -b 3e674d1 -m "Whoops, forgot to set the base" --no-announce
-ebe76f9c2148eb595d7a745f82275786bf3458c3
+$ rad patch update cf92361 -b 3e674d1 -m "Whoops, forgot to set the base" --no-announce
+02e77b19af9aeba218c8abe480bbcced8541e160
```
Now, if we show the patch we can see the patch's base has changed and
we have a single commit:
```
-$ rad patch show 183d343
+$ rad patch show cf92361
╭──────────────────────────────────────────────────────────╮
│ Title Add README, just for the fun │
-│ Patch 183d343ab47d7fe18baf1b24b7209ad033d7fe5c │
+│ Patch cf92361190b992fa4a3f603b848fb630bf5c55e0 │
│ Author alice (you) │
│ Head 27857ec9eb04c69cacab516e8bf4b5fd36090f66 │
│ Base 3e674d1a1df90807e934f9ae5da2591dd6848a33 │
@@ -89,7 +89,7 @@ $ rad patch show 183d343
├──────────────────────────────────────────────────────────┤
│ 27857ec Add README, just for the fun │
├──────────────────────────────────────────────────────────┤
-│ ● Revision 183d343 @ f2de534..27857ec by alice (you) now │
-│ ↑ Revision ebe76f9 @ 3e674d1..27857ec by alice (you) now │
+│ ● Revision cf92361 @ f2de534..27857ec by alice (you) now │
+│ ↑ Revision 02e77b1 @ 3e674d1..27857ec by alice (you) now │
╰──────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-patch-checkout-force.md b/crates/radicle-cli/examples/rad-patch-checkout-force.md
index d4b476cfd6..5ab3d15ddc 100644
--- a/crates/radicle-cli/examples/rad-patch-checkout-force.md
+++ b/crates/radicle-cli/examples/rad-patch-checkout-force.md
@@ -13,9 +13,9 @@ $ git commit -v -m "Define power requirements"
``` ~alice (stderr)
$ git push rad -o patch.message="Define power requirements" -o patch.message="See details." HEAD:refs/patches
-✓ Patch aa45913e757cacd46972733bddee5472c78fa32a opened
+✓ Patch 26ba0615c6e911344ee61d53241a2903c5bf8623 opened
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
@@ -24,12 +24,12 @@ On the other end, Bob uses `rad patch checkout` to view the patch:
``` ~bob
$ cd heartwood
$ rad sync -f
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-$ rad patch checkout aa45913 --name alice-init
-✓ Switched to branch alice-init at revision aa45913
-✓ Branch alice-init setup to track rad/patches/aa45913e757cacd46972733bddee5472c78fa32a
+$ rad patch checkout 26ba061 --name alice-init
+✓ Switched to branch alice-init at revision 26ba061
+✓ Branch alice-init setup to track rad/patches/26ba0615c6e911344ee61d53241a2903c5bf8623
```
Meanwhile, we may see some more changes that we need to make, so we
@@ -46,28 +46,28 @@ $ git commit --message "Add README, just for the fun"
``` ~alice (stderr)
$ git push rad -o patch.message="Add README, just for the fun"
-✓ Patch aa45913 updated to revision 3156bed9d64d4675d6cf56612d217fc5f4e8a53a
-To compare against your previous revision aa45913, run:
+✓ Patch 26ba061 updated to revision 32a5d05e0be58807fba749f320114cefac3e2d2e
+To compare against your previous revision 26ba061, run:
- git range-diff f2de534[..] 3e674d1[..] 27857ec[..]
+ git range-diff f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 3e674d1a1df90807e934f9ae5da2591dd6848a33 27857ec9eb04c69cacab516e8bf4b5fd36090f66
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- 3e674d1..27857ec flux-capacitor-power -> patches/aa45913e757cacd46972733bddee5472c78fa32a
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ 3e674d1..27857ec flux-capacitor-power -> patches/26ba0615c6e911344ee61d53241a2903c5bf8623
```
Bob fetches these new changes and can see their branch is now behind:
``` ~bob (stderr)
$ git fetch rad
-From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
- 3e674d1..27857ec patches/aa45913e757cacd46972733bddee5472c78fa32a -> rad/patches/aa45913e757cacd46972733bddee5472c78fa32a
+From rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G
+ 3e674d1..27857ec patches/26ba0615c6e911344ee61d53241a2903c5bf8623 -> rad/patches/26ba0615c6e911344ee61d53241a2903c5bf8623
```
``` ~bob
$ git status
On branch alice-init
-Your branch is behind 'rad/patches/aa45913e757cacd46972733bddee5472c78fa32a' by 1 commit, and can be fast-forwarded.
+Your branch is behind 'rad/patches/26ba0615c6e911344ee61d53241a2903c5bf8623' by 1 commit, and can be fast-forwarded.
(use "git pull" to update your local branch)
nothing to commit, working tree clean
@@ -79,17 +79,17 @@ overwrite any changes. Bob can choose to use the `--force` (`-f`) flag to
ensure that they are looking at the latest changes:
``` ~bob (fail)
-$ rad patch checkout aa45913 --name alice-init
+$ rad patch checkout 26ba061 --name alice-init
✗ Performing checkout… <canceled>
✗ Error: branch 'alice-init' already exists (use `--force` to overwrite)
```
``` ~bob
-$ rad patch checkout aa45913 -f --name alice-init
-✓ Switched to branch alice-init at revision 3156bed
+$ rad patch checkout 26ba061 -f --name alice-init
+✓ Switched to branch alice-init at revision 32a5d05
$ git status
On branch alice-init
-Your branch is up to date with 'rad/patches/aa45913e757cacd46972733bddee5472c78fa32a'.
+Your branch is up to date with 'rad/patches/26ba0615c6e911344ee61d53241a2903c5bf8623'.
nothing to commit, working tree clean
```
diff --git a/crates/radicle-cli/examples/rad-patch-checkout-revision.md b/crates/radicle-cli/examples/rad-patch-checkout-revision.md
index f045d3abd4..ced108bcb5 100644
--- a/crates/radicle-cli/examples/rad-patch-checkout-revision.md
+++ b/crates/radicle-cli/examples/rad-patch-checkout-revision.md
@@ -5,7 +5,7 @@ So first, let's add another change to the patch and a `LICENSE` file.
$ touch LICENSE
$ git add LICENSE
$ git commit --message "Add LICENSE, just for the business"
-[patch/aa45913 639f44a] Add LICENSE, just for the business
+[patch/26ba061 639f44a] Add LICENSE, just for the business
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 LICENSE
$ git push rad -o patch.message="Add LICENSE, just for the business"
@@ -14,15 +14,15 @@ $ git push rad -o patch.message="Add LICENSE, just for the business"
We can see the list of revisions of the patch by `show`ing it:
```
-$ rad patch show aa45913
+$ rad patch show 26ba061
╭──────────────────────────────────────────────────────────╮
│ Title Define power requirements │
-│ Patch aa45913e757cacd46972733bddee5472c78fa32a │
+│ Patch 26ba0615c6e911344ee61d53241a2903c5bf8623 │
│ Author alice (you) │
│ Head 639f44a25145a37f747f3c84265037a9461e44c5 │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
-│ Branches patch/aa45913 │
+│ Branches patch/26ba061 │
│ Commits ahead 3, behind 0 │
│ Status open │
│ │
@@ -32,20 +32,20 @@ $ rad patch show aa45913
│ 27857ec Add README, just for the fun │
│ 3e674d1 Define power requirements │
├──────────────────────────────────────────────────────────┤
-│ ● Revision aa45913 @ [.. ]..3e674d1 by alice (you) now │
-│ ↑ Revision 3156bed @ [.. ]..27857ec by alice (you) now │
-│ ↑ Revision 2f5324f @ [.. ]..639f44a by alice (you) now │
+│ ● Revision 26ba061 @ [..]..3e674d1 by alice (you) now │
+│ ↑ Revision 32a5d05 @ f2de534..27857ec by alice (you) now │
+│ ↑ Revision 3d2355d @ f2de534..639f44a by alice (you) now │
╰──────────────────────────────────────────────────────────╯
```
So, let's checkout the previous revision, `0c0942e2`:
```
-$ rad patch checkout aa45913 --revision 3156bed9d64d4675d6cf56612d217fc5f4e8a53a -f
-✓ Switched to branch patch/aa45913 at revision 3156bed
+$ rad patch checkout 26ba061 --revision 32a5d05e0be58807fba749f320114cefac3e2d2e -f
+✓ Switched to branch patch/26ba061 at revision 32a5d05
```
-And we can confirm that the current commit corresponds to `27857ec`:
+And we can confirm that the current commit corresponds to `3032c7f`:
```
$ git rev-parse HEAD
diff --git a/crates/radicle-cli/examples/rad-patch-checkout.md b/crates/radicle-cli/examples/rad-patch-checkout.md
index 044e6c26f5..e48ca577f0 100644
--- a/crates/radicle-cli/examples/rad-patch-checkout.md
+++ b/crates/radicle-cli/examples/rad-patch-checkout.md
@@ -22,17 +22,17 @@ Once the code is ready, we open (or create) a patch with our changes for the pro
``` (stderr)
$ git push rad -o patch.message="Define power requirements" -o patch.message="See details." HEAD:refs/patches
-✓ Patch aa45913e757cacd46972733bddee5472c78fa32a opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Patch 26ba0615c6e911344ee61d53241a2903c5bf8623 opened
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
Now, let's checkout the patch that we just created:
```
-$ rad patch checkout aa45913e757cacd46972733bddee5472c78fa32a
-✓ Switched to branch patch/aa45913 at revision aa45913
-✓ Branch patch/aa45913 setup to track rad/patches/aa45913e757cacd46972733bddee5472c78fa32a
+$ rad patch checkout 26ba0615c6e911344ee61d53241a2903c5bf8623
+✓ Switched to branch patch/26ba061 at revision 26ba061
+✓ Branch patch/26ba061 setup to track rad/patches/26ba0615c6e911344ee61d53241a2903c5bf8623
```
Note that `rad patch checkout` can be used to switch to the patch branch
@@ -40,8 +40,8 @@ as long as we haven't made changes to it.
```
$ git checkout master -q
-$ rad patch checkout aa45913
-✓ Switched to branch patch/aa45913 at revision aa45913
+$ rad patch checkout 26ba061
+✓ Switched to branch patch/26ba061 at revision 26ba061
```
Now, let's add a README too!
@@ -50,7 +50,7 @@ Now, let's add a README too!
$ touch README.md
$ git add README.md
$ git commit --message "Add README, just for the fun"
-[patch/aa45913 27857ec] Add README, just for the fun
+[patch/26ba061 27857ec] Add README, just for the fun
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 README.md
```
@@ -59,11 +59,11 @@ We can now finish off the update:
``` (stderr)
$ git push rad -o patch.message="Add README, just for the fun"
-✓ Patch aa45913 updated to revision 3156bed9d64d4675d6cf56612d217fc5f4e8a53a
-To compare against your previous revision aa45913, run:
+✓ Patch 26ba061 updated to revision 32a5d05e0be58807fba749f320114cefac3e2d2e
+To compare against your previous revision 26ba061, run:
- git range-diff f2de534[..] 3e674d1[..] 27857ec[..]
+ git range-diff f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 3e674d1a1df90807e934f9ae5da2591dd6848a33 27857ec9eb04c69cacab516e8bf4b5fd36090f66
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- 3e674d1..27857ec patch/aa45913 -> patches/aa45913e757cacd46972733bddee5472c78fa32a
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ 3e674d1..27857ec patch/26ba061 -> patches/26ba0615c6e911344ee61d53241a2903c5bf8623
```
diff --git a/crates/radicle-cli/examples/rad-patch-delete.md b/crates/radicle-cli/examples/rad-patch-delete.md
index 47bcecec7f..1d6af2272f 100644
--- a/crates/radicle-cli/examples/rad-patch-delete.md
+++ b/crates/radicle-cli/examples/rad-patch-delete.md
@@ -10,32 +10,32 @@ $ git commit -m "Introduce license"
``` ~alice (stderr)
$ git push rad -o patch.draft -o patch.message="Define LICENSE for project" HEAD:refs/patches
-✓ Patch 6c61ef1716ad8a5c11e04dd7a3fec51e01fba70b drafted
+✓ Patch 482eff7804f958efeef1cb63f511f2ed1431f742 drafted
✓ Synced with 2 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
``` ~bob
$ cd heartwood
$ rad sync -f
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 2 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 2 potential seed(s).
✓ Target met: 2 seed(s)
🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
🌱 Fetched from z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z
-$ rad patch comment 6c61ef1 -m "I think we should use MIT"
+$ rad patch comment 482eff7 -m "I think we should use MIT"
╭───────────────────────────╮
-│ bob (you) now 833db19 │
+│ bob (you) now 9963ada │
│ I think we should use MIT │
╰───────────────────────────╯
✓ Synced with 2 seed(s)
```
``` ~alice
-$ rad patch show 6c61ef1 -v
+$ rad patch show 482eff7 -v
╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ Title Define LICENSE for project │
-│ Patch 6c61ef1716ad8a5c11e04dd7a3fec51e01fba70b │
+│ Patch 482eff7804f958efeef1cb63f511f2ed1431f742 │
│ Author alice (you) │
│ Head 717c900ec17735639587325e0fd9fe09991c9edd │
│ Base f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 │
@@ -46,14 +46,14 @@ $ rad patch show 6c61ef1 -v
├──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
│ 717c900 Introduce license │
├──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● Revision 6c61ef1716ad8a5c11e04dd7a3fec51e01fba70b with range f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354..717c900ec17735639587325e0fd9fe09991c9edd by alice (you) now │
+│ ● Revision 482eff7804f958efeef1cb63f511f2ed1431f742 with range f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354..717c900ec17735639587325e0fd9fe09991c9edd by alice (you) now │
├──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ bob z6Mkt67…v4N1tRk now 833db19 │
+│ bob z6Mkt67…v4N1tRk now 9963ada │
│ I think we should use MIT │
╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
-$ rad patch comment 6c61ef1 --reply-to 833db19 -m "Thanks, I'll add it!"
+$ rad patch comment 482eff7 --reply-to 9963ada -m "Thanks, I'll add it!"
╭─────────────────────────╮
-│ alice (you) now 1803a38 │
+│ alice (you) now 294ce2f │
│ Thanks, I'll add it! │
╰─────────────────────────╯
✓ Synced with 2 seed(s)
@@ -70,24 +70,24 @@ $ git commit -am "Add MIT License"
``` ~alice (stderr)
$ git push -f
-✓ Patch 6c61ef1 updated to revision 93915b9afa94a9dc4f52f12cdf077d4613ea3eb3
-To compare against your previous revision 6c61ef1, run:
+✓ Patch 482eff7 updated to revision 68c388e97fa5c63b7a843861bc23bd7ebfcd84ba
+To compare against your previous revision 482eff7, run:
- git range-diff f2de534[..] 717c900[..] 1cc8cd9[..]
+ git range-diff f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 717c900ec17735639587325e0fd9fe09991c9edd 1cc8cd9de8ccc44b4fe3876f2dbd2cd1cf9ddc0e
✓ Synced with 2 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- 717c900..1cc8cd9 prepare-license -> patches/6c61ef1716ad8a5c11e04dd7a3fec51e01fba70b
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ 717c900..1cc8cd9 prepare-license -> patches/482eff7804f958efeef1cb63f511f2ed1431f742
```
``` ~bob
-$ rad patch review 6c61ef1 --accept -m "LGTM!"
-✓ Patch 6c61ef1 accepted
+$ rad patch review 482eff7 --accept -m "LGTM!"
+✓ Patch 482eff7 accepted
✓ Synced with 2 seed(s)
-$ rad patch show 6c61ef1 -v
+$ rad patch show 482eff7 -v
╭─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ Title Define LICENSE for project │
-│ Patch 6c61ef1716ad8a5c11e04dd7a3fec51e01fba70b │
+│ Patch 482eff7804f958efeef1cb63f511f2ed1431f742 │
│ Author alice z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │
│ Head 1cc8cd9de8ccc44b4fe3876f2dbd2cd1cf9ddc0e │
│ Base f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 │
@@ -98,22 +98,22 @@ $ rad patch show 6c61ef1 -v
│ 1cc8cd9 Add MIT License │
│ 717c900 Introduce license │
├─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● Revision 6c61ef1716ad8a5c11e04dd7a3fec51e01fba70b with range f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354..717c900ec17735639587325e0fd9fe09991c9edd by alice z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi now │
-│ ↑ Revision 93915b9afa94a9dc4f52f12cdf077d4613ea3eb3 with range f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354..1cc8cd9de8ccc44b4fe3876f2dbd2cd1cf9ddc0e by alice z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi now │
+│ ● Revision 482eff7804f958efeef1cb63f511f2ed1431f742 with range f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354..717c900ec17735639587325e0fd9fe09991c9edd by alice z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi now │
+│ ↑ Revision 68c388e97fa5c63b7a843861bc23bd7ebfcd84ba with range f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354..1cc8cd9de8ccc44b4fe3876f2dbd2cd1cf9ddc0e by alice z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi now │
│ └─ ✓ accepted by bob (you) now │
╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
```
``` ~bob
-$ rad patch delete 6c61ef1
+$ rad patch delete 482eff7
✓ Synced with 2 seed(s)
```
``` ~alice
-$ rad patch show 6c61ef1 -v
+$ rad patch show 482eff7 -v
╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ Title Define LICENSE for project │
-│ Patch 6c61ef1716ad8a5c11e04dd7a3fec51e01fba70b │
+│ Patch 482eff7804f958efeef1cb63f511f2ed1431f742 │
│ Author alice (you) │
│ Head 1cc8cd9de8ccc44b4fe3876f2dbd2cd1cf9ddc0e │
│ Base f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 │
@@ -125,8 +125,8 @@ $ rad patch show 6c61ef1 -v
│ 1cc8cd9 Add MIT License │
│ 717c900 Introduce license │
├──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● Revision 6c61ef1716ad8a5c11e04dd7a3fec51e01fba70b with range f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354..717c900ec17735639587325e0fd9fe09991c9edd by alice (you) now │
-│ ↑ Revision 93915b9afa94a9dc4f52f12cdf077d4613ea3eb3 with range f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354..1cc8cd9de8ccc44b4fe3876f2dbd2cd1cf9ddc0e by alice (you) now │
+│ ● Revision 482eff7804f958efeef1cb63f511f2ed1431f742 with range f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354..717c900ec17735639587325e0fd9fe09991c9edd by alice (you) now │
+│ ↑ Revision 68c388e97fa5c63b7a843861bc23bd7ebfcd84ba with range f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354..1cc8cd9de8ccc44b4fe3876f2dbd2cd1cf9ddc0e by alice (you) now │
╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
```
@@ -134,11 +134,11 @@ If Alice also decides to delete the patch, then any seeds that have synced with
Alice should no longer have the patch:
``` ~alice
-$ rad patch delete 6c61ef1
+$ rad patch delete 482eff7
✓ Synced with 2 seed(s)
```
``` ~seed (fails)
-$ rad patch show --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji 6c61ef1 -v
-✗ Error: Patch `6c61ef1716ad8a5c11e04dd7a3fec51e01fba70b` not found
+$ rad patch show --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G 482eff7 -v
+✗ Error: Patch `482eff7804f958efeef1cb63f511f2ed1431f742` not found
```
diff --git a/crates/radicle-cli/examples/rad-patch-detached-head.md b/crates/radicle-cli/examples/rad-patch-detached-head.md
index ab0c3f8e1d..7904bc7aa9 100644
--- a/crates/radicle-cli/examples/rad-patch-detached-head.md
+++ b/crates/radicle-cli/examples/rad-patch-detached-head.md
@@ -30,10 +30,10 @@ Now, we can create a commit on top of this and create a patch, as usual:
``` (stderr) RAD_HINT=1
$ git commit -a -m "Add things" -q --allow-empty
$ git push -o patch.message="Add things #1" -o patch.message="See commits for details." rad HEAD:refs/patches
-✓ Patch 6035d2f582afbe01ff23ea87528ae523d76875b6 opened
+✓ Patch 4e0b866a7ac15131ad472888528ae0e048ee952f opened
hint: offline push, your node is not running
hint: to sync with the network, run `rad node start`
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
diff --git a/crates/radicle-cli/examples/rad-patch-diff.md b/crates/radicle-cli/examples/rad-patch-diff.md
index 6504658f47..de6b8366eb 100644
--- a/crates/radicle-cli/examples/rad-patch-diff.md
+++ b/crates/radicle-cli/examples/rad-patch-diff.md
@@ -10,7 +10,7 @@ $ git commit -m "Add README" -q
$ git push rad HEAD:refs/patches
```
```
-$ rad patch diff 147309e
+$ rad patch diff a0b50ac
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..980a0d5
@@ -31,7 +31,7 @@ $ git commit --amend -q
$ git push -f
```
```
-$ rad patch diff 147309e
+$ rad patch diff a0b50ac
diff --git a/RADICLE.md b/RADICLE.md
new file mode 100644
index 0000000..e517184
@@ -52,7 +52,7 @@ Buf if we only want to see the changes from the first revision, we can do that
too.
```
-$ rad patch diff 147309e --revision 147309e
+$ rad patch diff a0b50ac --revision a0b50ac
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..980a0d5
diff --git a/crates/radicle-cli/examples/rad-patch-draft.md b/crates/radicle-cli/examples/rad-patch-draft.md
index adc502ec8d..ae97490412 100644
--- a/crates/radicle-cli/examples/rad-patch-draft.md
+++ b/crates/radicle-cli/examples/rad-patch-draft.md
@@ -9,21 +9,21 @@ To open a patch in draft mode, we use the `--draft` option:
``` (stderr)
$ git push -o patch.draft -o patch.message="Nothing yet" rad HEAD:refs/patches
-✓ Patch 97e18f8598237a396a1c0ac1509c89028e666c97 drafted
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Patch b599f894b2b409d800e74e8a9b9d817faff80e9a drafted
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
We can confirm it's a draft by running `show`:
```
-$ rad patch show 97e18f8598237a396a1c0ac1509c89028e666c97
+$ rad patch show b599f894b2b409d800e74e8a9b9d817faff80e9a
╭──────────────────────────────────────────────────────────╮
│ Title Nothing yet │
-│ Patch 97e18f8598237a396a1c0ac1509c89028e666c97 │
+│ Patch b599f894b2b409d800e74e8a9b9d817faff80e9a │
│ Author alice (you) │
│ Head 2a465832b5a76abe25be44a3a5d224bbd7741ba7 │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
│ Branches cloudhead/draft │
│ Commits ahead 1, behind 0 │
@@ -31,24 +31,24 @@ $ rad patch show 97e18f8598237a396a1c0ac1509c89028e666c97
├──────────────────────────────────────────────────────────┤
│ 2a46583 Nothing to see here.. │
├──────────────────────────────────────────────────────────┤
-│ ● Revision 97e18f8 @ [.. ]..2a46583 by alice (you) now │
+│ ● Revision b599f89 @ [..]..2a46583 by alice (you) now │
╰──────────────────────────────────────────────────────────╯
```
Once the patch is ready for review, we can use the `ready` command:
```
-$ rad patch ready 97e18f8598237a396a1c0ac1509c89028e666c97 --no-announce
+$ rad patch ready b599f894b2b409d800e74e8a9b9d817faff80e9a --no-announce
```
```
-$ rad patch show 97e18f8598237a396a1c0ac1509c89028e666c97
+$ rad patch show b599f894b2b409d800e74e8a9b9d817faff80e9a
╭──────────────────────────────────────────────────────────╮
│ Title Nothing yet │
-│ Patch 97e18f8598237a396a1c0ac1509c89028e666c97 │
+│ Patch b599f894b2b409d800e74e8a9b9d817faff80e9a │
│ Author alice (you) │
│ Head 2a465832b5a76abe25be44a3a5d224bbd7741ba7 │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
│ Branches cloudhead/draft │
│ Commits ahead 1, behind 0 │
@@ -56,7 +56,7 @@ $ rad patch show 97e18f8598237a396a1c0ac1509c89028e666c97
├──────────────────────────────────────────────────────────┤
│ 2a46583 Nothing to see here.. │
├──────────────────────────────────────────────────────────┤
-│ ● Revision 97e18f8 @ [.. ]..2a46583 by alice (you) now │
+│ ● Revision b599f89 @ [..]..2a46583 by alice (you) now │
╰──────────────────────────────────────────────────────────╯
```
@@ -64,14 +64,14 @@ If for whatever reason, it needed to go back into draft mode, we could use
the `--undo` flag:
```
-$ rad patch ready --undo 97e18f8598237a396a1c0ac1509c89028e666c97 --no-announce
-$ rad patch show 97e18f8598237a396a1c0ac1509c89028e666c97
+$ rad patch ready --undo b599f894b2b409d800e74e8a9b9d817faff80e9a --no-announce
+$ rad patch show b599f894b2b409d800e74e8a9b9d817faff80e9a
╭──────────────────────────────────────────────────────────╮
│ Title Nothing yet │
-│ Patch 97e18f8598237a396a1c0ac1509c89028e666c97 │
+│ Patch b599f894b2b409d800e74e8a9b9d817faff80e9a │
│ Author alice (you) │
│ Head 2a465832b5a76abe25be44a3a5d224bbd7741ba7 │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
│ Branches cloudhead/draft │
│ Commits ahead 1, behind 0 │
@@ -79,6 +79,6 @@ $ rad patch show 97e18f8598237a396a1c0ac1509c89028e666c97
├──────────────────────────────────────────────────────────┤
│ 2a46583 Nothing to see here.. │
├──────────────────────────────────────────────────────────┤
-│ ● Revision 97e18f8 @ [.. ]..2a46583 by alice (you) now │
+│ ● Revision b599f89 @ [..]..2a46583 by alice (you) now │
╰──────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-patch-edit.md b/crates/radicle-cli/examples/rad-patch-edit.md
index a2cd09d3dc..fac6a333c5 100644
--- a/crates/radicle-cli/examples/rad-patch-edit.md
+++ b/crates/radicle-cli/examples/rad-patch-edit.md
@@ -16,8 +16,8 @@ $ git commit --message "Add README, just for the fun"
``` (stderr)
$ git push rad -o patch.message="Add README, just for the fun" HEAD:refs/patches
-✓ Patch 89f7afb1511b976482b21f6b2f39aef7f4fb88a2 opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Patch f36ce41ee8d55d3723ad65ad39741391f9bed979 opened
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
@@ -32,25 +32,25 @@ $ git commit -v -m "Define the LICENSE"
``` (stderr)
$ git push -f -o patch.message="Add License"
-✓ Patch 89f7afb updated to revision 5d78dd5376453e25df5988ec86951c99cb73742c
-To compare against your previous revision 89f7afb, run:
+✓ Patch f36ce41 updated to revision 66230c3d87c5c444803e7d012a710013505dcdb9
+To compare against your previous revision f36ce41, run:
- git range-diff f2de534[..] 03c02af[..] 8945f61[..]
+ git range-diff f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 03c02af4b12a593d17a06d38fae50a57fc3c339a 8945f6189adf027892c85ac57f7e9341049c2537
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- 03c02af..8945f61 changes -> patches/89f7afb1511b976482b21f6b2f39aef7f4fb88a2
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ 03c02af..8945f61 changes -> patches/f36ce41ee8d55d3723ad65ad39741391f9bed979
```
Let's look at the patch, to see what it looks like before editing it:
```
-$ rad patch show 89f7afb
+$ rad patch show f36ce41
╭──────────────────────────────────────────────────────────╮
│ Title Add README, just for the fun │
-│ Patch 89f7afb1511b976482b21f6b2f39aef7f4fb88a2 │
+│ Patch f36ce41ee8d55d3723ad65ad39741391f9bed979 │
│ Author alice (you) │
│ Head 8945f6189adf027892c85ac57f7e9341049c2537 │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
│ Branches changes │
│ Commits ahead 2, behind 0 │
@@ -59,8 +59,8 @@ $ rad patch show 89f7afb
│ 8945f61 Define the LICENSE │
│ 03c02af Add README, just for the fun │
├──────────────────────────────────────────────────────────┤
-│ ● Revision 89f7afb @ [.. ]..03c02af by alice (you) now │
-│ ↑ Revision 5d78dd5 @ [.. ]..8945f61 by alice (you) now │
+│ ● Revision f36ce41 @ [..]..03c02af by alice (you) now │
+│ ↑ Revision 66230c3 @ [..]..8945f61 by alice (you) now │
╰──────────────────────────────────────────────────────────╯
```
@@ -68,14 +68,14 @@ We can change the title and description of the patch itself by using a
multi-line message (using two `--message` options here):
```
-$ rad patch edit 89f7afb --message "Add Metadata" --message "Add README & LICENSE" --no-announce
-$ rad patch show 89f7afb
+$ rad patch edit f36ce41 --message "Add Metadata" --message "Add README & LICENSE" --no-announce
+$ rad patch show f36ce41
╭──────────────────────────────────────────────────────────╮
│ Title Add Metadata │
-│ Patch 89f7afb1511b976482b21f6b2f39aef7f4fb88a2 │
+│ Patch f36ce41ee8d55d3723ad65ad39741391f9bed979 │
│ Author alice (you) │
│ Head 8945f6189adf027892c85ac57f7e9341049c2537 │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
│ Branches changes │
│ Commits ahead 2, behind 0 │
@@ -86,8 +86,8 @@ $ rad patch show 89f7afb
│ 8945f61 Define the LICENSE │
│ 03c02af Add README, just for the fun │
├──────────────────────────────────────────────────────────┤
-│ ● Revision 89f7afb @ [.. ]..03c02af by alice (you) now │
-│ ↑ Revision 5d78dd5 @ [.. ]..8945f61 by alice (you) now │
+│ ● Revision f36ce41 @ [..]..03c02af by alice (you) now │
+│ ↑ Revision 66230c3 @ [..]..8945f61 by alice (you) now │
╰──────────────────────────────────────────────────────────╯
```
@@ -98,14 +98,14 @@ If we want to change a specific revision's description, we can use the
`--revision` option:
```
-$ rad patch edit 89f7afb --revision 5d78dd5 --message "Changes: Adds LICENSE file" --no-announce
-$ rad patch show 89f7afb
+$ rad patch edit f36ce41 --revision 66230c3 --message "Changes: Adds LICENSE file" --no-announce
+$ rad patch show f36ce41
╭──────────────────────────────────────────────────────────╮
│ Title Add Metadata │
-│ Patch 89f7afb1511b976482b21f6b2f39aef7f4fb88a2 │
+│ Patch f36ce41ee8d55d3723ad65ad39741391f9bed979 │
│ Author alice (you) │
│ Head 8945f6189adf027892c85ac57f7e9341049c2537 │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
│ Branches changes │
│ Commits ahead 2, behind 0 │
@@ -116,8 +116,8 @@ $ rad patch show 89f7afb
│ 8945f61 Define the LICENSE │
│ 03c02af Add README, just for the fun │
├──────────────────────────────────────────────────────────┤
-│ ● Revision 89f7afb @ [.. ]..03c02af by alice (you) now │
-│ ↑ Revision 5d78dd5 @ [.. ]..8945f61 by alice (you) now │
+│ ● Revision f36ce41 @ [..]..03c02af by alice (you) now │
+│ ↑ Revision 66230c3 @ [..]..8945f61 by alice (you) now │
╰──────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-patch-fetch-1.md b/crates/radicle-cli/examples/rad-patch-fetch-1.md
index 28fdc9fc8e..e1ee4f23f7 100644
--- a/crates/radicle-cli/examples/rad-patch-fetch-1.md
+++ b/crates/radicle-cli/examples/rad-patch-fetch-1.md
@@ -20,9 +20,9 @@ $ git fetch --all
Fetching rad
Fetching alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
$ cat .git/FETCH_HEAD
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 branch 'master' of rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-7461703ce0fda972df450d071d1d3702057a6352 not-for-merge branch 'alice/1' of rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 not-for-merge branch 'master' of rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 branch 'master' of rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G
+7461703ce0fda972df450d071d1d3702057a6352 not-for-merge branch 'alice/1' of rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 not-for-merge branch 'master' of rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
$ git merge FETCH_HEAD
Already up to date.
$ git rev-parse master
diff --git a/crates/radicle-cli/examples/rad-patch-fetch-2.md b/crates/radicle-cli/examples/rad-patch-fetch-2.md
index a9392665cc..92e310fc68 100644
--- a/crates/radicle-cli/examples/rad-patch-fetch-2.md
+++ b/crates/radicle-cli/examples/rad-patch-fetch-2.md
@@ -12,7 +12,7 @@ $ git push rad -o patch.message="Changes" HEAD:refs/patches
$ git checkout master -q
$ git branch -D alice/1 -q
$ git update-ref -d refs/remotes/rad/alice/1
-$ git update-ref -d refs/remotes/rad/patches/5e2dedcc5d515fcbc1cca483d3376609fe889bfb
+$ git update-ref -d refs/remotes/rad/patches/1593312ce7ddd0258d5d1256bf06edceb592c527
$ git gc --prune=now
$ git branch -r
rad/master
@@ -23,5 +23,5 @@ $ git pull
Already up to date.
$ git branch -r
rad/master
- rad/patches/5e2dedcc5d515fcbc1cca483d3376609fe889bfb
+ rad/patches/1593312ce7ddd0258d5d1256bf06edceb592c527
```
diff --git a/crates/radicle-cli/examples/rad-patch-jj.md b/crates/radicle-cli/examples/rad-patch-jj.md
index 9c131dc828..25a765f282 100644
--- a/crates/radicle-cli/examples/rad-patch-jj.md
+++ b/crates/radicle-cli/examples/rad-patch-jj.md
@@ -38,8 +38,8 @@ Git to push.
``` (stderr)
$ git push rad -o patch.message="Define power requirements" -o patch.message="See details." HEAD:refs/patches
-✓ Patch 1e31055ed3c41a48f2a71ba5317feb863b089700 opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Patch c24d401043fbeae85d508f88b07b9cc3f4c646b3 opened
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
@@ -50,7 +50,7 @@ $ rad patch
╭─────────────────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Reviews Head + - Updated Labels │
├─────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● 1e31055 Define power requirements alice (you) - a6ea7b7 +0 -0 now │
+│ ● c24d401 Define power requirements alice (you) - a6ea7b7 +0 -0 now │
╰─────────────────────────────────────────────────────────────────────────────────────────────────╯
```
@@ -61,10 +61,10 @@ $ jj bookmark create flux-capacitor-power
```
```
-$ rad patch show 1e31055 -p
+$ rad patch show c24d401 -p
╭──────────────────────────────────────────────────────────╮
│ Title Define power requirements │
-│ Patch 1e31055[.. ] │
+│ Patch c24d401[.. ] │
│ Author alice (you) │
│ Head a6ea7b7[.. ] │
│ Base f2de534[.. ] │
@@ -76,7 +76,7 @@ $ rad patch show 1e31055 -p
├──────────────────────────────────────────────────────────┤
│ a6ea7b7 Define power requirements │
├──────────────────────────────────────────────────────────┤
-│ ● Revision 1e31055 @ [.. ]..a6ea7b7 by alice (you) now │
+│ ● Revision c24d401 @ [.. ]..a6ea7b7 by alice (you) now │
╰──────────────────────────────────────────────────────────╯
commit a6ea7b7[..]
diff --git a/crates/radicle-cli/examples/rad-patch-magic-push.md b/crates/radicle-cli/examples/rad-patch-magic-push.md
index 2fa569dc51..0847c184f1 100644
--- a/crates/radicle-cli/examples/rad-patch-magic-push.md
+++ b/crates/radicle-cli/examples/rad-patch-magic-push.md
@@ -3,7 +3,7 @@
First, we update the identity document to add a canonical reference rule for a new `accepted` branch, allowing delegates to merge into it.
```
-$ rad id update --title "Add accepted branch" --payload xyz.radicle.crefs rules '{ "refs/heads/accepted": { "threshold": 1, "allow": "delegates" } }' -q
+$ rad id update --title "Add accepted branch" --payload xyz.radicle.crefs rules '{ "refs/heads/master": { "threshold": 1, "allow": "delegates" }, "refs/heads/accepted": { "threshold": 1, "allow": "delegates" } }' -q
[..]
```
@@ -21,8 +21,8 @@ $ git commit --allow-empty -m "Initialize accepted branch"
``` (stderr)
$ git push rad accepted
-✓ Canonical reference refs/heads/accepted updated to target commit [..]
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Canonical reference refs/heads/accepted updated to target commit f9a3b8998a3922a1e542a3dc93299c82649da455
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new branch] accepted -> accepted
```
@@ -38,20 +38,20 @@ Pushing to the magic reference:
``` (stderr)
$ git push rad HEAD:refs/for/accepted
✓ Patch [..] opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/for/accepted
```
We can see the patch is open:
```
-$ rad patch show 01dad54
+$ rad patch show 9df700a
╭──────────────────────────────────────────────────────────╮
│ Title Initialize accepted branch │
-│ Patch 01dad54873ada4efa61541e7d90702266d5ced89 │
+│ Patch 9df700a8f5520e7932eac90e76209f7b8d52d8d0 │
│ Author alice (you) │
│ Head 46fd342edc149468ec08b0b25291083aa05d4449 │
-│ Base [.. ] │
+│ Base f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 │
│ Target accepted │
│ Branches feature/1 │
│ Commits ahead 1, behind 0 │
@@ -62,13 +62,13 @@ $ rad patch show 01dad54
│ 46fd342 Add new feature │
│ f9a3b89 Initialize accepted branch │
├──────────────────────────────────────────────────────────┤
-│ ● Revision 01dad54 @ f2de534..46fd342 by alice (you) now │
+│ ● Revision 9df700a @ f2de534..46fd342 by alice (you) now │
╰──────────────────────────────────────────────────────────╯
$ rad patch list --open
╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Reviews Head + - Updated Labels │
├──────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● [.. ] Initialize accepted branch alice (you) - [.. ] +0 -0 now │
+│ ● [..] Initialize accepted branch alice (you) - [..] +0 -0 now │
╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
```
@@ -87,22 +87,22 @@ Fast-forward
``` (stderr)
$ git push rad accepted
-✓ Patch [..] merged
-✓ Canonical reference refs/heads/accepted updated to target commit [..]
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- [..]..[..] accepted -> accepted
+✓ Patch 9df700a8f5520e7932eac90e76209f7b8d52d8d0 merged
+✓ Canonical reference refs/heads/accepted updated to target commit 46fd342edc149468ec08b0b25291083aa05d4449
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ f9a3b89..46fd342 accepted -> accepted
```
We can now verify that the patch has been successfully marked as merged:
```
-$ rad patch show 01dad54
+$ rad patch show 9df700a
╭──────────────────────────────────────────────────────────╮
│ Title Initialize accepted branch │
-│ Patch 01dad54873ada4efa61541e7d90702266d5ced89 │
+│ Patch 9df700a8f5520e7932eac90e76209f7b8d52d8d0 │
│ Author alice (you) │
│ Head 46fd342edc149468ec08b0b25291083aa05d4449 │
-│ Base [.. ] │
+│ Base f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 │
│ Target accepted │
│ Branches accepted, feature/1 │
│ Commits up to date │
@@ -113,14 +113,14 @@ $ rad patch show 01dad54
│ 46fd342 Add new feature │
│ f9a3b89 Initialize accepted branch │
├──────────────────────────────────────────────────────────┤
-│ ● Revision 01dad54 @ f2de534..46fd342 by alice (you) now │
+│ ● Revision 9df700a @ f2de534..46fd342 by alice (you) now │
│ └─ ✓ merged by alice (you) │
╰──────────────────────────────────────────────────────────╯
$ rad patch list --merged
╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Reviews Head + - Updated Labels │
├──────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ✓ [.. ] Initialize accepted branch alice (you) - [.. ] +0 -0 now │
+│ ✓ 9df700a Initialize accepted branch alice (you) - 46fd342 +0 -0 now │
╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
```
@@ -129,7 +129,7 @@ Alternative, attempting to provide conflicting targets fails:
``` (fail) (stderr)
$ git push -o patch.target=master rad HEAD:refs/for/accepted
error: conflicting merge targets: push option 'refs/heads/master' and magic ref 'refs/heads/accepted' specified
-error: failed to push some refs to 'rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi'
+error: failed to push some refs to 'rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi'
```
However, if the push option and the magic ref match, it succeeds:
@@ -142,14 +142,14 @@ $ git commit -m "Add another feature" --allow-empty -q
``` (stderr)
$ git push -o patch.target=accepted rad HEAD:refs/for/accepted
✓ Patch [..] opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/for/accepted
```
```
-$ rad patch show 965855f
+$ rad patch show b48e977
╭──────────────────────────────────────────────────────────╮
│ Title Initialize accepted branch │
-│ Patch 965855f69bc5a86f7e1787ed80cd065013b6504c │
+│ Patch b48e97770764ce5aaa679677bbdf878200cd3d57 │
│ Author alice (you) │
│ Head 7e6814e99fe7084a213faeb69ca1eacc26935e3c │
│ Base f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 │
@@ -167,7 +167,7 @@ $ rad patch show 965855f
│ 46fd342 Add new feature │
│ f9a3b89 Initialize accepted branch │
├──────────────────────────────────────────────────────────┤
-│ ● Revision 965855f @ f2de534..7e6814e by alice (you) now │
+│ ● Revision b48e977 @ f2de534..7e6814e by alice (you) now │
╰──────────────────────────────────────────────────────────╯
```
@@ -180,17 +180,17 @@ $ git commit -m "Add a third feature" --allow-empty -q
``` (stderr)
$ git push rad HEAD:refs/for/refs/heads/accepted
✓ Patch [..] opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/for/refs/heads/accepted
```
This will create a third feature branch and verify that pushing to `refs/for/refs/heads/accepted` successfully opens a patch.
```
-$ rad patch show c846bb5 -v
+$ rad patch show 32fd5b5 -v
╭──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ Title Initialize accepted branch │
-│ Patch c846bb5f8298802e8de589174549d78c1d9aa00f │
+│ Patch 32fd5b5331af54415458e3d7d966713c87765b1d │
│ Author alice (you) │
│ Head 99c1d5a04c17ba854f1f4d59985c980c0faf16e7 │
│ Base f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 │
@@ -212,6 +212,6 @@ $ rad patch show c846bb5 -v
│ 46fd342 Add new feature │
│ f9a3b89 Initialize accepted branch │
├──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● Revision c846bb5f8298802e8de589174549d78c1d9aa00f with range f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354..99c1d5a04c17ba854f1f4d59985c980c0faf16e7 by alice (you) now │
+│ ● Revision 32fd5b5331af54415458e3d7d966713c87765b1d with range f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354..99c1d5a04c17ba854f1f4d59985c980c0faf16e7 by alice (you) now │
╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-patch-merge-draft.md b/crates/radicle-cli/examples/rad-patch-merge-draft.md
index d36e67146e..262c1a3634 100644
--- a/crates/radicle-cli/examples/rad-patch-merge-draft.md
+++ b/crates/radicle-cli/examples/rad-patch-merge-draft.md
@@ -4,8 +4,8 @@ Let's start by creating a draft patch.
$ git checkout -b feature/1 -q
$ git commit --allow-empty -q -m "First change"
$ git push -o patch.draft rad HEAD:refs/patches
-✓ Patch 8dfb4dcafc4346158c8160410dd3f2b0616ad4fe drafted
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Patch 556e4968ab018cb351a64bca782c4548f98d7493 drafted
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
@@ -13,8 +13,8 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE
$ git checkout master -q
$ git merge feature/1
$ git push rad master
-✓ Patch 8dfb4dcafc4346158c8160410dd3f2b0616ad4fe merged
+✓ Patch 556e4968ab018cb351a64bca782c4548f98d7493 merged
✓ Canonical reference refs/heads/master updated to target commit 20aa5dde6210796c3a2f04079b42316a31d02689
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
f2de534..20aa5dd master -> master
```
diff --git a/crates/radicle-cli/examples/rad-patch-merge-into-canonical-ref-branch.md b/crates/radicle-cli/examples/rad-patch-merge-into-canonical-ref-branch.md
index 26180d82d6..87eec3b753 100644
--- a/crates/radicle-cli/examples/rad-patch-merge-into-canonical-ref-branch.md
+++ b/crates/radicle-cli/examples/rad-patch-merge-into-canonical-ref-branch.md
@@ -3,7 +3,7 @@
First, we update the identity document to add a canonical reference rule for a new `accepted` branch, allowing delegates to merge into it.
```
-$ rad id update --title "Add accepted branch" --payload xyz.radicle.crefs rules '{ "refs/heads/accepted": { "threshold": 1, "allow": "delegates" } }' -q
+$ rad id update --title "Add accepted branch" --payload xyz.radicle.crefs rules '{ "refs/heads/master": { "threshold": 1, "allow": "delegates" }, "refs/heads/accepted": { "threshold": 1, "allow": "delegates" } }' -q
[..]
```
@@ -21,8 +21,8 @@ $ git commit --allow-empty -m "Initialize accepted branch"
``` (stderr)
$ git push rad accepted
-✓ Canonical reference refs/heads/accepted updated to target commit [..]
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Canonical reference refs/heads/accepted updated to target commit f9a3b8998a3922a1e542a3dc93299c82649da455
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new branch] accepted -> accepted
```
@@ -45,7 +45,7 @@ $ git commit -m "Add new feature"
``` (stderr)
$ git push -o patch.message="Add new feature" -o patch.target="refs/heads/accepted" rad HEAD:refs/patches
✓ Patch [..] opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
@@ -56,7 +56,7 @@ $ rad patch
╭───────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Reviews Head + - Updated Labels │
├───────────────────────────────────────────────────────────────────────────────────────┤
-│ ● [.. ] Add new feature alice (you) - [.. ] +0 -0 now │
+│ ● [..] Add new feature alice (you) - [..] +0 -0 now │
╰───────────────────────────────────────────────────────────────────────────────────────╯
```
@@ -78,10 +78,10 @@ Fast-forward
``` (stderr)
$ git push rad accepted
-✓ Patch [..] merged
-✓ Canonical reference refs/heads/accepted updated to target commit [..]
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- [..]..[..] accepted -> accepted
+✓ Patch 38592f91ee06aeb38c88a5352ca4254accff3591 merged
+✓ Canonical reference refs/heads/accepted updated to target commit 27acd3b208662f374b34cd4c599f3628c9e42b80
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ f9a3b89..27acd3b accepted -> accepted
```
Finally, we verify that the patch has been successfully marked as merged, even though it wasn't merged into the default branch.
@@ -91,6 +91,6 @@ $ rad patch list --merged
╭───────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Reviews Head + - Updated Labels │
├───────────────────────────────────────────────────────────────────────────────────────┤
-│ ✓ [.. ] Add new feature alice (you) - [.. ] +0 -0 now │
+│ ✓ 38592f9 Add new feature alice (you) - 27acd3b +0 -0 now │
╰───────────────────────────────────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-patch-merge-on-first-push.md b/crates/radicle-cli/examples/rad-patch-merge-on-first-push.md
index efeb6b72d7..5ba1372a77 100644
--- a/crates/radicle-cli/examples/rad-patch-merge-on-first-push.md
+++ b/crates/radicle-cli/examples/rad-patch-merge-on-first-push.md
@@ -5,15 +5,15 @@ Here we start off with Alice adding Bob as a delegate:
``` ~alice
$ rad id update --title "Add Bob" --description "Add Bob as a delegate" --delegate did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk -q
-7be665f9fccba97abb21b2fa85a6fd3181c72858
+83ac41c238b1ece55e11ca0ad8621fe5013e30e5
```
Bob clones the repository so that he can start working on it with Alice:
``` ~bob
-$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'followed'
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+$ rad clone rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+✓ Seeding policy updated for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G with scope 'followed'
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
✓ Creating checkout in ./heartwood..
✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
@@ -42,8 +42,8 @@ $ git commit -v -m "Define power requirements"
``` ~alice (stderr)
$ git push rad -o no-sync -o patch.message="Define power requirements" -o patch.message="See details." HEAD:refs/patches
-✓ Patch df868fc7985fa7217aaef8423d73a077868c02b3 opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Patch d7df6d0eb75ae67ff055f7ad61072fbe262aa248 opened
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
@@ -52,7 +52,7 @@ first he syncs the repository:
``` ~bob
$ rad sync -f
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
```
@@ -60,12 +60,12 @@ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential s
He then checks out the patch and merges the changes in:
``` ~bob
-$ rad patch checkout df868fc
-✓ Switched to branch patch/df868fc at revision df868fc
-✓ Branch patch/df868fc setup to track rad/patches/df868fc7985fa7217aaef8423d73a077868c02b3
+$ rad patch checkout d7df6d0
+✓ Switched to branch patch/d7df6d0 at revision d7df6d0
+✓ Branch patch/d7df6d0 setup to track rad/patches/d7df6d0eb75ae67ff055f7ad61072fbe262aa248
$ git checkout master
Your branch is up to date with 'rad/master'.
-$ git merge patch/df868fc
+$ git merge patch/d7df6d0
Updating f2de534..3e674d1
Fast-forward
REQUIREMENTS | 0
@@ -82,13 +82,13 @@ z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
└── refs
├── cobs
│ ├── xyz.radicle.id
- │ │ └── 0656c217f917c3e06234771e9ecae53aba5e173e
+ │ │ └── 86399084097fb674569f5bc5847da609ab91aa9f
│ └── xyz.radicle.patch
- │ └── df868fc7985fa7217aaef8423d73a077868c02b3
+ │ └── d7df6d0eb75ae67ff055f7ad61072fbe262aa248
├── heads
│ ├── master
│ └── patches
- │ └── df868fc7985fa7217aaef8423d73a077868c02b3
+ │ └── d7df6d0eb75ae67ff055f7ad61072fbe262aa248
└── rad
├── id
├── root
@@ -101,10 +101,10 @@ Now that the changes are merged, he can push and have the patch merged:
``` ~bob (stderr)
$ git push rad master
-✓ Patch df868fc7985fa7217aaef8423d73a077868c02b3 merged
+✓ Patch d7df6d0eb75ae67ff055f7ad61072fbe262aa248 merged
✓ Canonical reference refs/heads/master updated to target commit 3e674d1a1df90807e934f9ae5da2591dd6848a33
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
* [new branch] master -> master
```
@@ -116,13 +116,13 @@ z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
└── refs
├── cobs
│ ├── xyz.radicle.id
- │ │ └── 0656c217f917c3e06234771e9ecae53aba5e173e
+ │ │ └── 86399084097fb674569f5bc5847da609ab91aa9f
│ └── xyz.radicle.patch
- │ └── df868fc7985fa7217aaef8423d73a077868c02b3
+ │ └── d7df6d0eb75ae67ff055f7ad61072fbe262aa248
├── heads
│ ├── master
│ └── patches
- │ └── df868fc7985fa7217aaef8423d73a077868c02b3
+ │ └── d7df6d0eb75ae67ff055f7ad61072fbe262aa248
└── rad
├── id
├── root
@@ -131,7 +131,7 @@ z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
└── refs
├── cobs
│ └── xyz.radicle.patch
- │ └── df868fc7985fa7217aaef8423d73a077868c02b3
+ │ └── d7df6d0eb75ae67ff055f7ad61072fbe262aa248
├── heads
│ └── master
└── rad
diff --git a/crates/radicle-cli/examples/rad-patch-merge-unauthorized-branch.md b/crates/radicle-cli/examples/rad-patch-merge-unauthorized-branch.md
index a8641accd3..69f70f296e 100644
--- a/crates/radicle-cli/examples/rad-patch-merge-unauthorized-branch.md
+++ b/crates/radicle-cli/examples/rad-patch-merge-unauthorized-branch.md
@@ -3,7 +3,7 @@
First, we update the identity document to add a canonical reference rule for a new `accepted` branch, but we only allow Alice to merge into it.
``` ~alice
-$ rad id update --title "Add accepted branch" --payload xyz.radicle.crefs rules '{ "refs/heads/accepted": { "threshold": 1, "allow": ["did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"] } }' -q
+$ rad id update --title "Add accepted branch" --payload xyz.radicle.crefs rules '{ "refs/heads/master": { "threshold": 1, "allow": "delegates" }, "refs/heads/accepted": { "threshold": 1, "allow": ["did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"] } }' -q
[..]
```
@@ -19,16 +19,16 @@ $ git commit --allow-empty -m "Initialize accepted branch"
```
``` ~alice (stderr)
$ git push rad accepted
-✓ Canonical reference refs/heads/accepted updated to target commit [..]
+✓ Canonical reference refs/heads/accepted updated to target commit f9a3b8998a3922a1e542a3dc93299c82649da455
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new branch] accepted -> accepted
```
Next, Bob clones the repository and opens a patch targeting `accepted`.
``` ~bob
-$ rad clone rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+$ rad clone rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G
✓ Creating checkout in ./heartwood..
✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
✓ Remote-tracking branch alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master created for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
@@ -57,7 +57,7 @@ $ git commit -m "Add new feature"
$ git push -o patch.message="Add new feature" -o patch.target="refs/heads/accepted" rad HEAD:refs/patches
✓ Patch [..] opened
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
* [new reference] HEAD -> refs/patches
```
@@ -77,7 +77,7 @@ Merge made by the 'ort' strategy.
``` ~bob (stderr)
$ git push rad accepted
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
* [new branch] accepted -> accepted
```
@@ -92,6 +92,6 @@ $ rad patch list --open
╭───────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Reviews Head + - Updated Labels │
├───────────────────────────────────────────────────────────────────────────────────────┤
-│ ● [.. ] Add new feature bob (you) - [.. ] +0 -0 now │
+│ ● [..] Add new feature bob (you) - [..] +0 -0 now │
╰───────────────────────────────────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-patch-merge-wrong-branch.md b/crates/radicle-cli/examples/rad-patch-merge-wrong-branch.md
index 72b09f08b6..b13cfa0f52 100644
--- a/crates/radicle-cli/examples/rad-patch-merge-wrong-branch.md
+++ b/crates/radicle-cli/examples/rad-patch-merge-wrong-branch.md
@@ -3,7 +3,7 @@
First, we update the identity document to add a canonical reference rule for a new `accepted` branch.
```
-$ rad id update --title "Add accepted branch" --payload xyz.radicle.crefs rules '{ "refs/heads/accepted": { "threshold": 1, "allow": "delegates" } }' -q
+$ rad id update --title "Add accepted branch" --payload xyz.radicle.crefs rules '{ "refs/heads/master": { "threshold": 1, "allow": "delegates" }, "refs/heads/accepted": { "threshold": 1, "allow": "delegates" } }' -q
[..]
```
@@ -19,8 +19,8 @@ $ git commit --allow-empty -m "Initialize accepted branch"
```
``` (stderr)
$ git push rad accepted
-✓ Canonical reference refs/heads/accepted updated to target commit [..]
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Canonical reference refs/heads/accepted updated to target commit f9a3b8998a3922a1e542a3dc93299c82649da455
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new branch] accepted -> accepted
```
@@ -41,7 +41,7 @@ $ git commit -m "Add new feature"
``` (stderr)
$ git push -o patch.message="Add new feature" -o patch.target="refs/heads/accepted" rad HEAD:refs/patches
✓ Patch [..] opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
@@ -62,7 +62,7 @@ Fast-forward
``` (stderr)
$ git push rad master
✓ Canonical reference refs/heads/master updated to target commit [..]
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
[..]..[..] master -> master
```
@@ -77,6 +77,6 @@ $ rad patch list --open
╭───────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Reviews Head + - Updated Labels │
├───────────────────────────────────────────────────────────────────────────────────────┤
-│ ● [.. ] Add new feature alice (you) - [.. ] +0 -0 now │
+│ ● [..] Add new feature alice (you) - [..] +0 -0 now │
╰───────────────────────────────────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-patch-open-explore.md b/crates/radicle-cli/examples/rad-patch-open-explore.md
index 242a7efc21..067e00d1a3 100644
--- a/crates/radicle-cli/examples/rad-patch-open-explore.md
+++ b/crates/radicle-cli/examples/rad-patch-open-explore.md
@@ -4,12 +4,12 @@ When preferred seeds are configured, opening a patch outputs the patch URL.
$ git checkout -b changes -q
$ git commit --allow-empty -q -m "Changes"
$ git push rad HEAD:refs/patches
-✓ Patch acab0ec777a97d013f30be5d5d1aec32562ecb02 opened
+✓ Patch 2b05aedac8fd1aedfe5ca2ecb6aef01a182963d4 opened
✓ Synced with 1 seed(s)
- https://radicle.network/nodes/[..]/rad:z3yXbb1sR6UG6ixxV2YF9jUP7ABra/patches/acab0ec777a97d013f30be5d5d1aec32562ecb02
+ https://radicle.network/nodes/127.0.0.1/rad:zREWtxFjVEsAkeUYBV5ZEbw3qGo8/patches/2b05aedac8fd1aedfe5ca2ecb6aef01a182963d4
-To rad://z3yXbb1sR6UG6ixxV2YF9jUP7ABra/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+To rad://zREWtxFjVEsAkeUYBV5ZEbw3qGo8/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
* [new reference] HEAD -> refs/patches
```
@@ -18,17 +18,17 @@ If we update the patch, the URL is also output.
``` (stderr)
$ git commit --amend --allow-empty -q -m "Other changes"
$ git push -f
-✓ Patch acab0ec updated to revision f7a830d829d0cdf398f63a32b0d5ee31f08e21ab
-To compare against your previous revision acab0ec, run:
+✓ Patch 2b05aed updated to revision 5ef99963cbd182ac0cdb8db046671324a32dfcff
+To compare against your previous revision 2b05aed, run:
- git range-diff f2de534[..] e12525d[..] b2b6432[..]
+ git range-diff f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 e12525d99b1415b9bccf4ed87050ab25eb86e2c4 b2b6432af93f8fe188e32d400263021b602cfec8
✓ Synced with 1 seed(s)
- https://radicle.network/nodes/[..]/rad:z3yXbb1sR6UG6ixxV2YF9jUP7ABra/patches/acab0ec777a97d013f30be5d5d1aec32562ecb02
+ https://radicle.network/nodes/127.0.0.1/rad:zREWtxFjVEsAkeUYBV5ZEbw3qGo8/patches/2b05aedac8fd1aedfe5ca2ecb6aef01a182963d4
-To rad://z3yXbb1sR6UG6ixxV2YF9jUP7ABra/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
- + e12525d...b2b6432 changes -> patches/acab0ec777a97d013f30be5d5d1aec32562ecb02 (forced update)
+To rad://zREWtxFjVEsAkeUYBV5ZEbw3qGo8/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+ + e12525d...b2b6432 changes -> patches/2b05aedac8fd1aedfe5ca2ecb6aef01a182963d4 (forced update)
```
While simply pushing a commit outputs a URL to the new source tree.
@@ -37,13 +37,13 @@ While simply pushing a commit outputs a URL to the new source tree.
$ git checkout master -q
$ git merge changes -q
$ git push rad master
-✓ Patch acab0ec777a97d013f30be5d5d1aec32562ecb02 merged
+✓ Patch 2b05aedac8fd1aedfe5ca2ecb6aef01a182963d4 merged
✓ Canonical reference refs/heads/master updated to target commit b2b6432af93f8fe188e32d400263021b602cfec8
✓ Synced with 1 seed(s)
- https://radicle.network/nodes/[..]/rad:z3yXbb1sR6UG6ixxV2YF9jUP7ABra/tree/b2b6432af93f8fe188e32d400263021b602cfec8
+ https://radicle.network/nodes/127.0.0.1/rad:zREWtxFjVEsAkeUYBV5ZEbw3qGo8/tree/b2b6432af93f8fe188e32d400263021b602cfec8
-To rad://z3yXbb1sR6UG6ixxV2YF9jUP7ABra/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+To rad://zREWtxFjVEsAkeUYBV5ZEbw3qGo8/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
f2de534..b2b6432 master -> master
```
diff --git a/crates/radicle-cli/examples/rad-patch-pull-update.md b/crates/radicle-cli/examples/rad-patch-pull-update.md
index 44aca4c29e..bbd4b081ae 100644
--- a/crates/radicle-cli/examples/rad-patch-pull-update.md
+++ b/crates/radicle-cli/examples/rad-patch-pull-update.md
@@ -9,7 +9,7 @@ Initializing public Radicle 👾 repository in [..]
✓ Repository heartwood created.
-Your Repository ID (RID) is rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK
+Your Repository ID (RID) is rad:z41A7PnmXror3L2oP1vq81vhCQPBc
You can show it any time by running `rad .` from this directory.
✓ Repository successfully announced to the network.
@@ -21,9 +21,9 @@ To push changes, run `git push`.
```
``` ~bob
-$ rad clone rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK
-✓ Seeding policy updated for rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK with scope 'followed'
-Fetching rad:zhbMU4DUXrzB8xT6qAJh6yZ7bFMK from the network, found 1 potential seed(s).
+$ rad clone rad:z41A7PnmXror3L2oP1vq81vhCQPBc
+✓ Seeding policy updated for rad:z41A7PnmXror3L2oP1vq81vhCQPBc with scope 'followed'
+Fetching rad:z41A7PnmXror3L2oP1vq81vhCQPBc from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
✓ Creating checkout in ./heartwood..
✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
@@ -44,7 +44,7 @@ our fork:
$ cd heartwood
$ git push rad master
✓ Synced with 1 seed(s)
-To rad://zhbMU4DUXrzB8xT6qAJh6yZ7bFMK/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+To rad://z41A7PnmXror3L2oP1vq81vhCQPBc/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
* [new branch] master -> master
```
@@ -54,22 +54,22 @@ Bob then opens a patch.
$ git checkout -b bob/feature -q
$ git commit --allow-empty -m "Bob's commit #1" -q
$ git push rad -o sync -o patch.message="Bob's patch" HEAD:refs/patches
-✓ Patch 55b9721ed7f6bfec38f43729e9b6631c5dc812fb opened
+✓ Patch 9a01007e4b6dfed6dfc14a207b483e856624f61e opened
✓ Synced with 1 seed(s)
-To rad://zhbMU4DUXrzB8xT6qAJh6yZ7bFMK/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+To rad://z41A7PnmXror3L2oP1vq81vhCQPBc/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
* [new reference] HEAD -> refs/patches
```
``` ~bob
$ git status --short --branch
-## bob/feature...rad/patches/55b9721ed7f6bfec38f43729e9b6631c5dc812fb
+## bob/feature...rad/patches/9a01007e4b6dfed6dfc14a207b483e856624f61e
```
Alice checks it out.
``` ~alice
-$ rad patch checkout 55b9721ed7f6bfec38f43729e9b6631c5dc812fb
-✓ Switched to branch patch/55b9721 at revision 55b9721
-✓ Branch patch/55b9721 setup to track rad/patches/55b9721ed7f6bfec38f43729e9b6631c5dc812fb
+$ rad patch checkout 9a01007e4b6dfed6dfc14a207b483e856624f61e
+✓ Switched to branch patch/9a01007 at revision 9a01007
+✓ Branch patch/9a01007 setup to track rad/patches/9a01007e4b6dfed6dfc14a207b483e856624f61e
$ git show
commit bdcdb30b3c0f513620dd0f1c24ff8f4f71de956b
Author: radicle <radicle@localhost>
@@ -83,26 +83,26 @@ Bob then updates the patch.
``` ~bob (stderr)
$ git commit --allow-empty -m "Bob's commit #2" -q
$ git push rad -o sync -o patch.message="Updated."
-✓ Patch 55b9721 updated to revision f91e056da05b2d9a58af1160c76245bc3debf7a8
-To compare against your previous revision 55b9721, run:
+✓ Patch 9a01007 updated to revision 90c8597aeaa247290d42665d01c363bfe67d1818
+To compare against your previous revision 9a01007, run:
- git range-diff f2de534[..] bdcdb30[..] cad2666[..]
+ git range-diff f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 bdcdb30b3c0f513620dd0f1c24ff8f4f71de956b cad2666a8a2250e4dee175ed5044be2c251ff08b
✓ Synced with 1 seed(s)
-To rad://zhbMU4DUXrzB8xT6qAJh6yZ7bFMK/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
- bdcdb30..cad2666 bob/feature -> patches/55b9721ed7f6bfec38f43729e9b6631c5dc812fb
+To rad://z41A7PnmXror3L2oP1vq81vhCQPBc/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+ bdcdb30..cad2666 bob/feature -> patches/9a01007e4b6dfed6dfc14a207b483e856624f61e
```
Alice pulls the update.
``` ~alice
-$ rad patch show 55b9721
+$ rad patch show 9a01007
╭──────────────────────────────────────────────────────────────────╮
│ Title Bob's patch │
-│ Patch 55b9721ed7f6bfec38f43729e9b6631c5dc812fb │
+│ Patch 9a01007e4b6dfed6dfc14a207b483e856624f61e │
│ Author bob z6Mkt67…v4N1tRk │
│ Head cad2666a8a2250e4dee175ed5044be2c251ff08b │
-│ Base [.. ] │
+│ Base f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 │
│ Target master │
│ Commits ahead 2, behind 0 │
│ Status open │
@@ -110,18 +110,18 @@ $ rad patch show 55b9721
│ cad2666 Bob's commit #2 │
│ bdcdb30 Bob's commit #1 │
├──────────────────────────────────────────────────────────────────┤
-│ ● Revision 55b9721 @ [.. ]..bdcdb30 by bob z6Mkt67…v4N1tRk now │
-│ ↑ Revision f91e056 @ [.. ]..cad2666 by bob z6Mkt67…v4N1tRk now │
+│ ● Revision 9a01007 @ f2de534..bdcdb30 by bob z6Mkt67…v4N1tRk now │
+│ ↑ Revision 90c8597 @ f2de534..cad2666 by bob z6Mkt67…v4N1tRk now │
╰──────────────────────────────────────────────────────────────────╯
$ git ls-remote rad
f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 HEAD
f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 refs/heads/master
-cad2666a8a2250e4dee175ed5044be2c251ff08b refs/heads/patches/55b9721ed7f6bfec38f43729e9b6631c5dc812fb
+cad2666a8a2250e4dee175ed5044be2c251ff08b refs/heads/patches/9a01007e4b6dfed6dfc14a207b483e856624f61e
```
``` ~alice
$ git fetch rad
$ git status --short --branch
-## patch/55b9721...rad/patches/55b9721ed7f6bfec38f43729e9b6631c5dc812fb [behind 1]
+## patch/9a01007...rad/patches/9a01007e4b6dfed6dfc14a207b483e856624f61e [behind 1]
```
``` ~alice
$ git pull
diff --git a/crates/radicle-cli/examples/rad-patch-revert-custom-branch.md b/crates/radicle-cli/examples/rad-patch-revert-custom-branch.md
index 63cf5ce994..1161a2cb44 100644
--- a/crates/radicle-cli/examples/rad-patch-revert-custom-branch.md
+++ b/crates/radicle-cli/examples/rad-patch-revert-custom-branch.md
@@ -3,7 +3,7 @@
First, we update the identity document to add a canonical reference rule for a new `accepted` branch.
```
-$ rad id update --title "Add accepted branch" --payload xyz.radicle.crefs rules '{ "refs/heads/accepted": { "threshold": 1, "allow": "delegates" } }' -q
+$ rad id update --title "Add accepted branch" --payload xyz.radicle.crefs rules '{ "refs/heads/master": { "threshold": 1, "allow": "delegates" }, "refs/heads/accepted": { "threshold": 1, "allow": "delegates" } }' -q
[..]
```
@@ -19,8 +19,8 @@ $ git commit --allow-empty -m "Initialize accepted branch"
```
``` (stderr)
$ git push rad accepted
-✓ Canonical reference refs/heads/accepted updated to target commit [..]
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Canonical reference refs/heads/accepted updated to target commit f9a3b8998a3922a1e542a3dc93299c82649da455
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new branch] accepted -> accepted
```
@@ -41,7 +41,7 @@ $ git commit -m "Add new feature"
``` (stderr)
$ git push -o patch.message="Add new feature" -o patch.target="refs/heads/accepted" rad HEAD:refs/patches
✓ Patch [..] opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
@@ -61,10 +61,10 @@ Fast-forward
```
``` (stderr)
$ git push rad accepted
-✓ Patch [..] merged
-✓ Canonical reference refs/heads/accepted updated to target commit [..]
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- [..]..[..] accepted -> accepted
+✓ Patch 38592f91ee06aeb38c88a5352ca4254accff3591 merged
+✓ Canonical reference refs/heads/accepted updated to target commit 27acd3b208662f374b34cd4c599f3628c9e42b80
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ f9a3b89..27acd3b accepted -> accepted
```
We verify the patch is merged.
@@ -74,7 +74,7 @@ $ rad patch list --merged
╭───────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Reviews Head + - Updated Labels │
├───────────────────────────────────────────────────────────────────────────────────────┤
-│ ✓ [.. ] Add new feature alice (you) - [.. ] +0 -0 now │
+│ ✓ 38592f9 Add new feature alice (you) - 27acd3b +0 -0 now │
╰───────────────────────────────────────────────────────────────────────────────────────╯
```
@@ -94,7 +94,7 @@ HEAD is now at [..] Initial commit
``` (stderr)
$ git push rad master --force
✓ Canonical reference refs/heads/master updated to target commit [..]
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ f2de534...08c788d master -> master (forced update)
```
@@ -106,7 +106,7 @@ $ rad patch list --merged
╭───────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Reviews Head + - Updated Labels │
├───────────────────────────────────────────────────────────────────────────────────────┤
-│ ✓ [.. ] Add new feature alice (you) - [.. ] +0 -0 now │
+│ ✓ 38592f9 Add new feature alice (you) - 27acd3b +0 -0 now │
╰───────────────────────────────────────────────────────────────────────────────────────╯
```
@@ -124,9 +124,9 @@ HEAD is now at [..] Initialize accepted branch
```
``` (stderr)
$ git push rad accepted --force
-! Patch [..] reverted at revision [..]
-✓ Canonical reference refs/heads/accepted updated to target commit [..]
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+! Patch 38592f91ee06aeb38c88a5352ca4254accff3591 reverted at revision 38592f9
+✓ Canonical reference refs/heads/accepted updated to target commit f9a3b8998a3922a1e542a3dc93299c82649da455
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ 27acd3b...f9a3b89 accepted -> accepted (forced update)
```
@@ -141,6 +141,6 @@ $ rad patch list --open
╭───────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Reviews Head + - Updated Labels │
├───────────────────────────────────────────────────────────────────────────────────────┤
-│ ● [.. ] Add new feature alice (you) - [.. ] +0 -0 now │
+│ ● [..] Add new feature alice (you) - [..] +0 -0 now │
╰───────────────────────────────────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-patch-revert-merge.md b/crates/radicle-cli/examples/rad-patch-revert-merge.md
index a0c58d070e..eb4c6e49fd 100644
--- a/crates/radicle-cli/examples/rad-patch-revert-merge.md
+++ b/crates/radicle-cli/examples/rad-patch-revert-merge.md
@@ -4,29 +4,29 @@ Let's create a patch, merge it and then revert it.
$ git checkout -b feature/1 -q
$ git commit --allow-empty -q -m "First change"
$ git push rad HEAD:refs/patches
-✓ Patch 696ec5508494692899337afe6713fe1796d0315c opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Patch 43362c8b437a0ce6798a762f3676e4dd68b67792 opened
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
$ git checkout master
Switched to branch 'master'
$ git merge feature/1
$ git push rad master
-✓ Patch 696ec5508494692899337afe6713fe1796d0315c merged
+✓ Patch 43362c8b437a0ce6798a762f3676e4dd68b67792 merged
✓ Canonical reference refs/heads/master updated to target commit 20aa5dde6210796c3a2f04079b42316a31d02689
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
f2de534..20aa5dd master -> master
```
First we see the patch as merged.
```
-$ rad patch show 696ec5508494692899337afe6713fe1796d0315c
+$ rad patch show 43362c8b437a0ce6798a762f3676e4dd68b67792
╭──────────────────────────────────────────────────────────╮
│ Title First change │
-│ Patch 696ec5508494692899337afe6713fe1796d0315c │
+│ Patch 43362c8b437a0ce6798a762f3676e4dd68b67792 │
│ Author alice (you) │
│ Head 20aa5dde6210796c3a2f04079b42316a31d02689 │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
│ Branches feature/1, master │
│ Commits up to date │
@@ -34,7 +34,7 @@ $ rad patch show 696ec5508494692899337afe6713fe1796d0315c
├──────────────────────────────────────────────────────────┤
│ 20aa5dd First change │
├──────────────────────────────────────────────────────────┤
-│ ● Revision 696ec55 @ [.. ]..20aa5dd by alice (you) now │
+│ ● Revision 43362c8 @ [..]..20aa5dd by alice (you) now │
│ └─ ✓ merged by alice (you) │
╰──────────────────────────────────────────────────────────╯
```
@@ -51,22 +51,22 @@ When pushing, notice that we're told our patch is reverted.
``` (stderr) RAD_SOCKET=/dev/null
$ git push rad master --force
-! Patch 696ec5508494692899337afe6713fe1796d0315c reverted at revision 696ec55
+! Patch 43362c8b437a0ce6798a762f3676e4dd68b67792 reverted at revision 43362c8
✓ Canonical reference refs/heads/master updated to target commit f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ 20aa5dd...f2de534 master -> master (forced update)
```
The patch shows up as open again.
```
-$ rad patch show 696ec5508494692899337afe6713fe1796d0315c
+$ rad patch show 43362c8b437a0ce6798a762f3676e4dd68b67792
╭──────────────────────────────────────────────────────────╮
│ Title First change │
-│ Patch 696ec5508494692899337afe6713fe1796d0315c │
+│ Patch 43362c8b437a0ce6798a762f3676e4dd68b67792 │
│ Author alice (you) │
│ Head 20aa5dde6210796c3a2f04079b42316a31d02689 │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
│ Branches feature/1 │
│ Commits ahead 1, behind 0 │
@@ -74,6 +74,6 @@ $ rad patch show 696ec5508494692899337afe6713fe1796d0315c
├──────────────────────────────────────────────────────────┤
│ 20aa5dd First change │
├──────────────────────────────────────────────────────────┤
-│ ● Revision 696ec55 @ [.. ]..20aa5dd by alice (you) now │
+│ ● Revision 43362c8 @ [..]..20aa5dd by alice (you) now │
╰──────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-patch-review-no-options.md b/crates/radicle-cli/examples/rad-patch-review-no-options.md
index 4853ec64cf..7d399644d1 100644
--- a/crates/radicle-cli/examples/rad-patch-review-no-options.md
+++ b/crates/radicle-cli/examples/rad-patch-review-no-options.md
@@ -2,15 +2,15 @@ The `rad patch review` command must provide an option or a review message, since
a review must have a verdict or a review summary:
``` (fail)
-$ rad patch review aa45913 --no-message --no-announce
+$ rad patch review 26ba061 --no-message --no-announce
✗ Error: expected one of `--accept` or `--reject`, or supply a review message
```
This time we will supply a message:
```
-$ rad patch review aa45913 -m "Looks reasonable, no strong opinion." --no-announce
-✓ Patch aa45913 reviewed
+$ rad patch review 26ba061 -m "Looks reasonable, no strong opinion." --no-announce
+✓ Patch 26ba061 reviewed
```
Submitting a second review on the same revision by the same author is ignored.
@@ -19,6 +19,6 @@ Currently, there is no way to edit a review from the CLI.
Note that the review command will still succeed, but with no effect:
```
-$ rad patch review aa45913 -m "Changed my mind." --no-announce
-✓ Patch aa45913 reviewed
+$ rad patch review 26ba061 -m "Changed my mind." --no-announce
+✓ Patch 26ba061 reviewed
```
diff --git a/crates/radicle-cli/examples/rad-patch-update.md b/crates/radicle-cli/examples/rad-patch-update.md
index 67934e0ba7..f5b2f84b7f 100644
--- a/crates/radicle-cli/examples/rad-patch-update.md
+++ b/crates/radicle-cli/examples/rad-patch-update.md
@@ -6,19 +6,19 @@ $ git commit -q -m "Not a real change" --allow-empty
```
``` (stderr)
$ git push rad HEAD:refs/patches
-✓ Patch b6a23eb08656de0ef1fcc0b5fe8820841e5cb2e5 opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Patch faba3f83f5497caa87ba98be85205b30c5e3afa7 opened
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
```
-$ rad patch show b6a23eb08656de0ef1fcc0b5fe8820841e5cb2e5
+$ rad patch show faba3f83f5497caa87ba98be85205b30c5e3afa7
╭──────────────────────────────────────────────────────────╮
│ Title Not a real change │
-│ Patch b6a23eb08656de0ef1fcc0b5fe8820841e5cb2e5 │
+│ Patch faba3f83f5497caa87ba98be85205b30c5e3afa7 │
│ Author alice (you) │
│ Head 51b2f0f77b9849bfaa3e9d3ff68ee2f57771d20c │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
│ Branches feature/1 │
│ Commits ahead 1, behind 0 │
@@ -26,7 +26,7 @@ $ rad patch show b6a23eb08656de0ef1fcc0b5fe8820841e5cb2e5
├──────────────────────────────────────────────────────────┤
│ 51b2f0f Not a real change │
├──────────────────────────────────────────────────────────┤
-│ ● Revision b6a23eb @ [.. ]..51b2f0f by alice (you) now │
+│ ● Revision faba3f8 @ [..]..51b2f0f by alice (you) now │
╰──────────────────────────────────────────────────────────╯
```
@@ -48,20 +48,20 @@ Now, instead of using `git push` to update the patch, as we normally would,
we run:
```
-$ rad patch update b6a23eb08656de0ef1fcc0b5fe8820841e5cb2e5 -m "Updated patch" --no-announce
-ea7def3857f62f404606d7cd6490cd0de4eaebd1
+$ rad patch update faba3f83f5497caa87ba98be85205b30c5e3afa7 -m "Updated patch" --no-announce
+078d917942c7a39c525686b9164fa27b544df5a1
```
The command outputs the new Revision ID, which we can now see here:
```
-$ rad patch show b6a23eb08656de0ef1fcc0b5fe8820841e5cb2e5
+$ rad patch show faba3f83f5497caa87ba98be85205b30c5e3afa7
╭──────────────────────────────────────────────────────────╮
│ Title Not a real change │
-│ Patch b6a23eb08656de0ef1fcc0b5fe8820841e5cb2e5 │
+│ Patch faba3f83f5497caa87ba98be85205b30c5e3afa7 │
│ Author alice (you) │
│ Head 4d272148458a17620541555b1f0905c01658aa9f │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
│ Branches feature/1 │
│ Commits ahead 2, behind 0 │
@@ -70,7 +70,7 @@ $ rad patch show b6a23eb08656de0ef1fcc0b5fe8820841e5cb2e5
│ 4d27214 Rename readme file │
│ 51b2f0f Not a real change │
├──────────────────────────────────────────────────────────┤
-│ ● Revision b6a23eb @ [.. ]..51b2f0f by alice (you) now │
-│ ↑ Revision ea7def3 @ [.. ]..4d27214 by alice (you) now │
+│ ● Revision faba3f8 @ [..]..51b2f0f by alice (you) now │
+│ ↑ Revision 078d917 @ f2de534..4d27214 by alice (you) now │
╰──────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-patch-via-push.md b/crates/radicle-cli/examples/rad-patch-via-push.md
index 7d99aac65e..05efb0a5ac 100644
--- a/crates/radicle-cli/examples/rad-patch-via-push.md
+++ b/crates/radicle-cli/examples/rad-patch-via-push.md
@@ -8,24 +8,24 @@ $ git checkout -b feature/1
Switched to a new branch 'feature/1'
$ git commit -a -m "Add things" -q --allow-empty
$ git push -o patch.message="Add things #1" -o patch.message="See commits for details." rad HEAD:refs/patches
-✓ Patch 6035d2f582afbe01ff23ea87528ae523d76875b6 opened
-hint: to update, run `git push` or `git push rad --force-with-lease HEAD:patches/6035d2f582afbe01ff23ea87528ae523d76875b6`
+✓ Patch 4e0b866a7ac15131ad472888528ae0e048ee952f opened
+hint: to update, run `git push` or `git push rad --force-with-lease HEAD:patches/4e0b866a7ac15131ad472888528ae0e048ee952f`
hint: offline push, your node is not running
hint: to sync with the network, run `rad node start`
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
We can see a patch was created:
```
-$ rad patch show 6035d2f582afbe01ff23ea87528ae523d76875b6
+$ rad patch show 4e0b866a7ac15131ad472888528ae0e048ee952f
╭──────────────────────────────────────────────────────────╮
│ Title Add things #1 │
-│ Patch 6035d2f582afbe01ff23ea87528ae523d76875b6 │
+│ Patch 4e0b866a7ac15131ad472888528ae0e048ee952f │
│ Author alice (you) │
│ Head 42d894a83c9c356552a57af09ccdbd5587a99045 │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
│ Branches feature/1 │
│ Commits ahead 1, behind 0 │
@@ -35,7 +35,7 @@ $ rad patch show 6035d2f582afbe01ff23ea87528ae523d76875b6
├──────────────────────────────────────────────────────────┤
│ 42d894a Add things │
├──────────────────────────────────────────────────────────┤
-│ ● Revision 6035d2f @ [.. ]..42d894a by alice (you) now │
+│ ● Revision 4e0b866 @ f2de534..42d894a by alice (you) now │
╰──────────────────────────────────────────────────────────╯
```
@@ -44,7 +44,7 @@ branch associated with this patch:
```
$ git branch -vv
-* feature/1 42d894a [rad/patches/6035d2f582afbe01ff23ea87528ae523d76875b6] Add things
+* feature/1 42d894a [rad/patches/4e0b866a7ac15131ad472888528ae0e048ee952f] Add things
master f2de534 [rad/master] Second commit
```
@@ -52,7 +52,7 @@ Let's check that it's up to date with our local head:
```
$ git status --short --branch
-## feature/1...rad/patches/6035d2f582afbe01ff23ea87528ae523d76875b6
+## feature/1...rad/patches/4e0b866a7ac15131ad472888528ae0e048ee952f
$ git fetch
$ git push
```
@@ -64,14 +64,14 @@ $ git show-ref
42d894a83c9c356552a57af09ccdbd5587a99045 refs/heads/feature/1
f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 refs/heads/master
f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 refs/remotes/rad/master
-42d894a83c9c356552a57af09ccdbd5587a99045 refs/remotes/rad/patches/6035d2f582afbe01ff23ea87528ae523d76875b6
+42d894a83c9c356552a57af09ccdbd5587a99045 refs/remotes/rad/patches/4e0b866a7ac15131ad472888528ae0e048ee952f
```
```
-$ git ls-remote rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji 'refs/heads/patches/*'
-42d894a83c9c356552a57af09ccdbd5587a99045 refs/heads/patches/6035d2f582afbe01ff23ea87528ae523d76875b6
-$ git ls-remote rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi 'refs/cobs/*'
-0656c217f917c3e06234771e9ecae53aba5e173e refs/cobs/xyz.radicle.id/0656c217f917c3e06234771e9ecae53aba5e173e
-6035d2f582afbe01ff23ea87528ae523d76875b6 refs/cobs/xyz.radicle.patch/6035d2f582afbe01ff23ea87528ae523d76875b6
+$ git ls-remote rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G 'refs/heads/patches/*'
+42d894a83c9c356552a57af09ccdbd5587a99045 refs/heads/patches/4e0b866a7ac15131ad472888528ae0e048ee952f
+$ git ls-remote rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi 'refs/cobs/*'
+86399084097fb674569f5bc5847da609ab91aa9f refs/cobs/xyz.radicle.id/86399084097fb674569f5bc5847da609ab91aa9f
+4e0b866a7ac15131ad472888528ae0e048ee952f refs/cobs/xyz.radicle.patch/4e0b866a7ac15131ad472888528ae0e048ee952f
```
We can create another patch:
@@ -80,8 +80,8 @@ We can create another patch:
$ git checkout -b feature/2 -q master
$ git commit -a -m "Add more things" -q --allow-empty
$ git push rad HEAD:refs/patches
-✓ Patch 95808913573cead52ad7b42c7b475260ec45c4b2 opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Patch 368960ee1cd815c40c68cc776cbe6bd4db48b287 opened
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
@@ -89,8 +89,8 @@ We see both branches with upstreams now:
```
$ git branch -vv
- feature/1 42d894a [rad/patches/6035d2f582afbe01ff23ea87528ae523d76875b6] Add things
-* feature/2 8b0ea80 [rad/patches/95808913573cead52ad7b42c7b475260ec45c4b2] Add more things
+ feature/1 42d894a [rad/patches/4e0b866a7ac15131ad472888528ae0e048ee952f] Add things
+* feature/2 8b0ea80 [rad/patches/368960ee1cd815c40c68cc776cbe6bd4db48b287] Add more things
master f2de534 [rad/master] Second commit
```
@@ -101,8 +101,8 @@ $ rad patch
╭───────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Reviews Head + - Updated Labels │
├───────────────────────────────────────────────────────────────────────────────────────┤
-│ ● 6035d2f Add things #1 alice (you) - 42d894a +0 -0 now │
-│ ● 9580891 Add more things alice (you) - 8b0ea80 +0 -0 now │
+│ ● 368960e Add more things alice (you) - 8b0ea80 +0 -0 now │
+│ ● 4e0b866 Add things #1 alice (you) - 42d894a +0 -0 now │
╰───────────────────────────────────────────────────────────────────────────────────────╯
```
@@ -114,13 +114,13 @@ $ git commit -a -m "Improve code" -q --allow-empty
``` (stderr)
$ git push rad
-✓ Patch 9580891 updated to revision d7040c6c97629c2b94f86fb639bebbff5de39697
-To compare against your previous revision 9580891, run:
+✓ Patch 368960e updated to revision f951ceca85e932c74eaa8d8cba16ce4712835f03
+To compare against your previous revision 368960e, run:
- git range-diff f2de534[..] 8b0ea80[..] 02bef3f[..]
+ git range-diff f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 8b0ea80d3acd2c55e8820b3064e7575934158b4d 02bef3fac41b2f98bb3c02b868a53ddfecb55b5f
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- 8b0ea80..02bef3f feature/2 -> patches/95808913573cead52ad7b42c7b475260ec45c4b2
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ 8b0ea80..02bef3f feature/2 -> patches/368960ee1cd815c40c68cc776cbe6bd4db48b287
```
This last `git push` worked without specifying an upstream branch despite the
@@ -138,13 +138,13 @@ This allows for pushing to the remote patch branch without using the full
We can then see that the patch head has moved:
```
-$ rad patch show 9580891
+$ rad patch show 368960e
╭──────────────────────────────────────────────────────────╮
│ Title Add more things │
-│ Patch 95808913573cead52ad7b42c7b475260ec45c4b2 │
+│ Patch 368960ee1cd815c40c68cc776cbe6bd4db48b287 │
│ Author alice (you) │
│ Head 02bef3fac41b2f98bb3c02b868a53ddfecb55b5f │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
│ Branches feature/2 │
│ Commits ahead 2, behind 0 │
@@ -153,8 +153,8 @@ $ rad patch show 9580891
│ 02bef3f Improve code │
│ 8b0ea80 Add more things │
├──────────────────────────────────────────────────────────┤
-│ ● Revision 9580891 @ [.. ]..8b0ea80 by alice (you) now │
-│ ↑ Revision d7040c6 @ [.. ]..02bef3f by alice (you) now │
+│ ● Revision 368960e @ [..]..8b0ea80 by alice (you) now │
+│ ↑ Revision f951cec @ [..]..02bef3f by alice (you) now │
╰──────────────────────────────────────────────────────────╯
```
@@ -167,14 +167,14 @@ $ git rev-parse HEAD
```
$ git status --short --branch
-## feature/2...rad/patches/95808913573cead52ad7b42c7b475260ec45c4b2
+## feature/2...rad/patches/368960ee1cd815c40c68cc776cbe6bd4db48b287
```
```
-$ git rev-parse refs/remotes/rad/patches/95808913573cead52ad7b42c7b475260ec45c4b2
+$ git rev-parse refs/remotes/rad/patches/368960ee1cd815c40c68cc776cbe6bd4db48b287
02bef3fac41b2f98bb3c02b868a53ddfecb55b5f
-$ git ls-remote rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi refs/heads/patches/95808913573cead52ad7b42c7b475260ec45c4b2
-02bef3fac41b2f98bb3c02b868a53ddfecb55b5f refs/heads/patches/95808913573cead52ad7b42c7b475260ec45c4b2
+$ git ls-remote rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi refs/heads/patches/368960ee1cd815c40c68cc776cbe6bd4db48b287
+02bef3fac41b2f98bb3c02b868a53ddfecb55b5f refs/heads/patches/368960ee1cd815c40c68cc776cbe6bd4db48b287
```
## Force push
@@ -194,9 +194,9 @@ Now let's push to the patch head.
``` (stderr) (fail)
$ git push
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- ! [rejected] feature/2 -> patches/95808913573cead52ad7b42c7b475260ec45c4b2 (non-fast-forward)
-error: failed to push some refs to 'rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi'
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ ! [rejected] feature/2 -> patches/368960ee1cd815c40c68cc776cbe6bd4db48b287 (non-fast-forward)
+error: failed to push some refs to 'rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi'
hint: [..]
hint: [..]
hint: [..]
@@ -208,25 +208,25 @@ use `--force-with-lease` (or `--force`) to force the update.
``` (stderr)
$ git push --force-with-lease
-✓ Patch 9580891 updated to revision 670d02794aa05afd6e0851f4aa848bc87c4712c7
-To compare against your previous revision d7040c6, run:
+✓ Patch 368960e updated to revision af867d0de56c5d8d000c390e580f180d5c20ad63
+To compare against your previous revision f951cec, run:
- git range-diff f2de534[..] 02bef3f[..] 9304dbc[..]
+ git range-diff f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 02bef3fac41b2f98bb3c02b868a53ddfecb55b5f 9304dbc445925187994a7a93222a3f8bde73b785
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- + 02bef3f...9304dbc feature/2 -> patches/95808913573cead52ad7b42c7b475260ec45c4b2 (forced update)
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ + 02bef3f...9304dbc feature/2 -> patches/368960ee1cd815c40c68cc776cbe6bd4db48b287 (forced update)
```
That worked. We can see the new revision if we call `rad patch show`:
```
-$ rad patch show 9580891
+$ rad patch show 368960e
╭──────────────────────────────────────────────────────────╮
│ Title Add more things │
-│ Patch 95808913573cead52ad7b42c7b475260ec45c4b2 │
+│ Patch 368960ee1cd815c40c68cc776cbe6bd4db48b287 │
│ Author alice (you) │
│ Head 9304dbc445925187994a7a93222a3f8bde73b785 │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
│ Branches feature/2 │
│ Commits ahead 2, behind 0 │
@@ -235,9 +235,9 @@ $ rad patch show 9580891
│ 9304dbc Amended commit │
│ 8b0ea80 Add more things │
├──────────────────────────────────────────────────────────┤
-│ ● Revision 9580891 @ [.. ]..8b0ea80 by alice (you) now │
-│ ↑ Revision d7040c6 @ [.. ]..02bef3f by alice (you) now │
-│ ↑ Revision 670d027 @ [.. ]..9304dbc by alice (you) now │
+│ ● Revision 368960e @ [..]..8b0ea80 by alice (you) now │
+│ ↑ Revision f951cec @ [..]..02bef3f by alice (you) now │
+│ ↑ Revision af867d0 @ [..]..9304dbc by alice (you) now │
╰──────────────────────────────────────────────────────────╯
```
@@ -273,10 +273,10 @@ Turn off this advice by setting config variable advice.detachedHead to false
HEAD is now at 831e838 Going into detached HEAD
$ git push rad HEAD:refs/patches -o patch.branch
-✓ Patch e0fd879ac0a7d3ddcf3b440d8db656f5d7cebea3 opened
-✓ Branch patches/e0fd879ac0a7d3ddcf3b440d8db656f5d7cebea3 created
-hint: to update, run `git push rad patches/e0fd879ac0a7d3ddcf3b440d8db656f5d7cebea3`
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Patch 93f89aa5ff91975938077ac27dfe0509e63ae45b opened
+✓ Branch patches/93f89aa5ff91975938077ac27dfe0509e63ae45b created
+hint: to update, run `git push rad patches/93f89aa5ff91975938077ac27dfe0509e63ae45b`
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
@@ -284,17 +284,17 @@ The default name used for the branch is `patches/<patch id>`. So let's checkout
the branch and push a new revision:
``` (stderr)
-$ git checkout patches/e0fd879ac0a7d3ddcf3b440d8db656f5d7cebea3
-Switched to branch 'patches/e0fd879ac0a7d3ddcf3b440d8db656f5d7cebea3'
+$ git checkout patches/93f89aa5ff91975938077ac27dfe0509e63ae45b
+Switched to branch 'patches/93f89aa5ff91975938077ac27dfe0509e63ae45b'
$ git commit --allow-empty -m "Pushing new revision"
$ git push rad
-✓ Patch e0fd879 updated to revision 943cbd9769e855d5e4eba419e68374c5141a2785
-To compare against your previous revision e0fd879, run:
+✓ Patch 93f89aa updated to revision c55e519073994d2904fab46988c8b2bca703624a
+To compare against your previous revision 93f89aa, run:
git range-diff [..] [..] [..]
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- 831e838..d0ff2a1 patches/e0fd879ac0a7d3ddcf3b440d8db656f5d7cebea3 -> patches/e0fd879ac0a7d3ddcf3b440d8db656f5d7cebea3
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ 831e838..d0ff2a1 patches/93f89aa5ff91975938077ac27dfe0509e63ae45b -> patches/93f89aa5ff91975938077ac27dfe0509e63ae45b
```
However, we also allow you to name the branch yourself:
@@ -302,10 +302,10 @@ However, we also allow you to name the branch yourself:
``` (stderr)
$ git checkout 831e838 -q
$ git push rad HEAD:refs/patches -o patch.branch='feature/3'
-✓ Patch e0fd879ac0a7d3ddcf3b440d8db656f5d7cebea3 opened
+✓ Patch 93f89aa5ff91975938077ac27dfe0509e63ae45b opened
✓ Branch feature/3 created
hint: to update, run `git push rad feature/3`
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
@@ -316,13 +316,13 @@ $ git checkout feature/3
Switched to branch 'feature/3'
$ git commit --allow-empty -m "Pushing new revision"
$ git push rad
-✓ Patch e0fd879 updated to revision 943cbd9769e855d5e4eba419e68374c5141a2785
-To compare against your previous revision e0fd879, run:
+✓ Patch 93f89aa updated to revision c55e519073994d2904fab46988c8b2bca703624a
+To compare against your previous revision 93f89aa, run:
git range-diff [..] [..] [..]
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- 831e838..d0ff2a1 feature/3 -> patches/e0fd879ac0a7d3ddcf3b440d8db656f5d7cebea3
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ 831e838..d0ff2a1 feature/3 -> patches/93f89aa5ff91975938077ac27dfe0509e63ae45b
```
## Empty patch
@@ -333,7 +333,7 @@ we should get an error:
``` (stderr) (fail)
$ git push rad master:refs/patches
warn: attempted to create a patch using the commit f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354, but this commit is already included in the base branch
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
! [remote rejected] master -> refs/patches (patch commits are already included in the base branch)
-error: failed to push some refs to 'rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi'
+error: failed to push some refs to 'rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi'
```
diff --git a/crates/radicle-cli/examples/rad-patch.md b/crates/radicle-cli/examples/rad-patch.md
index 875d7b39e4..e9a8558960 100644
--- a/crates/radicle-cli/examples/rad-patch.md
+++ b/crates/radicle-cli/examples/rad-patch.md
@@ -26,8 +26,8 @@ Once the code is ready, we open (or create) a patch with our changes for the pro
``` (stderr)
$ git push rad -o patch.message="Define power requirements" -o patch.message="See details." HEAD:refs/patches
-✓ Patch aa45913e757cacd46972733bddee5472c78fa32a opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Patch 26ba0615c6e911344ee61d53241a2903c5bf8623 opened
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
@@ -38,17 +38,17 @@ $ rad patch
╭─────────────────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Reviews Head + - Updated Labels │
├─────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● aa45913 Define power requirements alice (you) - 3e674d1 +0 -0 now │
+│ ● 26ba061 Define power requirements alice (you) - 3e674d1 +0 -0 now │
╰─────────────────────────────────────────────────────────────────────────────────────────────────╯
```
```
-$ rad patch show aa45913e757cacd46972733bddee5472c78fa32a -p
+$ rad patch show 26ba0615c6e911344ee61d53241a2903c5bf8623 -p
╭──────────────────────────────────────────────────────────╮
│ Title Define power requirements │
-│ Patch aa45913e757cacd46972733bddee5472c78fa32a │
+│ Patch 26ba0615c6e911344ee61d53241a2903c5bf8623 │
│ Author alice (you) │
│ Head 3e674d1a1df90807e934f9ae5da2591dd6848a33 │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
│ Branches flux-capacitor-power │
│ Commits ahead 1, behind 0 │
@@ -58,7 +58,7 @@ $ rad patch show aa45913e757cacd46972733bddee5472c78fa32a -p
├──────────────────────────────────────────────────────────┤
│ 3e674d1 Define power requirements │
├──────────────────────────────────────────────────────────┤
-│ ● Revision aa45913 @ [.. ]..3e674d1 by alice (you) now │
+│ ● Revision 26ba061 @ [..]..3e674d1 by alice (you) now │
╰──────────────────────────────────────────────────────────╯
commit 3e674d1a1df90807e934f9ae5da2591dd6848a33
@@ -80,14 +80,14 @@ $ rad patch list --authored
╭─────────────────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Reviews Head + - Updated Labels │
├─────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● aa45913 Define power requirements alice (you) - 3e674d1 +0 -0 now │
+│ ● 26ba061 Define power requirements alice (you) - 3e674d1 +0 -0 now │
╰─────────────────────────────────────────────────────────────────────────────────────────────────╯
```
We can also see that it set an upstream for our patch branch:
```
$ git branch -vv
-* flux-capacitor-power 3e674d1 [rad/patches/aa45913e757cacd46972733bddee5472c78fa32a] Define power requirements
+* flux-capacitor-power 3e674d1 [rad/patches/26ba0615c6e911344ee61d53241a2903c5bf8623] Define power requirements
master f2de534 [rad/master] Second commit
```
@@ -95,16 +95,16 @@ We can also label patches as well as assign DIDs to the patch to help
organise your workflow:
```
-$ rad patch label aa45913 --add fun --no-announce
-$ rad patch assign aa45913 --add did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --no-announce
-$ rad patch show aa45913
+$ rad patch label 26ba061 --add fun --no-announce
+$ rad patch assign 26ba061 --add did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --no-announce
+$ rad patch show 26ba061
╭──────────────────────────────────────────────────────────╮
│ Title Define power requirements │
-│ Patch aa45913e757cacd46972733bddee5472c78fa32a │
+│ Patch 26ba0615c6e911344ee61d53241a2903c5bf8623 │
│ Author alice (you) │
│ Labels fun │
│ Head 3e674d1a1df90807e934f9ae5da2591dd6848a33 │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
│ Branches flux-capacitor-power │
│ Commits ahead 1, behind 0 │
@@ -114,7 +114,7 @@ $ rad patch show aa45913
├──────────────────────────────────────────────────────────┤
│ 3e674d1 Define power requirements │
├──────────────────────────────────────────────────────────┤
-│ ● Revision aa45913 @ [.. ]..3e674d1 by alice (you) now │
+│ ● Revision 26ba061 @ [..]..3e674d1 by alice (you) now │
╰──────────────────────────────────────────────────────────╯
```
@@ -130,33 +130,33 @@ $ git commit --message "Add README, just for the fun"
```
``` (stderr)
$ git push rad -o patch.message="Add README, just for the fun"
-✓ Patch aa45913 updated to revision 6e5a3b7b2ce27b32e7ccc2f0b3f4594897dde638
-To compare against your previous revision aa45913, run:
+✓ Patch 26ba061 updated to revision d0013e385c76a82e5f62df467e735fd96bd69a00
+To compare against your previous revision 26ba061, run:
- git range-diff f2de534[..] 3e674d1[..] 27857ec[..]
+ git range-diff f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 3e674d1a1df90807e934f9ae5da2591dd6848a33 27857ec9eb04c69cacab516e8bf4b5fd36090f66
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- 3e674d1..27857ec flux-capacitor-power -> patches/aa45913e757cacd46972733bddee5472c78fa32a
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ 3e674d1..27857ec flux-capacitor-power -> patches/26ba0615c6e911344ee61d53241a2903c5bf8623
```
And let's leave a quick comment for our team:
```
-$ rad patch comment aa45913 --message 'I cannot wait to get back to the 90s!' --no-announce
+$ rad patch comment 26ba061 --message 'I cannot wait to get back to the 90s!' --no-announce
╭───────────────────────────────────────╮
-│ alice (you) now 686ec1c │
+│ alice (you) now 30c6a91 │
│ I cannot wait to get back to the 90s! │
╰───────────────────────────────────────╯
-$ rad patch comment aa45913 --message 'My favorite decade!' --reply-to 686ec1c -q --no-announce
-f4336e42daf76342f787d574b5ee779d89d05c7a
+$ rad patch comment 26ba061 --message 'My favorite decade!' --reply-to 30c6a91 -q --no-announce
+e99153259a09f5a15e385e531a5943d314245db1
```
If we realize we made a mistake in the comment, we can go back and edit it:
```
-$ rad patch comment aa45913 --edit 686ec1c --message 'I cannot wait to get back to the 80s!' --no-announce
+$ rad patch comment 26ba061 --edit 30c6a91 --message 'I cannot wait to get back to the 80s!' --no-announce
╭───────────────────────────────────────╮
-│ alice (you) now 686ec1c │
+│ alice (you) now 30c6a91 │
│ I cannot wait to get back to the 80s! │
╰───────────────────────────────────────╯
```
@@ -164,38 +164,38 @@ $ rad patch comment aa45913 --edit 686ec1c --message 'I cannot wait to get back
And if we really made a mistake, then we can redact the comment entirely:
```
-$ rad patch comment aa45913 --redact f4336e4 --no-announce
-✓ Redacted comment f4336e42daf76342f787d574b5ee779d89d05c7a
+$ rad patch comment 26ba061 --redact e991532 --no-announce
+✓ Redacted comment e99153259a09f5a15e385e531a5943d314245db1
```
Now, let's checkout the patch that we just created:
```
-$ rad patch checkout aa45913
-✓ Switched to branch patch/aa45913 at revision 6e5a3b7
-✓ Branch patch/aa45913 setup to track rad/patches/aa45913e757cacd46972733bddee5472c78fa32a
+$ rad patch checkout 26ba061
+✓ Switched to branch patch/26ba061 at revision d0013e3
+✓ Branch patch/26ba061 setup to track rad/patches/26ba0615c6e911344ee61d53241a2903c5bf8623
```
We can also add a review verdict as such:
```
-$ rad patch review aa45913 --accept --no-message --no-announce
-✓ Patch aa45913 accepted
+$ rad patch review 26ba061 --accept --no-message --no-announce
+✓ Patch 26ba061 accepted
```
Showing the patch list now will reveal the favorable verdict:
```
-$ rad patch show aa45913
+$ rad patch show 26ba061
╭──────────────────────────────────────────────────────────╮
│ Title Define power requirements │
-│ Patch aa45913e757cacd46972733bddee5472c78fa32a │
+│ Patch 26ba0615c6e911344ee61d53241a2903c5bf8623 │
│ Author alice (you) │
│ Labels fun │
│ Head 27857ec9eb04c69cacab516e8bf4b5fd36090f66 │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
-│ Branches flux-capacitor-power, patch/aa45913 │
+│ Branches flux-capacitor-power, patch/26ba061 │
│ Commits ahead 2, behind 0 │
│ Status open │
│ │
@@ -204,32 +204,32 @@ $ rad patch show aa45913
│ 27857ec Add README, just for the fun │
│ 3e674d1 Define power requirements │
├──────────────────────────────────────────────────────────┤
-│ ● Revision aa45913 @ [.. ]..3e674d1 by alice (you) now │
-│ ↑ Revision 6e5a3b7 @ [.. ]..27857ec by alice (you) now │
+│ ● Revision 26ba061 @ [..]..3e674d1 by alice (you) now │
+│ ↑ Revision d0013e3 @ f2de534..27857ec by alice (you) now │
│ └─ ✓ accepted by alice (you) now │
╰──────────────────────────────────────────────────────────╯
$ rad patch list
╭─────────────────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Reviews Head + - Updated Labels │
├─────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● aa45913 Define power requirements alice (you) ✓ 27857ec +0 -0 now fun │
+│ ● 26ba061 Define power requirements alice (you) ✓ 27857ec +0 -0 now fun │
╰─────────────────────────────────────────────────────────────────────────────────────────────────╯
```
If you make a mistake on the patch description, you can always change it!
```
-$ rad patch edit aa45913 --message "Define power requirements" --message "Add requirements file" --no-announce
-$ rad patch show aa45913
+$ rad patch edit 26ba061 --message "Define power requirements" --message "Add requirements file" --no-announce
+$ rad patch show 26ba061
╭──────────────────────────────────────────────────────────╮
│ Title Define power requirements │
-│ Patch aa45913e757cacd46972733bddee5472c78fa32a │
+│ Patch 26ba0615c6e911344ee61d53241a2903c5bf8623 │
│ Author alice (you) │
│ Labels fun │
│ Head 27857ec9eb04c69cacab516e8bf4b5fd36090f66 │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
-│ Branches flux-capacitor-power, patch/aa45913 │
+│ Branches flux-capacitor-power, patch/26ba061 │
│ Commits ahead 2, behind 0 │
│ Status open │
│ │
@@ -238,8 +238,8 @@ $ rad patch show aa45913
│ 27857ec Add README, just for the fun │
│ 3e674d1 Define power requirements │
├──────────────────────────────────────────────────────────┤
-│ ● Revision aa45913 @ [.. ]..3e674d1 by alice (you) now │
-│ ↑ Revision 6e5a3b7 @ [.. ]..27857ec by alice (you) now │
+│ ● Revision 26ba061 @ [..]..3e674d1 by alice (you) now │
+│ ↑ Revision d0013e3 @ f2de534..27857ec by alice (you) now │
│ └─ ✓ accepted by alice (you) now │
╰──────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-publish.md b/crates/radicle-cli/examples/rad-publish.md
index c3872e5d8c..2f67d62190 100644
--- a/crates/radicle-cli/examples/rad-publish.md
+++ b/crates/radicle-cli/examples/rad-publish.md
@@ -15,7 +15,7 @@ public
The repository is now in our inventory:
```
$ rad node inventory
-rad:z2ug5mwNKZB8KGpBDRTrWHAMbvHCu
+rad:z2PZv5hqSvKC6A5cTQrF5VXwG97Q2
```
If we try to publish again, we get an error:
@@ -34,12 +34,12 @@ repository private again __will not_ be replicated.
```
$ rad id update --visibility private --title "Privatise" --description "Reverting the rad publish event"
-✓ Identity revision 774cc1e72641d97d7dc9377745b7f454a9171747 created
+✓ Identity revision 64213cccd6bcb7b36fb03bb02b96c4439cdb73ca created
╭────────────────────────────────────────────────────────────────────────╮
│ Title Privatise │
-│ Revision 774cc1e72641d97d7dc9377745b7f454a9171747 │
-│ Parent cecb16c9bebf35cfc4130f17efe6424f8ac71d66 │
-│ Blob 88f759a4d46e9535766fccec0cbfe1fed6160b1a │
+│ Revision 64213cccd6bcb7b36fb03bb02b96c4439cdb73ca │
+│ Parent e2c923cc39373a95b8df231843288c402e51360d │
+│ Blob 63b5274c1fbf5b39f0f76eb16192b6aebd45e67f │
│ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │
│ State accepted │
│ Quorum yes │
@@ -49,20 +49,30 @@ $ rad id update --visibility private --title "Privatise" --description "Revertin
│ ✓ did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi alice (you) │
╰────────────────────────────────────────────────────────────────────────╯
-@@ -1,13 +1,16 @@
+@@ -1,23 +1,26 @@
{
+ "version": 2,
"payload": {
+ "xyz.radicle.crefs": {
+ "rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 1
+ }
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
+ }
+ },
"xyz.radicle.project": {
- "defaultBranch": "master",
"description": "radicle heartwood protocol & stack",
"name": "heartwood"
}
},
"delegates": [
"did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"
- ],
-- "threshold": 1
-+ "threshold": 1,
+- ]
++ ],
+ "visibility": {
+ "type": "private"
+ }
diff --git a/crates/radicle-cli/examples/rad-push-and-pull-patches.md b/crates/radicle-cli/examples/rad-push-and-pull-patches.md
index 0ca7df085f..d495d34c22 100644
--- a/crates/radicle-cli/examples/rad-push-and-pull-patches.md
+++ b/crates/radicle-cli/examples/rad-push-and-pull-patches.md
@@ -12,35 +12,35 @@ $ git checkout -b alice/1 -q
$ git rev-parse HEAD
f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
$ git checkout master -q
-$ rad patch checkout d004b67
-✓ Switched to branch patch/d004b67 at revision d004b67
-✓ Branch patch/d004b67 setup to track rad/patches/d004b67355456c46de10c0d287e4a791ad1a6945
+$ rad patch checkout 6118f2b
+✓ Switched to branch patch/6118f2b at revision 6118f2b
+✓ Branch patch/6118f2b setup to track rad/patches/6118f2b18790045d75584169043ebfeb80c67dd4
$ rad remote add z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
✓ Follow policy updated for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
✓ Remote bob@z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk added
✓ Remote-tracking branch bob@z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk/master created for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
$ git checkout master -q
$ cat .git/FETCH_HEAD
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 not-for-merge branch 'master' of rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-8d5f1bae4b69d8e3f6cbfc6f4bd675ed19990afc not-for-merge branch 'patches/d004b67355456c46de10c0d287e4a791ad1a6945' of rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 not-for-merge branch 'master' of rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+8d5f1bae4b69d8e3f6cbfc6f4bd675ed19990afc not-for-merge branch 'patches/6118f2b18790045d75584169043ebfeb80c67dd4' of rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
$ git rev-parse master
f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
```
``` ~alice (stderr)
-$ git checkout patch/d004b67 -q
+$ git checkout patch/6118f2b -q
$ git commit --allow-empty -m "Changes #2" -q
$ git push
-✓ Patch d004b67 updated to revision 2eb705c3da98e05c083df15be5b1bd6856a0bd77
-To compare against your previous revision d004b67, run:
+✓ Patch 6118f2b updated to revision 5d11564eeea9256e3847879f60461fe07a6e2fb1
+To compare against your previous revision 6118f2b, run:
- git range-diff f2de534[..] 8d5f1ba[..] c2aaf1c[..]
+ git range-diff f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 8d5f1bae4b69d8e3f6cbfc6f4bd675ed19990afc c2aaf1c4c36a6bacb64d3f15a310280b054a2213
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new branch] patch/d004b67 -> patches/d004b67355456c46de10c0d287e4a791ad1a6945
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ * [new branch] patch/6118f2b -> patches/6118f2b18790045d75584169043ebfeb80c67dd4
```
``` ~bob
@@ -51,32 +51,32 @@ $ git push
``` ~alice (stderr)
$ git checkout master -q
$ git pull
-From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
- + c2aaf1c...8d5f1ba patches/d004b67355456c46de10c0d287e4a791ad1a6945 -> rad/patches/d004b67355456c46de10c0d287e4a791ad1a6945 (forced update)
+From rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G
+ + c2aaf1c...8d5f1ba patches/6118f2b18790045d75584169043ebfeb80c67dd4 -> rad/patches/6118f2b18790045d75584169043ebfeb80c67dd4 (forced update)
$ git checkout - -q
$ git commit --allow-empty -m "Changes #3" -q
$ git push
-✓ Patch d004b67 updated to revision 7b5015a8dac188bb0d44a334aa68a51298750b07
-To compare against your previous revision d004b67, run:
+✓ Patch 6118f2b updated to revision 9560846e836bb2ed0b29dfb0dfe33c5d99098855
+To compare against your previous revision 6118f2b, run:
- git range-diff f2de534[..] 8d5f1ba[..] d9f8caf[..]
+ git range-diff f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 8d5f1bae4b69d8e3f6cbfc6f4bd675ed19990afc d9f8caf6e25a16e82e9a4df9ebe256ce6e727aa4
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- c2aaf1c..d9f8caf patch/d004b67 -> patches/d004b67355456c46de10c0d287e4a791ad1a6945
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ c2aaf1c..d9f8caf patch/6118f2b -> patches/6118f2b18790045d75584169043ebfeb80c67dd4
```
``` ~alice
$ cat .git/FETCH_HEAD
-f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 branch 'master' of rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-8d5f1bae4b69d8e3f6cbfc6f4bd675ed19990afc not-for-merge branch 'patches/d004b67355456c46de10c0d287e4a791ad1a6945' of rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 branch 'master' of rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G
+8d5f1bae4b69d8e3f6cbfc6f4bd675ed19990afc not-for-merge branch 'patches/6118f2b18790045d75584169043ebfeb80c67dd4' of rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G
```
``` ~bob (stderr)
$ git checkout master -q
$ git pull
-From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
- + c2aaf1c...8d5f1ba patches/d004b67355456c46de10c0d287e4a791ad1a6945 -> rad/patches/d004b67355456c46de10c0d287e4a791ad1a6945 (forced update)
+From rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G
+ + c2aaf1c...8d5f1ba patches/6118f2b18790045d75584169043ebfeb80c67dd4 -> rad/patches/6118f2b18790045d75584169043ebfeb80c67dd4 (forced update)
```
``` ~bob
diff --git a/crates/radicle-cli/examples/rad-review-by-hunk.md b/crates/radicle-cli/examples/rad-review-by-hunk.md
index d21b15e1d7..0c20cb6125 100644
--- a/crates/radicle-cli/examples/rad-review-by-hunk.md
+++ b/crates/radicle-cli/examples/rad-review-by-hunk.md
@@ -61,8 +61,8 @@ $ git commit -q -m "Update files"
``` (stderr)
$ git push rad HEAD:refs/patches
-✓ Patch 7a2ac7e2841cc1e7394f99f107555a499b1d3f23 opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+✓ Patch 3cb70d8de3d4c2285ae27017981a104362639042 opened
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
* [new reference] HEAD -> refs/patches
```
@@ -70,7 +70,7 @@ Finally, we do a review of the patch by hunk. The output of this command should
match `git diff master -W100% -U5 --patience`:
```
-$ rad patch review --patch -U5 7a2ac7e2841cc1e7394f99f107555a499b1d3f23 --no-announce
+$ rad patch review --patch -U5 3cb70d8de3d4c2285ae27017981a104362639042 --no-announce
╭──────────────────────╮
│ .gitignore ❲deleted❳ │
├──────────────────────┤
@@ -117,8 +117,8 @@ $ rad patch review --patch -U5 7a2ac7e2841cc1e7394f99f107555a499b1d3f23 --no-ann
Now let's accept these hunks one by one..
```
-$ rad patch review --patch --accept --hunk 1 7a2ac7e2841cc1e7394f99f107555a499b1d3f23 --no-announce
-✓ Loaded existing review ([..]) for patch 7a2ac7e2841cc1e7394f99f107555a499b1d3f23
+$ rad patch review --patch --accept --hunk 1 3cb70d8de3d4c2285ae27017981a104362639042 --no-announce
+✓ Loaded existing review ([..]) for patch 3cb70d8de3d4c2285ae27017981a104362639042
╭──────────────────────╮
│ .gitignore ❲deleted❳ │
├──────────────────────┤
@@ -128,8 +128,8 @@ $ rad patch review --patch --accept --hunk 1 7a2ac7e2841cc1e7394f99f107555a499b1
✓ Updated brain to a5fccf0e977225ff13c3f74c43faf4cb679bf835
```
```
-$ rad patch review --patch --accept --hunk 1 7a2ac7e2841cc1e7394f99f107555a499b1d3f23 --no-announce
-✓ Loaded existing review ([..]) for patch 7a2ac7e2841cc1e7394f99f107555a499b1d3f23
+$ rad patch review --patch --accept --hunk 1 3cb70d8de3d4c2285ae27017981a104362639042 --no-announce
+✓ Loaded existing review ([..]) for patch 3cb70d8de3d4c2285ae27017981a104362639042
╭──────────────────────────────────────────────────────────╮
│ DISCLAIMER.txt ❲created❳ │
├──────────────────────────────────────────────────────────┤
@@ -139,8 +139,8 @@ $ rad patch review --patch --accept --hunk 1 7a2ac7e2841cc1e7394f99f107555a499b1
✓ Updated brain to 2cdb82ea726e64d3b52847c7699d0d4759198f5c
```
```
-$ rad patch review --patch --accept -U3 --hunk 1 7a2ac7e2841cc1e7394f99f107555a499b1d3f23 --no-announce
-✓ Loaded existing review ([..]) for patch 7a2ac7e2841cc1e7394f99f107555a499b1d3f23
+$ rad patch review --patch --accept -U3 --hunk 1 3cb70d8de3d4c2285ae27017981a104362639042 --no-announce
+✓ Loaded existing review ([..]) for patch 3cb70d8de3d4c2285ae27017981a104362639042
╭─────────────────────────────╮
│ MENU.txt │
├─────────────────────────────┤
@@ -155,8 +155,8 @@ $ rad patch review --patch --accept -U3 --hunk 1 7a2ac7e2841cc1e7394f99f107555a4
✓ Updated brain to d4aecbb859a802a3215def0b538358bf63593953
```
```
-$ rad patch review --patch --accept -U3 --hunk 1 7a2ac7e2841cc1e7394f99f107555a499b1d3f23 --no-announce
-✓ Loaded existing review ([..]) for patch 7a2ac7e2841cc1e7394f99f107555a499b1d3f23
+$ rad patch review --patch --accept -U3 --hunk 1 3cb70d8de3d4c2285ae27017981a104362639042 --no-announce
+✓ Loaded existing review ([..]) for patch 3cb70d8de3d4c2285ae27017981a104362639042
╭───────────────────────────────────────╮
│ MENU.txt │
├───────────────────────────────────────┤
@@ -172,8 +172,8 @@ $ rad patch review --patch --accept -U3 --hunk 1 7a2ac7e2841cc1e7394f99f107555a4
```
```
-$ rad patch review --patch --accept --hunk 1 7a2ac7e2841cc1e7394f99f107555a499b1d3f23 --no-announce
-✓ Loaded existing review ([..]) for patch 7a2ac7e2841cc1e7394f99f107555a499b1d3f23
+$ rad patch review --patch --accept --hunk 1 3cb70d8de3d4c2285ae27017981a104362639042 --no-announce
+✓ Loaded existing review ([..]) for patch 3cb70d8de3d4c2285ae27017981a104362639042
╭────────────────────────────────────────────────────╮
│ INSTRUCTIONS.txt -> notes/INSTRUCTIONS.txt ❲moved❳ │
╰────────────────────────────────────────────────────╯
@@ -181,7 +181,7 @@ $ rad patch review --patch --accept --hunk 1 7a2ac7e2841cc1e7394f99f107555a499b1
```
```
-$ rad patch review --patch --accept --hunk 1 7a2ac7e2841cc1e7394f99f107555a499b1d3f23 --no-announce
-✓ Loaded existing review ([..]) for patch 7a2ac7e2841cc1e7394f99f107555a499b1d3f23
+$ rad patch review --patch --accept --hunk 1 3cb70d8de3d4c2285ae27017981a104362639042 --no-announce
+✓ Loaded existing review ([..]) for patch 3cb70d8de3d4c2285ae27017981a104362639042
✓ All hunks have been reviewed
```
diff --git a/crates/radicle-cli/examples/rad-seed-and-follow.md b/crates/radicle-cli/examples/rad-seed-and-follow.md
index a01b224563..bfe906f85a 100644
--- a/crates/radicle-cli/examples/rad-seed-and-follow.md
+++ b/crates/radicle-cli/examples/rad-seed-and-follow.md
@@ -21,8 +21,8 @@ $ rad follow
Now let's seed one of Eve's repositories:
```
-$ rad seed rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --scope followed --no-fetch
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'followed'
+$ rad seed rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --scope followed --no-fetch
+✓ Seeding policy updated for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G with scope 'followed'
```
We can list the repositories we are seeding by omitting the RID:
@@ -32,6 +32,6 @@ $ rad seed
╭─────────────────────────────────────────────────────────────────────────────────╮
│ Repository Name Policy Scope │
├─────────────────────────────────────────────────────────────────────────────────┤
-│ rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji Error determining name. allow followed │
+│ rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G Error determining name. allow followed │
╰─────────────────────────────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-seed-many.md b/crates/radicle-cli/examples/rad-seed-many.md
index 96e946e059..d855d79771 100644
--- a/crates/radicle-cli/examples/rad-seed-many.md
+++ b/crates/radicle-cli/examples/rad-seed-many.md
@@ -3,11 +3,9 @@ same time, where each repository specified will be fetched (unless `--no-fetch`
is used):
```
-$ rad seed rad:z3Rry7rpdWuGpfjPYGzdJKQADsoNW rad:z3zTnCfi6cVSZG8eCGn6AMDypgAPm
-✓ Seeding policy updated for rad:z3Rry7rpdWuGpfjPYGzdJKQADsoNW with scope 'followed'
-Fetching rad:z3Rry7rpdWuGpfjPYGzdJKQADsoNW from the network, found 1 potential seed(s).
-✓ Target met: 1 seed(s)
-✓ Seeding policy updated for rad:z3zTnCfi6cVSZG8eCGn6AMDypgAPm with scope 'followed'
-Fetching rad:z3zTnCfi6cVSZG8eCGn6AMDypgAPm from the network, found 1 potential seed(s).
-✓ Target met: 1 seed(s)
+$ rad seed rad:z4MWZ4byNSpmGBdSiEJ8ABNDY7qdG rad:z3LZFDDTVnYU7GrenyRYzNaviFF5u
+✓ Seeding policy updated for rad:z4MWZ4byNSpmGBdSiEJ8ABNDY7qdG with scope 'followed'
+✗ Error: no candidate seeds were found to fetch from
+✓ Seeding policy updated for rad:z3LZFDDTVnYU7GrenyRYzNaviFF5u with scope 'followed'
+✗ Error: no candidate seeds were found to fetch from
```
diff --git a/crates/radicle-cli/examples/rad-seed-scope.md b/crates/radicle-cli/examples/rad-seed-scope.md
index 2652fc7db5..459bd0e064 100644
--- a/crates/radicle-cli/examples/rad-seed-scope.md
+++ b/crates/radicle-cli/examples/rad-seed-scope.md
@@ -1,38 +1,38 @@
By default `rad seed` should add a seeding policy with the `followed` scope:
```
-$ rad seed --no-fetch rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'followed'
+$ rad seed --no-fetch rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+✓ Seeding policy updated for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G with scope 'followed'
$ rad seed
╭─────────────────────────────────────────────────────────────────────────────────╮
│ Repository Name Policy Scope │
├─────────────────────────────────────────────────────────────────────────────────┤
-│ rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji Error determining name. allow followed │
+│ rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G Error determining name. allow followed │
╰─────────────────────────────────────────────────────────────────────────────────╯
```
The policy can be updated by explicitly specifying a different scope:
```
-$ rad seed --no-fetch rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --scope all
-✓ Seeding policy updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'all'
+$ rad seed --no-fetch rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --scope all
+✓ Seeding policy updated for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G with scope 'all'
$ rad seed
╭──────────────────────────────────────────────────────────────────────────────╮
│ Repository Name Policy Scope │
├──────────────────────────────────────────────────────────────────────────────┤
-│ rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji Error determining name. allow all │
+│ rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G Error determining name. allow all │
╰──────────────────────────────────────────────────────────────────────────────╯
```
Running `rad seed` again without an explicit scope parameter should not change the existing policy:
```
-$ rad seed --no-fetch rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Seeding policy exists for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'all'
+$ rad seed --no-fetch rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+✓ Seeding policy exists for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G with scope 'all'
$ rad seed
╭──────────────────────────────────────────────────────────────────────────────╮
│ Repository Name Policy Scope │
├──────────────────────────────────────────────────────────────────────────────┤
-│ rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji Error determining name. allow all │
+│ rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G Error determining name. allow all │
╰──────────────────────────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-sync.md b/crates/radicle-cli/examples/rad-sync.md
index 8b181cdf91..71da0120d7 100644
--- a/crates/radicle-cli/examples/rad-sync.md
+++ b/crates/radicle-cli/examples/rad-sync.md
@@ -15,9 +15,9 @@ $ rad sync status --sort-by alias
╭───────────────────────────────────────────────────╮
│ Node ID Alias ? SigRefs Timestamp │
├───────────────────────────────────────────────────┤
-│ (you) alice ! 1d8285b [..] │
-│ z6Mkt67…v4N1tRk bob ✗ 55be805 [..] │
-│ z6Mkux1…nVhib7Z eve ✗ 55be805 [..] │
+│ (you) alice ! a1cd7ae now │
+│ z6Mkt67…v4N1tRk bob ✗ 65ca22e now │
+│ z6Mkux1…nVhib7Z eve ✗ 65ca22e now │
╰───────────────────────────────────────────────────╯
```
@@ -37,9 +37,9 @@ $ rad sync status --sort-by alias
╭───────────────────────────────────────────────────╮
│ Node ID Alias ? SigRefs Timestamp │
├───────────────────────────────────────────────────┤
-│ (you) alice ✓ 1d8285b [..] │
-│ z6Mkt67…v4N1tRk bob ✓ 1d8285b [..] │
-│ z6Mkux1…nVhib7Z eve ✓ 1d8285b [..] │
+│ (you) alice ✓ a1cd7ae now │
+│ z6Mkt67…v4N1tRk bob ✓ a1cd7ae now │
+│ z6Mkux1…nVhib7Z eve ✓ a1cd7ae now │
╰───────────────────────────────────────────────────╯
```
@@ -55,7 +55,7 @@ We can also use the `--fetch` option to only fetch objects:
```
$ rad sync --fetch
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 2 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 2 potential seed(s).
✓ Target met: 2 seed(s)
🌱 Fetched from z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z
🌱 Fetched from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
@@ -65,7 +65,7 @@ Specifying both `--fetch` and `--announce` is equivalent to specifying none:
```
$ rad sync --fetch --announce
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 2 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 2 potential seed(s).
✓ Target met: 2 seed(s)
🌱 Fetched from z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z
🌱 Fetched from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
@@ -76,7 +76,7 @@ It's also possible to use the `--seed` flag to only sync with a specific node:
```
$ rad sync --fetch --seed z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 3 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 3 potential seed(s).
✓ Target met: 1 preferred seed(s).
🌱 Fetched from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
```
@@ -90,7 +90,7 @@ $ rad issue open --title "Test `rad sync --replicas`" --description "Check that
```
$ rad sync --replicas 1
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 2 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 2 potential seed(s).
✓ Target met: 1 seed(s)
🌱 Fetched from z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z
✓ Synced with 1 seed(s)
@@ -127,7 +127,7 @@ Fetching rad:z39mP9rQAaGmERfUMPULfPUi473tY from the network, found 1 potential s
Also note that you cannot sync an unseeded repo:
```
$ rad unseed rad:z39mP9rQAaGmERfUMPULfPUi473tY
-[...]
+[..]
```
``` (fail)
$ rad sync rad:z39mP9rQAaGmERfUMPULfPUi473tY
diff --git a/crates/radicle-cli/examples/rad-unseed-many.md b/crates/radicle-cli/examples/rad-unseed-many.md
index edeca073f4..0c20df61ab 100644
--- a/crates/radicle-cli/examples/rad-unseed-many.md
+++ b/crates/radicle-cli/examples/rad-unseed-many.md
@@ -8,15 +8,15 @@ $ rad ls
╭───────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ Name RID Visibility Head Description │
├───────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ heartwood rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji public f2de534 Radicle Heartwood Protocol & Stack │
-│ nixpkgs rad:zyFFr2iwoTEfNF4jGNZHuoy7odMh public f2de534 Home for Nix Packages │
+│ heartwood rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G public f2de534 Radicle Heartwood Protocol & Stack │
+│ nixpkgs rad:z4TvK2n84TLVirqvccp4JFnfsJ84D public f2de534 Home for Nix Packages │
╰───────────────────────────────────────────────────────────────────────────────────────────────────────────╯
```
We could stop seeding them if we didn't want other nodes to fetch them from us:
```
-$ rad unseed rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji rad:zyFFr2iwoTEfNF4jGNZHuoy7odMh
-✓ Seeding policy for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji removed
-✓ Seeding policy for rad:zyFFr2iwoTEfNF4jGNZHuoy7odMh removed
+$ rad unseed rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G rad:z4TvK2n84TLVirqvccp4JFnfsJ84D
+✓ Seeding policy for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G removed
+✓ Seeding policy for rad:z4TvK2n84TLVirqvccp4JFnfsJ84D removed
```
diff --git a/crates/radicle-cli/examples/rad-unseed.md b/crates/radicle-cli/examples/rad-unseed.md
index f258e51e20..08ad921c54 100644
--- a/crates/radicle-cli/examples/rad-unseed.md
+++ b/crates/radicle-cli/examples/rad-unseed.md
@@ -5,15 +5,15 @@ $ rad ls
╭───────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ Name RID Visibility Head Description │
├───────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ heartwood rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji public f2de534 Radicle Heartwood Protocol & Stack │
+│ heartwood rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G public f2de534 Radicle Heartwood Protocol & Stack │
╰───────────────────────────────────────────────────────────────────────────────────────────────────────────╯
```
We could stop seeding it if we didn't want other nodes to fetch it from us:
```
-$ rad unseed rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-✓ Seeding policy for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji removed
+$ rad unseed rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G
+✓ Seeding policy for rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G removed
```
Now, if we run `rad ls`, we see it's gone:
@@ -32,7 +32,7 @@ $ rad ls --all
╭───────────────────────────────────────────────────────────────────────────────────────────────────────────╮
│ Name RID Visibility Head Description │
├───────────────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ heartwood rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji local f2de534 Radicle Heartwood Protocol & Stack │
+│ heartwood rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G local f2de534 Radicle Heartwood Protocol & Stack │
╰───────────────────────────────────────────────────────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-watch.md b/crates/radicle-cli/examples/rad-watch.md
index 39e3fc841e..ac10465a5e 100644
--- a/crates/radicle-cli/examples/rad-watch.md
+++ b/crates/radicle-cli/examples/rad-watch.md
@@ -16,5 +16,5 @@ $ git push rad master
```
``` ~bob
-$ rad watch --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --node z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --ref 'refs/heads/master' --target e09c4dc1b54443ceea715ea648afecdcfd1dd7d0 --interval 500
+$ rad watch --repo rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G --node z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi --ref 'refs/heads/master' --target e09c4dc1b54443ceea715ea648afecdcfd1dd7d0 --interval 500
```
diff --git a/crates/radicle-cli/examples/workflow/3-issues.md b/crates/radicle-cli/examples/workflow/3-issues.md
index 895246c1d5..a220231a14 100644
--- a/crates/radicle-cli/examples/workflow/3-issues.md
+++ b/crates/radicle-cli/examples/workflow/3-issues.md
@@ -7,7 +7,7 @@ Let's say the new car you are designing with your peers has a problem with its f
$ rad issue open --title "flux capacitor underpowered" --description "Flux capacitor power requirements exceed current supply" --no-announce
╭─────────────────────────────────────────────────────────╮
│ Title flux capacitor underpowered │
-│ Issue 9037b7a42323d4b79e6a48b7d05d3bbaae11d69b │
+│ Issue e7545692903f2edce37b4819d1321d26d3e37f0b │
│ Author bob (you) │
│ Status open │
│ │
@@ -22,7 +22,7 @@ $ rad issue list
╭──────────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Labels Assignees Opened │
├──────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● 9037b7a flux capacitor underpowered bob (you) now │
+│ ● e754569 flux capacitor underpowered bob (you) now │
╰──────────────────────────────────────────────────────────────────────────────────────────╯
```
@@ -31,6 +31,6 @@ found an important detail about the car's power requirements. It will help
whoever works on a fix.
```
-$ rad issue comment 9037b7a42323d4b79e6a48b7d05d3bbaae11d69b --message 'The flux capacitor needs 1.21 Gigawatts' -q --no-announce
-400cb155f512b4880858bb05f935104c34167b28
+$ rad issue comment e7545692903f2edce37b4819d1321d26d3e37f0b --message 'The flux capacitor needs 1.21 Gigawatts' -q --no-announce
+6034d6984974be72678e2a3234e230a546ea12ee
```
diff --git a/crates/radicle-cli/examples/workflow/4-patching-contributor.md b/crates/radicle-cli/examples/workflow/4-patching-contributor.md
index d9d1d99e3c..0b624876b6 100644
--- a/crates/radicle-cli/examples/workflow/4-patching-contributor.md
+++ b/crates/radicle-cli/examples/workflow/4-patching-contributor.md
@@ -26,8 +26,8 @@ Once the code is ready, we open a patch with our changes.
``` (stderr)
$ git push rad -o no-sync -o patch.message="Define power requirements" -o patch.message="See details." HEAD:refs/patches
-✓ Patch e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46 opened
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+✓ Patch 466ea167f4fc46f425967ce02fcee337c0597fcb opened
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
* [new reference] HEAD -> refs/patches
```
@@ -38,15 +38,15 @@ $ rad patch
╭─────────────────────────────────────────────────────────────────────────────────────────────────╮
│ ● ID Title Author Reviews Head + - Updated Labels │
├─────────────────────────────────────────────────────────────────────────────────────────────────┤
-│ ● e4934b6 Define power requirements bob (you) - 3e674d1 +0 -0 now │
+│ ● 466ea16 Define power requirements bob (you) - 3e674d1 +0 -0 now │
╰─────────────────────────────────────────────────────────────────────────────────────────────────╯
-$ rad patch show e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46
+$ rad patch show 466ea167f4fc46f425967ce02fcee337c0597fcb
╭────────────────────────────────────────────────────────╮
│ Title Define power requirements │
-│ Patch e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46 │
+│ Patch 466ea167f4fc46f425967ce02fcee337c0597fcb │
│ Author bob (you) │
│ Head 3e674d1a1df90807e934f9ae5da2591dd6848a33 │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
│ Branches flux-capacitor-power │
│ Commits ahead 1, behind 0 │
@@ -56,15 +56,15 @@ $ rad patch show e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46
├────────────────────────────────────────────────────────┤
│ 3e674d1 Define power requirements │
├────────────────────────────────────────────────────────┤
-│ ● Revision e4934b6 @ [.. ]..3e674d1 by bob (you) now │
+│ ● Revision 466ea16 @ [..]..3e674d1 by bob (you) now │
╰────────────────────────────────────────────────────────╯
```
We can also confirm that the patch branch is in storage:
```
-$ git ls-remote rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk refs/heads/patches/*
-3e674d1a1df90807e934f9ae5da2591dd6848a33 refs/heads/patches/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46
+$ git ls-remote rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk refs/heads/patches/*
+3e674d1a1df90807e934f9ae5da2591dd6848a33 refs/heads/patches/466ea167f4fc46f425967ce02fcee337c0597fcb
```
Wait, let's add a README too! Just for fun.
@@ -79,19 +79,19 @@ $ git commit --message "Add README, just for the fun"
```
``` (stderr) RAD_SOCKET=/dev/null
$ git push -o patch.message="Add README, just for the fun"
-✓ Patch e4934b6 updated to revision 773b9aab58b11e9fa83d0ed0baca2bea6ff889c9
-To compare against your previous revision e4934b6, run:
+✓ Patch 466ea16 updated to revision 56be6ed00cfed892e4e18f79ae69a9e62a4307d2
+To compare against your previous revision 466ea16, run:
- git range-diff f2de534[..] 3e674d1[..] 27857ec[..]
+ git range-diff f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 3e674d1a1df90807e934f9ae5da2591dd6848a33 27857ec9eb04c69cacab516e8bf4b5fd36090f66
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
- 3e674d1..27857ec flux-capacitor-power -> patches/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+ 3e674d1..27857ec flux-capacitor-power -> patches/466ea167f4fc46f425967ce02fcee337c0597fcb
```
And let's leave a quick comment for our team:
```
-$ rad patch comment e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46 --message 'I cannot wait to get back to the 90s!' -q
-8c66f87afadc7c7c857f8bb92973c25f64e75776
+$ rad patch comment 466ea167f4fc46f425967ce02fcee337c0597fcb --message 'I cannot wait to get back to the 90s!' -q
+ecdbfa5d85bd8b9968431e1768924e916032b93a
✓ Synced with 1 seed(s)
```
diff --git a/crates/radicle-cli/examples/workflow/5-patching-maintainer.md b/crates/radicle-cli/examples/workflow/5-patching-maintainer.md
index a459df0262..e4324a137f 100644
--- a/crates/radicle-cli/examples/workflow/5-patching-maintainer.md
+++ b/crates/radicle-cli/examples/workflow/5-patching-maintainer.md
@@ -8,7 +8,7 @@ of this.
```
$ rad remote add z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --name bob --sync --fetch
✓ Follow policy updated for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (bob)
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
✓ Remote bob added
✓ Remote-tracking branch bob/master created for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
@@ -21,19 +21,19 @@ $ rad inbox --sort-by id
╭────────────────────────────────────────────────────────────────────────────╮
│ heartwood │
├────────────────────────────────────────────────────────────────────────────┤
-│ 001 ● 9037b7a flux capacitor underpowered issue open bob now │
-│ 002 ● e4934b6 Define power requirements patch open bob now │
+│ 001 ● e754569 flux capacitor underpowered issue open bob now │
+│ 002 ● 466ea16 Define power requirements patch open bob now │
╰────────────────────────────────────────────────────────────────────────────╯
$ git branch -r
- bob/patches/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46
+ bob/patches/466ea167f4fc46f425967ce02fcee337c0597fcb
rad/master
-$ rad patch show e4934b6
+$ rad patch show 466ea16
╭──────────────────────────────────────────────────────────────────╮
│ Title Define power requirements │
-│ Patch e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46 │
+│ Patch 466ea167f4fc46f425967ce02fcee337c0597fcb │
│ Author bob z6Mkt67…v4N1tRk │
│ Head 27857ec9eb04c69cacab516e8bf4b5fd36090f66 │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
│ Commits ahead 2, behind 0 │
│ Status open │
@@ -43,8 +43,8 @@ $ rad patch show e4934b6
│ 27857ec Add README, just for the fun │
│ 3e674d1 Define power requirements │
├──────────────────────────────────────────────────────────────────┤
-│ ● Revision e4934b6 @ [.. ]..3e674d1 by bob z6Mkt67…v4N1tRk now │
-│ ↑ Revision 773b9aa @ [.. ]..27857ec by bob z6Mkt67…v4N1tRk now │
+│ ● Revision 466ea16 @ [..]..3e674d1 by bob z6Mkt67…v4N1tRk now │
+│ ↑ Revision 56be6ed @ f2de534..27857ec by bob z6Mkt67…v4N1tRk now │
╰──────────────────────────────────────────────────────────────────╯
```
@@ -54,35 +54,35 @@ way will tell others about the corrections we needed before merging the
changes.
```
-$ rad patch checkout e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46
-✓ Switched to branch patch/e4934b6 at revision 773b9aa
-✓ Branch patch/e4934b6 setup to track rad/patches/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46
+$ rad patch checkout 466ea167f4fc46f425967ce02fcee337c0597fcb
+✓ Switched to branch patch/466ea16 at revision 56be6ed
+✓ Branch patch/466ea16 setup to track rad/patches/466ea167f4fc46f425967ce02fcee337c0597fcb
$ git mv REQUIREMENTS REQUIREMENTS.md
$ git commit -m "Use markdown for requirements"
-[patch/e4934b6 f567f69] Use markdown for requirements
+[patch/466ea16 f567f69] Use markdown for requirements
1 file changed, 0 insertions(+), 0 deletions(-)
rename REQUIREMENTS => REQUIREMENTS.md (100%)
```
``` (stderr)
$ git push rad -o no-sync -o patch.message="Use markdown for requirements"
-✓ Patch e4934b6 updated to revision 9d62420e779e5cfe1dc02c51eddec9a0907aa844
-To compare against your previous revision 773b9aa, run:
+✓ Patch 466ea16 updated to revision 03f1ec0b2942fc67cb2895dc8c54f8864a852a56
+To compare against your previous revision 56be6ed, run:
- git range-diff f2de534[..] 27857ec[..] f567f69[..]
+ git range-diff f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 27857ec9eb04c69cacab516e8bf4b5fd36090f66 f567f695d25b4e8fb63b5f5ad2a584529826e908
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
- * [new branch] patch/e4934b6 -> patches/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+ * [new branch] patch/466ea16 -> patches/466ea167f4fc46f425967ce02fcee337c0597fcb
```
Great, all fixed up, lets accept and merge the code.
```
-$ rad patch review e4934b6 --revision 9d62420 --accept
-✓ Patch e4934b6 accepted
+$ rad patch review 466ea16 --revision 03f1ec0 --accept
+✓ Patch 466ea16 accepted
✓ Synced with 1 seed(s)
$ git checkout master
Your branch is up to date with 'rad/master'.
-$ git merge patch/e4934b6
+$ git merge patch/466ea16
Updating f2de534..f567f69
Fast-forward
README.md | 0
@@ -93,23 +93,23 @@ Fast-forward
```
``` (stderr)
$ git push rad master
-✓ Patch e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46 merged at revision 9d62420
+✓ Patch 466ea167f4fc46f425967ce02fcee337c0597fcb merged at revision 03f1ec0
✓ Canonical reference refs/heads/master updated to target commit f567f695d25b4e8fb63b5f5ad2a584529826e908
✓ Synced with 1 seed(s)
-To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+To rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
f2de534..f567f69 master -> master
```
The patch is now merged and closed :).
```
-$ rad patch show e4934b6
+$ rad patch show 466ea16
╭──────────────────────────────────────────────────────────────────╮
│ Title Define power requirements │
-│ Patch e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46 │
+│ Patch 466ea167f4fc46f425967ce02fcee337c0597fcb │
│ Author bob z6Mkt67…v4N1tRk │
│ Head 27857ec9eb04c69cacab516e8bf4b5fd36090f66 │
-│ Base [.. ] │
+│ Base [..] │
│ Target master │
│ Commits ahead 0, behind 1 │
│ Status merged │
@@ -119,9 +119,9 @@ $ rad patch show e4934b6
│ 27857ec Add README, just for the fun │
│ 3e674d1 Define power requirements │
├──────────────────────────────────────────────────────────────────┤
-│ ● Revision e4934b6 @ [.. ]..3e674d1 by bob z6Mkt67…v4N1tRk now │
-│ ↑ Revision 773b9aa @ [.. ]..27857ec by bob z6Mkt67…v4N1tRk now │
-│ ↑ Revision 9d62420 @ [.. ]..f567f69 by alice (you) now │
+│ ● Revision 466ea16 @ [..]..3e674d1 by bob z6Mkt67…v4N1tRk now │
+│ ↑ Revision 56be6ed @ f2de534..27857ec by bob z6Mkt67…v4N1tRk now │
+│ ↑ Revision 03f1ec0 @ f2de534..f567f69 by alice (you) now │
│ └─ ✓ accepted by alice (you) now │
│ └─ ✓ merged by alice (you) │
╰──────────────────────────────────────────────────────────────────╯
@@ -137,7 +137,7 @@ Finally, we will close the issue that was opened for this
patch, marking it as solved:
```
-$ rad issue state 9037b7a --solved
-✓ Issue 9037b7a is now solved
+$ rad issue state e754569 --solved
+✓ Issue e754569 is now solved
✓ Synced with 1 seed(s)
```
diff --git a/crates/radicle-cli/examples/workflow/6-pulling-contributor.md b/crates/radicle-cli/examples/workflow/6-pulling-contributor.md
index a34dfbfe97..de4d84eda3 100644
--- a/crates/radicle-cli/examples/workflow/6-pulling-contributor.md
+++ b/crates/radicle-cli/examples/workflow/6-pulling-contributor.md
@@ -10,7 +10,7 @@ f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
Then, we call `rad sync --fetch` to fetch from the maintainer:
```
$ rad sync --fetch
-Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 1 potential seed(s).
+Fetching rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G from the network, found 1 potential seed(s).
✓ Target met: 1 seed(s)
🌱 Fetched from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
```
@@ -22,9 +22,9 @@ Your branch is up to date with 'rad/master'.
```
``` (stderr) RAD_SOCKET=/dev/null
$ git pull --all --ff
-From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+From rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G
f2de534..f567f69 master -> rad/master
-From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
+From rad://z4MmvDgm9DoJF6ecPSt55geCbNp4G/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
f2de534..f567f69 master -> alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master
```
diff --git a/crates/radicle-cli/src/commands/clone.rs b/crates/radicle-cli/src/commands/clone.rs
index 9547918237..db1dd7a029 100644
--- a/crates/radicle-cli/src/commands/clone.rs
+++ b/crates/radicle-cli/src/commands/clone.rs
@@ -61,7 +61,7 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
.filter(|id| id != profile.id())
.collect::<Vec<_>>();
- let default_branch = repo.identity_doc()?.default_branch_name().ok();
+ let default_branch = doc.default_branch_name().ok();
let path = if !args.bare {
working.workdir().unwrap()
diff --git a/crates/radicle-cli/src/commands/id.rs b/crates/radicle-cli/src/commands/id.rs
index 9ff38f2bbf..64b8c45259 100644
--- a/crates/radicle-cli/src/commands/id.rs
+++ b/crates/radicle-cli/src/commands/id.rs
@@ -116,11 +116,14 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
edit,
} => {
let proposal = {
- let mut proposal = current.doc.clone().edit();
+ let proposal = current.doc.clone().edit();
let allow = allow.into_iter().collect::<BTreeSet<_>>();
let disallow = disallow.into_iter().collect::<BTreeSet<_>>();
- proposal.threshold = threshold.unwrap_or(proposal.threshold);
+ let proposal = match threshold {
+ Some(threshold) => update::threshold(proposal, threshold),
+ None => proposal,
+ };
let proposal = match visibility {
Some(edit) => update::visibility(proposal, edit),
@@ -136,14 +139,13 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
.into())
}
};
- let threshold = proposal.threshold;
let proposal = match update::delegates(proposal, delegates, rescind, &repo)? {
Ok(proposal) => proposal,
Err(errs) => {
term::error(format!("failed to verify delegates for {rid}"));
- term::error(format!(
- "the threshold of {threshold} delegates cannot be met.."
- ));
+ term::error(
+ "the required threshold of delegates cannot be met..".to_string(),
+ );
for e in errs {
print_delegate_verification_error(&e);
}
@@ -186,21 +188,44 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
}
return Ok(());
}
- let revision = update(title, description, proposal, &mut identity, &profile)?;
-
- if revision.is_accepted() && revision.parent == Some(current.id) {
- // Update the canonical head to point to the latest accepted revision.
- repo.set_identity_head_to(revision.id)?;
- }
- if args.quiet {
- term::println(revision.id);
- } else {
- term::success!(
- "Identity revision {} created",
- term::format::tertiary(revision.id)
+ propose(
+ title,
+ description,
+ proposal,
+ &mut identity,
+ ¤t,
+ &repo,
+ &profile,
+ args.quiet,
+ )?;
+ }
+ Command::Migrate { title, description } => {
+ let version = current.doc.version();
+ if version == doc::IDENTITY_VERSION {
+ anyhow::bail!(
+ "identity document is already at version {}",
+ doc::IDENTITY_VERSION
);
- print(&revision, ¤t, &repo, &profile)?;
}
+ let proposal = current.doc.migrated()?;
+
+ if !args.quiet {
+ term::println(term::format::italic(format!(
+ "Migrating identity document from version {version} to {}. \
+ Once adopted, this repository is no longer readable to older releases.",
+ doc::IDENTITY_VERSION
+ )));
+ }
+ propose(
+ title,
+ description,
+ proposal,
+ &mut identity,
+ ¤t,
+ &repo,
+ &profile,
+ args.quiet,
+ )?;
}
Command::List => {
let mut revisions =
@@ -503,6 +528,40 @@ and description.
Ok(result)
}
+/// Propose `doc` as a new revision, adopt it if the vote is already met, and
+/// report the outcome.
+#[allow(clippy::too_many_arguments)]
+fn propose(
+ title: Option<Title>,
+ description: Option<String>,
+ doc: Doc,
+ identity: &mut IdentityMut<
+ impl WriteRepository + cob::Store<Namespace = NodeId>,
+ impl crypto::Signer,
+ >,
+ current: &Revision,
+ repo: &radicle::storage::git::Repository,
+ profile: &Profile,
+ quiet: bool,
+) -> anyhow::Result<()> {
+ let revision = update(title, description, doc, identity, profile)?;
+
+ if revision.is_accepted() && revision.parent == Some(current.id) {
+ // Update the canonical head to point to the latest accepted revision.
+ repo.set_identity_head_to(revision.id)?;
+ }
+ if quiet {
+ term::println(revision.id);
+ } else {
+ term::success!(
+ "Identity revision {} created",
+ term::format::tertiary(revision.id)
+ );
+ print(&revision, current, repo, profile)?;
+ }
+ Ok(())
+}
+
fn update(
title: Option<Title>,
description: Option<String>,
diff --git a/crates/radicle-cli/src/commands/id/args.rs b/crates/radicle-cli/src/commands/id/args.rs
index 038a1e6256..00068f7c4a 100644
--- a/crates/radicle-cli/src/commands/id/args.rs
+++ b/crates/radicle-cli/src/commands/id/args.rs
@@ -220,6 +220,23 @@ pub(super) enum Command {
edit: bool,
},
+ /// Propose a revision that migrates the identity document to the current
+ /// version
+ ///
+ /// The migration is proposed like any other revision, so the delegates vote
+ /// on it. Once it is adopted, the repository is no longer readable to
+ /// releases that predate the new version.
+ #[clap(alias("m"))]
+ Migrate {
+ /// Set the title for the new proposal
+ #[arg(long)]
+ title: Option<Title>,
+
+ /// Set the description for the new proposal
+ #[arg(long)]
+ description: Option<String>,
+ },
+
/// Lists all proposed revisions to the identity document
#[clap(alias("l"))]
List,
diff --git a/crates/radicle-cli/src/commands/init.rs b/crates/radicle-cli/src/commands/init.rs
index 26cffea9bd..4e11145d98 100644
--- a/crates/radicle-cli/src/commands/init.rs
+++ b/crates/radicle-cli/src/commands/init.rs
@@ -139,7 +139,8 @@ pub fn init(repo: raw::Repository, args: Args, profile: &profile::Profile) -> an
let mut spinner = term::spinner("Initializing…");
let mut push_cmd = String::from("git push");
- match radicle::rad::init(
+ match radicle::rad::init_at(
+ args.identity_version,
&repo,
name,
&description,
diff --git a/crates/radicle-cli/src/commands/init/args.rs b/crates/radicle-cli/src/commands/init/args.rs
index 88831bce1f..79fe064925 100644
--- a/crates/radicle-cli/src/commands/init/args.rs
+++ b/crates/radicle-cli/src/commands/init/args.rs
@@ -2,7 +2,7 @@ use std::path::PathBuf;
use clap::Parser;
use radicle::{
- identity::{Visibility, project::ProjectName},
+ identity::{Visibility, doc, project::ProjectName},
node::policy::Scope,
prelude::RepoId,
};
@@ -26,6 +26,14 @@ pub struct Args {
/// The default branch of the repository
#[arg(long = "default-branch")]
pub(super) branch: Option<String>,
+ /// The version of the identity document to write
+ ///
+ /// An older version keeps the repository readable to older releases, at the
+ /// cost of the features the newer version brings. Use `rad id migrate` to
+ /// move to the current version later.
+ #[arg(long = "identity-version", value_name = "VERSION")]
+ #[arg(default_value_t = doc::IDENTITY_VERSION)]
+ pub(super) identity_version: doc::Version,
/// Repository follow scope
#[arg(
long,
diff --git a/crates/radicle-cli/src/commands/publish.rs b/crates/radicle-cli/src/commands/publish.rs
index dc8d491d1c..641d962b54 100644
--- a/crates/radicle-cli/src/commands/publish.rs
+++ b/crates/radicle-cli/src/commands/publish.rs
@@ -42,7 +42,7 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
// Update identity document.
let doc = doc.clone().with_edits(|doc| {
- doc.visibility = Visibility::Public;
+ *doc.visibility_mut() = Visibility::Public;
})?;
// SAFETY: the `Title` here is guaranteed to be nonempty and does not
diff --git a/crates/radicle-cli/tests/commands.rs b/crates/radicle-cli/tests/commands.rs
index 8807212de3..4861694f53 100644
--- a/crates/radicle-cli/tests/commands.rs
+++ b/crates/radicle-cli/tests/commands.rs
@@ -99,7 +99,7 @@ fn rad_remote() {
let bob = environment.relay("bob");
let eve = environment.relay("eve");
let home = alice.home.clone();
- let rid = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+ let rid = RepoId::from_str("z4MmvDgm9DoJF6ecPSt55geCbNp4G").unwrap();
// Set up a test repository.
environment.repository(&alice);
diff --git a/crates/radicle-cli/tests/commands/clone.rs b/crates/radicle-cli/tests/commands/clone.rs
index 3787c4fa3f..82d5b17259 100644
--- a/crates/radicle-cli/tests/commands/clone.rs
+++ b/crates/radicle-cli/tests/commands/clone.rs
@@ -179,7 +179,7 @@ fn rad_clone_connect() {
let alice = environment.node("alice");
let bob = environment.node("bob");
let mut eve = environment.node("eve");
- let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+ let acme = RepoId::from_str("z4MmvDgm9DoJF6ecPSt55geCbNp4G").unwrap();
let ua = UserAgent::default();
let now = LocalTime::now().into();
diff --git a/crates/radicle-cli/tests/commands/git.rs b/crates/radicle-cli/tests/commands/git.rs
index 9ab6eb1e5f..d664ee40ef 100644
--- a/crates/radicle-cli/tests/commands/git.rs
+++ b/crates/radicle-cli/tests/commands/git.rs
@@ -10,7 +10,7 @@ fn git_push_diverge() {
let mut environment = Environment::new();
let alice = environment.node("alice");
let bob = environment.node("bob");
- let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+ let acme = RepoId::from_str("z4MmvDgm9DoJF6ecPSt55geCbNp4G").unwrap();
environment.repository(&alice);
@@ -53,7 +53,7 @@ fn git_push_converge() {
let alice = environment.node("alice");
let bob = environment.node("bob");
let eve = environment.node("eve");
- let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+ let acme = RepoId::from_str("z4MmvDgm9DoJF6ecPSt55geCbNp4G").unwrap();
environment.repository(&alice);
@@ -113,7 +113,7 @@ fn git_push_amend() {
let mut environment = Environment::new();
let alice = environment.node("alice");
let bob = environment.node("bob");
- let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+ let acme = RepoId::from_str("z4MmvDgm9DoJF6ecPSt55geCbNp4G").unwrap();
environment.repository(&alice);
@@ -158,7 +158,7 @@ fn git_push_rollback() {
let mut environment = Environment::new();
let alice = environment.node("alice");
let bob = environment.node("bob");
- let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+ let acme = RepoId::from_str("z4MmvDgm9DoJF6ecPSt55geCbNp4G").unwrap();
environment.repository(&alice);
@@ -265,7 +265,7 @@ fn git_push_canonical_lightweight_tags() {
let alice = environment.node("alice");
let bob = environment.node("bob");
- let rid = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+ let rid = RepoId::from_str("z4MmvDgm9DoJF6ecPSt55geCbNp4G").unwrap();
fixtures::repository(environment.work(&alice));
@@ -311,7 +311,7 @@ fn git_push_canonical() {
let alice = environment.node("alice");
let bob = environment.node("bob");
- let rid = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+ let rid = RepoId::from_str("z4MmvDgm9DoJF6ecPSt55geCbNp4G").unwrap();
fixtures::repository(environment.work(&alice));
diff --git a/crates/radicle-cli/tests/commands/id.rs b/crates/radicle-cli/tests/commands/id.rs
index 24f0e8c27c..09a1a31a63 100644
--- a/crates/radicle-cli/tests/commands/id.rs
+++ b/crates/radicle-cli/tests/commands/id.rs
@@ -15,7 +15,7 @@ fn rad_id() {
let mut environment = Environment::new();
let alice = environment.node("alice");
let bob = environment.node("bob");
- let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+ let acme = RepoId::from_str("z4MmvDgm9DoJF6ecPSt55geCbNp4G").unwrap();
environment.repository(&alice);
@@ -61,7 +61,7 @@ fn rad_id_threshold() {
let alice = environment.node("alice");
let bob = environment.node("bob");
let seed = environment.node("seed");
- let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+ let acme = RepoId::from_str("z4MmvDgm9DoJF6ecPSt55geCbNp4G").unwrap();
environment.repository(&alice);
@@ -117,7 +117,7 @@ fn rad_id_threshold_soft_fork() {
let mut environment = Environment::new();
let alice = environment.node("alice");
let bob = environment.node("bob");
- let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+ let acme = RepoId::from_str("z4MmvDgm9DoJF6ecPSt55geCbNp4G").unwrap();
environment.repository(&alice);
@@ -167,13 +167,62 @@ fn rad_id_update_delete_field() {
Environment::alice(["rad-init", "rad-id-update-delete-field"]);
}
+#[test]
+fn rad_id_migrate() {
+ Environment::alice(["rad-id-migrate"]);
+}
+
+#[test]
+fn rad_id_migrate_multi_delegate() {
+ let mut environment = Environment::new();
+ let alice = environment.node("alice");
+ let bob = environment.node("bob");
+ let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+
+ environment.repository(&alice);
+
+ test(
+ "examples/rad-init-v1.md",
+ environment.work(&alice),
+ Some(&alice.home),
+ [],
+ )
+ .unwrap();
+
+ let mut alice = alice.spawn();
+ let bob = bob.spawn();
+
+ alice.handle.seed(acme, Scope::All).unwrap();
+ alice.connect(&bob).converge([&bob]);
+
+ bob.fork(acme, environment.work(&bob)).unwrap();
+ bob.has_remote_of(&acme, &alice.id);
+ alice.has_remote_of(&acme, &bob.id);
+ alice.is_synced_with(&acme, &bob.id);
+
+ formula(&environment.tempdir(), "examples/rad-id-migrate-vote.md")
+ .unwrap()
+ .home(
+ "alice",
+ environment.work(&alice),
+ [("RAD_HOME", alice.home.path().display())],
+ )
+ .home(
+ "bob",
+ environment.work(&bob),
+ [("RAD_HOME", bob.home.path().display())],
+ )
+ .run()
+ .unwrap();
+}
+
#[test]
fn rad_id_multi_delegate() {
let mut environment = Environment::new();
let alice = environment.node("alice");
let bob = environment.node("bob");
let eve = environment.node("eve");
- let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+ let acme = RepoId::from_str("z4MmvDgm9DoJF6ecPSt55geCbNp4G").unwrap();
environment.repository(&alice);
@@ -227,7 +276,7 @@ fn rad_id_unauthorized_delegate() {
let mut environment = Environment::new();
let alice = environment.node("alice");
let bob = environment.node("bob");
- let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+ let acme = RepoId::from_str("z4MmvDgm9DoJF6ecPSt55geCbNp4G").unwrap();
environment.repository(&alice);
@@ -281,7 +330,7 @@ fn rad_id_collaboration() {
let eve = environment.node("eve");
let seed = environment.seed("seed");
let distrustful = environment.seed("distrustful");
- let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+ let acme = RepoId::from_str("z4MmvDgm9DoJF6ecPSt55geCbNp4G").unwrap();
environment.repository(&alice);
@@ -382,7 +431,7 @@ fn rad_id_conflict() {
let mut environment = Environment::new();
let alice = environment.node("alice");
let bob = environment.node("bob");
- let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+ let acme = RepoId::from_str("z4MmvDgm9DoJF6ecPSt55geCbNp4G").unwrap();
environment.repository(&alice);
diff --git a/crates/radicle-cli/tests/commands/patch.rs b/crates/radicle-cli/tests/commands/patch.rs
index d908f46178..76e7d3d40c 100644
--- a/crates/radicle-cli/tests/commands/patch.rs
+++ b/crates/radicle-cli/tests/commands/patch.rs
@@ -46,7 +46,7 @@ fn rad_patch_checkout_force() {
let mut environment = Environment::new();
let alice = environment.node("alice");
let bob = environment.node("bob");
- let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+ let acme = RepoId::from_str("z4MmvDgm9DoJF6ecPSt55geCbNp4G").unwrap();
environment.repository(&alice);
@@ -156,7 +156,7 @@ fn rad_patch_delete() {
let alice = environment.relay("alice");
let bob = environment.relay("bob");
let seed = environment.relay("seed");
- let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+ let acme = RepoId::from_str("z4MmvDgm9DoJF6ecPSt55geCbNp4G").unwrap();
environment.repository(&alice);
@@ -211,7 +211,7 @@ fn rad_push_and_pull_patches() {
let mut environment = Environment::new();
let alice = environment.node("alice");
let bob = environment.node("bob");
- let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+ let acme = RepoId::from_str("z4MmvDgm9DoJF6ecPSt55geCbNp4G").unwrap();
environment.repository(&alice);
@@ -452,7 +452,7 @@ fn rad_patch_merge_unauthorized_branch() {
let mut environment = Environment::new();
let alice = environment.node("alice");
let bob = environment.node("bob");
- let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+ let acme = RepoId::from_str("z4MmvDgm9DoJF6ecPSt55geCbNp4G").unwrap();
environment.repository(&alice);
diff --git a/crates/radicle-cli/tests/commands/remote.rs b/crates/radicle-cli/tests/commands/remote.rs
index 68407d3309..0805f29dbc 100644
--- a/crates/radicle-cli/tests/commands/remote.rs
+++ b/crates/radicle-cli/tests/commands/remote.rs
@@ -13,7 +13,7 @@ fn rad_remote() {
let bob = environment.relay("bob");
let eve = environment.relay("eve");
let home = alice.home.clone();
- let rid = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+ let rid = RepoId::from_str("z4MmvDgm9DoJF6ecPSt55geCbNp4G").unwrap();
// Set up a test repository.
environment.repository(&alice);
diff --git a/crates/radicle-cli/tests/commands/sync.rs b/crates/radicle-cli/tests/commands/sync.rs
index d06f2e5641..4b50046d5b 100644
--- a/crates/radicle-cli/tests/commands/sync.rs
+++ b/crates/radicle-cli/tests/commands/sync.rs
@@ -68,7 +68,7 @@ fn rad_sync() {
let alice = environment.seed("alice");
let bob = environment.seed("bob");
let eve = environment.seed("eve");
- let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+ let acme = RepoId::from_str("z4MmvDgm9DoJF6ecPSt55geCbNp4G").unwrap();
radicle::test::fixtures::repository(working.join("acme"));
@@ -117,7 +117,7 @@ fn replication_via_seed() {
seeding_policy: DefaultSeedingPolicy::permissive(),
..crate::util::environment::config::relay("seed")
});
- let rid = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+ let rid = RepoId::from_str("z4MmvDgm9DoJF6ecPSt55geCbNp4G").unwrap();
let mut alice = alice.spawn();
let mut bob = bob.spawn();
diff --git a/crates/radicle-cli/tests/commands/utility.rs b/crates/radicle-cli/tests/commands/utility.rs
index cbabfeb40e..37aa275e6b 100644
--- a/crates/radicle-cli/tests/commands/utility.rs
+++ b/crates/radicle-cli/tests/commands/utility.rs
@@ -75,7 +75,7 @@ fn rad_clean() {
let working = environment.tempdir().join("working");
// Set up a test project.
- let acme = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+ let acme = RepoId::from_str("z4MmvDgm9DoJF6ecPSt55geCbNp4G").unwrap();
radicle::test::fixtures::repository(working.join("acme"));
test(
"examples/rad-init.md",
diff --git a/crates/radicle-fetch/src/state.rs b/crates/radicle-fetch/src/state.rs
index 8a8fb2120a..d7b60ef7fb 100644
--- a/crates/radicle-fetch/src/state.rs
+++ b/crates/radicle-fetch/src/state.rs
@@ -4,7 +4,7 @@ use std::time::Instant;
use gix_protocol::Handshake;
use radicle::crypto::PublicKey;
use radicle::git::{Oid, fmt::Qualified};
-use radicle::identity::{Did, Doc, DocError};
+use radicle::identity::{Doc, DocError, doc::DefaultBranchError};
use radicle::storage;
use radicle::storage::git::Repository;
@@ -62,6 +62,10 @@ pub mod error {
},
#[error("canonical 'refs/rad/id' is missing")]
MissingRadId,
+ #[error("failed to resolve default branch quorum from 'refs/rad/id': {0}")]
+ DefaultBranch(#[from] radicle::identity::doc::DefaultBranchError),
+ #[error("canonical 'refs/rad/id' has no rule matching its default branch")]
+ MissingBranchRule,
#[error(transparent)]
RefdbUpdate(#[from] repository::error::Update),
#[error(transparent)]
@@ -415,29 +419,55 @@ impl FetchState {
.canonical()?
.ok_or(error::Protocol::MissingRadId)?;
- let is_delegate = anchor.is_delegate(&Did::from(handle.local()));
- // TODO: not sure we should allow to block *any* peer from the
- // delegate set. We could end up ignoring delegates.
- let delegates = anchor
- .delegates()
+ // The canonical default branch — and the quorum required to establish
+ // it — is defined by the crefs rule that matches it. Fail closed: if the
+ // anchor's canonical references or default branch cannot be resolved, or
+ // no rule matches, abort the fetch rather than silently proceeding with
+ // a quorum of 1 (which would let a single delegate — or a seed serving a
+ // malformed 'refs/rad/id' — downgrade the required quorum).
+ let crefs = anchor.canonical_refs().map_err(DefaultBranchError::from)?;
+ let branch = anchor.default_branch()?;
+ let (_, branch_rule) = crefs
+ .rules()
+ .matches(&branch)
+ .next()
+ .ok_or(error::Protocol::MissingBranchRule)?;
+ let branch_threshold = usize::from(*branch_rule.threshold());
+
+ // The peers who vote on the canonical branch are the matched rule's
+ // `allowed` set — not the identity delegates — so that the threshold and
+ // the counted population come from the same rule. For the common
+ // `allow: delegates` rule this set is exactly the identity delegates; for
+ // an explicit `allow` set it may include non-delegates.
+ // TODO: not sure we should allow to block *any* peer from the voter set.
+ // We could end up ignoring voters.
+ let voters = branch_rule
+ .allowed()
.iter()
.filter(|id| !handle.is_blocked(id))
.map(|did| PublicKey::from(*did))
.collect::<BTreeSet<_>>();
- log::trace!("Identity delegates {delegates:?}");
+ log::trace!("Canonical branch voters {voters:?}");
- // The local peer does not need to count towards the threshold
- // since they must be valid already.
- let threshold = if is_delegate {
- anchor.threshold() - 1
+ // The local peer does not need to count towards the quorum since they
+ // must be valid already. Membership is checked against the rule's full
+ // `allowed` set, not the `voters` set above: `voters` has the local peer
+ // (which is always "blocked" from itself) and any blocked peers filtered
+ // out, so it must not be used to decide whether the local peer votes.
+ let is_voter = branch_rule
+ .allowed()
+ .iter()
+ .any(|did| PublicKey::from(*did) == *handle.local());
+ let threshold = if is_voter {
+ branch_threshold.saturating_sub(1)
} else {
- anchor.threshold()
+ branch_threshold
};
let signed_refs = self.run_special_refs(
handle,
handshake,
- delegates.clone(),
+ voters.clone(),
threshold,
&config.limit,
remote,
@@ -479,16 +509,16 @@ impl FetchState {
// non-pruned, fetched remotes here.
let mut remotes = BTreeSet::new();
- // The valid delegates start with all delegates that this peer
- // currently has valid references for
- let mut valid_delegates = handle
+ // The valid voters start with all branch voters that this peer
+ // currently has valid references for.
+ let mut valid_voters = handle
.repository()
.remote_ids()
.map_err(error::Protocol::RemoteIds)?
.filter_map(|id| id.ok())
- .filter(|id| delegates.contains(id))
+ .filter(|id| voters.contains(id))
.collect::<BTreeSet<_>>();
- let mut failed_delegates = BTreeSet::new();
+ let mut failed_voters = BTreeSet::new();
// TODO(finto): this might read better if it got its own
// private function.
@@ -498,7 +528,7 @@ impl FetchState {
continue;
}
- match (refs, delegates.contains(&remote)) {
+ match (refs, voters.contains(&remote)) {
(Ok(None), false) => {
log::debug!("Pruning non-delegate {remote} tips, missing 'rad/sigrefs'");
failures.push(sigrefs::Validation::MissingRadSigRefs(remote));
@@ -513,14 +543,14 @@ impl FetchState {
// previous `rad/sigrefs` but if this occurs with
// enough delegates also failing validation we
// would rather surface the issue and fail the fetch.
- valid_delegates.remove(&remote);
- failed_delegates.insert(remote);
+ valid_voters.remove(&remote);
+ failed_voters.insert(remote);
}
(Err(err), _) => {
log::debug!("Pruning {remote} tips due to: {err}");
self.prune(&remote);
- valid_delegates.remove(&remote);
- failed_delegates.insert(remote);
+ valid_voters.remove(&remote);
+ failed_voters.insert(remote);
failures.push(sigrefs::Validation::Read {
remote,
source: err,
@@ -540,8 +570,8 @@ impl FetchState {
});
if delegate {
- valid_delegates.remove(&remote);
- failed_delegates.insert(remote);
+ valid_voters.remove(&remote);
+ failed_voters.insert(remote);
}
self.prune(&remote);
@@ -648,11 +678,11 @@ impl FetchState {
if !fails.is_empty() {
log::debug!("Pruning delegate {remote} tips, due to validation failures");
self.prune(&remote);
- valid_delegates.remove(&remote);
- failed_delegates.insert(remote);
+ valid_voters.remove(&remote);
+ failed_voters.insert(remote);
failures.append(&mut fails)
} else {
- valid_delegates.insert(remote);
+ valid_voters.insert(remote);
remotes.insert(remote);
}
@@ -673,7 +703,7 @@ impl FetchState {
// N.b. only apply to Git repository if there are enough valid
// delegates that pass the threshold.
- if valid_delegates.len() >= threshold {
+ if valid_voters.len() >= threshold {
let applied = repository::update(
handle.repository(),
self.tips
@@ -695,7 +725,7 @@ impl FetchState {
);
Ok(FetchResult::Failed {
threshold,
- delegates: failed_delegates,
+ delegates: failed_voters,
validations: failures,
})
}
diff --git a/crates/radicle-node/src/test/simulator.rs b/crates/radicle-node/src/test/simulator.rs
index 9cf72594a3..0bb1de5313 100644
--- a/crates/radicle-node/src/test/simulator.rs
+++ b/crates/radicle-node/src/test/simulator.rs
@@ -400,7 +400,7 @@ where
}
Err(err) => panic!("Error fetching: {err}"),
}
- p.fetched(rid, nid, result);
+ p.fetched(rid, nid, result.map(Box::new));
}
}
while let Some(o) = p.next() {
diff --git a/crates/radicle-node/src/tests.rs b/crates/radicle-node/src/tests.rs
index d6253acca7..46944d37c7 100644
--- a/crates/radicle-node/src/tests.rs
+++ b/crates/radicle-node/src/tests.rs
@@ -494,7 +494,7 @@ fn announcement_rebroadcast_deduplicates() {
repo.doc.doc = repo
.doc
.doc
- .with_edits(|doc| doc.visibility = Visibility::Public)
+ .with_edits(|doc| *doc.visibility_mut() = Visibility::Public)
.unwrap();
amy.storage_mut().repos.insert(*rid, repo);
}
@@ -702,7 +702,7 @@ fn refs_announcement_relay_public() {
.doc
.doc
.with_edits(|doc| {
- doc.visibility = Visibility::Public; // Public repos are always gossiped.
+ *doc.visibility_mut() = Visibility::Public; // Public repos are always gossiped.
})
.unwrap();
amy.storage_mut().repos.insert(bob_inv[i], repo);
@@ -769,7 +769,7 @@ fn refs_announcement_relay_private() {
.doc
.doc
.with_edits(|doc| {
- doc.visibility = Visibility::Private { allow: [].into() };
+ *doc.visibility_mut() = Visibility::Private { allow: [].into() };
})
.unwrap();
repo
@@ -783,7 +783,7 @@ fn refs_announcement_relay_private() {
.doc
.doc
.with_edits(|doc| {
- doc.visibility = Visibility::Private {
+ *doc.visibility_mut() = Visibility::Private {
allow: [(*cid.nid()).into()].into(),
};
})
@@ -837,7 +837,7 @@ fn refs_announcement_subscribe_private() {
.doc
.doc
.with_edits(|doc| {
- doc.visibility = Visibility::Private {
+ *doc.visibility_mut() = Visibility::Private {
allow: [(*amy.nid()).into(), (*bob.nid()).into()].into(),
};
})
@@ -1523,7 +1523,11 @@ fn queued_fetch_max_capacity() {
amy.elapse(KEEP_ALIVE_DELTA);
// Finish the 1st fetch.
- amy.fetched(rid1, *bob.nid(), Ok(FetchResult::new(doc.clone())));
+ amy.fetched(
+ rid1,
+ *bob.nid(),
+ Ok(Box::new(FetchResult::new(doc.clone()))),
+ );
// Now the 1st fetch is done, the 2nd fetch is dequeued.
assert_eq!(amy.fetches().next(), Some((rid2, *bob.nid())));
@@ -1531,7 +1535,7 @@ fn queued_fetch_max_capacity() {
assert_matches!(amy.fetches().next(), None);
// Finish the 2nd fetch.
- amy.fetched(rid2, *bob.nid(), Ok(FetchResult::new(doc)));
+ amy.fetched(rid2, *bob.nid(), Ok(Box::new(FetchResult::new(doc))));
// Now the 2nd fetch is done, the 3rd fetch is dequeued.
assert_eq!(amy.fetches().next(), Some((rid3, *bob.nid())));
}
@@ -1587,7 +1591,7 @@ fn orphaned_fetch_blocks_repo_from_all_nodes() {
// Delivering the missing result (what the fix guarantees) clears the entry
// and the queued fetch from the other node proceeds.
- amy.fetched(rid, *bob.nid(), Ok(FetchResult::new(doc)));
+ amy.fetched(rid, *bob.nid(), Ok(Box::new(FetchResult::new(doc))));
assert_eq!(amy.fetches().next(), Some((rid, *cid.nid())));
}
@@ -1651,7 +1655,7 @@ fn queued_fetch_from_ann_same_rid() {
amy.fetched(
rid,
*bob.nid(),
- Ok(FetchResult {
+ Ok(Box::new(FetchResult {
updated: vec![RefUpdate::Created {
name: refname.clone(),
oid,
@@ -1660,7 +1664,7 @@ fn queued_fetch_from_ann_same_rid() {
namespaces: [*cid.nid()].into_iter().collect(),
clone: false,
doc: arbitrary::r#gen(1),
- }),
+ })),
);
// Now the 1st fetch is done, but the 2nd and 3rd fetches are redundant.
assert_matches!(amy.fetches().next(), None);
@@ -1710,7 +1714,7 @@ fn queued_fetch_from_command_same_rid() {
amy.elapse(KEEP_ALIVE_DELTA);
// Finish the 1st fetch.
- amy.fetched(rid1, nid, Ok(arbitrary::r#gen::<FetchResult>(1)));
+ amy.fetched(rid1, nid, Ok(Box::new(arbitrary::r#gen::<FetchResult>(1))));
// Now the 1st fetch is done, the 2nd fetch is dequeued.
let (rid, nid) = amy.fetches().next().unwrap();
assert_eq!(rid, rid1);
@@ -1720,7 +1724,7 @@ fn queued_fetch_from_command_same_rid() {
assert_matches!(amy.fetches().next(), None);
// Finish the 2nd fetch.
- amy.fetched(rid1, nid, Ok(arbitrary::r#gen::<FetchResult>(1)));
+ amy.fetched(rid1, nid, Ok(Box::new(arbitrary::r#gen::<FetchResult>(1))));
// Now the 2nd fetch is done, the 3rd fetch is dequeued.
assert_matches!(amy.fetches().next(), Some((rid, nid)) if rid == rid1 && peers.remove(&nid));
// All fetches were initiated.
@@ -1878,21 +1882,21 @@ fn prop_inventory_exchange_dense() {
AMY,
amy_inv
.clone()
- .map(|doc| doc.visibility = Visibility::Public),
+ .map(|doc| *doc.visibility_mut() = Visibility::Public),
);
let mut bob = Peer::with_storage(
"bob",
BOB,
bob_inv
.clone()
- .map(|doc| doc.visibility = Visibility::Public),
+ .map(|doc| *doc.visibility_mut() = Visibility::Public),
);
let mut cid = Peer::with_storage(
"cid",
CID,
cid_inv
.clone()
- .map(|doc| doc.visibility = Visibility::Public),
+ .map(|doc| *doc.visibility_mut() = Visibility::Public),
);
let mut routing = RandomMap::with_hasher(rng.clone().into());
diff --git a/crates/radicle-node/src/tests/e2e.rs b/crates/radicle-node/src/tests/e2e.rs
index affcb6c02f..a03161ff6d 100644
--- a/crates/radicle-node/src/tests/e2e.rs
+++ b/crates/radicle-node/src/tests/e2e.rs
@@ -195,7 +195,7 @@ fn public_to_private_to_public_replay() {
.unwrap()
.doc
.with_edits(|doc| {
- doc.visibility = Visibility::private([]);
+ *doc.visibility_mut() = Visibility::private([]);
})
.unwrap();
let private_rev = identity
@@ -1567,12 +1567,8 @@ fn missing_delegate_default_branch() {
// Helper to assert that Bob's default branch is not in storage
let assert_bobs_default_is_missing = |repo: &Repository| {
- let doc = repo.identity_doc().unwrap();
- let project = doc.project().unwrap().unwrap();
- let default_branch = repo.reference(
- &bob_key,
- &radicle::git::refs::branch(project.default_branch()),
- );
+ let branch_name = repo.default_branch_name().unwrap();
+ let default_branch = repo.reference(&bob_key, &radicle::git::refs::branch(&branch_name));
assert!(matches!(
default_branch,
Err(e) if e.is_not_found()
@@ -1895,8 +1891,8 @@ fn fetch_emits_canonical_ref_update() {
let default_branch: git::fmt::Qualified = {
let repo = alice.storage.repository(rid).unwrap();
- let proj = repo.identity_doc().unwrap().project().unwrap().unwrap();
- git::fmt::lit::refs_heads(proj.default_branch()).into()
+ let name = repo.default_branch_name().unwrap();
+ git::refs::branch(&name)
};
alice.commit_to(rid, &default_branch);
@@ -2186,16 +2182,27 @@ fn fetch_emits_canonical_ref_update_partial_glob() {
.unwrap()
.doc
.with_edits(|raw| {
+ // The canonical references payload is now the sole source of
+ // truth for the default branch, so it must carry the default
+ // branch rule and `HEAD` symbolic reference alongside the
+ // partial-glob rule under test.
let crefs = serde_json::json!({
"rules": {
+ "refs/heads/master": {
+ "threshold": 1,
+ "allow": "delegates"
+ },
"refs/heads/main*": {
"threshold": 1,
"allow": "delegates"
}
+ },
+ "symbolic": {
+ "HEAD": "refs/heads/master"
}
});
- raw.payload.insert(
+ raw.payload_mut().insert(
radicle::identity::doc::PayloadId::canonical_refs().clone(),
radicle::identity::doc::Payload::from(crefs),
);
diff --git a/crates/radicle-node/src/worker.rs b/crates/radicle-node/src/worker.rs
index 6aa66636c4..d262cc4945 100644
--- a/crates/radicle-node/src/worker.rs
+++ b/crates/radicle-node/src/worker.rs
@@ -125,7 +125,9 @@ impl Worker {
config,
} => {
log::debug!(target: "worker", "Worker processing outgoing fetch for {rid}");
- let result = self.fetch(rid, remote, refs_at, config, channels, notifs);
+ let result = self
+ .fetch(rid, remote, refs_at, config, channels, notifs)
+ .map(Box::new);
FetchResult::Initiator { rid, result }
}
FetchRequest::Responder { remote, emitter } => {
diff --git a/crates/radicle-protocol/src/service.rs b/crates/radicle-protocol/src/service.rs
index e874039601..5de8d95660 100644
--- a/crates/radicle-protocol/src/service.rs
+++ b/crates/radicle-protocol/src/service.rs
@@ -1052,7 +1052,7 @@ where
&mut self,
rid: RepoId,
from: NodeId,
- result: Result<crate::worker::fetch::FetchResult, crate::worker::FetchError>,
+ result: Result<Box<crate::worker::fetch::FetchResult>, crate::worker::FetchError>,
) {
let cmd = fetcher::state::command::Fetched { from, rid };
let fetcher::service::FetchCompleted { event, subscribers } = self.fetcher.fetched(cmd);
@@ -1079,7 +1079,7 @@ where
for responder in subscribers {
responder.ok(fetch_result.clone()).ok();
}
- match result {
+ match result.map(|result| *result) {
Ok(crate::worker::fetch::FetchResult {
updated,
canonical,
diff --git a/crates/radicle-protocol/src/worker.rs b/crates/radicle-protocol/src/worker.rs
index 4874d797a9..f690daf1f9 100644
--- a/crates/radicle-protocol/src/worker.rs
+++ b/crates/radicle-protocol/src/worker.rs
@@ -108,7 +108,10 @@ pub enum FetchResult {
/// Repo fetched.
rid: RepoId,
/// Fetch result, including remotes fetched.
- result: Result<fetch::FetchResult, FetchError>,
+ ///
+ /// Boxed because a successful result carries the fetched namespaces and
+ /// ref updates, which dwarf everything else this message holds.
+ result: Result<Box<fetch::FetchResult>, FetchError>,
},
Responder {
/// Repo requested.
diff --git a/crates/radicle/src/cob/identity.rs b/crates/radicle/src/cob/identity.rs
index 9afe0b7ab3..3b695d312f 100644
--- a/crates/radicle/src/cob/identity.rs
+++ b/crates/radicle/src/cob/identity.rs
@@ -1072,8 +1072,14 @@ impl Revision {
})
}
- pub fn sign(&self, signer: &impl crypto::Signer) -> Result<Signature, DocError> {
- self.doc.signature_of(signer)
+ /// Sign this revision, so a delegate can vote on it.
+ ///
+ /// The signature covers [`Revision::blob`], the document blob as stored.
+ /// Verification checks the signature against that same blob, so signing a
+ /// re-encoding of the in-memory document would break the vote whenever the
+ /// two disagreed.
+ pub fn sign(&self, signer: &impl crypto::Signer) -> Signature {
+ signer.sign(self.blob.as_ref())
}
}
@@ -1282,7 +1288,7 @@ where
}
#[allow(deprecated)]
- let signature = revision.sign(self.store.signer())?;
+ let signature = revision.sign(self.store.signer());
self.transaction("Accept revision", |tx, _| tx.accept(id, signature))
}
@@ -1397,6 +1403,66 @@ mod test {
assert_eq!(format!("\"{did}\""), json);
}
+ #[test]
+ fn migrate_version_1_identity() {
+ use crate::identity::doc::{IDENTITY_VERSION, Version};
+ use crate::storage::git::transport;
+
+ let v1 = Version::new(1).unwrap();
+ let tempdir = tempfile::tempdir().unwrap();
+ let storage = Storage::open(tempdir.path().join("storage"), fixtures::user()).unwrap();
+ transport::local::register(storage.clone());
+
+ let alice = SigningKey::mock(300);
+ let bob = SigningKey::mock(301);
+ let (working, _) = fixtures::repository(tempdir.path().join("working"));
+ let (rid, _, _) = rad::init_at(
+ v1,
+ &working,
+ "heartwood".try_into().unwrap(),
+ "Radicle Heartwood Protocol & Stack",
+ git::fmt::refname!("master"),
+ Visibility::default(),
+ &alice,
+ &storage,
+ )
+ .unwrap();
+ let repo = storage.repository(rid).unwrap();
+ let mut identity = Identity::load_mut(&repo, &alice).unwrap();
+ assert_eq!(identity.doc().version(), v1);
+
+ // Add Bob as a delegate, so that migrating needs a vote. An ordinary
+ // edit keeps the document at its stored version.
+ let mut doc = identity.doc().clone().edit();
+ doc.delegate(bob.public_key().into());
+ let r1 = identity
+ .update(Title::new("Add Bob").unwrap(), "", &doc.verified().unwrap())
+ .unwrap();
+ assert!(identity.revision(&r1).unwrap().is_accepted());
+ assert_eq!(identity.doc().version(), v1);
+
+ // The migration differs from its parent, so `DocUnchanged` does not
+ // fire, and it waits on Bob's vote.
+ let migrated = identity.doc().migrated().unwrap();
+ let r2 = identity
+ .update(Title::new("Migrate identity").unwrap(), "", &migrated)
+ .unwrap();
+ assert_eq!(identity.revision(&r2).unwrap().state, State::Active);
+ assert_eq!(identity.current, r1);
+
+ // Bob votes on a revision whose parent is a version-1 document.
+ let mut bob_identity = Identity::load_mut(&repo, &bob).unwrap();
+ bob_identity.accept(&r2).unwrap();
+ identity.reload().unwrap();
+
+ assert_eq!(identity.current, r2);
+ assert_eq!(identity.doc().version(), IDENTITY_VERSION);
+ assert_eq!(
+ identity.doc().default_branch().unwrap().as_str(),
+ "refs/heads/master"
+ );
+ }
+
#[test]
fn identity_updates() {
let NodeWithRepo { node, repo } = NodeWithRepo::default();
@@ -1416,11 +1482,6 @@ mod test {
.unwrap_err();
assert_eq!(identity.current, r0);
- // Change threshold to `2`, even though there's only one delegate. This should
- // fail as it makes the master branch immutable.
- doc.threshold = 2;
- assert!(doc.clone().verified().is_err());
-
// Let's add another delegate.
doc.delegate(bob.public_key().into());
// The update should go through now.
@@ -1432,7 +1493,7 @@ mod test {
// With two delegates now, we need two signatures for any update to go through.
// So this next update shouldn't be accepted as canonical until the second delegate
// signs it.
- doc.visibility = Visibility::private([]);
+ *doc.visibility_mut() = Visibility::private([]);
let r2 = identity
.update(title.clone(), description, &doc.clone().verified().unwrap())
.unwrap();
@@ -1482,7 +1543,7 @@ mod test {
.unwrap();
assert_eq!(identity.current, r1);
- doc.visibility = Visibility::private([]);
+ *doc.visibility_mut() = Visibility::private([]);
let r2 = identity
.update(
cob::Title::new("Make private").unwrap(),
@@ -1518,7 +1579,7 @@ mod test {
identity.reload().unwrap();
assert_eq!(identity.current, r3);
- doc.visibility = Visibility::Public;
+ *doc.visibility_mut() = Visibility::Public;
let r3 = identity
.update(
cob::Title::new("Make public").unwrap(),
@@ -1565,7 +1626,7 @@ mod test {
assert!(bob_doc.is_delegate(&bob.signer.public_key().into()));
// Alice changes the document without making Bob aware.
- alice_doc.visibility = Visibility::private([]);
+ *alice_doc.visibility_mut() = Visibility::private([]);
let a2 = alice_identity
.update(
cob::Title::new("Change visibility").unwrap(),
@@ -1632,7 +1693,7 @@ mod test {
)
.unwrap();
- alice_doc.visibility = Visibility::private([eve.signer.public_key().into()]);
+ *alice_doc.visibility_mut() = Visibility::private([eve.signer.public_key().into()]);
let a2 = alice_identity
.update(
cob::Title::new("Change visibility").unwrap(),
@@ -1682,7 +1743,7 @@ mod test {
// Alice proposes A₂. Since there are 2 delegates now, it stays Active.
let mut alice_doc2 = alice_identity.doc().clone().edit();
- alice_doc2.visibility = Visibility::private([]);
+ *alice_doc2.visibility_mut() = Visibility::private([]);
let a2 = alice_identity
.update(
cob::Title::new("A₂").unwrap(),
@@ -1696,7 +1757,7 @@ mod test {
let mut bob_identity = Identity::load_mut(&*bob.repo, &bob.signer).unwrap();
let mut bob_doc = bob_identity.doc().clone().edit();
- bob_doc.visibility = Visibility::private([alice.signer.public_key().into()]);
+ *bob_doc.visibility_mut() = Visibility::private([alice.signer.public_key().into()]);
// We use a manual transaction to force B₁ to be a child of the Active A₂,
// rather than the Accepted A₁.
@@ -1768,7 +1829,7 @@ mod test {
// Bob proposes b1.
let mut bob_identity = Identity::load_mut(&*bob.repo, &bob.signer).unwrap();
let mut bob_doc = bob_identity.doc().clone().edit();
- bob_doc.visibility = Visibility::private([]);
+ *bob_doc.visibility_mut() = Visibility::private([]);
let b1 = cob::stable::with_advanced_timestamp(|| {
bob_identity
.update(
@@ -1782,7 +1843,7 @@ mod test {
// Eve proposes e1 (a competing sibling from a different delegate).
let mut eve_identity = Identity::load_mut(&*eve.repo, &eve.signer).unwrap();
let mut eve_doc = eve_identity.doc().clone().edit();
- eve_doc.visibility = Visibility::private([eve.signer.public_key().into()]);
+ *eve_doc.visibility_mut() = Visibility::private([eve.signer.public_key().into()]);
let e1 = cob::stable::with_advanced_timestamp(|| {
eve_identity
.update(
@@ -1821,7 +1882,7 @@ mod test {
alice_doc.delegate(bob.signer.public_key().into());
alice_doc.delegate(eve.signer.public_key().into());
- assert_eq!(alice_doc.delegates.len(), 3);
+ assert_eq!(alice_doc.delegates().len(), 3);
let a0 = alice_identity.root;
let a1 = alice_identity // Change description to change traversal order.
@@ -1833,7 +1894,7 @@ mod test {
.unwrap();
alice_doc.rescind(&eve.signer.public_key().into()).unwrap();
- assert_eq!(alice_doc.delegates.len(), 2);
+ assert_eq!(alice_doc.delegates().len(), 2);
let a2 = alice_identity
.update(
@@ -1853,7 +1914,7 @@ mod test {
let mut eve_identity = Identity::load_mut(&*eve.repo, &eve.signer).unwrap();
let mut eve_doc = eve_identity.doc().clone().edit();
- eve_doc.visibility = Visibility::private([eve.signer.public_key().into()]);
+ *eve_doc.visibility_mut() = Visibility::private([eve.signer.public_key().into()]);
let e1 = cob::stable::with_advanced_timestamp(|| {
eve_identity
.update(
@@ -1909,7 +1970,7 @@ mod test {
)
.unwrap();
- alice_doc.visibility = Visibility::private([]);
+ *alice_doc.visibility_mut() = Visibility::private([]);
let a2 = alice_identity
.update(
cob::Title::new("Change visibility").unwrap(),
@@ -1933,7 +1994,7 @@ mod test {
// Then she submits a new revision.
let mut eve_doc = eve_identity.doc().clone().edit();
- eve_doc.visibility = Visibility::private([eve.signer.public_key().into()]);
+ *eve_doc.visibility_mut() = Visibility::private([eve.signer.public_key().into()]);
let e2 = eve_identity
.update(
cob::Title::new("Change visibility").unwrap(),
@@ -2010,7 +2071,7 @@ mod test {
// a0
// Bob and Alice change the document visibility. Eve is not aware.
- bob_doc.visibility = Visibility::private([]);
+ *bob_doc.visibility_mut() = Visibility::private([]);
let b1 = bob_identity
.update(
cob::Title::new("Change visibility #1").unwrap(),
@@ -2025,7 +2086,7 @@ mod test {
// In the meantime, Eve does the same thing on her side.
let mut eve_identity = Identity::load_mut(&*eve.repo, &eve.signer).unwrap();
let mut eve_doc = eve_identity.doc().clone().edit();
- eve_doc.visibility = Visibility::private([]);
+ *eve_doc.visibility_mut() = Visibility::private([]);
let e1 = eve_identity
.update(
cob::Title::new("Change visibility #2").unwrap(),
@@ -2075,7 +2136,7 @@ mod test {
// Bob proposes B1 (child of A1, the current revision).
let mut bob_identity = Identity::load_mut(&*bob.repo, &bob.signer).unwrap();
let mut bob_doc = bob_identity.doc().clone().edit();
- bob_doc.visibility = Visibility::private([]);
+ *bob_doc.visibility_mut() = Visibility::private([]);
let b1 = bob_identity
.update(
cob::Title::new("B1").unwrap(),
@@ -2088,7 +2149,7 @@ mod test {
// We use a manual transaction to set B1 as the parent, since `update()`
// always uses `self.current` (= A1, because B1 hasn't been accepted).
let mut bob_doc2 = bob_doc.clone();
- bob_doc2.visibility = Visibility::private([bob.signer.public_key().into()]);
+ *bob_doc2.visibility_mut() = Visibility::private([bob.signer.public_key().into()]);
let b2 = bob_identity
.transaction("B2", |tx, repo| {
*tx = Transaction::new_revision(
@@ -2106,7 +2167,7 @@ mod test {
// Eve proposes E1 (child of A1, sibling of B1).
let mut eve_identity = Identity::load_mut(&*eve.repo, &eve.signer).unwrap();
let mut eve_doc = eve_identity.doc().clone().edit();
- eve_doc.visibility = Visibility::private([eve.signer.public_key().into()]);
+ *eve_doc.visibility_mut() = Visibility::private([eve.signer.public_key().into()]);
let e1 = eve_identity
.update(
cob::Title::new("E1").unwrap(),
@@ -2213,7 +2274,7 @@ mod test {
assert_eq!(alice_identity.revision(&a1).unwrap().state, State::Accepted);
let mut alice_doc2 = alice_identity.doc().clone().edit();
- alice_doc2.visibility = Visibility::private([]);
+ *alice_doc2.visibility_mut() = Visibility::private([]);
let a2 = alice_identity
.update(
cob::Title::new("A2").unwrap(),
@@ -2276,7 +2337,7 @@ mod test {
alice_identity.reload().unwrap();
let mut alice_doc2 = alice_identity.doc().clone().edit();
- alice_doc2.visibility = Visibility::private([]);
+ *alice_doc2.visibility_mut() = Visibility::private([]);
let a2 = alice_identity
.update(
cob::Title::new("A2").unwrap(),
@@ -2294,13 +2355,16 @@ mod test {
alice.repo.fetch(bob);
alice_identity.reload().unwrap();
- assert_eq!(
- alice_identity.revision(&a2).unwrap().state,
- State::Redacted(RedactedBy::Author)
- );
+ // Nb. `a2` is redacted by Alice concurrently with Bob's acceptance. The
+ // winner of this concurrent resolution depends on the operations' OIDs,
+ // which shift whenever the document format changes; here the acceptance
+ // wins (as the diagram below shows). The terminal-state protection this
+ // test targets is exercised by `a3` and `a4` further down, and the
+ // concurrent case itself by `concurrent_redact_and_accept_converge`.
+ assert_eq!(alice_identity.revision(&a2).unwrap().state, State::Accepted);
let mut alice_doc3 = alice_identity.doc().clone().edit();
- alice_doc3.visibility = Visibility::private([alice.signer.public_key().into()]);
+ *alice_doc3.visibility_mut() = Visibility::private([alice.signer.public_key().into()]);
let a3 = alice_identity
.update(
cob::Title::new("A3").unwrap(),
@@ -2321,7 +2385,7 @@ mod test {
assert_eq!(alice_identity.revision(&a3).unwrap().state, State::Accepted);
let mut alice_doc4 = alice_identity.doc().clone().edit();
- alice_doc4.visibility = Visibility::private([]);
+ *alice_doc4.visibility_mut() = Visibility::private([]);
let a4 = alice_identity
.update(
cob::Title::new("A4").unwrap(),
@@ -2344,9 +2408,9 @@ mod test {
// a4 (Propose "A4") 1/2 (Rejected by Bob) -> Redact attempt ignored
// |
// a3 (Propose "A3") 2/2 (Accepted by Alice, Bob) -> Redact attempt ignored
- // | \
- // | a2 (Propose "A2") 1/2 (Redacted by Alice concurrently with Bob's Accept)
- // | /
+ // |
+ // a2 (Propose "A2") 2/2 (Accepted by Bob, winning over Alice's concurrent Redact)
+ // |
// a1 (Add Bob) 2/2 (Accepted by Alice, Bob)
// |
// a0
@@ -2391,7 +2455,7 @@ mod test {
// A₂ is proposed and accepted, is acceptedy by Bob, thus reaches 2/2 votes,
// is accepted, and becomes the current revision, superseding A₁.
let mut alice_doc2 = alice_identity.doc().clone().edit();
- alice_doc2.visibility = Visibility::private([]);
+ *alice_doc2.visibility_mut() = Visibility::private([]);
let a2 = alice_identity
.update(
cob::Title::new("A₂").unwrap(),
@@ -2446,7 +2510,7 @@ mod test {
// Alice proposes A₂. With 2 delegates, needs 2/2 votes. Stays Active.
let mut alice_doc2 = alice_identity.doc().clone().edit();
- alice_doc2.visibility = Visibility::private([]);
+ *alice_doc2.visibility_mut() = Visibility::private([]);
let a2 = alice_identity
.update(
cob::Title::new("A₂").unwrap(),
@@ -2527,7 +2591,7 @@ mod test {
.unwrap();
let mut alice_doc2 = alice_identity.doc().clone().edit();
- alice_doc2.visibility = Visibility::private([]);
+ *alice_doc2.visibility_mut() = Visibility::private([]);
let a2 = alice_identity
.update(
cob::Title::new("A₂").unwrap(),
@@ -2595,8 +2659,8 @@ mod test {
// Make a change to the description and sign it.
let desc = prj.description().to_owned() + "!";
- let prj = prj.update(None, desc, None).unwrap();
- doc.payload
+ let prj = prj.update(None, desc).unwrap();
+ doc.payload_mut()
.insert(PayloadId::project().clone(), prj.clone().into());
identity
.update(
@@ -2608,7 +2672,6 @@ mod test {
// Add Bob as a delegate, and sign it.
doc.delegate(bob.public_key().into());
- doc.threshold = 2;
identity
.update(
cob::Title::new("Add bob").unwrap(),
@@ -2634,8 +2697,9 @@ mod test {
// Update description again with signatures by Eve and Bob.
let desc = prj.description().to_owned() + "?";
- let prj = prj.update(None, desc, None).unwrap();
- doc.payload.insert(PayloadId::project().clone(), prj.into());
+ let prj = prj.update(None, desc).unwrap();
+ doc.payload_mut()
+ .insert(PayloadId::project().clone(), prj.into());
let revision = bob_identity
.update(
cob::Title::new("Update description again").unwrap(),
@@ -2703,7 +2767,7 @@ mod test {
// Alice proposes A1 and B1
let mut doc_a1 = alice_identity.doc().clone().edit();
- doc_a1.visibility = Visibility::private([]);
+ *doc_a1.visibility_mut() = Visibility::private([]);
let a1 = alice_identity
.update(
cob::Title::new("A1").unwrap(),
@@ -2713,7 +2777,7 @@ mod test {
.unwrap();
let mut doc_b1 = doc_a1.clone();
- doc_b1.visibility = Visibility::private([bob.signer.public_key().into()]);
+ *doc_b1.visibility_mut() = Visibility::private([bob.signer.public_key().into()]);
let b1 = alice_identity
.transaction("B1", |tx, repo| {
*tx = Transaction::new_revision(
@@ -2822,7 +2886,7 @@ mod test {
// B1: Alice proposes a child of A2 (changes visibility).
// B1's parent is A2 (Active, not current), so we use a manual transaction.
let mut doc_b1 = doc_a2.clone();
- doc_b1.visibility = Visibility::private([]);
+ *doc_b1.visibility_mut() = Visibility::private([]);
let b1 = alice_identity
.transaction("B1", |tx, repo| {
*tx = Transaction::new_revision(
@@ -2930,7 +2994,7 @@ mod test {
// Note that at this point, A₁ is still the currently accepted revision,
// meaning Dave is a delegate according to the currently accepted revision.
let mut doc_a3 = doc_a2.clone();
- doc_a3.visibility = Visibility::private([]);
+ *doc_a3.visibility_mut() = Visibility::private([]);
let a3 = alice_identity
.transaction("A₃", |tx, repo| {
*tx = Transaction::new_revision(
@@ -2989,7 +3053,7 @@ mod test {
// Alice proposes a revision (child of current). Alice has an implicit accept.
let mut doc1 = alice_identity.doc().clone().edit();
- doc1.visibility = Visibility::private([]);
+ *doc1.visibility_mut() = Visibility::private([]);
let child = alice_identity
.update(
cob::Title::new("Child 1").unwrap(),
@@ -3035,7 +3099,7 @@ mod test {
bob.repo.fetch(alice);
let mut bob_identity = Identity::load_mut(&*bob.repo, &bob.signer).unwrap();
let mut bob_doc = bob_identity.doc().clone().edit();
- bob_doc.visibility = Visibility::private([]);
+ *bob_doc.visibility_mut() = Visibility::private([]);
let child_a = bob_identity
.update(
cob::Title::new("Child A").unwrap(),
@@ -3046,7 +3110,7 @@ mod test {
// Alice proposes child_b (sibling, gets implicit accept).
let mut alice_doc2 = alice_identity.doc().clone().edit();
- alice_doc2.visibility = Visibility::private([alice.signer.public_key().into()]);
+ *alice_doc2.visibility_mut() = Visibility::private([alice.signer.public_key().into()]);
let _child_b = alice_identity
.update(
cob::Title::new("Child B").unwrap(),
@@ -3064,8 +3128,7 @@ mod test {
let sig = alice_identity
.revision(&child_a)
.unwrap()
- .sign(&alice.signer)
- .unwrap();
+ .sign(&alice.signer);
alice_identity
.transaction("Accept child_a", |tx, _| tx.accept(child_a, sig))
.unwrap();
@@ -3105,7 +3168,7 @@ mod test {
// Alice proposes first child (gets implicit accept).
let mut doc1 = alice_identity.doc().clone().edit();
- doc1.visibility = Visibility::private([]);
+ *doc1.visibility_mut() = Visibility::private([]);
let child1 = alice_identity
.update(
cob::Title::new("Child 1").unwrap(),
@@ -3116,7 +3179,7 @@ mod test {
// Alice proposes second child via transaction (simulating old history).
let mut doc2 = doc1.clone();
- doc2.visibility = Visibility::private([alice.signer.public_key().into()]);
+ *doc2.visibility_mut() = Visibility::private([alice.signer.public_key().into()]);
let current = alice_identity.current;
let child2 = alice_identity
.transaction("Child 2", |tx, repo| {
@@ -3188,7 +3251,7 @@ mod test {
bob.repo.fetch(alice);
let mut bob_identity = Identity::load_mut(&*bob.repo, &bob.signer).unwrap();
let mut bob_doc = bob_identity.doc().clone().edit();
- bob_doc.visibility = Visibility::private([]);
+ *bob_doc.visibility_mut() = Visibility::private([]);
let child_a = bob_identity
.update(
cob::Title::new("Child A").unwrap(),
@@ -3201,7 +3264,7 @@ mod test {
eve.repo.fetch(alice);
let mut eve_identity = Identity::load_mut(&*eve.repo, &eve.signer).unwrap();
let mut eve_doc = eve_identity.doc().clone().edit();
- eve_doc.visibility = Visibility::private([eve.signer.public_key().into()]);
+ *eve_doc.visibility_mut() = Visibility::private([eve.signer.public_key().into()]);
let child_b = eve_identity
.update(
cob::Title::new("Child B").unwrap(),
@@ -3252,7 +3315,7 @@ mod test {
// Alice proposes first child.
let mut doc1 = alice_identity.doc().clone().edit();
- doc1.visibility = Visibility::private([]);
+ *doc1.visibility_mut() = Visibility::private([]);
let _child1 = alice_identity
.update(
cob::Title::new("Child 1").unwrap(),
@@ -3263,7 +3326,7 @@ mod test {
// Alice tries to propose a second child (sibling) — should fail.
let mut doc2 = alice_identity.doc().clone().edit();
- doc2.visibility = Visibility::private([alice.signer.public_key().into()]);
+ *doc2.visibility_mut() = Visibility::private([alice.signer.public_key().into()]);
let err = alice_identity
.update(
cob::Title::new("Child 2").unwrap(),
diff --git a/crates/radicle/src/cob/identity/test/property.rs b/crates/radicle/src/cob/identity/test/property.rs
index 1036845af3..1822c278cb 100644
--- a/crates/radicle/src/cob/identity/test/property.rs
+++ b/crates/radicle/src/cob/identity/test/property.rs
@@ -139,7 +139,6 @@ impl Harness {
let mut alice_doc = alice_identity.doc().clone().edit();
alice_doc.delegate(bob.signer.public_key().into());
alice_doc.delegate(eve.signer.public_key().into());
- alice_doc.threshold = 2;
let a1 = alice_identity
.update(
@@ -433,8 +432,9 @@ impl Harness {
fn update_description(&self, doc: &mut crate::prelude::RawDoc, msg: &str) {
let prj = doc.project().unwrap().unwrap();
let desc = format!("{} {}", msg, self.revisions.len());
- let prj = prj.update(None, desc, None).unwrap();
- doc.payload.insert(PayloadId::project().clone(), prj.into());
+ let prj = prj.update(None, desc).unwrap();
+ doc.payload_mut()
+ .insert(PayloadId::project().clone(), prj.into());
}
fn did_for(&self, actor: &Actor) -> Did {
@@ -449,14 +449,9 @@ impl Harness {
fn toggle_delegate(&self, delegate: &Actor, doc: &mut crate::prelude::RawDoc) {
let target_delegate: Did = self.did_for(delegate);
- if doc.delegates.contains(&target_delegate) {
- if doc.delegates.len() > 1 {
+ if doc.delegates().contains(&target_delegate) {
+ if doc.delegates().len() > 1 {
doc.rescind(&target_delegate).unwrap();
-
- // Ensure threshold never exceeds new delegate count
- if doc.threshold > doc.delegates.len() {
- doc.threshold = doc.delegates.len();
- }
}
} else {
doc.delegate(target_delegate);
diff --git a/crates/radicle/src/cob/patch.rs b/crates/radicle/src/cob/patch.rs
index 8016b63927..2c3eaf0c3a 100644
--- a/crates/radicle/src/cob/patch.rs
+++ b/crates/radicle/src/cob/patch.rs
@@ -3042,7 +3042,6 @@ mod test {
use crate::cob::common::CodeRange;
use crate::cob::test::SignerOpExt as _;
use crate::crypto::{Signer as _, SigningKey};
- use crate::git::BranchName;
use crate::identity;
use crate::identity::doc::RawDoc;
use crate::identity::project::{Project, ProjectName};
@@ -3138,12 +3137,12 @@ mod test {
let project = Project::new(
ProjectName::from_str("test_merge_target_resolution").unwrap(),
String::from(""),
- BranchName::from(git::fmt::RefString::try_from("master").unwrap()),
);
let doc = RawDoc::new(
project.unwrap(),
vec![alice.did()],
+ &git::fmt::refname!("master"),
1,
identity::Visibility::Public,
)
@@ -3196,22 +3195,22 @@ mod test {
let mut raw_doc = RawDoc::new(
r#gen::<Project>(1),
vec![alice.did()],
+ &git::fmt::refname!("master"),
1,
identity::Visibility::Public,
);
- let rules = serde_json::json!({
- "refs/heads/accepted": {
- "allow": "delegates",
- "threshold": 1
- },
- "refs/tags/v1.0": {
- "allow": "delegates",
- "threshold": 1
+ // Keep a valid default branch (`master`) while adding the custom rules
+ // this test exercises, so the document verifies.
+ let crefs = serde_json::json!({
+ "symbolic": { "HEAD": "refs/heads/master" },
+ "rules": {
+ "refs/heads/master": { "allow": "delegates", "threshold": 1 },
+ "refs/heads/accepted": { "allow": "delegates", "threshold": 1 },
+ "refs/tags/v1.0": { "allow": "delegates", "threshold": 1 }
}
});
- let crefs = serde_json::json!({ "rules": rules });
- raw_doc.payload.insert(
+ raw_doc.payload_mut().insert(
identity::doc::PayloadId::canonical_refs().clone(),
identity::doc::Payload::from(crefs),
);
@@ -3280,20 +3279,21 @@ mod test {
let mut raw_doc = RawDoc::new(
r#gen::<Project>(1),
vec![bob.did()],
+ &git::fmt::refname!("master"),
1,
identity::Visibility::Public,
);
- let rules = serde_json::json!({
- "refs/heads/accepted": {
- "allow": [alice.did()],
- "threshold": 1
- }
- });
+ // Keep a valid default branch (`master`) while adding the custom rule
+ // (governed by a non-delegate `allow` set) this test exercises.
let crefs = serde_json::json!({
- "rules": rules
+ "symbolic": { "HEAD": "refs/heads/master" },
+ "rules": {
+ "refs/heads/master": { "allow": "delegates", "threshold": 1 },
+ "refs/heads/accepted": { "allow": [alice.did()], "threshold": 1 }
+ }
});
- raw_doc.payload.insert(
+ raw_doc.payload_mut().insert(
identity::doc::PayloadId::canonical_refs().clone(),
identity::doc::Payload::from(crefs),
);
@@ -3339,20 +3339,21 @@ mod test {
let mut raw_doc = RawDoc::new(
r#gen::<Project>(1),
vec![alice.did()],
+ &git::fmt::refname!("master"),
1,
identity::Visibility::Public,
);
- let rules = serde_json::json!({
- "refs/heads/accepted": {
- "allow": [alice.did()],
- "threshold": 1
- }
- });
+ // Keep a valid default branch (`master`) while adding the custom rule
+ // (governed by a non-delegate `allow` set) this test exercises.
let crefs = serde_json::json!({
- "rules": rules
+ "symbolic": { "HEAD": "refs/heads/master" },
+ "rules": {
+ "refs/heads/master": { "allow": "delegates", "threshold": 1 },
+ "refs/heads/accepted": { "allow": [alice.did()], "threshold": 1 }
+ }
});
- raw_doc.payload.insert(
+ raw_doc.payload_mut().insert(
identity::doc::PayloadId::canonical_refs().clone(),
identity::doc::Payload::from(crefs),
);
@@ -3393,7 +3394,7 @@ mod test {
///
/// The document has four delegates and a threshold of three, while the
/// rule matching the target branch allows only Alice and Bob, with a
- /// threshold of two. The two quorums are distinguishable.
+ /// threshold of two. The two quorums are therefore distinguishable.
fn merge_quorum_fixture(
signers: &[&SigningKey],
commit: git::Oid,
@@ -3406,18 +3407,26 @@ mod test {
let mut raw_doc = RawDoc::new(
r#gen::<Project>(1),
vec![alice.did(), bob.did(), eve.did(), dave.did()],
+ &git::fmt::refname!("master"),
3,
identity::Visibility::Public,
);
+ // Keep a valid default branch (`master`) alongside the rule this test
+ // exercises, so the document verifies.
let crefs = serde_json::json!({
+ "symbolic": { "HEAD": "refs/heads/master" },
"rules": {
+ "refs/heads/master": {
+ "allow": "delegates",
+ "threshold": 3
+ },
"refs/heads/accepted": {
"allow": [alice.did(), bob.did()],
"threshold": 2
}
}
});
- raw_doc.payload.insert(
+ raw_doc.payload_mut().insert(
identity::doc::PayloadId::canonical_refs().clone(),
identity::doc::Payload::from(crefs),
);
@@ -3479,7 +3488,7 @@ mod test {
}
#[test]
- fn test_patch_merge_quorum_uses_rule_threshold() {
+ fn patch_merge_quorum_uses_rule_threshold() {
let commit = git::Oid::from_str("518d5069f94c03427f694bb494ac1cd7d1339380").unwrap();
let alice = SigningKey::mock(14);
let bob = SigningKey::mock(23);
@@ -3506,7 +3515,7 @@ mod test {
}
#[test]
- fn test_patch_merge_quorum_ignores_disallowed_merges() {
+ fn patch_merge_quorum_ignores_disallowed_merges() {
let commit = git::Oid::from_str("518d5069f94c03427f694bb494ac1cd7d1339380").unwrap();
let alice = SigningKey::mock(14);
let bob = SigningKey::mock(23);
@@ -3530,22 +3539,24 @@ mod test {
}
#[test]
- fn test_patch_merge_quorum_without_matching_rule() {
+ fn patch_merge_quorum_without_matching_rule() {
let base = git::Oid::from_str("cb18e95ada2bb38aadd8e6cef0963ce37a87add3").unwrap();
let commit = git::Oid::from_str("518d5069f94c03427f694bb494ac1cd7d1339380").unwrap();
let alice = SigningKey::mock(14);
- // The only rule is the one synthesized for the default branch, so
- // nothing matches `refs/heads/staging`.
- let project = Project::new(
- ProjectName::from_str("unruled").unwrap(),
- String::new(),
- BranchName::from(git::fmt::RefString::try_from("master").unwrap()),
+ // The only rule is the one written for the default branch, so nothing
+ // matches `refs/heads/staging`.
+ let project =
+ Project::new(ProjectName::from_str("unruled").unwrap(), String::new()).unwrap();
+ let doc = RawDoc::new(
+ project,
+ vec![alice.did()],
+ &git::fmt::refname!("master"),
+ 1,
+ identity::Visibility::Public,
)
+ .verified()
.unwrap();
- let doc = RawDoc::new(project, vec![alice.did()], 1, identity::Visibility::Public)
- .verified()
- .unwrap();
let branch = git::fmt::qualified!("refs/heads/staging");
let mut repo = MockRepository::new(r#gen::<RepoId>(1), doc.clone());
@@ -3587,26 +3598,23 @@ mod test {
/// The default branch keeps the quorum it had before rules were consulted.
///
- /// Without a `xyz.radicle.crefs` payload, the rule for the default branch
- /// is synthesized as `delegates` at the document threshold, so the tally
- /// must behave exactly as it did when it used the document directly.
+ /// `RawDoc::new` writes the rule for the default branch as `delegates` at
+ /// the given threshold, so the tally must behave exactly as it did when it
+ /// used the document threshold directly.
#[test]
- fn test_patch_merge_quorum_of_default_branch() {
+ fn patch_merge_quorum_of_default_branch() {
let base = git::Oid::from_str("cb18e95ada2bb38aadd8e6cef0963ce37a87add3").unwrap();
let commit = git::Oid::from_str("518d5069f94c03427f694bb494ac1cd7d1339380").unwrap();
let alice = SigningKey::mock(14);
let bob = SigningKey::mock(23);
let eve = SigningKey::mock(31);
- let project = Project::new(
- ProjectName::from_str("unruled").unwrap(),
- String::new(),
- BranchName::from(git::fmt::RefString::try_from("master").unwrap()),
- )
- .unwrap();
+ let project =
+ Project::new(ProjectName::from_str("unruled").unwrap(), String::new()).unwrap();
let doc = RawDoc::new(
project,
vec![alice.did(), bob.did(), eve.did()],
+ &git::fmt::refname!("master"),
2,
identity::Visibility::Public,
)
@@ -3645,14 +3653,14 @@ mod test {
apply_merge(&mut patch, &doc, &repo, revision, commit, &alice);
assert!(
!patch.is_merged(),
- "one of three delegates is below the document threshold"
+ "one of three delegates is below the rule's threshold"
);
apply_merge(&mut patch, &doc, &repo, revision, commit, &bob);
assert_eq!(
*patch.state(),
State::Merged { revision, commit },
- "the synthesized rule resolves to the document threshold of two"
+ "the default branch rule resolves to its threshold of two"
);
}
@@ -3901,6 +3909,7 @@ mod test {
let doc = RawDoc::new(
r#gen::<Project>(1),
vec![alice.did()],
+ &git::fmt::refname!("master"),
1,
identity::Visibility::Public,
)
diff --git a/crates/radicle/src/identity/crefs.rs b/crates/radicle/src/identity/crefs.rs
index daced4cf66..c79ebca8d2 100644
--- a/crates/radicle/src/identity/crefs.rs
+++ b/crates/radicle/src/identity/crefs.rs
@@ -33,7 +33,7 @@ pub enum ValidationError {
/// Configuration for canonical references and their rules.
///
/// [`RawCanonicalRefs`] are verified into [`CanonicalRefs`].
-#[derive(Default, Debug, Clone, PartialEq, Eq, Deserialize)]
+#[derive(Default, Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct RawCanonicalRefs {
rules: RawRules,
diff --git a/crates/radicle/src/identity/doc.rs b/crates/radicle/src/identity/doc.rs
index 756a7a36e5..b9b3f2e04e 100644
--- a/crates/radicle/src/identity/doc.rs
+++ b/crates/radicle/src/identity/doc.rs
@@ -1,9 +1,15 @@
+pub mod migrate;
+pub mod raw;
pub mod update;
+pub mod v1;
+pub mod v2;
+
+pub use raw::RawDoc;
use std::collections::{BTreeMap, BTreeSet};
use std::fmt;
use std::num::{NonZeroU32, NonZeroUsize};
-use std::ops::{Deref, Not};
+use std::ops::Deref;
use std::path::Path;
use std::str::FromStr;
use std::sync::LazyLock;
@@ -19,8 +25,6 @@ use crate::cob::identity;
use crate::crypto;
use crate::crypto::Signature;
use crate::git;
-use crate::git::canonical::rules::{self, ResolvedDelegates};
-use crate::git::fmt::Qualified;
use crate::git::fmt::RefString;
use crate::git::raw::ErrorExt as _;
use crate::identity::crefs;
@@ -41,8 +45,17 @@ pub const MAX_STRING_LENGTH: usize = 255;
/// Maximum number of a delegates in the identity document.
pub const MAX_DELEGATES: usize = 255;
/// The current, most recent version of the identity document.
+///
+/// Version 2 replaced the top-level `threshold` and the project's
+/// `defaultBranch` with the `xyz.radicle.crefs` payload (see [`canonical`]),
+/// which governs the default branch and its write quorum. Version 1 documents
+/// stay readable: they are migrated in memory when they are loaded (see
+/// [`migrate`]), and `rad id migrate` proposes the migration as a revision that
+/// the delegates vote on.
+///
+/// [`canonical`]: crate::git::canonical
// SAFETY: identity version should never be 0, so we can use `unsafe` here
-pub const IDENTITY_VERSION: Version = Version(NonZeroU32::new(1).unwrap());
+pub const IDENTITY_VERSION: Version = Version(NonZeroU32::new(2).unwrap());
#[derive(Error, Debug)]
pub enum DocError {
@@ -54,8 +67,14 @@ pub enum DocError {
Threshold(#[from] ThresholdError),
#[error("git: {0}")]
Git(#[from] git::raw::Error),
+ #[error("could not migrate identity document: {0}")]
+ Migrate(#[from] migrate::Error),
+ #[error(transparent)]
+ DefaultBranchDisallowed(#[from] v2::DefaultBranchDisallowed),
#[error("missing identity document")]
Missing,
+ #[error("invalid default branch: {0}")]
+ DefaultBranch(#[from] DefaultBranchError),
}
#[derive(Debug, Error)]
@@ -78,14 +97,6 @@ impl DocError {
#[derive(Debug, Error)]
pub enum DefaultBranchError {
- #[error(
- "could not find default branch in any of the payloads `xyz.radicle.project` ({project}) or `xyz.radicle.crefs` ({crefs})"
- )]
- Payload {
- project: PayloadError,
- crefs: PayloadError,
- },
-
#[error("no symbolic reference with name `HEAD` is defined")]
MissingHead,
@@ -127,16 +138,24 @@ impl Version {
pub fn is_valid_version(v: &u32) -> bool {
0 < *v && *v <= IDENTITY_VERSION.into()
}
+}
- /// Helper for skipping the serialization of the version if `version <= 1`.
- ///
- /// Note that we shouldn't allow `version: 0`, but there is no harm in
- /// skipping it anyway.
- fn skip_serializing(&self) -> bool {
- u32::from(*self) <= 1
+impl FromStr for Version {
+ type Err = ParseVersionError;
+
+ fn from_str(s: &str) -> Result<Self, Self::Err> {
+ Version::new(s.parse::<u32>()?).map_err(ParseVersionError::Version)
}
}
+#[derive(Debug, Error)]
+pub enum ParseVersionError {
+ #[error("`{0}` is not a version number")]
+ Number(#[from] std::num::ParseIntError),
+ #[error(transparent)]
+ Version(VersionError),
+}
+
impl From<Version> for NonZeroU32 {
fn from(Version(n): Version) -> Self {
n
@@ -312,12 +331,18 @@ pub trait GetPayload {
}
impl GetPayload for Doc {
+ fn get_payload(&self, id: &PayloadId) -> Option<&Payload> {
+ self.view.payload.get(id)
+ }
+}
+
+impl GetPayload for v1::Doc {
fn get_payload(&self, id: &PayloadId) -> Option<&Payload> {
self.payload.get(id)
}
}
-impl GetPayload for RawDoc {
+impl GetPayload for v2::Doc {
fn get_payload(&self, id: &PayloadId) -> Option<&Payload> {
self.payload.get(id)
}
@@ -403,122 +428,6 @@ impl Visibility {
}
}
-/// `RawDoc` is similar to the [`Doc`] type, however, it can be edited and may
-/// not be valid.
-///
-/// It is expected that any changes to a [`Doc`] are made via [`RawDoc`], and
-/// then verified by using [`RawDoc::verified`].
-///
-/// Note that `RawDoc` only implements [`Deserialize`]. This prevents us from
-/// serializing an unverified document, while also making sure that any document
-/// that is deserialized is verified.
-#[derive(Debug, Clone, PartialEq, Eq, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct RawDoc {
- /// Version of the identity document.
- #[serde(default = "missing_version")]
- version: Version,
- /// The payload section.
- pub payload: BTreeMap<PayloadId, Payload>,
- /// The delegates section.
- pub delegates: Vec<Did>,
- /// The signature threshold.
- pub threshold: usize,
- /// Repository visibility.
- #[serde(default)]
- pub visibility: Visibility,
-}
-
-impl TryFrom<RawDoc> for Doc {
- type Error = DocError;
-
- fn try_from(doc: RawDoc) -> Result<Self, Self::Error> {
- doc.verified()
- }
-}
-
-impl RawDoc {
- /// Construct a new [`RawDoc`] with an initial [`RawDoc::payload`]
- /// containing the provided [`Project`], and the given `delegates`,
- /// `threshold`, and `visibility`.
- pub fn new(
- project: Project,
- delegates: Vec<Did>,
- threshold: usize,
- visibility: Visibility,
- ) -> Self {
- let project =
- serde_json::to_value(project).expect("Doc::initial: payload must be serializable");
-
- Self {
- version: IDENTITY_VERSION,
- payload: BTreeMap::from_iter([(PayloadId::project().clone(), Payload::from(project))]),
- delegates,
- threshold,
- visibility,
- }
- }
-
- /// Get the version of the document.
- pub fn version(&self) -> &Version {
- &self.version
- }
-
- /// Check if the given `did` is in the set of [`RawDoc::delegates`].
- pub fn is_delegate(&self, did: &Did) -> bool {
- self.delegates.contains(did)
- }
-
- /// Add a new delegate to the document.
- ///
- /// Note that if this `Did` is a duplicate, then the resulting set will only
- /// show it once.
- pub fn delegate(&mut self, did: Did) {
- self.delegates.push(did)
- }
-
- /// Remove the `did` from the set of delegates. Returns `true` if it was
- /// removed.
- pub fn rescind(&mut self, did: &Did) -> Result<bool, DocError> {
- let (matches, delegates) = self.delegates.iter().partition(|d| *d == did);
- self.delegates = delegates;
- Ok(matches.is_empty().not())
- }
-
- /// Construct the `RawDoc` from the set of `bytes` that are expected to be
- /// in JSON format.
- pub fn from_json(bytes: &[u8]) -> Result<Self, DocError> {
- serde_json::from_slice(bytes).map_err(DocError::from)
- }
-
- /// Verify the `RawDoc`'s values, converting it into a valid [`Doc`].
- ///
- /// The verifications are as follows:
- ///
- /// - [`RawDoc::delegates`]: any duplicates are removed, and for the
- /// remaining set ensure that it is non-empty and does not exceed a
- /// length of [`MAX_DELEGATES`].
- /// - [`RawDoc::threshold`]: ensure that it is in the range `[1, delegates.len()]`.
- pub fn verified(self) -> Result<Doc, DocError> {
- let RawDoc {
- version,
- payload,
- delegates,
- threshold,
- visibility,
- } = self;
- let delegates = Delegates::new(delegates)?;
- let threshold = Threshold::new(threshold, &delegates)?;
- Ok(Doc {
- version,
- payload,
- delegates,
- threshold,
- visibility,
- })
- }
-}
-
/// A valid set of delegates for the identity [`Doc`].
///
/// It can only be constructed via [`Delegates::new`].
@@ -687,36 +596,91 @@ impl Threshold {
/// [`RawDoc`] and use [`RawDoc::verified`] to construct the `Doc`.
/// 4. [`Doc::from_blob`]: construct a `Doc` from a Git blob by deserializing
/// its contents.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
+///
+/// The document is held twice, in two roles that must not be confused:
+///
+/// - The **stored** form, [`Doc::raw`], decides the document's identity. The
+/// [`RepoId`] is the Git blob id of the canonically-encoded root document,
+/// and every revision signature covers a blob id. It is also what a
+/// delegate edits. Serializing a `Doc` writes this form, so serializing a
+/// version-1 document yields version-1 JSON.
+/// - The **migrated** form, the view, is what every reader consumes. Holding
+/// it materialized keeps version conditionals out of reader code.
+#[derive(Debug, Clone, Eq, Deserialize)]
#[serde(try_from = "RawDoc")]
pub struct Doc {
- #[serde(skip_serializing_if = "Version::skip_serializing")]
- version: Version,
- payload: BTreeMap<PayloadId, Payload>,
+ /// The document as stored. Decides identity, serialization and signing.
+ raw: RawDoc,
+ /// The document migrated to [`IDENTITY_VERSION`]. Every read goes through
+ /// this.
+ view: v2::Doc,
+ /// The delegates, validated. They are the same in `raw` and in `view`,
+ /// since migration never touches them.
delegates: Delegates,
- threshold: Threshold,
- #[serde(default, skip_serializing_if = "Visibility::is_public")]
- visibility: Visibility,
+}
+
+impl PartialEq for Doc {
+ /// Two documents are equal when they are stored identically.
+ ///
+ /// The view is a function of the stored form, so comparing the stored form
+ /// alone loses nothing. It also states the intent: two documents that
+ /// migrate to the same view but differ on disk are different documents,
+ /// which is what lets a migration revision differ from its parent and so
+ /// pass the `DocUnchanged` check.
+ fn eq(&self, other: &Self) -> bool {
+ self.raw == other.raw
+ }
+}
+
+impl Serialize for Doc {
+ fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+ self.raw.serialize(serializer)
+ }
}
impl Doc {
- /// Construct the initial [`Doc`] for an identity.
+ /// Construct the initial [`Doc`] for an identity at [`IDENTITY_VERSION`].
///
- /// It will begin with the provided `project` in the [`Doc::payload`], the
- /// `delegate` as the sole delegate, a threshold of 1, and the given
- /// `visibility`.
- pub fn initial(project: Project, delegate: Did, visibility: Visibility) -> Self {
- let project =
- serde_json::to_value(project).expect("Doc::initial: payload must be serializable");
-
- Self {
- version: IDENTITY_VERSION,
- payload: BTreeMap::from_iter([(PayloadId::project().clone(), Payload::from(project))]),
- delegates: Delegates(NonEmpty::new(delegate)),
- threshold: Threshold(NonZeroUsize::MIN),
+ /// It will begin with the provided `project` in the [`Doc::payload`], a
+ /// `xyz.radicle.crefs` payload governing `default_branch` with a threshold
+ /// of 1, the `delegate` as the sole delegate, and the given `visibility`.
+ pub fn initial(
+ project: Project,
+ delegate: Did,
+ default_branch: &RefString,
+ visibility: Visibility,
+ ) -> Self {
+ Self::initial_at(
+ IDENTITY_VERSION,
+ project,
+ delegate,
+ default_branch,
visibility,
- }
+ )
+ .expect("Doc::initial: initial document must be valid")
+ }
+
+ /// Like [`Doc::initial`], but at the given document `version`.
+ ///
+ /// Initializing at an older version is deliberate: the repository stays
+ /// readable to releases that predate [`IDENTITY_VERSION`], until
+ /// `rad id migrate` is run.
+ pub fn initial_at(
+ version: Version,
+ project: Project,
+ delegate: Did,
+ default_branch: &RefString,
+ visibility: Visibility,
+ ) -> Result<Self, DocError> {
+ RawDoc::new_at(
+ version,
+ project,
+ vec![delegate],
+ default_branch,
+ 1,
+ visibility,
+ )
+ .verified()
}
/// Construct a [`Doc`] contained in the provided Git blob.
@@ -726,21 +690,29 @@ impl Doc {
/// Convert the [`Doc`] into a [`RawDoc`] for changing the field values and
/// re-verifying.
+ ///
+ /// The edited document keeps its stored version, so an ordinary edit of a
+ /// version-1 document proposes another version-1 document.
pub fn edit(self) -> RawDoc {
- let Doc {
- version,
- payload,
- delegates,
- threshold,
- visibility,
- } = self;
- RawDoc {
- version,
- payload,
- delegates: delegates.into(),
- threshold: threshold.into(),
- visibility,
- }
+ self.raw
+ }
+
+ /// The document as stored.
+ ///
+ /// Use this where the stored form is what matters — showing a delegate what
+ /// they are about to edit, or diffing two revisions — rather than the
+ /// migrated view that [`Doc::payload`] and friends return.
+ pub fn raw(&self) -> &RawDoc {
+ &self.raw
+ }
+
+ /// The document migrated to [`IDENTITY_VERSION`], which is what
+ /// `rad id migrate` proposes as a new revision.
+ ///
+ /// For a document that is already at [`IDENTITY_VERSION`] this is the
+ /// document itself, so proposing it would be a no-op.
+ pub fn migrated(&self) -> Result<Doc, DocError> {
+ RawDoc::V2(self.view.clone()).verified()
}
/// Using the current state of the `Doc`, perform any edits on the `RawDoc`
@@ -754,14 +726,14 @@ impl Doc {
raw.verified()
}
- /// Get the version of the document.
- pub fn version(&self) -> &Version {
- &self.version
+ /// Get the version of the document, as stored.
+ pub fn version(&self) -> Version {
+ self.raw.version()
}
/// Return the associated payloads for this [`Doc`].
pub fn payload(&self) -> &BTreeMap<PayloadId, Payload> {
- &self.payload
+ &self.view.payload
}
/// Gets the qualified reference name of the default branch,
@@ -776,176 +748,49 @@ impl Doc {
Ok(qualified.to_owned())
}
- pub fn default_branch_name(&self) -> Result<git::fmt::RefString, DefaultBranchError> {
+ /// Gets the short name of the default branch, i.e. the target of the `HEAD`
+ /// symbolic reference with the `refs/heads/` prefix removed.
+ pub fn default_branch_name(&self) -> Result<RefString, DefaultBranchError> {
let qualified = self.default_branch()?;
- Ok(qualified
- .strip_prefix(RefString::try_from("refs/heads").expect("valid refstring"))
- .expect("valid branch")
- .to_ref_string())
+ let name = qualified
+ .as_str()
+ .strip_prefix("refs/heads/")
+ .and_then(|name| RefString::try_from(name).ok())
+ .ok_or(DefaultBranchError::MissingHead)?;
+ Ok(name)
}
/// Construct the canonical references for this document.
///
- /// Uses the `xyz.radicle.crefs` payload (if present) and the
- /// `xyz.radicle.project` payload to determine the `HEAD` symbolic
- /// reference and its associated rule.
- ///
- /// There are three cases, depending on whether `HEAD` is already
- /// defined in the crefs payload and whether a project payload exists:
- ///
- /// 1. **Explicit HEAD + project**: `HEAD` must agree with
- /// [`Project::default_branch_qualified`], and the matching rule must
- /// use `delegates` with the document's threshold.
- /// 2. **Explicit HEAD, no project**: The matching rule must use
- /// `delegates` with the document's threshold.
- /// 3. **No HEAD**: A rule and `HEAD` symbolic reference are synthesized
- /// from the project payload (which must exist).
- ///
- /// In all cases the result must pass [`RawCanonicalRefs::try_into_canonical_refs`]
- /// validation. If a rule for `HEAD`'s target is missing, it will be
- /// caught as a dangling reference there.
+ /// The canonical references, including the default branch and its `HEAD`
+ /// symbolic reference, are governed entirely by the `xyz.radicle.crefs`
+ /// payload. The payload must be present and must pass
+ /// [`RawCanonicalRefs::try_into_canonical_refs`] validation.
///
/// [`RawCanonicalRefs`]: super::crefs::RawCanonicalRefs
pub fn canonical_refs(&self) -> Result<CanonicalRefs, CanonicalRefsError> {
- let resolve = &mut || self.delegates.clone();
- let crefs = self
+ let raw_crefs = self
.raw_canonical_refs()
- .transpose()
- .map_err(CanonicalRefsError::Payload)?
- .map(|crefs| crefs.try_into_canonical_refs(resolve))
- .transpose()
- .map_err(CanonicalRefsError::CanonicalRefs)?
- .unwrap_or_default();
-
- // Determine where `HEAD` comes from. The `resolve_head()` result
- // borrows `raw_crefs`, so clone to allow mutation in the synthesis
- // path.
- let head: Option<Qualified<'static>> = crefs.symbolic().resolve_head().cloned();
-
- match (head, self.project()) {
- (Some(ref default_branch), Some(Ok(project))) => {
- let project_branch = project.default_branch_qualified();
- if project_branch != *default_branch {
- return Err(CanonicalRefsError::DefaultBranchRuleError(
- DefaultBranchRuleError::HeadMismatch {
- cref: default_branch.to_ref_string(),
- project: project_branch.to_ref_string(),
- },
- ));
- }
- self.validate_head_rule(&crefs, default_branch)?;
- }
- (Some(ref default_branch), None) => {
- self.validate_head_rule(&crefs, default_branch)?;
- }
- (None, Some(Ok(project))) => {
- return Ok(self
- .synthesize_head(crefs, &project)
- .try_into_canonical_refs(resolve)?);
- }
- (None, None) => {
- return Err(CanonicalRefsError::SynthesisPayloadMissing);
- }
- (_, Some(Err(err))) => {
- return Err(CanonicalRefsError::ProjectPayload(err));
- }
- }
-
- Ok(crefs)
- }
-
- /// Validate that the rule matching `HEAD`'s target branch uses
- /// `delegates` and the document's threshold.
- ///
- /// If no rule matches the target, `HEAD` will dangle — this is caught
- /// later by [`RawCanonicalRefs::try_into_canonical_refs`] validation.
- fn validate_head_rule(
- &self,
- crefs: &CanonicalRefs,
- default_branch: &Qualified<'static>,
- ) -> Result<(), CanonicalRefsError> {
- let Some((pattern, rule)) = crefs.rules().matches(default_branch).next() else {
- return Ok(());
- };
-
- let _allowed = rule.allowed();
- match rule.allowed() {
- ResolvedDelegates::Delegates(_) => {
- // This is the expected case, so we continue to validate the threshold.
- }
- ResolvedDelegates::Set(actual) => {
- return Err(CanonicalRefsError::DefaultBranchRuleError(
- DefaultBranchRuleError::Allowed {
- pattern: pattern.to_string(),
- actual: actual
- .iter()
- .map(|s| s.to_string())
- .collect::<Vec<_>>()
- .join(", "),
- },
- ));
- }
- }
- let actual = (*rule.threshold()).into();
- let expected = self.threshold();
- if actual != expected {
- return Err(CanonicalRefsError::DefaultBranchRuleError(
- DefaultBranchRuleError::Threshold {
- pattern: pattern.to_string(),
- actual,
- expected,
- },
- ));
- }
- Ok(())
- }
-
- /// Synthesize a `HEAD` symbolic reference and a default branch rule
- /// from the project payload.
- fn synthesize_head(&self, crefs: CanonicalRefs, project: &Project) -> RawCanonicalRefs {
- let default_branch = project.default_branch_qualified();
-
- let add_rule = crefs.rules().matches(&default_branch).next().is_none();
-
- let mut raw_crefs = RawCanonicalRefs::from(crefs);
-
- if add_rule {
- raw_crefs.raw_rules_mut().insert(
- git::fmt::refspec::QualifiedPattern::from(default_branch.to_owned()),
- rules::Rule::new(rules::Allowed::Delegates, self.threshold()),
- );
- }
-
- raw_crefs
- .symbolic_mut()
- .insert(git::fmt::refname!("HEAD"), default_branch.to_ref_string());
+ .ok_or(CanonicalRefsError::Missing)?
+ .map_err(CanonicalRefsError::Payload)?;
+ let resolve = &mut || self.delegates.clone();
- raw_crefs
+ Ok(raw_crefs.try_into_canonical_refs(resolve)?)
}
/// Return the associated [`Visibility`] of this document.
pub fn visibility(&self) -> &Visibility {
- &self.visibility
+ &self.view.visibility
}
/// Check whether the visibility of the document is public.
pub fn is_public(&self) -> bool {
- self.visibility.is_public()
+ self.visibility().is_public()
}
/// Check whether the visibility of the document is private.
pub fn is_private(&self) -> bool {
- self.visibility.is_private()
- }
-
- /// Return the associated threshold of this document.
- pub fn threshold(&self) -> usize {
- self.threshold.into()
- }
-
- /// Return the associated threshold of this document in its non-zero format.
- pub fn threshold_nonzero(&self) -> &NonZeroUsize {
- &self.threshold.0
+ self.visibility().is_private()
}
/// Return the associated delegates of this document.
@@ -961,7 +806,7 @@ impl Doc {
/// Check whether this document and the associated repository is visible to
/// the given peer.
pub fn is_visible_to(&self, did: &Did) -> bool {
- match &self.visibility {
+ match self.visibility() {
Visibility::Public => true,
Visibility::Private { allow } => allow.contains(did) || self.is_delegate(did),
}
@@ -1082,36 +927,8 @@ pub enum CanonicalRefsError {
#[error(transparent)]
CanonicalRefs(#[from] crefs::ValidationError),
- #[error("could not load `xyz.radicle.project` to get default branch name: {0}")]
- ProjectPayload(PayloadError),
-
- #[error("payload `xyz.radicle.project` is missing")]
- SynthesisPayloadMissing,
-
- #[error(transparent)]
- DefaultBranchRuleError(#[from] DefaultBranchRuleError),
-}
-
-#[derive(Debug, Error)]
-pub enum DefaultBranchRuleError {
- #[error(
- "rule for pattern '{pattern}' which matches the target of symbolic reference 'HEAD' (possibly synthesized from payload 'xyz.radicle.project') must use 'allow' value of \"delegates\" but uses {actual}"
- )]
- Allowed { pattern: String, actual: String },
-
- #[error(
- "rule for pattern '{pattern}' which matches the target of symbolic reference 'HEAD' (possibly synthesized from payload 'xyz.radicle.project') must use a threshold of {expected} as required by the identity document but uses {actual}"
- )]
- Threshold {
- pattern: String,
- actual: usize,
- expected: usize,
- },
-
- #[error(
- "target symbolic reference 'HEAD' ('{cref}') does not match `defaultBranch` from payload `xyz.radicle.project` ('{project}')"
- )]
- HeadMismatch { cref: RefString, project: RefString },
+ #[error("identity document is missing the `xyz.radicle.crefs` payload")]
+ Missing,
}
#[cfg(test)]
@@ -1136,7 +953,13 @@ mod test {
fn duplicate_dids() {
let delegate = SigningKey::mock(usize::MAX);
let did = Did::from(delegate.public_key());
- let mut doc = RawDoc::new(r#gen::<Project>(1), vec![did], 1, Visibility::Public);
+ let mut doc = RawDoc::new(
+ r#gen::<Project>(1),
+ vec![did],
+ &git::fmt::refname!("master"),
+ 1,
+ Visibility::Public,
+ );
doc.delegate(did);
let doc = doc.verified().unwrap();
assert!(doc.delegates().len() == 1, "Duplicate DID was not removed");
@@ -1154,16 +977,214 @@ mod test {
let doc = RawDoc::new(
r#gen::<Project>(1),
delegates[0..MAX_DELEGATES].into(),
+ &git::fmt::refname!("master"),
1,
Visibility::Public,
);
assert_matches!(doc.verified(), Ok(_));
// A document that exceeds max delegates should fail
- let doc = RawDoc::new(r#gen::<Project>(1), delegates, 1, Visibility::Public);
+ let doc = RawDoc::new(
+ r#gen::<Project>(1),
+ delegates,
+ &git::fmt::refname!("master"),
+ 1,
+ Visibility::Public,
+ );
assert_matches!(doc.verified(), Err(DocError::Delegates(DelegatesError(_))));
}
+ // The write-quorum invariant (`1 <= threshold <= |allowed|`) is enforced by
+ // `verified()` itself, so it holds for every `Doc` — including revisions
+ // adopted over the network via `Doc::from_blob` — not only for documents
+ // that pass the CLI's `update::verify`.
+ #[test]
+ fn verified_rejects_threshold_exceeding_delegates() {
+ // A single-delegate document whose default-branch rule demands a
+ // threshold of 2 makes the branch immutable and must be rejected.
+ let did = r#gen::<Did>(1);
+ let doc = RawDoc::new(
+ r#gen::<Project>(1),
+ vec![did],
+ &git::fmt::refname!("master"),
+ 2,
+ Visibility::Public,
+ );
+ assert_matches!(doc.verified(), Err(DocError::DefaultBranch(_)));
+ }
+
+ #[test]
+ fn verified_rejects_missing_crefs() {
+ // Without the `xyz.radicle.crefs` payload there is no default branch or
+ // write quorum, so the document must not verify.
+ let mut doc = RawDoc::new(
+ r#gen::<Project>(1),
+ vec![r#gen::<Did>(1)],
+ &git::fmt::refname!("master"),
+ 1,
+ Visibility::Public,
+ );
+ doc.payload_mut().remove(PayloadId::canonical_refs());
+ assert_matches!(doc.verified(), Err(DocError::DefaultBranch(_)));
+ }
+
+ /// A version-1 document as a released client wrote it.
+ fn v1_golden() -> serde_json::Value {
+ json!({
+ "payload": {
+ "xyz.radicle.project": {
+ "defaultBranch": "master",
+ "description": "Radicle Heartwood Protocol & Stack",
+ "name": "heartwood"
+ }
+ },
+ "delegates": ["did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM"],
+ "threshold": 1
+ })
+ }
+
+ #[test]
+ fn migrated_view_governs_default_branch() {
+ // The migration moves the default branch and its quorum into the crefs
+ // payload, and drops `defaultBranch` from the project payload.
+ let doc = serde_json::from_value::<Doc>(v1_golden()).unwrap();
+ let crefs = doc.canonical_refs().unwrap();
+
+ assert_eq!(
+ crefs.symbolic().resolve_head().unwrap().as_str(),
+ "refs/heads/master"
+ );
+ let (pattern, rule) = crefs
+ .rules()
+ .matches(&doc.default_branch().unwrap())
+ .next()
+ .unwrap();
+ assert_eq!(pattern.as_str(), "refs/heads/master");
+ assert_eq!(usize::from(*rule.threshold()), 1);
+ assert!(
+ doc.payload()
+ .get(PayloadId::project())
+ .unwrap()
+ .get("defaultBranch")
+ .is_none(),
+ "the migrated view must not carry `defaultBranch`"
+ );
+ // The project payload still deserializes, minus the moved field.
+ assert_eq!(doc.project().unwrap().unwrap().name(), "heartwood");
+ }
+
+ #[test]
+ fn migrate_is_stable() {
+ let doc = serde_json::from_value::<Doc>(v1_golden()).unwrap();
+ let migrated = doc.migrated().unwrap();
+
+ assert_eq!(migrated.version(), IDENTITY_VERSION);
+ // Migrating what is already migrated changes nothing, so a repeated
+ // `rad id migrate` cannot drift.
+ assert_eq!(migrated.migrated().unwrap(), migrated);
+ // The view is the same whichever side it is read from.
+ assert_eq!(doc.payload(), migrated.payload());
+ }
+
+ #[test]
+ fn migration_revision_differs_from_parent() {
+ // The migration changes the stored document, so `DocUnchanged` does not
+ // fire when the revision is applied.
+ let doc = serde_json::from_value::<Doc>(v1_golden()).unwrap();
+ let migrated = doc.migrated().unwrap();
+
+ assert_ne!(doc, migrated);
+ assert_ne!(doc.encode().unwrap().0, migrated.encode().unwrap().0);
+ }
+
+ #[test]
+ fn version_2_rejects_default_branch() {
+ // `Project` swallows unknown fields, so a stray `defaultBranch` would be
+ // silently ignored rather than disallowed without an explicit check.
+ let doc = json!({
+ "version": 2,
+ "payload": {
+ "xyz.radicle.project": {
+ "name": "heartwood",
+ "description": "Radicle Heartwood Protocol & Stack",
+ "defaultBranch": "master"
+ },
+ "xyz.radicle.crefs": {
+ "symbolic": { "HEAD": "refs/heads/master" },
+ "rules": {
+ "refs/heads/master": { "allow": "delegates", "threshold": 1 }
+ }
+ }
+ },
+ "delegates": ["did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM"]
+ });
+ assert_matches!(
+ serde_json::from_value::<Doc>(doc),
+ Err(_),
+ "a version 2 document must not carry `defaultBranch`"
+ );
+ }
+
+ #[test]
+ fn version_2_rejects_threshold() {
+ // The quorum lives in the crefs rule; a top-level `threshold` would be a
+ // second, silently ignored source of truth.
+ let doc = json!({
+ "version": 2,
+ "payload": {
+ "xyz.radicle.crefs": {
+ "symbolic": { "HEAD": "refs/heads/master" },
+ "rules": {
+ "refs/heads/master": { "allow": "delegates", "threshold": 1 }
+ }
+ }
+ },
+ "delegates": ["did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM"],
+ "threshold": 1
+ });
+ assert_matches!(serde_json::from_value::<RawDoc>(doc), Err(_));
+ }
+
+ #[test]
+ fn version_1_head_must_agree_with_default_branch() {
+ // Version 1 allowed a crefs payload alongside `defaultBranch`, as long
+ // as the two agreed. A document that never was valid must not become
+ // valid by migrating.
+ let doc = json!({
+ "payload": {
+ "xyz.radicle.project": {
+ "name": "heartwood",
+ "description": "Radicle Heartwood Protocol & Stack",
+ "defaultBranch": "master"
+ },
+ "xyz.radicle.crefs": {
+ "symbolic": { "HEAD": "refs/heads/main" },
+ "rules": {
+ "refs/heads/main": { "allow": "delegates", "threshold": 1 }
+ }
+ }
+ },
+ "delegates": ["did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM"],
+ "threshold": 1
+ });
+ assert_matches!(
+ serde_json::from_value::<Doc>(doc),
+ Err(_),
+ "`HEAD` disagreeing with `defaultBranch` must be rejected"
+ );
+ }
+
+ #[test]
+ fn edit_keeps_stored_version() {
+ // An ordinary edit of a version-1 document proposes another version-1
+ // document; only `rad id migrate` changes the version.
+ let doc = serde_json::from_value::<Doc>(v1_golden()).unwrap();
+ let edited = doc.with_edits(|raw| raw.delegate(r#gen::<Did>(1))).unwrap();
+
+ assert_eq!(edited.version(), Version::new(1).unwrap());
+ assert_eq!(edited.delegates().len(), 2);
+ }
+
#[test]
fn is_valid_version() {
// 0 is not a valid version
@@ -1211,8 +1232,8 @@ mod test {
}
);
- // Deserializing the `RawDoc` should not fail and should include the
- // `IDENTITY_VERSION`.
+ // Deserializing the `RawDoc` should not fail, and a document without a
+ // `version` field is the original (version 1) format.
let doc = serde_json::from_str::<RawDoc>(&v1.to_string()).unwrap();
let payload = [(
PayloadId::project().clone(),
@@ -1237,30 +1258,45 @@ mod test {
.parse::<Did>()
.unwrap(),
];
- // And this is the expected outcome of the deserialization
+ // And this is the expected outcome of the deserialization.
assert_eq!(
doc,
- RawDoc {
- version: IDENTITY_VERSION,
+ RawDoc::V1(v1::Doc {
payload: payload.clone(),
delegates: delegates.clone(),
threshold: 1,
visibility: Visibility::Public,
- }
+ })
);
- // Deserializing into `Doc` should also succeed.
- let verified = serde_json::from_str::<Doc>(&v1.to_string()).unwrap();
- let delegates = Delegates(NonEmpty::from_vec(delegates).unwrap());
+ // A version 1 document verifies, and its view exposes the default
+ // branch and quorum the version-1 fields described.
+ let verified = doc.clone().verified().unwrap();
+ assert_eq!(verified.version(), Version::new(1).unwrap());
assert_eq!(
- verified,
- Doc {
- version: IDENTITY_VERSION,
- threshold: Threshold::new(1, &delegates).unwrap(),
- payload: payload.clone(),
- delegates,
- visibility: Visibility::Public,
- }
+ verified.default_branch().unwrap().as_str(),
+ "refs/heads/master"
+ );
+ let crefs = verified.canonical_refs().unwrap();
+ let (_, rule) = crefs
+ .rules()
+ .matches(&verified.default_branch().unwrap())
+ .next()
+ .unwrap();
+ assert_eq!(usize::from(*rule.threshold()), 1);
+
+ // Deserializing directly into `Doc` gives the same document.
+ assert_eq!(
+ serde_json::from_str::<Doc>(&v1.to_string()).unwrap(),
+ verified
+ );
+
+ // The stored form is unchanged, so re-encoding a version 1 document
+ // reproduces the bytes a released client wrote.
+ let (_, bytes) = verified.encode().unwrap();
+ assert_eq!(
+ serde_json::from_slice::<serde_json::Value>(&bytes).unwrap(),
+ v1
);
}
@@ -1290,9 +1326,9 @@ mod test {
);
assert_eq!(
(*id).to_string(),
- "d96f425412c9f8ad5d9a9a05c9831d0728e2338d"
+ "f10bd9e36848dc4eb70cc078d1d0bbaac7c1ba61"
);
- assert_eq!(id.urn(), String::from("rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji"));
+ assert_eq!(id.urn(), String::from("rad:z4MmvDgm9DoJF6ecPSt55geCbNp4G"));
}
#[test]
@@ -1409,6 +1445,7 @@ mod test {
fn default_branch_without_project() {
let value = serde_json::json!(
{
+ "version": 2,
"payload": {
"xyz.radicle.crefs": {
"symbolic": {
@@ -1424,8 +1461,7 @@ mod test {
},
"delegates": [
"did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM"
- ],
- "threshold": 1
+ ]
}
);
@@ -1433,43 +1469,46 @@ mod test {
assert_eq!(doc.default_branch().unwrap().as_str(), "refs/heads/main");
}
+ /// Version 2 leaves the rule governing `HEAD` free: it may name explicit
+ /// DIDs instead of `delegates`, and it may set its own threshold. The rule
+ /// that governs `HEAD` is the most specific match, not the first one the
+ /// glob happens to yield.
#[test]
- fn default_branch_clash() {
+ fn head_rule_is_the_most_specific_match() {
let value = serde_json::json!(
{
+ "version": 2,
"payload": {
- "xyz.radicle.project": {
- "name": "example",
- "description": "An example project",
- "defaultBranch": "main",
- },
"xyz.radicle.crefs": {
"symbolic": {
- "HEAD": "refs/heads/master",
+ "HEAD": "refs/heads/main",
},
"rules": {
- "refs/heads/master": {
+ "refs/heads/*": {
"allow": "delegates",
+ "threshold": 2,
+ },
+ "refs/heads/main": {
+ "allow": ["did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM"],
"threshold": 1,
}
}
}
},
"delegates": [
- "did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM"
- ],
- "threshold": 1
+ "did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
+ "did:key:z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT"
+ ]
}
);
let doc = serde_json::from_value::<Doc>(value).unwrap();
- assert_matches!(
- doc.default_branch(),
- Err(DefaultBranchError::CanonicalRefsError(
- CanonicalRefsError::DefaultBranchRuleError(
- DefaultBranchRuleError::HeadMismatch { .. }
- )
- ))
- );
+ assert_eq!(doc.default_branch().unwrap().as_str(), "refs/heads/main");
+
+ let crefs = doc.canonical_refs().unwrap();
+ let head = crefs.symbolic().resolve_head().unwrap();
+ let (pattern, rule) = crefs.rules().matches(head).next().unwrap();
+ assert_eq!(pattern.to_string(), "refs/heads/main");
+ assert_eq!(usize::from(*rule.threshold()), 1);
}
}
diff --git a/crates/radicle/src/identity/doc/migrate.rs b/crates/radicle/src/identity/doc/migrate.rs
new file mode 100644
index 0000000000..bcb6e73f33
--- /dev/null
+++ b/crates/radicle/src/identity/doc/migrate.rs
@@ -0,0 +1,210 @@
+//! Migration between the stored identity document schemas.
+
+use serde_json as json;
+
+use crate::git;
+use crate::git::canonical::rules::{self, ResolvedDelegates};
+use crate::git::fmt::{Qualified, RefString};
+use crate::identity::crefs::{CanonicalRefs, RawCanonicalRefs};
+
+use super::{
+ CanonicalRefsError, Delegates, DelegatesError, GetPayload as _, Payload, PayloadId, v1, v2,
+};
+
+/// Transform a stored identity document into the schema that follows it.
+///
+/// The transform is deterministic: the same stored document always yields the
+/// same result. One implementation therefore serves both the view every reader
+/// consumes and the revision `rad id migrate` proposes, so the implicit and the
+/// explicit migration cannot drift apart.
+pub trait Migrate {
+ /// The schema this document migrates to.
+ type Next;
+ /// Why a document cannot be migrated.
+ type Error;
+
+ /// Migrate the document to [`Migrate::Next`].
+ fn migrate(self) -> Result<Self::Next, Self::Error>;
+}
+
+#[derive(Debug, thiserror::Error)]
+pub enum Error {
+ #[error("json: {0}")]
+ Json(#[from] json::Error),
+
+ #[error(transparent)]
+ CanonicalRefs(#[from] CanonicalRefsError),
+
+ #[error(transparent)]
+ DefaultBranchRule(#[from] DefaultBranchRuleError),
+
+ #[error(transparent)]
+ Delegates(#[from] DelegatesError),
+
+ #[error(
+ "no default branch to migrate: the `xyz.radicle.project` payload defines no `defaultBranch` and the `xyz.radicle.crefs` payload defines no `HEAD` symbolic reference"
+ )]
+ MissingDefaultBranch,
+}
+
+/// The version-1 rule governing the default branch disagrees with the rest of
+/// the document, so there is no single quorum to carry over.
+#[derive(Debug, thiserror::Error)]
+pub enum DefaultBranchRuleError {
+ #[error(
+ "rule for pattern '{pattern}' which matches the target of symbolic reference 'HEAD' must use 'allow' value of \"delegates\" but uses {actual}"
+ )]
+ Allowed { pattern: String, actual: String },
+
+ #[error(
+ "rule for pattern '{pattern}' which matches the target of symbolic reference 'HEAD' must use a threshold of {expected} as required by the identity document but uses {actual}"
+ )]
+ Threshold {
+ pattern: String,
+ actual: usize,
+ expected: usize,
+ },
+
+ #[error(
+ "target of symbolic reference 'HEAD' ('{cref}') does not match `defaultBranch` from payload `xyz.radicle.project` ('{project}')"
+ )]
+ HeadMismatch { cref: RefString, project: RefString },
+}
+
+impl Migrate for v1::Doc {
+ type Next = v2::Doc;
+ type Error = Error;
+
+ /// Move the default branch and its write quorum into the
+ /// `xyz.radicle.crefs` payload, and drop the top-level `threshold`.
+ ///
+ /// A version-1 document could already carry a crefs payload, in which case
+ /// its `HEAD` had to agree with `defaultBranch` and its rule with the
+ /// document's `threshold`. That invariant is checked here rather than
+ /// papered over, so a document that never was valid does not become valid
+ /// by migrating.
+ fn migrate(mut self) -> Result<Self::Next, Self::Error> {
+ let threshold = self.threshold;
+ let default_branch = self.default_branch();
+ let mut crefs = self
+ .raw_canonical_refs()
+ .transpose()
+ .map_err(CanonicalRefsError::Payload)?
+ .unwrap_or_default();
+ // Rules can only be matched against once validated, and validation
+ // also resolves any `HEAD` chain. `crefs` is mutated when synthesizing,
+ // so validate a copy.
+ let valid = {
+ let delegates = Delegates::new(self.delegates.iter().copied())?;
+ let resolve = &mut || delegates.clone();
+ crefs
+ .clone()
+ .try_into_canonical_refs(resolve)
+ .map_err(CanonicalRefsError::CanonicalRefs)?
+ };
+ let head = valid.symbolic().resolve_head().cloned();
+
+ let synthesized = match (head, default_branch) {
+ (Some(head), Some(branch)) => {
+ let project_branch = git::refs::branch(&branch);
+ if project_branch != head {
+ return Err(DefaultBranchRuleError::HeadMismatch {
+ cref: head.to_ref_string(),
+ project: project_branch.to_ref_string(),
+ }
+ .into());
+ }
+ validate_head_rule(&valid, &head, threshold)?;
+ false
+ }
+ (Some(head), None) => {
+ validate_head_rule(&valid, &head, threshold)?;
+ false
+ }
+ (None, Some(branch)) => {
+ synthesize_head(&mut crefs, &valid, &branch, threshold);
+ true
+ }
+ (None, None) => return Err(Error::MissingDefaultBranch),
+ };
+
+ // The crefs payload is the sole authority from here on.
+ self.remove_default_branch();
+
+ let v1::Doc {
+ mut payload,
+ delegates,
+ visibility,
+ threshold: _,
+ } = self;
+
+ if synthesized {
+ payload.insert(
+ PayloadId::canonical_refs().clone(),
+ Payload::from(json::to_value(crefs)?),
+ );
+ }
+
+ Ok(v2::Doc {
+ payload,
+ delegates,
+ visibility,
+ })
+ }
+}
+
+/// Check that the rule matching `HEAD`'s target uses `delegates` and the
+/// document's `threshold`.
+///
+/// A `HEAD` with no matching rule dangles; that is reported by canonical
+/// references validation, which sees the migrated document.
+fn validate_head_rule(
+ crefs: &CanonicalRefs,
+ head: &Qualified,
+ threshold: usize,
+) -> Result<(), DefaultBranchRuleError> {
+ let Some((pattern, rule)) = crefs.rules().matches(head).next() else {
+ return Ok(());
+ };
+
+ if let ResolvedDelegates::Set(actual) = rule.allowed() {
+ return Err(DefaultBranchRuleError::Allowed {
+ pattern: pattern.to_string(),
+ actual: actual
+ .iter()
+ .map(|did| did.to_string())
+ .collect::<Vec<_>>()
+ .join(", "),
+ });
+ }
+ let actual = usize::from(*rule.threshold());
+ if actual != threshold {
+ return Err(DefaultBranchRuleError::Threshold {
+ pattern: pattern.to_string(),
+ actual,
+ expected: threshold,
+ });
+ }
+ Ok(())
+}
+
+/// Add a `HEAD` symbolic reference for `branch`, and a rule governing it if
+/// none matches already.
+fn synthesize_head(
+ crefs: &mut RawCanonicalRefs,
+ valid: &CanonicalRefs,
+ branch: &RefString,
+ threshold: usize,
+) {
+ let qualified = git::refs::branch(branch);
+
+ if valid.rules().matches(&qualified).next().is_none() {
+ crefs.raw_rules_mut().insert(
+ v2::branch_pattern(branch),
+ rules::Rule::new(rules::Allowed::Delegates, threshold),
+ );
+ }
+ crefs
+ .symbolic_mut()
+ .insert(git::fmt::refname!("HEAD"), qualified.to_ref_string());
+}
diff --git a/crates/radicle/src/identity/doc/raw.rs b/crates/radicle/src/identity/doc/raw.rs
new file mode 100644
index 0000000000..ebf5a84820
--- /dev/null
+++ b/crates/radicle/src/identity/doc/raw.rs
@@ -0,0 +1,306 @@
+//! The identity document as it is stored, at whichever version wrote it.
+
+use std::collections::BTreeMap;
+use std::ops::Not;
+
+use serde::{Deserialize, Deserializer, Serialize, Serializer, de};
+use serde_json as json;
+
+use crate::git::fmt::RefString;
+use crate::identity::{Did, project::Project};
+
+use super::migrate::Migrate as _;
+use super::{
+ Delegates, Doc, DocError, GetPayload, Payload, PayloadId, Version, Visibility, migrate,
+ missing_version, v1, v2,
+};
+
+/// `RawDoc` is similar to the [`Doc`] type, however, it can be edited and may
+/// not be valid.
+///
+/// It is expected that any changes to a [`Doc`] are made via [`RawDoc`], and
+/// then verified by using [`RawDoc::verified`].
+///
+/// Each variant is a *stored* schema — the bytes a client of that version
+/// wrote, hashed and signed. Editing and re-serializing a `RawDoc` keeps its
+/// version, so an ordinary edit of an older document does not silently migrate
+/// it. [`Doc::migrated`] performs the explicit migration, which goes through
+/// the usual delegate vote.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum RawDoc {
+ V1(v1::Doc),
+ V2(v2::Doc),
+}
+
+/// Apply `$body` to the inner document of either variant.
+macro_rules! dispatch {
+ ($doc:expr, |$inner:ident| $body:expr) => {
+ match $doc {
+ RawDoc::V1($inner) => $body,
+ RawDoc::V2($inner) => $body,
+ }
+ };
+}
+
+impl<'de> Deserialize<'de> for RawDoc {
+ fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+ where
+ D: Deserializer<'de>,
+ {
+ // Serde's internally-tagged enums need a *string* tag, but `version` is
+ // a number, so the variant is chosen by hand.
+ let value = json::Value::deserialize(deserializer)?;
+ let version = match value.get("version") {
+ // A document written before `version` was introduced is version 1.
+ None => missing_version(),
+ // `Version::new` rejects `0` and anything past `IDENTITY_VERSION`.
+ Some(version) => Version::deserialize(version).map_err(de::Error::custom)?,
+ };
+
+ match u32::from(version) {
+ 1 => json::from_value(value)
+ .map(RawDoc::V1)
+ .map_err(de::Error::custom),
+ 2 => {
+ if value.get("threshold").is_some() {
+ return Err(de::Error::custom(
+ "a version 2 identity document must not define a top-level `threshold`; \
+ the write quorum is governed by the `xyz.radicle.crefs` payload",
+ ));
+ }
+ json::from_value(value)
+ .map(RawDoc::V2)
+ .map_err(de::Error::custom)
+ }
+ // N.b. `Version` cannot hold any other number, so this is
+ // unreachable until a version 3 schema is added.
+ version => Err(de::Error::custom(format!(
+ "unsupported identity document version {version}"
+ ))),
+ }
+ }
+}
+
+impl Serialize for RawDoc {
+ fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+ dispatch!(self, |doc| doc.serialize(serializer))
+ }
+}
+
+impl RawDoc {
+ /// Construct a new [`RawDoc`] at [`IDENTITY_VERSION`], with an initial
+ /// payload containing the provided [`Project`] and a `xyz.radicle.crefs`
+ /// payload governing `default_branch` at the given `threshold`, with the
+ /// given `delegates` and `visibility`.
+ ///
+ /// [`IDENTITY_VERSION`]: super::IDENTITY_VERSION
+ pub fn new(
+ project: Project,
+ delegates: Vec<Did>,
+ default_branch: &RefString,
+ threshold: usize,
+ visibility: Visibility,
+ ) -> Self {
+ Self::new_at(
+ super::IDENTITY_VERSION,
+ project,
+ delegates,
+ default_branch,
+ threshold,
+ visibility,
+ )
+ }
+
+ /// Like [`RawDoc::new`], but at the given document `version`.
+ ///
+ /// Creating a version-1 document is deliberate: it stays readable to
+ /// releases that predate version 2.
+ pub fn new_at(
+ version: Version,
+ project: Project,
+ delegates: Vec<Did>,
+ default_branch: &RefString,
+ threshold: usize,
+ visibility: Visibility,
+ ) -> Self {
+ let project =
+ json::to_value(project).expect("RawDoc::new_at: payload must be serializable");
+
+ match u32::from(version) {
+ 1 => {
+ let mut project = project;
+ if let Some(object) = project.as_object_mut() {
+ object.insert(
+ "defaultBranch".to_owned(),
+ json::Value::from(default_branch.as_str()),
+ );
+ }
+ Self::V1(v1::Doc {
+ payload: BTreeMap::from_iter([(
+ PayloadId::project().clone(),
+ Payload::from(project),
+ )]),
+ delegates,
+ threshold,
+ visibility,
+ })
+ }
+ _ => Self::V2(v2::Doc {
+ payload: BTreeMap::from_iter([
+ (PayloadId::project().clone(), Payload::from(project)),
+ (
+ PayloadId::canonical_refs().clone(),
+ v2::default_branch_crefs(default_branch, threshold),
+ ),
+ ]),
+ delegates,
+ visibility,
+ }),
+ }
+ }
+
+ /// Get the version of the document.
+ pub fn version(&self) -> Version {
+ match self {
+ Self::V1(_) => missing_version(),
+ Self::V2(_) => super::IDENTITY_VERSION,
+ }
+ }
+
+ /// Return the associated payloads for this document.
+ pub fn payload(&self) -> &BTreeMap<PayloadId, Payload> {
+ dispatch!(self, |doc| &doc.payload)
+ }
+
+ /// Return the associated payloads for mutation.
+ pub fn payload_mut(&mut self) -> &mut BTreeMap<PayloadId, Payload> {
+ dispatch!(self, |doc| &mut doc.payload)
+ }
+
+ /// Return the associated delegates for this document.
+ pub fn delegates(&self) -> &Vec<Did> {
+ dispatch!(self, |doc| &doc.delegates)
+ }
+
+ /// Return the associated delegates for mutation.
+ ///
+ /// The delegates are only checked by [`RawDoc::verified`], so an
+ /// intermediate edit may leave the set empty or oversized.
+ pub fn delegates_mut(&mut self) -> &mut Vec<Did> {
+ dispatch!(self, |doc| &mut doc.delegates)
+ }
+
+ /// Return the associated [`Visibility`] of this document.
+ pub fn visibility(&self) -> &Visibility {
+ dispatch!(self, |doc| &doc.visibility)
+ }
+
+ /// Return the associated [`Visibility`] for mutation.
+ pub fn visibility_mut(&mut self) -> &mut Visibility {
+ dispatch!(self, |doc| &mut doc.visibility)
+ }
+
+ /// Set the number of delegates required to accept a change to the default
+ /// branch.
+ ///
+ /// Where the threshold is stored depends on the version: version 1 has a
+ /// top-level field, while version 2 keeps it in the `xyz.radicle.crefs`
+ /// rule governing `HEAD`.
+ pub fn set_threshold(&mut self, threshold: usize) {
+ match self {
+ Self::V1(doc) => doc.threshold = threshold,
+ Self::V2(doc) => doc.set_threshold(threshold),
+ }
+ }
+
+ /// Check if the given `did` is in the set of delegates.
+ pub fn is_delegate(&self, did: &Did) -> bool {
+ self.delegates().contains(did)
+ }
+
+ /// Add a new delegate to the document.
+ ///
+ /// Note that if this `Did` is a duplicate, then the resulting set will only
+ /// show it once.
+ pub fn delegate(&mut self, did: Did) {
+ self.delegates_mut().push(did)
+ }
+
+ /// Remove the `did` from the set of delegates. Returns `true` if it was
+ /// removed.
+ pub fn rescind(&mut self, did: &Did) -> Result<bool, DocError> {
+ let delegates = self.delegates_mut();
+ let (matches, remaining) = delegates.iter().partition(|d| *d == did);
+ *delegates = remaining;
+
+ Ok(matches.is_empty().not())
+ }
+
+ /// Construct the `RawDoc` from the set of `bytes` that are expected to be
+ /// in JSON format.
+ pub fn from_json(bytes: &[u8]) -> Result<Self, DocError> {
+ json::from_slice(bytes).map_err(DocError::from)
+ }
+
+ /// The document migrated to [`IDENTITY_VERSION`], which is what every
+ /// reader consumes.
+ ///
+ /// [`IDENTITY_VERSION`]: super::IDENTITY_VERSION
+ pub fn view(&self) -> Result<v2::Doc, migrate::Error> {
+ match self {
+ Self::V1(doc) => doc.clone().migrate(),
+ Self::V2(doc) => Ok(doc.clone()),
+ }
+ }
+
+ /// Verify the `RawDoc`'s values, converting it into a valid [`Doc`].
+ ///
+ /// The verifications are as follows:
+ ///
+ /// - The delegates: any duplicates are removed, and for the remaining set
+ /// ensure that it is non-empty and does not exceed a length of
+ /// [`MAX_DELEGATES`].
+ /// - The document migrates to [`IDENTITY_VERSION`]. For version 1 this
+ /// also checks the version-1 invariants that tie `defaultBranch`, the
+ /// top-level `threshold` and the crefs payload together.
+ /// - The migrated document satisfies the version-2 invariants: the
+ /// `xyz.radicle.project` payload defines no `defaultBranch`, and the
+ /// `xyz.radicle.crefs` payload is present, valid, and defines a
+ /// resolvable default branch whose rule has a well-formed write quorum
+ /// (`1 <= threshold <= |allowed|`).
+ ///
+ /// [`MAX_DELEGATES`]: super::MAX_DELEGATES
+ /// [`IDENTITY_VERSION`]: super::IDENTITY_VERSION
+ pub fn verified(self) -> Result<Doc, DocError> {
+ let delegates = Delegates::new(self.delegates().iter().copied())?;
+ let view = self.view()?;
+ view.validate()?;
+
+ let doc = Doc {
+ raw: self,
+ view,
+ delegates,
+ };
+ // Validate here so that *every* verified `Doc` — including those adopted
+ // over the network via `Doc::from_blob` and those obtained by
+ // deserializing — carries an enforceable quorum, rather than deferring
+ // the check to the CLI-only `update::verify`.
+ doc.default_branch()?;
+
+ Ok(doc)
+ }
+}
+
+impl GetPayload for RawDoc {
+ fn get_payload(&self, id: &PayloadId) -> Option<&Payload> {
+ self.payload().get(id)
+ }
+}
+
+impl TryFrom<RawDoc> for Doc {
+ type Error = DocError;
+
+ fn try_from(doc: RawDoc) -> Result<Self, Self::Error> {
+ doc.verified()
+ }
+}
diff --git a/crates/radicle/src/identity/doc/update.rs b/crates/radicle/src/identity/doc/update.rs
index cc3ee8a9b6..b47ef6a792 100644
--- a/crates/radicle/src/identity/doc/update.rs
+++ b/crates/radicle/src/identity/doc/update.rs
@@ -39,20 +39,30 @@ impl FromStr for EditVisibility {
/// Change the visibility of the [`RawDoc`], using the provided
/// [`EditVisibility`].
pub fn visibility(mut raw: RawDoc, edit: EditVisibility) -> RawDoc {
- match (&mut raw.visibility, edit) {
+ match (raw.visibility(), edit) {
(Visibility::Public, EditVisibility::Public) => raw,
(Visibility::Private { .. }, EditVisibility::Private) => raw,
(Visibility::Public, EditVisibility::Private) => {
- raw.visibility = Visibility::private([]);
+ *raw.visibility_mut() = Visibility::private([]);
raw
}
(Visibility::Private { .. }, EditVisibility::Public) => {
- raw.visibility = Visibility::Public;
+ *raw.visibility_mut() = Visibility::Public;
raw
}
}
}
+/// Set the number of delegates required to accept a change to the default
+/// branch.
+///
+/// Where the threshold is stored depends on the document version, which
+/// [`RawDoc::set_threshold`] takes care of.
+pub fn threshold(mut raw: RawDoc, threshold: usize) -> RawDoc {
+ raw.set_threshold(threshold);
+ raw
+}
+
/// Change the `allow` set of a document if the visibility is set to
/// [`Visibility::Private`].
///
@@ -83,7 +93,7 @@ pub fn privacy_allow_list(
return Err(error::PrivacyAllowList::Overlapping(overlap));
}
- match &mut raw.visibility {
+ match raw.visibility_mut() {
Visibility::Public => Err(error::PrivacyAllowList::PublicVisibility),
Visibility::Private { allow: existing } => {
for did in allow {
@@ -122,9 +132,10 @@ pub fn delegates(
return Ok(Ok(raw));
}
- raw.delegates = raw
- .delegates
- .into_iter()
+ let delegates = raw.delegates_mut();
+ *delegates = delegates
+ .iter()
+ .copied()
.chain(additions)
.filter(|d| !removals.contains(d))
.collect::<Vec<_>>();
@@ -167,7 +178,7 @@ pub fn payload(
upserts: impl IntoIterator<Item = PayloadUpsert>,
) -> Result<RawDoc, error::PayloadError> {
for PayloadUpsert { id, key, value } in upserts {
- if let Some(ref mut payload) = raw.payload.get_mut(&id) {
+ if let Some(ref mut payload) = raw.payload_mut().get_mut(&id) {
if let Some(obj) = payload.as_object_mut() {
if value.is_null() {
obj.remove(&key);
@@ -178,7 +189,7 @@ pub fn payload(
return Err(error::PayloadError::ExpectedObject { id });
}
} else {
- raw.payload
+ raw.payload_mut()
.insert(id, serde_json::json!({ key: value }).into());
}
}
@@ -195,68 +206,24 @@ pub fn payload(
/// [`CanonicalRefs`]: crate::identity::CanonicalRefs
pub fn verify(raw: RawDoc) -> Result<Doc, error::DocVerification> {
let proposal = raw.clone().verified()?;
- // Verify that the project payload is valid
+ // Verify that the project payload, if present, deserializes correctly.
// TODO(finto): perhaps this should be handled by JSON Schemas instead
- let project = match proposal.project() {
- None => None,
- Some(Ok(project)) => Some(project),
- Some(Err(PayloadError::Json(e))) => {
- return Err(error::DocVerification::PayloadError {
- id: PayloadId::project().clone(),
- err: e.to_string(),
- });
- }
- };
-
- let resolve = &mut || proposal.delegates.clone();
-
- let crefs = match proposal.raw_canonical_refs() {
- None => None,
- Some(Ok(crefs)) => match crefs.try_into_canonical_refs(resolve) {
- Ok(crefs) => Some(crefs),
- Err(err) => {
- return Err(error::DocVerification::PayloadError {
- id: PayloadId::canonical_refs().clone(),
- err: err.to_string(),
- });
- }
- },
- Some(Err(PayloadError::Json(e))) => {
- return Err(error::DocVerification::PayloadError {
- id: PayloadId::canonical_refs().clone(),
- err: e.to_string(),
- });
- }
- };
-
- // If we have both payloads `xyz.radicle.{project,crefs}` ensure that,
- // in the `crefs` payload there is no …
- // 1. … rule that matches the default branch from the `project` payload.
- // (This rule must be synthesized!)
- // 2. … symbolic reference with the name `HEAD`.
- // (This reference must be synthesized!)
- match crefs.zip(project) {
- Some((crefs, project)) => {
- let default = project.default_branch_qualified().to_owned();
- let matches = crefs
- .rules()
- .matches(&default)
- .map(|(pattern, _)| pattern.to_string())
- .collect::<Vec<_>>();
- if !matches.is_empty() {
- return Err(error::DocVerification::DisallowDefaultBranchRule { matches, default });
- }
-
- if let Some(symbolic) = crefs.symbolic().resolve_head() {
- return Err(error::DocVerification::DisallowDefaultBranchSymbolic {
- symbolic: symbolic.to_ref_string(),
- default,
- });
- }
- }
- _ => { /* we validate below */ }
+ if let Some(Err(PayloadError::Json(e))) = proposal.project() {
+ return Err(error::DocVerification::PayloadError {
+ id: PayloadId::project().clone(),
+ err: e.to_string(),
+ });
}
+ // Verify that the canonical references payload is valid. The default branch
+ // and its `HEAD` symbolic reference are now governed entirely by the
+ // `xyz.radicle.crefs` payload, which must be present and resolvable.
+ if let Err(e) = proposal.canonical_refs() {
+ return Err(error::DocVerification::PayloadError {
+ id: PayloadId::canonical_refs().clone(),
+ err: e.to_string(),
+ });
+ }
Ok(proposal)
}
@@ -264,12 +231,39 @@ fn verify_delegates(
proposal: &RawDoc,
repo: &storage::git::Repository,
) -> Result<Option<Vec<error::DelegateVerification>>, RepositoryError> {
- let dids = &proposal.delegates;
- let threshold = proposal.threshold;
+ use super::{CanonicalRefsError, Delegates, DocError, GetPayload as _};
+
let (canonical, _) = repo.canonical_head()?;
- let mut missing = Vec::with_capacity(dids.len());
+ // The quorum for the canonical default branch is defined by the canonical
+ // reference rule that matches it. Resolve the *validated* rule so that (a)
+ // the most specific matching rule is chosen (the raw rules are only byte
+ // ordered), and (b) both the required threshold and the population of
+ // voters counted below come from that same rule. Fail closed: an unreadable
+ // or invalid crefs payload, or a branch with no matching rule, is a
+ // verification error, not an assumed quorum of 1.
+ let delegates = Delegates::new(proposal.delegates().iter().copied()).map_err(DocError::from)?;
+ // Read the rules from the *migrated* document, so that a document stored at
+ // an older version is governed by the same rules its readers see.
+ let crefs = proposal
+ .view()
+ .map_err(DocError::from)?
+ .raw_canonical_refs()
+ .ok_or(CanonicalRefsError::Missing)?
+ .map_err(CanonicalRefsError::Payload)?
+ .try_into_canonical_refs(&mut || delegates.clone())
+ .map_err(CanonicalRefsError::from)?;
+ let (_, rule) = crefs
+ .rules()
+ .matches(&canonical)
+ .next()
+ .ok_or(RepositoryError::MissingBranchRule)?;
+ let allowed = rule.allowed();
+ let threshold = usize::from(*rule.threshold());
- for did in dids {
+ // Count the votes over the rule's `allowed` set, which may differ from the
+ // identity delegates when the default branch is governed by an explicit set.
+ let mut missing = Vec::with_capacity(allowed.len());
+ for did in allowed.iter() {
match refs::SignedRefs::load((*did).into(), repo)
.map_err(|err| storage::Error::Refs(storage::refs::Error::Read(err)))?
{
@@ -287,7 +281,7 @@ fn verify_delegates(
}
}
- Ok((dids.len() - missing.len() < threshold).then_some(missing))
+ Ok((allowed.len() - missing.len() < threshold).then_some(missing))
}
#[allow(clippy::unwrap_used)]
@@ -295,24 +289,33 @@ fn verify_delegates(
mod test {
use serde_json::json;
- use super::*;
+ use super::PayloadUpsert;
use crate::{
- identity::doc::{PayloadId, update::error},
- prelude::RawDoc,
+ identity::doc::{IDENTITY_VERSION, PayloadId, Version},
test::arbitrary,
};
- use super::PayloadUpsert;
+ /// A version-2 document, whose crefs payload alone governs the default
+ /// branch. These cases are about that payload, so the version is pinned.
+ fn v2() -> crate::prelude::RawDoc {
+ arbitrary::raw_doc_at(IDENTITY_VERSION)
+ }
#[test]
fn can_update_crefs() {
- let raw = arbitrary::r#gen::<RawDoc>(1);
+ // The document's default branch is `master`; keep its rule and add an
+ // unrelated tags rule.
+ let raw = v2();
let raw = super::payload(
raw,
[PayloadUpsert {
id: PayloadId::canonical_refs().clone(),
key: "rules".to_string(),
value: json!({
+ "refs/heads/master": {
+ "threshold": 1,
+ "allow": "delegates"
+ },
"refs/tags/*": {
"threshold": 1,
"allow": "delegates"
@@ -326,10 +329,10 @@ mod test {
}
#[test]
- fn cannot_include_default_branch_rule() {
- let raw = arbitrary::r#gen::<RawDoc>(1);
- let project = raw.project().unwrap().unwrap();
- let branch = project.default_branch_qualified();
+ fn default_branch_requires_rule() {
+ // A document whose `HEAD` symbolic reference has no matching rule is
+ // invalid, since the canonical head cannot be resolved.
+ let raw = v2();
let raw = super::payload(
raw,
[PayloadUpsert {
@@ -339,48 +342,77 @@ mod test {
"refs/tags/*": {
"threshold": 1,
"allow": "delegates"
- },
- branch.as_str(): {
- "threshold": 1,
- "allow": "delegates",
}
}),
}],
)
.unwrap();
assert!(
- matches!(
- super::verify(raw),
- Err(error::DocVerification::DisallowDefaultBranchRule { .. })
- ),
- "Verification should be rejected for including default branch rule"
- )
+ super::verify(raw).is_err(),
+ "Verification should fail when the default branch has no rule"
+ );
}
#[test]
- fn default_branch_rule_exists_after_verification() {
- let raw = arbitrary::r#gen::<RawDoc>(1);
- let project = raw.project().unwrap().unwrap();
- let branch = project.default_branch_qualified();
+ fn threshold_targets_most_specific_rule() {
+ // Two rules match `HEAD` (`refs/heads/master`): the exact branch rule
+ // and a broad glob. `*` (0x2A) sorts before `m` (0x6D), so the
+ // lexicographically-first rule is the glob. Updating the threshold must
+ // rewrite the exact branch rule that actually governs the quorum, not
+ // the glob.
+ use crate::identity::doc::GetPayload as _;
+
+ let raw = v2();
let raw = super::payload(
raw,
[PayloadUpsert {
id: PayloadId::canonical_refs().clone(),
key: "rules".to_string(),
value: json!({
- "refs/tags/*": {
- "threshold": 1,
- "allow": "delegates"
- }
+ "refs/heads/*": { "threshold": 1, "allow": "delegates" },
+ "refs/heads/master": { "threshold": 1, "allow": "delegates" }
}),
}],
)
.unwrap();
- let verified = super::verify(raw).unwrap();
- let crefs = verified.canonical_refs().unwrap();
- assert!(
- crefs.rules().matches(&branch).next().is_some(),
- "Default branch rule is missing!"
+ let raw = super::threshold(raw, 3);
+
+ let crefs = raw.raw_canonical_refs().unwrap().unwrap();
+ let threshold_of = |pattern: &str| {
+ crefs
+ .raw_rules()
+ .iter()
+ .find(|(p, _)| p.as_str() == pattern)
+ .map(|(_, rule)| *rule.threshold())
+ };
+ assert_eq!(
+ threshold_of("refs/heads/master"),
+ Some(3),
+ "the exact branch rule governing HEAD should be updated"
+ );
+ assert_eq!(
+ threshold_of("refs/heads/*"),
+ Some(1),
+ "the broad glob rule should be left untouched"
);
}
+
+ #[test]
+ fn threshold_writes_version_1_field() {
+ // A version-1 document keeps its quorum in the top-level `threshold`,
+ // so an ordinary edit must write there and leave the version alone.
+ let raw = arbitrary::raw_doc_at(Version::new(1).unwrap());
+ let raw = super::threshold(raw, 1);
+ let doc = super::verify(raw).unwrap();
+
+ assert_eq!(doc.version(), Version::new(1).unwrap());
+ // The migrated view carries the same quorum in the crefs rule.
+ let crefs = doc.canonical_refs().unwrap();
+ let (_, rule) = crefs
+ .rules()
+ .matches(&doc.default_branch().unwrap())
+ .next()
+ .unwrap();
+ assert_eq!(usize::from(*rule.threshold()), 1);
+ }
}
diff --git a/crates/radicle/src/identity/doc/update/error.rs b/crates/radicle/src/identity/doc/update/error.rs
index 31ffde52a9..1fdca4de91 100644
--- a/crates/radicle/src/identity/doc/update/error.rs
+++ b/crates/radicle/src/identity/doc/update/error.rs
@@ -1,6 +1,5 @@
use thiserror::Error;
-use crate::git;
use crate::git::fmt::RefString;
use crate::identity::{Did, DocError, doc::PayloadId};
@@ -28,20 +27,6 @@ pub enum DocVerification {
PayloadError { id: PayloadId, err: String },
#[error(transparent)]
Doc(#[from] DocError),
- #[error(
- "incompatible payloads: The rule(s) xyz.radicle.crefs.rules.{matches:?} matches the value of xyz.radicle.project.defaultBranch ('{default}'). Possible resolutions: Change the name of the default branch or remove the rule(s)."
- )]
- DisallowDefaultBranchRule {
- matches: Vec<String>,
- default: git::fmt::Qualified<'static>,
- },
- #[error(
- "incompatible payloads: The symbolic reference xyz.radicle.crefs.symbolic.HEAD → '{symbolic}' conflicts with xyz.radicle.project.defaultBranch ('{default}'). Possible resolutions: Remove either of the two."
- )]
- DisallowDefaultBranchSymbolic {
- symbolic: RefString,
- default: git::fmt::Qualified<'static>,
- },
}
#[derive(Clone, Debug)]
diff --git a/crates/radicle/src/identity/doc/v1.rs b/crates/radicle/src/identity/doc/v1.rs
new file mode 100644
index 0000000000..f7a8b56950
--- /dev/null
+++ b/crates/radicle/src/identity/doc/v1.rs
@@ -0,0 +1,60 @@
+//! The version-1 identity document.
+
+use std::collections::BTreeMap;
+
+use serde::{Deserialize, Serialize};
+
+use crate::git::fmt::RefString;
+use crate::identity::Did;
+
+use super::{Payload, PayloadId, Visibility};
+
+/// A version-1 identity document, in the shape it is stored in.
+///
+/// The default branch is the `defaultBranch` field of the `xyz.radicle.project`
+/// payload, and its write quorum is the top-level `threshold`. Released clients
+/// wrote no `version` key, so none is serialized here either.
+///
+/// [`Migrate`] moves both into the `xyz.radicle.crefs` payload.
+///
+/// [`Migrate`]: super::migrate::Migrate
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Doc {
+ /// The payload section.
+ pub payload: BTreeMap<PayloadId, Payload>,
+ /// The delegates section.
+ pub delegates: Vec<Did>,
+ /// The number of delegates required to accept a change to the default
+ /// branch.
+ pub threshold: usize,
+ /// Repository visibility.
+ #[serde(default, skip_serializing_if = "Visibility::is_public")]
+ pub visibility: Visibility,
+}
+
+impl Doc {
+ /// Read `defaultBranch` from the `xyz.radicle.project` payload.
+ ///
+ /// Returns `None` when the payload is absent, or when the field is missing
+ /// or is not a valid reference name. Version 1 accepted such a document as
+ /// long as the `xyz.radicle.crefs` payload defined `HEAD` itself.
+ pub fn default_branch(&self) -> Option<RefString> {
+ self.payload
+ .get(PayloadId::project())?
+ .get("defaultBranch")?
+ .as_str()
+ .and_then(|name| RefString::try_from(name).ok())
+ }
+
+ /// Remove `defaultBranch` from the `xyz.radicle.project` payload, if
+ /// present. Version 2 governs the default branch through
+ /// `xyz.radicle.crefs` alone.
+ pub(super) fn remove_default_branch(&mut self) {
+ if let Some(project) = self.payload.get_mut(PayloadId::project())
+ && let Some(object) = project.as_object_mut()
+ {
+ object.remove("defaultBranch");
+ }
+ }
+}
diff --git a/crates/radicle/src/identity/doc/v2.rs b/crates/radicle/src/identity/doc/v2.rs
new file mode 100644
index 0000000000..6662d627c9
--- /dev/null
+++ b/crates/radicle/src/identity/doc/v2.rs
@@ -0,0 +1,152 @@
+//! The version-2 identity document.
+
+use std::collections::BTreeMap;
+
+use serde::ser::SerializeStruct as _;
+use serde::{Deserialize, Serialize, Serializer};
+use serde_json as json;
+
+use crate::git;
+use crate::git::canonical::rules::{self, Rules};
+use crate::git::canonical::symbolic::{RawSymbolicRefs, SymbolicRefs};
+use crate::git::fmt::RefString;
+use crate::identity::Did;
+use crate::identity::crefs::RawCanonicalRefs;
+
+use super::{Delegates, GetPayload as _, IDENTITY_VERSION, Payload, PayloadId, Visibility};
+
+/// A version-2 identity document, in the shape it is stored in.
+///
+/// The `xyz.radicle.crefs` payload is the sole authority over the default
+/// branch and its write quorum: there is no top-level `threshold`, and the
+/// `xyz.radicle.project` payload carries no `defaultBranch`.
+#[derive(Debug, Clone, PartialEq, Eq, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Doc {
+ /// The payload section.
+ pub payload: BTreeMap<PayloadId, Payload>,
+ /// The delegates section.
+ pub delegates: Vec<Did>,
+ /// Repository visibility.
+ #[serde(default)]
+ pub visibility: Visibility,
+}
+
+impl Serialize for Doc {
+ fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+ // `version` is a constant of this schema rather than data, so it is
+ // written here instead of being held in a field. Version 1 documents
+ // must keep serializing without a `version` key, which is why the two
+ // schemas serialize separately.
+ let public = self.visibility.is_public();
+ let mut doc = serializer.serialize_struct("Doc", if public { 3 } else { 4 })?;
+
+ doc.serialize_field("version", &IDENTITY_VERSION)?;
+ doc.serialize_field("payload", &self.payload)?;
+ doc.serialize_field("delegates", &self.delegates)?;
+ if public {
+ doc.skip_field("visibility")?;
+ } else {
+ doc.serialize_field("visibility", &self.visibility)?;
+ }
+ doc.end()
+ }
+}
+
+impl Doc {
+ /// Check the invariants that distinguish this schema from version 1.
+ ///
+ /// The `xyz.radicle.project` payload must not carry a `defaultBranch`.
+ /// Without this check the field would merely be ignored, since [`Project`]
+ /// swallows unknown fields when deserializing.
+ ///
+ /// [`Project`]: crate::identity::Project
+ pub fn validate(&self) -> Result<(), DefaultBranchDisallowed> {
+ match self.payload.get(PayloadId::project()) {
+ Some(project) if project.get("defaultBranch").is_some() => Err(DefaultBranchDisallowed),
+ _ => Ok(()),
+ }
+ }
+
+ /// Set the write quorum of the default branch.
+ ///
+ /// The threshold lives in the `xyz.radicle.crefs` rule that matches the
+ /// target of the `HEAD` symbolic reference. This rewrites that rule's
+ /// threshold, preserving its `allow` value. If no such rule is present, the
+ /// document is left unchanged.
+ pub fn set_threshold(&mut self, threshold: usize) {
+ let mut crefs = self
+ .raw_canonical_refs()
+ .and_then(|crefs| crefs.ok())
+ .unwrap_or_default();
+
+ // `RawSymbolicRefs` cannot resolve a `HEAD` chain, so validate them
+ // first.
+ let symbolic = SymbolicRefs::try_from(crefs.symbolic().clone()).ok();
+ if let Some(head) = symbolic.as_ref().and_then(|symbolic| symbolic.resolve_head()) {
+ // Target the *most specific* rule matching `HEAD`, consistent with
+ // the enforcement paths (`Doc::canonical_refs`, patch merge,
+ // fetch). Because `RawRules` is keyed by plain byte order,
+ // `RawRules::matches().next()` could rewrite a broad glob (e.g.
+ // `refs/heads/*`) instead of the exact branch rule that actually
+ // governs the quorum. Resolving through validated `Rules` restores
+ // specificity ordering.
+ let pattern = Delegates::new(self.delegates.clone())
+ .ok()
+ .and_then(|delegates| {
+ Rules::from_raw(crefs.raw_rules().clone(), &mut || delegates.clone()).ok()
+ })
+ .and_then(|rules| rules.matches(head).next().map(|(p, _)| p.clone()));
+
+ if let Some(pattern) = pattern
+ && let Some(allow) = crefs
+ .raw_rules()
+ .rules
+ .get(&pattern)
+ .map(|rule| rule.allowed().clone())
+ {
+ crefs
+ .raw_rules_mut()
+ .insert(pattern, rules::Rule::new(allow, threshold));
+ }
+ }
+ let value = json::to_value(crefs).expect("v2::Doc::set_threshold: crefs are serializable");
+ self.payload
+ .insert(PayloadId::canonical_refs().clone(), Payload::from(value));
+ }
+}
+
+/// The `xyz.radicle.project` payload of a version-2 document defines
+/// `defaultBranch`, which version 2 does not allow.
+#[derive(Debug, thiserror::Error)]
+#[error(
+ "the `xyz.radicle.project` payload must not define `defaultBranch`; \
+ the default branch is governed by the `xyz.radicle.crefs` payload"
+)]
+pub struct DefaultBranchDisallowed;
+
+/// Build the `xyz.radicle.crefs` payload for a default branch governed by the
+/// delegates at the given `threshold`.
+///
+/// This produces a rule matching `refs/heads/<default_branch>` with an `allow`
+/// value of `delegates`, and a `HEAD` symbolic reference targeting that branch.
+pub fn default_branch_crefs(default_branch: &RefString, threshold: usize) -> Payload {
+ let mut raw_rules = rules::RawRules::default();
+ raw_rules.insert(
+ branch_pattern(default_branch),
+ rules::Rule::new(rules::Allowed::Delegates, threshold),
+ );
+ let symbolic = RawSymbolicRefs::from([(
+ git::fmt::refname!("HEAD"),
+ git::refs::branch(default_branch).to_ref_string(),
+ )]);
+ let crefs = RawCanonicalRefs::new(raw_rules, symbolic);
+ let value = json::to_value(crefs).expect("v2::default_branch_crefs: crefs are serializable");
+
+ Payload::from(value)
+}
+
+/// The rule pattern that matches exactly the given branch.
+pub(super) fn branch_pattern(branch: &RefString) -> git::fmt::refspec::QualifiedPattern<'static> {
+ git::fmt::refspec::QualifiedPattern::from(git::refs::branch(branch).to_owned())
+}
diff --git a/crates/radicle/src/identity/project.rs b/crates/radicle/src/identity/project.rs
index 308d8a4d77..92d34c72d7 100644
--- a/crates/radicle/src/identity/project.rs
+++ b/crates/radicle/src/identity/project.rs
@@ -7,8 +7,6 @@ use serde::{
use thiserror::Error;
use crate::crypto;
-use crate::git::BranchName;
-use crate::git::{fmt::Qualified, refs::branch};
use crate::identity::doc;
use crate::identity::doc::Payload;
@@ -21,8 +19,6 @@ pub enum ProjectError {
Name(&'static str),
#[error("invalid description: {0}")]
Description(&'static str),
- #[error("invalid default branch: {0}")]
- DefaultBranch(&'static str),
}
/// A valid project name.
@@ -99,8 +95,6 @@ pub struct Project {
name: ProjectName,
/// Project description.
description: String,
- /// Project default branch.
- default_branch: BranchName,
}
impl<'de> Deserialize<'de> for Project {
@@ -113,7 +107,6 @@ impl<'de> Deserialize<'de> for Project {
enum Field {
Name,
Description,
- DefaultBranch,
/// A catch-all variant to allow for unknown fields
Unknown(#[allow(dead_code)] String),
}
@@ -133,7 +126,6 @@ impl<'de> Deserialize<'de> for Project {
{
let mut name = None;
let mut description = None;
- let mut default_branch = None;
while let Some(key) = map.next_key()? {
match key {
@@ -149,21 +141,13 @@ impl<'de> Deserialize<'de> for Project {
}
description = Some(map.next_value()?);
}
- Field::DefaultBranch => {
- if default_branch.is_some() {
- return Err(de::Error::duplicate_field("defaultBranch"));
- }
- default_branch = Some(map.next_value()?);
- }
Field::Unknown(_) => continue,
}
}
let name = name.ok_or_else(|| de::Error::missing_field("name"))?;
let description =
description.ok_or_else(|| de::Error::missing_field("description"))?;
- let default_branch =
- default_branch.ok_or_else(|| de::Error::missing_field("defaultBranch"))?;
- Project::new(name, description, default_branch).map_err(|errs| {
+ Project::new(name, description).map_err(|errs| {
de::Error::custom(
errs.into_iter()
.map(|err| err.to_string())
@@ -173,7 +157,7 @@ impl<'de> Deserialize<'de> for Project {
})
}
}
- const FIELDS: &[&str] = &["name", "description", "defaultBranch"];
+ const FIELDS: &[&str] = &["name", "description"];
deserializer.deserialize_struct("Project", FIELDS, ProjectVisitor)
}
}
@@ -187,12 +171,7 @@ impl Project {
///
/// * `name`'s length must not be empty and must not exceed 255.
/// * `description`'s length must not exceed 255.
- /// * `default_branch`'s length must not be empty and must not exceed 255.
- pub fn new(
- name: ProjectName,
- description: String,
- default_branch: BranchName,
- ) -> Result<Self, Vec<ProjectError>> {
+ pub fn new(name: ProjectName, description: String) -> Result<Self, Vec<ProjectError>> {
let mut errs = Vec::new();
if description.len() > doc::MAX_STRING_LENGTH {
@@ -201,22 +180,8 @@ impl Project {
));
}
- if default_branch.is_empty() {
- errs.push(ProjectError::DefaultBranch(
- "default branch cannot be empty",
- ))
- } else if default_branch.len() > doc::MAX_STRING_LENGTH {
- errs.push(ProjectError::DefaultBranch(
- "default branch cannot exceed 255 bytes",
- ))
- }
-
if errs.is_empty() {
- Ok(Self {
- name,
- description,
- default_branch,
- })
+ Ok(Self { name, description })
} else {
Err(errs)
}
@@ -233,12 +198,10 @@ impl Project {
self,
name: impl Into<Option<ProjectName>>,
description: impl Into<Option<String>>,
- default_branch: impl Into<Option<BranchName>>,
) -> Result<Self, Vec<ProjectError>> {
let name = name.into().unwrap_or(self.name);
let description = description.into().unwrap_or(self.description);
- let default_branch = default_branch.into().unwrap_or(self.default_branch);
- Self::new(name, description, default_branch)
+ Self::new(name, description)
}
#[inline]
@@ -250,21 +213,6 @@ impl Project {
pub fn description(&self) -> &str {
&self.description
}
-
- /// Return the default branch of the project.
- ///
- /// To obtain the default branch of the repository, prefer
- /// [`super::Doc::default_branch_name`].
- #[inline]
- pub fn default_branch(&self) -> &BranchName {
- &self.default_branch
- }
-
- /// Return the qualified name of the default branch.
- #[inline]
- pub fn default_branch_qualified(&self) -> Qualified<'_> {
- branch(&self.default_branch)
- }
}
impl From<Project> for Payload {
diff --git a/crates/radicle/src/rad.rs b/crates/radicle/src/rad.rs
index b8644af311..98360800c6 100644
--- a/crates/radicle/src/rad.rs
+++ b/crates/radicle/src/rad.rs
@@ -44,7 +44,8 @@ pub enum InitError {
Storage(#[from] storage::Error),
}
-/// Initialize a new Radicle project from a git repository.
+/// Initialize a new Radicle project from a git repository, at the current
+/// identity document version.
pub fn init(
repo: &git::raw::Repository,
name: ProjectName,
@@ -53,15 +54,37 @@ pub fn init(
visibility: Visibility,
signer: &impl crypto::Signer,
storage: &impl WriteStorage,
+) -> Result<(RepoId, identity::Doc, SignedRefs), InitError> {
+ init_at(
+ doc::IDENTITY_VERSION,
+ repo,
+ name,
+ description,
+ default_branch,
+ visibility,
+ signer,
+ storage,
+ )
+}
+
+/// Like [`init`], but writing the identity document at the given `version`.
+///
+/// Initializing at an older version keeps the repository readable to releases
+/// that predate [`doc::IDENTITY_VERSION`], until `rad id migrate` is run.
+#[allow(clippy::too_many_arguments)]
+pub fn init_at(
+ version: doc::Version,
+ repo: &git::raw::Repository,
+ name: ProjectName,
+ description: &str,
+ default_branch: BranchName,
+ visibility: Visibility,
+ signer: &impl crypto::Signer,
+ storage: &impl WriteStorage,
) -> Result<(RepoId, identity::Doc, SignedRefs), InitError> {
// TODO: Better error when project id already exists in storage, but remote doesn't.
let delegate: identity::Did = signer.public_key().into();
- let proj = Project::new(
- name.to_owned(),
- description.to_owned(),
- default_branch.clone(),
- )
- .map_err(|errs| {
+ let proj = Project::new(name.to_owned(), description.to_owned()).map_err(|errs| {
InitError::ProjectPayload(
errs.into_iter()
.map(|err| err.to_string())
@@ -69,7 +92,7 @@ pub fn init(
.join(", "),
)
})?;
- let doc = identity::Doc::initial(proj, delegate, visibility);
+ let doc = identity::Doc::initial_at(version, proj, delegate, &default_branch, visibility)?;
let (project, identity) = Repository::init(&doc, storage, signer)?;
let url = git::Url::from(project.id);
@@ -173,16 +196,11 @@ pub fn fork_remote(
// refs/namespaces/<pk>/refs/tags/*
let me = signer.public_key();
- let doc = storage.get(proj)?.ok_or(ForkError::NotFound(proj))?;
let repository = storage.repository_mut(proj)?;
+ let default_branch = git::refs::branch(&repository.default_branch_name()?);
let raw = repository.raw();
-
- #[allow(clippy::unwrap_used)]
- let default_branch = doc.default_branch().unwrap();
-
let remote_head = raw.refname_to_id(default_branch.with_namespace(remote.into()).as_str())?;
-
raw.reference(
&default_branch.with_namespace(me.into()),
remote_head,
@@ -564,7 +582,7 @@ mod tests {
assert_eq!(remotes[public_key].refs.refs(), refs.refs());
assert_eq!(project.name(), "acme");
assert_eq!(project.description(), "Acme's repo");
- assert_eq!(project.default_branch(), &git::fmt::refname!("master"));
+ assert_eq!(doc.default_branch().unwrap().as_str(), "refs/heads/master");
assert_eq!(doc.delegates().first(), &Did::from(public_key));
}
diff --git a/crates/radicle/src/storage.rs b/crates/radicle/src/storage.rs
index 09c8ac3def..4b88f0f7e0 100644
--- a/crates/radicle/src/storage.rs
+++ b/crates/radicle/src/storage.rs
@@ -527,6 +527,12 @@ pub trait ReadRepository: Sized + ValidateRepository {
Ok(self.identity_doc()?.default_branch()?.to_owned())
}
+ /// Gets the short name of the default branch of self, according to the
+ /// canonical references payload in the identity document.
+ fn default_branch_name(&self) -> Result<crate::git::fmt::RefString, RepositoryError> {
+ Ok(self.identity_doc()?.default_branch_name()?)
+ }
+
/// Compute the canonical head of this repository.
///
/// Ignores any existing `HEAD` reference.
diff --git a/crates/radicle/src/storage/refs.rs b/crates/radicle/src/storage/refs.rs
index 51b00402a9..6029f4aec5 100644
--- a/crates/radicle/src/storage/refs.rs
+++ b/crates/radicle/src/storage/refs.rs
@@ -565,12 +565,12 @@ mod tests {
{
let paris_doc = paris_doc
.with_edits(|doc| {
- doc.delegates.push(bob.public_key().into());
+ doc.delegates_mut().push(bob.public_key().into());
})
.unwrap();
let london_doc = london_doc
.with_edits(|doc| {
- doc.delegates.push(bob.public_key().into());
+ doc.delegates_mut().push(bob.public_key().into());
})
.unwrap();
diff --git a/crates/radicle/src/test/arbitrary.rs b/crates/radicle/src/test/arbitrary.rs
index ce81c2397e..9357cb814c 100644
--- a/crates/radicle/src/test/arbitrary.rs
+++ b/crates/radicle/src/test/arbitrary.rs
@@ -15,7 +15,7 @@ use crate::identity::doc::Visibility;
use crate::identity::project::ProjectName;
use crate::identity::{
Did,
- doc::{Doc, DocAt, RawDoc, RepoId},
+ doc::{Doc, DocAt, IDENTITY_VERSION, RawDoc, RepoId, Version},
project::Project,
};
use crate::node::address::{AddressType, Source};
@@ -140,13 +140,8 @@ impl Arbitrary for Project {
let description = iter::repeat_with(|| rng.alphanumeric())
.take(length * 2)
.collect();
- let default_branch: git::fmt::RefString = iter::repeat_with(|| rng.alphanumeric())
- .take(length)
- .collect::<String>()
- .try_into()
- .unwrap();
- Project::new(name, description, default_branch).unwrap()
+ Project::new(name, description).unwrap()
}
}
@@ -162,13 +157,43 @@ impl Arbitrary for Visibility {
}
}
+/// An arbitrary stored document version, so that generated documents exercise
+/// both the version-1 and the version-2 path.
+fn identity_version(g: &mut qcheck::Gen) -> Version {
+ if bool::arbitrary(g) {
+ #[allow(clippy::unwrap_used)]
+ Version::new(1).unwrap()
+ } else {
+ IDENTITY_VERSION
+ }
+}
+
+/// An arbitrary [`RawDoc`] stored at the given `version`.
+pub fn raw_doc_at(version: Version) -> RawDoc {
+ RawDoc::new_at(
+ version,
+ r#gen::<Project>(1),
+ vec![r#gen::<Did>(1)],
+ &git::fmt::refname!("master"),
+ 1,
+ Visibility::Public,
+ )
+}
+
impl Arbitrary for RawDoc {
fn arbitrary(g: &mut qcheck::Gen) -> Self {
let proj = Project::arbitrary(g);
let delegate = Did::arbitrary(g);
let visibility = Visibility::arbitrary(g);
- Self::new(proj, vec![delegate], 1, visibility)
+ Self::new_at(
+ identity_version(g),
+ proj,
+ vec![delegate],
+ &git::fmt::refname!("master"),
+ 1,
+ visibility,
+ )
}
}
@@ -178,8 +203,16 @@ impl Arbitrary for Doc {
let delegates = vec_distinct::<Did>(1..6);
let threshold = delegates.len() / 2 + 1;
let visibility = Visibility::arbitrary(g);
- let doc = RawDoc::new(project, delegates, threshold, visibility);
+ let doc = RawDoc::new_at(
+ identity_version(g),
+ project,
+ delegates,
+ &git::fmt::refname!("master"),
+ threshold,
+ visibility,
+ );
+ #[allow(clippy::unwrap_used)]
doc.verified().unwrap()
}
}
diff --git a/rad-id.1.adoc b/rad-id.1.adoc
index 173d91e29c..49e508c9f7 100644
--- a/rad-id.1.adoc
+++ b/rad-id.1.adoc
@@ -15,6 +15,7 @@ rad-id - Manage changes to a Radicle repository's identity.
*rad id* [<option>...] +
*rad id* _list_ [<option>...] +
*rad id* _update_ [--title <string>] [--description <string>] <option>... +
+*rad id* _migrate_ [--title <string>] [--description <string>] [<option>...] +
*rad id* _edit_ <revision-id> [--title <string>] [--description <string>] [<option>...] +
*rad id* _show_ <revision-id> [<option>...] +
*rad id* _accept_ | _reject_ <revision-id> [<option>...] +
@@ -89,6 +90,26 @@ automatically accepted and included into the identity document.
*--edit*::
Opens your $EDITOR to edit the JSON contents directly.
+=== migrate
+
+Proposes a revision that migrates the identity document to the current version.
+
+An identity document written by an older release keeps its stored version. It is
+migrated to the current version in memory each time it is read, so a reader
+always sees the current shape, but the document on disk does not change. This
+command writes the migration down, as an ordinary revision that the delegates
+vote on.
+
+Once the migration is adopted, the repository is no longer readable to releases
+that predate the new version. The command fails if the document is already at
+the current version.
+
+*--title* _<string>_::
+ Set the title for the new revision.
+
+*--description* _<string>_::
+ Set the description for the new revision.
+
=== edit
Edit an existing revision to the identity document. The revision must still be
commit 92eab97c716fbe3d7ac121fbd77382d6c4c7a724
Author: Daniel Norman <daniel@norman.life>
Date: Mon Aug 17 15:12:18 2026 +0200
patch: Use cref rule quorum for merge tally
To determine whether a patch has been merged to the default branch, we
tally merges based on the default branch quorum: allow set and
threshold. With the introduction of custom branch, the tallying wasn't
updated to use the quorum rules for the target branch, instead merging
on the identity document threshold and delegate set.
This fix uses the `allow` set and the `threshold` of the most specific
rule that matches the target branch of patch.
Note that a reference that no rule matches never becomes canonical, so a
patch that targets one can never reach a quorum.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76f0731c3d..675a94bcab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## Unreleased
+
+## Fixes
+
+- A patch now merges on the quorum of the canonical reference rule that
+ matches its target branch, not on the identity document threshold.
+ Only merges by DIDs in the rule's `allow` set count, and they must
+ reach the rule's `threshold`. A patch that targets a branch which no
+ rule matches cannot merge.
+
## 1.10.3 - 2026-09-07
### Fixes
diff --git a/crates/radicle/src/cob/patch.rs b/crates/radicle/src/cob/patch.rs
index 7b83ca4cf3..8016b63927 100644
--- a/crates/radicle/src/cob/patch.rs
+++ b/crates/radicle/src/cob/patch.rs
@@ -1250,7 +1250,7 @@ impl Patch {
return Ok(());
};
- let expected_branch = self.merge_target_branch(identity)?;
+ let expected_branch = self.merge_target_branch(identity)?.to_owned();
// Nb. We don't return an error in case the merge commit is not an
// ancestor of the default branch. The default branch can change
@@ -1274,15 +1274,33 @@ impl Patch {
},
);
+ // The quorum for the target branch is defined by the canonical
+ // reference rule that matches it: only merges made by an allowed
+ // DID count, and the rule's threshold must be reached.
+ //
+ // A branch that no rule matches never becomes a canonical
+ // reference, so a patch targeting it can never reach a quorum.
+ //
+ // As above, a merge we cannot evaluate is skipped rather
+ // than rejected.
+ let Ok(crefs) = identity.canonical_refs() else {
+ return Ok(());
+ };
+ let Some((_, rule)) = crefs.rules().matches(&expected_branch).next() else {
+ return Ok(());
+ };
+
let mut merges = self.merges.iter().fold(
HashMap::<(RevisionId, git::Oid), usize>::new(),
- |mut acc, (_, merge)| {
- *acc.entry((merge.revision, merge.commit)).or_default() += 1;
+ |mut acc, (actor, merge)| {
+ if rule.allowed().contains(&Did::from(*actor)) {
+ *acc.entry((merge.revision, merge.commit)).or_default() += 1;
+ }
acc
},
);
- // Discard revisions that weren't merged by a threshold of delegates.
- merges.retain(|_, count| *count >= identity.threshold());
+ // Discard revisions that weren't merged by a threshold of allowed DIDs.
+ merges.retain(|_, count| *count >= usize::from(*rule.threshold()));
match merges.into_keys().collect::<Vec<_>>().as_slice() {
[] => {
@@ -3370,6 +3388,274 @@ mod test {
);
}
+ /// Build a patch targeting `refs/heads/accepted`, together with the
+ /// document and repository needed to apply merges to it.
+ ///
+ /// The document has four delegates and a threshold of three, while the
+ /// rule matching the target branch allows only Alice and Bob, with a
+ /// threshold of two. The two quorums are distinguishable.
+ fn merge_quorum_fixture(
+ signers: &[&SigningKey],
+ commit: git::Oid,
+ ) -> (Patch, Doc, MockRepository, RevisionId) {
+ let base = git::Oid::from_str("cb18e95ada2bb38aadd8e6cef0963ce37a87add3").unwrap();
+ let [alice, bob, eve, dave] = signers else {
+ panic!("merge_quorum_fixture: expected four signers");
+ };
+
+ let mut raw_doc = RawDoc::new(
+ r#gen::<Project>(1),
+ vec![alice.did(), bob.did(), eve.did(), dave.did()],
+ 3,
+ identity::Visibility::Public,
+ );
+ let crefs = serde_json::json!({
+ "rules": {
+ "refs/heads/accepted": {
+ "allow": [alice.did(), bob.did()],
+ "threshold": 2
+ }
+ }
+ });
+ raw_doc.payload.insert(
+ identity::doc::PayloadId::canonical_refs().clone(),
+ identity::doc::Payload::from(crefs),
+ );
+ let doc = raw_doc.verified().unwrap();
+
+ // Every signer publishes the merge commit on the target branch, so that
+ // the merge is not skipped for being unreachable.
+ let branch = git::fmt::qualified!("refs/heads/accepted");
+ let mut repo = MockRepository::new(r#gen::<RepoId>(1), doc.clone());
+ for signer in signers {
+ let mut refs = crate::storage::refs::Refs::new();
+ refs.insert(branch.to_ref_string(), commit);
+ repo.remotes.insert(
+ *signer.public_key(),
+ crate::storage::refs::arbitrary::signed_refs(refs, commit, *signer),
+ );
+ }
+
+ let revision_id = RevisionId(arbitrary::entry_id());
+ let patch = Patch::new(
+ cob::Title::new("My Patch").unwrap(),
+ MergeTarget::Branch(TargetBranch::try_from("accepted").unwrap()),
+ (
+ revision_id,
+ Revision::new(
+ revision_id,
+ Author::new(alice.did()),
+ String::new(),
+ base,
+ commit,
+ env::local_time().into(),
+ Default::default(),
+ ),
+ ),
+ );
+
+ (patch, doc, repo, revision_id)
+ }
+
+ fn apply_merge(
+ patch: &mut Patch,
+ doc: &Doc,
+ repo: &MockRepository,
+ revision: RevisionId,
+ commit: git::Oid,
+ signer: &SigningKey,
+ ) {
+ patch
+ .action(
+ Action::Merge { revision, commit },
+ arbitrary::entry_id(),
+ *signer.public_key(),
+ env::local_time().into(),
+ &[],
+ doc,
+ repo,
+ )
+ .unwrap();
+ }
+
+ #[test]
+ fn test_patch_merge_quorum_uses_rule_threshold() {
+ let commit = git::Oid::from_str("518d5069f94c03427f694bb494ac1cd7d1339380").unwrap();
+ let alice = SigningKey::mock(14);
+ let bob = SigningKey::mock(23);
+ let eve = SigningKey::mock(31);
+ let dave = SigningKey::mock(42);
+ let signers = [&alice, &bob, &eve, &dave];
+
+ let (mut patch, doc, repo, revision) = merge_quorum_fixture(&signers, commit);
+
+ apply_merge(&mut patch, &doc, &repo, revision, commit, &alice);
+ assert!(
+ !patch.is_merged(),
+ "one of two allowed merges is not a quorum"
+ );
+
+ // Two allowed merges reach the rule's threshold, even though the
+ // document threshold of three is not met.
+ apply_merge(&mut patch, &doc, &repo, revision, commit, &bob);
+ assert_eq!(
+ *patch.state(),
+ State::Merged { revision, commit },
+ "the rule's threshold of two is reached"
+ );
+ }
+
+ #[test]
+ fn test_patch_merge_quorum_ignores_disallowed_merges() {
+ let commit = git::Oid::from_str("518d5069f94c03427f694bb494ac1cd7d1339380").unwrap();
+ let alice = SigningKey::mock(14);
+ let bob = SigningKey::mock(23);
+ let eve = SigningKey::mock(31);
+ let dave = SigningKey::mock(42);
+ let signers = [&alice, &bob, &eve, &dave];
+
+ let (mut patch, doc, repo, revision) = merge_quorum_fixture(&signers, commit);
+
+ // Eve and Dave are delegates, but the rule does not allow them, so
+ // their merges never count towards the quorum.
+ apply_merge(&mut patch, &doc, &repo, revision, commit, &eve);
+ apply_merge(&mut patch, &doc, &repo, revision, commit, &dave);
+ apply_merge(&mut patch, &doc, &repo, revision, commit, &alice);
+
+ assert_eq!(patch.merges.len(), 3, "all three merges are recorded");
+ assert!(
+ !patch.is_merged(),
+ "only Alice's merge counts, which is below the rule's threshold"
+ );
+ }
+
+ #[test]
+ fn test_patch_merge_quorum_without_matching_rule() {
+ let base = git::Oid::from_str("cb18e95ada2bb38aadd8e6cef0963ce37a87add3").unwrap();
+ let commit = git::Oid::from_str("518d5069f94c03427f694bb494ac1cd7d1339380").unwrap();
+ let alice = SigningKey::mock(14);
+
+ // The only rule is the one synthesized for the default branch, so
+ // nothing matches `refs/heads/staging`.
+ let project = Project::new(
+ ProjectName::from_str("unruled").unwrap(),
+ String::new(),
+ BranchName::from(git::fmt::RefString::try_from("master").unwrap()),
+ )
+ .unwrap();
+ let doc = RawDoc::new(project, vec![alice.did()], 1, identity::Visibility::Public)
+ .verified()
+ .unwrap();
+
+ let branch = git::fmt::qualified!("refs/heads/staging");
+ let mut repo = MockRepository::new(r#gen::<RepoId>(1), doc.clone());
+ let mut refs = crate::storage::refs::Refs::new();
+ refs.insert(branch.to_ref_string(), commit);
+ repo.remotes.insert(
+ *alice.public_key(),
+ crate::storage::refs::arbitrary::signed_refs(refs, commit, &alice),
+ );
+
+ let revision = RevisionId(arbitrary::entry_id());
+ let mut patch = Patch::new(
+ cob::Title::new("My Patch").unwrap(),
+ MergeTarget::Branch(TargetBranch::try_from("staging").unwrap()),
+ (
+ revision,
+ Revision::new(
+ revision,
+ Author::new(alice.did()),
+ String::new(),
+ base,
+ commit,
+ env::local_time().into(),
+ Default::default(),
+ ),
+ ),
+ );
+
+ // Alice is the only delegate, so she meets the document threshold on
+ // her own, but no rule makes `refs/heads/staging` canonical.
+ apply_merge(&mut patch, &doc, &repo, revision, commit, &alice);
+
+ assert_eq!(patch.merges.len(), 1, "the merge is recorded");
+ assert!(
+ !patch.is_merged(),
+ "a branch that no rule matches can never reach a quorum"
+ );
+ }
+
+ /// The default branch keeps the quorum it had before rules were consulted.
+ ///
+ /// Without a `xyz.radicle.crefs` payload, the rule for the default branch
+ /// is synthesized as `delegates` at the document threshold, so the tally
+ /// must behave exactly as it did when it used the document directly.
+ #[test]
+ fn test_patch_merge_quorum_of_default_branch() {
+ let base = git::Oid::from_str("cb18e95ada2bb38aadd8e6cef0963ce37a87add3").unwrap();
+ let commit = git::Oid::from_str("518d5069f94c03427f694bb494ac1cd7d1339380").unwrap();
+ let alice = SigningKey::mock(14);
+ let bob = SigningKey::mock(23);
+ let eve = SigningKey::mock(31);
+
+ let project = Project::new(
+ ProjectName::from_str("unruled").unwrap(),
+ String::new(),
+ BranchName::from(git::fmt::RefString::try_from("master").unwrap()),
+ )
+ .unwrap();
+ let doc = RawDoc::new(
+ project,
+ vec![alice.did(), bob.did(), eve.did()],
+ 2,
+ identity::Visibility::Public,
+ )
+ .verified()
+ .unwrap();
+
+ let branch = git::fmt::qualified!("refs/heads/master");
+ let mut repo = MockRepository::new(r#gen::<RepoId>(1), doc.clone());
+ for signer in [&alice, &bob, &eve] {
+ let mut refs = crate::storage::refs::Refs::new();
+ refs.insert(branch.to_ref_string(), commit);
+ repo.remotes.insert(
+ *signer.public_key(),
+ crate::storage::refs::arbitrary::signed_refs(refs, commit, signer),
+ );
+ }
+
+ let revision = RevisionId(arbitrary::entry_id());
+ let mut patch = Patch::new(
+ cob::Title::new("My Patch").unwrap(),
+ MergeTarget::Delegates,
+ (
+ revision,
+ Revision::new(
+ revision,
+ Author::new(alice.did()),
+ String::new(),
+ base,
+ commit,
+ env::local_time().into(),
+ Default::default(),
+ ),
+ ),
+ );
+
+ apply_merge(&mut patch, &doc, &repo, revision, commit, &alice);
+ assert!(
+ !patch.is_merged(),
+ "one of three delegates is below the document threshold"
+ );
+
+ apply_merge(&mut patch, &doc, &repo, revision, commit, &bob);
+ assert_eq!(
+ *patch.state(),
+ State::Merged { revision, commit },
+ "the synthesized rule resolves to the document threshold of two"
+ );
+ }
+
#[test]
fn json_serialization() {
let edit = Action::Label {
diff --git a/crates/radicle/src/storage/refs/arbitrary.rs b/crates/radicle/src/storage/refs/arbitrary.rs
index 67f07d0de0..e137a09b66 100644
--- a/crates/radicle/src/storage/refs/arbitrary.rs
+++ b/crates/radicle/src/storage/refs/arbitrary.rs
@@ -27,6 +27,19 @@ pub fn signed_refs_at(g: &mut qcheck::Gen, root: Oid, signer: &impl crypto::Sign
}
}
+/// Sign an exact set of `refs`, for tests that need specific reference names.
+pub fn signed_refs(refs: Refs, at: Oid, signer: &impl crypto::Signer) -> SignedRefs {
+ let signature = crypto::signature::Signer::sign(signer, &refs.canonical());
+ SignedRefs {
+ refs,
+ signature,
+ id: *signer.public_key(),
+ level: FeatureLevel::default(),
+ parent: None,
+ at,
+ }
+}
+
impl Arbitrary for Refs {
fn arbitrary(g: &mut qcheck::Gen) -> Self {
let names = &[
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 8c691f9b-089b-4823-8984-e8fb3cbca6e4 -v /opt/radcis/ci.rad.levitte.org/cci/state/8c691f9b-089b-4823-8984-e8fb3cbca6e4/s:/8c691f9b-089b-4823-8984-e8fb3cbca6e4/s:ro -v /opt/radcis/ci.rad.levitte.org/cci/state/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w:/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w -w /8c691f9b-089b-4823-8984-e8fb3cbca6e4/w -v /opt/radcis/ci.rad.levitte.org/.radicle:/${id}/.radicle:ro -e RAD_HOME=/${id}/.radicle rust:trixie bash /8c691f9b-089b-4823-8984-e8fb3cbca6e4/s/script.sh
+ export 'RUSTDOCFLAGS=-D warnings'
+ RUSTDOCFLAGS='-D warnings'
+ cargo --version
info: syncing channel updates for '1.98.0-x86_64-unknown-linux-gnu'
info: latest update on 2026-08-20, rust version 1.98.0 (88d9e12ae 2026-08-18)
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.98.0 (797e8a9bc 2026-08-05)
+ rustc --version
rustc 1.98.0 (88d9e12ae 2026-08-18)
+ cargo fmt --check
+ cargo clippy --all-targets --workspace -- --deny warnings
Updating crates.io index
Downloading crates ...
Downloaded cyphergraphy v0.3.1
Downloaded clap_derive v4.6.0
Downloaded crypto-common v0.1.7
Downloaded cipher v0.4.4
Downloaded quick-error v1.2.3
Downloaded convert_case v0.10.0
Downloaded ctr v0.9.2
Downloaded qcheck-macros v1.0.0
Downloaded gix-sec v0.14.0
Downloaded clap v4.6.0
Downloaded addr2line v0.25.1
Downloaded quote v1.0.45
Downloaded const-oid v0.9.6
Downloaded fancy-regex v0.14.0
Downloaded gix-pack v0.70.0
Downloaded clap_builder v4.6.0
Downloaded crossbeam-utils v0.8.21
Downloaded fastrand v2.3.0
Downloaded chrono v0.4.44
Downloaded rand v0.8.5
Downloaded crypto-bigint v0.5.5
Downloaded getrandom v0.3.4
Downloaded rand v0.9.2
Downloaded dunce v1.0.5
Downloaded env_logger v0.11.9
Downloaded errno v0.3.14
Downloaded console v0.16.3
Downloaded gix-prompt v0.15.0
Downloaded colorchoice v1.0.5
Downloaded equivalent v1.0.2
Downloaded fnv v1.0.7
Downloaded gix-features v0.48.0
Downloaded gix-packetline v0.21.5
Downloaded serde_core v1.0.228
Downloaded gix-chunk v0.7.1
Downloaded snapbox-macros v1.1.0
Downloaded generic-array v0.14.7
Downloaded rustc-demangle v0.1.27
Downloaded signature v1.6.4
Downloaded shlex v1.3.0
Downloaded ssh-agent-lib v0.6.0
Downloaded siphasher v1.0.2
Downloaded sval_dynamic v2.17.0
Downloaded rustc_version v0.4.1
Downloaded thiserror v2.0.18
Downloaded rsa v0.9.10
Downloaded const-str v0.4.3
Downloaded find-msvc-tools v0.1.9
Downloaded data-encoding-macro v0.1.19
Downloaded same-file v1.0.6
Downloaded rfc6979 v0.4.0
Downloaded rand_xorshift v0.4.0
Downloaded signal-hook-registry v1.4.8
Downloaded sec1 v0.7.3
Downloaded sha2 v0.10.9
Downloaded ssh-cipher v0.2.0
Downloaded spki v0.7.3
Downloaded scopeguard v1.2.0
Downloaded shell-words v1.1.1
Downloaded siphasher v0.3.11
Downloaded strsim v0.11.1
Downloaded smallvec v1.15.1
Downloaded schemars_derive v1.2.1
Downloaded systemd-journal-logger v2.2.2
Downloaded scrypt v0.11.0
Downloaded stable_deref_trait v1.2.1
Downloaded serde_spanned v1.0.4
Downloaded sval_fmt v2.17.0
Downloaded serde_fmt v1.1.0
Downloaded clap_lex v1.1.0
Downloaded cpufeatures v0.2.17
Downloaded data-encoding-macro-internal v0.1.17
Downloaded gix-quote v0.7.1
Downloaded semver v1.0.27
Downloaded sqlite v0.37.0
Downloaded form_urlencoded v1.2.2
Downloaded dyn-clone v1.0.20
Downloaded gix-glob v0.26.0
Downloaded subtle v2.6.1
Downloaded faster-hex v0.10.0
Downloaded gix-fs v0.21.1
Downloaded erased-serde v0.4.10
Downloaded gix-config-value v0.18.0
Downloaded gix-actor v0.41.0
Downloaded idna_adapter v1.2.1
Downloaded regex v1.12.3
Downloaded ref-cast-impl v1.0.25
Downloaded test-log-macros v0.2.19
Downloaded fast-glob v0.3.3
Downloaded gix-command v0.9.0
Downloaded gix-lock v23.0.0
Downloaded ghash v0.5.1
Downloaded curve25519-dalek-derive v0.1.1
Downloaded document-features v0.2.12
Downloaded gix-hashtable v0.15.0
Downloaded signal-hook-mio v0.2.5
Downloaded socks5-client v0.4.3
Downloaded cypheraddr v0.4.1
Downloaded is_terminal_polyfill v1.70.2
Downloaded matchers v0.2.0
Downloaded noise-framework v0.4.1
Downloaded heck v0.5.0
Downloaded secrecy v0.10.3
Downloaded ssh-encoding v0.2.0
Downloaded lazy_static v1.5.0
Downloaded rand_chacha v0.3.1
Downloaded sval_ref v2.17.0
Downloaded ecdsa v0.16.9
Downloaded ed25519 v2.2.3
Downloaded either v1.15.0
Downloaded env_filter v1.0.0
Downloaded fluent-uri v0.3.2
Downloaded gix-commitgraph v0.37.0
Downloaded gix-error v0.2.3
Downloaded gix-hash v0.25.0
Downloaded gix-negotiate v0.31.0
Downloaded gix-refspec v0.41.0
Downloaded gix-revision v0.45.0
Downloaded num v0.4.3
Downloaded percent-encoding v2.3.2
Downloaded serde-untagged v0.1.9
Downloaded cbc v0.1.2
Downloaded colored v2.2.0
Downloaded crc32fast v1.5.0
Downloaded data-encoding v2.10.0
Downloaded diff v0.1.13
Downloaded digest v0.10.7
Downloaded displaydoc v0.2.5
Downloaded ec25519 v0.1.0
Downloaded ed25519 v1.5.3
Downloaded email_address v0.2.9
Downloaded escargot v0.5.15
Downloaded ff v0.13.1
Downloaded gix-credentials v0.38.0
Downloaded gix-revwalk v0.31.0
Downloaded pem-rfc7468 v0.7.0
Downloaded sval_json v2.17.0
Downloaded sval_nested v2.17.0
Downloaded sval_serde v2.17.0
Downloaded gix-validate v0.11.1
Downloaded test-log v0.2.19
Downloaded rs-release v0.1.11
Downloaded gix-date v0.15.3
Downloaded fraction v0.15.3
Downloaded tracing-log v0.2.0
Downloaded polyval v0.6.2
Downloaded bytecount v0.6.9
Downloaded gix-path v0.12.0
Downloaded phf v0.11.3
Downloaded getrandom v0.2.17
Downloaded value-bag-sval2 v1.12.0
Downloaded aead v0.5.2
Downloaded litrs v1.0.0
Downloaded bcrypt-pbkdf v0.10.0
Downloaded tree-sitter-language v0.1.7
Downloaded ref-cast v1.0.25
Downloaded clap_complete v4.6.0
Downloaded getrandom v0.4.3
Downloaded unicode-display-width v0.3.0
Downloaded universal-hash v0.5.1
Downloaded synstructure v0.13.2
Downloaded rand_core v0.9.5
Downloaded elliptic-curve v0.13.8
Downloaded amplify_syn v2.0.1
Downloaded anstream v0.6.21
Downloaded streaming-iterator v0.1.9
Downloaded rand_chacha v0.9.0
Downloaded thiserror-impl v1.0.69
Downloaded gix-diff v0.63.0
Downloaded gix-odb v0.80.0
Downloaded simd-adler32 v0.3.8
Downloaded block-padding v0.3.3
Downloaded spin v0.9.9
Downloaded yoke-derive v0.8.1
Downloaded parking_lot_core v0.9.12
Downloaded toml_datetime v0.7.5+spec-1.1.0
Downloaded thiserror v1.0.69
Downloaded signature v2.2.0
Downloaded num-traits v0.2.19
Downloaded toml v0.9.12+spec-1.1.0
Downloaded gix-shallow v0.12.0
Downloaded vsimd v0.8.0
Downloaded base16ct v0.2.0
Downloaded amplify_num v0.5.3
Downloaded rusty-fork v0.3.1
Downloaded sqlite3-sys v0.18.0
Downloaded block-buffer v0.10.4
Downloaded crossbeam-channel v0.5.15
Downloaded timeago v0.4.2
Downloaded sval_buffer v2.17.0
Downloaded chacha20poly1305 v0.10.1
Downloaded gix-ref v0.63.0
Downloaded heapless v0.8.0
Downloaded miniz_oxide v0.8.9
Downloaded unicode-ident v1.0.24
Downloaded bytesize v2.3.1
Downloaded derive_more v2.1.1
Downloaded keccak v0.1.6
Downloaded num-iter v0.1.45
Downloaded value-bag v1.12.0
Downloaded p256 v0.13.2
Downloaded gix-utils v0.3.2
Downloaded anyhow v1.0.102
Downloaded base64ct v1.8.3
Downloaded gix-protocol v0.61.0
Downloaded der v0.7.10
Downloaded flate2 v1.1.9
Downloaded gix-object v0.60.0
Downloaded gix-transport v0.57.0
Downloaded itoa v1.0.17
Downloaded hex-literal v1.1.0
Downloaded normalize-line-endings v0.3.0
Downloaded tracing-core v0.1.36
Downloaded derive_more-impl v2.1.1
Downloaded ed25519-dalek v2.2.0
Downloaded arc-swap v1.9.1
Downloaded adler2 v2.0.1
Downloaded yansi v1.0.1
Downloaded hash32 v0.3.1
Downloaded multibase v0.9.2
Downloaded serde_derive_internals v0.29.1
Downloaded tinyvec_macros v0.1.1
Downloaded emojis v0.6.4
Downloaded rustversion v1.0.22
Downloaded sha1 v0.10.6
Downloaded gix-trace v0.1.21
Downloaded sem_safe v0.2.1
Downloaded icu_normalizer v2.1.1
Downloaded jobserver v0.1.34
Downloaded salsa20 v0.10.2
Downloaded structured-logger v1.0.5
Downloaded gix-tempfile v23.0.0
Downloaded thiserror-impl v2.0.18
Downloaded uuid-simd v0.8.0
Downloaded tree-sitter-go v0.23.4
Downloaded cyphernet v0.5.4
Downloaded num-complex v0.4.6
Downloaded crossterm v0.29.0
Downloaded anstyle-query v1.1.5
Downloaded human-panic v2.0.6
Downloaded maybe-async v0.2.10
Downloaded qcheck v1.0.0
Downloaded opaque-debug v0.3.1
Downloaded zerovec-derive v0.11.2
Downloaded thread_local v1.1.9
Downloaded zmij v1.0.21
Downloaded inout v0.1.4
Downloaded sval v2.17.0
Downloaded pastey v0.2.1
Downloaded rand_core v0.6.4
Downloaded yoke v0.8.1
Downloaded tempfile v3.27.0
Downloaded outref v0.5.2
Downloaded potential_utf v0.1.4
Downloaded primeorder v0.13.6
Downloaded unit-prefix v0.5.2
Downloaded base-x v0.2.11
Downloaded bit-set v0.8.0
Downloaded ryu v1.0.23
Downloaded value-bag-serde1 v1.12.0
Downloaded base256emoji v1.0.2
Downloaded lexopt v0.3.2
Downloaded nonempty v0.12.0
Downloaded cfg-if v1.0.4
Downloaded ppv-lite86 v0.2.21
Downloaded tinystr v0.8.2
Downloaded wait-timeout v0.2.1
Downloaded zerofrom-derive v0.1.6
Downloaded utf8parse v0.2.2
Downloaded base32 v0.4.0
Downloaded group v0.13.0
Downloaded gix-url v0.36.0
Downloaded toml_writer v1.0.7+spec-1.1.0
Downloaded zeroize v1.9.0
Downloaded hmac v0.12.1
Downloaded libm v0.2.16
Downloaded nonempty v0.9.0
Downloaded borrow-or-share v0.2.4
Downloaded phf_shared v0.11.3
Downloaded pbkdf2 v0.12.2
Downloaded utf8_iter v1.0.4
Downloaded version_check v0.9.5
Downloaded tree-sitter-highlight v0.24.7
Downloaded typeid v1.0.3
Downloaded tree-sitter-html v0.23.2
Downloaded bit-vec v0.8.0
Downloaded p521 v0.13.3
Downloaded humantime v2.3.0
Downloaded lock_api v0.4.14
Downloaded tree-sitter-toml-ng v0.6.0
Downloaded poly1305 v0.8.0
Downloaded pin-project-lite v0.2.17
Downloaded chacha20 v0.9.1
Downloaded match-lookup v0.1.2
Downloaded num-cmp v0.1.0
Downloaded signal-hook v0.3.18
Downloaded ascii v1.1.0
Downloaded parking_lot v0.12.5
Downloaded tinyvec v1.11.0
Downloaded autocfg v1.5.0
Downloaded litemap v0.8.1
Downloaded signals_receipts v0.2.5
Downloaded once_cell v1.21.4
Downloaded nu-ansi-term v0.50.3
Downloaded pkg-config v0.3.32
Downloaded jsonschema v0.30.0
Downloaded tree-sitter-css v0.23.2
Downloaded tree-sitter-json v0.24.8
Downloaded amplify_derive v4.0.1
Downloaded zerofrom v0.1.6
Downloaded icu_normalizer_data v2.1.1
Downloaded icu_provider v2.1.1
Downloaded bitflags v2.11.0
Downloaded serde_derive v1.0.228
Downloaded sharded-slab v0.1.7
Downloaded pretty_assertions v1.4.1
Downloaded portable-atomic v1.13.1
Downloaded anstream v1.0.0
Downloaded p384 v0.13.1
Downloaded unarray v0.1.4
Downloaded base64 v0.22.1
Downloaded idna v1.1.0
Downloaded byteorder v1.5.0
Downloaded iana-time-zone v0.1.65
Downloaded cc v1.2.57
Downloaded icu_collections v2.1.1
Downloaded memmap2 v0.9.10
Downloaded num-rational v0.4.2
Downloaded tracing-subscriber v0.3.23
Downloaded url v2.5.8
Downloaded pkcs1 v0.7.5
Downloaded zerotrie v0.2.3
Downloaded gix-traverse v0.57.0
Downloaded pkcs8 v0.10.2
Downloaded referencing v0.30.0
Downloaded unicode-segmentation v1.12.0
Downloaded git2 v0.21.0
Downloaded inquire v0.9.4
Downloaded writeable v0.6.2
Downloaded anstyle v1.0.14
Downloaded anstyle-parse v0.2.7
Downloaded memchr v2.8.0
Downloaded indexmap v2.13.0
Downloaded num-bigint v0.4.6
Downloaded socket2 v0.5.10
Downloaded hashbrown v0.16.1
Downloaded num-bigint-dig v0.8.6
Downloaded num-integer v0.1.46
Downloaded blowfish v0.9.1
Downloaded serde v1.0.228
Downloaded itertools v0.14.0
Downloaded anstyle-parse v1.0.0
Downloaded snapbox v1.2.2
Downloaded gimli v0.32.3
Downloaded tree-sitter v0.24.7
Downloaded similar v3.1.1
Downloaded ahash v0.8.12
Downloaded curve25519-dalek v4.1.3
Downloaded log v0.4.29
Downloaded proptest v1.10.0
Downloaded icu_properties v2.1.2
Downloaded object v0.37.3
Downloaded proc-macro2 v1.0.106
Downloaded zlib-rs v0.6.5
Downloaded walkdir v2.5.0
Downloaded ssh-key v0.6.7
Downloaded icu_locale_core v2.1.1
Downloaded zerocopy v0.8.42
Downloaded unicode-width v0.2.2
Downloaded uuid v1.22.0
Downloaded jiff-static v0.2.23
Downloaded tree-sitter-rust v0.23.3
Downloaded bloomy v1.2.0
Downloaded amplify v4.9.0
Downloaded indicatif v0.18.4
Downloaded schemars v1.2.1
Downloaded tree-sitter-ruby v0.23.1
Downloaded backtrace v0.3.76
Downloaded tracing v0.1.44
Downloaded jiff v0.2.23
Downloaded prodash v31.0.0
Downloaded base64 v0.21.7
Downloaded bytes v1.11.1
Downloaded tree-sitter-typescript v0.23.2
Downloaded tokio v1.50.0
Downloaded mio v1.1.1
Downloaded typenum v1.20.1
Downloaded linux-raw-sys v0.12.1
Downloaded unicode-normalization v0.1.25
Downloaded zerovec v0.11.5
Downloaded serde_json v1.0.149
Downloaded aes v0.8.4
Downloaded aes-gcm v0.10.3
Downloaded icu_properties_data v2.1.2
Downloaded aho-corasick v1.1.4
Downloaded tree-sitter-python v0.23.6
Downloaded sysinfo v0.37.2
Downloaded vcpkg v0.2.15
Downloaded syn v1.0.109
Downloaded tree-sitter-c v0.23.4
Downloaded syn v2.0.117
Downloaded tree-sitter-md v0.3.2
Downloaded regex-syntax v0.8.10
Downloaded bstr v1.12.1
Downloaded rustix v1.1.4
Downloaded tree-sitter-bash v0.23.3
Downloaded regex-automata v0.4.14
Downloaded sha1-checked v0.10.0
Downloaded sha3 v0.10.8
Downloaded libc v0.2.183
Downloaded libz-sys v1.1.25
Downloaded libgit2-sys v0.18.4+1.9.3
Downloaded sqlite3-src v0.7.0
Compiling libc v0.2.183
Compiling proc-macro2 v1.0.106
Compiling quote v1.0.45
Compiling unicode-ident v1.0.24
Compiling serde_core v1.0.228
Checking cfg-if v1.0.4
Compiling serde v1.0.228
Compiling version_check v0.9.5
Compiling generic-array v0.14.7
Checking typenum v1.20.1
Compiling syn v2.0.117
Checking getrandom v0.2.17
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 subtle v2.6.1
Checking const-oid v0.9.6
Checking smallvec v1.15.1
Compiling cc v1.2.57
Checking regex-syntax v0.8.10
Checking aho-corasick v1.1.4
Checking cpufeatures v0.2.17
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
Checking stable_deref_trait v1.2.1
Compiling typeid v1.0.3
Compiling erased-serde v0.4.10
Checking tinyvec_macros v0.1.1
Checking gix-trace v0.1.21
Checking itoa v1.0.17
Checking tinyvec v1.11.0
Checking serde_fmt v1.1.0
Checking hashbrown v0.16.1
Checking unicode-normalization v0.1.25
Checking value-bag-serde1 v1.12.0
Checking byteorder v1.5.0
Checking value-bag v1.12.0
Checking gix-utils v0.3.2
Compiling crc32fast v1.5.0
Checking log v0.4.29
Checking bstr v1.12.1
Checking same-file v1.0.6
Compiling serde_derive v1.0.228
Compiling thiserror-impl v2.0.18
Checking walkdir v2.5.0
Checking prodash v31.0.0
Checking gix-validate v0.11.1
Checking zlib-rs v0.6.5
Compiling getrandom v0.4.3
Compiling heapless v0.8.0
Compiling pkg-config v0.3.32
Checking gix-path v0.12.0
Compiling autocfg v1.5.0
Compiling libm v0.2.16
Checking gix-features v0.48.0
Checking hash32 v0.3.1
Compiling rustix v1.1.4
Compiling num-traits v0.2.19
Checking linux-raw-sys v0.12.1
Checking faster-hex v0.10.0
Compiling zerocopy v0.8.42
Compiling zmij v1.0.21
Compiling serde_json v1.0.149
Checking zeroize v1.9.0
Checking equivalent v1.0.2
Checking indexmap v2.13.0
Checking crypto-common v0.1.7
Checking block-buffer v0.10.4
Checking digest v0.10.7
Compiling ref-cast v1.0.25
Checking sha1 v0.10.6
Checking sha1-checked v0.10.0
Checking once_cell v1.21.4
Checking gix-hash v0.25.0
Checking block-padding v0.3.3
Compiling ref-cast-impl v1.0.25
Checking inout v0.1.4
Checking sha2 v0.10.9
Compiling vcpkg v0.2.15
Checking dyn-clone v1.0.20
Checking cipher v0.4.4
Checking tempfile v3.27.0
Compiling serde_derive_internals v0.29.1
Checking ppv-lite86 v0.2.21
Checking der v0.7.10
Compiling libz-sys v1.1.25
Compiling libgit2-sys v0.18.4+1.9.3
Checking spin v0.9.9
Checking rand_chacha v0.3.1
Compiling schemars_derive v1.2.1
Checking lazy_static v1.5.0
Compiling syn v1.0.109
Checking rand v0.8.5
Compiling tree-sitter-language v0.1.7
Checking hmac v0.12.1
Checking universal-hash v0.5.1
Checking num-integer v0.1.46
Checking opaque-debug v0.3.1
Checking spki v0.7.3
Checking signature v2.2.0
Checking ff v0.13.1
Checking base16ct v0.2.0
Checking sec1 v0.7.3
Checking schemars v1.2.1
Checking group v0.13.0
Checking crypto-bigint v0.5.5
Compiling data-encoding v2.10.0
Checking elliptic-curve v0.13.8
Compiling data-encoding-macro-internal v0.1.17
Compiling amplify_syn v2.0.1
Checking num-iter v0.1.45
Checking aead v0.5.2
Compiling match-lookup v0.1.2
Checking const-str v0.4.3
Compiling semver v1.0.27
Checking signature v1.6.4
Checking ed25519 v1.5.3
Compiling rustc_version v0.4.1
Checking base256emoji v1.0.2
Compiling amplify_derive v4.0.1
Checking data-encoding-macro v0.1.19
Checking poly1305 v0.8.0
Checking rfc6979 v0.4.0
Checking qcheck v1.0.0
Checking chacha20 v0.9.1
Checking gix-error v0.2.3
Checking amplify_num v0.5.3
Checking base-x v0.2.11
Checking ascii v1.1.0
Checking multibase v0.9.2
Checking ecdsa v0.16.9
Compiling curve25519-dalek v4.1.3
Checking ec25519 v0.1.0
Checking primeorder v0.13.6
Checking amplify v4.9.0
Checking polyval v0.6.2
Compiling num-bigint-dig v0.8.6
Checking base64ct v1.8.3
Checking cyphergraphy v0.3.1
Checking ghash v0.5.1
Checking pkcs8 v0.10.2
Checking pem-rfc7468 v0.7.0
Checking pbkdf2 v0.12.2
Checking aes v0.8.4
Checking ctr v0.9.2
Checking radicle-git-ref-format v0.2.0 (/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w/crates/radicle-git-ref-format)
Compiling sqlite3-src v0.7.0
Compiling curve25519-dalek-derive v0.1.1
Compiling synstructure v0.13.2
Checking keccak v0.1.6
Checking sha3 v0.10.8
Checking aes-gcm v0.10.3
Checking ssh-encoding v0.2.0
Checking pkcs1 v0.7.5
Checking ed25519 v2.2.3
Checking blowfish v0.9.1
Checking cbc v0.1.2
Checking percent-encoding v2.3.2
Checking base32 v0.4.0
Checking cypheraddr v0.4.1
Checking rsa v0.9.10
Checking ssh-cipher v0.2.0
Checking bcrypt-pbkdf v0.10.0
Checking ed25519-dalek v2.2.0
Compiling zerofrom-derive v0.1.6
Checking p521 v0.13.3
Checking p256 v0.13.2
Checking p384 v0.13.1
Checking chacha20poly1305 v0.10.1
Checking noise-framework v0.4.1
Checking ssh-key v0.6.7
Checking zerofrom v0.1.6
Checking socks5-client v0.4.3
Compiling yoke-derive v0.8.1
Checking secrecy v0.10.3
Checking ssh-agent-lib v0.6.0
Checking cyphernet v0.5.4
Checking yoke v0.8.1
Checking nonempty v0.9.0
Checking utf8parse v0.2.2
Checking jiff v0.2.23
Checking anstyle-query v1.1.5
Compiling zerovec-derive v0.11.2
Checking zerovec v0.11.5
Checking radicle-localtime v0.1.0 (/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w/crates/radicle-localtime)
Compiling displaydoc v0.2.5
Checking errno v0.3.14
Checking base64 v0.21.7
Checking colorchoice v1.0.5
Checking is_terminal_polyfill v1.70.2
Checking gix-date v0.15.3
Checking anstyle v1.0.14
Checking gix-hashtable v0.15.0
Checking gix-actor v0.41.0
Checking siphasher v1.0.2
Checking gix-object v0.60.0
Checking radicle-dag v0.10.0 (/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w/crates/radicle-dag)
Checking memmap2 v0.9.10
Checking nonempty v0.12.0
Checking tinystr v0.8.2
Checking gix-chunk v0.7.1
Checking writeable v0.6.2
Checking litemap v0.8.1
Compiling radicle v0.25.1 (/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w/crates/radicle)
Checking icu_locale_core v2.1.1
Checking gix-commitgraph v0.37.0
Checking zerotrie v0.2.3
Checking potential_utf v0.1.4
Checking anstyle-parse v1.0.0
Checking serde-untagged v0.1.9
Checking bytesize v2.3.1
Checking dunce v1.0.5
Compiling icu_normalizer_data v2.1.1
Compiling icu_properties_data v2.1.2
Checking fast-glob v0.3.3
Checking anstream v1.0.0
Checking icu_provider v2.1.1
Checking icu_collections v2.1.1
Checking gix-revwalk v0.31.0
Checking gix-fs v0.21.1
Checking mio v1.1.1
Checking sem_safe v0.2.1
Checking simd-adler32 v0.3.8
Checking adler2 v2.0.1
Checking signals_receipts v0.2.5
Checking miniz_oxide v0.8.9
Checking gix-tempfile v23.0.0
Checking gix-quote v0.7.1
Checking icu_properties v2.1.2
Checking icu_normalizer v2.1.1
Compiling signal-hook v0.3.18
Checking iana-time-zone v0.1.65
Checking shell-words v1.1.1
Checking either v1.15.0
Compiling unicode-segmentation v1.12.0
Checking idna_adapter v1.2.1
Checking gix-command v0.9.0
Checking chrono v0.4.44
Compiling convert_case v0.10.0
Checking radicle-signals v0.12.1 (/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w/crates/radicle-signals)
Checking signal-hook-registry v1.4.8
Checking colored v2.2.0
Compiling rustversion v1.0.22
Checking utf8_iter v1.0.4
Compiling object v0.37.3
Compiling getrandom v0.3.4
Checking idna v1.1.0
Compiling derive_more-impl v2.1.1
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
Compiling litrs v1.0.0
Compiling portable-atomic v1.13.1
Checking unicode-width v0.2.2
Checking gimli v0.32.3
Compiling thiserror v1.0.69
Compiling document-features v0.2.12
Checking derive_more v2.1.1
Checking gix-prompt v0.15.0
Checking signal-hook-mio v0.2.5
Checking addr2line v0.25.1
Checking radicle-log v0.2.0 (/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w/crates/radicle-log)
Checking gix-traverse v0.57.0
Checking gix-revision v0.45.0
Checking gix-diff v0.63.0
Checking anstyle-parse v0.2.7
Checking gix-packetline v0.21.5
Checking gix-glob v0.26.0
Compiling thiserror-impl v1.0.69
Checking rustc-demangle v0.1.27
Checking backtrace v0.3.76
Checking gix-refspec v0.41.0
Checking gix-transport v0.57.0
Checking anstream v0.6.21
Checking gix-pack v0.70.0
Checking arc-swap v1.9.1
Checking crossterm v0.29.0
Checking gix-credentials v0.38.0
Checking console v0.16.3
Checking gix-ref v0.63.0
Checking gix-shallow v0.12.0
Checking gix-negotiate v0.31.0
Checking form_urlencoded v1.2.2
Compiling maybe-async v0.2.10
Checking regex v1.12.3
Compiling tree-sitter v0.24.7
Checking unit-prefix v0.5.2
Checking gix-protocol v0.61.0
Checking indicatif v0.18.4
Checking url v2.5.8
Checking gix-odb v0.80.0
Checking inquire v0.9.4
Checking unicode-display-width v0.3.0
Checking uuid v1.22.0
Checking bytes v1.11.1
Checking snapbox-macros v1.1.0
Checking salsa20 v0.10.2
Checking siphasher v0.3.11
Checking normalize-line-endings v0.3.0
Compiling crossbeam-utils v0.8.21
Checking strsim v0.11.1
Checking streaming-iterator v0.1.9
Compiling heck v0.5.0
Checking similar v3.1.1
Checking clap_lex v1.1.0
Checking clap_builder v4.6.0
Checking snapbox v1.2.2
Compiling clap_derive v4.6.0
Checking bloomy v1.2.0
Checking scrypt v0.11.0
Checking systemd-journal-logger v2.2.2
Compiling tree-sitter-python v0.23.6
Compiling tree-sitter-md v0.3.2
Compiling tree-sitter-css v0.23.2
Compiling tree-sitter-go v0.23.4
Compiling tree-sitter-json v0.24.8
Compiling tree-sitter-typescript v0.23.2
Compiling tree-sitter-ruby v0.23.1
Compiling tree-sitter-html v0.23.2
Compiling tree-sitter-rust v0.23.3
Compiling tree-sitter-c v0.23.4
Compiling tree-sitter-toml-ng v0.6.0
Compiling tree-sitter-bash v0.23.3
Checking toml_datetime v0.7.5+spec-1.1.0
Checking serde_spanned v1.0.4
Checking toml_writer v1.0.7+spec-1.1.0
Checking bit-vec v0.8.0
Compiling anyhow v1.0.102
Checking pin-project-lite v0.2.17
Checking tokio v1.50.0
Checking bit-set v0.8.0
Checking toml v0.9.12+spec-1.1.0
Checking sqlite3-sys v0.18.0
Checking sqlite v0.37.0
Checking radicle-crypto v0.19.0 (/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w/crates/radicle-crypto)
Checking clap v4.6.0
Checking rand_core v0.9.5
Checking sysinfo v0.37.2
Compiling radicle-cli v0.23.0 (/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w/crates/radicle-cli)
Compiling radicle-node v0.21.1 (/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w/crates/radicle-node)
Checking yansi v1.0.1
Checking diff v0.1.13
Checking human-panic v2.0.6
Checking pretty_assertions v1.4.1
Checking crossbeam-channel v0.5.15
Checking clap_complete v4.6.0
Checking structured-logger v1.0.5
Checking radicle-systemd v0.13.0 (/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w/crates/radicle-systemd)
Checking tree-sitter-highlight v0.24.7
Checking itertools v0.14.0
Checking socket2 v0.5.10
Compiling escargot v0.5.15
Checking humantime v2.3.0
Checking lexopt v0.3.2
Checking rs-release v0.1.11
Checking timeago v0.4.2
Checking wait-timeout v0.2.1
Checking quick-error v1.2.3
Checking fnv v1.0.7
Checking rusty-fork v0.3.1
Checking rand_xorshift v0.4.0
Checking rand_chacha v0.9.0
Checking rand v0.9.2
Compiling qcheck-macros v1.0.0
Checking num-bigint v0.4.6
Compiling ahash v0.8.12
Checking unarray v0.1.4
Checking proptest v1.10.0
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 num-rational v0.4.2
Checking env_logger v0.11.9
Checking num v0.4.3
Checking flate2 v1.1.9
Checking phf_shared v0.11.3
Compiling test-log-macros v0.2.19
Checking outref v0.5.2
Checking hex-literal v1.1.0
Checking vsimd v0.8.0
Compiling radicle-remote-helper v0.18.1 (/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w/crates/radicle-remote-helper)
Checking uuid-simd v0.8.0
Checking test-log v0.2.19
Checking phf v0.11.3
Checking referencing v0.30.0
Checking fraction v0.15.3
Checking fancy-regex v0.14.0
Checking email_address v0.2.9
Checking base64 v0.22.1
Checking num-cmp v0.1.0
Checking bytecount v0.6.9
Checking emojis v0.6.4
Compiling pastey v0.2.1
Checking jsonschema v0.30.0
Checking radicle-windows v0.1.0 (/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w/crates/radicle-windows)
Checking git2 v0.21.0
Checking radicle-oid v0.2.2 (/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w/crates/radicle-oid)
Checking radicle-git-metadata v0.2.1 (/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w/crates/radicle-git-metadata)
Checking radicle-term v0.19.1 (/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w/crates/radicle-term)
Checking radicle-core v0.4.1 (/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w/crates/radicle-core)
Checking radicle-cob v0.21.1 (/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w/crates/radicle-cob)
Checking radicle-surf v0.29.0 (/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w/crates/radicle-surf)
Checking radicle-cli-test v0.14.1 (/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w/crates/radicle-cli-test)
error[E0061]: this function takes 0 arguments but 7 arguments were supplied
--> crates/radicle/src/rad.rs:623:29
|
623 | let (rid, doc, _) = init(
| ^^^^
|
note: function defined here
--> crates/radicle/src/rad.rs:559:8
|
559 | fn init() {
| ^^^^
help: remove the extra arguments
|
624 - &repo,
625 - "acme".try_into().unwrap(),
626 - "Acme's repo",
627 - None,
628 - Visibility::default(),
629 - &signer,
630 - &storage,
631 - )
624 + )
|
error[E0599]: no method named `unwrap` found for unit type `()` in the current scope
--> crates/radicle/src/rad.rs:632:10
|
623 | let (rid, doc, _) = init(
| _____________________________-
624 | | &repo,
625 | | "acme".try_into().unwrap(),
626 | | "Acme's repo",
... |
632 | | .unwrap();
| |_________-^^^^^^
|
help: there is a method `wrap` with a similar name
|
632 - .unwrap();
632 + .wrap();
|
Checking radicle-fetch v0.21.1 (/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w/crates/radicle-fetch)
Checking radicle-schemars v0.9.1 (/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w/crates/radicle-schemars)
Checking radicle-protocol v0.9.1 (/8c691f9b-089b-4823-8984-e8fb3cbca6e4/w/crates/radicle-protocol)
Some errors have detailed explanations: E0061, E0599.
For more information about an error, try `rustc --explain E0061`.
error: could not compile `radicle` (lib test) due to 2 previous errors
warning: build failed, waiting for other jobs to finish...
Exit code: 101
{
"response": "finished",
"result": "failure"
}