diff --git a/radicle-cli/examples/rad-id-rebase.md b/radicle-cli/examples/rad-id-rebase.md index f70de436..c640e707 100644 --- a/radicle-cli/examples/rad-id-rebase.md +++ b/radicle-cli/examples/rad-id-rebase.md @@ -6,7 +6,7 @@ delegates creating proposals concurrently. ``` $ rad id edit --title "Add Alice" --description "Add Alice as a delegate" --delegates did:key:z6MkedTZGJGqgQ2py2b8kGecfxdt2yRdHWF6JpaZC47fovFn --no-confirm -✓ Identity proposal '04603c0d3ea4d137487024a51c9360adfc511114' created +✓ Identity proposal '6b73fce909f612d5d92084b91309d73c21fea396' created title: Add Alice description: Add Alice as a delegate status: ❲open❳ @@ -48,7 +48,7 @@ Quorum Reached ``` $ rad id edit --title "Add Bob" --description "Add Bob as a delegate" --delegates did:key:z6MkjchhfUsD6mmvni8mCdXHw216Xrm9bQe2mBH1P5RDjVJG --no-confirm -✓ Identity proposal '3f6ae4f8645c8b0cbcd35ea924df7b13aca52774' created +✓ Identity proposal '2bf3a85e209d10b11a65e7ed8a8085f6f18ac6bf' created title: Add Bob description: Add Bob as a delegate status: ❲open❳ @@ -93,7 +93,7 @@ second proposal, then the identity would be out of date. So let's run through that and see what happens. ``` -$ rad id accept 04603c0d3ea4d137487024a51c9360adfc511114 --no-confirm +$ rad id accept 6b73fce909f612d5d92084b91309d73c21fea396 --no-confirm ✓ Accepted proposal ✓ title: Add Alice description: Add Alice as a delegate @@ -137,7 +137,7 @@ Quorum Reached ``` ``` -$ rad id commit 04603c0d3ea4d137487024a51c9360adfc511114 --no-confirm +$ rad id commit 6b73fce909f612d5d92084b91309d73c21fea396 --no-confirm ✓ Committed new identity '29ae4b72f5a315328f06fbd68dc1c396a2d5c45e' title: Add Alice description: Add Alice as a delegate @@ -183,7 +183,7 @@ Quorum Reached Now, when we go to accept the second proposal: ``` -$ rad id accept 3f6ae4f8645c8b0cbcd35ea924df7b13aca52774 --no-confirm +$ rad id accept 2bf3a85e209d10b11a65e7ed8a8085f6f18ac6bf --no-confirm ! Warning: Revision is out of date ! Warning: d96f425412c9f8ad5d9a9a05c9831d0728e2338d =/= 475cdfbc8662853dd132ec564e4f5eb0f152dd7f * Consider using 'rad id rebase' to update the proposal to the latest identity @@ -238,19 +238,19 @@ Note that a warning was emitted: If we attempt to commit this revision, the command will fail: ``` (fail) -$ rad id commit 3f6ae4f8645c8b0cbcd35ea924df7b13aca52774 --no-confirm +$ rad id commit 2bf3a85e209d10b11a65e7ed8a8085f6f18ac6bf --no-confirm ! Warning: Revision is out of date ! Warning: d96f425412c9f8ad5d9a9a05c9831d0728e2338d =/= 475cdfbc8662853dd132ec564e4f5eb0f152dd7f * Consider using 'rad id rebase' to update the proposal to the latest identity -✗ Id failed: the identity hashes do match 'd96f425412c9f8ad5d9a9a05c9831d0728e2338d =/= 475cdfbc8662853dd132ec564e4f5eb0f152dd7f' for the revision '3f6ae4f8645c8b0cbcd35ea924df7b13aca52774' +✗ Id failed: the identity hashes do not match for revision 2bf3a85e209d10b11a65e7ed8a8085f6f18ac6bf (d96f425412c9f8ad5d9a9a05c9831d0728e2338d =/= 475cdfbc8662853dd132ec564e4f5eb0f152dd7f) ``` So, let's fix this by running a rebase on the proposal's revision: ``` -$ rad id rebase 3f6ae4f8645c8b0cbcd35ea924df7b13aca52774 --no-confirm -✓ Identity proposal '3f6ae4f8645c8b0cbcd35ea924df7b13aca52774' rebased -✓ Revision '42b9428df59ad349f706b1397750b75ea3b42574' +$ rad id rebase 2bf3a85e209d10b11a65e7ed8a8085f6f18ac6bf --no-confirm +✓ Identity proposal '2bf3a85e209d10b11a65e7ed8a8085f6f18ac6bf' rebased +✓ Revision 'e56b3e0842a4dd37c2a997344bcb4113704e4768' title: Add Bob description: Add Bob as a delegate status: ❲open❳ @@ -293,9 +293,9 @@ Quorum Reached We can now update the proposal to have both keys in the delegates set: ``` -$ rad id update 3f6ae4f8645c8b0cbcd35ea924df7b13aca52774 --rev 42b9428df59ad349f706b1397750b75ea3b42574 --delegates did:key:z6MkedTZGJGqgQ2py2b8kGecfxdt2yRdHWF6JpaZC47fovFn --no-confirm -✓ Identity proposal '3f6ae4f8645c8b0cbcd35ea924df7b13aca52774' updated -✓ Revision '1b4ded759249e4f76d19c3e580b4736bf2a2d1c4' +$ rad id update 2bf3a85e209d10b11a65e7ed8a8085f6f18ac6bf --rev e56b3e0842a4dd37c2a997344bcb4113704e4768 --delegates did:key:z6MkedTZGJGqgQ2py2b8kGecfxdt2yRdHWF6JpaZC47fovFn --no-confirm +✓ Identity proposal '2bf3a85e209d10b11a65e7ed8a8085f6f18ac6bf' updated +✓ Revision 'f15fc641d777cfb005caaa9405e262e516b8ac60' title: Add Bob description: Add Bob as a delegate status: ❲open❳ @@ -338,10 +338,10 @@ Quorum Reached Finally, we can accept and commit this proposal, creating the final state of our new Radicle identity: -$ rad id show 3f6ae4f8645c8b0cbcd35ea924df7b13aca52774 --revisions +$ rad id show 2bf3a85e209d10b11a65e7ed8a8085f6f18ac6bf --revisions ``` -$ rad id accept 3f6ae4f8645c8b0cbcd35ea924df7b13aca52774 --rev 1b4ded759249e4f76d19c3e580b4736bf2a2d1c4 --no-confirm +$ rad id accept 2bf3a85e209d10b11a65e7ed8a8085f6f18ac6bf --rev f15fc641d777cfb005caaa9405e262e516b8ac60 --no-confirm ✓ Accepted proposal ✓ title: Add Bob description: Add Bob as a delegate @@ -385,7 +385,7 @@ Quorum Reached ``` ``` -$ rad id commit 3f6ae4f8645c8b0cbcd35ea924df7b13aca52774 --rev 1b4ded759249e4f76d19c3e580b4736bf2a2d1c4 --no-confirm +$ rad id commit 2bf3a85e209d10b11a65e7ed8a8085f6f18ac6bf --rev f15fc641d777cfb005caaa9405e262e516b8ac60 --no-confirm ✓ Committed new identity '60de897bc24898f6908fd1272633c0b15aa4096f' title: Add Bob description: Add Bob as a delegate diff --git a/radicle-cli/examples/rad-id.md b/radicle-cli/examples/rad-id.md index 8c73e649..368ddae0 100644 --- a/radicle-cli/examples/rad-id.md +++ b/radicle-cli/examples/rad-id.md @@ -14,7 +14,7 @@ Let's add Bob as a delegate using their DID ``` $ rad id edit --title "Add Bob" --description "Add Bob as a delegate" --delegates did:key:z6MkedTZGJGqgQ2py2b8kGecfxdt2yRdHWF6JpaZC47fovFn --no-confirm -✓ Identity proposal '0d396a83a5e1dda2b8929f7dc401d19dd1a79fb8' created +✓ Identity proposal '662a8065f18db50d9ee952bb36eda5b605f161e9' created title: Add Bob description: Add Bob as a delegate status: ❲open❳ @@ -89,7 +89,7 @@ Finally, we can see whether the `Quorum` was reached: Let's see what happens when we reject the change: ``` -$ rad id reject 0d396a --no-confirm +$ rad id reject 662a8065f18db50d9ee952bb36eda5b605f161e9 --no-confirm ✓ Rejected proposal 👎 title: Add Bob description: Add Bob as a delegate @@ -145,7 +145,7 @@ increased to `1`. Instead, let's accept the proposal: ``` -$ rad id accept 0d396a --no-confirm +$ rad id accept 662a8065f18db50d9ee952bb36eda5b605f161e9 --no-confirm ✓ Accepted proposal ✓ title: Add Bob description: Add Bob as a delegate @@ -207,7 +207,7 @@ As well as that, the `Quorum` has now been reached: At this point, we can commit the proposal and update the identity: ``` -$ rad id commit 0d396a --no-confirm +$ rad id commit 662a8065f18db50d9ee952bb36eda5b605f161e9 --no-confirm ✓ Committed new identity 'c96e764965aaeff1c6ea3e5b97e2b9828773c8b0' title: Add Bob description: Add Bob as a delegate @@ -255,7 +255,7 @@ the `--threshold` option: ``` $ rad id edit --title "Update threshold" --description "Update to safer threshold" --threshold 2 --no-confirm -✓ Identity proposal 'f435d6e89c8f922ede691287c0d8b7f82afa591e' created +✓ Identity proposal 'e6c04862ed0e59739f34232c8690cbad73840a93' created title: Update threshold description: Update to safer threshold status: ❲open❳ @@ -298,8 +298,8 @@ Quorum Reached But we change our minds and decide to close the proposal instead: ``` -$ rad id close f435d6 --no-confirm -✓ Closed identity proposal 'f435d6e89c8f922ede691287c0d8b7f82afa591e' +$ rad id close e6c04862ed0e59739f34232c8690cbad73840a93 --no-confirm +✓ Closed identity proposal 'e6c04862ed0e59739f34232c8690cbad73840a93' title: Update threshold description: Update to safer threshold status: ❲closed❳ @@ -348,15 +348,15 @@ Radicle identity, then we can use the list command: ``` $ rad id list -0d396a83a5e1dda2b8929f7dc401d19dd1a79fb8 "Add Bob" ❲committed❳ -f435d6e89c8f922ede691287c0d8b7f82afa591e "Update threshold" ❲closed❳ +662a8065f18db50d9ee952bb36eda5b605f161e9 "Add Bob" ❲committed❳ +e6c04862ed0e59739f34232c8690cbad73840a93 "Update threshold" ❲closed❳ ``` And if we want to view the latest state of any proposal we can use the show command: ``` -$ rad id show f435d6 +$ rad id show e6c04862ed0e59739f34232c8690cbad73840a93 title: Update threshold description: Update to safer threshold status: ❲closed❳ diff --git a/radicle-cli/examples/rad-issue.md b/radicle-cli/examples/rad-issue.md index 6b6bc172..bcb60cba 100644 --- a/radicle-cli/examples/rad-issue.md +++ b/radicle-cli/examples/rad-issue.md @@ -7,7 +7,7 @@ Let's say the new car you are designing with your peers has a problem with its f $ rad issue open --title "flux capacitor underpowered" --description "Flux capacitor power requirements exceed current supply" --no-announce ╭─────────────────────────────────────────────────────────╮ │ Title flux capacitor underpowered │ -│ Issue 2e8c1bf3fe0532a314778357c886608a966a34bd │ +│ Issue 42028af21fabc09bfac2f25490f119f7c7e11542 │ │ Status open │ │ │ │ Flux capacitor power requirements exceed current supply │ @@ -18,20 +18,20 @@ The issue is now listed under our project. ``` $ rad issue list -╭───────────────────────────────────────────────────────────────────────────────────────────────────────╮ -│ ● ID Title Author Tags Assignees Opened │ -├───────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ ● 2e8c1bf flux capacitor underpowered z6MknSL…StBU8Vi (you) [ .. ] │ -╰───────────────────────────────────────────────────────────────────────────────────────────────────────╯ +╭─────────────────────────────────────────────────────────────────────────────────────────────────────────╮ +│ ● ID Title Author Labels Assignees Opened │ +├─────────────────────────────────────────────────────────────────────────────────────────────────────────┤ +│ ● 42028af flux capacitor underpowered z6MknSL…StBU8Vi (you) [ .. ] │ +╰─────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ``` Show the issue information issue. ``` -$ rad issue show 2e8c1bf +$ rad issue show 42028af ╭─────────────────────────────────────────────────────────╮ │ Title flux capacitor underpowered │ -│ Issue 2e8c1bf3fe0532a314778357c886608a966a34bd │ +│ Issue 42028af21fabc09bfac2f25490f119f7c7e11542 │ │ Status open │ │ │ │ Flux capacitor power requirements exceed current supply │ @@ -47,24 +47,24 @@ others to work on. This is to ensure work is not duplicated. Let's assign ourselves to this one. ``` -$ rad assign 2e8c1bf3fe0532a314778357c886608a966a34bd --to did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi +$ rad assign 42028af21fabc09bfac2f25490f119f7c7e11542 --to did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi ``` It will now show in the list of issues assigned to us. ``` $ rad issue list --assigned -╭─────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ -│ ● ID Title Author Tags Assignees Opened │ -├─────────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ ● 2e8c1bf flux capacitor underpowered z6MknSL…StBU8Vi (you) z6MknSL…StBU8Vi [ .. ] │ -╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ +╭───────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ +│ ● ID Title Author Labels Assignees Opened │ +├───────────────────────────────────────────────────────────────────────────────────────────────────────────────┤ +│ ● 42028af flux capacitor underpowered z6MknSL…StBU8Vi (you) z6MknSL…StBU8Vi [ .. ] │ +╰───────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ``` Note: this can always be undone with the `unassign` subcommand. ``` -$ rad unassign 2e8c1bf3fe0532a314778357c886608a966a34bd --from did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi +$ rad unassign 42028af21fabc09bfac2f25490f119f7c7e11542 --from did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi ``` Great, now we have communicated to the world about our car's defect. @@ -73,8 +73,8 @@ But wait! We've found an important detail about the car's power requirements. It will help whoever works on a fix. ``` -$ rad comment 2e8c1bf3fe0532a314778357c886608a966a34bd --message 'The flux capacitor needs 1.21 Gigawatts' -9822748bd076595a2408aad02b3a0d9f94fec7e0 -$ rad comment 2e8c1bf3fe0532a314778357c886608a966a34bd --reply-to 9822748bd076595a2408aad02b3a0d9f94fec7e0 --message 'More power!' -edec8d07bf3788b98943394c1274910b8f12d35c +$ rad comment 42028af21fabc09bfac2f25490f119f7c7e11542 --message 'The flux capacitor needs 1.21 Gigawatts' +84492237dc0908b1e5b728d1a4e5f1343b6ffe9b +$ rad comment 42028af21fabc09bfac2f25490f119f7c7e11542 --reply-to 84492237dc0908b1e5b728d1a4e5f1343b6ffe9b --message 'More power!' +dd679552a15e2db73bbedf3084f5f7c62bb0d724 ``` diff --git a/radicle-cli/examples/rad-tag.md b/radicle-cli/examples/rad-label.md similarity index 64% rename from radicle-cli/examples/rad-tag.md rename to radicle-cli/examples/rad-label.md index 2c3733e0..5bb507d7 100644 --- a/radicle-cli/examples/rad-tag.md +++ b/radicle-cli/examples/rad-label.md @@ -1,18 +1,18 @@ -Tagging an issue is easy, let's add the `bug` and `good-first-issue` tags to +Labeling an issue is easy, let's add the `bug` and `good-first-issue` labels to some issue: ``` -$ rad tag 2e8c1bf3fe0532a314778357c886608a966a34bd bug good-first-issue +$ rad label 42028af21fabc09bfac2f25490f119f7c7e11542 bug good-first-issue ``` -We can now show the issue to check whether those tags were added: +We can now show the issue to check whether those labels were added: ``` -$ rad issue show 2e8c1bf3fe0532a314778357c886608a966a34bd +$ rad issue show 42028af21fabc09bfac2f25490f119f7c7e11542 ╭─────────────────────────────────────────────────────────╮ │ Title flux capacitor underpowered │ -│ Issue 2e8c1bf3fe0532a314778357c886608a966a34bd │ -│ Tags bug, good-first-issue │ +│ Issue 42028af21fabc09bfac2f25490f119f7c7e11542 │ +│ Labels bug, good-first-issue │ │ Status open │ │ │ │ Flux capacitor power requirements exceed current supply │ @@ -22,17 +22,17 @@ $ rad issue show 2e8c1bf3fe0532a314778357c886608a966a34bd Untagging an issue is very similar: ``` -$ rad untag 2e8c1bf3fe0532a314778357c886608a966a34bd good-first-issue +$ rad unlabel 42028af21fabc09bfac2f25490f119f7c7e11542 good-first-issue ``` -Notice that the `good-first-issue` tag has disappeared: +Notice that the `good-first-issue` label has disappeared: ``` -$ rad issue show 2e8c1bf3fe0532a314778357c886608a966a34bd +$ rad issue show 42028af21fabc09bfac2f25490f119f7c7e11542 ╭─────────────────────────────────────────────────────────╮ │ Title flux capacitor underpowered │ -│ Issue 2e8c1bf3fe0532a314778357c886608a966a34bd │ -│ Tags bug │ +│ Issue 42028af21fabc09bfac2f25490f119f7c7e11542 │ +│ Labels bug │ │ Status open │ │ │ │ Flux capacitor power requirements exceed current supply │ diff --git a/radicle-cli/examples/rad-merge-after-update.md b/radicle-cli/examples/rad-merge-after-update.md index 13f9d1e0..ee176938 100644 --- a/radicle-cli/examples/rad-merge-after-update.md +++ b/radicle-cli/examples/rad-merge-after-update.md @@ -4,7 +4,7 @@ Let's start by creating a patch. $ git checkout -b feature/1 -q $ git commit --allow-empty -q -m "First change" $ git push rad HEAD:refs/patches -✓ Patch 0ec956c94256fa101db4c32956ce195a1aa0edf2 opened +✓ Patch 143bb0c962561b09e86478a53ba346b5ff934335 opened To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi * [new reference] HEAD -> refs/patches ``` @@ -26,8 +26,8 @@ update it, we expect it to be updated and merged: ``` (stderr) RAD_SOCKET=/dev/null $ git checkout feature/1 -q $ git push -f -✓ Patch 0ec956c updated to 8175b00f4d75059976930cfcb75ef08454c87055 -✓ Patch 0ec956c94256fa101db4c32956ce195a1aa0edf2 merged +✓ Patch 143bb0c updated to e595bf1246bdcee7b0c20615e479f62d2bf02249 +✓ Patch 143bb0c962561b09e86478a53ba346b5ff934335 merged To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi - + 20aa5dd...954bcdb feature/1 -> patches/0ec956c94256fa101db4c32956ce195a1aa0edf2 (forced update) + + 20aa5dd...954bcdb feature/1 -> patches/143bb0c962561b09e86478a53ba346b5ff934335 (forced update) ``` diff --git a/radicle-cli/examples/rad-merge-via-push.md b/radicle-cli/examples/rad-merge-via-push.md index 04e2b951..72fadd15 100644 --- a/radicle-cli/examples/rad-merge-via-push.md +++ b/radicle-cli/examples/rad-merge-via-push.md @@ -4,7 +4,7 @@ Let's start by creating two patches. $ git checkout -b feature/1 -q $ git commit --allow-empty -q -m "First change" $ git push rad HEAD:refs/patches -✓ Patch 0ec956c94256fa101db4c32956ce195a1aa0edf2 opened +✓ Patch 143bb0c962561b09e86478a53ba346b5ff934335 opened To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi * [new reference] HEAD -> refs/patches ``` @@ -12,7 +12,7 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE $ git checkout -b feature/2 -q master $ git commit --allow-empty -q -m "Second change" $ git push rad HEAD:refs/patches -✓ Patch 928d76e22ef98a8406f2e4e4bcc8878533bbdfe0 opened +✓ Patch 5d0e608aa35af59f769e9d6a2c0227ea60ae2740 opened To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi * [new reference] HEAD -> refs/patches ``` @@ -22,8 +22,8 @@ This creates some remote tracking branches for us: ``` $ git branch -r rad/master - rad/patches/0ec956c94256fa101db4c32956ce195a1aa0edf2 - rad/patches/928d76e22ef98a8406f2e4e4bcc8878533bbdfe0 + rad/patches/143bb0c962561b09e86478a53ba346b5ff934335 + rad/patches/5d0e608aa35af59f769e9d6a2c0227ea60ae2740 ``` And some remote refs: @@ -34,13 +34,13 @@ z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi └── refs    ├── cobs    │   └── xyz.radicle.patch -    │      ├── 0ec956c94256fa101db4c32956ce195a1aa0edf2 -    │      └── 928d76e22ef98a8406f2e4e4bcc8878533bbdfe0 +    │      ├── 143bb0c962561b09e86478a53ba346b5ff934335 +    │      └── 5d0e608aa35af59f769e9d6a2c0227ea60ae2740    ├── heads    │   ├── master    │   └── patches -    │      ├── 0ec956c94256fa101db4c32956ce195a1aa0edf2 -    │      └── 928d76e22ef98a8406f2e4e4bcc8878533bbdfe0 +    │      ├── 143bb0c962561b09e86478a53ba346b5ff934335 +    │      └── 5d0e608aa35af59f769e9d6a2c0227ea60ae2740    └── rad       ├── id       └── sigrefs @@ -59,8 +59,8 @@ When we push to `rad/master`, we automatically merge the patches: ``` (stderr) RAD_SOCKET=/dev/null $ git push rad master -✓ Patch 0ec956c94256fa101db4c32956ce195a1aa0edf2 merged -✓ Patch 928d76e22ef98a8406f2e4e4bcc8878533bbdfe0 merged +✓ Patch 143bb0c962561b09e86478a53ba346b5ff934335 merged +✓ Patch 5d0e608aa35af59f769e9d6a2c0227ea60ae2740 merged To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi f2de534..d6399c7 master -> master ``` @@ -69,8 +69,8 @@ $ rad patch --merged ╭────────────────────────────────────────────────────────────────────────────────────────╮ │ ● ID Title Author Head + - Updated │ ├────────────────────────────────────────────────────────────────────────────────────────┤ -│ ✔ 0ec956c First change z6MknSL…StBU8Vi alice (you) 20aa5dd +0 -0 [ ... ] │ -│ ✔ 928d76e Second change z6MknSL…StBU8Vi alice (you) daf349f +0 -0 [ ... ] │ +│ ✔ 143bb0c First change z6MknSL…StBU8Vi alice (you) 20aa5dd +0 -0 [ ... ] │ +│ ✔ 5d0e608 Second change z6MknSL…StBU8Vi alice (you) daf349f +0 -0 [ ... ] │ ╰────────────────────────────────────────────────────────────────────────────────────────╯ ``` @@ -89,8 +89,8 @@ z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi └── refs    ├── cobs    │   └── xyz.radicle.patch -    │      ├── 0ec956c94256fa101db4c32956ce195a1aa0edf2 -    │      └── 928d76e22ef98a8406f2e4e4bcc8878533bbdfe0 +    │      ├── 143bb0c962561b09e86478a53ba346b5ff934335 +    │      └── 5d0e608aa35af59f769e9d6a2c0227ea60ae2740    ├── heads    │   └── master    └── rad diff --git a/radicle-cli/examples/rad-patch-ahead-behind.md b/radicle-cli/examples/rad-patch-ahead-behind.md index 6a02a10a..98ac8764 100644 --- a/radicle-cli/examples/rad-patch-ahead-behind.md +++ b/radicle-cli/examples/rad-patch-ahead-behind.md @@ -37,7 +37,7 @@ $ git log --graph --decorate --abbrev-commit --pretty=oneline --all Then we create a patch from `feature/1`: ``` (stderr) $ git push rad feature/1:refs/patches -✓ Patch 866f59c001cd4d78a151f444b34265566c83c264 opened +✓ Patch 69ebafb6f654fb29d23f630cc165d83d6cbf525c opened To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi * [new reference] feature/1 -> refs/patches ``` @@ -48,17 +48,17 @@ $ rad patch list ╭─────────────────────────────────────────────────────────────────────────────╮ │ ● ID Title Author Head + - Updated │ ├─────────────────────────────────────────────────────────────────────────────┤ -│ ● 866f59c Add Alan z6MknSL…StBU8Vi (you) 5c88a79 +1 -0 [ ... ] │ +│ ● 69ebafb Add Alan z6MknSL…StBU8Vi (you) 5c88a79 +1 -0 [ ... ] │ ╰─────────────────────────────────────────────────────────────────────────────╯ ``` When showing the patch, we see that it is `ahead 1, behind 1`, since master has diverged by one commit: ``` -$ rad patch show -v -p 866f59c +$ rad patch show -v -p 69ebafb ╭────────────────────────────────────────────────────────────────────╮ │ Title Add Alan │ -│ Patch 866f59c001cd4d78a151f444b34265566c83c264 │ +│ Patch 69ebafb6f654fb29d23f630cc165d83d6cbf525c │ │ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │ │ Head 5c88a79d75f5c2b4cc51ee6f163d2db91ee198d7 │ │ Base f64fb2c8fe28f7c458c72ec8d700373924794943 │ @@ -93,7 +93,7 @@ $ git checkout -q -b feature/2 feature/1 $ sed -i '$a Mel Farna' CONTRIBUTORS $ git commit -a -q -m "Add Mel" $ git push -o patch.message="Add Mel" rad HEAD:refs/patches -✓ Patch 57cb9b2758518e547de324456ac967fda456c6c1 opened +✓ Patch 53d5f17aba5fd9b7de7a02ecb6f01de561701eeb opened To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi * [new reference] HEAD -> refs/patches ``` @@ -101,10 +101,10 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE When we look at the patch, we see that it has both commits, because this new patch uses the same base as the previous patch: ``` -$ rad patch show -v 57cb9b2758518e547de324456ac967fda456c6c1 +$ rad patch show -v 53d5f17aba5fd9b7de7a02ecb6f01de561701eeb ╭────────────────────────────────────────────────────────────────────╮ │ Title Add Mel │ -│ Patch 57cb9b2758518e547de324456ac967fda456c6c1 │ +│ Patch 53d5f17aba5fd9b7de7a02ecb6f01de561701eeb │ │ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │ │ Head 7f63fcbcf23fc39eea784c091ad3d20d7e4bd005 │ │ Base f64fb2c8fe28f7c458c72ec8d700373924794943 │ @@ -124,7 +124,7 @@ If we want to instead create a "stacked" patch, we can do so with the ``` (stderr) $ git push -o patch.message="Add Mel #2" -o patch.base=5c88a79d75f5c2b4cc51ee6f163d2db91ee198d7 rad HEAD:refs/patches -✓ Patch 395221c5b75fa9bc2de7909d03e69dfd606611c6 opened +✓ Patch 459dc67a024ff30c3bca02f0f1e5b746459ce32a opened To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi * [new reference] HEAD -> refs/patches ``` @@ -136,10 +136,10 @@ However, since the patch is still intended to be merged into `master`, we see that it is still two commits ahead and one behind from `master`. ``` -$ rad patch show -v 395221c5b75fa9bc2de7909d03e69dfd606611c6 +$ rad patch show -v 459dc67a024ff30c3bca02f0f1e5b746459ce32a ╭────────────────────────────────────────────────────────────────────╮ │ Title Add Mel #2 │ -│ Patch 395221c5b75fa9bc2de7909d03e69dfd606611c6 │ +│ Patch 459dc67a024ff30c3bca02f0f1e5b746459ce32a │ │ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │ │ Head 7f63fcbcf23fc39eea784c091ad3d20d7e4bd005 │ │ Base 5c88a79d75f5c2b4cc51ee6f163d2db91ee198d7 │ diff --git a/radicle-cli/examples/rad-patch-draft.md b/radicle-cli/examples/rad-patch-draft.md index d1d0a6dc..5935beea 100644 --- a/radicle-cli/examples/rad-patch-draft.md +++ b/radicle-cli/examples/rad-patch-draft.md @@ -9,7 +9,7 @@ To open a patch in draft mode, we use the `--draft` option: ``` (stderr) $ git push -o patch.draft -o patch.message="Nothing yet" rad HEAD:refs/patches -✓ Patch c639a0f9895a0fdf2ba2d04533290937cb6fd2f7 drafted +✓ Patch 79a1a5138b7f91c6dead5544ecde285dc3d0cb45 drafted To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi * [new reference] HEAD -> refs/patches ``` @@ -17,10 +17,10 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE We can confirm it's a draft by running `show`: ``` -$ rad patch show c639a0f9895a0fdf2ba2d04533290937cb6fd2f7 +$ rad patch show 79a1a5138b7f91c6dead5544ecde285dc3d0cb45 ╭────────────────────────────────────────────────────────────────────╮ │ Title Nothing yet │ -│ Patch c639a0f9895a0fdf2ba2d04533290937cb6fd2f7 │ +│ Patch 79a1a5138b7f91c6dead5544ecde285dc3d0cb45 │ │ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │ │ Head 2a465832b5a76abe25be44a3a5d224bbd7741ba7 │ │ Branches cloudhead/draft │ @@ -36,14 +36,14 @@ $ rad patch show c639a0f9895a0fdf2ba2d04533290937cb6fd2f7 Once the patch is ready for review, we can use the `ready` command: ``` -$ rad patch ready c639a0f9895a0fdf2ba2d04533290937cb6fd2f7 +$ rad patch ready 79a1a5138b7f91c6dead5544ecde285dc3d0cb45 ``` ``` -$ rad patch show c639a0f9895a0fdf2ba2d04533290937cb6fd2f7 +$ rad patch show 79a1a5138b7f91c6dead5544ecde285dc3d0cb45 ╭────────────────────────────────────────────────────────────────────╮ │ Title Nothing yet │ -│ Patch c639a0f9895a0fdf2ba2d04533290937cb6fd2f7 │ +│ Patch 79a1a5138b7f91c6dead5544ecde285dc3d0cb45 │ │ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │ │ Head 2a465832b5a76abe25be44a3a5d224bbd7741ba7 │ │ Branches cloudhead/draft │ @@ -60,11 +60,11 @@ If for whatever reason, it needed to go back into draft mode, we could use the `--undo` flag: ``` -$ rad patch ready --undo c639a0f9895a0fdf2ba2d04533290937cb6fd2f7 -$ rad patch show c639a0f9895a0fdf2ba2d04533290937cb6fd2f7 +$ rad patch ready --undo 79a1a5138b7f91c6dead5544ecde285dc3d0cb45 +$ rad patch show 79a1a5138b7f91c6dead5544ecde285dc3d0cb45 ╭─────────────────────────────────────────────────────────────────────────────────────────╮ │ Title Nothing yet │ -│ Patch c639a0f9895a0fdf2ba2d04533290937cb6fd2f7 │ +│ Patch 79a1a5138b7f91c6dead5544ecde285dc3d0cb45 │ │ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │ │ Head 2a465832b5a76abe25be44a3a5d224bbd7741ba7 │ │ Branches cloudhead/draft │ diff --git a/radicle-cli/examples/rad-patch-pull-update.md b/radicle-cli/examples/rad-patch-pull-update.md index dcdc81a1..5c9b062f 100644 --- a/radicle-cli/examples/rad-patch-pull-update.md +++ b/radicle-cli/examples/rad-patch-pull-update.md @@ -40,22 +40,22 @@ $ cd heartwood $ git checkout -b bob/feature -q $ git commit --allow-empty -m "Bob's commit #1" -q $ git push rad -o sync -o patch.message="Bob's patch" HEAD:refs/patches -✓ Patch 627477fdb46b9aaf3f0677c415b569cd21227b76 opened +✓ Patch 26e3e563ddc7df8dd0c9f81274c0b3cb1b764568 opened ✓ Synced with 1 node(s) To rad://zhbMU4DUXrzB8xT6qAJh6yZ7bFMK/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk * [new reference] HEAD -> refs/patches ``` ``` ~bob $ git status --short --branch -## bob/feature...rad/patches/627477fdb46b9aaf3f0677c415b569cd21227b76 +## bob/feature...rad/patches/26e3e563ddc7df8dd0c9f81274c0b3cb1b764568 ``` Alice checks it out. ``` ~alice -$ rad patch checkout 627477f -✓ Switched to branch patch/627477f -✓ Branch patch/627477f setup to track rad/patches/627477fdb46b9aaf3f0677c415b569cd21227b76 +$ rad patch checkout 26e3e56 +✓ Switched to branch patch/26e3e56 +✓ Branch patch/26e3e56 setup to track rad/patches/26e3e563ddc7df8dd0c9f81274c0b3cb1b764568 $ git show commit bdcdb30b3c0f513620dd0f1c24ff8f4f71de956b Author: radicle @@ -69,19 +69,19 @@ Bob then updates the patch. ``` ~bob (stderr) $ git commit --allow-empty -m "Bob's commit #2" -q $ git push rad -o sync -o patch.message="Updated." -✓ Patch 627477f updated to c4114446af35501300c68571cfb07a6f5c7e1eef +✓ Patch 26e3e56 updated to c04ef81bad734c65a7d5834cefcdd60c4f0484f7 ✓ Synced with 1 node(s) To rad://zhbMU4DUXrzB8xT6qAJh6yZ7bFMK/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk - bdcdb30..cad2666 bob/feature -> patches/627477fdb46b9aaf3f0677c415b569cd21227b76 + bdcdb30..cad2666 bob/feature -> patches/26e3e563ddc7df8dd0c9f81274c0b3cb1b764568 ``` Alice pulls the update. ``` ~alice -$ rad patch show 627477f +$ rad patch show 26e3e56 ╭──────────────────────────────────────────────────────────────────────────────╮ │ Title Bob's patch │ -│ Patch 627477fdb46b9aaf3f0677c415b569cd21227b76 │ +│ Patch 26e3e563ddc7df8dd0c9f81274c0b3cb1b764568 │ │ Author did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk │ │ Head cad2666a8a2250e4dee175ed5044be2c251ff08b │ │ Commits ahead 2, behind 0 │ @@ -91,16 +91,16 @@ $ rad patch show 627477f │ bdcdb30 Bob's commit #1 │ ├──────────────────────────────────────────────────────────────────────────────┤ │ ● opened by bob (z6Mkt67…v4N1tRk) [ ... ] │ -│ ↑ updated to c4114446af35501300c68571cfb07a6f5c7e1eef (cad2666) [ ... ] │ +│ ↑ updated to c04ef81bad734c65a7d5834cefcdd60c4f0484f7 (cad2666) [ ... ] │ ╰──────────────────────────────────────────────────────────────────────────────╯ $ git ls-remote rad f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 refs/heads/master -cad2666a8a2250e4dee175ed5044be2c251ff08b refs/heads/patches/627477fdb46b9aaf3f0677c415b569cd21227b76 +cad2666a8a2250e4dee175ed5044be2c251ff08b refs/heads/patches/26e3e563ddc7df8dd0c9f81274c0b3cb1b764568 ``` ``` ~alice $ git fetch rad $ git status --short --branch -## patch/627477f...rad/patches/627477fdb46b9aaf3f0677c415b569cd21227b76 [behind 1] +## patch/26e3e56...rad/patches/26e3e563ddc7df8dd0c9f81274c0b3cb1b764568 [behind 1] ``` ``` ~alice $ git pull diff --git a/radicle-cli/examples/rad-patch-update.md b/radicle-cli/examples/rad-patch-update.md index ef0fc61d..40c452b9 100644 --- a/radicle-cli/examples/rad-patch-update.md +++ b/radicle-cli/examples/rad-patch-update.md @@ -6,16 +6,16 @@ $ git commit -q -m "Not a real change" --allow-empty ``` ``` (stderr) $ git push rad HEAD:refs/patches -✓ Patch 51e0d0bc168ccdc541b7b1aeab2eb9e048c2fcdd opened +✓ Patch ea6fa6c274c55d0f4fdf203a192cbf1330b51221 opened To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi * [new reference] HEAD -> refs/patches ``` ``` -$ rad patch show 51e0d0bc168ccdc541b7b1aeab2eb9e048c2fcdd +$ rad patch show ea6fa6c274c55d0f4fdf203a192cbf1330b51221 ╭────────────────────────────────────────────────────────────────────╮ │ Title Not a real change │ -│ Patch 51e0d0bc168ccdc541b7b1aeab2eb9e048c2fcdd │ +│ Patch ea6fa6c274c55d0f4fdf203a192cbf1330b51221 │ │ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │ │ Head 51b2f0f77b9849bfaa3e9d3ff68ee2f57771d20c │ │ Branches feature/1 │ @@ -46,17 +46,17 @@ Now, instead of using `git push` to update the patch, as we normally would, we run: ``` -$ rad patch update 51e0d0bc168ccdc541b7b1aeab2eb9e048c2fcdd -m "Updated patch" -c10012c2cb9c0c9bfeba7ef28cae10e4b8db3469 +$ rad patch update ea6fa6c274c55d0f4fdf203a192cbf1330b51221 -m "Updated patch" +59bbb5c5d3c9f18a686113e6354b1372eebafda4 ``` The command outputs the new Revision ID, which we can now see here: ``` -$ rad patch show 51e0d0bc168ccdc541b7b1aeab2eb9e048c2fcdd +$ rad patch show ea6fa6c274c55d0f4fdf203a192cbf1330b51221 ╭──────────────────────────────────────────────────────────────────────────────╮ │ Title Not a real change │ -│ Patch 51e0d0bc168ccdc541b7b1aeab2eb9e048c2fcdd │ +│ Patch ea6fa6c274c55d0f4fdf203a192cbf1330b51221 │ │ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │ │ Head 4d272148458a17620541555b1f0905c01658aa9f │ │ Branches feature/1 │ @@ -67,6 +67,6 @@ $ rad patch show 51e0d0bc168ccdc541b7b1aeab2eb9e048c2fcdd │ 51b2f0f Not a real change │ ├──────────────────────────────────────────────────────────────────────────────┤ │ ● opened by (you) [ ... ] │ -│ ↑ updated to c10012c2cb9c0c9bfeba7ef28cae10e4b8db3469 (4d27214) [ ... ] │ +│ ↑ updated to 59bbb5c5d3c9f18a686113e6354b1372eebafda4 (4d27214) [ ... ] │ ╰──────────────────────────────────────────────────────────────────────────────╯ ``` diff --git a/radicle-cli/examples/rad-patch-via-push.md b/radicle-cli/examples/rad-patch-via-push.md index 241686eb..568dbc47 100644 --- a/radicle-cli/examples/rad-patch-via-push.md +++ b/radicle-cli/examples/rad-patch-via-push.md @@ -8,7 +8,7 @@ $ git checkout -b feature/1 Switched to a new branch 'feature/1' $ git commit -a -m "Add things" -q --allow-empty $ git push -o patch.message="Add things #1" -o patch.message="See commits for details." rad HEAD:refs/patches -✓ Patch 2647168c23e7c2b2c1936d695443944e143bc3f7 opened +✓ Patch 90c77f2c33b7e472e058de4a586156f8a7fec7d6 opened To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi * [new reference] HEAD -> refs/patches ``` @@ -16,10 +16,10 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE We can see a patch was created: ``` -$ rad patch show 2647168 +$ rad patch show 90c77f2 ╭────────────────────────────────────────────────────────────────────╮ │ Title Add things #1 │ -│ Patch 2647168c23e7c2b2c1936d695443944e143bc3f7 │ +│ Patch 90c77f2c33b7e472e058de4a586156f8a7fec7d6 │ │ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │ │ Head 42d894a83c9c356552a57af09ccdbd5587a99045 │ │ Branches feature/1 │ @@ -39,7 +39,7 @@ branch associated with this patch: ``` $ git branch -vv -* feature/1 42d894a [rad/patches/2647168c23e7c2b2c1936d695443944e143bc3f7] Add things +* feature/1 42d894a [rad/patches/90c77f2c33b7e472e058de4a586156f8a7fec7d6] Add things master f2de534 [rad/master] Second commit ``` @@ -47,7 +47,7 @@ Let's check that it's up to date with our local head: ``` $ git status --short --branch -## feature/1...rad/patches/2647168c23e7c2b2c1936d695443944e143bc3f7 +## feature/1...rad/patches/90c77f2c33b7e472e058de4a586156f8a7fec7d6 $ git fetch $ git push ``` @@ -59,13 +59,13 @@ $ git show-ref 42d894a83c9c356552a57af09ccdbd5587a99045 refs/heads/feature/1 f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 refs/heads/master f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354 refs/remotes/rad/master -42d894a83c9c356552a57af09ccdbd5587a99045 refs/remotes/rad/patches/2647168c23e7c2b2c1936d695443944e143bc3f7 +42d894a83c9c356552a57af09ccdbd5587a99045 refs/remotes/rad/patches/90c77f2c33b7e472e058de4a586156f8a7fec7d6 ``` ``` $ git ls-remote rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji 'refs/heads/patches/*' -42d894a83c9c356552a57af09ccdbd5587a99045 refs/heads/patches/2647168c23e7c2b2c1936d695443944e143bc3f7 +42d894a83c9c356552a57af09ccdbd5587a99045 refs/heads/patches/90c77f2c33b7e472e058de4a586156f8a7fec7d6 $ git ls-remote rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi 'refs/cobs/*' -2647168c23e7c2b2c1936d695443944e143bc3f7 refs/cobs/xyz.radicle.patch/2647168c23e7c2b2c1936d695443944e143bc3f7 +90c77f2c33b7e472e058de4a586156f8a7fec7d6 refs/cobs/xyz.radicle.patch/90c77f2c33b7e472e058de4a586156f8a7fec7d6 ``` We can create another patch: @@ -74,7 +74,7 @@ We can create another patch: $ git checkout -b feature/2 -q master $ git commit -a -m "Add more things" -q --allow-empty $ git push rad HEAD:refs/patches -✓ Patch b8ab1c99c1c8205680a3494f04fb3934ec738ddd opened +✓ Patch fedf0e4dcb74ff6db1d5e30a6a254b77f02ff60b opened To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi * [new reference] HEAD -> refs/patches ``` @@ -83,8 +83,8 @@ We see both branches with upstreams now: ``` $ git branch -vv - feature/1 42d894a [rad/patches/2647168c23e7c2b2c1936d695443944e143bc3f7] Add things -* feature/2 8b0ea80 [rad/patches/b8ab1c99c1c8205680a3494f04fb3934ec738ddd] Add more things + feature/1 42d894a [rad/patches/90c77f2c33b7e472e058de4a586156f8a7fec7d6] Add things +* feature/2 8b0ea80 [rad/patches/fedf0e4dcb74ff6db1d5e30a6a254b77f02ff60b] Add more things master f2de534 [rad/master] Second commit ``` @@ -95,8 +95,8 @@ $ rad patch ╭────────────────────────────────────────────────────────────────────────────────────╮ │ ● ID Title Author Head + - Updated │ ├────────────────────────────────────────────────────────────────────────────────────┤ -│ ● 2647168 Add things #1 z6MknSL…StBU8Vi (you) 42d894a +0 -0 [ ... ] │ -│ ● b8ab1c9 Add more things z6MknSL…StBU8Vi (you) 8b0ea80 +0 -0 [ ... ] │ +│ ● 90c77f2 Add things #1 z6MknSL…StBU8Vi (you) 42d894a +0 -0 [ ... ] │ +│ ● fedf0e4 Add more things z6MknSL…StBU8Vi (you) 8b0ea80 +0 -0 [ ... ] │ ╰────────────────────────────────────────────────────────────────────────────────────╯ ``` @@ -108,9 +108,9 @@ $ git commit -a -m "Improve code" -q --allow-empty ``` (stderr) $ git push -✓ Patch b8ab1c9 updated to 8767880c31b9e4a04cdb07ad6faa9ce453980399 +✓ Patch fedf0e4 updated to d0018fcc21d87c91a1ff9155aed6b4e57535566b To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi - 8b0ea80..02bef3f feature/2 -> patches/b8ab1c99c1c8205680a3494f04fb3934ec738ddd + 8b0ea80..02bef3f feature/2 -> patches/fedf0e4dcb74ff6db1d5e30a6a254b77f02ff60b ``` This last `git push` worked without specifying an upstream branch despite the @@ -128,10 +128,10 @@ This allows for pushing to the remote patch branch without using the full We can then see that the patch head has moved: ``` -$ rad patch show b8ab1c9 +$ rad patch show fedf0e4 ╭──────────────────────────────────────────────────────────────────────────────╮ │ Title Add more things │ -│ Patch b8ab1c99c1c8205680a3494f04fb3934ec738ddd │ +│ Patch fedf0e4dcb74ff6db1d5e30a6a254b77f02ff60b │ │ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │ │ Head 02bef3fac41b2f98bb3c02b868a53ddfecb55b5f │ │ Branches feature/2 │ @@ -142,7 +142,7 @@ $ rad patch show b8ab1c9 │ 8b0ea80 Add more things │ ├──────────────────────────────────────────────────────────────────────────────┤ │ ● opened by (you) [ ... ] │ -│ ↑ updated to 8767880c31b9e4a04cdb07ad6faa9ce453980399 (02bef3f) [ ... ] │ +│ ↑ updated to d0018fcc21d87c91a1ff9155aed6b4e57535566b (02bef3f) [ ... ] │ ╰──────────────────────────────────────────────────────────────────────────────╯ ``` @@ -155,14 +155,14 @@ $ git rev-parse HEAD ``` $ git status --short --branch -## feature/2...rad/patches/b8ab1c99c1c8205680a3494f04fb3934ec738ddd +## feature/2...rad/patches/fedf0e4dcb74ff6db1d5e30a6a254b77f02ff60b ``` ``` -$ git rev-parse refs/remotes/rad/patches/b8ab1c99c1c8205680a3494f04fb3934ec738ddd +$ git rev-parse refs/remotes/rad/patches/fedf0e4dcb74ff6db1d5e30a6a254b77f02ff60b 02bef3fac41b2f98bb3c02b868a53ddfecb55b5f -$ git ls-remote rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi refs/heads/patches/b8ab1c99c1c8205680a3494f04fb3934ec738ddd -02bef3fac41b2f98bb3c02b868a53ddfecb55b5f refs/heads/patches/b8ab1c99c1c8205680a3494f04fb3934ec738ddd +$ git ls-remote rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi refs/heads/patches/fedf0e4dcb74ff6db1d5e30a6a254b77f02ff60b +02bef3fac41b2f98bb3c02b868a53ddfecb55b5f refs/heads/patches/fedf0e4dcb74ff6db1d5e30a6a254b77f02ff60b ``` ## Force push @@ -183,7 +183,7 @@ Now let's push to the patch head. ``` (stderr) (fail) $ git push To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi - ! [rejected] feature/2 -> patches/b8ab1c99c1c8205680a3494f04fb3934ec738ddd (non-fast-forward) + ! [rejected] feature/2 -> patches/fedf0e4dcb74ff6db1d5e30a6a254b77f02ff60b (non-fast-forward) error: failed to push some refs to 'rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi' hint: Updates were rejected because a pushed branch tip is behind its remote hint: counterpart. Check out this branch and integrate the remote changes @@ -196,18 +196,18 @@ use `--force` to force the update. ``` (stderr) $ git push --force -✓ Patch b8ab1c9 updated to f24334f8cea7b7a5bcaf3bc6deb1408c9bf507ad +✓ Patch fedf0e4 updated to 31ecf28817c44d90686b5c3c624c1f4a534b6478 To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi - + 02bef3f...9304dbc feature/2 -> patches/b8ab1c99c1c8205680a3494f04fb3934ec738ddd (forced update) + + 02bef3f...9304dbc feature/2 -> patches/fedf0e4dcb74ff6db1d5e30a6a254b77f02ff60b (forced update) ``` That worked. We can see the new revision if we call `rad patch show`: ``` -$ rad patch show b8ab1c9 +$ rad patch show fedf0e4 ╭──────────────────────────────────────────────────────────────────────────────╮ │ Title Add more things │ -│ Patch b8ab1c99c1c8205680a3494f04fb3934ec738ddd │ +│ Patch fedf0e4dcb74ff6db1d5e30a6a254b77f02ff60b │ │ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │ │ Head 9304dbc445925187994a7a93222a3f8bde73b785 │ │ Branches feature/2 │ @@ -218,8 +218,8 @@ $ rad patch show b8ab1c9 │ 8b0ea80 Add more things │ ├──────────────────────────────────────────────────────────────────────────────┤ │ ● opened by (you) [ ... ] │ -│ ↑ updated to 8767880c31b9e4a04cdb07ad6faa9ce453980399 (02bef3f) [ ... ] │ -│ ↑ updated to f24334f8cea7b7a5bcaf3bc6deb1408c9bf507ad (9304dbc) [ ... ] │ +│ ↑ updated to d0018fcc21d87c91a1ff9155aed6b4e57535566b (02bef3f) [ ... ] │ +│ ↑ updated to 31ecf28817c44d90686b5c3c624c1f4a534b6478 (9304dbc) [ ... ] │ ╰──────────────────────────────────────────────────────────────────────────────╯ ``` diff --git a/radicle-cli/examples/rad-patch.md b/radicle-cli/examples/rad-patch.md index d74572b9..12a4fbd1 100644 --- a/radicle-cli/examples/rad-patch.md +++ b/radicle-cli/examples/rad-patch.md @@ -26,7 +26,7 @@ Once the code is ready, we open (or create) a patch with our changes for the pro ``` (stderr) $ git push rad -o patch.message="Define power requirements" -o patch.message="See details." HEAD:refs/patches -✓ Patch 077e4bbe9a6e5546f400ef5951768c37a76f13a4 opened +✓ Patch 73b73f376e93e09e0419664766ac9e433bf7d389 opened To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi * [new reference] HEAD -> refs/patches ``` @@ -38,14 +38,14 @@ $ rad patch ╭──────────────────────────────────────────────────────────────────────────────────────────────╮ │ ● ID Title Author Head + - Updated │ ├──────────────────────────────────────────────────────────────────────────────────────────────┤ -│ ● 077e4bb Define power requirements z6MknSL…StBU8Vi (you) 3e674d1 +0 -0 [ ... ] │ +│ ● 73b73f3 Define power requirements z6MknSL…StBU8Vi (you) 3e674d1 +0 -0 [ ... ] │ ╰──────────────────────────────────────────────────────────────────────────────────────────────╯ ``` ``` -$ rad patch show 077e4bbe9a6e5546f400ef5951768c37a76f13a4 -p +$ rad patch show 73b73f376e93e09e0419664766ac9e433bf7d389 -p ╭────────────────────────────────────────────────────────────────────╮ │ Title Define power requirements │ -│ Patch 077e4bbe9a6e5546f400ef5951768c37a76f13a4 │ +│ Patch 73b73f376e93e09e0419664766ac9e433bf7d389 │ │ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │ │ Head 3e674d1a1df90807e934f9ae5da2591dd6848a33 │ │ Branches flux-capacitor-power │ @@ -74,7 +74,7 @@ index 0000000..e69de29 We can also see that it set an upstream for our patch branch: ``` $ git branch -vv -* flux-capacitor-power 3e674d1 [rad/patches/077e4bbe9a6e5546f400ef5951768c37a76f13a4] Define power requirements +* flux-capacitor-power 3e674d1 [rad/patches/73b73f376e93e09e0419664766ac9e433bf7d389] Define power requirements master f2de534 [rad/master] Second commit ``` @@ -90,45 +90,45 @@ $ git commit --message "Add README, just for the fun" ``` ``` (stderr) $ git push rad -o patch.message="Add README, just for the fun" -✓ Patch 077e4bb updated to 5cdcd2e14411e2bfec7b11bcf4667e2e0fc4d417 +✓ Patch 73b73f3 updated to 5605784ae81dad91ba47ea55e19dd16f6280d44b To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi - 3e674d1..27857ec flux-capacitor-power -> patches/077e4bbe9a6e5546f400ef5951768c37a76f13a4 + 3e674d1..27857ec flux-capacitor-power -> patches/73b73f376e93e09e0419664766ac9e433bf7d389 ``` And let's leave a quick comment for our team: ``` -$ rad comment 077e4bbe9a6e5546f400ef5951768c37a76f13a4 --message 'I cannot wait to get back to the 90s!' -31a07b8e7758af2027e74e521a74bea4574280e7 -$ rad comment 077e4bbe9a6e5546f400ef5951768c37a76f13a4 --message 'I cannot wait to get back to the 90s!' --reply-to 31a07b8e7758af2027e74e521a74bea4574280e7 -d66bcb6bfe2e06e57636e8b1ba3ef8098a8bb250 +$ rad comment 73b73f376e93e09e0419664766ac9e433bf7d389 --message 'I cannot wait to get back to the 90s!' +de198e9b1613d827ce294a5b36cecdb8e65abcf1 +$ rad comment 73b73f376e93e09e0419664766ac9e433bf7d389 --message 'I cannot wait to get back to the 90s!' --reply-to de198e9b1613d827ce294a5b36cecdb8e65abcf1 +bd53b38140cf8249ef31c7464d35a4c960258e3f ``` Now, let's checkout the patch that we just created: ``` -$ rad patch checkout 077e4bb -✓ Switched to branch patch/077e4bb -✓ Branch patch/077e4bb setup to track rad/patches/077e4bbe9a6e5546f400ef5951768c37a76f13a4 +$ rad patch checkout 73b73f3 +✓ Switched to branch patch/73b73f3 +✓ Branch patch/73b73f3 setup to track rad/patches/73b73f376e93e09e0419664766ac9e433bf7d389 ``` We can also add a review verdict as such: ``` -$ rad review 077e4bbe9a6e5546f400ef5951768c37a76f13a4 --accept --no-message --no-sync -✓ Patch 077e4bb accepted +$ rad review 73b73f376e93e09e0419664766ac9e433bf7d389 --accept --no-message --no-sync +✓ Patch 73b73f3 accepted ``` Showing the patch list now will reveal the favorable verdict: ``` -$ rad patch show 077e4bb +$ rad patch show 73b73f3 ╭──────────────────────────────────────────────────────────────────────────────╮ │ Title Define power requirements │ -│ Patch 077e4bbe9a6e5546f400ef5951768c37a76f13a4 │ +│ Patch 73b73f376e93e09e0419664766ac9e433bf7d389 │ │ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │ │ Head 27857ec9eb04c69cacab516e8bf4b5fd36090f66 │ -│ Branches flux-capacitor-power, patch/077e4bb │ +│ Branches flux-capacitor-power, patch/73b73f3 │ │ Commits ahead 2, behind 0 │ │ Status open │ │ │ @@ -138,7 +138,7 @@ $ rad patch show 077e4bb │ 3e674d1 Define power requirements │ ├──────────────────────────────────────────────────────────────────────────────┤ │ ● opened by (you) [ ... ] │ -│ ↑ updated to 5cdcd2e14411e2bfec7b11bcf4667e2e0fc4d417 (27857ec) [ ... ] │ +│ ↑ updated to 5605784ae81dad91ba47ea55e19dd16f6280d44b (27857ec) [ ... ] │ │ ✓ accepted by (you) [ ... ] │ ╰──────────────────────────────────────────────────────────────────────────────╯ ``` @@ -146,14 +146,14 @@ $ rad patch show 077e4bb If you make a mistake on the patch description, you can always change it! ``` -$ rad patch edit 077e4bb --message "Define power requirements" --message "Add requirements file" -$ rad patch show 077e4bb +$ rad patch edit 73b73f3 --message "Define power requirements" --message "Add requirements file" +$ rad patch show 73b73f3 ╭──────────────────────────────────────────────────────────────────────────────╮ │ Title Define power requirements │ -│ Patch 077e4bbe9a6e5546f400ef5951768c37a76f13a4 │ +│ Patch 73b73f376e93e09e0419664766ac9e433bf7d389 │ │ Author did:key:z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi │ │ Head 27857ec9eb04c69cacab516e8bf4b5fd36090f66 │ -│ Branches flux-capacitor-power, patch/077e4bb │ +│ Branches flux-capacitor-power, patch/73b73f3 │ │ Commits ahead 2, behind 0 │ │ Status open │ │ │ @@ -163,7 +163,7 @@ $ rad patch show 077e4bb │ 3e674d1 Define power requirements │ ├──────────────────────────────────────────────────────────────────────────────┤ │ ● opened by (you) [ ... ] │ -│ ↑ updated to 5cdcd2e14411e2bfec7b11bcf4667e2e0fc4d417 (27857ec) [ ... ] │ +│ ↑ updated to 5605784ae81dad91ba47ea55e19dd16f6280d44b (27857ec) [ ... ] │ │ ✓ accepted by (you) [ ... ] │ ╰──────────────────────────────────────────────────────────────────────────────╯ ``` diff --git a/radicle-cli/examples/rad-review-by-hunk.md b/radicle-cli/examples/rad-review-by-hunk.md index ea616213..023b19b7 100644 --- a/radicle-cli/examples/rad-review-by-hunk.md +++ b/radicle-cli/examples/rad-review-by-hunk.md @@ -61,7 +61,7 @@ $ git commit -q -m "Update files" ``` (stderr) $ git push rad HEAD:refs/patches -✓ Patch a05c57911e6ec9eba4e5539a095a6a86e2bf7c2c opened +✓ Patch 7f6ed9bd562a36eb1d5689f95600d09247726a23 opened To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi * [new reference] HEAD -> refs/patches ``` @@ -70,7 +70,7 @@ Finally, we do a review of the patch by hunk. The output of this command should match `git diff master -W100% -U5 --patience`: ``` -$ rad review --no-sync --patch -U5 a05c57911e6ec9eba4e5539a095a6a86e2bf7c2c +$ rad review --no-sync --patch -U5 7f6ed9bd562a36eb1d5689f95600d09247726a23 diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 7937fb3..0000000 @@ -116,8 +116,8 @@ rename to notes/INSTRUCTIONS.txt Now let's accept these hunks one by one.. ``` -$ rad review --no-sync --patch --accept --hunk 1 a05c57911e6ec9eba4e5539a095a6a86e2bf7c2c -✓ Loaded existing review ([..]) for patch a05c57911e6ec9eba4e5539a095a6a86e2bf7c2c +$ rad review --no-sync --patch --accept --hunk 1 7f6ed9bd562a36eb1d5689f95600d09247726a23 +✓ Loaded existing review ([..]) for patch 7f6ed9bd562a36eb1d5689f95600d09247726a23 diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 7937fb3..0000000 @@ -127,8 +127,8 @@ index 7937fb3..0000000 -*.draft ``` ``` -$ rad review --no-sync --patch --accept --hunk 1 a05c57911e6ec9eba4e5539a095a6a86e2bf7c2c -✓ Loaded existing review ([..]) for patch a05c57911e6ec9eba4e5539a095a6a86e2bf7c2c +$ rad review --no-sync --patch --accept --hunk 1 7f6ed9bd562a36eb1d5689f95600d09247726a23 +✓ Loaded existing review ([..]) for patch 7f6ed9bd562a36eb1d5689f95600d09247726a23 diff --git a/DISCLAIMER.txt b/DISCLAIMER.txt new file mode 100644 index 0000000..2b5bd86 @@ -138,8 +138,8 @@ index 0000000..2b5bd86 +All food is served as-is, with no warranty! ``` ``` -$ rad review --no-sync --patch --accept -U3 --hunk 1 a05c57911e6ec9eba4e5539a095a6a86e2bf7c2c -✓ Loaded existing review ([..]) for patch a05c57911e6ec9eba4e5539a095a6a86e2bf7c2c +$ rad review --no-sync --patch --accept -U3 --hunk 1 7f6ed9bd562a36eb1d5689f95600d09247726a23 +✓ Loaded existing review ([..]) for patch 7f6ed9bd562a36eb1d5689f95600d09247726a23 diff --git a/MENU.txt b/MENU.txt index 867958c..3af9741 100644 --- a/MENU.txt @@ -153,8 +153,8 @@ index 867958c..3af9741 100644 [..] ``` ``` -$ rad review --no-sync --patch --accept -U3 --hunk 1 a05c57911e6ec9eba4e5539a095a6a86e2bf7c2c -✓ Loaded existing review ([..]) for patch a05c57911e6ec9eba4e5539a095a6a86e2bf7c2c +$ rad review --no-sync --patch --accept -U3 --hunk 1 7f6ed9bd562a36eb1d5689f95600d09247726a23 +✓ Loaded existing review ([..]) for patch 7f6ed9bd562a36eb1d5689f95600d09247726a23 diff --git a/MENU.txt b/MENU.txt index 4e2e828..3af9741 100644 --- a/MENU.txt @@ -169,8 +169,8 @@ index 4e2e828..3af9741 100644 ``` ``` -$ rad review --no-sync --patch --accept --hunk 1 a05c57911e6ec9eba4e5539a095a6a86e2bf7c2c -✓ Loaded existing review ([..]) for patch a05c57911e6ec9eba4e5539a095a6a86e2bf7c2c +$ rad review --no-sync --patch --accept --hunk 1 7f6ed9bd562a36eb1d5689f95600d09247726a23 +✓ Loaded existing review ([..]) for patch 7f6ed9bd562a36eb1d5689f95600d09247726a23 diff --git a/INSTRUCTIONS.txt b/notes/INSTRUCTIONS.txt similarity index 100% rename from INSTRUCTIONS.txt @@ -178,7 +178,7 @@ rename to notes/INSTRUCTIONS.txt ``` ``` -$ rad review --no-sync --patch --accept --hunk 1 a05c57911e6ec9eba4e5539a095a6a86e2bf7c2c -✓ Loaded existing review ([..]) for patch a05c57911e6ec9eba4e5539a095a6a86e2bf7c2c +$ rad review --no-sync --patch --accept --hunk 1 7f6ed9bd562a36eb1d5689f95600d09247726a23 +✓ Loaded existing review ([..]) for patch 7f6ed9bd562a36eb1d5689f95600d09247726a23 ✓ All hunks have been reviewed ``` diff --git a/radicle-cli/examples/workflow/3-issues.md b/radicle-cli/examples/workflow/3-issues.md index b93a5426..ae8cf186 100644 --- a/radicle-cli/examples/workflow/3-issues.md +++ b/radicle-cli/examples/workflow/3-issues.md @@ -7,7 +7,7 @@ Let's say the new car you are designing with your peers has a problem with its f $ rad issue open --title "flux capacitor underpowered" --description "Flux capacitor power requirements exceed current supply" --no-announce ╭─────────────────────────────────────────────────────────╮ │ Title flux capacitor underpowered │ -│ Issue b05e945bb63c11bf80320f4e26ad1d1f7c51f755 │ +│ Issue 2f6eb49efac492327f71437b6bfc01b49afa0981 │ │ Status open │ │ │ │ Flux capacitor power requirements exceed current supply │ @@ -18,11 +18,11 @@ The issue is now listed under our project. ``` $ rad issue list -╭───────────────────────────────────────────────────────────────────────────────────────────────────────────╮ -│ ● ID Title Author Tags Assignees Opened │ -├───────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ ● b05e945 flux capacitor underpowered z6Mkt67…v4N1tRk bob (you) [ .. ] │ -╰───────────────────────────────────────────────────────────────────────────────────────────────────────────╯ +╭─────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ +│ ● ID Title Author Labels Assignees Opened │ +├─────────────────────────────────────────────────────────────────────────────────────────────────────────────┤ +│ ● 2f6eb49 flux capacitor underpowered z6Mkt67…v4N1tRk bob (you) [ .. ] │ +╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ``` Great! Now we've documented the issue for ourselves and others. @@ -33,27 +33,27 @@ others to work on. This is to ensure work is not duplicated. Let's assign this issue to ourself. ``` -$ rad assign b05e945bb63c11bf80320f4e26ad1d1f7c51f755 --to did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk +$ rad assign 2f6eb49efac492327f71437b6bfc01b49afa0981 --to did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk ``` It will now show in the list of issues assigned to us. ``` $ rad issue list --assigned -╭───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ -│ ● ID Title Author Tags Assignees Opened │ -├───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ ● b05e945 flux capacitor underpowered z6Mkt67…v4N1tRk bob (you) bob (z6Mkt67…v4N1tRk) [ .. ] │ -╰───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ +╭─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╮ +│ ● ID Title Author Labels Assignees Opened │ +├─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤ +│ ● 2f6eb49 flux capacitor underpowered z6Mkt67…v4N1tRk bob (you) bob (z6Mkt67…v4N1tRk) [ .. ] │ +╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯ ``` In addition, you can see that when you run `rad issue show` you are listed under the `Assignees`. ``` -$ rad issue show b05e945 +$ rad issue show 2f6eb49 ╭─────────────────────────────────────────────────────────╮ │ Title flux capacitor underpowered │ -│ Issue b05e945bb63c11bf80320f4e26ad1d1f7c51f755 │ +│ Issue 2f6eb49efac492327f71437b6bfc01b49afa0981 │ │ Assignees z6Mkt67…v4N1tRk │ │ Status open │ │ │ @@ -69,6 +69,6 @@ But wait! We've found an important detail about the car's power requirements. It will help whoever works on a fix. ``` -$ rad comment b05e945bb63c11bf80320f4e26ad1d1f7c51f755 --message 'The flux capacitor needs 1.21 Gigawatts' -8b9ee0f0a530f0318e100ea8b9ed3a723bd584f6 +$ rad comment 2f6eb49efac492327f71437b6bfc01b49afa0981 --message 'The flux capacitor needs 1.21 Gigawatts' +24ab347afda760e77d565f9cb013c6db560f44fd ``` diff --git a/radicle-cli/examples/workflow/4-patching-contributor.md b/radicle-cli/examples/workflow/4-patching-contributor.md index ac7f39ea..475a7d21 100644 --- a/radicle-cli/examples/workflow/4-patching-contributor.md +++ b/radicle-cli/examples/workflow/4-patching-contributor.md @@ -26,7 +26,7 @@ Once the code is ready, we open a patch with our changes. ``` (stderr) $ git push rad -o no-sync -o patch.message="Define power requirements" -o patch.message="See details." HEAD:refs/patches -✓ Patch 50e29a111972f3b7d2123c5057de5bdf09bc7b1c opened +✓ Patch 69e881c606639691330051d7d8f013854f32fb87 opened To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk * [new reference] HEAD -> refs/patches ``` @@ -38,12 +38,12 @@ $ rad patch ╭──────────────────────────────────────────────────────────────────────────────────────────────────╮ │ ● ID Title Author Head + - Updated │ ├──────────────────────────────────────────────────────────────────────────────────────────────────┤ -│ ● 50e29a1 Define power requirements z6Mkt67…v4N1tRk bob (you) 3e674d1 +0 -0 [ ... ] │ +│ ● 69e881c Define power requirements z6Mkt67…v4N1tRk bob (you) 3e674d1 +0 -0 [ ... ] │ ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯ -$ rad patch show 50e29a111972f3b7d2123c5057de5bdf09bc7b1c +$ rad patch show 69e881c606639691330051d7d8f013854f32fb87 ╭────────────────────────────────────────────────────────────────────╮ │ Title Define power requirements │ -│ Patch 50e29a111972f3b7d2123c5057de5bdf09bc7b1c │ +│ Patch 69e881c606639691330051d7d8f013854f32fb87 │ │ Author did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk │ │ Head 3e674d1a1df90807e934f9ae5da2591dd6848a33 │ │ Branches flux-capacitor-power │ @@ -62,7 +62,7 @@ We can also confirm that the patch branch is in storage: ``` $ git ls-remote rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk refs/heads/patches/* -3e674d1a1df90807e934f9ae5da2591dd6848a33 refs/heads/patches/50e29a111972f3b7d2123c5057de5bdf09bc7b1c +3e674d1a1df90807e934f9ae5da2591dd6848a33 refs/heads/patches/69e881c606639691330051d7d8f013854f32fb87 ``` Wait, let's add a README too! Just for fun. @@ -77,14 +77,14 @@ $ git commit --message "Add README, just for the fun" ``` ``` (stderr) RAD_SOCKET=/dev/null $ git push -o patch.message="Add README, just for the fun" -✓ Patch 50e29a1 updated to 3530243d46a2e7a8e4eac7afcbb17cc7c56b3d29 +✓ Patch 69e881c updated to dcf3e6dd97c95cf8653cbb8ce47df20d28eb1821 To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk - 3e674d1..27857ec flux-capacitor-power -> patches/50e29a111972f3b7d2123c5057de5bdf09bc7b1c + 3e674d1..27857ec flux-capacitor-power -> patches/69e881c606639691330051d7d8f013854f32fb87 ``` And let's leave a quick comment for our team: ``` -$ rad comment 50e29a111972f3b7d2123c5057de5bdf09bc7b1c --message 'I cannot wait to get back to the 90s!' -4a9d780cf088769722d226d83a1b4663ab176f8e +$ rad comment 69e881c606639691330051d7d8f013854f32fb87 --message 'I cannot wait to get back to the 90s!' +f95ef6c0fb97a5dd05db49f7012010f0c49d59bc ``` diff --git a/radicle-cli/examples/workflow/5-patching-maintainer.md b/radicle-cli/examples/workflow/5-patching-maintainer.md index 9f88ba71..f3123e07 100644 --- a/radicle-cli/examples/workflow/5-patching-maintainer.md +++ b/radicle-cli/examples/workflow/5-patching-maintainer.md @@ -23,7 +23,7 @@ $ rad remote add z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --name bob $ git fetch bob From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk * [new branch] master -> bob/master - * [new branch] patches/50e29a111972f3b7d2123c5057de5bdf09bc7b1c -> bob/patches/50e29a111972f3b7d2123c5057de5bdf09bc7b1c + * [new branch] patches/69e881c606639691330051d7d8f013854f32fb87 -> bob/patches/69e881c606639691330051d7d8f013854f32fb87 ``` The contributor's changes are now visible to us. @@ -31,12 +31,12 @@ The contributor's changes are now visible to us. ``` $ git branch -r bob/master - bob/patches/50e29a111972f3b7d2123c5057de5bdf09bc7b1c + bob/patches/69e881c606639691330051d7d8f013854f32fb87 rad/master -$ rad patch show 50e29a1 +$ rad patch show 69e881c ╭──────────────────────────────────────────────────────────────────────────────╮ │ Title Define power requirements │ -│ Patch 50e29a111972f3b7d2123c5057de5bdf09bc7b1c │ +│ Patch 69e881c606639691330051d7d8f013854f32fb87 │ │ Author did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk │ │ Head 27857ec9eb04c69cacab516e8bf4b5fd36090f66 │ │ Commits ahead 2, behind 0 │ @@ -48,7 +48,7 @@ $ rad patch show 50e29a1 │ 3e674d1 Define power requirements │ ├──────────────────────────────────────────────────────────────────────────────┤ │ ● opened by bob (z6Mkt67…v4N1tRk) [ ... ] │ -│ ↑ updated to 3530243d46a2e7a8e4eac7afcbb17cc7c56b3d29 (27857ec) [ ... ] │ +│ ↑ updated to dcf3e6dd97c95cf8653cbb8ce47df20d28eb1821 (27857ec) [ ... ] │ ╰──────────────────────────────────────────────────────────────────────────────╯ ``` @@ -58,20 +58,20 @@ way will tell others about the corrections we needed before merging the changes. ``` -$ rad patch checkout 50e29a111972f3b7d2123c5057de5bdf09bc7b1c -✓ Switched to branch patch/50e29a1 -✓ Branch patch/50e29a1 setup to track rad/patches/50e29a111972f3b7d2123c5057de5bdf09bc7b1c +$ rad patch checkout 69e881c606639691330051d7d8f013854f32fb87 +✓ Switched to branch patch/69e881c +✓ Branch patch/69e881c setup to track rad/patches/69e881c606639691330051d7d8f013854f32fb87 $ git mv REQUIREMENTS REQUIREMENTS.md $ git commit -m "Use markdown for requirements" -[patch/50e29a1 f567f69] Use markdown for requirements +[patch/69e881c f567f69] Use markdown for requirements 1 file changed, 0 insertions(+), 0 deletions(-) rename REQUIREMENTS => REQUIREMENTS.md (100%) ``` ``` (stderr) $ git push rad -o no-sync -o patch.message="Use markdown for requirements" -✓ Patch 50e29a1 updated to 744c1f0a75b1c42833c9aa32f79cd40443925d66 +✓ Patch 69e881c updated to ab05fcdca93cf4d5b22da8913e2fe0b6d8c79338 To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi - * [new branch] patch/50e29a1 -> patches/50e29a111972f3b7d2123c5057de5bdf09bc7b1c + * [new branch] patch/69e881c -> patches/69e881c606639691330051d7d8f013854f32fb87 ``` Great, all fixed up, lets merge the code. @@ -79,7 +79,7 @@ Great, all fixed up, lets merge the code. ``` $ git checkout master Your branch is up to date with 'rad/master'. -$ git merge patch/50e29a1 +$ git merge patch/69e881c Updating f2de534..f567f69 Fast-forward README.md | 0 @@ -93,13 +93,13 @@ $ git push rad master The patch is now merged and closed :). ``` -$ rad patch show 50e29a1 +$ rad patch show 69e881c ╭──────────────────────────────────────────────────────────────────────────────╮ │ Title Define power requirements │ -│ Patch 50e29a111972f3b7d2123c5057de5bdf09bc7b1c │ +│ Patch 69e881c606639691330051d7d8f013854f32fb87 │ │ Author did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk │ │ Head f567f695d25b4e8fb63b5f5ad2a584529826e908 │ -│ Branches master, patch/50e29a1 │ +│ Branches master, patch/69e881c │ │ Commits up to date │ │ Status merged │ │ │ @@ -110,8 +110,8 @@ $ rad patch show 50e29a1 │ 3e674d1 Define power requirements │ ├──────────────────────────────────────────────────────────────────────────────┤ │ ● opened by bob (z6Mkt67…v4N1tRk) [ ... ] │ -│ ↑ updated to 3530243d46a2e7a8e4eac7afcbb17cc7c56b3d29 (27857ec) [ ... ] │ -│ ↑ updated to 744c1f0a75b1c42833c9aa32f79cd40443925d66 (f567f69) [ ... ] │ +│ ↑ updated to dcf3e6dd97c95cf8653cbb8ce47df20d28eb1821 (27857ec) [ ... ] │ +│ ↑ updated to ab05fcdca93cf4d5b22da8913e2fe0b6d8c79338 (f567f69) [ ... ] │ │ ✓ merged by alice (you) [ ... ] │ ╰──────────────────────────────────────────────────────────────────────────────╯ ``` diff --git a/radicle-cli/src/commands.rs b/radicle-cli/src/commands.rs index 2a43feae..e7036949 100644 --- a/radicle-cli/src/commands.rs +++ b/radicle-cli/src/commands.rs @@ -24,6 +24,8 @@ pub mod rad_init; pub mod rad_inspect; #[path = "commands/issue.rs"] pub mod rad_issue; +#[path = "commands/label.rs"] +pub mod rad_label; #[path = "commands/ls.rs"] pub mod rad_ls; #[path = "commands/node.rs"] @@ -42,14 +44,12 @@ pub mod rad_rm; pub mod rad_self; #[path = "commands/sync.rs"] pub mod rad_sync; -#[path = "commands/tag.rs"] -pub mod rad_tag; #[path = "commands/track.rs"] pub mod rad_track; #[path = "commands/unassign.rs"] pub mod rad_unassign; -#[path = "commands/untag.rs"] -pub mod rad_untag; +#[path = "commands/unlabel.rs"] +pub mod rad_unlabel; #[path = "commands/untrack.rs"] pub mod rad_untrack; #[path = "commands/web.rs"] diff --git a/radicle-cli/src/commands/help.rs b/radicle-cli/src/commands/help.rs index 57d34254..9af7ae3a 100644 --- a/radicle-cli/src/commands/help.rs +++ b/radicle-cli/src/commands/help.rs @@ -31,10 +31,10 @@ const COMMANDS: &[Help] = &[ rad_review::HELP, rad_rm::HELP, rad_self::HELP, - rad_tag::HELP, + rad_label::HELP, rad_track::HELP, rad_unassign::HELP, - rad_untag::HELP, + rad_unlabel::HELP, rad_untrack::HELP, rad_remote::HELP, rad_sync::HELP, diff --git a/radicle-cli/src/commands/issue.rs b/radicle-cli/src/commands/issue.rs index 0dfa10b2..fe815fbc 100644 --- a/radicle-cli/src/commands/issue.rs +++ b/radicle-cli/src/commands/issue.rs @@ -5,7 +5,7 @@ use std::str::FromStr; use anyhow::{anyhow, Context as _}; -use radicle::cob::common::{Reaction, Tag}; +use radicle::cob::common::{Label, Reaction}; use radicle::cob::issue; use radicle::cob::issue::{CloseReason, Issues, State}; use radicle::cob::thread; @@ -36,7 +36,7 @@ Usage rad issue delete [