rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5 heartwoodaf85fde2a9811f3003c3f2cfb3dd7a87a8b93f46
{
"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": "c8312990192bef81f6a250a15d478822e9c35232",
"author": {
"id": "did:key:z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5",
"alias": "sebastinez"
},
"title": "httpd: Remove diff and branches from history route",
"state": {
"status": "merged",
"conflicts": []
},
"before": "bd8e0ebcda8f6f06dc20641a71614e3778a43fea",
"after": "af85fde2a9811f3003c3f2cfb3dd7a87a8b93f46",
"commits": [
"af85fde2a9811f3003c3f2cfb3dd7a87a8b93f46"
],
"target": "7e1cb406bb935c3de008d2171e8961f57b4336ea",
"labels": [],
"assignees": [],
"revisions": [
{
"id": "c8312990192bef81f6a250a15d478822e9c35232",
"author": {
"id": "did:key:z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5",
"alias": "sebastinez"
},
"description": "",
"base": "bd8e0ebcda8f6f06dc20641a71614e3778a43fea",
"oid": "00acdcf11043639db0e6bdd7f7847c8bbb85fae2",
"timestamp": 1712741598
},
{
"id": "85c4c277779c63deae5ccd84505c8ed34e24d6a7",
"author": {
"id": "did:key:z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5",
"alias": "sebastinez"
},
"description": "Remove explicit return",
"base": "bd8e0ebcda8f6f06dc20641a71614e3778a43fea",
"oid": "af85fde2a9811f3003c3f2cfb3dd7a87a8b93f46",
"timestamp": 1712741978
},
{
"id": "5da77bb3df6da31fedb6fcbce61581ae1f37e8de",
"author": {
"id": "did:key:z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5",
"alias": "sebastinez"
},
"description": "Clippy.",
"base": "bd8e0ebcda8f6f06dc20641a71614e3778a43fea",
"oid": "c3e0275e828e3483dbb58d1f09740aa63bb89478",
"timestamp": 1712742198
},
{
"id": "4788ec496b587552d92846ef1206870261f7f23b",
"author": {
"id": "did:key:z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5",
"alias": "sebastinez"
},
"description": "Rebase.",
"base": "35567583869c2c24a2e040a0f1e755d4e3d17880",
"oid": "574ac3566bd465d5306cd58d17ff9c87a5118ddd",
"timestamp": 1712742245
}
]
}
}
{
"response": "triggered",
"run_id": {
"id": "3abd96e7-8d54-4b85-b8a9-2fb0dd6981b1"
},
"info_url": "https://cci.rad.levitte.org//3abd96e7-8d54-4b85-b8a9-2fb0dd6981b1.html"
}
Started at: 2026-09-08 22:21:59.189469+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/3abd96e7-8d54-4b85-b8a9-2fb0dd6981b1/w/
╭────────────────────────────────────╮
│ heartwood │
│ Radicle Heartwood Protocol & Stack │
│ 189 issues · 39 patches │
╰────────────────────────────────────╯
Run `cd ./.` to go to the repository directory.
Exit code: 0
$ rad patch checkout c8312990192bef81f6a250a15d478822e9c35232
✓ Switched to branch patch/c831299 at revision 85c4c27
✓ Branch patch/c831299 setup to track rad/patches/c8312990192bef81f6a250a15d478822e9c35232
Exit code: 0
$ git config advice.detachedHead false
Exit code: 0
$ git checkout af85fde2a9811f3003c3f2cfb3dd7a87a8b93f46
HEAD is now at af85fde2 httpd: Remove diff and branches from history route
Exit code: 0
$ rad patch show c8312990192bef81f6a250a15d478822e9c35232 -p
╭─────────────────────────────────────────────────────────────────────────────────╮
│ Title httpd: Remove diff and branches from history route │
│ Patch c8312990192bef81f6a250a15d478822e9c35232 │
│ Author sebastinez z6MkkfM…jXVsVz5 │
│ Head af85fde2a9811f3003c3f2cfb3dd7a87a8b93f46 │
│ Base bd8e0ebcda8f6f06dc20641a71614e3778a43fea │
│ Target master │
│ Branches patch/c831299 │
│ Commits ahead 1, behind 1454 │
│ Status merged │
├─────────────────────────────────────────────────────────────────────────────────┤
│ af85fde httpd: Remove diff and branches from history route │
├─────────────────────────────────────────────────────────────────────────────────┤
│ ● Revision c831299 @ bd8e0eb..00acdcf by sebastinez z6MkkfM…jXVsVz5 2 years ago │
│ └─ ✓ accepted by fintohaps z6Mkire…SQZ3voM 2 years ago │
│ ↑ Revision 85c4c27 @ bd8e0eb..af85fde by sebastinez z6MkkfM…jXVsVz5 2 years ago │
│ ↑ Revision 5da77bb @ bd8e0eb..c3e0275 by cloudhead z6MksFq…bS9wzpT 2 years ago │
│ ↑ Revision 4788ec4 @ 3556758..574ac35 by cloudhead z6MksFq…bS9wzpT 2 years ago │
│ └─ ✓ merged by cloudhead z6MksFq…bS9wzpT │
╰─────────────────────────────────────────────────────────────────────────────────╯
commit af85fde2a9811f3003c3f2cfb3dd7a87a8b93f46
Author: Sebastian Martinez <me@sebastinez.dev>
Date: Wed Apr 10 11:33:13 2024 +0200
httpd: Remove diff and branches from history route
diff --git a/radicle-httpd/src/api/v1/projects.rs b/radicle-httpd/src/api/v1/projects.rs
index 19965d06d3..4bb10be79f 100644
--- a/radicle-httpd/src/api/v1/projects.rs
+++ b/radicle-httpd/src/api/v1/projects.rs
@@ -214,41 +214,22 @@ async fn history_handler(
let commits = repo
.history(&sha)?
- .filter(|q| {
- if let Ok(q) = q {
- if let (Some(since), Some(until)) = (since, until) {
- q.committer.time.seconds() >= since && q.committer.time.seconds() < until
- } else if let Some(since) = since {
- q.committer.time.seconds() >= since
- } else if let Some(until) = until {
- q.committer.time.seconds() < until
- } else {
- // If neither `since` nor `until` are specified, we include the commit.
- true
- }
- } else {
- false
+ .filter_map(|commit| {
+ let commit = commit.ok()?;
+ let time = commit.committer.time.seconds();
+ let commit = api::json::commit(&commit);
+
+ match (since, until) {
+ (Some(since), Some(until)) if time >= since && time < until => Some(commit),
+ (Some(since), None) if time >= since => Some(commit),
+ (None, Some(until)) if time < until => Some(commit),
+ (None, None) => Some(commit),
+ _ => None,
}
})
.skip(page * per_page)
.take(per_page)
- .map(|r| {
- r.and_then(|c| {
- let glob = Glob::all_heads().branches().and(Glob::all_remotes());
- let branches: Vec<String> = repo
- .revision_branches(c.id, glob)?
- .iter()
- .map(|b| b.refname().to_string())
- .collect();
- let diff = repo.diff_commit(c.id)?;
- Ok(json!({
- "commit": api::json::commit(&c),
- "diff": diff,
- "branches": branches
- }))
- })
- })
- .collect::<Result<Vec<_>, _>>()?;
+ .collect::<Vec<_>>();
let response = json!({
"commits": commits,
@@ -1124,320 +1105,54 @@ mod routes {
json!({
"commits": [
{
- "commit": {
- "id": HEAD,
- "author": {
- "name": "Alice Liddell",
- "email": "alice@radicle.xyz"
- },
- "summary": "Add another folder",
- "description": "",
- "parents": [
- "ee8d6a29304623a78ebfa5eeed5af674d0e58f83",
- ],
- "committer": {
- "name": "Alice Liddell",
- "email": "alice@radicle.xyz",
- "time": 1673003014
- },
+ "id": HEAD,
+ "author": {
+ "name": "Alice Liddell",
+ "email": "alice@radicle.xyz"
},
- "diff": {
- "added": [
- {
- "path": "README",
- "diff": {
- "type": "plain",
- "hunks": [
- {
- "header": "@@ -0,0 +1 @@\n",
- "lines": [
- {
- "line": "Hello World!\n",
- "lineNo": 1,
- "type": "addition",
- },
- ],
- "old": {
- "start": 0,
- "end": 0,
- },
- "new": {
- "start": 1,
- "end": 2,
- },
- },
- ],
- "stats": {
- "additions": 1,
- "deletions": 0,
- },
- "eof": "noneMissing",
- },
- "new": {
- "oid": "980a0d5f19a64b4b30a87d4206aade58726b60e3",
- "mode": "blob",
- },
- },
- {
- "path": "dir1/README",
- "diff": {
- "type": "plain",
- "hunks": [
- {
- "header": "@@ -0,0 +1 @@\n",
- "lines": [
- {
- "line": "Hello World from dir1!\n",
- "lineNo": 1,
- "type": "addition"
- }
- ],
- "old": {
- "start": 0,
- "end": 0,
- },
- "new": {
- "start": 1,
- "end": 2,
- },
- }
- ],
- "stats": {
- "additions": 1,
- "deletions": 0,
- },
- "eof": "noneMissing",
- },
- "new": {
- "oid": "1dd5654ca2d2cf9f33b14c92b5ca9e1d21a91ae1",
- "mode": "blob",
- },
- }
- ],
- "deleted": [
- {
- "path": "CONTRIBUTING",
- "diff": {
- "type": "plain",
- "hunks": [
- {
- "header": "@@ -1 +0,0 @@\n",
- "lines": [
- {
- "line": "Thank you very much!\n",
- "lineNo": 1,
- "type": "deletion",
- },
- ],
- "old": {
- "start": 1,
- "end": 2,
- },
- "new": {
- "start": 0,
- "end": 0,
- },
- },
- ],
- "stats": {
- "additions": 0,
- "deletions": 1,
- },
- "eof": "noneMissing",
- },
- "old": {
- "oid": "82eb77880c693655bce074e3dbbd9fa711dc018b",
- "mode": "blob",
- },
- },
- ],
- "moved": [],
- "copied": [],
- "modified": [],
- "stats": {
- "filesChanged": 3,
- "insertions": 2,
- "deletions": 1
- }
+ "summary": "Add another folder",
+ "description": "",
+ "parents": [
+ "ee8d6a29304623a78ebfa5eeed5af674d0e58f83",
+ ],
+ "committer": {
+ "name": "Alice Liddell",
+ "email": "alice@radicle.xyz",
+ "time": 1673003014
},
- "branches": [
- "refs/heads/master"
- ]
},
{
- "commit": {
- "id": PARENT,
- "author": {
- "name": "Alice Liddell",
- "email": "alice@radicle.xyz"
- },
- "summary": "Add contributing file",
- "description": "",
- "parents": [
- "f604ce9fd5b7cc77b7609beda45ea8760bee78f7",
- ],
- "committer": {
- "name": "Alice Liddell",
- "email": "alice@radicle.xyz",
- "time": 1673002014,
- },
- },
- "diff": {
- "added": [
- {
- "path": "CONTRIBUTING",
- "diff": {
- "type": "plain",
- "hunks": [
- {
- "header": "@@ -0,0 +1 @@\n",
- "lines": [
- {
- "line": "Thank you very much!\n",
- "lineNo": 1,
- "type": "addition",
- },
- ],
- "old": {
- "start": 0,
- "end": 0,
- },
- "new": {
- "start": 1,
- "end": 2,
- },
- },
- ],
- "stats": {
- "additions": 1,
- "deletions": 0,
- },
- "eof": "noneMissing",
- },
- "new": {
- "oid": "82eb77880c693655bce074e3dbbd9fa711dc018b",
- "mode": "blob",
- },
- },
- ],
- "deleted": [
- {
- "path": "README",
- "diff": {
- "type": "plain",
- "hunks": [
- {
- "header": "@@ -1 +0,0 @@\n",
- "lines": [
- {
- "line": "Hello World!\n",
- "lineNo": 1,
- "type": "deletion",
- },
- ],
- "old": {
- "start": 1,
- "end": 2,
- },
- "new": {
- "start": 0,
- "end": 0,
- },
- },
- ],
- "stats": {
- "additions": 0,
- "deletions": 1,
- },
- "eof": "noneMissing",
- },
- "old": {
- "oid": "980a0d5f19a64b4b30a87d4206aade58726b60e3",
- "mode": "blob",
- },
- },
- ],
- "moved": [],
- "copied": [],
- "modified": [],
- "stats": {
- "filesChanged": 2,
- "insertions": 1,
- "deletions": 1,
- },
+ "id": PARENT,
+ "author": {
+ "name": "Alice Liddell",
+ "email": "alice@radicle.xyz"
},
- "branches": [
- "refs/heads/master",
+ "summary": "Add contributing file",
+ "description": "",
+ "parents": [
+ "f604ce9fd5b7cc77b7609beda45ea8760bee78f7",
],
+ "committer": {
+ "name": "Alice Liddell",
+ "email": "alice@radicle.xyz",
+ "time": 1673002014,
+ },
},
{
- "commit": {
- "id": INITIAL_COMMIT,
- "author": {
- "name": "Alice Liddell",
- "email": "alice@radicle.xyz",
- },
- "summary": "Initial commit",
- "description": "",
- "parents": [],
- "committer": {
- "name": "Alice Liddell",
- "email": "alice@radicle.xyz",
- "time": 1673001014,
- },
+ "id": INITIAL_COMMIT,
+ "author": {
+ "name": "Alice Liddell",
+ "email": "alice@radicle.xyz",
},
- "diff": {
- "added": [
- {
- "path": "README",
- "diff": {
- "type": "plain",
- "hunks": [
- {
- "header": "@@ -0,0 +1 @@\n",
- "lines": [
- {
- "line": "Hello World!\n",
- "lineNo": 1,
- "type": "addition"
- }
- ],
- "old": {
- "start": 0,
- "end": 0,
- },
- "new": {
- "start": 1,
- "end": 2,
- },
- }
- ],
- "stats": {
- "additions": 1,
- "deletions": 0,
- },
- "eof": "noneMissing",
- },
- "new": {
- "oid": "980a0d5f19a64b4b30a87d4206aade58726b60e3",
- "mode": "blob",
- },
- }
- ],
- "deleted": [],
- "moved": [],
- "copied": [],
- "modified": [],
- "stats": {
- "filesChanged": 1,
- "insertions": 1,
- "deletions": 0
- }
+ "summary": "Initial commit",
+ "description": "",
+ "parents": [],
+ "committer": {
+ "name": "Alice Liddell",
+ "email": "alice@radicle.xyz",
+ "time": 1673001014,
},
- "branches": [
- "refs/heads/master"
- ]
- }
+ },
],
"stats": {
"commits": 3,
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 3abd96e7-8d54-4b85-b8a9-2fb0dd6981b1 -v /opt/radcis/ci.rad.levitte.org/cci/state/3abd96e7-8d54-4b85-b8a9-2fb0dd6981b1/s:/3abd96e7-8d54-4b85-b8a9-2fb0dd6981b1/s:ro -v /opt/radcis/ci.rad.levitte.org/cci/state/3abd96e7-8d54-4b85-b8a9-2fb0dd6981b1/w:/3abd96e7-8d54-4b85-b8a9-2fb0dd6981b1/w -w /3abd96e7-8d54-4b85-b8a9-2fb0dd6981b1/w -v /opt/radcis/ci.rad.levitte.org/.radicle:/${id}/.radicle:ro -e RAD_HOME=/${id}/.radicle rust:trixie bash /3abd96e7-8d54-4b85-b8a9-2fb0dd6981b1/s/script.sh
+ cargo --version
info: syncing channel updates for '1.77-x86_64-unknown-linux-gnu'
info: latest update on 2024-04-09, rust version 1.77.2 (25ef9e3d8 2024-04-09)
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.77.2 (e52e36006 2024-03-26)
+ rustc --version
rustc 1.77.2 (25ef9e3d8 2024-04-09)
+ cargo fmt --check
error: 'cargo-fmt' is not installed for the toolchain '1.77-x86_64-unknown-linux-gnu'.
To install, run `rustup component add --toolchain 1.77-x86_64-unknown-linux-gnu rustfmt`
Exit code: 1
{
"response": "finished",
"result": "failure"
}