rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5 heartwoode64b39b6a6b882e56b452545d422d3918b87d12f
{
"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": "e500399b3e1db5fe7bcf6d7661d5a42dfa49d4d5",
"author": {
"id": "did:key:z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz",
"alias": null
},
"title": "radicle: improve inline comments",
"state": {
"status": "draft",
"conflicts": []
},
"before": "a8dac56ca645fdd98955766f07abe7cdd8980e56",
"after": "e64b39b6a6b882e56b452545d422d3918b87d12f",
"commits": [
"e64b39b6a6b882e56b452545d422d3918b87d12f",
"caa917406caf1b9c8c949f3f5e4c424103b32488",
"78fe4ee9087267b0cf0472a2891f127c83ce416f",
"3879e7558e182d2bb5a01b11874fb2913165c589",
"c3714bb791982ebfc128474f71dd1811fee7b867"
],
"target": "7e1cb406bb935c3de008d2171e8961f57b4336ea",
"labels": [],
"assignees": [],
"revisions": [
{
"id": "e500399b3e1db5fe7bcf6d7661d5a42dfa49d4d5",
"author": {
"id": "did:key:z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz",
"alias": null
},
"description": "The previous `CodeLocation` type did not correctly represent the semantics of an\ninline code location, for the following reasons:\n\n1. If it is for lines within a file pertaining to the commit, then there should\n be no `old` or `new` ranges, only a single range.\n2. If it is for a patch created by diffing the commit with another commit, then\n the other commit is missing.\n\nIt could be argued that the semantics of these two cases could be retrieved by:\n\n1. In the first case, just use one of the ranges.\n2. In the second case, infer the commit from the context, e.g. always use\n `Revision::base` for locations used in the `ReviewComment`.\n\nInstead, the type is renamed to `PartialLocation` to represent these semantics\nbetter, and only remains for backwards-compatibility when deserializing existing\ndata.\n\nTwo new types are introduced `CommitLocation` and `DiffLocation`, which more\naccurately describe the two cases.\n\nEach of these is used in a `Patch`'s `Revision` and `Review` thread\nrespectively. These are created with new actions `RevisionCommitComment` and\n`ReviewDiffComment`, while deprecating the use of `RevisionComment` and\n`ReviewComment` \u2013 they can no longer be constructed outside of the module.\n\nThe final part is to ensure that clients can calculate stable diffs for patches\n\u2013 to allow them to display the `DiffLocation`s correctly \u2013 the relevant diff\noptions are recorded for each patch. Sane defaults are used if the options are\nmissing.",
"base": "3b5fac178eaf9bca639fbd0c1df0c68619a7f51f",
"oid": "3679d0fbeb6123e7bed99bd3ddd05fea9ac83790",
"timestamp": 1741364575
},
{
"id": "687497ce5855e549e237de665e684772dbc28f76",
"author": {
"id": "did:key:z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz",
"alias": null
},
"description": "Changes:\n- Split up the patch into separate commits\n- Optional selection for file-level comments\n- Rename actions to use `V1` suffix, keeping the latest version of actions using\n their regular names. As well as this, the enum tag renames use `.v2` suffix.\n- Refactor `diff::Options` methods to return `git2::DiffOptions` directly.\n- Add `FindOptions` to the `diff::Options`.",
"base": "3b5fac178eaf9bca639fbd0c1df0c68619a7f51f",
"oid": "17713eab9565df332bb3ce40d3cf78f282d86050",
"timestamp": 1742995065
},
{
"id": "b168b283a23c3ca2457abf8b185d2b09eabe56af",
"author": {
"id": "did:key:z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz",
"alias": null
},
"description": "Changes:\n- Remove `all` from `FindOptions` \u2013 I found that it is worse at detecting\n renames\n- Remove `exact_match`, because I believe this will only look at SHAs and not\n return renames",
"base": "3b5fac178eaf9bca639fbd0c1df0c68619a7f51f",
"oid": "ff6cb4a3633bf31513824282628a4a3d19e6fbd9",
"timestamp": 1743007134
},
{
"id": "0a74e306857f4e907324fdb1b4c4c1f09d7fb691",
"author": {
"id": "did:key:z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz",
"alias": null
},
"description": "Changes:\n- Rebased\n- Document code\n- Removed `CodeRange::Chars` \u2013 I believe that no one actually used this and I'd\n prefer not support it until it's needed.",
"base": "5553a147523778574c1671d4706d34f723138632",
"oid": "e7cab63866450f40069dbe2038a9806f6878dd63",
"timestamp": 1746615901
},
{
"id": "8ac7f35519a868d1c0ff63d626ab7b5a382cfebb",
"author": {
"id": "did:key:z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz",
"alias": null
},
"description": "Backwards-compatible Approach\n\nThis approach extends the way we implemented changes to `Review` in a previous\npatch. The change is two-fold.\n\nThe first thing we do is separate out the effected `Action` variants into the\n`actions` module. While doing this, we version them, and guard the way they are\nconstructed and how they affect a `Patch` when being applied. We also ensure\nthat we can deserialize.\n\nThe second part is to separate the \"encoding\" of a `Revision`. Since `Revision`\nis changing by changing the type of the code locations from `PartialLocation`\n(previously named `CodeLocation`) to `DiffLocation`. The `encoding::Revision`\ntype can deserialize any existing revision JSON that exists, and it does this be\n\"decoding\" the previous version of the data into the newer version. Note that to\ndo this effectively, we need to provide the `DiffLocation` with the `base: Oid`.\nWe, safely, assume that this is the `Revision::base` and use that as the\ncontextual information for building the `DiffLocation`. Note that this means\n`encoding::Review** will no longer implement `Deserialize**, but it does have a\nmethod `decode**. This method takes the contextual `base: Oid** to convert any\nfound `PartialLocation`s into `DiffLocation`s.\n\n**NOTE**: when converting a `PartialLocation` to a `DiffLocation`, there is no\nway to get the hunk selection from the line selection. This would require a\n`Repository` handle to compute. We set the `selection` to `None` as a minor\nsacrifice in the name of backwards-compatibility (almost).\n\n**Aside**: One can imagine that we might end up changing some field in `Patch`\nin the future, and this exact process will have to be done again and introduce\nan `encoding::Patch`, which provides a way to migrate from the previous encoding\nto the latest encoding.",
"base": "2a47bc0c7dd6238ce3416e19d2ba57f3a7626f64",
"oid": "222e53c358dd9d87894ec64e8181b8353a5c517e",
"timestamp": 1753287978
},
{
"id": "62142e992b09aad50caad33f9ca0a23cd99d7308",
"author": {
"id": "did:key:z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz",
"alias": null
},
"description": "Properly encode single-line review comments in the CLI",
"base": "2a47bc0c7dd6238ce3416e19d2ba57f3a7626f64",
"oid": "37aa1dbca1032defced89bc3e602c8cac47449f7",
"timestamp": 1753961422
},
{
"id": "2331a68dca43f0386ab53068f2adba784bcf5134",
"author": {
"id": "did:key:z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz",
"alias": null
},
"description": "Rebase",
"base": "a8dac56ca645fdd98955766f07abe7cdd8980e56",
"oid": "e64b39b6a6b882e56b452545d422d3918b87d12f",
"timestamp": 1754923911
},
{
"id": "8eaf54d42211577cabb3ebef1ecab78665108e4d",
"author": {
"id": "did:key:z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz",
"alias": null
},
"description": "Changes:\n- Rebased\n- Fixed SHA in workflow test\n- Removed old radicle/cob/patch.rs that was left in by accident",
"base": "de78cf7874daceefbf6b370a31a3465e34e86423",
"oid": "096963ce455e62d622ae69d11cd973ed7d814240",
"timestamp": 1755188094
}
]
}
}
{
"response": "triggered",
"run_id": {
"id": "7f225445-b738-4217-acc5-3483542e3b15"
},
"info_url": "https://cci.rad.levitte.org//7f225445-b738-4217-acc5-3483542e3b15.html"
}
Started at: 2026-09-08 19:58:57.829258+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/7f225445-b738-4217-acc5-3483542e3b15/w/
╭────────────────────────────────────╮
│ heartwood │
│ Radicle Heartwood Protocol & Stack │
│ 189 issues · 39 patches │
╰────────────────────────────────────╯
Run `cd ./.` to go to the repository directory.
Exit code: 0
$ rad patch checkout e500399b3e1db5fe7bcf6d7661d5a42dfa49d4d5
✓ Switched to branch patch/e500399 at revision 8eaf54d
✓ Branch patch/e500399 setup to track rad/patches/e500399b3e1db5fe7bcf6d7661d5a42dfa49d4d5
Exit code: 0
$ git config advice.detachedHead false
Exit code: 0
$ git checkout e64b39b6a6b882e56b452545d422d3918b87d12f
HEAD is now at e64b39b6 cli: Properly encode single-line review comments
Exit code: 0
$ rad patch show e500399b3e1db5fe7bcf6d7661d5a42dfa49d4d5 -p
╭──────────────────────────────────────────────────────────────────────────────────╮
│ Title radicle: improve inline comments │
│ Patch e500399b3e1db5fe7bcf6d7661d5a42dfa49d4d5 │
│ Author fintohaps z6Mkire…SQZ3voM │
│ Head 096963ce455e62d622ae69d11cd973ed7d814240 │
│ Base de78cf7874daceefbf6b370a31a3465e34e86423 │
│ Target master │
│ Branches patch/e500399 │
│ Commits ahead 5, behind 922 │
│ Status draft │
│ │
│ The previous `CodeLocation` type did not correctly represent the semantics of an │
│ inline code location, for the following reasons: │
│ │
│ 1. If it is for lines within a file pertaining to the commit, then there should │
│ be no `old` or `new` ranges, only a single range. │
│ 2. If it is for a patch created by diffing the commit with another commit, then │
│ the other commit is missing. │
│ │
│ It could be argued that the semantics of these two cases could be retrieved by: │
│ │
│ 1. In the first case, just use one of the ranges. │
│ 2. In the second case, infer the commit from the context, e.g. always use │
│ `Revision::base` for locations used in the `ReviewComment`. │
│ │
│ Instead, the type is renamed to `PartialLocation` to represent these semantics │
│ better, and only remains for backwards-compatibility when deserializing existing │
│ data. │
│ │
│ Two new types are introduced `CommitLocation` and `DiffLocation`, which more │
│ accurately describe the two cases. │
│ │
│ Each of these is used in a `Patch`'s `Revision` and `Review` thread │
│ respectively. These are created with new actions `RevisionCommitComment` and │
│ `ReviewDiffComment`, while deprecating the use of `RevisionComment` and │
│ `ReviewComment` – they can no longer be constructed outside of the module. │
│ │
│ The final part is to ensure that clients can calculate stable diffs for patches │
│ – to allow them to display the `DiffLocation`s correctly – the relevant diff │
│ options are recorded for each patch. Sane defaults are used if the options are │
│ missing. │
├──────────────────────────────────────────────────────────────────────────────────┤
│ 096963c cli: Properly encode single-line review comments │
│ b6aeff4 radicle: use diff options in Patch │
│ 55f0002 radicle: deprecate old location in favour of DiffLocation │
│ 0819ebf radicle: diff configuration data │
│ 59a6f63 radicle: DiffLocation │
├──────────────────────────────────────────────────────────────────────────────────┤
│ ● Revision e500399 @ 3b5fac1..3679d0f by fintohaps z6Mkire…SQZ3voM 1 year ago │
│ ↑ Revision 687497c @ 3b5fac1..17713ea by fintohaps z6Mkire…SQZ3voM 1 year ago │
│ ↑ Revision b168b28 @ 3b5fac1..ff6cb4a by fintohaps z6Mkire…SQZ3voM 1 year ago │
│ └─ ⋄ reviewed by erikli z6MkgFq…FGAnBGz 1 year ago │
│ ↑ Revision 0a74e30 @ 5553a14..e7cab63 by fintohaps z6Mkire…SQZ3voM 1 year ago │
│ ↑ Revision 8ac7f35 @ 2a47bc0..222e53c by fintohaps z6Mkire…SQZ3voM 1 year ago │
│ ↑ Revision 62142e9 @ 2a47bc0..37aa1db by erikli z6MkgFq…FGAnBGz 1 year ago │
│ ↑ Revision 2331a68 @ a8dac56..e64b39b by lorenz z6MkkPv…WX5sTEz 1 year ago │
│ ↑ Revision 8eaf54d @ de78cf7..096963c by fintohaps z6Mkire…SQZ3voM 1 year ago │
╰──────────────────────────────────────────────────────────────────────────────────╯
commit 096963ce455e62d622ae69d11cd973ed7d814240
Author: Erik Kundt <erik@zirkular.io>
Date: Thu Jul 31 13:29:40 2025 +0200
cli: Properly encode single-line review comments
diff --git a/crates/radicle-cli/src/commands/patch/review/builder.rs b/crates/radicle-cli/src/commands/patch/review/builder.rs
index 2a1524e2b1..4070a83677 100644
--- a/crates/radicle-cli/src/commands/patch/review/builder.rs
+++ b/crates/radicle-cli/src/commands/patch/review/builder.rs
@@ -919,10 +919,8 @@ impl CommentBuilder {
// Skip the hunk header
.filter(|l| !l.starts_with("> @@"));
let mut comment = String::new();
- // Keeps track of where the next range will start from
- let mut range_start = 0;
// Keeps track of the line index within the hunk itself
- let mut line_ix = 0;
+ let mut line_ix = 0_usize;
// Keeps track of whether the first comment is at the top-level
let mut top_level = true;
@@ -933,9 +931,11 @@ impl CommentBuilder {
// Top-level comment
self.add_comment(hunk.as_index(None), &comment);
} else {
- self.add_comment(hunk.as_index(Some(range_start..line_ix)), &comment);
+ self.add_comment(
+ hunk.as_index(Some(line_ix.saturating_sub(1)..line_ix)),
+ &comment,
+ );
}
- range_start = line_ix;
comment.clear();
}
line_ix += 1;
@@ -947,7 +947,10 @@ impl CommentBuilder {
}
}
if !comment.is_empty() {
- self.add_comment(hunk.as_index(Some(range_start..line_ix)), &comment);
+ self.add_comment(
+ hunk.as_index(Some(line_ix.saturating_sub(1)..line_ix)),
+ &comment,
+ );
}
self
}
@@ -1034,7 +1037,7 @@ Comment #5.
base,
commit,
path.clone(),
- HunkIndex::new(0, CodeRange::lines(0..6)),
+ HunkIndex::new(0, CodeRange::lines(5..6)),
),
body: "Comment #1.".to_owned(),
}),
@@ -1043,7 +1046,7 @@ Comment #5.
base,
commit,
path.clone(),
- HunkIndex::new(0, CodeRange::lines(6..12)),
+ HunkIndex::new(0, CodeRange::lines(11..12)),
),
body: "Comment #2.".to_owned(),
}),
@@ -1052,7 +1055,7 @@ Comment #5.
base,
commit,
path.clone(),
- HunkIndex::new(0, CodeRange::lines(12..17)),
+ HunkIndex::new(0, CodeRange::lines(16..17)),
),
body: "Comment #3.".to_owned(),
}),
@@ -1070,7 +1073,7 @@ Comment #5.
base,
commit,
path.clone(),
- HunkIndex::new(0, CodeRange::lines(18..26)),
+ HunkIndex::new(0, CodeRange::lines(25..26)),
),
body: "Comment #5.".to_owned(),
}),
@@ -1146,7 +1149,7 @@ Woof.
base,
commit,
path.clone(),
- HunkIndex::new(0, CodeRange::lines(0..6)),
+ HunkIndex::new(0, CodeRange::lines(5..6)),
),
body: r#"
Blah blah blah blah blah blah blah.
@@ -1165,7 +1168,7 @@ Blaaah blaaah blaaah.
base,
commit,
path.clone(),
- HunkIndex::new(0, CodeRange::lines(6..12)),
+ HunkIndex::new(0, CodeRange::lines(11..12)),
),
body: r#"
Woof woof.
@@ -1285,7 +1288,7 @@ Comment on a split hunk.
base,
commit,
path.clone(),
- HunkIndex::new(0, CodeRange::lines(5..7)),
+ HunkIndex::new(0, CodeRange::lines(6..7)),
),
body: "Comment on a split hunk.".to_owned(),
})];
commit b6aeff4f923eab68f828046161d0c95ff8d2c878
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Fri Feb 28 09:14:49 2025 +0000
radicle: use diff options in Patch
Introduce the use of the `diff::Options` in `Patch`'s.
The diff configuration options are stored alongside a `Patch` so that when
reproducing comments in clients, they can accurately locate the `DiffLocation`.
diff --git a/crates/radicle-cli/examples/rad-cob-show.md b/crates/radicle-cli/examples/rad-cob-show.md
index 673f88788f..c930cb8cbd 100644
--- a/crates/radicle-cli/examples/rad-cob-show.md
+++ b/crates/radicle-cli/examples/rad-cob-show.md
@@ -72,7 +72,7 @@ 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":{}}
+{"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":{},"diffOptions":{"algorithm":"Histogram","skipBinary":false,"contextLines":3,"interhunkLines":0,"find":{"exact_match":false,"renames":{"limit":200,"rename_threshold":50}}}}
```
Finally let's update the issue and see the output of `rad cob show` also changes.
diff --git a/crates/radicle-remote-helper/src/push.rs b/crates/radicle-remote-helper/src/push.rs
index 53a0e278e0..fa3eb3705e 100644
--- a/crates/radicle-remote-helper/src/push.rs
+++ b/crates/radicle-remote-helper/src/push.rs
@@ -505,6 +505,7 @@ where
patch::MergeTarget::default(),
base,
head,
+ None,
&[],
signer,
)
@@ -515,6 +516,7 @@ where
patch::MergeTarget::default(),
base,
head,
+ None,
&[],
signer,
)
diff --git a/crates/radicle/src/cob/patch.rs b/crates/radicle/src/cob/patch.rs
index 033659b3c2..9ba301306a 100644
--- a/crates/radicle/src/cob/patch.rs
+++ b/crates/radicle/src/cob/patch.rs
@@ -234,6 +234,11 @@ pub enum Action {
/// Review comments resolved by this revision.
#[serde(default, skip_serializing_if = "BTreeSet::is_empty")]
resolves: BTreeSet<(EntryId, CommentId)>,
+ /// The diff options for the patch.
+ ///
+ /// **N.B**: Only relevant for the initial revision creation.
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ diff_options: Option<diff::Options>,
},
#[serde(rename = "revision.edit")]
RevisionEdit {
@@ -428,11 +433,64 @@ pub struct Patch {
pub(super) timeline: Vec<EntryId>,
/// Reviews index. Keeps track of reviews for better performance.
pub(super) reviews: BTreeMap<ReviewId, Option<(RevisionId, ActorId)>>,
+ /// The options used to provide the diff of the [`Patch`].
+ #[serde(default)]
+ pub(super) diff_options: diff::Options,
+}
+
+/// Data to create a new [`Patch`].
+///
+/// A new request can be constructed with [`CreatePatchRequest::new`]. The
+/// [`MergeTarget`] and [`diff::Options`] can be set for the request by using
+/// [`CreatePatchRequest::with_target`] and
+/// [`CreatePatchRequest::with_diff_options`], respectively.
+///
+/// To use the [`CreatePatchRequest`], see [`Patch::new`].
+pub struct CreatePatchRequest {
+ title: String,
+ target: MergeTarget,
+ id: RevisionId,
+ revision: Revision,
+ diff_options: diff::Options,
+}
+
+impl CreatePatchRequest {
+ /// Construct a new `CreatePatch` using default for `target`and
+ /// `diff_options`.
+ pub fn new(title: String, id: RevisionId, revision: Revision) -> Self {
+ Self {
+ title,
+ target: MergeTarget::default(),
+ id,
+ revision,
+ diff_options: diff::Options::default(),
+ }
+ }
+
+ /// Set the `target`.
+ pub fn with_target(self, target: MergeTarget) -> Self {
+ Self { target, ..self }
+ }
+
+ /// Set the `diff_options`.
+ pub fn with_diff_options(self, diff_options: diff::Options) -> Self {
+ Self {
+ diff_options,
+ ..self
+ }
+ }
}
impl Patch {
- /// Construct a new patch object from a revision.
- pub fn new(title: String, target: MergeTarget, (id, revision): (RevisionId, Revision)) -> Self {
+ /// Construct a new patch object from a [`CreatePatchRequest`].
+ pub fn new(create: CreatePatchRequest) -> Self {
+ let CreatePatchRequest {
+ title,
+ target,
+ id,
+ revision,
+ diff_options,
+ } = create;
Self {
title,
author: revision.author.clone(),
@@ -444,6 +502,7 @@ impl Patch {
assignees: BTreeSet::default(),
timeline: vec![id.into_inner()],
reviews: BTreeMap::default(),
+ diff_options,
}
}
@@ -845,6 +904,8 @@ impl Patch {
base,
oid,
resolves,
+ // ignored for new revisions
+ diff_options: _,
} => {
debug_assert!(!self.revisions.contains_key(&entry));
let id = RevisionId(entry);
@@ -1136,6 +1197,7 @@ impl store::Cob for Patch {
base,
oid,
resolves,
+ diff_options,
}) = actions.next()
else {
return Err(Error::Init("the first action must be of type `revision`"));
@@ -1152,7 +1214,11 @@ impl store::Cob for Patch {
op.timestamp,
resolves,
);
- let mut patch = Patch::new(title, target, (RevisionId(op.id), revision));
+
+ let create = CreatePatchRequest::new(title, RevisionId(op.id), revision)
+ .with_target(target)
+ .with_diff_options(diff_options.unwrap_or_default());
+ let mut patch = Patch::new(create);
for action in actions {
match patch.authorization(&action, &op.author, &doc)? {
@@ -1914,6 +1980,22 @@ impl<R: ReadRepository> store::Transaction<Patch, R> {
self.push(Action::Merge { revision, commit })
}
+ fn initial_revision(
+ &mut self,
+ description: impl ToString,
+ base: impl Into<git::Oid>,
+ oid: impl Into<git::Oid>,
+ opts: Option<diff::Options>,
+ ) -> Result<(), store::Error> {
+ self.push(Action::Revision {
+ description: description.to_string(),
+ base: base.into(),
+ oid: oid.into(),
+ resolves: BTreeSet::new(),
+ diff_options: opts,
+ })
+ }
+
/// Update a patch with a new revision.
pub fn revision(
&mut self,
@@ -1926,6 +2008,7 @@ impl<R: ReadRepository> store::Transaction<Patch, R> {
base: base.into(),
oid: oid.into(),
resolves: BTreeSet::new(),
+ diff_options: None,
})
}
@@ -2599,6 +2682,7 @@ where
target: MergeTarget,
base: impl Into<git::Oid>,
oid: impl Into<git::Oid>,
+ opts: Option<diff::Options>,
labels: &[Label],
cache: &'g mut C,
signer: &Device<G>,
@@ -2613,6 +2697,7 @@ where
target,
base,
oid,
+ opts,
labels,
Lifecycle::default(),
cache,
@@ -2628,6 +2713,7 @@ where
target: MergeTarget,
base: impl Into<git::Oid>,
oid: impl Into<git::Oid>,
+ opts: Option<diff::Options>,
labels: &[Label],
cache: &'g mut C,
signer: &Device<G>,
@@ -2642,6 +2728,7 @@ where
target,
base,
oid,
+ opts,
labels,
Lifecycle::Draft,
cache,
@@ -2676,6 +2763,7 @@ where
target: MergeTarget,
base: impl Into<git::Oid>,
oid: impl Into<git::Oid>,
+ opts: Option<diff::Options>,
labels: &[Label],
state: Lifecycle,
cache: &'g mut C,
@@ -2686,7 +2774,7 @@ where
G: crypto::signature::Signer<crypto::Signature>,
{
let (id, patch) = Transaction::initial("Create patch", &mut self.raw, signer, |tx, _| {
- tx.revision(description, base, oid)?;
+ tx.initial_revision(description, base, oid, opts)?;
tx.edit(title, target)?;
if !labels.is_empty() {
@@ -2862,6 +2950,7 @@ mod test {
target,
branch.base,
branch.oid,
+ None,
&[],
&alice.signer,
)
@@ -2902,6 +2991,7 @@ mod test {
MergeTarget::Delegates,
branch.base,
branch.oid,
+ None,
&[],
&alice.signer,
)
@@ -2935,6 +3025,7 @@ mod test {
MergeTarget::Delegates,
branch.base,
branch.oid,
+ None,
&[],
&alice.signer,
)
@@ -2966,6 +3057,7 @@ mod test {
MergeTarget::Delegates,
branch.base,
branch.oid,
+ None,
&[],
&alice.signer,
)
@@ -3018,6 +3110,7 @@ mod test {
MergeTarget::Delegates,
branch.base,
branch.oid,
+ None,
&[],
&alice.signer,
)
@@ -3058,6 +3151,7 @@ mod test {
base,
oid,
resolves: Default::default(),
+ diff_options: None,
},
Action::Edit {
title: String::from("My patch"),
@@ -3069,6 +3163,7 @@ mod test {
base,
oid,
resolves: Default::default(),
+ diff_options: None,
}]);
let a3 = alice.op::<Patch>([Action::RevisionRedact {
revision: RevisionId(a2.id()),
@@ -3109,6 +3204,7 @@ mod test {
base,
oid,
resolves: Default::default(),
+ diff_options: None,
},
Action::Edit {
title: String::from("Some patch"),
@@ -3124,6 +3220,7 @@ mod test {
base,
oid,
resolves: Default::default(),
+ diff_options: None,
},
&alice,
);
@@ -3169,6 +3266,7 @@ mod test {
base,
oid,
resolves: Default::default(),
+ diff_options: None,
},
Action::Edit {
title: String::from("My patch"),
@@ -3206,6 +3304,7 @@ mod test {
MergeTarget::Delegates,
branch.base,
branch.oid,
+ None,
&[],
&alice.signer,
)
@@ -3251,6 +3350,7 @@ mod test {
MergeTarget::Delegates,
branch.base,
branch.oid,
+ None,
&[],
&alice.signer,
)
@@ -3282,6 +3382,7 @@ mod test {
MergeTarget::Delegates,
branch.base,
branch.oid,
+ None,
&[],
&alice.signer,
)
@@ -3333,6 +3434,7 @@ mod test {
MergeTarget::Delegates,
branch.base,
branch.oid,
+ None,
&[],
&alice.signer,
)
@@ -3380,6 +3482,7 @@ mod test {
MergeTarget::Delegates,
branch.base,
branch.oid,
+ None,
&[],
&alice.signer,
)
@@ -3435,6 +3538,7 @@ mod test {
MergeTarget::Delegates,
branch.base,
branch.oid,
+ None,
&[],
&alice.signer,
)
@@ -3484,6 +3588,7 @@ mod test {
MergeTarget::Delegates,
branch.base,
branch.oid,
+ None,
&[],
&alice.signer,
)
diff --git a/crates/radicle/src/cob/patch/cache.rs b/crates/radicle/src/cob/patch/cache.rs
index ea10869dd5..9e9aa0567d 100644
--- a/crates/radicle/src/cob/patch/cache.rs
+++ b/crates/radicle/src/cob/patch/cache.rs
@@ -11,11 +11,12 @@ use crate::cob::store;
use crate::cob::{Label, ObjectId, TypeName};
use crate::git;
use crate::node::device::Device;
+use crate::node::NodeId;
use crate::prelude::RepoId;
use crate::storage::{HasRepoId, ReadRepository, RepositoryError, SignRepository, WriteRepository};
use super::{
- ByRevision, MergeTarget, NodeId, Patch, PatchCounts, PatchId, PatchMut, Revision, RevisionId,
+ diff, ByRevision, MergeTarget, Patch, PatchCounts, PatchId, PatchMut, Revision, RevisionId,
State, Status,
};
@@ -115,6 +116,7 @@ impl<'a, R, C> Cache<super::Patches<'a, R>, C> {
target: MergeTarget,
base: impl Into<git::Oid>,
oid: impl Into<git::Oid>,
+ opts: Option<diff::Options>,
labels: &[Label],
signer: &Device<G>,
) -> Result<PatchMut<'a, 'g, R, C>, super::Error>
@@ -129,6 +131,7 @@ impl<'a, R, C> Cache<super::Patches<'a, R>, C> {
target,
base,
oid,
+ opts,
labels,
&mut self.cache,
signer,
@@ -145,6 +148,7 @@ impl<'a, R, C> Cache<super::Patches<'a, R>, C> {
target: MergeTarget,
base: impl Into<git::Oid>,
oid: impl Into<git::Oid>,
+ opts: Option<diff::Options>,
labels: &[Label],
signer: &Device<G>,
) -> Result<PatchMut<'a, 'g, R, C>, super::Error>
@@ -159,6 +163,7 @@ impl<'a, R, C> Cache<super::Patches<'a, R>, C> {
target,
base,
oid,
+ opts,
labels,
&mut self.cache,
signer,
@@ -714,7 +719,8 @@ mod tests {
use crate::cob::thread::{Comment, Thread};
use crate::cob::Author;
use crate::patch::{
- ByRevision, MergeTarget, Patch, PatchCounts, PatchId, Revision, RevisionId, State, Status,
+ ByRevision, CreatePatchRequest, Patch, PatchCounts, PatchId, Revision, RevisionId, State,
+ Status,
};
use crate::prelude::Did;
use crate::profile::env;
@@ -767,13 +773,15 @@ mod tests {
let mut cache = memory(repo);
assert!(cache.is_empty().unwrap());
- let patch = Patch::new("Patch #1".to_string(), MergeTarget::Delegates, revision());
+ let (id, rev) = revision();
+ let patch = Patch::new(CreatePatchRequest::new("Patch #1".to_string(), id, rev));
let id = ObjectId::from_str("47799cbab2eca047b6520b9fce805da42b49ecab").unwrap();
cache.update(&cache.rid(), &id, &patch).unwrap();
+ let (id, rev) = revision();
let patch = Patch {
state: State::Archived,
- ..Patch::new("Patch #2".to_string(), MergeTarget::Delegates, revision())
+ ..Patch::new(CreatePatchRequest::new("Patch #2".to_string(), id, rev))
};
let id = ObjectId::from_str("ae981ded6ed2ed2cdba34c8603714782667f18a3").unwrap();
cache.update(&cache.rid(), &id, &patch).unwrap();
@@ -803,16 +811,18 @@ mod tests {
.collect::<BTreeSet<PatchId>>();
for id in open_ids.iter() {
- let patch = Patch::new(id.to_string(), MergeTarget::Delegates, revision());
+ let (rev_id, rev) = revision();
+ let patch = Patch::new(CreatePatchRequest::new(id.to_string(), rev_id, rev));
cache
.update(&cache.rid(), &PatchId::from(*id), &patch)
.unwrap();
}
for id in draft_ids.iter() {
+ let (rev_id, rev) = revision();
let patch = Patch {
state: State::Draft,
- ..Patch::new(id.to_string(), MergeTarget::Delegates, revision())
+ ..Patch::new(CreatePatchRequest::new(id.to_string(), rev_id, rev))
};
cache
.update(&cache.rid(), &PatchId::from(*id), &patch)
@@ -820,9 +830,10 @@ mod tests {
}
for id in archived_ids.iter() {
+ let (rev_id, rev) = revision();
let patch = Patch {
state: State::Archived,
- ..Patch::new(id.to_string(), MergeTarget::Delegates, revision())
+ ..Patch::new(CreatePatchRequest::new(id.to_string(), rev_id, rev))
};
cache
.update(&cache.rid(), &PatchId::from(*id), &patch)
@@ -830,12 +841,13 @@ mod tests {
}
for id in merged_ids.iter() {
+ let (rev_id, rev) = revision();
let patch = Patch {
state: State::Merged {
revision: arbitrary::oid().into(),
commit: arbitrary::oid(),
},
- ..Patch::new(id.to_string(), MergeTarget::Delegates, revision())
+ ..Patch::new(CreatePatchRequest::new(id.to_string(), rev_id, rev))
};
cache
.update(&cache.rid(), &PatchId::from(*id), &patch)
@@ -869,7 +881,8 @@ mod tests {
let mut patches = Vec::with_capacity(ids.len());
for id in ids.iter() {
- let patch = Patch::new(id.to_string(), MergeTarget::Delegates, revision());
+ let (rev_id, rev) = revision();
+ let patch = Patch::new(CreatePatchRequest::new(id.to_string(), rev_id, rev));
cache
.update(&cache.rid(), &PatchId::from(*id), &patch)
.unwrap();
@@ -897,11 +910,11 @@ mod tests {
.iter()
.next()
.expect("at least one revision should have been created");
- let mut patch = Patch::new(
+ let mut patch = Patch::new(CreatePatchRequest::new(
patch_id.to_string(),
- MergeTarget::Delegates,
- (*rev_id, rev.clone()),
- );
+ *rev_id,
+ rev.clone(),
+ ));
let timeline = revisions.keys().copied().collect::<Vec<_>>();
patch
.timeline
@@ -937,7 +950,8 @@ mod tests {
let mut patches = Vec::with_capacity(ids.len());
for id in ids.iter() {
- let patch = Patch::new(id.to_string(), MergeTarget::Delegates, revision());
+ let (rev_id, rev) = revision();
+ let patch = Patch::new(CreatePatchRequest::new(id.to_string(), rev_id, rev));
cache
.update(&cache.rid(), &PatchId::from(*id), &patch)
.unwrap();
@@ -964,7 +978,8 @@ mod tests {
let mut patches = Vec::with_capacity(ids.len());
for id in ids.iter() {
- let patch = Patch::new(id.to_string(), MergeTarget::Delegates, revision());
+ let (rev_id, rev) = revision();
+ let patch = Patch::new(CreatePatchRequest::new(id.to_string(), rev_id, rev));
cache
.update(&cache.rid(), &PatchId::from(*id), &patch)
.unwrap();
@@ -990,7 +1005,8 @@ mod tests {
.collect::<BTreeSet<PatchId>>();
for id in ids.iter() {
- let patch = Patch::new(id.to_string(), MergeTarget::Delegates, revision());
+ let (rev_id, rev) = revision();
+ let patch = Patch::new(CreatePatchRequest::new(id.to_string(), rev_id, rev));
cache
.update(&cache.rid(), &PatchId::from(*id), &patch)
.unwrap();
diff --git a/crates/radicle/src/cob/test.rs b/crates/radicle/src/cob/test.rs
index c2fb701cde..548bbc6a70 100644
--- a/crates/radicle/src/cob/test.rs
+++ b/crates/radicle/src/cob/test.rs
@@ -237,6 +237,7 @@ impl<G: Signer> Actor<G> {
base,
oid,
resolves: Default::default(),
+ diff_options: None,
},
patch::Action::Edit {
title: title.to_string(),
commit 55f000268fc95c670ce2ba6b78ccdab925c1ab4e
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Wed Mar 26 10:27:39 2025 +0000
radicle: deprecate old location in favour of DiffLocation
diff --git a/crates/radicle-cli/examples/rad-patch-delete.md b/crates/radicle-cli/examples/rad-patch-delete.md
index 565e1d11c3..5927820325 100644
--- a/crates/radicle-cli/examples/rad-patch-delete.md
+++ b/crates/radicle-cli/examples/rad-patch-delete.md
@@ -25,7 +25,7 @@ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from the network, found 2 potential s
🌱 Fetched from z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z
$ rad patch comment 6c61ef1 -m "I think we should use MIT"
╭───────────────────────────╮
-│ bob (you) now 833db19 │
+│ bob (you) now f20d3ec │
│ I think we should use MIT │
╰───────────────────────────╯
✓ Synced with 2 seed(s)
@@ -47,12 +47,12 @@ $ rad patch show 6c61ef1 -v
├────────────────────────────────────────────────────┤
│ ● opened by alice (you) (717c900) now │
├────────────────────────────────────────────────────┤
-│ bob z6Mkt67…v4N1tRk now 833db19 │
+│ bob z6Mkt67…v4N1tRk now f20d3ec │
│ I think we should use MIT │
╰────────────────────────────────────────────────────╯
-$ rad patch comment 6c61ef1 --reply-to 833db19 -m "Thanks, I'll add it!"
+$ rad patch comment 6c61ef1 --reply-to f20d3ec -m "Thanks, I'll add it!"
╭─────────────────────────╮
-│ alice (you) now 1803a38 │
+│ alice (you) now 6af0c73 │
│ Thanks, I'll add it! │
╰─────────────────────────╯
✓ Synced with 2 seed(s)
@@ -70,7 +70,7 @@ $ git commit -am "Add MIT License"
``` ~alice (stderr)
$ git push -f
-✓ Patch 6c61ef1 updated to revision 93915b9afa94a9dc4f52f12cdf077d4613ea3eb3
+✓ Patch 6c61ef1 updated to revision f415ddfb8ef2c4e58b73e96cec8303941fe791d2
To compare against your previous revision 6c61ef1, run:
git range-diff f2de534[..] 717c900[..] 1cc8cd9[..]
@@ -98,7 +98,7 @@ $ rad patch show 6c61ef1 -v
│ 717c900 Introduce license │
├─────────────────────────────────────────────────────────────────────┤
│ ● opened by alice z6MknSL…StBU8Vi (717c900) now │
-│ ↑ updated to 93915b9afa94a9dc4f52f12cdf077d4613ea3eb3 (1cc8cd9) now │
+│ ↑ updated to f415ddfb8ef2c4e58b73e96cec8303941fe791d2 (1cc8cd9) now │
│ └─ ✓ accepted by bob (you) now │
╰─────────────────────────────────────────────────────────────────────╯
```
@@ -124,7 +124,7 @@ $ rad patch show 6c61ef1 -v
│ 717c900 Introduce license │
├─────────────────────────────────────────────────────────────────────┤
│ ● opened by alice (you) (717c900) now │
-│ ↑ updated to 93915b9afa94a9dc4f52f12cdf077d4613ea3eb3 (1cc8cd9) now │
+│ ↑ updated to f415ddfb8ef2c4e58b73e96cec8303941fe791d2 (1cc8cd9) now │
╰─────────────────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/examples/rad-patch.md b/crates/radicle-cli/examples/rad-patch.md
index b038fa6745..d3f5fd7420 100644
--- a/crates/radicle-cli/examples/rad-patch.md
+++ b/crates/radicle-cli/examples/rad-patch.md
@@ -140,19 +140,19 @@ 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
╭───────────────────────────────────────╮
-│ alice (you) now 686ec1c │
+│ alice (you) now a6202ea │
│ 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 aa45913 --message 'My favorite decade!' --reply-to a6202ea -q --no-announce
+9063c13c19202750bd9aa81fffdea2198cedfba7
```
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 aa45913 --edit a6202ea --message 'I cannot wait to get back to the 80s!' --no-announce
╭───────────────────────────────────────╮
-│ alice (you) now 686ec1c │
+│ alice (you) now a6202ea │
│ I cannot wait to get back to the 80s! │
╰───────────────────────────────────────╯
```
@@ -160,8 +160,8 @@ $ 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 aa45913 --redact 9063c13c19202750bd9aa81fffdea2198cedfba7 --no-announce
+✓ Redacted comment 9063c13c19202750bd9aa81fffdea2198cedfba7
```
Now, let's checkout the patch that we just created:
diff --git a/crates/radicle-cli/examples/workflow/4-patching-contributor.md b/crates/radicle-cli/examples/workflow/4-patching-contributor.md
index a04551615d..a56ab8703c 100644
--- a/crates/radicle-cli/examples/workflow/4-patching-contributor.md
+++ b/crates/radicle-cli/examples/workflow/4-patching-contributor.md
@@ -90,6 +90,6 @@ 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
+4830a8598c5f6ad9f4aa3acd701a61a380b0d275
✓ 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 61c771da25..02214e40eb 100644
--- a/crates/radicle-cli/examples/workflow/5-patching-maintainer.md
+++ b/crates/radicle-cli/examples/workflow/5-patching-maintainer.md
@@ -63,7 +63,7 @@ $ git commit -m "Use markdown for requirements"
```
``` (stderr)
$ git push rad -o no-sync -o patch.message="Use markdown for requirements"
-✓ Patch e4934b6 updated to revision 9d62420e779e5cfe1dc02c51eddec9a0907aa844
+✓ Patch e4934b6 updated to revision 9e458d00b2e9a26993113c48259781725e2cbee3
To compare against your previous revision 773b9aa, run:
git range-diff f2de534[..] 27857ec[..] f567f69[..]
@@ -75,7 +75,7 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE
Great, all fixed up, lets accept and merge the code.
```
-$ rad patch review e4934b6 --revision 9d62420 --accept
+$ rad patch review e4934b6 --revision 9e458d00b2e9a26993113c48259781725e2cbee3 --accept
✓ Patch e4934b6 accepted
✓ Synced with 1 seed(s)
$ git checkout master
@@ -91,7 +91,7 @@ Fast-forward
```
``` (stderr)
$ git push rad master
-✓ Patch e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46 merged at revision 9d62420
+✓ Patch e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46 merged at revision 9e458d0
✓ Canonical reference refs/heads/master updated to target commit f567f695d25b4e8fb63b5f5ad2a584529826e908
✓ Synced with 1 seed(s)
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
@@ -117,9 +117,9 @@ $ rad patch show e4934b6
├─────────────────────────────────────────────────────────────────────┤
│ ● opened by bob z6Mkt67…v4N1tRk (3e674d1) now │
│ ↑ updated to 773b9aab58b11e9fa83d0ed0baca2bea6ff889c9 (27857ec) now │
-│ * revised by alice (you) in 9d62420 (f567f69) now │
+│ * revised by alice (you) in 9e458d0 (f567f69) now │
│ └─ ✓ accepted by alice (you) now │
-│ └─ ✓ merged by alice (you) at revision 9d62420 (f567f69) now │
+│ └─ ✓ merged by alice (you) at revision 9e458d0 (f567f69) now │
╰─────────────────────────────────────────────────────────────────────╯
```
diff --git a/crates/radicle-cli/src/commands/patch/review/builder.rs b/crates/radicle-cli/src/commands/patch/review/builder.rs
index fe7f24484c..2a1524e2b1 100644
--- a/crates/radicle-cli/src/commands/patch/review/builder.rs
+++ b/crates/radicle-cli/src/commands/patch/review/builder.rs
@@ -13,21 +13,24 @@
//!
use std::collections::VecDeque;
use std::fmt::Write as _;
-use std::ops::{Deref, Not, Range};
+use std::ops::{Deref, Range};
use std::path::{Path, PathBuf};
use std::str::FromStr;
use std::{fmt, io};
use radicle::cob;
use radicle::cob::patch::{PatchId, Revision, Verdict};
-use radicle::cob::{CodeLocation, CodeRange};
+use radicle::cob::{CodeRange, DiffLocation, HunkIndex};
use radicle::crypto;
use radicle::git;
use radicle::node::device::Device;
use radicle::prelude::*;
use radicle::storage::git::{cob::DraftStore, Repository};
use radicle_git_ext::Oid;
-use radicle_surf::diff::*;
+use radicle_surf::diff;
+use radicle_surf::diff::{
+ Copied, Diff, DiffContent, DiffFile, EofNewLine, FileDiff, Hunks, Modification, Moved,
+};
use radicle_term::{Element, VStack};
use crate::git::pretty_diff::ToPretty;
@@ -136,6 +139,33 @@ impl FromStr for ReviewAction {
}
}
+/// Keep track of the [`diff::Hunk`] and its `index` within the diff patch.
+#[derive(Debug)]
+pub struct Hunk {
+ /// Index of the hunk within its respective patch.
+ index: usize,
+ /// The [`diff::Hunk`] that is being kept track of.
+ inner: diff::Hunk<Modification>,
+}
+
+impl Hunk {
+ pub fn new(index: usize, hunk: diff::Hunk<Modification>) -> Self {
+ Self { index, inner: hunk }
+ }
+
+ pub fn as_index(&self, range: Option<Range<usize>>) -> Option<HunkIndex> {
+ range.map(|range| HunkIndex::new(self.index, CodeRange::lines(range)))
+ }
+}
+
+impl TryFrom<&Hunk> for HunkHeader {
+ type Error = unified_diff::Error;
+
+ fn try_from(Hunk { ref inner, .. }: &Hunk) -> Result<Self, Self::Error> {
+ Self::try_from(inner)
+ }
+}
+
/// A single review item. Can be a hunk or eg. a file move.
/// Files are usually split into multiple review items.
#[derive(Debug)]
@@ -144,20 +174,20 @@ pub enum ReviewItem {
path: PathBuf,
header: FileHeader,
new: DiffFile,
- hunk: Option<Hunk<Modification>>,
+ hunk: Option<Hunk>,
},
FileDeleted {
path: PathBuf,
header: FileHeader,
old: DiffFile,
- hunk: Option<Hunk<Modification>>,
+ hunk: Option<Hunk>,
},
FileModified {
path: PathBuf,
header: FileHeader,
old: DiffFile,
new: DiffFile,
- hunk: Option<Hunk<Modification>>,
+ hunk: Option<Hunk>,
},
FileMoved {
moved: Moved,
@@ -181,7 +211,7 @@ pub enum ReviewItem {
}
impl ReviewItem {
- fn hunk(&self) -> Option<&Hunk<Modification>> {
+ fn hunk(&self) -> Option<&Hunk> {
match self {
Self::FileAdded { hunk, .. } => hunk.as_ref(),
Self::FileDeleted { hunk, .. } => hunk.as_ref(),
@@ -260,7 +290,7 @@ impl ReviewItem {
.child(header);
if let Some(hunk) = hunk {
- let hunk = hunk.pretty(&mut hi, &highlighted, repo);
+ let hunk = hunk.inner.pretty(&mut hi, &highlighted, repo);
if !hunk.is_empty() {
return vstack.divider().merge(hunk).boxed();
}
@@ -312,7 +342,9 @@ impl ReviewQueue {
..
} = a.diff
{
- hs.pop()
+ hs.len()
+ .checked_sub(1)
+ .and_then(|i| hs.pop().map(|h| Hunk::new(i, h)))
} else {
None
},
@@ -328,7 +360,9 @@ impl ReviewQueue {
..
} = d.diff
{
- hs.pop()
+ hs.len()
+ .checked_sub(1)
+ .and_then(|i| hs.pop().map(|h| Hunk::new(i, h)))
} else {
None
},
@@ -361,13 +395,13 @@ impl ReviewQueue {
eof,
..
} => {
- for hunk in hunks {
+ for (i, hunk) in hunks.iter().enumerate() {
self.add_item(ReviewItem::FileModified {
path: m.path.clone(),
header: header.clone(),
old: m.old.clone(),
new: m.new.clone(),
- hunk: Some(hunk),
+ hunk: Some(Hunk::new(i, hunk.clone())),
});
}
if let EofNewLine::OldMissing | EofNewLine::NewMissing = eof {
@@ -461,11 +495,12 @@ impl FileReviewBuilder {
header.old_line_no -= self.delta as u32;
header.new_line_no -= self.delta as u32;
- let h = Hunk {
+ let h = h.inner.clone();
+ let h = diff::Hunk {
header: header.to_unified_string()?.as_bytes().to_owned().into(),
- lines: h.lines.clone(),
- old: h.old.clone(),
- new: h.new.clone(),
+ lines: h.lines,
+ old: h.old,
+ new: h.new,
};
writer.encode(&h)?;
}
@@ -710,7 +745,11 @@ impl<'a> ReviewBuilder<'a> {
let path = old.or(new);
if let (Some(hunk), Some((path, _))) = (item.hunk(), path) {
- let builder = CommentBuilder::new(revision.head(), path.to_path_buf());
+ let builder = CommentBuilder::new(
+ *revision.base(),
+ revision.head(),
+ path.to_path_buf(),
+ );
let comments = builder.edit(hunk)?;
patch.transaction("Review comments", signer, |tx| {
@@ -820,7 +859,7 @@ impl<'a> ReviewBuilder<'a> {
#[derive(Debug, PartialEq, Eq)]
struct ReviewComment {
- location: CodeLocation,
+ location: DiffLocation,
body: String,
}
@@ -840,23 +879,25 @@ enum Error {
#[derive(Debug)]
struct CommentBuilder {
+ base: Oid,
commit: Oid,
path: PathBuf,
comments: Vec<ReviewComment>,
}
impl CommentBuilder {
- fn new(commit: Oid, path: PathBuf) -> Self {
+ fn new(base: Oid, commit: Oid, path: PathBuf) -> Self {
Self {
+ base,
commit,
path,
comments: Vec::new(),
}
}
- fn edit(mut self, hunk: &Hunk<Modification>) -> Result<Vec<ReviewComment>, Error> {
+ fn edit(mut self, hunk: &Hunk) -> Result<Vec<ReviewComment>, Error> {
let mut input = String::new();
- for line in hunk.to_unified_string()?.lines() {
+ for line in hunk.inner.to_unified_string()?.lines() {
writeln!(&mut input, "> {line}")?;
}
let output = term::Editor::comment()
@@ -865,91 +906,65 @@ impl CommentBuilder {
.edit()?;
if let Some(output) = output {
- let header = HunkHeader::try_from(hunk)?;
- self.add_hunk(header, &output);
+ self.add_hunk(hunk, &output);
}
Ok(self.comments())
}
- fn add_hunk(&mut self, hunk: HunkHeader, input: &str) -> &mut Self {
- let lines = input.trim().lines().map(|l| l.trim());
- let (mut old_line, mut new_line) = (hunk.old_line_no as usize, hunk.new_line_no as usize);
- let (mut old_start, mut new_start) = (old_line, new_line);
+ fn add_hunk(&mut self, hunk: &Hunk, input: &str) -> &mut Self {
+ let lines = input
+ .trim()
+ .lines()
+ .map(|l| l.trim())
+ // Skip the hunk header
+ .filter(|l| !l.starts_with("> @@"));
let mut comment = String::new();
+ // Keeps track of where the next range will start from
+ let mut range_start = 0;
+ // Keeps track of the line index within the hunk itself
+ let mut line_ix = 0;
+ // Keeps track of whether the first comment is at the top-level
+ let mut top_level = true;
for line in lines {
if line.starts_with('>') {
if !comment.is_empty() {
- self.add_comment(
- &hunk,
- &comment,
- old_start..old_line - 1,
- new_start..new_line - 1,
- );
-
- old_start = old_line - 1;
- new_start = new_line - 1;
-
- comment.clear();
- }
- match line.trim_start_matches('>').trim_start().chars().next() {
- Some('-') => old_line += 1,
- Some('+') => new_line += 1,
- _ => {
- old_line += 1;
- new_line += 1;
+ if top_level {
+ // Top-level comment
+ self.add_comment(hunk.as_index(None), &comment);
+ } else {
+ self.add_comment(hunk.as_index(Some(range_start..line_ix)), &comment);
}
+ range_start = line_ix;
+ comment.clear();
}
+ line_ix += 1;
+ // Can no longer be a top-level comment
+ top_level = false;
} else {
comment.push_str(line);
comment.push('\n');
}
}
if !comment.is_empty() {
- self.add_comment(
- &hunk,
- &comment,
- old_start..old_line - 1,
- new_start..new_line - 1,
- );
+ self.add_comment(hunk.as_index(Some(range_start..line_ix)), &comment);
}
self
}
- fn add_comment(
- &mut self,
- hunk: &HunkHeader,
- comment: &str,
- mut old_range: Range<usize>,
- mut new_range: Range<usize>,
- ) {
+ fn add_comment(&mut self, selection: Option<HunkIndex>, comment: &str) {
// Empty lines between quoted text can generate empty comments
// that should be filtered out.
if comment.trim().is_empty() {
return;
}
- // Top-level comment, it should apply to the whole hunk.
- if old_range.is_empty() && new_range.is_empty() {
- old_range = hunk.old_line_no as usize..(hunk.old_line_no + hunk.old_size + 1) as usize;
- new_range = hunk.new_line_no as usize..(hunk.new_line_no + hunk.new_size + 1) as usize;
- }
- let old_range = old_range
- .is_empty()
- .not()
- .then_some(old_range)
- .map(|range| CodeRange::Lines { range });
- let new_range = (new_range)
- .is_empty()
- .not()
- .then_some(new_range)
- .map(|range| CodeRange::Lines { range });
self.comments.push(ReviewComment {
- location: CodeLocation {
- commit: self.commit,
+ location: DiffLocation {
+ base: self.base,
+ head: self.commit,
path: self.path.clone(),
- old: old_range,
- new: new_range,
+ selection,
},
body: comment.trim().to_owned(),
});
@@ -1010,65 +1025,73 @@ Comment #5.
"#;
+ let base = git::raw::Oid::zero().into();
let commit = Oid::from_str("a32c4b93e2573fd83b15ac1ad6bf1317dc8fd760").unwrap();
let path = PathBuf::from_str("main.rs").unwrap();
let expected = &[
(ReviewComment {
- location: CodeLocation {
+ location: DiffLocation::hunk_level(
+ base,
commit,
- path: path.clone(),
- old: Some(CodeRange::Lines { range: 2559..2565 }),
- new: Some(CodeRange::Lines { range: 2560..2563 }),
- },
+ path.clone(),
+ HunkIndex::new(0, CodeRange::lines(0..6)),
+ ),
body: "Comment #1.".to_owned(),
}),
(ReviewComment {
- location: CodeLocation {
+ location: DiffLocation::hunk_level(
+ base,
commit,
- path: path.clone(),
- old: Some(CodeRange::Lines { range: 2565..2568 }),
- new: Some(CodeRange::Lines { range: 2563..2567 }),
- },
+ path.clone(),
+ HunkIndex::new(0, CodeRange::lines(6..12)),
+ ),
body: "Comment #2.".to_owned(),
}),
(ReviewComment {
- location: CodeLocation {
+ location: DiffLocation::hunk_level(
+ base,
commit,
- path: path.clone(),
- old: Some(CodeRange::Lines { range: 2568..2571 }),
- new: Some(CodeRange::Lines { range: 2567..2570 }),
- },
+ path.clone(),
+ HunkIndex::new(0, CodeRange::lines(12..17)),
+ ),
body: "Comment #3.".to_owned(),
}),
(ReviewComment {
- location: CodeLocation {
+ location: DiffLocation::hunk_level(
+ base,
commit,
- path: path.clone(),
- old: None,
- new: Some(CodeRange::Lines { range: 2570..2571 }),
- },
+ path.clone(),
+ HunkIndex::new(0, CodeRange::lines(17..18)),
+ ),
body: "Comment #4.".to_owned(),
}),
(ReviewComment {
- location: CodeLocation {
+ location: DiffLocation::hunk_level(
+ base,
commit,
- path: path.clone(),
- old: Some(CodeRange::Lines { range: 2571..2577 }),
- new: Some(CodeRange::Lines { range: 2571..2578 }),
- },
+ path.clone(),
+ HunkIndex::new(0, CodeRange::lines(18..26)),
+ ),
body: "Comment #5.".to_owned(),
}),
];
- let mut builder = CommentBuilder::new(commit, path.clone());
+ let mut builder = CommentBuilder::new(base, commit, path.clone());
builder.add_hunk(
- HunkHeader {
- old_line_no: 2559,
- old_size: 18,
- new_line_no: 2560,
- new_size: 18,
- text: vec![],
- },
+ &Hunk::new(
+ 0,
+ diff::Hunk {
+ header: diff::Line::from(vec![]),
+ lines: std::iter::repeat(diff::Modification::addition(
+ diff::Line::from(vec![]),
+ 1,
+ ))
+ .take(26)
+ .collect(),
+ old: 2559..2578,
+ new: 2560..2579,
+ },
+ ),
input,
);
let actual = builder.comments();
@@ -1114,16 +1137,17 @@ Woof.
"#;
+ let base = git::raw::Oid::zero().into();
let commit = Oid::from_str("a32c4b93e2573fd83b15ac1ad6bf1317dc8fd760").unwrap();
let path = PathBuf::from_str("main.rs").unwrap();
let expected = &[
(ReviewComment {
- location: CodeLocation {
+ location: DiffLocation::hunk_level(
+ base,
commit,
- path: path.clone(),
- old: Some(CodeRange::Lines { range: 2559..2565 }),
- new: Some(CodeRange::Lines { range: 2560..2563 }),
- },
+ path.clone(),
+ HunkIndex::new(0, CodeRange::lines(0..6)),
+ ),
body: r#"
Blah blah blah blah blah blah blah.
Blah blah blah.
@@ -1137,12 +1161,12 @@ Blaaah blaaah blaaah.
.to_owned(),
}),
(ReviewComment {
- location: CodeLocation {
+ location: DiffLocation::hunk_level(
+ base,
commit,
- path: path.clone(),
- old: Some(CodeRange::Lines { range: 2565..2568 }),
- new: Some(CodeRange::Lines { range: 2563..2567 }),
- },
+ path.clone(),
+ HunkIndex::new(0, CodeRange::lines(6..12)),
+ ),
body: r#"
Woof woof.
Woof.
@@ -1155,15 +1179,22 @@ Woof.
}),
];
- let mut builder = CommentBuilder::new(commit, path.clone());
+ let mut builder = CommentBuilder::new(base, commit, path.clone());
builder.add_hunk(
- HunkHeader {
- old_line_no: 2559,
- old_size: 9,
- new_line_no: 2560,
- new_size: 7,
- text: vec![],
- },
+ &Hunk::new(
+ 0,
+ diff::Hunk {
+ header: diff::Line::from(vec![]),
+ lines: std::iter::repeat(diff::Modification::addition(
+ diff::Line::from(vec![]),
+ 1,
+ ))
+ .take(12)
+ .collect(),
+ old: 2559..2569,
+ new: 2560..2568,
+ },
+ ),
input,
);
let actual = builder.comments();
@@ -1195,27 +1226,30 @@ This is a top-level comment.
> + let connect = available.take(wanted).collect::<Vec<_>>();
"#;
+ let base = git::raw::Oid::zero().into();
let commit = Oid::from_str("a32c4b93e2573fd83b15ac1ad6bf1317dc8fd760").unwrap();
let path = PathBuf::from_str("main.rs").unwrap();
let expected = &[(ReviewComment {
- location: CodeLocation {
- commit,
- path: path.clone(),
- old: Some(CodeRange::Lines { range: 2559..2569 }),
- new: Some(CodeRange::Lines { range: 2560..2568 }),
- },
+ location: DiffLocation::file_level(git::raw::Oid::zero().into(), commit, path.clone()),
body: "This is a top-level comment.".to_owned(),
})];
- let mut builder = CommentBuilder::new(commit, path.clone());
+ let mut builder = CommentBuilder::new(base, commit, path.clone());
builder.add_hunk(
- HunkHeader {
- old_line_no: 2559,
- old_size: 9,
- new_line_no: 2560,
- new_size: 7,
- text: vec![],
- },
+ &Hunk::new(
+ 0,
+ diff::Hunk {
+ header: diff::Line::from(vec![]),
+ lines: std::iter::repeat(diff::Modification::addition(
+ diff::Line::from(vec![]),
+ 1,
+ ))
+ .take(12)
+ .collect(),
+ old: 2559..2569,
+ new: 2560..2568,
+ },
+ ),
input,
);
let actual = builder.comments();
@@ -1243,27 +1277,30 @@ This is a top-level comment.
Comment on a split hunk.
"#;
+ let base = git::raw::Oid::zero().into();
let commit = Oid::from_str("a32c4b93e2573fd83b15ac1ad6bf1317dc8fd760").unwrap();
let path = PathBuf::from_str("main.rs").unwrap();
let expected = &[(ReviewComment {
- location: CodeLocation {
+ location: DiffLocation::hunk_level(
+ base,
commit,
- path: path.clone(),
- old: Some(CodeRange::Lines { range: 2564..2565 }),
- new: Some(CodeRange::Lines { range: 2563..2564 }),
- },
+ path.clone(),
+ HunkIndex::new(0, CodeRange::lines(5..7)),
+ ),
body: "Comment on a split hunk.".to_owned(),
})];
- let mut builder = CommentBuilder::new(commit, path.clone());
+ let mut builder = CommentBuilder::new(base, commit, path.clone());
builder.add_hunk(
- HunkHeader {
- old_line_no: 2559,
- old_size: 6,
- new_line_no: 2560,
- new_size: 4,
- text: vec![],
- },
+ &Hunk::new(
+ 0,
+ diff::Hunk {
+ header: diff::Line::from(vec![]),
+ lines: vec![],
+ old: 2559..2566,
+ new: 2560..2565,
+ },
+ ),
input,
);
let actual = builder.comments();
diff --git a/crates/radicle/src/cob/common.rs b/crates/radicle/src/cob/common.rs
index 10718f8e6a..5c05157f37 100644
--- a/crates/radicle/src/cob/common.rs
+++ b/crates/radicle/src/cob/common.rs
@@ -1,5 +1,6 @@
use std::fmt;
use std::fmt::Display;
+use std::hash::Hash;
use std::ops::{Deref, Range};
use std::path::PathBuf;
use std::str::FromStr;
@@ -373,60 +374,85 @@ impl From<bool> for Authorization {
}
}
+/// **Note**: this type is deprecated and should no longer be used.
+/// Use [`DiffLocation`] instead.
+///
/// Describes a code location that can be used for comments on
/// patches, issues, and diffs.
+///
+/// It is called a `PartialLocation`, because it describes a potential diff
+/// compared to its `commit`, but does not describe the other `Oid` – thus the
+/// other `Oid` must be inferred from context.
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
-pub struct CodeLocation {
+pub struct PartialLocation {
/// [`Oid`] of the Git commit.
- pub commit: Oid,
+ pub(crate) commit: Oid,
/// Path of file.
- pub path: PathBuf,
+ pub(crate) path: PathBuf,
/// Line range on old file. `None` for added files.
- pub old: Option<CodeRange>,
+ pub(crate) old: Option<CodeRange>,
/// Line range on new file. `None` for deleted files.
- pub new: Option<CodeRange>,
+ pub(crate) new: Option<CodeRange>,
}
-/// Code range.
+/// The specified range that selects a section of code.
+///
+/// When used with [`HunkIndex`], the range represents the lines within the hunk
+/// itself, which are 0-indexed.
+///
+/// Note: `CodeRange` is an `enum` that has the single variant `Lines`, but may
+/// add more cases in the future.
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase", tag = "type")]
pub enum CodeRange {
/// One or more lines.
Lines { range: Range<usize> },
- /// Character range within a line.
- Chars { line: usize, range: Range<usize> },
}
-impl std::cmp::PartialOrd for CodeRange {
+impl PartialOrd for CodeRange {
fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
Some(self.cmp(other))
}
}
-impl std::cmp::Ord for CodeRange {
+impl Ord for CodeRange {
fn cmp(&self, other: &Self) -> std::cmp::Ordering {
match (self, other) {
- (CodeRange::Lines { .. }, CodeRange::Chars { .. }) => std::cmp::Ordering::Less,
- (CodeRange::Chars { .. }, CodeRange::Lines { .. }) => std::cmp::Ordering::Greater,
-
- (CodeRange::Lines { range: a }, CodeRange::Lines { range: b }) => {
- a.clone().cmp(b.clone())
+ (CodeRange::Lines { range: x }, CodeRange::Lines { range: y }) => {
+ x.start.cmp(&y.start).then(x.end.cmp(&y.end))
}
- (
- CodeRange::Chars {
- line: l1,
- range: r1,
- },
- CodeRange::Chars {
- line: l2,
- range: r2,
- },
- ) => l1.cmp(l2).then(r1.clone().cmp(r2.clone())),
}
}
}
+impl CodeRange {
+ /// Get the starting position of the range.
+ ///
+ /// If the range is [`CodeRange::Lines`], this corresponds to the start of
+ /// the line range.
+ pub fn line_start(&self) -> usize {
+ match self {
+ CodeRange::Lines { range } => range.start,
+ }
+ }
+
+ /// Get the ending position of the range.
+ ///
+ /// If the range is [`CodeRange::Lines`], this corresponds to the end of
+ /// the line range.
+ pub fn line_end(&self) -> usize {
+ match self {
+ CodeRange::Lines { range } => range.end,
+ }
+ }
+
+ /// Construct a `CodeRange` for which is one or more lines.
+ pub fn lines(range: Range<usize>) -> Self {
+ Self::Lines { range }
+ }
+}
+
/// Describes a selection within a diff.
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
@@ -443,6 +469,8 @@ pub struct DiffLocation {
}
impl DiffLocation {
+ /// Construct a file-level diff location, where the
+ /// [`DiffLocation::selection`] is `None`.
pub fn file_level(base: Oid, head: Oid, path: PathBuf) -> Self {
Self {
base,
@@ -452,6 +480,8 @@ impl DiffLocation {
}
}
+ /// Construct a hunk-level diff location, where the
+ /// [`DiffLocation::selection`] is set to the given `hunk`.
pub fn hunk_level(base: Oid, head: Oid, path: PathBuf, hunk: HunkIndex) -> Self {
Self {
base,
@@ -461,13 +491,20 @@ impl DiffLocation {
}
}
- pub fn code_range(&self) -> Option<&CodeRange> {
- self.selection().map(|s| s.range())
- }
-
+ /// Get the [`DiffLocation::selection`].
pub fn selection(&self) -> Option<&HunkIndex> {
self.selection.as_ref()
}
+
+ /// Get the index for the hunk of the [`DiffLocation::selection`].
+ pub fn hunk_index(&self) -> Option<usize> {
+ self.selection().map(|s| s.index())
+ }
+
+ /// Get the [`CodeRange`] of the [`DiffLocation::selection`].
+ pub fn code_range(&self) -> Option<&CodeRange> {
+ self.selection().map(|s| s.range())
+ }
}
/// The combined index of the hunk and range within that hunk.
@@ -475,9 +512,9 @@ impl DiffLocation {
#[serde(rename_all = "camelCase")]
pub struct HunkIndex {
/// The index of the hunk in the patch.
- pub hunk: usize,
+ hunk: usize,
/// The line selection within the hunk itself.
- pub range: CodeRange,
+ range: CodeRange,
}
impl HunkIndex {
diff --git a/crates/radicle/src/cob/patch.rs b/crates/radicle/src/cob/patch.rs
index faa5227fad..033659b3c2 100644
--- a/crates/radicle/src/cob/patch.rs
+++ b/crates/radicle/src/cob/patch.rs
@@ -2,7 +2,7 @@ pub mod cache;
pub mod diff;
mod actions;
-pub use actions::ReviewEdit;
+pub use actions::{ReviewComment, ReviewEdit};
mod encoding;
@@ -20,7 +20,7 @@ use storage::{HasRepoId, RepositoryError};
use thiserror::Error;
use crate::cob;
-use crate::cob::common::{Author, Authorization, CodeLocation, Label, Reaction, Timestamp};
+use crate::cob::common::{Author, Authorization, DiffLocation, Label, Reaction, Timestamp};
use crate::cob::store::Transaction;
use crate::cob::store::{Cob, CobAction};
use crate::cob::thread;
@@ -195,21 +195,6 @@ pub enum Action {
},
#[serde(rename = "review.redact")]
ReviewRedact { review: ReviewId },
- #[serde(rename = "review.comment")]
- ReviewComment {
- review: ReviewId,
- body: String,
- #[serde(default, skip_serializing_if = "Option::is_none")]
- location: Option<CodeLocation>,
- /// Comment this is a reply to.
- /// Should be [`None`] if it's the first comment.
- /// Should be [`Some`] otherwise.
- #[serde(default, skip_serializing_if = "Option::is_none")]
- reply_to: Option<CommentId>,
- /// Embeded content.
- #[serde(default, skip_serializing_if = "Vec::is_empty")]
- embeds: Vec<Embed<Uri>>,
- },
#[serde(rename = "review.comment.edit")]
ReviewCommentEdit {
review: ReviewId,
@@ -258,36 +243,8 @@ pub enum Action {
#[serde(default, skip_serializing_if = "Vec::is_empty")]
embeds: Vec<Embed<Uri>>,
},
- /// React to the revision.
- #[serde(rename = "revision.react")]
- RevisionReact {
- revision: RevisionId,
- #[serde(default, skip_serializing_if = "Option::is_none")]
- location: Option<CodeLocation>,
- reaction: Reaction,
- active: bool,
- },
#[serde(rename = "revision.redact")]
RevisionRedact { revision: RevisionId },
- #[serde(rename_all = "camelCase")]
- #[serde(rename = "revision.comment")]
- RevisionComment {
- /// The revision to comment on.
- revision: RevisionId,
- /// For comments on the revision code.
- #[serde(default, skip_serializing_if = "Option::is_none")]
- location: Option<CodeLocation>,
- /// Comment body.
- body: String,
- /// Comment this is a reply to.
- /// Should be [`None`] if it's the top-level comment.
- /// Should be the root [`CommentId`] if it's a top-level comment.
- #[serde(default, skip_serializing_if = "Option::is_none")]
- reply_to: Option<CommentId>,
- /// Embeded content.
- #[serde(default, skip_serializing_if = "Vec::is_empty")]
- embeds: Vec<Embed<Uri>>,
- },
/// Edit a revision comment.
#[serde(rename = "revision.comment.edit")]
RevisionCommentEdit {
@@ -310,12 +267,40 @@ pub enum Action {
reaction: Reaction,
active: bool,
},
- /// Edit a review's summary, verdict, labels, and embeds.
+
// Note that the tags live on `actions::ReviewEdit`, and according to the
// serde.rs docs, it must come after the other variants due to the
// `untagged` declaration.
+ /// Edit a review's summary, verdict, labels, and embeds.
#[serde(untagged)]
ReviewEdit(actions::ReviewEdit),
+ /// Publish a comment to a review.
+ #[serde(untagged)]
+ ReviewComment(actions::ReviewComment),
+ /// Publish a comment to a revision.
+ #[serde(untagged)]
+ RevisionComment(actions::RevisionComment),
+ /// React to the revision.
+ #[serde(untagged)]
+ RevisionReact(actions::RevisionReact),
+}
+
+impl From<actions::ReviewComment> for Action {
+ fn from(value: actions::ReviewComment) -> Self {
+ Action::ReviewComment(value)
+ }
+}
+
+impl From<actions::RevisionComment> for Action {
+ fn from(value: actions::RevisionComment) -> Self {
+ Action::RevisionComment(value)
+ }
+}
+
+impl From<actions::RevisionReact> for Action {
+ fn from(value: actions::RevisionReact) -> Self {
+ Action::RevisionReact(value)
+ }
}
impl CobAction for Action {
@@ -877,23 +862,7 @@ impl Patch {
)),
);
}
- Action::RevisionReact {
- revision,
- reaction,
- active,
- location,
- } => {
- if let Some(revision) = lookup::revision_mut(self, &revision)? {
- let key = (author, reaction);
- let reactions = revision.reactions.entry(location).or_default();
-
- if active {
- reactions.insert(key);
- } else {
- reactions.remove(&key);
- }
- }
- }
+ Action::RevisionReact(react) => react.run(author, self)?,
Action::RevisionRedact { revision } => {
// Not allowed to delete the root revision.
let (root, _) = self.root();
@@ -998,26 +967,7 @@ impl Patch {
thread::unresolve(&mut review.comments, entry, comment)?;
}
}
- Action::ReviewComment {
- review,
- body,
- location,
- reply_to,
- embeds,
- } => {
- if let Some(review) = lookup::review_mut(self, &review)? {
- thread::comment(
- &mut review.comments,
- entry,
- author,
- timestamp,
- body,
- reply_to,
- location,
- embeds,
- )?;
- }
- }
+ Action::ReviewComment(action) => action.run(entry, author, timestamp, self)?,
Action::ReviewRedact { review } => {
// Redactions must have observed a review to be valid.
let Some(locator) = self.reviews.get_mut(&review) else {
@@ -1122,26 +1072,7 @@ impl Patch {
}
}
- Action::RevisionComment {
- revision,
- body,
- reply_to,
- embeds,
- location,
- } => {
- if let Some(revision) = lookup::revision_mut(self, &revision)? {
- thread::comment(
- &mut revision.discussion,
- entry,
- author,
- timestamp,
- body,
- reply_to,
- location,
- embeds,
- )?;
- }
- }
+ Action::RevisionComment(comment) => comment.run(entry, author, timestamp, self)?,
Action::RevisionCommentEdit {
revision,
comment,
@@ -1391,7 +1322,7 @@ mod lookup {
/// A patch revision.
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
+#[serde(rename_all = "camelCase", from = "encoding::revision::Revision")]
pub struct Revision {
/// Revision identifier.
pub(super) id: RevisionId,
@@ -1404,7 +1335,7 @@ pub struct Revision {
/// Reference to the Git object containing the code (revision head).
pub(super) oid: git::Oid,
/// Discussion around this revision.
- pub(super) discussion: Thread<Comment<CodeLocation>>,
+ pub(super) discussion: Thread<Comment<DiffLocation>>,
/// Reviews of this revision's changes (all review edits are kept).
pub(super) reviews: BTreeMap<ActorId, Review>,
/// When this revision was created.
@@ -1412,11 +1343,8 @@ pub struct Revision {
/// Review comments resolved by this revision.
pub(super) resolves: BTreeSet<(EntryId, CommentId)>,
/// Reactions on code locations and revision itself
- #[serde(
- serialize_with = "ser::serialize_reactions",
- deserialize_with = "ser::deserialize_reactions"
- )]
- pub(super) reactions: BTreeMap<Option<CodeLocation>, Reactions>,
+ #[serde(serialize_with = "encoding::ser::serialize_reactions")]
+ pub(super) reactions: BTreeMap<Option<DiffLocation>, Reactions>,
}
impl Revision {
@@ -1461,7 +1389,7 @@ impl Revision {
&self.description.last().embeds
}
- pub fn reactions(&self) -> &BTreeMap<Option<CodeLocation>, BTreeSet<(PublicKey, Reaction)>> {
+ pub fn reactions(&self) -> &BTreeMap<Option<DiffLocation>, BTreeSet<(PublicKey, Reaction)>> {
&self.reactions
}
@@ -1491,7 +1419,7 @@ impl Revision {
}
/// Discussion around this revision.
- pub fn discussion(&self) -> &Thread<Comment<CodeLocation>> {
+ pub fn discussion(&self) -> &Thread<Comment<DiffLocation>> {
&self.discussion
}
@@ -1501,7 +1429,7 @@ impl Revision {
}
/// Iterate over all top-level replies.
- pub fn replies(&self) -> impl Iterator<Item = (&CommentId, &thread::Comment<CodeLocation>)> {
+ pub fn replies(&self) -> impl Iterator<Item = (&CommentId, &thread::Comment<DiffLocation>)> {
self.discussion.comments()
}
@@ -1628,9 +1556,8 @@ impl fmt::Display for Verdict {
}
/// A patch review on a revision.
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
#[serde(rename_all = "camelCase")]
-#[serde(from = "encoding::review::Review")]
pub struct Review {
/// Review identifier.
pub(super) id: ReviewId,
@@ -1648,7 +1575,7 @@ pub struct Review {
/// edit of the summary.
pub(super) summary: NonEmpty<Edit>,
/// Review comments.
- pub(super) comments: Thread<Comment<CodeLocation>>,
+ pub(super) comments: Thread<Comment<DiffLocation>>,
/// Labels qualifying the review. For example if this review only looks at the
/// concept or intention of the patch, it could have a "concept" label.
pub(super) labels: Vec<Label>,
@@ -1698,7 +1625,7 @@ impl Review {
}
/// Review inline code comments.
- pub fn comments(&self) -> impl DoubleEndedIterator<Item = (&EntryId, &Comment<CodeLocation>)> {
+ pub fn comments(&self) -> impl DoubleEndedIterator<Item = (&EntryId, &Comment<DiffLocation>)> {
self.comments.comments()
}
@@ -1766,13 +1693,13 @@ impl<R: ReadRepository> store::Transaction<Patch, R> {
revision: RevisionId,
body: S,
) -> Result<(), store::Error> {
- self.push(Action::RevisionComment {
+ self.push(Action::RevisionComment(actions::RevisionComment::new(
revision,
- body: body.to_string(),
- reply_to: None,
- location: None,
- embeds: vec![],
- })
+ None,
+ body.to_string(),
+ None,
+ vec![],
+ )))
}
/// React on a patch revision.
@@ -1780,15 +1707,12 @@ impl<R: ReadRepository> store::Transaction<Patch, R> {
&mut self,
revision: RevisionId,
reaction: Reaction,
- location: Option<CodeLocation>,
+ location: Option<DiffLocation>,
active: bool,
) -> Result<(), store::Error> {
- self.push(Action::RevisionReact {
- revision,
- reaction,
- location,
- active,
- })
+ self.push(Action::RevisionReact(actions::RevisionReact::new(
+ revision, location, reaction, active,
+ )))
}
/// Comment on a patch revision.
@@ -1797,17 +1721,17 @@ impl<R: ReadRepository> store::Transaction<Patch, R> {
revision: RevisionId,
body: S,
reply_to: Option<CommentId>,
- location: Option<CodeLocation>,
+ location: Option<DiffLocation>,
embeds: Vec<Embed<Uri>>,
) -> Result<(), store::Error> {
self.embed(embeds.clone())?;
- self.push(Action::RevisionComment {
+ self.push(Action::RevisionComment(actions::RevisionComment::new(
revision,
- body: body.to_string(),
- reply_to,
location,
+ body.to_string(),
+ reply_to,
embeds,
- })
+ )))
}
/// Edit a comment on a patch revision.
@@ -1857,18 +1781,18 @@ impl<R: ReadRepository> store::Transaction<Patch, R> {
&mut self,
review: ReviewId,
body: S,
- location: Option<CodeLocation>,
+ location: Option<DiffLocation>,
reply_to: Option<CommentId>,
embeds: Vec<Embed<Uri>>,
) -> Result<(), store::Error> {
self.embed(embeds.clone())?;
- self.push(Action::ReviewComment {
+ self.push(Action::ReviewComment(actions::ReviewComment::new(
review,
- body: body.to_string(),
+ body.to_string(),
location,
reply_to,
embeds,
- })
+ )))
}
/// Resolve a review comment.
@@ -2143,7 +2067,7 @@ where
revision: RevisionId,
body: S,
reply_to: Option<CommentId>,
- location: Option<CodeLocation>,
+ location: Option<DiffLocation>,
embeds: impl IntoIterator<Item = Embed<Uri>>,
signer: &Device<G>,
) -> Result<EntryId, Error>
@@ -2167,7 +2091,7 @@ where
&mut self,
revision: RevisionId,
reaction: Reaction,
- location: Option<CodeLocation>,
+ location: Option<DiffLocation>,
active: bool,
signer: &Device<G>,
) -> Result<EntryId, Error>
@@ -2234,7 +2158,7 @@ where
&mut self,
review: ReviewId,
body: S,
- location: Option<CodeLocation>,
+ location: Option<DiffLocation>,
reply_to: Option<CommentId>,
embeds: impl IntoIterator<Item = Embed<Uri>>,
signer: &Device<G>,
@@ -2847,129 +2771,10 @@ impl From<RangeDiff> for std::process::Command {
}
}
-/// Helpers for de/serialization of patch data types.
-mod ser {
- use std::collections::{BTreeMap, BTreeSet};
-
- use serde::ser::SerializeSeq;
-
- use crate::cob::{thread::Reactions, ActorId, CodeLocation};
-
- /// Serialize a `Revision`'s reaction as an object containing the
- /// `location`, `emoji`, and all `authors` that have performed the
- /// same reaction.
- #[derive(Debug, serde::Serialize, serde::Deserialize)]
- #[serde(rename_all = "camelCase")]
- struct Reaction {
- location: Option<CodeLocation>,
- emoji: super::Reaction,
- authors: Vec<ActorId>,
- }
-
- impl Reaction {
- fn as_revision_reactions(
- reactions: Vec<Reaction>,
- ) -> BTreeMap<Option<CodeLocation>, Reactions> {
- reactions.into_iter().fold(
- BTreeMap::<Option<CodeLocation>, Reactions>::new(),
- |mut reactions,
- Reaction {
- location,
- emoji,
- authors,
- }| {
- let mut inner = authors
- .into_iter()
- .map(|author| (author, emoji))
- .collect::<BTreeSet<_>>();
- let entry = reactions.entry(location).or_default();
- entry.append(&mut inner);
- reactions
- },
- )
- }
- }
-
- /// Helper to serialize a `Revision`'s reactions, since
- /// `CodeLocation` cannot be a key for a JSON object.
- ///
- /// The set `reactions` are first turned into a set of
- /// [`Reaction`]s and then serialized via a `Vec`.
- pub fn serialize_reactions<S>(
- reactions: &BTreeMap<Option<CodeLocation>, Reactions>,
- serializer: S,
- ) -> Result<S::Ok, S::Error>
- where
- S: serde::Serializer,
- {
- let reactions = reactions
- .iter()
- .flat_map(|(location, reaction)| {
- let reactions = reaction.iter().fold(
- BTreeMap::new(),
- |mut acc: BTreeMap<&super::Reaction, Vec<_>>, (author, emoji)| {
- acc.entry(emoji).or_default().push(*author);
- acc
- },
- );
- reactions
- .into_iter()
- .map(|(emoji, authors)| Reaction {
- location: location.clone(),
- emoji: *emoji,
- authors,
- })
- .collect::<Vec<_>>()
- })
- .collect::<Vec<_>>();
- let mut s = serializer.serialize_seq(Some(reactions.len()))?;
- for r in &reactions {
- s.serialize_element(r)?;
- }
- s.end()
- }
-
- /// Helper to deserialize a `Revision`'s reactions, the inverse of
- /// `serialize_reactions`.
- ///
- /// The `Vec` of [`Reaction`]s are deserialized and converted to a
- /// `BTreeMap<Option<CodeLocation>, Reactions>`.
- pub fn deserialize_reactions<'de, D>(
- deserializer: D,
- ) -> Result<BTreeMap<Option<CodeLocation>, Reactions>, D::Error>
- where
- D: serde::Deserializer<'de>,
- {
- struct ReactionsVisitor;
-
- impl<'de> serde::de::Visitor<'de> for ReactionsVisitor {
- type Value = Vec<Reaction>;
-
- fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
- formatter.write_str("a reaction of the form {'location', 'emoji', 'authors'}")
- }
-
- fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
- where
- A: serde::de::SeqAccess<'de>,
- {
- let mut reactions = Vec::new();
- while let Some(reaction) = seq.next_element()? {
- reactions.push(reaction);
- }
- Ok(reactions)
- }
- }
-
- let reactions = deserializer.deserialize_seq(ReactionsVisitor)?;
- Ok(Reaction::as_revision_reactions(reactions))
- }
-}
-
#[cfg(test)]
#[allow(clippy::unwrap_used)]
mod test {
- use std::path::PathBuf;
+ use std::path::Path;
use std::str::FromStr;
use std::vec;
@@ -3006,10 +2811,10 @@ mod test {
#[serde(rename_all = "camelCase")]
struct TestReactions {
#[serde(
- serialize_with = "super::ser::serialize_reactions",
- deserialize_with = "super::ser::deserialize_reactions"
+ serialize_with = "encoding::ser::serialize_reactions",
+ deserialize_with = "encoding::ser::deserialize_reactions"
)]
- inner: BTreeMap<Option<CodeLocation>, Reactions>,
+ inner: BTreeMap<Option<encoding::Location>, Reactions>,
}
let reactions = TestReactions {
@@ -3370,12 +3175,12 @@ mod test {
target: MergeTarget::Delegates,
},
]);
- let a2 = alice.op::<Patch>([Action::RevisionReact {
- revision: RevisionId(a1.id()),
- location: None,
+ let a2 = alice.op::<Patch>([Action::from(actions::RevisionReact::new(
+ RevisionId(a1.id()),
+ None,
reaction,
- active: true,
- }]);
+ true,
+ ))]);
let patch = Patch::from_ops([a1, a2], &repo).unwrap();
let (_, r1) = patch.revisions().next().unwrap();
@@ -3534,11 +3339,11 @@ mod test {
.unwrap();
let (rid, _) = patch.latest();
- let location = CodeLocation {
- commit: branch.oid,
- path: PathBuf::from_str("README").unwrap(),
- old: None,
- new: Some(CodeRange::Lines { range: 5..8 }),
+ let location = DiffLocation {
+ base: branch.base,
+ head: branch.oid,
+ path: Path::new("README.md").to_path_buf(),
+ selection: None,
};
let review = patch
.review(rid, Some(Verdict::Accept), None, vec![], &alice.signer)
diff --git a/crates/radicle/src/cob/patch/actions.rs b/crates/radicle/src/cob/patch/actions.rs
index 67f6cfc123..17ccda594f 100644
--- a/crates/radicle/src/cob/patch/actions.rs
+++ b/crates/radicle/src/cob/patch/actions.rs
@@ -3,11 +3,16 @@
//!
//! [`Action`]: super::Action
+use radicle_cob::EntryId;
use serde::{Deserialize, Serialize};
-use crate::cob::{thread::Edit, ActorId, Embed, Label, Timestamp, Uri};
+use crate::cob::{
+ thread,
+ thread::{CommentId, Edit},
+ ActorId, DiffLocation, Embed, Label, PartialLocation, Reaction, Timestamp, Uri,
+};
-use super::{lookup, Error, Patch, ReviewId, Verdict};
+use super::{encoding::Location, lookup, Error, Patch, ReviewId, RevisionId, Verdict};
/// A review edit that keeps track of the different versions of actions.
///
@@ -178,6 +183,468 @@ pub struct ReviewEditV1 {
labels: Vec<Label>,
}
+/// A review comment that keeps track of the different versions of actions.
+///
+/// [`ReviewComment::new`] will create the latest version of the action.
+///
+/// [`ReviewComment::run`] will apply the action to the given [`Patch`].
+#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum ReviewComment {
+ #[serde(rename = "review.comment")]
+ V1(ReviewCommentV1),
+ #[serde(rename = "review.comment.v2")]
+ V2(ReviewCommentV2),
+}
+
+impl ReviewComment {
+ /// Create the latest version of [`ReviewComment`].
+ pub fn new(
+ review: ReviewId,
+ body: String,
+ location: Option<DiffLocation>,
+ reply_to: Option<CommentId>,
+ embeds: Vec<Embed<Uri>>,
+ ) -> Self {
+ Self::V2(ReviewCommentV2 {
+ review,
+ body,
+ location,
+ reply_to,
+ embeds,
+ })
+ }
+
+ /// Get the [`ReviewId`] that this comment is applying to.
+ pub fn review_id(&self) -> &ReviewId {
+ match self {
+ ReviewComment::V1(v1) => &v1.review,
+ ReviewComment::V2(v2) => &v2.review,
+ }
+ }
+
+ /// Get the body of the comment.
+ pub fn body(&self) -> &String {
+ match self {
+ ReviewComment::V1(v1) => &v1.body,
+ ReviewComment::V2(v2) => &v2.body,
+ }
+ }
+
+ /// Get the [`CommentId`] this comment is replying to, if any.
+ pub fn reply_to(&self) -> Option<&CommentId> {
+ match self {
+ ReviewComment::V1(v1) => v1.reply_to.as_ref(),
+ ReviewComment::V2(v2) => v2.reply_to.as_ref(),
+ }
+ }
+
+ /// Get the [`Embed`]s for this comment.
+ pub fn embeds(&self) -> &[Embed<Uri>] {
+ match self {
+ ReviewComment::V1(v1) => &v1.embeds,
+ ReviewComment::V2(v2) => &v2.embeds,
+ }
+ }
+
+ /// Get the [`DiffLocation`] this comment is referring to, if any.
+ pub fn location(&self) -> Option<&DiffLocation> {
+ match self {
+ ReviewComment::V1(_) => None,
+ ReviewComment::V2(v2) => v2.location.as_ref(),
+ }
+ }
+
+ /// Apply the action to the given [`Patch`].
+ pub fn run(
+ self,
+ entry: EntryId,
+ author: ActorId,
+ timestamp: Timestamp,
+ patch: &mut Patch,
+ ) -> Result<(), Error> {
+ match self {
+ ReviewComment::V1(ReviewCommentV1 {
+ review,
+ body,
+ location,
+ reply_to,
+ embeds,
+ }) => {
+ let context = patch
+ .revisions()
+ .find(|(_, rev)| rev.reviews().any(|(_, r)| r.id == review))
+ .map(|(_, rev)| rev.base)
+ // TODO
+ .expect("BUG: no revision for review");
+ if let Some(review) = lookup::review_mut(patch, &review)? {
+ let location =
+ location.map(|loc| Location::V1(loc).into_diff_location(context));
+ thread::comment(
+ &mut review.comments,
+ entry,
+ author,
+ timestamp,
+ body,
+ reply_to,
+ location,
+ embeds,
+ )?;
+ }
+ }
+ ReviewComment::V2(ReviewCommentV2 {
+ review,
+ body,
+ location,
+ reply_to,
+ embeds,
+ }) => {
+ if let Some(review) = lookup::review_mut(patch, &review)? {
+ thread::comment(
+ &mut review.comments,
+ entry,
+ author,
+ timestamp,
+ body,
+ reply_to,
+ location,
+ embeds,
+ )?;
+ }
+ }
+ }
+ Ok(())
+ }
+}
+
+#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ReviewCommentV2 {
+ review: ReviewId,
+ body: String,
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ location: Option<DiffLocation>,
+ /// Comment this is a reply to.
+ /// Should be [`None`] if it's the first comment.
+ /// Should be [`Some`] otherwise.
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ reply_to: Option<CommentId>,
+ /// Embeded content.
+ #[serde(default, skip_serializing_if = "Vec::is_empty")]
+ embeds: Vec<Embed<Uri>>,
+}
+
+#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ReviewCommentV1 {
+ review: ReviewId,
+ body: String,
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ location: Option<PartialLocation>,
+ /// Comment this is a reply to.
+ /// Should be [`None`] if it's the first comment.
+ /// Should be [`Some`] otherwise.
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ reply_to: Option<CommentId>,
+ /// Embeded content.
+ #[serde(default, skip_serializing_if = "Vec::is_empty")]
+ embeds: Vec<Embed<Uri>>,
+}
+
+/// A revision comment that keeps track of the different versions of actions.
+///
+/// [`RevisionComment::new`] will create the latest version of the action.
+///
+/// [`RevisionComment::run`] will apply the action to the given [`Patch`].
+#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum RevisionComment {
+ #[serde(rename = "revision.comment")]
+ V1(RevisionCommentV1),
+ #[serde(rename = "revision.comment.v2")]
+ V2(RevisionCommentV2),
+}
+
+impl RevisionComment {
+ /// Create the latest version of [`RevisionComment`].
+ pub fn new(
+ revision: RevisionId,
+ location: Option<DiffLocation>,
+ body: String,
+ reply_to: Option<CommentId>,
+ embeds: Vec<Embed<Uri>>,
+ ) -> Self {
+ Self::V2(RevisionCommentV2 {
+ revision,
+ location,
+ body,
+ reply_to,
+ embeds,
+ })
+ }
+
+ /// Get the [`RevisionId`] that this comment is applying to.
+ pub fn revision(&self) -> &RevisionId {
+ match self {
+ Self::V1(v1) => &v1.revision,
+ Self::V2(v2) => &v2.revision,
+ }
+ }
+
+ /// Get the body of the comment.
+ pub fn body(&self) -> &String {
+ match self {
+ Self::V1(v1) => &v1.body,
+ Self::V2(v2) => &v2.body,
+ }
+ }
+
+ /// Get the [`CommentId`] this comment is replying to, if any.
+ pub fn reply_to(&self) -> Option<&CommentId> {
+ match self {
+ Self::V1(v1) => v1.reply_to.as_ref(),
+ Self::V2(v2) => v2.reply_to.as_ref(),
+ }
+ }
+
+ /// Get the [`Embed`]s for this comment.
+ pub fn embeds(&self) -> &[Embed<Uri>] {
+ match self {
+ Self::V1(v1) => &v1.embeds,
+ Self::V2(v2) => &v2.embeds,
+ }
+ }
+
+ /// Get the [`DiffLocation`] this comment is referring to, if any.
+ pub fn location(&self) -> Option<&DiffLocation> {
+ match self {
+ Self::V1(_) => None,
+ Self::V2(v2) => v2.location.as_ref(),
+ }
+ }
+
+ /// Apply the action to the given [`Patch`].
+ pub fn run(
+ self,
+ entry: EntryId,
+ author: ActorId,
+ timestamp: Timestamp,
+ patch: &mut Patch,
+ ) -> Result<(), Error> {
+ match self {
+ Self::V1(RevisionCommentV1 {
+ revision,
+ location,
+ body,
+ reply_to,
+ embeds,
+ }) => {
+ if let Some(revision) = lookup::revision_mut(patch, &revision)? {
+ let location =
+ location.map(|loc| Location::V1(loc).into_diff_location(revision.base));
+ thread::comment(
+ &mut revision.discussion,
+ entry,
+ author,
+ timestamp,
+ body,
+ reply_to,
+ location,
+ embeds,
+ )?;
+ }
+ }
+ Self::V2(RevisionCommentV2 {
+ revision,
+ body,
+ location,
+ reply_to,
+ embeds,
+ }) => {
+ if let Some(revision) = lookup::revision_mut(patch, &revision)? {
+ thread::comment(
+ &mut revision.discussion,
+ entry,
+ author,
+ timestamp,
+ body,
+ reply_to,
+ location,
+ embeds,
+ )?;
+ }
+ }
+ }
+ Ok(())
+ }
+}
+
+#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct RevisionCommentV2 {
+ /// The revision to comment on.
+ revision: RevisionId,
+ /// For comments on the revision code.
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ location: Option<DiffLocation>,
+ /// Comment body.
+ body: String,
+ /// Comment this is a reply to.
+ /// Should be [`None`] if it's the top-level comment.
+ /// Should be the root [`CommentId`] if it's a top-level comment.
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ reply_to: Option<CommentId>,
+ /// Embeded content.
+ #[serde(default, skip_serializing_if = "Vec::is_empty")]
+ embeds: Vec<Embed<Uri>>,
+}
+
+#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct RevisionCommentV1 {
+ /// The revision to comment on.
+ revision: RevisionId,
+ /// For comments on the revision code.
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ location: Option<PartialLocation>,
+ /// Comment body.
+ body: String,
+ /// Comment this is a reply to.
+ /// Should be [`None`] if it's the top-level comment.
+ /// Should be the root [`CommentId`] if it's a top-level comment.
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ reply_to: Option<CommentId>,
+ /// Embeded content.
+ #[serde(default, skip_serializing_if = "Vec::is_empty")]
+ embeds: Vec<Embed<Uri>>,
+}
+
+/// A revision reaction that keeps track of the different versions of actions.
+///
+/// [`RevisionReact::new`] will create the latest version of the action.
+///
+/// [`RevisionReact::run`] will apply the action to the given [`Patch`].
+#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
+#[serde(tag = "type", rename_all = "camelCase")]
+pub enum RevisionReact {
+ #[serde(rename = "revision.react")]
+ V1(RevisionReactV1),
+ #[serde(rename = "revision.react.v2")]
+ V2(RevisionReactV2),
+}
+
+impl RevisionReact {
+ /// Create the latest version of [`RevisionReact`].
+ pub fn new(
+ revision: RevisionId,
+ location: Option<DiffLocation>,
+ reaction: Reaction,
+ active: bool,
+ ) -> Self {
+ Self::V2(RevisionReactV2 {
+ revision,
+ location,
+ reaction,
+ active,
+ })
+ }
+
+ /// Get the [`RevisionId`] that this reaction is applying to.
+ pub fn revision(&self) -> &RevisionId {
+ match self {
+ Self::V1(v1) => &v1.revision,
+ Self::V2(v2) => &v2.revision,
+ }
+ }
+
+ /// The [`Reaction`] to the revision.
+ pub fn reaction(&self) -> &Reaction {
+ match self {
+ Self::V1(v1) => &v1.reaction,
+ Self::V2(v2) => &v2.reaction,
+ }
+ }
+
+ /// Whether the [`Reaction`] is active.
+ pub fn active(&self) -> bool {
+ match self {
+ Self::V1(v1) => v1.active,
+ Self::V2(v2) => v2.active,
+ }
+ }
+
+ /// Get the [`DiffLocation`] this reaction is referring to, if any.
+ pub fn location(&self) -> Option<&DiffLocation> {
+ match self {
+ Self::V1(_) => None,
+ Self::V2(v2) => v2.location.as_ref(),
+ }
+ }
+
+ /// Apply the action to the given [`Patch`].
+ pub fn run(self, author: ActorId, patch: &mut Patch) -> Result<(), Error> {
+ match self {
+ Self::V1(RevisionReactV1 {
+ revision,
+ location,
+ reaction,
+ active,
+ }) => {
+ if let Some(revision) = lookup::revision_mut(patch, &revision)? {
+ let key = (author, reaction);
+ let location =
+ location.map(|loc| Location::V1(loc).into_diff_location(revision.base));
+ let reactions = revision.reactions.entry(location).or_default();
+
+ if active {
+ reactions.insert(key);
+ } else {
+ reactions.remove(&key);
+ }
+ }
+ }
+ Self::V2(RevisionReactV2 {
+ revision,
+ location,
+ reaction,
+ active,
+ }) => {
+ if let Some(revision) = lookup::revision_mut(patch, &revision)? {
+ let key = (author, reaction);
+ let reactions = revision.reactions.entry(location).or_default();
+
+ if active {
+ reactions.insert(key);
+ } else {
+ reactions.remove(&key);
+ }
+ }
+ }
+ }
+ Ok(())
+ }
+}
+
+#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct RevisionReactV2 {
+ revision: RevisionId,
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ location: Option<DiffLocation>,
+ reaction: Reaction,
+ active: bool,
+}
+
+#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct RevisionReactV1 {
+ revision: RevisionId,
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ location: Option<PartialLocation>,
+ reaction: Reaction,
+ active: bool,
+}
+
#[allow(clippy::unwrap_used)]
#[cfg(test)]
mod test {
@@ -185,7 +652,7 @@ mod test {
use crate::patch;
- use super::ReviewEdit;
+ use super::*;
#[test]
fn test_review_edit() {
@@ -215,4 +682,185 @@ mod test {
patch::Action::ReviewEdit { .. }
));
}
+
+ #[test]
+ fn test_review_comment() {
+ let v1 = json!({
+ "type": "review.comment",
+ "review": "89d45fb371eb2622ba88188d474347cc526d80bb",
+ "body": "This looks good to me",
+ "location": {
+ "commit": "b455c819807cd7a7543d03215570c72b7cb452d7",
+ "path": "src/main.rs",
+ "old": {
+ "type": "lines",
+ "range": {
+ "start": 10,
+ "end": 12
+ }
+ },
+ "new": {
+ "type": "lines",
+ "range": {
+ "start": 12,
+ "end": 14
+ }
+ }
+ },
+ "replyTo": "92d77f9ec373261d91a65e68c95baaaa9fc9b95e",
+ "embeds": []
+ });
+ let v2 = json!({
+ "type": "review.comment.v2",
+ "review": "89d45fb371eb2622ba88188d474347cc526d80bb",
+ "body": "This looks good to me",
+ "location": {
+ "base": "b455c819807cd7a7543d03215570c72b7cb452d7",
+ "head": "e67a8f4d32c830c24ed68ea21707923480830511",
+ "path": "src/main.rs",
+ "selection": {
+ "hunk": 0,
+ "range": {
+ "type": "lines",
+ "range": {
+ "start": 2,
+ "end": 4
+ }
+ }
+ }
+ },
+ "replyTo": "92d77f9ec373261d91a65e68c95baaaa9fc9b95e",
+ "embeds": []
+ });
+ serde_json::from_value::<ReviewComment>(v1.clone()).unwrap();
+ serde_json::from_value::<ReviewComment>(v2.clone()).unwrap();
+ assert!(matches!(
+ serde_json::from_value::<patch::Action>(v1).unwrap(),
+ patch::Action::ReviewComment { .. }
+ ));
+ assert!(matches!(
+ serde_json::from_value::<patch::Action>(v2).unwrap(),
+ patch::Action::ReviewComment { .. }
+ ));
+ }
+
+ #[test]
+ fn test_revision_comment() {
+ let v1 = json!({
+ "type": "revision.comment",
+ "revision": "b455c819807cd7a7543d03215570c72b7cb452d7",
+ "body": "Nice changes here",
+ "location": {
+ "commit": "e67a8f4d32c830c24ed68ea21707923480830511",
+ "path": "src/lib.rs",
+ "old": {
+ "type": "lines",
+ "range": {
+ "start": 25,
+ "end": 27
+ }
+ },
+ "new": {
+ "type": "lines",
+ "range": {
+ "start": 30,
+ "end": 32
+ }
+ }
+ },
+ "replyTo": "05368e84fabb0fa5d2995741de87374812ae501c",
+ "embeds": []
+ });
+ let v2 = json!({
+ "type": "revision.comment.v2",
+ "revision": "b455c819807cd7a7543d03215570c72b7cb452d7",
+ "body": "Nice changes here",
+ "location": {
+ "base": "e67a8f4d32c830c24ed68ea21707923480830511",
+ "head": "2a47bc0c7dd6238ce3416e19d2ba57f3a7626f64",
+ "path": "src/lib.rs",
+ "selection": {
+ "hunk": 1,
+ "range": {
+ "type": "lines",
+ "range": {
+ "start": 0,
+ "end": 3
+ }
+ }
+ }
+ },
+ "replyTo": "05368e84fabb0fa5d2995741de87374812ae501c",
+ "embeds": []
+ });
+ serde_json::from_value::<RevisionComment>(v1.clone()).unwrap();
+ serde_json::from_value::<RevisionComment>(v2.clone()).unwrap();
+ assert!(matches!(
+ serde_json::from_value::<patch::Action>(v1).unwrap(),
+ patch::Action::RevisionComment { .. }
+ ));
+ assert!(matches!(
+ serde_json::from_value::<patch::Action>(v2).unwrap(),
+ patch::Action::RevisionComment { .. }
+ ));
+ }
+
+ #[test]
+ fn test_revision_react() {
+ let v1 = json!({
+ "type": "revision.react",
+ "revision": "e67a8f4d32c830c24ed68ea21707923480830511",
+ "reaction": "👍",
+ "active": true,
+ "location": {
+ "commit": "2a47bc0c7dd6238ce3416e19d2ba57f3a7626f64",
+ "path": "src/utils.rs",
+ "old": {
+ "type": "lines",
+ "range": {
+ "start": 15,
+ "end": 17
+ }
+ },
+ "new": {
+ "type": "lines",
+ "range": {
+ "start": 18,
+ "end": 20
+ }
+ }
+ }
+ });
+ let v2 = json!({
+ "type": "revision.react.v2",
+ "revision": "e67a8f4d32c830c24ed68ea21707923480830511",
+ "reaction": "👍",
+ "active": true,
+ "location": {
+ "base": "2a47bc0c7dd6238ce3416e19d2ba57f3a7626f64",
+ "head": "a998ce691d6962ea75d861b25532f4c042c36f1a",
+ "path": "src/utils.rs",
+ "selection": {
+ "hunk": 2,
+ "range": {
+ "type": "lines",
+ "range": {
+ "start": 5,
+ "end": 8
+ }
+ }
+ }
+ }
+ });
+ serde_json::from_value::<RevisionReact>(v1.clone()).unwrap();
+ serde_json::from_value::<RevisionReact>(v2.clone()).unwrap();
+ assert!(matches!(
+ serde_json::from_value::<patch::Action>(v1).unwrap(),
+ patch::Action::RevisionReact { .. }
+ ));
+ assert!(matches!(
+ serde_json::from_value::<patch::Action>(v2).unwrap(),
+ patch::Action::RevisionReact { .. }
+ ));
+ }
}
diff --git a/crates/radicle/src/cob/patch/encoding.rs b/crates/radicle/src/cob/patch/encoding.rs
index 01897f3111..b93b9d32a1 100644
--- a/crates/radicle/src/cob/patch/encoding.rs
+++ b/crates/radicle/src/cob/patch/encoding.rs
@@ -4,3 +4,163 @@
//! [`Patch`]: super::Patch
pub mod review;
+pub mod revision;
+
+use crate::cob::{DiffLocation, PartialLocation};
+use crate::git;
+
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize)]
+#[serde(untagged)]
+pub(in crate::cob::patch) enum Location {
+ V2(DiffLocation),
+ V1(PartialLocation),
+}
+
+impl Location {
+ pub fn into_diff_location(self, context: git::Oid) -> DiffLocation {
+ match self {
+ Location::V2(loc) => loc,
+ Location::V1(PartialLocation { commit, path, .. }) => DiffLocation {
+ base: context,
+ head: commit,
+ path,
+ // N.b. We would need to figure out where the lines translate it
+ // into the hunk – which would require using a `Repository` to
+ // look up.
+ // Instead, we just set the selection to `None` and preserve the
+ // rest of the information.
+ selection: None,
+ },
+ }
+ }
+}
+
+/// Helpers for de/serialization of patch data types.
+pub(super) mod ser {
+ use std::collections::BTreeMap;
+
+ use serde::{ser::SerializeSeq as _, Deserialize, Serialize};
+
+ use crate::cob::{patch, thread::Reactions, ActorId};
+
+ #[cfg(test)]
+ use std::{collections::BTreeSet, marker::PhantomData};
+
+ /// Serialize a `Revision`'s reaction as an object containing the
+ /// `location`, `emoji`, and all `authors` that have performed the
+ /// same reaction.
+ #[derive(Debug, Serialize, Deserialize)]
+ #[serde(rename_all = "camelCase")]
+ struct Reaction<T> {
+ location: Option<T>,
+ emoji: patch::Reaction,
+ authors: Vec<ActorId>,
+ }
+
+ impl<T> Reaction<T> {
+ #[cfg(test)]
+ fn as_revision_reactions(reactions: Vec<Self>) -> BTreeMap<Option<T>, Reactions>
+ where
+ T: Ord,
+ {
+ reactions.into_iter().fold(
+ BTreeMap::<Option<T>, Reactions>::new(),
+ |mut reactions,
+ Reaction {
+ location,
+ emoji,
+ authors,
+ }| {
+ let mut inner = authors
+ .into_iter()
+ .map(|author| (author, emoji))
+ .collect::<BTreeSet<_>>();
+ let entry = reactions.entry(location).or_default();
+ entry.append(&mut inner);
+ reactions
+ },
+ )
+ }
+ }
+
+ /// Helper to serialize a `Revision`'s reactions, since
+ /// `CodeLocation` cannot be a key for a JSON object.
+ ///
+ /// The set `reactions` are first turned into a set of
+ /// [`Reaction`]s and then serialized via a `Vec`.
+ pub fn serialize_reactions<T, S>(
+ reactions: &BTreeMap<Option<T>, Reactions>,
+ serializer: S,
+ ) -> Result<S::Ok, S::Error>
+ where
+ S: serde::Serializer,
+ T: Clone + Serialize,
+ {
+ let reactions = reactions
+ .iter()
+ .flat_map(|(location, reaction)| {
+ let reactions = reaction.iter().fold(
+ BTreeMap::new(),
+ |mut acc: BTreeMap<&patch::Reaction, Vec<_>>, (author, emoji)| {
+ acc.entry(emoji).or_default().push(*author);
+ acc
+ },
+ );
+ reactions
+ .into_iter()
+ .map(|(emoji, authors)| Reaction {
+ location: location.clone(),
+ emoji: *emoji,
+ authors,
+ })
+ .collect::<Vec<_>>()
+ })
+ .collect::<Vec<_>>();
+ let mut s = serializer.serialize_seq(Some(reactions.len()))?;
+ for r in &reactions {
+ s.serialize_element(r)?;
+ }
+ s.end()
+ }
+
+ /// Helper to deserialize a `Revision`'s reactions, the inverse of
+ /// `serialize_reactions`.
+ ///
+ /// The `Vec` of [`Reaction`]s are deserialized and converted to a
+ /// `BTreeMap<Option<CodeLocation>, Reactions>`.
+ #[cfg(test)]
+ pub fn deserialize_reactions<'de, T, D>(
+ deserializer: D,
+ ) -> Result<BTreeMap<Option<T>, Reactions>, D::Error>
+ where
+ D: serde::Deserializer<'de>,
+ T: Ord + Deserialize<'de>,
+ {
+ struct ReactionsVisitor<T>(PhantomData<T>);
+
+ impl<'de, T> serde::de::Visitor<'de> for ReactionsVisitor<T>
+ where
+ T: Deserialize<'de>,
+ {
+ type Value = Vec<Reaction<T>>;
+
+ fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+ formatter.write_str("a reaction of the form {'location', 'emoji', 'authors'}")
+ }
+
+ fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+ where
+ A: serde::de::SeqAccess<'de>,
+ {
+ let mut reactions = Vec::new();
+ while let Some(reaction) = seq.next_element()? {
+ reactions.push(reaction);
+ }
+ Ok(reactions)
+ }
+ }
+
+ let reactions = deserializer.deserialize_seq(ReactionsVisitor::<T>(PhantomData))?;
+ Ok(Reaction::as_revision_reactions(reactions))
+ }
+}
diff --git a/crates/radicle/src/cob/patch/encoding/review.rs b/crates/radicle/src/cob/patch/encoding/review.rs
index bb60b0f1ca..d43444cf1c 100644
--- a/crates/radicle/src/cob/patch/encoding/review.rs
+++ b/crates/radicle/src/cob/patch/encoding/review.rs
@@ -14,8 +14,11 @@ use serde_untagged::UntaggedEnumVisitor;
use crate::cob::patch;
use crate::cob::patch::{
- Author, CodeLocation, Comment, Edit, Label, Reactions, ReviewId, Thread, Timestamp, Verdict,
+ Author, Comment, Edit, Label, Reactions, ReviewId, Thread, Timestamp, Verdict,
};
+use crate::git;
+
+use super::Location;
/// The encoding for a `patch::Review` that can be deserialized and migrated.
///
@@ -29,7 +32,6 @@ pub(in crate::cob::patch) struct Review {
id: ReviewId,
author: Author,
verdict: Option<Verdict>,
- comments: Thread<Comment<CodeLocation>>,
labels: Vec<Label>,
timestamp: Timestamp,
@@ -40,6 +42,40 @@ pub(in crate::cob::patch) struct Review {
// V1 -> V2 conversion
#[serde(default)]
summary: Summary,
+ comments: Thread<Comment<Location>>,
+}
+
+impl Review {
+ pub fn decode(self, context: git::Oid) -> patch::Review {
+ let Review {
+ id,
+ author,
+ verdict,
+ comments: Thread { comments, timeline },
+ labels,
+ timestamp,
+ reactions,
+ summary,
+ } = self;
+ let summary = summary.into_edits(&author, ×tamp);
+ let comments = comments
+ .into_iter()
+ .map(|(id, comment)| {
+ let comment = comment.map(|c| c.map(|l| l.into_diff_location(context)));
+ (id, comment)
+ })
+ .collect();
+ patch::Review {
+ id,
+ author,
+ verdict,
+ summary,
+ comments: Thread { comments, timeline },
+ labels,
+ reactions,
+ timestamp,
+ }
+ }
}
/// The [`Summary`] type represents the different versions of the `summary`
@@ -94,45 +130,44 @@ impl Summary {
}
}
-impl From<Review> for patch::Review {
- fn from(review: Review) -> Self {
- let Review {
- id,
- author,
- verdict,
- comments,
- labels,
- timestamp,
- reactions,
- summary,
- } = review;
- let summary = summary.into_edits(&author, ×tamp);
- Self {
- id,
- author,
- verdict,
- summary,
- comments,
- labels,
- reactions,
- timestamp,
- }
- }
-}
-
#[allow(clippy::unwrap_used)]
#[cfg(test)]
mod test {
- use nonempty::nonempty;
+ use std::collections::BTreeSet;
+
+ use nonempty::{nonempty, NonEmpty};
use serde_json::json;
use crate::{
- cob::{thread::Edit, Timestamp},
- patch,
+ cob::{
+ thread::{Edit, Thread},
+ Author, Timestamp,
+ },
+ patch::{self, ReviewId, Verdict},
+ prelude::Did,
};
use super::{Review, Summary};
+ fn author() -> Author {
+ Author::new(
+ "did:key:z6MkwPUeUS2fJMfc2HZN1RQTQcTTuhw4HhPySB8JeUg2mVvx"
+ .parse::<Did>()
+ .unwrap(),
+ )
+ }
+
+ fn timestamp() -> Timestamp {
+ Timestamp::from_secs(1710947885_u64)
+ }
+
+ fn review_id() -> ReviewId {
+ "89d45fb371eb2622ba88188d474347cc526d80bb"
+ .parse::<crate::cob::EntryId>()
+ .unwrap()
+ .into()
+ }
+
#[test]
fn test_review_summary() {
let summary_null = json!(null);
@@ -179,9 +214,25 @@ mod test {
"timestamp": 1710947885000_i64
});
let v1 = serde_json::from_value::<Review>(review.clone()).unwrap();
+ let author = author();
+ let timestamp = timestamp();
assert_eq!(
- serde_json::from_value::<patch::Review>(review).unwrap(),
- v1.into()
+ v1.decode(git2::Oid::zero().into()),
+ patch::Review {
+ id: review_id(),
+ author: author.clone(),
+ verdict: Some(Verdict::Accept),
+ summary: NonEmpty::new(Edit::new(
+ *author.public_key(),
+ "".to_string(),
+ timestamp,
+ vec![]
+ )),
+ comments: Thread::default(),
+ labels: vec![],
+ reactions: BTreeSet::new(),
+ timestamp,
+ }
);
}
@@ -199,9 +250,25 @@ mod test {
"timestamp": 1710947885000_i64
});
let v1 = serde_json::from_value::<Review>(review.clone()).unwrap();
+ let author = author();
+ let timestamp = timestamp();
assert_eq!(
- serde_json::from_value::<patch::Review>(review).unwrap(),
- v1.into()
+ v1.decode(git2::Oid::zero().into()),
+ patch::Review {
+ id: review_id(),
+ author: author.clone(),
+ verdict: Some(Verdict::Accept),
+ summary: NonEmpty::new(Edit::new(
+ *author.public_key(),
+ "".to_string(),
+ timestamp,
+ vec![]
+ )),
+ comments: Thread::default(),
+ labels: vec![],
+ reactions: BTreeSet::new(),
+ timestamp,
+ }
);
}
@@ -219,10 +286,27 @@ mod test {
"labels": [],
"timestamp": 1710947885000_i64
});
+
let v1 = serde_json::from_value::<Review>(review.clone()).unwrap();
+ let author = author();
+ let timestamp = timestamp();
assert_eq!(
- serde_json::from_value::<patch::Review>(review).unwrap(),
- v1.into()
+ v1.decode(git2::Oid::zero().into()),
+ patch::Review {
+ id: review_id(),
+ author: author.clone(),
+ verdict: Some(Verdict::Accept),
+ summary: NonEmpty::new(Edit::new(
+ *author.public_key(),
+ "lgtm".to_string(),
+ timestamp,
+ vec![]
+ )),
+ comments: Thread::default(),
+ labels: vec![],
+ reactions: BTreeSet::new(),
+ timestamp,
+ }
);
}
@@ -246,9 +330,25 @@ mod test {
"timestamp": 1710947885000_i64
});
let v2 = serde_json::from_value::<Review>(review.clone()).unwrap();
+ let author = author();
+ let timestamp = timestamp();
assert_eq!(
- serde_json::from_value::<patch::Review>(review).unwrap(),
- v2.into()
+ v2.decode(git2::Oid::zero().into()),
+ patch::Review {
+ id: review_id(),
+ author: author.clone(),
+ verdict: Some(Verdict::Accept),
+ summary: NonEmpty::new(Edit::new(
+ *author.public_key(),
+ "lgtm".to_string(),
+ timestamp,
+ vec![]
+ )),
+ comments: Thread::default(),
+ labels: vec![],
+ reactions: BTreeSet::new(),
+ timestamp,
+ }
);
}
}
diff --git a/crates/radicle/src/cob/patch/encoding/revision.rs b/crates/radicle/src/cob/patch/encoding/revision.rs
new file mode 100644
index 0000000000..33e3e3b1d9
--- /dev/null
+++ b/crates/radicle/src/cob/patch/encoding/revision.rs
@@ -0,0 +1,606 @@
+use std::collections::{BTreeMap, BTreeSet};
+
+use nonempty::NonEmpty;
+use radicle_cob::EntryId;
+use serde::Deserialize;
+
+use crate::{
+ cob::{
+ thread::{Comment, CommentId, Edit, Reactions, Thread},
+ ActorId, Author, DiffLocation, Timestamp,
+ },
+ git,
+ patch::{self, encoding, RevisionId},
+};
+
+use super::Location;
+
+/// A patch revision.
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Revision {
+ /// Revision identifier.
+ id: RevisionId,
+ /// Author of the revision.
+ author: Author,
+ /// Revision description.
+ description: NonEmpty<Edit>,
+ /// Base branch commit, used as a merge base.
+ base: git::Oid,
+ /// Reference to the Git object containing the code (revision head).
+ oid: git::Oid,
+
+ /// When this revision was created.
+ timestamp: Timestamp,
+ /// Review comments resolved by this revision.
+ resolves: BTreeSet<(EntryId, CommentId)>,
+
+ // V1 -> V2 conversion
+ /// Discussion around this revision.
+ discussion: Thread<Comment<Location>>,
+ reviews: BTreeMap<ActorId, encoding::review::Review>,
+ /// Reactions on code locations and revision itself
+ #[serde(deserialize_with = "ser::deserialize_reactions")]
+ reactions: BTreeMap<Option<Location>, Reactions>,
+}
+
+impl From<Revision> for patch::Revision {
+ fn from(revision: Revision) -> Self {
+ let Revision {
+ id,
+ author,
+ description,
+ base,
+ oid,
+ timestamp,
+ resolves,
+ discussion,
+ reviews,
+ reactions,
+ } = revision;
+
+ let discussion = decode_discussion(discussion, base);
+ let reviews = decode_reviews(reviews, base);
+ let reactions = decode_reactions(reactions, base);
+
+ Self {
+ id,
+ author,
+ description,
+ base,
+ oid,
+ discussion,
+ reviews,
+ timestamp,
+ resolves,
+ reactions,
+ }
+ }
+}
+
+fn decode_reviews(
+ reviews: BTreeMap<ActorId, encoding::review::Review>,
+ context: git::Oid,
+) -> BTreeMap<ActorId, patch::Review> {
+ reviews
+ .into_iter()
+ .map(|(actor, review)| (actor, review.decode(context)))
+ .collect()
+}
+
+fn decode_discussion(
+ discussion: Thread<Comment<Location>>,
+ context: git::Oid,
+) -> Thread<Comment<DiffLocation>> {
+ let comments = discussion
+ .comments
+ .into_iter()
+ .map(|(id, c)| {
+ let c = c.map(|c| c.map(|loc| loc.into_diff_location(context)));
+ (id, c)
+ })
+ .collect();
+ Thread {
+ comments,
+ timeline: discussion.timeline,
+ }
+}
+
+fn decode_reactions(
+ reactions: BTreeMap<Option<Location>, Reactions>,
+ context: git::Oid,
+) -> BTreeMap<Option<DiffLocation>, Reactions> {
+ reactions
+ .into_iter()
+ .map(|(loc, rs)| {
+ let loc = loc.map(|loc| loc.into_diff_location(context));
+ (loc, rs)
+ })
+ .collect()
+}
+
+/// Helpers for de/serialization of patch data types.
+mod ser {
+ use std::collections::{BTreeMap, BTreeSet};
+
+ use crate::{
+ cob::{patch, thread::Reactions, ActorId},
+ patch::encoding::Location,
+ };
+
+ /// Serialize a `Revision`'s reaction as an object containing the
+ /// `location`, `emoji`, and all `authors` that have performed the
+ /// same reaction.
+ #[derive(Debug, serde::Deserialize)]
+ #[serde(rename_all = "camelCase")]
+ struct Reaction {
+ location: Option<Location>,
+ emoji: patch::Reaction,
+ authors: Vec<ActorId>,
+ }
+
+ impl Reaction {
+ fn as_revision_reactions(
+ reactions: Vec<Reaction>,
+ ) -> BTreeMap<Option<Location>, Reactions> {
+ reactions.into_iter().fold(
+ BTreeMap::<Option<Location>, Reactions>::new(),
+ |mut reactions,
+ Reaction {
+ location,
+ emoji,
+ authors,
+ }| {
+ let mut inner = authors
+ .into_iter()
+ .map(|author| (author, emoji))
+ .collect::<BTreeSet<_>>();
+ let entry = reactions.entry(location).or_default();
+ entry.append(&mut inner);
+ reactions
+ },
+ )
+ }
+ }
+
+ /// Helper to deserialize a `Revision`'s reactions, the inverse of
+ /// `serialize_reactions`.
+ ///
+ /// The `Vec` of [`Reaction`]s are deserialized and converted to a
+ /// `BTreeMap<Option<CodeLocation>, Reactions>`.
+ pub fn deserialize_reactions<'de, D>(
+ deserializer: D,
+ ) -> Result<BTreeMap<Option<Location>, Reactions>, D::Error>
+ where
+ D: serde::Deserializer<'de>,
+ {
+ struct ReactionsVisitor;
+
+ impl<'de> serde::de::Visitor<'de> for ReactionsVisitor {
+ type Value = Vec<Reaction>;
+
+ fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+ formatter.write_str("a reaction of the form {'location', 'emoji', 'authors'}")
+ }
+
+ fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+ where
+ A: serde::de::SeqAccess<'de>,
+ {
+ let mut reactions = Vec::new();
+ while let Some(reaction) = seq.next_element()? {
+ reactions.push(reaction);
+ }
+ Ok(reactions)
+ }
+ }
+
+ let reactions = deserializer.deserialize_seq(ReactionsVisitor)?;
+ Ok(Reaction::as_revision_reactions(reactions))
+ }
+}
+
+#[allow(clippy::unwrap_used)]
+#[cfg(test)]
+mod test {
+ use serde_json::json;
+
+ use crate::{
+ cob::{Author, DiffLocation, PartialLocation, Reaction},
+ git, patch,
+ prelude::Did,
+ };
+
+ use super::{Location, Revision};
+
+ fn author() -> Author {
+ Author::new(
+ "did:key:z6MkwPUeUS2fJMfc2HZN1RQTQcTTuhw4HhPySB8JeUg2mVvx"
+ .parse::<Did>()
+ .unwrap(),
+ )
+ }
+
+ fn base_oid() -> git::Oid {
+ "e67a8f4d32c830c24ed68ea21707923480830511".parse().unwrap()
+ }
+
+ fn head_oid() -> git::Oid {
+ "b455c819807cd7a7543d03215570c72b7cb452d7".parse().unwrap()
+ }
+
+ #[test]
+ fn test_revision_deserialize_v1_location_migration() {
+ let revision_json = json!({
+ "id": "89d45fb371eb2622ba88188d474347cc526d80bb",
+ "author": { "id": "did:key:z6MkwPUeUS2fJMfc2HZN1RQTQcTTuhw4HhPySB8JeUg2mVvx" },
+ "description": [{
+ "author": "z6MkwPUeUS2fJMfc2HZN1RQTQcTTuhw4HhPySB8JeUg2mVvx",
+ "timestamp": 1710947885000_i64,
+ "body": "Initial revision",
+ "embeds": []
+ }],
+ "base": "e67a8f4d32c830c24ed68ea21707923480830511",
+ "oid": "b455c819807cd7a7543d03215570c72b7cb452d7",
+ "timestamp": 1710947885000_i64,
+ "resolves": [],
+ "discussion": {
+ "comments": {
+ "2a47bc0c7dd6238ce3416e19d2ba57f3a7626f64": {
+ "id": "2a47bc0c7dd6238ce3416e19d2ba57f3a7626f64",
+ "author": "z6MkwPUeUS2fJMfc2HZN1RQTQcTTuhw4HhPySB8JeUg2mVvx",
+ "edits": [{
+ "author": "z6MkwPUeUS2fJMfc2HZN1RQTQcTTuhw4HhPySB8JeUg2mVvx",
+ "timestamp": 1710947885000_i64,
+ "body": "Great changes!",
+ "embeds": []
+ }],
+ "reactions": [],
+ "replyTo": null,
+ "resolved": false,
+ "location": {
+ "commit": "b455c819807cd7a7543d03215570c72b7cb452d7",
+ "path": "src/main.rs",
+ "old": {
+ "type": "lines",
+ "range": {
+ "start": 10,
+ "end": 12
+ }
+ },
+ "new": {
+ "type": "lines",
+ "range": {
+ "start": 12,
+ "end": 14
+ }
+ }
+ },
+ "embeds": []
+ }
+ },
+ "timeline": ["2a47bc0c7dd6238ce3416e19d2ba57f3a7626f64"]
+ },
+ "reviews": {},
+ "reactions": [{
+ "location": {
+ "commit": "b455c819807cd7a7543d03215570c72b7cb452d7",
+ "path": "src/utils.rs",
+ "old": {
+ "type": "lines",
+ "range": {
+ "start": 5,
+ "end": 7
+ }
+ },
+ "new": {
+ "type": "lines",
+ "range": {
+ "start": 8,
+ "end": 10
+ }
+ }
+ },
+ "emoji": "👍",
+ "authors": ["z6MkwPUeUS2fJMfc2HZN1RQTQcTTuhw4HhPySB8JeUg2mVvx"]
+ }]
+ });
+
+ let revision = serde_json::from_value::<Revision>(revision_json).unwrap();
+ let decoded: patch::Revision = revision.into();
+
+ // Check that the V1 PartialLocation was migrated to V2 DiffLocation
+ let (comment_id, comment) = decoded.discussion().comments().next().unwrap();
+ assert_eq!(
+ comment_id.to_string(),
+ "2a47bc0c7dd6238ce3416e19d2ba57f3a7626f64"
+ );
+ assert_eq!(comment.body(), "Great changes!");
+
+ let location = comment.location().unwrap();
+ assert_eq!(location.base, base_oid());
+ assert_eq!(location.head, head_oid());
+ assert_eq!(location.path.to_str().unwrap(), "src/main.rs");
+ assert!(location.selection.is_none()); // V1 locations lose selection info
+
+ // Check that reactions were also migrated
+ let reactions = decoded.reactions();
+ assert_eq!(reactions.len(), 1);
+ let (location, reaction_set) = reactions.iter().next().unwrap();
+ let location = location.as_ref().unwrap();
+ assert_eq!(location.base, base_oid());
+ assert_eq!(location.head, head_oid());
+ assert_eq!(location.path.to_str().unwrap(), "src/utils.rs");
+ assert!(location.selection.is_none()); // V1 locations lose selection info
+
+ let reaction_emoji = Reaction::new('👍').unwrap();
+ assert!(reaction_set.contains(&(*author().public_key(), reaction_emoji)));
+ }
+
+ #[test]
+ fn test_revision_deserialize_v2_location_preserved() {
+ let revision_json = json!({
+ "id": "89d45fb371eb2622ba88188d474347cc526d80bb",
+ "author": { "id": "did:key:z6MkwPUeUS2fJMfc2HZN1RQTQcTTuhw4HhPySB8JeUg2mVvx" },
+ "description": [{
+ "author": "z6MkwPUeUS2fJMfc2HZN1RQTQcTTuhw4HhPySB8JeUg2mVvx",
+ "timestamp": 1710947885000_i64,
+ "body": "Initial revision",
+ "embeds": []
+ }],
+ "base": "e67a8f4d32c830c24ed68ea21707923480830511",
+ "oid": "b455c819807cd7a7543d03215570c72b7cb452d7",
+ "timestamp": 1710947885000_i64,
+ "resolves": [],
+ "discussion": {
+ "comments": {
+ "2a47bc0c7dd6238ce3416e19d2ba57f3a7626f64": {
+ "id": "2a47bc0c7dd6238ce3416e19d2ba57f3a7626f64",
+ "author": "z6MkwPUeUS2fJMfc2HZN1RQTQcTTuhw4HhPySB8JeUg2mVvx",
+ "edits": [{
+ "author": "z6MkwPUeUS2fJMfc2HZN1RQTQcTTuhw4HhPySB8JeUg2mVvx",
+ "timestamp": 1710947885000_i64,
+ "body": "Great changes!",
+ "embeds": []
+ }],
+ "reactions": [],
+ "replyTo": null,
+ "resolved": false,
+ "location": {
+ "base": "e67a8f4d32c830c24ed68ea21707923480830511",
+ "head": "b455c819807cd7a7543d03215570c72b7cb452d7",
+ "path": "src/main.rs",
+ "selection": {
+ "hunk": 0,
+ "range": {
+ "type": "lines",
+ "range": {
+ "start": 2,
+ "end": 4
+ }
+ }
+ }
+ },
+ "embeds": []
+ }
+ },
+ "timeline": ["2a47bc0c7dd6238ce3416e19d2ba57f3a7626f64"]
+ },
+ "reviews": {},
+ "reactions": [{
+ "location": {
+ "base": "e67a8f4d32c830c24ed68ea21707923480830511",
+ "head": "b455c819807cd7a7543d03215570c72b7cb452d7",
+ "path": "src/utils.rs",
+ "selection": {
+ "hunk": 1,
+ "range": {
+ "type": "lines",
+ "range": {
+ "start": 0,
+ "end": 3
+ }
+ }
+ }
+ },
+ "emoji": "👍",
+ "authors": ["z6MkwPUeUS2fJMfc2HZN1RQTQcTTuhw4HhPySB8JeUg2mVvx"]
+ }]
+ });
+
+ let revision = serde_json::from_value::<Revision>(revision_json).unwrap();
+ let decoded: patch::Revision = revision.into();
+
+ // Check that the V2 DiffLocation was preserved
+ let (comment_id, comment) = decoded.discussion().comments().next().unwrap();
+ assert_eq!(
+ comment_id.to_string(),
+ "2a47bc0c7dd6238ce3416e19d2ba57f3a7626f64"
+ );
+ assert_eq!(comment.body(), "Great changes!");
+
+ let location = comment.location().unwrap();
+ assert_eq!(location.base, base_oid());
+ assert_eq!(location.head, head_oid());
+ assert_eq!(location.path.to_str().unwrap(), "src/main.rs");
+
+ // V2 locations preserve selection info
+ let selection = location.selection.as_ref().unwrap();
+ assert_eq!(selection.index(), 0);
+ assert_eq!(selection.range().line_start(), 2);
+ assert_eq!(selection.range().line_end(), 4);
+
+ // Check that reactions were also preserved
+ let reactions = decoded.reactions();
+ assert_eq!(reactions.len(), 1);
+ let (location, reaction_set) = reactions.iter().next().unwrap();
+ let location = location.as_ref().unwrap();
+ assert_eq!(location.base, base_oid());
+ assert_eq!(location.head, head_oid());
+ assert_eq!(location.path.to_str().unwrap(), "src/utils.rs");
+
+ // V2 locations preserve selection info
+ let selection = location.selection.as_ref().unwrap();
+ assert_eq!(selection.index(), 1);
+ assert_eq!(selection.range().line_start(), 0);
+ assert_eq!(selection.range().line_end(), 3);
+
+ let reaction_emoji = Reaction::new('👍').unwrap();
+ assert!(reaction_set.contains(&(*author().public_key(), reaction_emoji)));
+ }
+
+ #[test]
+ fn test_revision_deserialize_mixed_locations() {
+ // Test a revision that has both V1 and V2 locations mixed together
+ let revision_json = json!({
+ "id": "89d45fb371eb2622ba88188d474347cc526d80bb",
+ "author": { "id": "did:key:z6MkwPUeUS2fJMfc2HZN1RQTQcTTuhw4HhPySB8JeUg2mVvx" },
+ "description": [{
+ "author": "z6MkwPUeUS2fJMfc2HZN1RQTQcTTuhw4HhPySB8JeUg2mVvx",
+ "timestamp": 1710947885000_i64,
+ "body": "Initial revision",
+ "embeds": []
+ }],
+ "base": "e67a8f4d32c830c24ed68ea21707923480830511",
+ "oid": "b455c819807cd7a7543d03215570c72b7cb452d7",
+ "timestamp": 1710947885000_i64,
+ "resolves": [],
+ "discussion": {
+ "comments": {
+ "2a47bc0c7dd6238ce3416e19d2ba57f3a7626f64": {
+ "id": "2a47bc0c7dd6238ce3416e19d2ba57f3a7626f64",
+ "author": "z6MkwPUeUS2fJMfc2HZN1RQTQcTTuhw4HhPySB8JeUg2mVvx",
+ "edits": [{
+ "author": "z6MkwPUeUS2fJMfc2HZN1RQTQcTTuhw4HhPySB8JeUg2mVvx",
+ "timestamp": 1710947885000_i64,
+ "body": "V1 location comment",
+ "embeds": []
+ }],
+ "timestamp": 1710947885000_i64,
+ "replyTo": null,
+ "resolved": false,
+ "location": {
+ "commit": "b455c819807cd7a7543d03215570c72b7cb452d7",
+ "path": "src/old.rs",
+ "old": {
+ "type": "lines",
+ "range": { "start": 1, "end": 3 }
+ },
+ "new": {
+ "type": "lines",
+ "range": { "start": 1, "end": 3 }
+ }
+ },
+ "reactions": [],
+ "embeds": []
+ },
+ "89d45fb371eb2622ba88188d474347cc526d80bb": {
+ "id": "89d45fb371eb2622ba88188d474347cc526d80bb",
+ "author": "z6MkwPUeUS2fJMfc2HZN1RQTQcTTuhw4HhPySB8JeUg2mVvx",
+ "edits": [{
+ "author": "z6MkwPUeUS2fJMfc2HZN1RQTQcTTuhw4HhPySB8JeUg2mVvx",
+ "timestamp": 1710947885000_i64,
+ "body": "V2 location comment",
+ "embeds": []
+ }],
+ "timestamp": 1710947885000_i64,
+ "replyTo": null,
+ "resolved": false,
+ "location": {
+ "base": "e67a8f4d32c830c24ed68ea21707923480830511",
+ "head": "b455c819807cd7a7543d03215570c72b7cb452d7",
+ "path": "src/new.rs",
+ "selection": {
+ "hunk": 2,
+ "range": {
+ "type": "lines",
+ "range": { "start": 5, "end": 8 }
+ }
+ }
+ },
+ "reactions": [],
+ "embeds": []
+ }
+ },
+ "timeline": ["2a47bc0c7dd6238ce3416e19d2ba57f3a7626f64", "89d45fb371eb2622ba88188d474347cc526d80bb"]
+ },
+ "reviews": {},
+ "reactions": []
+ });
+
+ let revision = serde_json::from_value::<Revision>(revision_json).unwrap();
+ let decoded: patch::Revision = revision.into();
+
+ let comments: Vec<_> = decoded.discussion().comments().collect();
+ assert_eq!(comments.len(), 2);
+
+ // Check V1 location was migrated
+ let (comment1_id, comment1) = &comments[0];
+ assert_eq!(
+ comment1_id.to_string(),
+ "2a47bc0c7dd6238ce3416e19d2ba57f3a7626f64"
+ );
+ assert_eq!(comment1.body(), "V1 location comment");
+ let location1 = comment1.location().unwrap();
+ assert_eq!(location1.base, base_oid()); // Context provided
+ assert_eq!(location1.head, head_oid());
+ assert_eq!(location1.path.to_str().unwrap(), "src/old.rs");
+ assert!(location1.selection.is_none()); // V1 loses selection
+
+ // Check V2 location was preserved
+ let (comment2_id, comment2) = &comments[1];
+ assert_eq!(
+ comment2_id.to_string(),
+ "89d45fb371eb2622ba88188d474347cc526d80bb"
+ );
+ assert_eq!(comment2.body(), "V2 location comment");
+ let location2 = comment2.location().unwrap();
+ assert_eq!(location2.base, base_oid());
+ assert_eq!(location2.head, head_oid());
+ assert_eq!(location2.path.to_str().unwrap(), "src/new.rs");
+
+ // V2 preserves selection
+ let selection2 = location2.selection.as_ref().unwrap();
+ assert_eq!(selection2.index(), 2);
+ assert_eq!(selection2.range().line_start(), 5);
+ assert_eq!(selection2.range().line_end(), 8);
+ }
+
+ #[test]
+ fn test_location_v1_to_v2_migration() {
+ let base_context = base_oid();
+ let partial_location = PartialLocation {
+ commit: head_oid(),
+ path: "src/test.rs".into(),
+ old: Some(crate::cob::common::CodeRange::lines(10..15)),
+ new: Some(crate::cob::common::CodeRange::lines(12..17)),
+ };
+
+ let v1_location = Location::V1(partial_location);
+ let diff_location = v1_location.into_diff_location(base_context);
+
+ assert_eq!(diff_location.base, base_context);
+ assert_eq!(diff_location.head, head_oid());
+ assert_eq!(diff_location.path.to_str().unwrap(), "src/test.rs");
+ assert!(diff_location.selection.is_none()); // V1 migration loses selection
+ }
+
+ #[test]
+ fn test_location_v2_preserved() {
+ let base_context = base_oid();
+ let diff_location = DiffLocation {
+ base: base_oid(),
+ head: head_oid(),
+ path: "src/test.rs".into(),
+ selection: Some(crate::cob::common::HunkIndex::new(
+ 1,
+ crate::cob::common::CodeRange::lines(5..10),
+ )),
+ };
+
+ let v2_location = Location::V2(diff_location.clone());
+ let preserved_location = v2_location.into_diff_location(base_context);
+
+ assert_eq!(preserved_location, diff_location); // Should be identical
+ }
+}
diff --git a/crates/radicle/src/cob/thread.rs b/crates/radicle/src/cob/thread.rs
index f786bffb9e..964f100795 100644
--- a/crates/radicle/src/cob/thread.rs
+++ b/crates/radicle/src/cob/thread.rs
@@ -234,6 +234,21 @@ impl<L> Comment<L> {
pub fn unresolve(&mut self) {
self.resolved = false;
}
+
+ pub(crate) fn map<M, F>(self, f: F) -> Comment<M>
+ where
+ F: FnOnce(L) -> M,
+ {
+ let location = self.location.map(f);
+ Comment {
+ author: self.author,
+ edits: self.edits,
+ reactions: self.reactions,
+ reply_to: self.reply_to,
+ location,
+ resolved: self.resolved,
+ }
+ }
}
impl<T: PartialOrd> PartialOrd for Comment<T> {
commit 0819ebfc7bc21de80f4ffa4a4ea2000fbaa91047
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Wed Mar 26 10:12:14 2025 +0000
radicle: diff configuration data
Introduce diff configuration data so that it can be used reproduce diff
information in a stable way.
This information can be stored alongside a patch so that when comments are made
on a patch's diff, then their positions can be stable across clients – as long
as they reproduce the diff with the same configuration.
diff --git a/crates/radicle/src/cob/patch.rs b/crates/radicle/src/cob/patch.rs
index 76c6f5e73d..faa5227fad 100644
--- a/crates/radicle/src/cob/patch.rs
+++ b/crates/radicle/src/cob/patch.rs
@@ -1,4 +1,5 @@
pub mod cache;
+pub mod diff;
mod actions;
pub use actions::ReviewEdit;
diff --git a/crates/radicle/src/cob/patch/diff.rs b/crates/radicle/src/cob/patch/diff.rs
new file mode 100644
index 0000000000..361bbe8a5e
--- /dev/null
+++ b/crates/radicle/src/cob/patch/diff.rs
@@ -0,0 +1,256 @@
+use serde::{Deserialize, Serialize};
+
+/// The options to be used to calculate the diff for a given `Patch`.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Options {
+ /// The algorithm used to calculate the diff.
+ ///
+ /// Default: [`Algorithm::Histogram`].
+ algorithm: Algorithm,
+ /// Disable updating the binary flag in delta records.
+ ///
+ /// Default: `false`.
+ skip_binary: bool,
+ /// Set the number of unchanged lines that define the boundary of a hunk
+ /// (and to display before and after).
+ ///
+ /// Default: `3`.
+ context_lines: u32,
+ /// Set the maximum number of unchanged lines between hunk boundaries before
+ /// the hunks will be merged into one.
+ ///
+ /// Default: `0`.
+ interhunk_lines: u32,
+ /// Configuration options for finding similar files in a diff.
+ find: FindOptions,
+}
+
+impl Options {
+ pub fn new() -> Self {
+ Self::default()
+ }
+
+ /// The algorithm used to calculate the diff.
+ ///
+ /// Default: [`Algorithm::Histogram`].
+ pub fn with_algorithm(self, algorithm: Algorithm) -> Self {
+ Self { algorithm, ..self }
+ }
+
+ /// Disable updating the binary flag in delta records.
+ ///
+ /// Default: `false`.
+ pub fn skip_binary(self, skip: bool) -> Self {
+ Self {
+ skip_binary: skip,
+ ..self
+ }
+ }
+
+ /// Set the number of unchanged lines that define the boundary of a hunk
+ /// (and to display before and after).
+ ///
+ /// Default: `3`.
+ pub fn with_context_lines(self, lines: u32) -> Self {
+ Self {
+ context_lines: lines,
+ ..self
+ }
+ }
+
+ /// Set the maximum number of unchanged lines between hunk boundaries before
+ /// the hunks will be merged into one.
+ ///
+ /// Default: `0`.
+ pub fn with_interhunk_lines(self, lines: u32) -> Self {
+ Self {
+ interhunk_lines: lines,
+ ..self
+ }
+ }
+
+ /// Construct the [`git2::DiffOptions`] using the [`Options`] provided.
+ ///
+ /// The following flags are ensured to be not set:
+ ///
+ /// - `skip_binary_check`
+ /// - `force_text`
+ /// - `force_binary`
+ fn as_diff_options(&self) -> git2::DiffOptions {
+ let mut opts = git2::DiffOptions::new();
+ // Options that we want to ensure are not set
+ opts.reverse(false).force_text(false).force_binary(false);
+
+ opts.skip_binary_check(self.skip_binary)
+ .context_lines(self.context_lines)
+ .interhunk_lines(self.interhunk_lines);
+ match self.algorithm {
+ Algorithm::Myers => opts.patience(false),
+ Algorithm::Patience => opts.patience(true),
+ Algorithm::Histogram => opts.patience(true).minimal(true),
+ };
+ opts
+ }
+}
+
+impl From<&Options> for git2::DiffOptions {
+ fn from(opts: &Options) -> Self {
+ opts.as_diff_options()
+ }
+}
+
+impl From<&Options> for git2::DiffFindOptions {
+ fn from(opts: &Options) -> Self {
+ opts.find.as_diff_find_options()
+ }
+}
+
+impl Default for Options {
+ fn default() -> Self {
+ Self {
+ algorithm: Algorithm::default(),
+ skip_binary: false,
+ context_lines: 3,
+ interhunk_lines: 0,
+ find: FindOptions::default(),
+ }
+ }
+}
+
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
+pub enum Algorithm {
+ /// The myers algorithm, this is the default used in `git`.
+ Myers,
+ /// The patience algorithm.
+ Patience,
+ /// The patience algorithm, which takes slightly more time to minimize the
+ /// diff. This is the protocol's default.
+ #[default]
+ Histogram,
+}
+
+/// The options to be used to calculate to find file similarity within a diff.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+pub struct FindOptions {
+ /// Measure similarity only by comparing SHAs (fast and cheap).
+ exact_match: bool,
+ /// Look for copies.
+ #[serde(skip_serializing_if = "Option::is_none")]
+ copies: Option<Copies>,
+ /// Look for renames.
+ #[serde(skip_serializing_if = "Option::is_none")]
+ renames: Option<Renames>,
+}
+
+impl Default for FindOptions {
+ fn default() -> Self {
+ Self {
+ exact_match: false,
+ copies: None,
+ renames: Some(Renames::default()),
+ }
+ }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+pub struct Copies {
+ /// Similarity to consider a file copy
+ ///
+ /// Default: `50`
+ pub copy_threshold: u16,
+}
+
+impl Default for Copies {
+ fn default() -> Self {
+ Self { copy_threshold: 50 }
+ }
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+pub struct Renames {
+ /// The number of files to consider when performing the copy/rename detection;
+ /// equivalent to the git diff option -l. This setting has no effect if rename
+ /// detection is turned off.
+ ///
+ /// Default: `200`.
+ pub limit: usize,
+ /// Similarity to consider a file renamed
+ ///
+ /// Default: `50`.
+ pub rename_threshold: u16,
+}
+
+impl Default for Renames {
+ fn default() -> Self {
+ Self {
+ limit: 200,
+ rename_threshold: 50,
+ }
+ }
+}
+
+impl FindOptions {
+ pub fn new() -> Self {
+ Self::default()
+ }
+
+ /// Measure similarity only by comparing SHAs (fast and cheap).
+ ///
+ /// Default: `true`.
+ pub fn with_exact_match(self, exact_match: bool) -> Self {
+ Self {
+ exact_match,
+ ..self
+ }
+ }
+
+ /// Look for copies.
+ ///
+ /// Default: `None`
+ pub fn with_copies(self, copies: Option<Copies>) -> Self {
+ Self { copies, ..self }
+ }
+
+ /// Look for renames.
+ ///
+ /// Default: `Some(Renames::default())`
+ pub fn with_renames(self, renames: Option<Renames>) -> Self {
+ Self { renames, ..self }
+ }
+
+ /// Construct the [`git2::DiffFindOptions`] using the [`FindOptions`] provided.
+ pub fn as_diff_find_options(&self) -> git2::DiffFindOptions {
+ let mut opts = git2::DiffFindOptions::new();
+ match self.renames {
+ Some(Renames {
+ limit,
+ rename_threshold,
+ }) => {
+ opts.renames(true);
+ opts.rename_limit(limit);
+ opts.rename_from_rewrite_threshold(rename_threshold);
+ }
+ None => {
+ opts.renames(false);
+ }
+ }
+ match self.copies {
+ Some(Copies { copy_threshold }) => {
+ opts.copies(true);
+ opts.copy_threshold(copy_threshold);
+ }
+ None => {
+ opts.copies(false);
+ }
+ }
+ opts.exact_match_only(self.exact_match);
+ opts
+ }
+}
+
+impl From<&FindOptions> for git2::DiffFindOptions {
+ fn from(opts: &FindOptions) -> Self {
+ opts.as_diff_find_options()
+ }
+}
commit 59a6f63ac16f6fadccf39bc3703edaee899e30dc
Author: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Wed Mar 26 09:53:39 2025 +0000
radicle: DiffLocation
Introduce the `DiffLocation` type. The type describes a location to be used
within comments. The information it provides are the base, head, file path, and
hunk index. With this information a `git2::Patch` can be recreated and the
relevant hunk lines can be retrieved.
diff --git a/crates/radicle/src/cob/common.rs b/crates/radicle/src/cob/common.rs
index 67f2f3b529..10718f8e6a 100644
--- a/crates/radicle/src/cob/common.rs
+++ b/crates/radicle/src/cob/common.rs
@@ -427,6 +427,73 @@ impl std::cmp::Ord for CodeRange {
}
}
+/// Describes a selection within a diff.
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct DiffLocation {
+ /// The old side of the commit diff.
+ pub base: Oid,
+ /// The new side of the commit diff.
+ pub head: Oid,
+ /// Path of the file.
+ pub path: PathBuf,
+ /// The selected section of the diff patch.
+ /// If the selection is `None`, then this is a file-level comment.
+ pub selection: Option<HunkIndex>,
+}
+
+impl DiffLocation {
+ pub fn file_level(base: Oid, head: Oid, path: PathBuf) -> Self {
+ Self {
+ base,
+ head,
+ path,
+ selection: None,
+ }
+ }
+
+ pub fn hunk_level(base: Oid, head: Oid, path: PathBuf, hunk: HunkIndex) -> Self {
+ Self {
+ base,
+ head,
+ path,
+ selection: Some(hunk),
+ }
+ }
+
+ pub fn code_range(&self) -> Option<&CodeRange> {
+ self.selection().map(|s| s.range())
+ }
+
+ pub fn selection(&self) -> Option<&HunkIndex> {
+ self.selection.as_ref()
+ }
+}
+
+/// The combined index of the hunk and range within that hunk.
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct HunkIndex {
+ /// The index of the hunk in the patch.
+ pub hunk: usize,
+ /// The line selection within the hunk itself.
+ pub range: CodeRange,
+}
+
+impl HunkIndex {
+ pub fn new(hunk: usize, range: CodeRange) -> Self {
+ Self { hunk, range }
+ }
+
+ pub fn index(&self) -> usize {
+ self.hunk
+ }
+
+ pub fn range(&self) -> &CodeRange {
+ &self.range
+ }
+}
+
#[cfg(test)]
#[allow(clippy::unwrap_used)]
mod test {
Exit code: 0
shell: 'cargo --version rustc --version cargo fmt --check cargo clippy --all-targets --workspace -- --deny warnings cargo build --all-targets --workspace cargo doc --workspace --no-deps cargo test --workspace --no-fail-fast '
Commands:
$ podman run --name 7f225445-b738-4217-acc5-3483542e3b15 -v /opt/radcis/ci.rad.levitte.org/cci/state/7f225445-b738-4217-acc5-3483542e3b15/s:/7f225445-b738-4217-acc5-3483542e3b15/s:ro -v /opt/radcis/ci.rad.levitte.org/cci/state/7f225445-b738-4217-acc5-3483542e3b15/w:/7f225445-b738-4217-acc5-3483542e3b15/w -w /7f225445-b738-4217-acc5-3483542e3b15/w -v /opt/radcis/ci.rad.levitte.org/.radicle:/${id}/.radicle:ro -e RAD_HOME=/${id}/.radicle rust:trixie bash /7f225445-b738-4217-acc5-3483542e3b15/s/script.sh
+ cargo --version
info: syncing channel updates for '1.88-x86_64-unknown-linux-gnu'
info: latest update on 2025-06-26, rust version 1.88.0 (6b00bc388 2025-06-23)
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.88.0 (873a06493 2025-05-10)
+ rustc --version
rustc 1.88.0 (6b00bc388 2025-06-23)
+ cargo fmt --check
+ cargo clippy --all-targets --workspace -- --deny warnings
Updating crates.io index
Downloading crates ...
Downloaded amplify_syn v2.0.1
Downloaded outref v0.5.2
Downloaded overload v0.1.1
Downloaded p256 v0.13.2
Downloaded colorchoice v1.0.0
Downloaded p384 v0.13.0
Downloaded salsa20 v0.10.2
Downloaded socks5-client v0.4.1
Downloaded signal-hook v0.3.18
Downloaded signature v2.2.0
Downloaded stable_deref_trait v1.2.0
Downloaded rfc6979 v0.4.0
Downloaded flate2 v1.1.1
Downloaded ssh-cipher v0.2.0
Downloaded fast-glob v0.3.3
Downloaded fluent-uri v0.3.2
Downloaded fraction v0.15.3
Downloaded rand_chacha v0.3.1
Downloaded pbkdf2 v0.12.2
Downloaded sqlite3-sys v0.15.2
Downloaded equivalent v1.0.1
Downloaded subtle v2.5.0
Downloaded noise-framework v0.4.0
Downloaded diff v0.1.13
Downloaded siphasher v1.0.1
Downloaded shlex v1.3.0
Downloaded qcheck-macros v1.0.0
Downloaded yoke-derive v0.7.5
Downloaded io-reactor v0.5.2
Downloaded maybe-async v0.2.10
Downloaded gix-sec v0.10.12
Downloaded matchers v0.1.0
Downloaded write16 v1.0.0
Downloaded tracing-log v0.2.0
Downloaded log v0.4.27
Downloaded gix-command v0.4.1
Downloaded utf8_iter v1.0.4
Downloaded utf16_iter v1.0.5
Downloaded git-ref-format-macro v0.3.1
Downloaded uuid-simd v0.8.0
Downloaded aes-gcm v0.10.3
Downloaded gix-utils v0.1.14
Downloaded zerofrom-derive v0.1.6
Downloaded gix-chunk v0.4.11
Downloaded gix-url v0.28.2
Downloaded thiserror v2.0.12
Downloaded gix-date v0.9.4
Downloaded git-ref-format-core v0.3.1
Downloaded inout v0.1.3
Downloaded gix-lock v15.0.1
Downloaded git-ref-format v0.3.1
Downloaded ghash v0.5.1
Downloaded num-rational v0.4.2
Downloaded num-integer v0.1.46
Downloaded tree-sitter-highlight v0.24.4
Downloaded gix-credentials v0.26.0
Downloaded tree-sitter-json v0.24.8
Downloaded zerovec-derive v0.10.3
Downloaded tree-sitter-language v0.1.2
Downloaded tree-sitter-css v0.23.1
Downloaded icu_normalizer_data v1.5.1
Downloaded libm v0.2.8
Downloaded tree-sitter-html v0.23.2
Downloaded gix-object v0.46.1
Downloaded mio v0.8.11
Downloaded tree-sitter-go v0.23.4
Downloaded gix-pack v0.56.0
Downloaded zerovec v0.10.4
Downloaded hashbrown v0.14.3
Downloaded tracing-subscriber v0.3.19
Downloaded tree-sitter-python v0.23.4
Downloaded git2 v0.19.0
Downloaded tree-sitter v0.24.4
Downloaded winnow v0.6.26
Downloaded tree-sitter-c v0.23.2
Downloaded rustix v0.38.34
Downloaded syn v2.0.89
Downloaded regex-syntax v0.8.5
Downloaded rustix v1.0.7
Downloaded tree-sitter-md v0.3.2
Downloaded tree-sitter-rust v0.23.2
Downloaded regex-syntax v0.6.29
Downloaded vcpkg v0.2.15
Downloaded tree-sitter-bash v0.23.3
Downloaded icu_properties_data v1.5.1
Downloaded syn v1.0.109
Downloaded regex v1.11.1
Downloaded tree-sitter-ruby v0.23.1
Downloaded libc v0.2.174
Downloaded regex-automata v0.4.9
Downloaded idna v1.0.3
Downloaded zerocopy v0.7.35
Downloaded indexmap v2.2.6
Downloaded tree-sitter-typescript v0.23.2
Downloaded num-bigint-dig v0.8.4
Downloaded gix-odb v0.66.0
Downloaded jiff v0.2.1
Downloaded gix-diff v0.49.0
Downloaded memchr v2.7.2
Downloaded mio v1.0.4
Downloaded unicode-normalization v0.1.23
Downloaded sha3 v0.10.8
Downloaded p521 v0.13.3
Downloaded bstr v1.9.1
Downloaded miniz_oxide v0.8.8
Downloaded num-bigint v0.4.6
Downloaded jsonschema v0.30.0
Downloaded tar v0.4.40
Downloaded icu_normalizer v1.5.0
Downloaded gix-features v0.39.1
Downloaded inquire v0.7.5
Downloaded unicode-segmentation v1.11.0
Downloaded hmac v0.12.1
Downloaded gix-packetline v0.18.4
Downloaded icu_provider_macros v1.5.0
Downloaded radicle-surf v0.22.0
Downloaded iana-time-zone v0.1.60
Downloaded memmap2 v0.9.4
Downloaded icu_collections v1.5.0
Downloaded gix-actor v0.33.2
Downloaded gix-revision v0.31.1
Downloaded uuid v1.16.0
Downloaded regex-automata v0.1.10
Downloaded gix-path v0.10.15
Downloaded gix-negotiate v0.17.0
Downloaded gix-hashtable v0.6.0
Downloaded idna_adapter v1.2.0
Downloaded writeable v0.5.5
Downloaded nu-ansi-term v0.46.0
Downloaded num-complex v0.4.6
Downloaded tinyvec v1.6.0
Downloaded gix-hash v0.15.1
Downloaded zeroize v1.7.0
Downloaded yansi v0.5.1
Downloaded normalize-line-endings v0.3.0
Downloaded url v2.5.4
Downloaded linux-raw-sys v0.4.13
Downloaded xattr v1.3.1
Downloaded jobserver v0.1.31
Downloaded tracing-core v0.1.34
Downloaded tempfile v3.10.1
Downloaded gix-transport v0.44.0
Downloaded multibase v0.9.1
Downloaded icu_locid_transform_data v1.5.1
Downloaded tracing v0.1.41
Downloaded bloomy v1.2.0
Downloaded num-iter v0.1.45
Downloaded gix-fs v0.12.1
Downloaded itoa v1.0.11
Downloaded zerofrom v0.1.6
Downloaded lexopt v0.3.0
Downloaded rand v0.8.5
Downloaded home v0.5.9
Downloaded lazy_static v1.5.0
Downloaded keccak v0.1.5
Downloaded gix-prompt v0.9.1
Downloaded libgit2-sys v0.17.0+1.8.1
Downloaded yoke v0.7.5
Downloaded walkdir v2.5.0
Downloaded num-cmp v0.1.0
Downloaded num v0.4.3
Downloaded tinyvec_macros v0.1.1
Downloaded gix-quote v0.4.15
Downloaded unicode-ident v1.0.12
Downloaded gix-commitgraph v0.25.1
Downloaded gix-tempfile v15.0.0
Downloaded typeid v1.0.3
Downloaded timeago v0.4.2
Downloaded test-log v0.2.18
Downloaded test-log-macros v0.2.18
Downloaded icu_locid_transform v1.5.0
Downloaded schemars v1.0.4
Downloaded fancy-regex v0.14.0
Downloaded icu_locid v1.5.0
Downloaded gix-traverse v0.43.1
Downloaded gix-config-value v0.14.12
Downloaded lock_api v0.4.11
Downloaded gix-trace v0.1.12
Downloaded vsimd v0.8.0
Downloaded prodash v29.0.2
Downloaded thiserror-impl v1.0.69
Downloaded newline-converter v0.3.0
Downloaded linux-raw-sys v0.9.4
Downloaded base32 v0.4.0
Downloaded unicode-width v0.1.11
Downloaded typenum v1.17.0
Downloaded icu_provider v1.5.0
Downloaded icu_properties v1.5.1
Downloaded serde_derive v1.0.219
Downloaded serde v1.0.219
Downloaded rsa v0.9.6
Downloaded tinystr v0.7.6
Downloaded fxhash v0.2.1
Downloaded sqlite3-src v0.5.1
Downloaded crossterm v0.29.0
Downloaded litrs v0.4.1
Downloaded gix-revwalk v0.17.0
Downloaded gix-refspec v0.27.0
Downloaded gix-ref v0.49.1
Downloaded gix-protocol v0.47.0
Downloaded nonempty v0.5.0
Downloaded similar v2.5.0
Downloaded ahash v0.8.11
Downloaded pretty_assertions v1.4.0
Downloaded version_check v0.9.4
Downloaded universal-hash v0.5.1
Downloaded tree-sitter-toml-ng v0.6.0
Downloaded socket2 v0.5.7
Downloaded ed25519 v1.5.3
Downloaded crypto-bigint v0.5.5
Downloaded crossterm v0.25.0
Downloaded gix-shallow v0.1.0
Downloaded thiserror-impl v2.0.12
Downloaded signals_receipts v0.2.0
Downloaded ryu v1.0.17
Downloaded quote v1.0.36
Downloaded proc-macro2 v1.0.92
Downloaded once_cell v1.21.3
Downloaded cc v1.2.2
Downloaded base64 v0.21.7
Downloaded aho-corasick v1.1.3
Downloaded spin v0.9.8
Downloaded sha2 v0.10.8
Downloaded schemars_derive v1.0.4
Downloaded phf v0.11.3
Downloaded crossbeam-channel v0.5.15
Downloaded chacha20poly1305 v0.10.1
Downloaded base64 v0.22.1
Downloaded localtime v1.3.1
Downloaded utf8parse v0.2.1
Downloaded unicode-display-width v0.3.0
Downloaded thread_local v1.1.9
Downloaded thiserror v1.0.69
Downloaded netservices v0.8.0
Downloaded group v0.13.0
Downloaded snapbox v0.4.17
Downloaded signal-hook-registry v1.4.5
Downloaded serde-untagged v0.1.7
Downloaded sec1 v0.7.3
Downloaded primeorder v0.13.6
Downloaded pkg-config v0.3.30
Downloaded crc32fast v1.4.0
Downloaded bytes v1.10.1
Downloaded gix-validate v0.9.4
Downloaded systemd-journal-logger v2.2.2
Downloaded synstructure v0.13.1
Downloaded streaming-iterator v0.1.9
Downloaded ssh-encoding v0.2.0
Downloaded spki v0.7.3
Downloaded shell-words v1.1.0
Downloaded serde_derive_internals v0.29.1
Downloaded ref-cast v1.0.24
Downloaded rand_core v0.6.4
Downloaded qcheck v1.0.0
Downloaded proc-macro-error v1.0.4
Downloaded pkcs8 v0.10.2
Downloaded pin-project-lite v0.2.16
Downloaded opaque-debug v0.3.1
Downloaded emojis v0.6.4
Downloaded derive_more v2.0.1
Downloaded cyphernet v0.5.2
Downloaded cypheraddr v0.4.0
Downloaded crossbeam-utils v0.8.19
Downloaded const-oid v0.9.6
Downloaded colored v2.1.0
Downloaded cipher v0.4.4
Downloaded blowfish v0.9.1
Downloaded base64 v0.13.1
Downloaded arc-swap v1.7.1
Downloaded anstream v0.6.13
Downloaded litemap v0.7.5
Downloaded nonempty v0.9.0
Downloaded sqlite v0.32.0
Downloaded snapbox-macros v0.3.8
Downloaded siphasher v0.3.11
Downloaded ref-cast-impl v1.0.24
Downloaded proc-macro-error-attr v1.0.4
Downloaded libz-sys v1.1.16
Downloaded popol v3.0.0
Downloaded dyn-clone v1.0.17
Downloaded block-buffer v0.10.4
Downloaded bitflags v1.3.2
Downloaded generic-array v0.14.7
Downloaded data-encoding-macro-internal v0.1.12
Downloaded bitflags v2.9.1
Downloaded base64ct v1.6.0
Downloaded anstyle-parse v0.2.3
Downloaded sha1_smol v1.0.0
Downloaded erased-serde v0.4.6
Downloaded email_address v0.2.9
Downloaded chacha20 v0.9.1
Downloaded cbc v0.1.2
Downloaded block-padding v0.3.3
Downloaded base-x v0.2.11
Downloaded cfg-if v1.0.0
Downloaded anyhow v1.0.82
Downloaded ec25519 v0.1.0
Downloaded anstyle v1.0.6
Downloaded amplify_num v0.5.2
Downloaded ff v0.13.0
Downloaded either v1.11.0
Downloaded crypto-common v0.1.6
Downloaded bit-vec v0.8.0
Downloaded bcrypt-pbkdf v0.10.0
Downloaded autocfg v1.2.0
Downloaded data-encoding-macro v0.1.14
Downloaded bit-set v0.8.0
Downloaded displaydoc v0.2.5
Downloaded cyphergraphy v0.3.0
Downloaded base16ct v0.2.0
Downloaded ascii v1.1.0
Downloaded aes v0.8.4
Downloaded filetime v0.2.23
Downloaded faster-hex v0.9.0
Downloaded document-features v0.2.11
Downloaded digest v0.10.7
Downloaded ctr v0.9.2
Downloaded cpufeatures v0.2.12
Downloaded anstyle-query v1.0.2
Downloaded radicle-git-ext v0.8.1
Downloaded phf_shared v0.11.3
Downloaded form_urlencoded v1.2.1
Downloaded fastrand v2.1.0
Downloaded env_filter v0.1.3
Downloaded der v0.7.9
Downloaded data-encoding v2.5.0
Downloaded ct-codecs v1.1.1
Downloaded convert_case v0.7.1
Downloaded amplify_derive v4.0.0
Downloaded ssh-key v0.6.6
Downloaded smallvec v1.13.2
Downloaded signal-hook-mio v0.2.4
Downloaded sharded-slab v0.1.7
Downloaded sem_safe v0.2.0
Downloaded scrypt v0.11.0
Downloaded same-file v1.0.6
Downloaded referencing v0.30.0
Downloaded poly1305 v0.8.0
Downloaded percent-encoding v2.3.1
Downloaded pem-rfc7468 v0.7.0
Downloaded parking_lot_core v0.9.9
Downloaded parking_lot v0.12.3
Downloaded elliptic-curve v0.13.8
Downloaded derive_more-impl v2.0.1
Downloaded amplify v4.6.0
Downloaded aead v0.5.2
Downloaded adler2 v2.0.0
Downloaded signature v1.6.4
Downloaded serde_json v1.0.140
Downloaded scopeguard v1.2.0
Downloaded radicle-std-ext v0.1.0
Downloaded pkcs1 v0.7.5
Downloaded escargot v0.5.10
Downloaded env_logger v0.11.8
Downloaded borrow-or-share v0.2.2
Downloaded errno v0.3.13
Downloaded chrono v0.4.38
Downloaded bytesize v2.0.1
Downloaded ppv-lite86 v0.2.17
Downloaded polyval v0.6.2
Downloaded ecdsa v0.16.9
Downloaded byteorder v1.5.0
Downloaded bytecount v0.6.8
Downloaded num-traits v0.2.19
Downloaded getrandom v0.2.15
Compiling libc v0.2.174
Compiling proc-macro2 v1.0.92
Compiling unicode-ident v1.0.12
Checking cfg-if v1.0.0
Compiling shlex v1.3.0
Compiling version_check v0.9.4
Compiling serde v1.0.219
Checking memchr v2.7.2
Compiling autocfg v1.2.0
Compiling quote v1.0.36
Checking log v0.4.27
Compiling jobserver v0.1.31
Checking smallvec v1.13.2
Compiling syn v2.0.89
Compiling cc v1.2.2
Checking getrandom v0.2.15
Checking aho-corasick v1.1.3
Compiling typenum v1.17.0
Checking regex-syntax v0.8.5
Compiling generic-array v0.14.7
Checking rand_core v0.6.4
Checking fastrand v2.1.0
Checking bitflags v2.9.1
Compiling lock_api v0.4.11
Checking regex-automata v0.4.9
Compiling parking_lot_core v0.9.9
Checking crypto-common v0.1.6
Checking scopeguard v1.2.0
Checking subtle v2.5.0
Checking stable_deref_trait v1.2.0
Checking parking_lot v0.12.3
Checking tinyvec_macros v0.1.1
Compiling syn v1.0.109
Checking once_cell v1.21.3
Checking tinyvec v1.6.0
Checking zeroize v1.7.0
Compiling synstructure v0.13.1
Checking unicode-normalization v0.1.23
Checking cpufeatures v0.2.12
Checking litemap v0.7.5
Checking bstr v1.9.1
Compiling crc32fast v1.4.0
Checking writeable v0.5.5
Compiling icu_locid_transform_data v1.5.1
Compiling serde_derive v1.0.219
Compiling zerofrom-derive v0.1.6
Compiling yoke-derive v0.7.5
Checking zerofrom v0.1.6
Compiling zerovec-derive v0.10.3
Checking yoke v0.7.5
Compiling displaydoc v0.2.5
Compiling thiserror v2.0.12
Compiling icu_provider_macros v1.5.0
Compiling thiserror-impl v2.0.12
Checking block-padding v0.3.3
Compiling icu_properties_data v1.5.1
Checking zerovec v0.10.4
Checking inout v0.1.3
Checking block-buffer v0.10.4
Checking itoa v1.0.11
Compiling icu_normalizer_data v1.5.1
Checking tinystr v0.7.6
Compiling pkg-config v0.3.30
Checking icu_locid v1.5.0
Checking hashbrown v0.14.3
Checking icu_collections v1.5.0
Checking icu_provider v1.5.0
Checking icu_locid_transform v1.5.0
Checking digest v0.10.7
Checking cipher v0.4.4
Checking utf8_iter v1.0.4
Checking icu_properties v1.5.1
Checking utf16_iter v1.0.5
Checking write16 v1.0.0
Compiling thiserror v1.0.69
Compiling thiserror-impl v1.0.69
Compiling rustix v0.38.34
Checking percent-encoding v2.3.1
Checking linux-raw-sys v0.4.13
Checking sha2 v0.10.8
Checking form_urlencoded v1.2.1
Checking universal-hash v0.5.1
Checking opaque-debug v0.3.1
Compiling vcpkg v0.2.15
Checking icu_normalizer v1.5.0
Compiling amplify_syn v2.0.1
Checking idna_adapter v1.2.0
Compiling libz-sys v1.1.16
Checking idna v1.0.3
Checking url v2.5.4
Checking gix-trace v0.1.12
Compiling data-encoding v2.5.0
Compiling amplify_derive v4.0.0
Checking tempfile v3.10.1
Checking amplify_num v0.5.2
Checking signature v1.6.4
Checking ascii v1.1.0
Compiling data-encoding-macro-internal v0.1.12
Checking ed25519 v1.5.3
Checking faster-hex v0.9.0
Compiling libgit2-sys v0.17.0+1.8.1
Checking data-encoding-macro v0.1.14
Checking aead v0.5.2
Compiling num-traits v0.2.19
Compiling proc-macro-error-attr v1.0.4
Checking base-x v0.2.11
Checking ct-codecs v1.1.1
Checking byteorder v1.5.0
Checking ec25519 v0.1.0
Checking multibase v0.9.1
Checking poly1305 v0.8.0
Checking chacha20 v0.9.1
Checking amplify v4.6.0
Checking gix-utils v0.1.14
Compiling proc-macro-error v1.0.4
Checking adler2 v2.0.0
Checking cyphergraphy v0.3.0
Checking miniz_oxide v0.8.8
Checking gix-hash v0.15.1
Compiling crossbeam-utils v0.8.19
Checking same-file v1.0.6
Checking keccak v0.1.5
Checking walkdir v2.5.0
Checking sha3 v0.10.8
Checking flate2 v1.1.1
Compiling git-ref-format-core v0.3.1
Checking polyval v0.6.2
Checking hmac v0.12.1
Compiling sqlite3-src v0.5.1
Checking prodash v29.0.2
Checking base32 v0.4.0
Checking equivalent v1.0.1
Compiling serde_json v1.0.140
Checking base64ct v1.6.0
Checking sha1_smol v1.0.0
Checking ppv-lite86 v0.2.17
Checking gix-features v0.39.1
Checking pem-rfc7468 v0.7.0
Checking indexmap v2.2.6
Checking rand_chacha v0.3.1
Checking cypheraddr v0.4.0
Compiling git-ref-format-macro v0.3.1
Checking ghash v0.5.1
Checking pbkdf2 v0.12.2
Checking chacha20poly1305 v0.10.1
Checking ctr v0.9.2
Checking aes v0.8.4
Checking ryu v1.0.17
Checking aes-gcm v0.10.3
Checking git-ref-format v0.3.1
Checking noise-framework v0.4.0
Checking crossbeam-channel v0.5.15
Checking socks5-client v0.4.1
Checking rand v0.8.5
Checking ssh-encoding v0.2.0
Checking blowfish v0.9.1
Checking cbc v0.1.2
Compiling ref-cast v1.0.24
Checking radicle-std-ext v0.1.0
Checking home v0.5.9
Checking gix-path v0.10.15
Checking ssh-cipher v0.2.0
Checking bcrypt-pbkdf v0.10.0
Checking cyphernet v0.5.2
Compiling ref-cast-impl v1.0.24
Checking signature v2.2.0
Checking ssh-key v0.6.6
Checking qcheck v1.0.0
Checking radicle-ssh v0.9.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-ssh)
Checking lazy_static v1.5.0
Compiling typeid v1.0.3
Checking dyn-clone v1.0.17
Checking siphasher v1.0.1
Checking nonempty v0.9.0
Compiling serde_derive_internals v0.29.1
Checking radicle-dag v0.10.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-dag)
Checking erased-serde v0.4.6
Checking jiff v0.2.1
Compiling schemars_derive v1.0.4
Checking iana-time-zone v0.1.60
Checking chrono v0.4.38
Checking gix-date v0.9.4
Checking schemars v1.0.4
Checking serde-untagged v0.1.7
Checking colored v2.1.0
Checking localtime v1.3.1
Checking bytesize v2.0.1
Checking winnow v0.6.26
Checking tree-sitter-language v0.1.2
Checking fast-glob v0.3.3
Checking base64 v0.21.7
Checking gix-hashtable v0.6.0
Checking gix-validate v0.9.4
Checking anstyle-query v1.0.2
Checking memmap2 v0.9.4
Compiling anyhow v1.0.82
Checking gix-actor v0.33.2
Checking gix-object v0.46.1
Compiling rustix v1.0.7
Checking gix-chunk v0.4.11
Checking linux-raw-sys v0.9.4
Checking gix-commitgraph v0.25.1
Checking gix-revwalk v0.17.0
Checking gix-fs v0.12.1
Checking sem_safe v0.2.0
Checking errno v0.3.13
Checking signals_receipts v0.2.0
Checking gix-tempfile v15.0.0
Compiling signal-hook v0.3.18
Checking signal-hook-registry v1.4.5
Checking shell-words v1.1.0
Checking gix-command v0.4.1
Checking radicle-signals v0.11.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-signals)
Compiling tree-sitter v0.24.4
Checking mio v1.0.4
Checking mio v0.8.11
Checking utf8parse v0.2.1
Compiling unicode-segmentation v1.11.0
Compiling convert_case v0.7.1
Checking signal-hook-mio v0.2.4
Checking anstyle-parse v0.2.3
Checking gix-lock v15.0.1
Checking gix-url v0.28.2
Checking gix-config-value v0.14.12
Checking gix-quote v0.4.15
Checking regex v1.11.1
Checking gix-sec v0.10.12
Checking colorchoice v1.0.0
Checking anstyle v1.0.6
Checking anstream v0.6.13
Checking gix-prompt v0.9.1
Compiling xattr v1.3.1
Compiling derive_more-impl v2.0.1
Compiling filetime v0.2.23
Checking gix-revision v0.31.1
Checking gix-traverse v0.43.1
Checking gix-diff v0.49.0
Checking gix-packetline v0.18.4
Compiling litrs v0.4.1
Checking lexopt v0.3.0
Checking bitflags v1.3.2
Checking crossterm v0.25.0
Compiling document-features v0.2.11
Checking gix-pack v0.56.0
Checking gix-transport v0.44.0
Checking derive_more v2.0.1
Checking gix-refspec v0.27.0
Compiling tar v0.4.40
Checking gix-credentials v0.26.0
Checking newline-converter v0.3.0
Checking gix-shallow v0.1.0
Checking gix-ref v0.49.1
Checking gix-negotiate v0.17.0
Checking fxhash v0.2.1
Compiling maybe-async v0.2.10
Checking unicode-width v0.1.11
Checking arc-swap v1.7.1
Checking streaming-iterator v0.1.9
Checking sqlite3-sys v0.15.2
Checking sqlite v0.32.0
Checking gix-odb v0.66.0
Checking inquire v0.7.5
Checking gix-protocol v0.47.0
Compiling radicle-surf v0.22.0
Checking crossterm v0.29.0
Checking unicode-display-width v0.3.0
Compiling tree-sitter-typescript v0.23.2
Compiling tree-sitter-html v0.23.2
Compiling tree-sitter-c v0.23.2
Compiling tree-sitter-md v0.3.2
Compiling tree-sitter-rust v0.23.2
Compiling tree-sitter-json v0.24.8
Compiling tree-sitter-go v0.23.4
Compiling tree-sitter-css v0.23.1
Compiling tree-sitter-ruby v0.23.1
Compiling tree-sitter-toml-ng v0.6.0
Compiling tree-sitter-python v0.23.4
Compiling tree-sitter-bash v0.23.3
Checking either v1.11.0
Checking snapbox-macros v0.3.8
Checking salsa20 v0.10.2
Checking normalize-line-endings v0.3.0
Checking nonempty v0.5.0
Compiling radicle-cli v0.14.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-cli)
Checking siphasher v0.3.11
Checking base64 v0.13.1
Checking similar v2.5.0
Checking bloomy v1.2.0
Checking scrypt v0.11.0
Checking snapbox v0.4.17
Checking tree-sitter-highlight v0.24.4
Checking systemd-journal-logger v2.2.2
Checking popol v3.0.0
Checking bytes v1.10.1
Checking timeago v0.4.2
Checking io-reactor v0.5.2
Checking socket2 v0.5.7
Compiling radicle-node v0.12.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-node)
Checking diff v0.1.13
Checking yansi v0.5.1
Checking pretty_assertions v1.4.0
Checking netservices v0.8.0
Checking radicle-systemd v0.9.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-systemd)
Checking num-integer v0.1.46
Compiling escargot v0.5.10
Compiling qcheck-macros v1.0.0
Checking num-bigint v0.4.6
Compiling ahash v0.8.11
Compiling radicle-remote-helper v0.11.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-remote-helper)
Checking num-iter v0.1.45
Checking num-complex v0.4.6
Checking env_filter v0.1.3
Checking borrow-or-share v0.2.2
Checking bit-vec v0.8.0
Checking zerocopy v0.7.35
Checking bit-set v0.8.0
Checking num-rational v0.4.2
Checking fluent-uri v0.3.2
Checking num v0.4.3
Checking env_logger v0.11.8
Checking phf_shared v0.11.3
Compiling test-log-macros v0.2.18
Checking vsimd v0.8.0
Checking outref v0.5.2
Checking uuid v1.16.0
Checking phf v0.11.3
Checking uuid-simd v0.8.0
Checking referencing v0.30.0
Checking test-log v0.2.18
Checking fraction v0.15.3
Checking fancy-regex v0.14.0
Checking email_address v0.2.9
Checking num-cmp v0.1.0
Checking bytecount v0.6.8
Checking base64 v0.22.1
Checking emojis v0.6.4
Checking jsonschema v0.30.0
Checking git2 v0.19.0
Checking radicle-git-ext v0.8.1
Checking radicle-term v0.13.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-term)
Checking radicle-crypto v0.12.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-crypto)
Checking radicle-cob v0.14.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-cob)
Checking radicle v0.16.1 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle)
Checking radicle-fetch v0.12.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-fetch)
Checking radicle-cli-test v0.11.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-cli-test)
Checking radicle-schemars v0.1.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-schemars)
Checking radicle-protocol v0.1.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-protocol)
Finished `dev` profile [unoptimized + debuginfo] target(s) in 47.12s
+ cargo build --all-targets --workspace
Compiling cfg-if v1.0.0
Compiling libc v0.2.174
Compiling shlex v1.3.0
Compiling memchr v2.7.2
Compiling serde v1.0.219
Compiling smallvec v1.13.2
Compiling log v0.4.27
Compiling jobserver v0.1.31
Compiling getrandom v0.2.15
Compiling cc v1.2.2
Compiling aho-corasick v1.1.3
Compiling regex-syntax v0.8.5
Compiling typenum v1.17.0
Compiling regex-automata v0.4.9
Compiling generic-array v0.14.7
Compiling rand_core v0.6.4
Compiling bitflags v2.9.1
Compiling crypto-common v0.1.6
Compiling fastrand v2.1.0
Compiling scopeguard v1.2.0
Compiling lock_api v0.4.11
Compiling zerofrom v0.1.6
Compiling parking_lot_core v0.9.9
Compiling subtle v2.5.0
Compiling stable_deref_trait v1.2.0
Compiling yoke v0.7.5
Compiling parking_lot v0.12.3
Compiling once_cell v1.21.3
Compiling tinyvec_macros v0.1.1
Compiling tinyvec v1.6.0
Compiling zerovec v0.10.4
Compiling zeroize v1.7.0
Compiling cpufeatures v0.2.12
Compiling writeable v0.5.5
Compiling unicode-normalization v0.1.23
Compiling tinystr v0.7.6
Compiling litemap v0.7.5
Compiling block-padding v0.3.3
Compiling thiserror v2.0.12
Compiling icu_locid v1.5.0
Compiling inout v0.1.3
Compiling icu_locid_transform_data v1.5.1
Compiling block-buffer v0.10.4
Compiling adler2 v2.0.0
Compiling hashbrown v0.14.3
Compiling itoa v1.0.11
Compiling bstr v1.9.1
Compiling icu_provider v1.5.0
Compiling miniz_oxide v0.8.8
Compiling digest v0.10.7
Compiling icu_locid_transform v1.5.0
Compiling cipher v0.4.4
Compiling icu_properties_data v1.5.1
Compiling crc32fast v1.4.0
Compiling icu_collections v1.5.0
Compiling icu_normalizer_data v1.5.1
Compiling write16 v1.0.0
Compiling utf16_iter v1.0.5
Compiling icu_properties v1.5.1
Compiling utf8_iter v1.0.4
Compiling percent-encoding v2.3.1
Compiling linux-raw-sys v0.4.13
Compiling thiserror v1.0.69
Compiling sha2 v0.10.8
Compiling rustix v0.38.34
Compiling form_urlencoded v1.2.1
Compiling icu_normalizer v1.5.0
Compiling universal-hash v0.5.1
Compiling idna_adapter v1.2.0
Compiling opaque-debug v0.3.1
Compiling idna v1.0.3
Compiling libz-sys v1.1.16
Compiling url v2.5.4
Compiling gix-trace v0.1.12
Compiling tempfile v3.10.1
Compiling amplify_num v0.5.2
Compiling ascii v1.1.0
Compiling signature v1.6.4
Compiling data-encoding v2.5.0
Compiling ed25519 v1.5.3
Compiling libgit2-sys v0.17.0+1.8.1
Compiling aead v0.5.2
Compiling data-encoding-macro v0.1.14
Compiling faster-hex v0.9.0
Compiling base-x v0.2.11
Compiling byteorder v1.5.0
Compiling amplify v4.6.0
Compiling ct-codecs v1.1.1
Compiling multibase v0.9.1
Compiling ec25519 v0.1.0
Compiling poly1305 v0.8.0
Compiling chacha20 v0.9.1
Compiling gix-utils v0.1.14
Compiling cyphergraphy v0.3.0
Compiling num-traits v0.2.19
Compiling gix-hash v0.15.1
Compiling keccak v0.1.5
Compiling same-file v1.0.6
Compiling walkdir v2.5.0
Compiling sha3 v0.10.8
Compiling polyval v0.6.2
Compiling git-ref-format-core v0.3.1
Compiling flate2 v1.1.1
Compiling hmac v0.12.1
Compiling sqlite3-src v0.5.1
Compiling prodash v29.0.2
Compiling base64ct v1.6.0
Compiling ppv-lite86 v0.2.17
Compiling equivalent v1.0.1
Compiling base32 v0.4.0
Compiling sha1_smol v1.0.0
Compiling rand_chacha v0.3.1
Compiling gix-features v0.39.1
Compiling cypheraddr v0.4.0
Compiling indexmap v2.2.6
Compiling pem-rfc7468 v0.7.0
Compiling git-ref-format-macro v0.3.1
Compiling pbkdf2 v0.12.2
Compiling ghash v0.5.1
Compiling crossbeam-utils v0.8.19
Compiling chacha20poly1305 v0.10.1
Compiling ctr v0.9.2
Compiling aes v0.8.4
Compiling ryu v1.0.17
Compiling serde_json v1.0.140
Compiling aes-gcm v0.10.3
Compiling git-ref-format v0.3.1
Compiling noise-framework v0.4.0
Compiling crossbeam-channel v0.5.15
Compiling ssh-encoding v0.2.0
Compiling socks5-client v0.4.1
Compiling rand v0.8.5
Compiling blowfish v0.9.1
Compiling cbc v0.1.2
Compiling home v0.5.9
Compiling radicle-std-ext v0.1.0
Compiling gix-path v0.10.15
Compiling ssh-cipher v0.2.0
Compiling bcrypt-pbkdf v0.10.0
Compiling cyphernet v0.5.2
Compiling signature v2.2.0
Compiling ssh-key v0.6.6
Compiling ref-cast v1.0.24
Compiling qcheck v1.0.0
Compiling radicle-ssh v0.9.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-ssh)
Compiling dyn-clone v1.0.17
Compiling lazy_static v1.5.0
Compiling siphasher v1.0.1
Compiling typeid v1.0.3
Compiling radicle-dag v0.10.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-dag)
Compiling nonempty v0.9.0
Compiling erased-serde v0.4.6
Compiling iana-time-zone v0.1.60
Compiling jiff v0.2.1
Compiling serde-untagged v0.1.7
Compiling chrono v0.4.38
Compiling schemars v1.0.4
Compiling colored v2.1.0
Compiling gix-date v0.9.4
Compiling bytesize v2.0.1
Compiling localtime v1.3.1
Compiling winnow v0.6.26
Compiling tree-sitter-language v0.1.2
Compiling base64 v0.21.7
Compiling fast-glob v0.3.3
Compiling gix-actor v0.33.2
Compiling gix-hashtable v0.6.0
Compiling gix-validate v0.9.4
Compiling anstyle-query v1.0.2
Compiling memmap2 v0.9.4
Compiling gix-object v0.46.1
Compiling gix-chunk v0.4.11
Compiling linux-raw-sys v0.9.4
Compiling rustix v1.0.7
Compiling gix-commitgraph v0.25.1
Compiling gix-revwalk v0.17.0
Compiling anyhow v1.0.82
Compiling gix-fs v0.12.1
Compiling errno v0.3.13
Compiling sem_safe v0.2.0
Compiling unicode-segmentation v1.11.0
Compiling signals_receipts v0.2.0
Compiling gix-tempfile v15.0.0
Compiling signal-hook-registry v1.4.5
Compiling shell-words v1.1.0
Compiling gix-command v0.4.1
Compiling signal-hook v0.3.18
Compiling radicle-signals v0.11.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-signals)
Compiling tree-sitter v0.24.4
Compiling mio v1.0.4
Compiling mio v0.8.11
Compiling utf8parse v0.2.1
Compiling signal-hook-mio v0.2.4
Compiling anstyle-parse v0.2.3
Compiling gix-lock v15.0.1
Compiling convert_case v0.7.1
Compiling gix-url v0.28.2
Compiling sqlite3-sys v0.15.2
Compiling sqlite v0.32.0
Compiling gix-config-value v0.14.12
Compiling gix-quote v0.4.15
Compiling regex v1.11.1
Compiling gix-sec v0.10.12
Compiling colorchoice v1.0.0
Compiling anstyle v1.0.6
Compiling gix-prompt v0.9.1
Compiling anstream v0.6.13
Compiling derive_more-impl v2.0.1
Compiling xattr v1.3.1
Compiling gix-traverse v0.43.1
Compiling gix-revision v0.31.1
Compiling gix-diff v0.49.0
Compiling gix-packetline v0.18.4
Compiling filetime v0.2.23
Compiling lexopt v0.3.0
Compiling bitflags v1.3.2
Compiling crossterm v0.25.0
Compiling gix-transport v0.44.0
Compiling tar v0.4.40
Compiling derive_more v2.0.1
Compiling gix-pack v0.56.0
Compiling gix-refspec v0.27.0
Compiling gix-credentials v0.26.0
Compiling gix-shallow v0.1.0
Compiling gix-ref v0.49.1
Compiling newline-converter v0.3.0
Compiling gix-negotiate v0.17.0
Compiling fxhash v0.2.1
Compiling unicode-width v0.1.11
Compiling arc-swap v1.7.1
Compiling streaming-iterator v0.1.9
Compiling gix-odb v0.66.0
Compiling inquire v0.7.5
Compiling gix-protocol v0.47.0
Compiling radicle-surf v0.22.0
Compiling crossterm v0.29.0
Compiling unicode-display-width v0.3.0
Compiling tree-sitter-bash v0.23.3
Compiling tree-sitter-json v0.24.8
Compiling tree-sitter-html v0.23.2
Compiling tree-sitter-typescript v0.23.2
Compiling tree-sitter-toml-ng v0.6.0
Compiling tree-sitter-c v0.23.2
Compiling tree-sitter-rust v0.23.2
Compiling tree-sitter-md v0.3.2
Compiling tree-sitter-ruby v0.23.1
Compiling tree-sitter-css v0.23.1
Compiling tree-sitter-go v0.23.4
Compiling tree-sitter-python v0.23.4
Compiling either v1.11.0
Compiling snapbox-macros v0.3.8
Compiling salsa20 v0.10.2
Compiling radicle-cli v0.14.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-cli)
Compiling siphasher v0.3.11
Compiling normalize-line-endings v0.3.0
Compiling similar v2.5.0
Compiling nonempty v0.5.0
Compiling base64 v0.13.1
Compiling snapbox v0.4.17
Compiling bloomy v1.2.0
Compiling scrypt v0.11.0
Compiling tree-sitter-highlight v0.24.4
Compiling systemd-journal-logger v2.2.2
Compiling popol v3.0.0
Compiling timeago v0.4.2
Compiling bytes v1.10.1
Compiling io-reactor v0.5.2
Compiling socket2 v0.5.7
Compiling yansi v0.5.1
Compiling diff v0.1.13
Compiling radicle-node v0.12.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-node)
Compiling pretty_assertions v1.4.0
Compiling netservices v0.8.0
Compiling radicle-systemd v0.9.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-systemd)
Compiling num-integer v0.1.46
Compiling escargot v0.5.10
Compiling num-bigint v0.4.6
Compiling radicle-remote-helper v0.11.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-remote-helper)
Compiling num-iter v0.1.45
Compiling num-complex v0.4.6
Compiling env_filter v0.1.3
Compiling borrow-or-share v0.2.2
Compiling bit-vec v0.8.0
Compiling zerocopy v0.7.35
Compiling num-rational v0.4.2
Compiling ahash v0.8.11
Compiling num v0.4.3
Compiling bit-set v0.8.0
Compiling fluent-uri v0.3.2
Compiling env_logger v0.11.8
Compiling phf_shared v0.11.3
Compiling outref v0.5.2
Compiling vsimd v0.8.0
Compiling uuid v1.16.0
Compiling referencing v0.30.0
Compiling test-log v0.2.18
Compiling uuid-simd v0.8.0
Compiling phf v0.11.3
Compiling fancy-regex v0.14.0
Compiling fraction v0.15.3
Compiling email_address v0.2.9
Compiling bytecount v0.6.8
Compiling num-cmp v0.1.0
Compiling base64 v0.22.1
Compiling emojis v0.6.4
Compiling jsonschema v0.30.0
Compiling git2 v0.19.0
Compiling radicle-git-ext v0.8.1
Compiling radicle-term v0.13.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-term)
Compiling radicle-crypto v0.12.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-crypto)
Compiling radicle-cob v0.14.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-cob)
Compiling radicle v0.16.1 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle)
Compiling radicle-fetch v0.12.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-fetch)
Compiling radicle-protocol v0.1.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-protocol)
Compiling radicle-cli-test v0.11.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-cli-test)
Compiling radicle-schemars v0.1.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-schemars)
Finished `dev` profile [unoptimized + debuginfo] target(s) in 1m 12s
+ cargo doc --workspace --no-deps
Checking regex-automata v0.4.9
Compiling syn v1.0.109
Checking idna v1.0.3
Checking radicle-ssh v0.9.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-ssh)
Checking url v2.5.4
Compiling num-traits v0.2.19
Checking git2 v0.19.0
Checking radicle-dag v0.10.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-dag)
Checking chrono v0.4.38
Checking bstr v1.9.1
Compiling amplify_syn v2.0.1
Compiling data-encoding-macro-internal v0.1.12
Compiling proc-macro-error v1.0.4
Checking gix-path v0.10.15
Compiling git-ref-format-macro v0.3.1
Compiling amplify_derive v4.0.0
Checking git-ref-format-core v0.3.1
Checking data-encoding-macro v0.1.14
Checking multibase v0.9.1
Checking gix-date v0.9.4
Checking gix-validate v0.9.4
Checking git-ref-format v0.3.1
Checking gix-actor v0.33.2
Checking gix-commitgraph v0.25.1
Checking radicle-git-ext v0.8.1
Checking gix-object v0.46.1
Checking gix-command v0.4.1
Checking radicle-signals v0.11.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-signals)
Checking regex v1.11.1
Checking gix-url v0.28.2
Checking gix-config-value v0.14.12
Checking tree-sitter v0.24.4
Checking gix-revwalk v0.17.0
Checking gix-quote v0.4.15
Checking gix-traverse v0.43.1
Checking gix-revision v0.31.1
Checking gix-prompt v0.9.1
Checking gix-diff v0.49.0
Checking gix-packetline v0.18.4
Checking radicle-surf v0.22.0
Checking gix-refspec v0.27.0
Checking gix-transport v0.44.0
Checking amplify v4.6.0
Compiling radicle-cli v0.14.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-cli)
Checking gix-pack v0.56.0
Checking gix-credentials v0.26.0
Checking tree-sitter-toml-ng v0.6.0
Checking tree-sitter-highlight v0.24.4
Checking cyphergraphy v0.3.0
Checking gix-negotiate v0.17.0
Checking cypheraddr v0.4.0
Checking noise-framework v0.4.0
Checking gix-ref v0.49.1
Checking socks5-client v0.4.1
Checking gix-shallow v0.1.0
Checking cyphernet v0.5.2
Checking radicle-crypto v0.12.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-crypto)
Checking radicle-term v0.13.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-term)
Checking radicle-cob v0.14.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-cob)
Checking gix-odb v0.66.0
Checking gix-protocol v0.47.0
Checking io-reactor v0.5.2
Compiling radicle-node v0.12.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-node)
Checking netservices v0.8.0
Checking radicle v0.16.1 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle)
Checking radicle-systemd v0.9.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-systemd)
Documenting radicle v0.16.1 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle)
Documenting radicle-systemd v0.9.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-systemd)
Documenting radicle-cob v0.14.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-cob)
Documenting radicle-crypto v0.12.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-crypto)
Documenting radicle-term v0.13.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-term)
Documenting radicle-signals v0.11.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-signals)
Documenting radicle-ssh v0.9.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-ssh)
Documenting radicle-dag v0.10.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-dag)
Checking radicle-fetch v0.12.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-fetch)
Documenting radicle-cli v0.14.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-cli)
Documenting radicle-cli-test v0.11.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-cli-test)
Checking radicle-protocol v0.1.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-protocol)
Documenting radicle-protocol v0.1.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-protocol)
Documenting radicle-node v0.12.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-node)
Documenting radicle-fetch v0.12.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-fetch)
Documenting radicle-schemars v0.1.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-schemars)
Documenting radicle-remote-helper v0.11.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-remote-helper)
Checking radicle-remote-helper v0.11.0 (/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-remote-helper)
Finished `dev` profile [unoptimized + debuginfo] target(s) in 12.75s
Generated /7f225445-b738-4217-acc5-3483542e3b15/w/target/doc/radicle/index.html and 16 other files
+ cargo test --workspace --no-fail-fast
Finished `test` profile [unoptimized + debuginfo] target(s) in 0.17s
Running unittests src/lib.rs (target/debug/deps/radicle-da482c2d6eaacf74)
running 215 tests
test canonical::formatter::test::ascii_control_characters ... ok
test canonical::formatter::test::ordered_nested_object ... ok
test canonical::formatter::test::securesystemslib_asserts ... ok
test cob::cache::migrations::_2::tests::test_patch_json_deserialization ... ok
test cob::cache::migrations::_2::tests::test_migration_2 ... ok
test cob::cache::tests::test_check_version ... ok
test cob::common::test::test_color ... ok
test cob::common::test::test_emojis ... ok
test cob::cache::tests::test_migrate_to ... ok
test cob::identity::test::prop_json_eq_str ... ok
test cob::identity::test::test_identity_redact_revision ... ok
test cob::identity::test::test_identity_update_rejected ... ok
test cob::identity::test::test_identity_updates ... ok
test cob::identity::test::test_identity_remove_delegate_concurrent ... ok
test cob::identity::test::test_identity_reject_concurrent ... ok
test cob::issue::cache::tests::test_counts ... ok
test cob::issue::cache::tests::test_get ... ok
test cob::issue::cache::tests::test_is_empty ... ok
test cob::issue::cache::tests::test_list ... ok
test cob::issue::cache::tests::test_list_by_status ... ok
test cob::issue::cache::tests::test_remove ... ok
test cob::identity::test::test_identity_updates_concurrent ... ok
test cob::identity::test::test_valid_identity ... ok
test cob::issue::test::test_embeds ... ok
test cob::issue::test::test_embeds_edit ... ok
test cob::identity::test::test_identity_updates_concurrent_outdated ... ok
test cob::issue::test::test_invalid_actions ... ok
test cob::issue::test::test_invalid_cob ... ok
test cob::issue::test::test_concurrency ... ok
test cob::issue::test::test_invalid_tx ... ok
test cob::issue::test::test_invalid_tx_reference ... ok
test cob::issue::test::test_issue_comment ... ok
test cob::issue::test::test_issue_all ... ok
test cob::issue::test::test_issue_create_and_assign ... ok
test cob::issue::test::test_issue_comment_redact ... ok
test cob::issue::test::test_issue_create_and_change_state ... ok
test cob::issue::test::test_issue_create_and_get ... ok
test cob::issue::test::test_issue_create_and_reassign ... ok
test cob::issue::test::test_issue_create_and_unassign ... ok
test cob::issue::test::test_issue_edit ... ok
test cob::issue::test::test_issue_edit_description ... ok
test cob::issue::test::test_issue_label ... ok
test cob::issue::test::test_issue_state_serde ... ok
test cob::issue::test::test_ordering ... ok
test cob::patch::actions::test::test_review_comment ... ok
test cob::patch::actions::test::test_review_edit ... ok
test cob::patch::actions::test::test_revision_comment ... ok
test cob::patch::actions::test::test_revision_react ... ok
test cob::issue::test::test_issue_multilines ... ok
test cob::issue::test::test_issue_react ... ok
test cob::issue::test::test_issue_reply ... ok
test cob::patch::cache::tests::test_is_empty ... ok
test cob::patch::cache::tests::test_list ... ok
test cob::patch::cache::tests::test_get ... ok
test cob::patch::cache::tests::test_counts ... ok
test cob::patch::encoding::review::test::test_review_deserialize_summary_migration_null_summary ... ok
test cob::patch::encoding::review::test::test_review_deserialize_summary_migration_with_summary ... ok
test cob::patch::encoding::review::test::test_review_deserialize_summary_migration_without_summary ... ok
test cob::patch::encoding::review::test::test_review_deserialize_summary_v2 ... ok
test cob::patch::encoding::review::test::test_review_summary ... ok
test cob::patch::encoding::revision::test::test_location_v1_to_v2_migration ... ok
test cob::patch::encoding::revision::test::test_location_v2_preserved ... ok
test cob::patch::encoding::revision::test::test_revision_deserialize_mixed_locations ... ok
test cob::patch::encoding::revision::test::test_revision_deserialize_v1_location_migration ... ok
test cob::patch::encoding::revision::test::test_revision_deserialize_v2_location_preserved ... ok
test cob::patch::test::test_json ... ok
test cob::patch::test::test_json_serialization ... ok
test cob::patch::cache::tests::test_remove ... ok
test cob::patch::test::test_patch_create_and_get ... ok
test cob::patch::cache::tests::test_list_by_status ... ok
test cob::patch::test::test_patch_discussion ... ok
test cob::patch::test::test_patch_merge ... ok
test cob::patch::test::test_patch_redact ... ok
test cob::patch::test::test_patch_review ... ok
test cob::patch::test::test_patch_review_comment ... ok
test cob::patch::cache::tests::test_find_by_revision ... ok
test cob::patch::test::test_patch_review_duplicate ... ok
test cob::patch::test::test_patch_review_edit_comment ... ok
test cob::patch::test::test_patch_review_edit ... ok
test cob::patch::test::test_reactions_json_serialization ... ok
test cob::patch::test::test_revision_edit_redact ... ok
test cob::patch::test::test_revision_reaction ... ok
test cob::patch::test::test_patch_review_remove_summary ... ok
test cob::patch::test::test_revision_review_merge_redacted ... ok
test cob::thread::tests::test_comment_edit_missing ... ok
test cob::thread::tests::test_comment_edit_redacted ... ok
test cob::thread::tests::test_comment_redact_missing ... ok
test cob::thread::tests::test_duplicate_comments ... ok
test cob::thread::tests::test_edit_comment ... ok
test cob::thread::tests::test_redact_comment ... ok
test cob::thread::tests::test_timeline ... ok
test git::canonical::rules::tests::test_canonical ... ok
test git::canonical::rules::tests::test_deserialization ... ok
test git::canonical::rules::tests::test_deserialize_extensions ... ok
test git::canonical::rules::tests::test_order ... ok
test git::canonical::rules::tests::test_roundtrip ... ok
test cob::patch::test::test_patch_review_revision_redact ... ok
test git::canonical::rules::tests::test_rule_validate_success ... ok
test git::canonical::rules::tests::test_special_branches ... ok
test cob::patch::test::test_patch_update ... ok
test git::canonical::tests::test_quorum_groups ... ok
test git::canonical::tests::test_quorum_merges ... ok
test git::canonical::tests::test_quorum ... ok
test git::canonical::rules::tests::test_rule_validate_failures ... ok
test git::canonical::tests::test_quorum_tag ... ok
test git::test::test_version_from_str ... ok
test git::test::test_version_ord ... ok
test identity::did::test::test_did_encode_decode ... ok
test identity::did::test::test_did_vectors ... ok
test identity::doc::id::test::prop_from_str ... ok
test identity::doc::test::test_canonical_doc ... ok
test identity::doc::test::test_canonical_example ... ok
test identity::doc::test::test_duplicate_dids ... ok
test identity::doc::test::test_future_version_error ... ok
test identity::doc::test::test_is_valid_version ... ok
test identity::doc::test::test_max_delegates ... ok
test identity::doc::test::test_not_found ... ok
test identity::doc::test::test_parse_version ... ok
test identity::doc::test::test_visibility_json ... ok
test identity::doc::update::test::test_can_update_crefs ... ok
test identity::doc::update::test::test_cannot_include_default_branch_rule ... ok
test identity::doc::update::test::test_default_branch_rule_exists_after_verification ... ok
test identity::project::test::test_project_name ... ok
test git::canonical::tests::test_quorum_properties ... ok
test node::address::store::test::test_alias ... ok
test node::address::store::test::test_disconnected ... ok
test node::address::store::test::test_disconnected_ban ... ok
test node::address::store::test::test_entries ... ok
test node::address::store::test::test_get_none ... ok
test node::address::store::test::test_insert_and_get ... ok
test node::address::store::test::test_insert_and_remove ... ok
test node::address::store::test::test_insert_and_update ... ok
test node::address::store::test::test_insert_duplicate ... ok
test node::address::store::test::test_node_aliases ... ok
test node::address::store::test::test_remove_nothing ... ok
test node::db::test::test_version ... ok
test node::features::test::test_operations ... ok
test node::notifications::store::test::test_branch_notifications ... ok
test node::notifications::store::test::test_clear ... ok
test node::notifications::store::test::test_cob_notifications ... ok
test node::notifications::store::test::test_counts_by_repo ... ok
test node::notifications::store::test::test_duplicate_notifications ... ok
test node::notifications::store::test::test_notification_status ... ok
test node::policy::store::test::test_follow_and_unfollow_node ... ok
test node::policy::store::test::test_node_aliases ... ok
test node::policy::store::test::test_node_policies ... ok
test node::policy::store::test::test_node_policy ... ok
test node::policy::store::test::test_repo_policies ... ok
test node::policy::store::test::test_repo_policy ... ok
test node::policy::store::test::test_seed_and_unseed_repo ... ok
test node::policy::store::test::test_update_alias ... ok
test node::policy::store::test::test_update_scope ... ok
test node::refs::store::test::test_count ... ok
test node::refs::store::test::test_set_and_delete ... ok
test node::refs::store::test::test_set_and_get ... ok
test node::routing::test::test_count ... ok
test node::routing::test::test_entries ... ok
test node::routing::test::test_insert_and_get ... ok
test node::routing::test::test_insert_and_get_resources ... ok
test cob::thread::tests::prop_ordering ... ok
test node::routing::test::test_insert_duplicate ... ok
test node::routing::test::test_insert_existing_updated_time ... ok
test node::routing::test::test_len ... ok
test node::routing::test::test_insert_and_remove ... ok
test node::routing::test::test_remove_many ... ok
test node::routing::test::test_remove_redundant ... ok
test node::routing::test::test_update_existing_multi ... ok
test node::sync::announce::test::announcer_must_reach_preferred_seeds ... ok
test node::routing::test::test_prune ... ok
test node::sync::announce::test::announcer_reached_max_replication_target ... ok
test node::sync::announce::test::announcer_reached_min_replication_target ... ok
test node::sync::announce::test::announcer_timed_out ... ok
test node::sync::announce::test::announcer_will_minimise_replication_factor ... ok
test node::sync::fetch::test::all_nodes_are_candidates ... ok
test node::sync::announce::test::cannot_construct_announcer ... ok
test node::sync::fetch::test::could_not_reach_target ... ok
test node::sync::fetch::test::ignores_duplicates_and_local_node ... ok
test node::sync::fetch::test::all_nodes_are_fetchable ... ok
test node::sync::fetch::test::preferred_seeds_target_returned_over_replicas ... ok
test node::sync::fetch::test::reaches_target_of_max_replicas ... ok
test node::sync::fetch::test::reaches_target_of_replicas ... ok
test node::sync::test::ensure_replicas_construction ... ok
test node::sync::test::replicas_constrain_to ... ok
test node::sync::fetch::test::reaches_target_of_preferred_seeds ... ok
test node::test::test_alias ... ok
test node::test::test_command_result ... ok
test node::test::test_user_agent ... ok
test node::timestamp::tests::test_timestamp_max ... ok
test profile::test::canonicalize_home ... ok
test profile::test::test_config ... ok
test node::address::store::test::test_empty ... ok
test rad::tests::test_checkout ... ok
test rad::tests::test_fork ... ok
test serde_ext::test::test_localtime ... ok
test serde_ext::test::test_localtime_ext ... ok
test rad::tests::test_init ... ok
test storage::git::tests::test_references_of ... ok
test profile::config::test::schema ... ok
test storage::git::transport::local::url::test::test_url_parse ... ok
test storage::git::transport::local::url::test::test_url_to_string ... ok
test storage::git::transport::remote::url::test::test_url_parse ... ok
test storage::refs::tests::prop_canonical_roundtrip ... ok
test storage::git::tests::test_sign_refs ... ok
test storage::tests::test_storage ... ok
test test::assert::test::assert_with_message ... ok
test test::assert::test::test_assert_no_move ... ok
test test::assert::test::test_assert_panic_0 - should panic ... ok
test test::assert::test::test_assert_panic_1 - should panic ... ok
test test::assert::test::test_assert_panic_2 - should panic ... ok
test test::assert::test::test_assert_succeed ... ok
test test::assert::test::test_panic_message ... ok
test version::test::test_version ... ok
test storage::git::tests::test_remote_refs ... ok
test storage::refs::tests::test_rid_verification ... ok
test identity::doc::test::prop_encode_decode ... ok
test result: ok. 215 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 2.57s
Running unittests src/lib.rs (target/debug/deps/radicle_cli-4eb230157f9cea8d)
running 14 tests
test commands::rad_inspect::test::test_tree ... ok
test commands::rad_patch::review::builder::tests::test_review_comments_multiline ... ok
test commands::rad_patch::review::builder::tests::test_review_comments_basic ... ok
test commands::rad_patch::review::builder::tests::test_review_comments_split_hunk ... ok
test git::pretty_diff::test::test_pretty ... ignored
test git::ddiff::tests::diff_encode_decode_ddiff_hunk ... ok
test commands::rad_patch::review::builder::tests::test_review_comments_before ... ok
test git::unified_diff::test::test_diff_content_encode_decode_content ... ok
test git::unified_diff::test::test_diff_encode_decode_diff ... ok
test terminal::format::test::test_bytes ... ok
test terminal::format::test::test_strip_comments ... ok
test terminal::patch::test::test_edit_display_message ... ok
test terminal::patch::test::test_create_display_message ... ok
test terminal::patch::test::test_update_display_message ... ok
test result: ok. 13 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out; finished in 0.01s
Running unittests src/main.rs (target/debug/deps/rad-8bccd21382c3ed99)
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running tests/commands.rs (target/debug/deps/commands-36c1443700b4d7b1)
running 101 tests
test framework_home ... ok
test git_push_and_fetch ... ok
test git_push_amend ... ok
test git_push_canonical_annotated_tags ... ok
test git_push_canonical_lightweight_tags ... ok
test git_push_diverge ... ok
test rad_auth ... ok
test rad_auth_errors ... ok
test rad_block ... ok
test git_push_rollback ... ok
test git_tag ... ok
test rad_checkout ... ok
test git_push_converge ... ok
test rad_clone ... ok
test rad_clean ... ok
test rad_clone_connect ... ok
test rad_clone_directory ... ok
test rad_clone_unknown ... ok
test rad_clone_all ... ok
test rad_cob_multiset ... ok
test rad_cob_log ... ok
test rad_cob_migrate ... ok
test rad_cob_show ... ok
test rad_cob_update_identity ... ok
test rad_clone_partial_fail ... ok
test rad_cob_update ... ok
test rad_config ... ok
test rad_diff ... ok
test rad_id_collaboration ... ignored, slow
test rad_id ... ok
test rad_id_conflict ... ok
test rad_id_missing_commits ... ok
test rad_id_private ... ok
test rad_id_multi_delegate ... ok
test rad_id_threshold_soft_fork ... ok
test rad_id_threshold ... ok
test rad_id_unknown_field ... ok
test rad_id_update_delete_field ... ok
test rad_init ... ignored, part of many other tests
test rad_init_detached_head ... ok
test rad_init_existing ... ok
test rad_init_no_git ... ok
test rad_init_no_seed ... ok
test rad_init_private ... ok
test rad_fetch ... ok
test rad_fork ... ok
test rad_inbox ... ok
test rad_init_private_clone ... ok
test rad_init_private_no_seed ... ok
test rad_init_sync_not_connected ... ok
test rad_init_private_clone_seed ... ok
test rad_init_private_seed ... ok
test rad_init_sync_preferred ... ok
test rad_init_with_existing_remote ... ok
test rad_inspect ... ok
test rad_issue ... ok
test rad_merge_after_update ... ok
test rad_merge_no_ff ... ok
test rad_merge_via_push ... ok
test rad_node_connect ... ok
test rad_node_connect_without_address ... ok
test rad_patch ... ok
test rad_node ... ok
test rad_patch_ahead_behind ... ok
test rad_patch_change_base ... ok
test rad_patch_checkout ... ok
test rad_patch_checkout_revision ... ok
test rad_patch_checkout_force ... ok
test rad_patch_detached_head ... ok
test rad_patch_diff ... ok
test rad_init_sync_and_clone ... ok
test rad_patch_draft ... ok
test rad_init_sync_timeout ... ok
test rad_patch_edit ... ok
test rad_patch_fetch_2 ... ok
test rad_patch_merge_draft ... ok
test rad_patch_fetch_1 ... ok
test rad_patch_delete ... ok
test rad_patch_revert_merge ... ok
test rad_patch_update ... ok
test rad_publish ... ok
test rad_patch_open_explore ... ok
test rad_patch_via_push ... ok
test rad_review_by_hunk ... ok
test rad_seed_and_follow ... ok
test rad_remote ... ok
test rad_self ... ok
test rad_seed_many ... ok
test rad_sync_without_node ... ok
test rad_push_and_pull_patches ... ok
test rad_unseed ... ok
test rad_warn_old_nodes ... ok
test rad_unseed_many ... ok
test rad_sync ... ok
test rad_watch ... ok
test test_clone_without_seeds ... ok
test test_cob_deletion ... ok
test test_cob_replication ... ok
test rad_workflow ... FAILED
test rad_patch_pull_update ... ok
test test_replication_via_seed ... ok
failures:
---- rad_workflow stdout ----
1788890555 test: Using PATH ["/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-cli/target/debug", "/usr/local/cargo/bin", "/usr/local/sbin", "/usr/local/bin", "/usr/sbin", "/usr/bin", "/sbin", "/bin", "/tmp/radicle-NGLGY6/work/alice"]
1788890555 test: 1-new-project.md: Running `/7f225445-b738-4217-acc5-3483542e3b15/w/target/debug/rad` with ["init", "--name", "heartwood", "--description", "Radicle Heartwood Protocol & Stack", "--no-confirm", "--public", "-v"] in `/tmp/radicle-NGLGY6/work/alice`..
1788890556 test: 1-new-project.md: Running `/7f225445-b738-4217-acc5-3483542e3b15/w/target/debug/rad` with ["init"] in `/tmp/radicle-NGLGY6/work/alice`..
1788890556 test: 1-new-project.md: Running `/7f225445-b738-4217-acc5-3483542e3b15/w/target/debug/rad` with ["ls"] in `/tmp/radicle-NGLGY6/work/alice`..
1788890556 test: 1-new-project.md: Running `/7f225445-b738-4217-acc5-3483542e3b15/w/target/debug/rad` with ["node", "inventory"] in `/tmp/radicle-NGLGY6/work/alice`..
1788890556 rad_workflow node: Opening policy database..
1788890556 rad_workflow node: Default seeding policy set to 'block (all)'
1788890556 rad_workflow node: Initializing service (Test)..
1788890556 rad_workflow node: Opening node database..
1788890556 rad_workflow node: Address book is empty. Adding bootstrap nodes..
1788890556 rad_workflow node: 0 nodes added to address book
1788890556 rad_workflow service: Init @1788890556109
1788890556 rad_workflow service: Empty refs database, populating from storage..
1788890556 rad_workflow service: Saved local sync status for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji..
1788890556 rad_workflow service: Adding refs announcement for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji to historical gossip messages..
1788890556 rad_workflow service: Not enough available peers to connect to (available=0, wanted=8)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> node: Listening on 0.0.0.0:43547..
1788890556 rad_workflow node: Binding control socket /tmp/radicle-NGLGY6/home/alice/.radicle/node/control.sock..
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <runtime> node: Running node z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi in /tmp/radicle-NGLGY6/home/alice/.radicle..
1788890556 rad_workflow node: Opening policy database..
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <control> control: Control thread listening on socket..
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Received command QueryState(..)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <signals> node: Signal notifications channel error: receiving on an empty and disconnected channel
1788890556 rad_workflow node: Default seeding policy set to 'block (all)'
1788890556 rad_workflow node: Initializing service (Test)..
1788890556 rad_workflow node: Opening node database..
1788890556 rad_workflow node: Address book is empty. Adding bootstrap nodes..
1788890556 rad_workflow node: 0 nodes added to address book
1788890556 rad_workflow service: Init @1788890556145
1788890556 rad_workflow service: Empty refs database, populating from storage..
1788890556 rad_workflow service: Not enough available peers to connect to (available=0, wanted=8)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> node: Listening on 0.0.0.0:34365..
1788890556 rad_workflow node: Binding control socket /tmp/radicle-NGLGY6/home/bob/.radicle/node/control.sock..
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <runtime> node: Running node z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk in /tmp/radicle-NGLGY6/home/bob/.radicle..
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <signals> node: Signal notifications channel error: receiving on an empty and disconnected channel
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Received command QueryState(..)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <control> control: Control thread listening on socket..
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Received command QueryState(..)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Received command Connect(z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi, 0.0.0.0:43547, ConnectOptions { persistent: false, timeout: 30s })
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Connecting to z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (0.0.0.0:43547)..
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Attempted connection to z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (0.0.0.0:43547)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Registering outbound transport for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (fd=581)..
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Outbound peer resource registered for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi with id=2 (fd=581)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Inbound connection from 127.0.0.1:38228 (fd=582)..
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Accepted inbound connection from 127.0.0.1:38228 (fd=582)..
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Inbound peer resource registered with id=2 (fd=582)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Session established with z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (id=2) (fd=581) (outbound)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Connected to z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (0.0.0.0:43547) (Outbound)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Subscribing to messages since timestamp 1788804156163..
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Session established with z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (id=2) (fd=582) (inbound)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Connected to z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (127.0.0.1:38228) (Inbound)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Subscribing to messages since timestamp 1788804156164..
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Received node announcement of z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk with 0 address(es) from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (t=1788890556145)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Received node announcement of z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi with 0 address(es) from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (t=1788890556109)
1788890556 test: Node z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi has converged
1788890556 test: Node has missing routes: [(RepoId(rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji), PublicKey(z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi))]
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Stored announcement from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi to be broadcast in 0 millisecond(s) (t=1788890556109)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Stored announcement from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk to be broadcast in 0 millisecond(s) (t=1788890556145)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Address store entry for node z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi updated at 1788890556109
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Received inventory announcement of z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi with 1 item(s) from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (t=1788890556111)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Address store entry for node z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk updated at 1788890556145
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Received inventory announcement of z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk with 0 item(s) from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (t=1788890556146)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Stored announcement from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi to be broadcast in 0 millisecond(s) (t=1788890556111)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Stored announcement from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk to be broadcast in 0 millisecond(s) (t=1788890556146)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Received subscription filter from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Routing table updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with seed z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Received subscription filter from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
1788890556 test: Node z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk has converged
1788890556 test: Using PATH ["/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-cli/target/debug", "/usr/local/cargo/bin", "/usr/local/sbin", "/usr/local/bin", "/usr/sbin", "/usr/bin", "/sbin", "/bin", "/tmp/radicle-NGLGY6/work/bob"]
1788890556 test: 2-cloning.md: Running `/7f225445-b738-4217-acc5-3483542e3b15/w/target/debug/rad` with ["clone", "rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji", "--scope", "followed"] in `/tmp/radicle-NGLGY6/work/bob`..
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <control> control: Received `{"command":"status"}` on control socket
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <control> control: Received `{"command":"seed","rid":"rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji","scope":"followed"}` on control socket
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Received command Seed(rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji, followed)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Sending subscription filter to z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Received subscription filter from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <control> control: Received `{"command":"seeds","rid":"rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji"}` on control socket
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Received command Seeds(rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Found 1 connected seed(s) and 0 disconnected seed(s) for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <control> control: Received `{"command":"session","nid":"z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"}` on control socket
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Received command QueryState(..)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <control> control: Received `{"command":"fetch","rid":"rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji","nid":"z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi","timeout":{"secs":9,"nanos":0}}` on control socket
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Received command Fetch(rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji, z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Fetch initiated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi [outbound connected] (all remotes)..
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Opened new stream with id 12 for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji and remote z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#0> worker: Worker processing outgoing fetch for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Received `open` command for stream 12 from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#0> worker: Worker processing incoming fetch for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk on stream 12..
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#0> worker: z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk cloning from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#0> worker: Spawning upload-pack process for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji on stream 12..
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#0> fetch: Fetched rad/id (6ms)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#0> fetch: Fetched data for 1 remote(s) (11ms)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#0> fetch: Fetched data refs for 1 remotes (16ms)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#0> fetch: Sent done signal to remote z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Received `end-of-file` on stream 12 from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#0> fetch: Validated 1 remote(s) (16ms)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#0> fetch: Applied updates (17ms)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#0> fetch: Finished clone of rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (30ms)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#0> cob: Loading object of type xyz.radicle.id at 0656c217f917c3e06234771e9ecae53aba5e173e
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <upload-pack> worker: Exiting upload-pack reader thread for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#0> worker: Upload pack finished (30ms)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#0> worker: Upload process on stream 12 exited with result Ok(())
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Received fetch result from worker for stream 12, remote z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk: Responder { rid: Some(RepoId(rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji)), result: Ok(()) }
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Stream 12 of z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk closing with 0 byte(s) sent and 0 byte(s) received
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Peer z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk fetched rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from us successfully
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#0> storage: Setting ref: refs/rad/id -> 0656c217f917c3e06234771e9ecae53aba5e173e
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Received `close` command for stream 12 from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Stream 12 of z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi closed with 0 byte(s) sent and 0 byte(s) received
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#0> storage: Setting ref: refs/heads/master -> f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#0> storage: Setting ref: HEAD -> refs/heads/master
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#0> cob: Loading object of type xyz.radicle.id at 0656c217f917c3e06234771e9ecae53aba5e173e
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Received fetch result from worker for stream 12, remote z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi: Initiator { rid: RepoId(rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji), result: Ok(FetchResult { updated: [Created { name: RefString("refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/rad/id"), oid: Oid(0656c217f917c3e06234771e9ecae53aba5e173e) }, Created { name: RefString("refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/rad/sigrefs"), oid: Oid(99c549702e2bcfe02b0e68d4a2224fb7a1524529) }, Created { name: RefString("refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/cobs/xyz.radicle.id/0656c217f917c3e06234771e9ecae53aba5e173e"), oid: Oid(0656c217f917c3e06234771e9ecae53aba5e173e) }, Created { name: RefString("refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/heads/master"), oid: Oid(f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354) }, Skipped { name: RefString("refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/rad/id"), oid: Oid(0656c217f917c3e06234771e9ecae53aba5e173e) }, Created { name: RefString("refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/rad/root"), oid: Oid(0656c217f917c3e06234771e9ecae53aba5e173e) }], namespaces: {PublicKey(z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi)}, clone: true, doc: DocAt { commit: Oid(0656c217f917c3e06234771e9ecae53aba5e173e), blob: Oid(d96f425412c9f8ad5d9a9a05c9831d0728e2338d), doc: Doc { version: Version(1), payload: {PayloadId(TypeName("xyz.radicle.project")): Payload { value: Object {"defaultBranch": String("master"), "description": String("Radicle Heartwood Protocol & Stack"), "name": String("heartwood")} }}, delegates: Delegates(NonEmpty { head: Did("did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"), tail: [] }), threshold: Threshold(1), visibility: Public } } }) }
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Found existing fetch request from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi, sending result..
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Sent fetch result for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi..
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Fetched rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi successfully
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Ref updated: * 0000000..0656c21 refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/rad/id for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Ref updated: * 0000000..99c5497 refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/rad/sigrefs for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Ref updated: * 0000000..0656c21 refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/cobs/xyz.radicle.id/0656c217f917c3e06234771e9ecae53aba5e173e for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Ref updated: * 0000000..f2de534 refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/heads/master for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Ref updated: * 0000000..0656c21 refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/rad/root for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Updating and announcing inventory for cloned repository rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji..
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Sending inventory announcement of z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk with 1 item(s) to z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (t=1788890556435)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Sending refs announcement of z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with 1 remote(s) to z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (t=1788890556436)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Received inventory announcement of z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk with 1 item(s) from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (t=1788890556435)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Stored announcement from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk to be broadcast in 0 millisecond(s) (t=1788890556435)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Routing table updated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with seed z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Received refs announcement of z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with 1 remote(s) from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (t=1788890556436)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Stored announcement from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk to be broadcast in 0 millisecond(s) (t=1788890556436)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Refs announcement of z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji contains our own remote at 99c549702e2bcfe02b0e68d4a2224fb7a1524529 (t=1788890556436)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Updating sync status of z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji to 99c549702e2bcfe02b0e68d4a2224fb7a1524529
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Skipping fetch for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji, all refs are already in storage
1788890556 test: 2-cloning.md: Running `cd /tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 test: 2-cloning.md: Running `ls` with [] in `/tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 test: 2-cloning.md: Running `cat` with ["README"] in `/tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 test: 2-cloning.md: Running `git` with ["status"] in `/tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 test: 2-cloning.md: Running `git` with ["branch", "--remotes"] in `/tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 test: 2-cloning.md: Running `git` with ["remote", "-v"] in `/tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 test: 2-cloning.md: Running `git` with ["log", "-n", "1"] in `/tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 test: 2-cloning.md: Running `/7f225445-b738-4217-acc5-3483542e3b15/w/target/debug/rad` with ["ls", "--seeded"] in `/tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 test: Using PATH ["/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-cli/target/debug", "/usr/local/cargo/bin", "/usr/local/sbin", "/usr/local/bin", "/usr/sbin", "/usr/bin", "/sbin", "/bin", "/tmp/radicle-NGLGY6/work/bob/heartwood"]
1788890556 test: 3-issues.md: Running `/7f225445-b738-4217-acc5-3483542e3b15/w/target/debug/rad` with ["issue", "open", "--title", "flux capacitor underpowered", "--description", "Flux capacitor power requirements exceed current supply", "--no-announce"] in `/tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 test: 3-issues.md: Running `/7f225445-b738-4217-acc5-3483542e3b15/w/target/debug/rad` with ["issue", "list"] in `/tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 test: 3-issues.md: Running `/7f225445-b738-4217-acc5-3483542e3b15/w/target/debug/rad` with ["issue", "comment", "9037b7a42323d4b79e6a48b7d05d3bbaae11d69b", "--message", "The flux capacitor needs 1.21 Gigawatts", "-q", "--no-announce"] in `/tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 test: Using PATH ["/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-cli/target/debug", "/usr/local/cargo/bin", "/usr/local/sbin", "/usr/local/bin", "/usr/sbin", "/usr/bin", "/sbin", "/bin", "/tmp/radicle-NGLGY6/work/bob/heartwood"]
1788890556 test: 4-patching-contributor.md: Running `git` with ["checkout", "-b", "flux-capacitor-power"] in `/tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 test: 4-patching-contributor.md: Running `touch` with ["REQUIREMENTS"] in `/tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 test: 4-patching-contributor.md: Running `git` with ["add", "REQUIREMENTS"] in `/tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 test: 4-patching-contributor.md: Running `git` with ["commit", "-v", "-m", "Define power requirements"] in `/tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 test: 4-patching-contributor.md: Running `git` with ["push", "rad", "-o", "no-sync", "-o", "patch.message=Define power requirements", "-o", "patch.message=See details.", "HEAD:refs/patches"] in `/tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 test: 4-patching-contributor.md: Running `/7f225445-b738-4217-acc5-3483542e3b15/w/target/debug/rad` with ["patch"] in `/tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 test: 4-patching-contributor.md: Running `/7f225445-b738-4217-acc5-3483542e3b15/w/target/debug/rad` with ["patch", "show", "e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46"] in `/tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 test: 4-patching-contributor.md: Running `git` with ["ls-remote", "rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk", "refs/heads/patches/*"] in `/tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 test: 4-patching-contributor.md: Running `touch` with ["README.md"] in `/tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 test: 4-patching-contributor.md: Running `git` with ["add", "README.md"] in `/tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 test: 4-patching-contributor.md: Running `git` with ["commit", "--message", "Add README, just for the fun"] in `/tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 test: 4-patching-contributor.md: Running `git` with ["push", "-o", "patch.message=Add README, just for the fun"] in `/tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 test: 4-patching-contributor.md: Running `/7f225445-b738-4217-acc5-3483542e3b15/w/target/debug/rad` with ["patch", "comment", "e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46", "--message", "I cannot wait to get back to the 90s!", "-q"] in `/tmp/radicle-NGLGY6/work/bob/heartwood`..
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <control> control: Received `{"command":"seeds","rid":"rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji"}` on control socket
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Received command Seeds(rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Found 1 connected seed(s) and 0 disconnected seed(s) for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <control> control: Received `{"command":"subscribe"}` on control socket
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <control> control: Received `{"command":"announceRefs","rid":"rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji"}` on control socket
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Received command AnnounceRefs(rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Announcing own refs for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji to peers (47f46882150506b54dc83146b9e20762b5dceda8) (t=1788890556915)..
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Saved local sync status for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji..
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Sending refs announcement of z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with 1 remote(s) to z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (t=1788890556915)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Received refs announcement of z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with 1 remote(s) from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (t=1788890556915)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Stored announcement from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk to be broadcast in 0 millisecond(s) (t=1788890556915)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Fetch initiated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk [inbound connected] (1 remote(s))..
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Opened new stream with id 13 for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji and remote z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#1> worker: Worker processing outgoing fetch for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#1> worker: z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi pulling from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Received `open` command for stream 13 from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#1> worker: Worker processing incoming fetch for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi on stream 13..
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#1> worker: Spawning upload-pack process for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji on stream 13..
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#1> fetch: Fetched rad/id (3ms)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#1> fetch: Fetched data for 1 remote(s) (14ms)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#1> fetch: Fetched data refs for 1 remotes (26ms)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#1> fetch: Sent done signal to remote z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Received `end-of-file` on stream 13 from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <upload-pack> worker: Exiting upload-pack reader thread for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#1> fetch: Validated 1 remote(s) (27ms)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#1> fetch: Applied updates (27ms)
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#1> fetch: Finished pull of rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji (36ms)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#1> worker: Upload pack finished (35ms)
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#1> worker: Upload process on stream 13 exited with result Ok(())
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Received fetch result from worker for stream 13, remote z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi: Responder { rid: Some(RepoId(rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji)), result: Ok(()) }
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Stream 13 of z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi closing with 0 byte(s) sent and 0 byte(s) received
1788890556 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Peer z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi fetched rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from us successfully
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Received `close` command for stream 13 from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Stream 13 of z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk closed with 0 byte(s) sent and 0 byte(s) received
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#1> cob: Loading object of type xyz.radicle.id at 0656c217f917c3e06234771e9ecae53aba5e173e
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#1> storage: Setting ref: refs/rad/id -> 0656c217f917c3e06234771e9ecae53aba5e173e
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#1> cob: Loading object of type xyz.radicle.id at 0656c217f917c3e06234771e9ecae53aba5e173e
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#1> cob: Loading object of type xyz.radicle.issue at 9037b7a42323d4b79e6a48b7d05d3bbaae11d69b
1788890556 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#1> cob: Loading object of type xyz.radicle.patch at e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Received fetch result from worker for stream 13, remote z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk: Initiator { rid: RepoId(rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji), result: Ok(FetchResult { updated: [Created { name: RefString("refs/namespaces/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk/refs/rad/sigrefs"), oid: Oid(47f46882150506b54dc83146b9e20762b5dceda8) }, Created { name: RefString("refs/namespaces/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk/refs/cobs/xyz.radicle.issue/9037b7a42323d4b79e6a48b7d05d3bbaae11d69b"), oid: Oid(400cb155f512b4880858bb05f935104c34167b28) }, Created { name: RefString("refs/namespaces/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk/refs/cobs/xyz.radicle.patch/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46"), oid: Oid(4830a8598c5f6ad9f4aa3acd701a61a380b0d275) }, Created { name: RefString("refs/namespaces/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk/refs/heads/patches/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46"), oid: Oid(27857ec9eb04c69cacab516e8bf4b5fd36090f66) }, Created { name: RefString("refs/namespaces/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk/refs/rad/root"), oid: Oid(0656c217f917c3e06234771e9ecae53aba5e173e) }], namespaces: {PublicKey(z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk)}, clone: false, doc: DocAt { commit: Oid(0656c217f917c3e06234771e9ecae53aba5e173e), blob: Oid(d96f425412c9f8ad5d9a9a05c9831d0728e2338d), doc: Doc { version: Version(1), payload: {PayloadId(TypeName("xyz.radicle.project")): Payload { value: Object {"defaultBranch": String("master"), "description": String("Radicle Heartwood Protocol & Stack"), "name": String("heartwood")} }}, delegates: Delegates(NonEmpty { head: Did("did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"), tail: [] }), threshold: Threshold(1), visibility: Public } } }) }
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Fetched rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk successfully
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Ref updated: * 0000000..47f4688 refs/namespaces/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk/refs/rad/sigrefs for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Ref updated: * 0000000..400cb15 refs/namespaces/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk/refs/cobs/xyz.radicle.issue/9037b7a42323d4b79e6a48b7d05d3bbaae11d69b for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Ref updated: * 0000000..4830a85 refs/namespaces/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk/refs/cobs/xyz.radicle.patch/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46 for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Ref updated: * 0000000..27857ec refs/namespaces/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk/refs/heads/patches/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46 for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Ref updated: * 0000000..0656c21 refs/namespaces/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk/refs/rad/root for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Sending refs announcement of z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with 1 remote(s) to z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (t=1788890557020)
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Received refs announcement of z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with 1 remote(s) from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (t=1788890557020)
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Stored announcement from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi to be broadcast in 0 millisecond(s) (t=1788890557020)
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Refs announcement of z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji contains our own remote at 47f46882150506b54dc83146b9e20762b5dceda8 (t=1788890557020)
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Updating sync status of z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji to 47f46882150506b54dc83146b9e20762b5dceda8
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Skipping fetch for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji, all refs are already in storage
1788890557 test: Using PATH ["/7f225445-b738-4217-acc5-3483542e3b15/w/crates/radicle-cli/target/debug", "/usr/local/cargo/bin", "/usr/local/sbin", "/usr/local/bin", "/usr/sbin", "/usr/bin", "/sbin", "/bin", "/tmp/radicle-NGLGY6/work/alice"]
1788890557 test: 5-patching-maintainer.md: Running `/7f225445-b738-4217-acc5-3483542e3b15/w/target/debug/rad` with ["remote", "add", "z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk", "--name", "bob", "--sync", "--fetch"] in `/tmp/radicle-NGLGY6/work/alice`..
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <control> control: Received `{"command":"follow","nid":"z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk","alias":"bob"}` on control socket
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Received command Follow(z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <control> control: Received `{"command":"seeds","rid":"rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji"}` on control socket
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Received command Seeds(rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Found 1 connected seed(s) and 1 disconnected seed(s) for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <control> control: Received `{"command":"session","nid":"z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk"}` on control socket
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Received command QueryState(..)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <control> control: Received `{"command":"fetch","rid":"rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji","nid":"z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk","timeout":{"secs":9,"nanos":0}}` on control socket
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Received command Fetch(rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji, z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Fetch initiated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk [inbound connected] (all remotes)..
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Opened new stream with id 21 for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji and remote z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#2> worker: Worker processing outgoing fetch for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#2> worker: z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi pulling from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Received `open` command for stream 21 from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#2> worker: Worker processing incoming fetch for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi on stream 21..
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#2> worker: Spawning upload-pack process for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji on stream 21..
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <control> control: Command returned error: i/o error: Broken pipe (os error 32)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#2> fetch: Fetched rad/id (4ms)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#2> fetch: Fetched data for 1 remote(s) (7ms)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#2> fetch: Fetched data refs for 1 remotes (7ms)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#2> fetch: Sent done signal to remote z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Received `end-of-file` on stream 21 from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <upload-pack> worker: Exiting upload-pack reader thread for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#2> worker: Upload pack finished (21ms)
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#2> worker: Upload process on stream 21 exited with result Ok(())
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Received fetch result from worker for stream 21, remote z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi: Responder { rid: Some(RepoId(rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji)), result: Ok(()) }
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Stream 21 of z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi closing with 0 byte(s) sent and 0 byte(s) received
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Peer z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi fetched rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from us successfully
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Received `close` command for stream 21 from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Stream 21 of z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk closed with 0 byte(s) sent and 0 byte(s) received
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#2> fetch: Validated 1 remote(s) (8ms)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#2> fetch: Applied updates (8ms)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#2> fetch: Finished pull of rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji (23ms)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#2> cob: Loading object of type xyz.radicle.id at 0656c217f917c3e06234771e9ecae53aba5e173e
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#2> storage: Setting ref: refs/rad/id -> 0656c217f917c3e06234771e9ecae53aba5e173e
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#2> cob: Loading object of type xyz.radicle.id at 0656c217f917c3e06234771e9ecae53aba5e173e
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Received fetch result from worker for stream 21, remote z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk: Initiator { rid: RepoId(rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji), result: Ok(FetchResult { updated: [Skipped { name: RefString("refs/namespaces/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk/refs/rad/sigrefs"), oid: Oid(47f46882150506b54dc83146b9e20762b5dceda8) }, Skipped { name: RefString("refs/namespaces/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk/refs/cobs/xyz.radicle.issue/9037b7a42323d4b79e6a48b7d05d3bbaae11d69b"), oid: Oid(400cb155f512b4880858bb05f935104c34167b28) }, Skipped { name: RefString("refs/namespaces/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk/refs/cobs/xyz.radicle.patch/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46"), oid: Oid(4830a8598c5f6ad9f4aa3acd701a61a380b0d275) }, Skipped { name: RefString("refs/namespaces/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk/refs/heads/patches/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46"), oid: Oid(27857ec9eb04c69cacab516e8bf4b5fd36090f66) }, Skipped { name: RefString("refs/namespaces/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk/refs/rad/root"), oid: Oid(0656c217f917c3e06234771e9ecae53aba5e173e) }], namespaces: {PublicKey(z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk)}, clone: false, doc: DocAt { commit: Oid(0656c217f917c3e06234771e9ecae53aba5e173e), blob: Oid(d96f425412c9f8ad5d9a9a05c9831d0728e2338d), doc: Doc { version: Version(1), payload: {PayloadId(TypeName("xyz.radicle.project")): Payload { value: Object {"defaultBranch": String("master"), "description": String("Radicle Heartwood Protocol & Stack"), "name": String("heartwood")} }}, delegates: Delegates(NonEmpty { head: Did("did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"), tail: [] }), threshold: Threshold(1), visibility: Public } } }) }
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Found existing fetch request from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk, sending result..
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Sent fetch result for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk..
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Fetched rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk successfully
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Nothing to announce, no refs were updated..
1788890557 test: 5-patching-maintainer.md: Running `/7f225445-b738-4217-acc5-3483542e3b15/w/target/debug/rad` with ["inbox", "--sort-by", "id"] in `/tmp/radicle-NGLGY6/work/alice`..
1788890557 test: 5-patching-maintainer.md: Running `git` with ["branch", "-r"] in `/tmp/radicle-NGLGY6/work/alice`..
1788890557 test: 5-patching-maintainer.md: Running `/7f225445-b738-4217-acc5-3483542e3b15/w/target/debug/rad` with ["patch", "show", "e4934b6"] in `/tmp/radicle-NGLGY6/work/alice`..
1788890557 test: 5-patching-maintainer.md: Running `/7f225445-b738-4217-acc5-3483542e3b15/w/target/debug/rad` with ["patch", "checkout", "e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46"] in `/tmp/radicle-NGLGY6/work/alice`..
1788890557 test: 5-patching-maintainer.md: Running `git` with ["mv", "REQUIREMENTS", "REQUIREMENTS.md"] in `/tmp/radicle-NGLGY6/work/alice`..
1788890557 test: 5-patching-maintainer.md: Running `git` with ["commit", "-m", "Use markdown for requirements"] in `/tmp/radicle-NGLGY6/work/alice`..
1788890557 test: 5-patching-maintainer.md: Running `git` with ["push", "rad", "-o", "no-sync", "-o", "patch.message=Use markdown for requirements"] in `/tmp/radicle-NGLGY6/work/alice`..
1788890557 test: 5-patching-maintainer.md: Running `/7f225445-b738-4217-acc5-3483542e3b15/w/target/debug/rad` with ["patch", "review", "e4934b6", "--revision", "9e458d00b2e9a26993113c48259781725e2cbee3", "--accept"] in `/tmp/radicle-NGLGY6/work/alice`..
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <control> control: Received `{"command":"seeds","rid":"rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji"}` on control socket
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Received command Seeds(rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Found 1 connected seed(s) and 1 disconnected seed(s) for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <control> control: Received `{"command":"subscribe"}` on control socket
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <control> control: Received `{"command":"announceRefs","rid":"rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji"}` on control socket
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Received command AnnounceRefs(rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Announcing own refs for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji to peers (71fb897892d0d2993ae9a650d675afe448db43ba) (t=1788890557444)..
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Saved local sync status for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji..
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Sending refs announcement of z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with 1 remote(s) to z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (t=1788890557444)
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Received refs announcement of z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with 1 remote(s) from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (t=1788890557444)
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Stored announcement from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi to be broadcast in 0 millisecond(s) (t=1788890557444)
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Fetch initiated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi [outbound connected] (1 remote(s))..
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Opened new stream with id 20 for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji and remote z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#3> worker: Worker processing outgoing fetch for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Received `open` command for stream 20 from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#3> worker: z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk pulling from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#3> worker: Worker processing incoming fetch for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk on stream 20..
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#3> worker: Spawning upload-pack process for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji on stream 20..
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#3> fetch: Fetched rad/id (6ms)
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#3> fetch: Fetched data for 1 remote(s) (18ms)
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#3> fetch: Fetched data refs for 1 remotes (25ms)
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#3> fetch: Sent done signal to remote z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Received `end-of-file` on stream 20 from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <upload-pack> worker: Exiting upload-pack reader thread for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#3> worker: Upload pack finished (38ms)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#3> worker: Upload process on stream 20 exited with result Ok(())
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#3> fetch: Validated 1 remote(s) (27ms)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Received fetch result from worker for stream 20, remote z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk: Responder { rid: Some(RepoId(rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji)), result: Ok(()) }
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Stream 20 of z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk closing with 0 byte(s) sent and 0 byte(s) received
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Peer z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk fetched rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from us successfully
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#3> fetch: Applied updates (28ms)
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#3> fetch: Finished pull of rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji (40ms)
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Received `close` command for stream 20 from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Stream 20 of z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi closed with 0 byte(s) sent and 0 byte(s) received
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#3> cob: Loading object of type xyz.radicle.id at 0656c217f917c3e06234771e9ecae53aba5e173e
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#3> storage: Setting ref: refs/rad/id -> 0656c217f917c3e06234771e9ecae53aba5e173e
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#3> cob: Loading object of type xyz.radicle.id at 0656c217f917c3e06234771e9ecae53aba5e173e
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#3> cob: Loading object of type xyz.radicle.patch at e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Received fetch result from worker for stream 20, remote z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi: Initiator { rid: RepoId(rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji), result: Ok(FetchResult { updated: [Updated { name: RefString("refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/rad/sigrefs"), old: Oid(99c549702e2bcfe02b0e68d4a2224fb7a1524529), new: Oid(71fb897892d0d2993ae9a650d675afe448db43ba) }, Skipped { name: RefString("refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/cobs/xyz.radicle.id/0656c217f917c3e06234771e9ecae53aba5e173e"), oid: Oid(0656c217f917c3e06234771e9ecae53aba5e173e) }, Created { name: RefString("refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/cobs/xyz.radicle.patch/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46"), oid: Oid(2d64d70b8ebd3df783e57f14220a09a19ac460e7) }, Skipped { name: RefString("refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/heads/master"), oid: Oid(f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354) }, Created { name: RefString("refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/heads/patches/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46"), oid: Oid(f567f695d25b4e8fb63b5f5ad2a584529826e908) }, Skipped { name: RefString("refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/rad/id"), oid: Oid(0656c217f917c3e06234771e9ecae53aba5e173e) }, Skipped { name: RefString("refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/rad/root"), oid: Oid(0656c217f917c3e06234771e9ecae53aba5e173e) }], namespaces: {PublicKey(z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi)}, clone: false, doc: DocAt { commit: Oid(0656c217f917c3e06234771e9ecae53aba5e173e), blob: Oid(d96f425412c9f8ad5d9a9a05c9831d0728e2338d), doc: Doc { version: Version(1), payload: {PayloadId(TypeName("xyz.radicle.project")): Payload { value: Object {"defaultBranch": String("master"), "description": String("Radicle Heartwood Protocol & Stack"), "name": String("heartwood")} }}, delegates: Delegates(NonEmpty { head: Did("did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"), tail: [] }), threshold: Threshold(1), visibility: Public } } }) }
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Fetched rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi successfully
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Ref updated: ~ 99c5497..71fb897 refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/rad/sigrefs for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Ref updated: * 0000000..2d64d70 refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/cobs/xyz.radicle.patch/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46 for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Ref updated: * 0000000..f567f69 refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/heads/patches/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46 for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Sending refs announcement of z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with 1 remote(s) to z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (t=1788890557536)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Received refs announcement of z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with 1 remote(s) from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (t=1788890557536)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Stored announcement from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk to be broadcast in 0 millisecond(s) (t=1788890557536)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Refs announcement of z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji contains our own remote at 71fb897892d0d2993ae9a650d675afe448db43ba (t=1788890557536)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Updating sync status of z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji to 71fb897892d0d2993ae9a650d675afe448db43ba
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Skipping fetch for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji, all refs are already in storage
1788890557 test: 5-patching-maintainer.md: Running `git` with ["checkout", "master"] in `/tmp/radicle-NGLGY6/work/alice`..
1788890557 test: 5-patching-maintainer.md: Running `git` with ["merge", "patch/e4934b6"] in `/tmp/radicle-NGLGY6/work/alice`..
1788890557 test: 5-patching-maintainer.md: Running `git` with ["push", "rad", "master"] in `/tmp/radicle-NGLGY6/work/alice`..
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <control> control: Received `{"command":"status"}` on control socket
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <control> control: Received `{"command":"seeds","rid":"rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji"}` on control socket
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Received command Seeds(rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Found 1 connected seed(s) and 1 disconnected seed(s) for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <control> control: Received `{"command":"subscribe"}` on control socket
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <control> control: Received `{"command":"announceRefs","rid":"rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji"}` on control socket
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Received command AnnounceRefs(rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Announcing own refs for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji to peers (fcec86be8b00bf26e7e4c6a17c216e60aca69ac4) (t=1788890557701)..
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Saved local sync status for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji..
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Sending refs announcement of z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with 1 remote(s) to z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (t=1788890557701)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <control> control: Command returned error: i/o error: Broken pipe (os error 32)
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Received refs announcement of z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with 1 remote(s) from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (t=1788890557701)
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Stored announcement from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi to be broadcast in 0 millisecond(s) (t=1788890557701)
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Fetch initiated for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi [outbound connected] (1 remote(s))..
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Opened new stream with id 28 for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji and remote z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Received `open` command for stream 28 from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#4> worker: Worker processing outgoing fetch for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#4> worker: z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk pulling from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#4> worker: Worker processing incoming fetch for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk on stream 28..
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#4> worker: Spawning upload-pack process for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji on stream 28..
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#4> fetch: Fetched rad/id (1ms)
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#4> fetch: Fetched data for 1 remote(s) (8ms)
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#4> fetch: Fetched data refs for 1 remotes (13ms)
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#4> fetch: Sent done signal to remote z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Received `end-of-file` on stream 28 from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <upload-pack> worker: Exiting upload-pack reader thread for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#4> worker: Upload pack finished (21ms)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <worker#4> worker: Upload process on stream 28 exited with result Ok(())
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Received fetch result from worker for stream 28, remote z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk: Responder { rid: Some(RepoId(rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji)), result: Ok(()) }
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Stream 28 of z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk closing with 0 byte(s) sent and 0 byte(s) received
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Peer z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk fetched rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from us successfully
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Received `close` command for stream 28 from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Stream 28 of z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi closed with 0 byte(s) sent and 0 byte(s) received
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#4> fetch: Validated 1 remote(s) (14ms)
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#4> fetch: Applied updates (15ms)
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#4> fetch: Finished pull of rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji (23ms)
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#4> cob: Loading object of type xyz.radicle.id at 0656c217f917c3e06234771e9ecae53aba5e173e
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#4> storage: Setting ref: refs/rad/id -> 0656c217f917c3e06234771e9ecae53aba5e173e
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#4> storage: Setting ref: refs/heads/master -> f567f695d25b4e8fb63b5f5ad2a584529826e908
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#4> storage: Setting ref: HEAD -> refs/heads/master
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#4> cob: Loading object of type xyz.radicle.id at 0656c217f917c3e06234771e9ecae53aba5e173e
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <worker#4> cob: Loading object of type xyz.radicle.patch at e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> wire: Received fetch result from worker for stream 28, remote z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi: Initiator { rid: RepoId(rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji), result: Ok(FetchResult { updated: [Updated { name: RefString("refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/rad/sigrefs"), old: Oid(71fb897892d0d2993ae9a650d675afe448db43ba), new: Oid(fcec86be8b00bf26e7e4c6a17c216e60aca69ac4) }, Skipped { name: RefString("refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/cobs/xyz.radicle.id/0656c217f917c3e06234771e9ecae53aba5e173e"), oid: Oid(0656c217f917c3e06234771e9ecae53aba5e173e) }, Updated { name: RefString("refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/cobs/xyz.radicle.patch/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46"), old: Oid(2d64d70b8ebd3df783e57f14220a09a19ac460e7), new: Oid(6fb40d77626be93fca74c845fd5d2361a73f65ac) }, Updated { name: RefString("refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/heads/master"), old: Oid(f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354), new: Oid(f567f695d25b4e8fb63b5f5ad2a584529826e908) }, Skipped { name: RefString("refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/rad/id"), oid: Oid(0656c217f917c3e06234771e9ecae53aba5e173e) }, Skipped { name: RefString("refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/rad/root"), oid: Oid(0656c217f917c3e06234771e9ecae53aba5e173e) }, Deleted { name: RefString("refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/heads/patches/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46"), oid: Oid(f567f695d25b4e8fb63b5f5ad2a584529826e908) }], namespaces: {PublicKey(z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi)}, clone: false, doc: DocAt { commit: Oid(0656c217f917c3e06234771e9ecae53aba5e173e), blob: Oid(d96f425412c9f8ad5d9a9a05c9831d0728e2338d), doc: Doc { version: Version(1), payload: {PayloadId(TypeName("xyz.radicle.project")): Payload { value: Object {"defaultBranch": String("master"), "description": String("Radicle Heartwood Protocol & Stack"), "name": String("heartwood")} }}, delegates: Delegates(NonEmpty { head: Did("did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi"), tail: [] }), threshold: Threshold(1), visibility: Public } } }) }
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Fetched rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi successfully
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Ref updated: ~ 71fb897..fcec86b refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/rad/sigrefs for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Ref updated: ~ 2d64d70..6fb40d7 refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/cobs/xyz.radicle.patch/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46 for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Ref updated: ~ f2de534..f567f69 refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/heads/master for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Ref updated: - f567f69..0000000 refs/namespaces/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/refs/heads/patches/e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46 for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <service> service: Sending refs announcement of z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with 1 remote(s) to z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi (t=1788890557757)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Received refs announcement of z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with 1 remote(s) from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (t=1788890557757)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Stored announcement from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk to be broadcast in 0 millisecond(s) (t=1788890557757)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Refs announcement of z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji contains our own remote at fcec86be8b00bf26e7e4c6a17c216e60aca69ac4 (t=1788890557757)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Updating sync status of z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji to fcec86be8b00bf26e7e4c6a17c216e60aca69ac4
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Skipping fetch for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji, all refs are already in storage
thread 'rad_workflow' panicked at crates/radicle-cli-test/src/lib.rs:489:36:
--- Expected
++++ actual: stderr
1 - ✓ Patch e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46 merged at revision 9d62420
1 + ✓ Patch e4934b6d9dbe01ce3c7fbb5b77a80d5f1dacdc46 merged at revision 9e458d0
2 2 | ✓ Canonical reference refs/heads/master updated to target commit f567f695d25b4e8fb63b5f5ad2a584529826e908
3 3 | ✓ Synced with 1 seed(s)
4 4 | To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
5 5 | f2de534..f567f69 master -> master
Exit status: 0
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
1788890557 test: Node z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk shutting down..
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <control> control: Received `{"command":"shutdown"}` on control socket
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <control> control: Shutdown requested..
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Disconnecting peer with id=2: connection reset
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> wire: Transport handover for disconnecting peer with id=2 (fd=582)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Disconnected from z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (connection reset)
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <service> service: Dropping peer z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk..
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <control> control: Command returned error: i/o error: Broken pipe (os error 32)
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <runtime> pool: Worker pool shutting down..
1788890557 z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk <runtime> node: Node shutdown completed for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
1788890557 test: Node z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi shutting down..
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <control> control: Received `{"command":"shutdown"}` on control socket
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <control> control: Shutdown requested..
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <runtime> pool: Worker pool shutting down..
1788890557 z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi <runtime> node: Node shutdown completed for z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
failures:
rad_workflow
test result: FAILED. 98 passed; 1 failed; 2 ignored; 0 measured; 0 filtered out; finished in 78.54s
error: test failed, to rerun pass `-p radicle-cli --test commands`
Running unittests src/lib.rs (target/debug/deps/radicle_cli_test-a0fa862e1dacd58e)
running 3 tests
test tests::test_parse ... ok
test tests::test_run ... ok
test tests::test_example_spaced_brackets ... ok
test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/lib.rs (target/debug/deps/radicle_cob-6a3dd1f9a5500172)
running 8 tests
test object::tests::test_serde ... ok
test tests::invalid_parse_refstr ... ok
test tests::parse_refstr ... ok
test tests::roundtrip ... ok
test type_name::test::valid_typenames ... ok
test tests::list_cobs ... ok
test tests::update_cob ... ok
test tests::traverse_cobs ... ok
test result: ok. 8 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.02s
Running unittests src/lib.rs (target/debug/deps/radicle_crypto-b5d365b3b19671d3)
running 12 tests
test ssh::fmt::test::test_key ... ok
test ssh::fmt::test::test_fingerprint ... ok
test ssh::keystore::tests::test_init_no_passphrase ... ok
test ssh::test::test_agent_encoding_remove ... ok
test ssh::test::test_agent_encoding_sign ... ok
test ssh::test::prop_encode_decode_sk ... ok
test tests::prop_encode_decode ... ok
test tests::test_e25519_dh ... ok
test tests::test_encode_decode ... ok
test tests::prop_key_equality ... ok
test ssh::keystore::tests::test_signer ... ok
test ssh::keystore::tests::test_init_passphrase ... ok
test result: ok. 12 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.81s
Running unittests src/lib.rs (target/debug/deps/radicle_dag-7d941d2839407890)
running 20 tests
test tests::test_complex ... ok
test tests::test_contains ... ok
test tests::test_cycle ... ok
test tests::test_dependencies ... ok
test tests::test_fold_diamond ... ok
test tests::test_diamond ... ok
test tests::test_fold_multiple_roots ... ok
test tests::test_fold_reject ... ok
test tests::test_fold_sorting_2 ... ok
test tests::test_get ... ok
test tests::test_is_empty ... ok
test tests::test_fold_sorting_1 ... ok
test tests::test_len ... ok
test tests::test_merge_1 ... ok
test tests::test_merge_2 ... ok
test tests::test_prune_2 ... ok
test tests::test_prune_1 ... ok
test tests::test_prune_by_sorting ... ok
test tests::test_remove ... ok
test tests::test_siblings ... ok
test result: ok. 20 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/lib.rs (target/debug/deps/radicle_fetch-5a6427f5130774f9)
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/lib.rs (target/debug/deps/radicle_node-e6155d25ec60e94d)
running 69 tests
test control::tests::test_control_socket ... ok
test control::tests::test_seed_unseed ... ok
test tests::e2e::missing_default_branch ... ok
test tests::e2e::missing_delegate_default_branch ... ok
test tests::e2e::test_catchup_on_refs_announcements ... ok
test tests::e2e::test_background_foreground_fetch ... ok
test tests::e2e::test_channel_reader_limit ... ok
test tests::e2e::test_clone ... ok
test tests::e2e::test_dont_fetch_owned_refs ... ok
test tests::e2e::test_fetch_followed_remotes ... ok
test tests::e2e::test_connection_crossing ... ok
test tests::e2e::test_fetch_preserve_owned_refs ... ok
test tests::e2e::test_fetch_unseeded ... ok
test tests::e2e::test_concurrent_fetches ... ok
test tests::e2e::test_inventory_sync_basic ... ok
test tests::e2e::test_fetch_up_to_date ... ok
test tests::e2e::test_large_fetch ... ok
test tests::e2e::test_migrated_clone ... ok
test tests::e2e::test_missing_remote ... ok
test tests::e2e::test_multiple_offline_inits ... ok
test tests::e2e::test_non_fastforward_sigrefs ... ok
test tests::e2e::test_outdated_delegate_sigrefs ... ok
test tests::e2e::test_outdated_sigrefs ... ok
test tests::e2e::test_replication ... ok
test tests::e2e::test_replication_invalid ... ok
test tests::e2e::test_inventory_sync_bridge ... ok
test tests::e2e::test_replication_ref_in_sigrefs ... ok
test tests::e2e::test_inventory_sync_ring ... ok
test tests::e2e::test_inventory_sync_star ... ok
test tests::test_announcement_rebroadcast ... ok
test tests::test_announcement_rebroadcast_duplicates ... ok
test tests::test_announcement_rebroadcast_timestamp_filtered ... ok
test tests::test_announcement_relay ... ok
test tests::test_disconnecting_unresponsive_peer ... ok
test tests::test_connection_kept_alive ... ok
test tests::test_fetch_missing_inventory_on_gossip ... ok
test tests::test_fetch_missing_inventory_on_schedule ... ok
test tests::test_inbound_connection ... ok
test tests::test_inventory_decode ... ok
test tests::test_init_and_seed ... ok
test tests::test_inventory_relay ... ok
test tests::test_inventory_relay_bad_timestamp ... ok
test tests::test_inventory_sync ... ok
test tests::test_maintain_connections ... ok
test tests::test_maintain_connections_failed_attempt ... ok
test tests::test_maintain_connections_transient ... ok
test tests::test_outbound_connection ... ok
test tests::test_persistent_peer_connect ... ok
test tests::test_inventory_pruning ... ok
test tests::test_persistent_peer_reconnect_attempt ... ok
test tests::test_persistent_peer_reconnect_success ... ok
test tests::test_ping_response ... ok
test tests::test_queued_fetch_from_ann_same_rid ... ok
test tests::test_queued_fetch_from_command_same_rid ... ok
test tests::test_queued_fetch_max_capacity ... ok
test tests::test_redundant_connect ... ok
test tests::test_refs_announcement_followed ... ok
test tests::test_refs_announcement_fetch_trusted_no_inventory ... ok
test tests::test_refs_announcement_no_subscribe ... ok
test tests::test_refs_announcement_offline ... ok
test tests::test_refs_announcement_relay_private ... ok
test tests::test_refs_announcement_relay_public ... ok
test tests::test_seed_repo_subscribe ... ok
test tests::test_seeding ... ok
test wire::test::test_inventory_ann_with_extension ... ok
test tests::test_refs_synced_event ... ok
test wire::test::test_pong_message_with_extension ... ok
test tests::prop_inventory_exchange_dense ... ok
test tests::test_announcement_message_amplification ... ok
test result: ok. 69 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 16.76s
Running unittests src/main.rs (target/debug/deps/radicle_node-e411e59d8d44e20b)
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/lib.rs (target/debug/deps/radicle_protocol-3e278f0397f381d4)
running 45 tests
test deserializer::test::test_decode_next ... ok
test deserializer::test::test_unparsed ... ok
test service::filter::test::test_parameters ... ok
test deserializer::test::prop_decode_next ... ok
test service::limiter::test::test_limitter_multi ... ok
test service::limiter::test::test_limitter_different_rates ... ok
test service::limiter::test::test_limitter_refill ... ok
test service::gossip::store::test::test_announced ... ok
test service::filter::test::test_sizes ... ok
test service::message::tests::test_ref_remote_limit ... ok
test wire::frame::test::test_stream_id ... ok
test service::message::tests::test_inventory_limit ... ok
test wire::message::tests::prop_addr ... ok
test service::message::tests::prop_refs_announcement_signing ... ok
test wire::message::tests::prop_zero_bytes_encode_decode ... ok
test wire::message::tests::test_inv_ann_max_size ... ok
test wire::message::tests::test_node_ann_max_size ... ok
test wire::message::tests::test_ping_encode_size_overflow - should panic ... ok
test wire::message::tests::test_pingpong_encode_max_size ... ok
test wire::message::tests::test_pong_encode_size_overflow - should panic ... ok
test wire::message::tests::prop_message_encode_decode ... ok
test wire::tests::prop_filter ... ok
test wire::tests::prop_id ... ok
test wire::tests::prop_oid ... ok
test wire::tests::prop_pubkey ... ok
test wire::tests::prop_refs ... ok
test wire::tests::prop_signature ... ok
test wire::tests::prop_signed_refs ... ok
test wire::tests::prop_string ... ok
test wire::tests::prop_tuple ... ok
test wire::tests::prop_u16 ... ok
test wire::tests::prop_u32 ... ok
test wire::tests::prop_u64 ... ok
test wire::tests::prop_u8 ... ok
test wire::tests::prop_vec ... ok
test wire::tests::test_alias ... ok
test wire::tests::test_bounded_vec_limit ... ok
test wire::tests::test_filter_invalid ... ok
test wire::tests::test_string ... ok
test wire::varint::test::prop_encode_decode ... ok
test wire::varint::test::test_encode_overflow - should panic ... ok
test wire::varint::test::test_encoding ... ok
test wire::message::tests::test_refs_ann_max_size ... ok
test wire::message::tests::prop_message_decoder ... ok
test service::message::tests::test_node_announcement_validate ... ok
test result: ok. 45 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 1.53s
Running unittests src/lib.rs (target/debug/deps/radicle_remote_helper-8439a0af23219fc3)
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/git-remote-rad.rs (target/debug/deps/git_remote_rad-576dab1f6fe0c057)
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/main.rs (target/debug/deps/radicle_schemars-f93341695cedc6a3)
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/lib.rs (target/debug/deps/radicle_signals-3340fefd7bdb5980)
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/lib.rs (target/debug/deps/radicle_ssh-60ab4cdea8861dd8)
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/lib.rs (target/debug/deps/radicle_systemd-f6447f31dae14e21)
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Running unittests src/lib.rs (target/debug/deps/radicle_term-02b714d63421e164)
running 20 tests
test cell::test::test_width ... ok
test ansi::tests::wrapping ... ok
test ansi::tests::colors_enabled ... ok
test ansi::tests::colors_disabled ... ok
test table::test::test_table ... ok
test element::test::test_truncate ... ok
test table::test::test_table_border ... ok
test table::test::test_table_border_maximized ... ok
test element::test::test_width ... ok
test table::test::test_table_border_truncated ... ok
test table::test::test_table_truncate ... ok
test table::test::test_table_unicode ... ok
test table::test::test_truncate ... ok
test table::test::test_table_unicode_truncate ... ok
test textarea::test::test_wrapping_code_block ... ok
test textarea::test::test_wrapping ... ok
test textarea::test::test_wrapping_fenced_block ... ok
test textarea::test::test_wrapping_paragraphs ... ok
test vstack::test::test_vstack_maximize ... ok
test vstack::test::test_vstack ... ok
test result: ok. 20 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle
running 1 test
test crates/radicle/src/cob/patch/encoding/review.rs - cob::patch::encoding::review::Review (line 26) ... ignored
test result: ok. 0 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_cli
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_cli_test
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_cob
running 1 test
test crates/radicle-cob/src/backend/git/stable.rs - backend::git::stable::with_advanced_timestamp (line 56) ... ignored
test result: ok. 0 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_crypto
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_dag
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_fetch
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_node
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_protocol
running 6 tests
test crates/radicle-protocol/src/bounded.rs - bounded::BoundedVec<T,N>::max (line 96) ... ok
test crates/radicle-protocol/src/bounded.rs - bounded::BoundedVec<T,N>::truncate (line 50) ... ok
test crates/radicle-protocol/src/bounded.rs - bounded::BoundedVec<T,N>::collect_from (line 30) ... ok
test crates/radicle-protocol/src/bounded.rs - bounded::BoundedVec<T,N>::unbound (line 149) ... ok
test crates/radicle-protocol/src/bounded.rs - bounded::BoundedVec<T,N>::with_capacity (line 66) ... ok
test crates/radicle-protocol/src/bounded.rs - bounded::BoundedVec<T,N>::push (line 122) ... ok
test result: ok. 6 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.52s
Doc-tests radicle_remote_helper
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_signals
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_ssh
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_systemd
running 0 tests
test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.00s
Doc-tests radicle_term
running 1 test
test crates/radicle-term/src/table.rs - table (line 4) ... ok
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.48s
error: 1 target failed:
`-p radicle-cli --test commands`
Exit code: 101
{
"response": "finished",
"result": "failure"
}