rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5 heartwood6124996d281afd988143d9244a8f7aab43ba9e2f
{
"request": "trigger",
"version": 1,
"event_type": "patch",
"repository": {
"id": "rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5",
"name": "heartwood",
"description": "Radicle Heartwood Protocol & Stack",
"private": false,
"default_branch": "master",
"delegates": [
"did:key:z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT",
"did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
"did:key:z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz"
]
},
"action": "Created",
"patch": {
"id": "61766c77a4498aafbf69599b033f211acf0430f9",
"author": {
"id": "did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
"alias": null
},
"title": "cli: show revision on rad patch checkout",
"state": {
"status": "merged",
"conflicts": []
},
"before": "a48081f2717f069d456ec09f31d9e639b232dbed",
"after": "6124996d281afd988143d9244a8f7aab43ba9e2f",
"commits": [
"6124996d281afd988143d9244a8f7aab43ba9e2f"
],
"target": "3fc92f83fe089263c470b328414d923227cf0e4a",
"labels": [],
"assignees": [],
"revisions": [
{
"id": "61766c77a4498aafbf69599b033f211acf0430f9",
"author": {
"id": "did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
"alias": null
},
"description": "Help the user know which revision they currently have checked out when\nrunning `rad patch checkout`.",
"base": "a48081f2717f069d456ec09f31d9e639b232dbed",
"oid": "6124996d281afd988143d9244a8f7aab43ba9e2f",
"timestamp": 1709892297
},
{
"id": "9257d8b84215172874780b3f0fb604f3bfc87f8d",
"author": {
"id": "did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
"alias": null
},
"description": "Rebase.",
"base": "325289d28f52d094308902fb0b4671cc30c6572e",
"oid": "7ddb1119a58c37a711e08968dbeaac27052f20bc",
"timestamp": 1710154575
}
]
}
}
{
"response": "triggered",
"run_id": {
"id": "8c66c184-2a29-49d3-90e3-0b3c3a35f45e"
},
"info_url": "https://cci.rad.levitte.org//8c66c184-2a29-49d3-90e3-0b3c3a35f45e.html"
}
Started at: 2026-09-07 22:06:01.761679+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/8c66c184-2a29-49d3-90e3-0b3c3a35f45e/w/
╭────────────────────────────────────╮
│ heartwood │
│ Radicle Heartwood Protocol & Stack │
│ 189 issues · 38 patches │
╰────────────────────────────────────╯
Run `cd ./.` to go to the repository directory.
Exit code: 0
$ rad patch checkout 61766c77a4498aafbf69599b033f211acf0430f9
✓ Switched to branch patch/61766c7 at revision 61766c7
✓ Branch patch/61766c7 setup to track rad/patches/61766c77a4498aafbf69599b033f211acf0430f9
Exit code: 0
$ git config advice.detachedHead false
Exit code: 0
$ git checkout 6124996d281afd988143d9244a8f7aab43ba9e2f
HEAD is now at 6124996d cli: show revision on rad patch checkout
Exit code: 0
$ rad patch show 61766c77a4498aafbf69599b033f211acf0430f9 -p
╭────────────────────────────────────────────────────────────────────────────────╮
│ Title cli: show revision on rad patch checkout │
│ Patch 61766c77a4498aafbf69599b033f211acf0430f9 │
│ Author fintohaps z6Mkire…SQZ3voM │
│ Head 6124996d281afd988143d9244a8f7aab43ba9e2f │
│ Base a48081f2717f069d456ec09f31d9e639b232dbed │
│ Target master │
│ Branches patch/61766c7 │
│ Commits ahead 1, behind 1584 │
│ Status merged │
│ │
│ Help the user know which revision they currently have checked out when │
│ running `rad patch checkout`. │
├────────────────────────────────────────────────────────────────────────────────┤
│ 6124996 cli: show revision on rad patch checkout │
├────────────────────────────────────────────────────────────────────────────────┤
│ ● Revision 61766c7 @ a48081f..6124996 by fintohaps z6Mkire…SQZ3voM 2 years ago │
│ ↑ Revision 9257d8b @ 325289d..7ddb111 by cloudhead z6MksFq…bS9wzpT 2 years ago │
│ └─ ✓ merged by cloudhead z6MksFq…bS9wzpT │
╰────────────────────────────────────────────────────────────────────────────────╯
commit 6124996d281afd988143d9244a8f7aab43ba9e2f
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Fri Mar 8 10:03:59 2024 +0000
cli: show revision on rad patch checkout
Help the user know which revision they currently have checked out when
running `rad patch checkout`.
Signed-off-by: Fintan Halpenny <fintan.halpenny@gmail.com>
X-Clacks-Overhead: GNU Terry Pratchett
diff --git a/radicle-cli/examples/rad-patch-checkout-force.md b/radicle-cli/examples/rad-patch-checkout-force.md
index 852d3c848..c08c03738 100644
--- a/radicle-cli/examples/rad-patch-checkout-force.md
+++ b/radicle-cli/examples/rad-patch-checkout-force.md
@@ -27,7 +27,7 @@ $ rad sync -f
✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
✓ Fetched repository from 1 seed(s)
$ rad patch checkout aa45913 --name alice-init
-✓ Switched to branch alice-init
+✓ Switched to branch alice-init at revision aa45913
✓ Branch alice-init setup to track rad/patches/aa45913e757cacd46972733bddee5472c78fa32a
```
@@ -81,7 +81,7 @@ $ rad patch checkout aa45913 --name alice-init
``` ~bob
$ rad patch checkout aa45913 -f --name alice-init
-✓ Switched to branch alice-init
+✓ Switched to branch alice-init at revision 3156bed
$ git status
On branch alice-init
Your branch is up to date with 'rad/patches/aa45913e757cacd46972733bddee5472c78fa32a'.
diff --git a/radicle-cli/examples/rad-patch-checkout-revision.md b/radicle-cli/examples/rad-patch-checkout-revision.md
index 5d9b62364..ef48a2e25 100644
--- a/radicle-cli/examples/rad-patch-checkout-revision.md
+++ b/radicle-cli/examples/rad-patch-checkout-revision.md
@@ -40,7 +40,7 @@ So, let's checkout the previous revision, `0c0942e2`:
```
$ rad patch checkout aa45913 --revision 3156bed9d64d4675d6cf56612d217fc5f4e8a53a -f
-✓ Switched to branch patch/aa45913
+✓ Switched to branch patch/aa45913 at revision 3156bed
```
And we can confirm that the current commit corresponds to `27857ec`:
diff --git a/radicle-cli/examples/rad-patch-checkout.md b/radicle-cli/examples/rad-patch-checkout.md
index f266b5bab..eadb67fc8 100644
--- a/radicle-cli/examples/rad-patch-checkout.md
+++ b/radicle-cli/examples/rad-patch-checkout.md
@@ -31,7 +31,7 @@ Now, let's checkout the patch that we just created:
```
$ rad patch checkout aa45913e757cacd46972733bddee5472c78fa32a
-✓ Switched to branch patch/aa45913
+✓ Switched to branch patch/aa45913 at revision aa45913
✓ Branch patch/aa45913 setup to track rad/patches/aa45913e757cacd46972733bddee5472c78fa32a
```
@@ -41,7 +41,7 @@ as long as we haven't made changes to it.
```
$ git checkout master -q
$ rad patch checkout aa45913
-✓ Switched to branch patch/aa45913
+✓ Switched to branch patch/aa45913 at revision aa45913
```
Now, let's add a README too!
diff --git a/radicle-cli/examples/rad-patch-pull-update.md b/radicle-cli/examples/rad-patch-pull-update.md
index fcb08b5fa..9f93cfa8c 100644
--- a/radicle-cli/examples/rad-patch-pull-update.md
+++ b/radicle-cli/examples/rad-patch-pull-update.md
@@ -67,7 +67,7 @@ Alice checks it out.
``` ~alice
$ rad patch checkout 55b9721ed7f6bfec38f43729e9b6631c5dc812fb
-✓ Switched to branch patch/55b9721
+✓ Switched to branch patch/55b9721 at revision 55b9721
✓ Branch patch/55b9721 setup to track rad/patches/55b9721ed7f6bfec38f43729e9b6631c5dc812fb
$ git show
commit bdcdb30b3c0f513620dd0f1c24ff8f4f71de956b
diff --git a/radicle-cli/examples/rad-patch.md b/radicle-cli/examples/rad-patch.md
index 1ff174705..23fa0e442 100644
--- a/radicle-cli/examples/rad-patch.md
+++ b/radicle-cli/examples/rad-patch.md
@@ -147,7 +147,7 @@ Now, let's checkout the patch that we just created:
```
$ rad patch checkout aa45913
-✓ Switched to branch patch/aa45913
+✓ Switched to branch patch/aa45913 at revision 6e5a3b7
✓ Branch patch/aa45913 setup to track rad/patches/aa45913e757cacd46972733bddee5472c78fa32a
```
diff --git a/radicle-cli/examples/rad-push-and-pull-patches.md b/radicle-cli/examples/rad-push-and-pull-patches.md
index dd31db117..8c5f2e1e5 100644
--- a/radicle-cli/examples/rad-push-and-pull-patches.md
+++ b/radicle-cli/examples/rad-push-and-pull-patches.md
@@ -13,7 +13,7 @@ $ git rev-parse HEAD
f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
$ git checkout master -q
$ rad patch checkout d004b67
-✓ Switched to branch patch/d004b67
+✓ Switched to branch patch/d004b67 at revision d004b67
✓ Branch patch/d004b67 setup to track rad/patches/d004b67355456c46de10c0d287e4a791ad1a6945
$ rad remote add z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
✓ Follow policy updated for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
diff --git a/radicle-cli/examples/workflow/5-patching-maintainer.md b/radicle-cli/examples/workflow/5-patching-maintainer.md
index e78a4c254..90c9bc79a 100644
--- a/radicle-cli/examples/workflow/5-patching-maintainer.md
+++ b/radicle-cli/examples/workflow/5-patching-maintainer.md
@@ -52,7 +52,7 @@ changes.
```
$ rad patch checkout e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46
-✓ Switched to branch patch/e4934b6
+✓ Switched to branch patch/e4934b6 at revision 773b9aa
✓ Branch patch/e4934b6 setup to track rad/patches/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46
$ git mv REQUIREMENTS REQUIREMENTS.md
$ git commit -m "Use markdown for requirements"
diff --git a/radicle-cli/src/commands/patch/checkout.rs b/radicle-cli/src/commands/patch/checkout.rs
index 815bfae3e..9f3e3c2cc 100644
--- a/radicle-cli/src/commands/patch/checkout.rs
+++ b/radicle-cli/src/commands/patch/checkout.rs
@@ -42,11 +42,14 @@ pub fn run(
.get(patch_id)?
.ok_or_else(|| anyhow!("Patch `{patch_id}` not found"))?;
- let revision = match revision_id {
- Some(id) => patch
- .revision(&id)
- .ok_or_else(|| anyhow!("Patch revision `{id}` not found"))?,
- None => patch.latest().1,
+ let (revision_id, revision) = match revision_id {
+ Some(id) => (
+ id,
+ patch
+ .revision(&id)
+ .ok_or_else(|| anyhow!("Patch revision `{id}` not found"))?,
+ ),
+ None => patch.latest(),
};
let mut spinner = term::spinner("Performing checkout...");
@@ -88,8 +91,9 @@ pub fn run(
working.set_head(&git::refs::workdir::branch(&patch_branch))?;
spinner.message(format!(
- "Switched to branch {}",
- term::format::highlight(&patch_branch)
+ "Switched to branch {} at revision {}",
+ term::format::highlight(&patch_branch),
+ term::format::secondary(term::format::oid(revision_id)),
));
spinner.finish();
Exit code: 0
shell: 'cargo --version rustc --version cargo fmt --check cargo clippy --all-targets --workspace -- --deny clippy::all cargo build --all-targets --workspace cargo doc --workspace cargo test --workspace --no-fail-fast '
Commands:
$ podman run --name 8c66c184-2a29-49d3-90e3-0b3c3a35f45e -v /opt/radcis/ci.rad.levitte.org/cci/state/8c66c184-2a29-49d3-90e3-0b3c3a35f45e/s:/8c66c184-2a29-49d3-90e3-0b3c3a35f45e/s:ro -v /opt/radcis/ci.rad.levitte.org/cci/state/8c66c184-2a29-49d3-90e3-0b3c3a35f45e/w:/8c66c184-2a29-49d3-90e3-0b3c3a35f45e/w -w /8c66c184-2a29-49d3-90e3-0b3c3a35f45e/w -v /opt/radcis/ci.rad.levitte.org/.radicle:/${id}/.radicle:ro -e RAD_HOME=/${id}/.radicle rust:trixie bash /8c66c184-2a29-49d3-90e3-0b3c3a35f45e/s/script.sh
+ cargo --version
info: syncing channel updates for '1.74-x86_64-unknown-linux-gnu'
info: latest update on 2023-12-07, rust version 1.74.1 (a28077b28 2023-12-04)
info: downloading component 'cargo'
info: downloading component 'rust-std'
info: downloading component 'rustc'
info: installing component 'cargo'
info: installing component 'rust-std'
info: installing component 'rustc'
cargo 1.74.1 (ecb9851af 2023-10-18)
+ rustc --version
rustc 1.74.1 (a28077b28 2023-12-04)
+ cargo fmt --check
error: 'cargo-fmt' is not installed for the toolchain '1.74-x86_64-unknown-linux-gnu'.
To install, run `rustup component add --toolchain 1.74-x86_64-unknown-linux-gnu rustfmt`
Exit code: 1
{
"response": "finished",
"result": "failure"
}