modified radicle-cli/examples/git/git-push-diverge.md
@@ -6,7 +6,7 @@ First we add a second delegate, Bob, to our repo:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-cob.md
@@ -6,7 +6,7 @@ First create an issue.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -21,7 +21,7 @@ $ rad issue list
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -45,7 +45,7 @@ $ rad patch
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -53,17 +53,17 @@ Both issue and patch COBs can be listed.
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -92,9 +92,9 @@ date Thu, 15 Dec 2022 17:28:04 +0000
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-id-conflict.md
@@ -2,7 +2,7 @@ First let's add Bob as a delegate, and sync the changes to Bob:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -16,11 +16,11 @@ time:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -34,10 +34,10 @@ $ rad id list
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -45,15 +45,15 @@ This isn't a problem as long as we don't try to accept both. So let's accept
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -66,16 +66,16 @@ $ rad sync --fetch rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-id-multi-delegate.md
@@ -1,6 +1,6 @@
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -8,10 +8,10 @@ $ rad sync --fetch rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -47,11 +47,11 @@ $ rad sync --fetch rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -68,7 +68,7 @@ did:key:z6MkedTZGJGqgQ2py2b8kGecfxdt2yRdHWF6JpaZC47fovFn
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -78,33 +78,33 @@ $ rad id list
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -142,21 +142,21 @@ $ rad id show 3fba3b17851cde9814f35acce4f740f53fb63dd7
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-id.md
@@ -15,10 +15,10 @@ threshold to `2`.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -93,22 +93,22 @@ $ rad inspect --identity
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -126,14 +126,14 @@ Note that once a revision is accepted, it can't be edited, redacted or otherwise
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
modified radicle-cli/examples/rad-inspect.md
@@ -21,7 +21,7 @@ z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -49,7 +49,7 @@ history:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified 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
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -22,17 +22,17 @@ $ rad issue list
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -49,7 +49,7 @@ others to work on. This is to ensure work is not duplicated.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -59,14 +59,14 @@ $ rad issue list --assigned
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -75,28 +75,28 @@ But wait! We've found an important detail about the car's power requirements.
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-label.md
@@ -2,16 +2,16 @@ Labeling an issue is easy, let's add the `bug` and `good-first-issue` labels to
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -23,16 +23,16 @@ $ rad issue show 9bf82c141d5a9c54bb1d6b4517eb3bb7da8fb30d --format header
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-merge-after-update.md
@@ -4,7 +4,7 @@ Let's start by creating a patch.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -26,8 +26,8 @@ update it, we expect it to be updated and merged:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
modified radicle-cli/examples/rad-merge-no-ff.md
@@ -4,7 +4,7 @@ First, let's create a patch.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -36,7 +36,7 @@ committer radicle <radicle@localhost> 1671125284 +0000
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-merge-via-push.md
@@ -4,7 +4,7 @@ Let's start by creating two patches.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -12,7 +12,7 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -22,8 +22,8 @@ This creates some remote tracking branches for us:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -34,15 +34,15 @@ z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -61,8 +61,8 @@ When we push to `rad/master`, we automatically merge the patches:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -91,10 +91,10 @@ z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-patch-ahead-behind.md
@@ -37,7 +37,7 @@ $ git log --graph --decorate --abbrev-commit --pretty=oneline --all
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -48,17 +48,17 @@ $ rad patch list
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -93,7 +93,7 @@ $ git checkout -q -b feature/2 feature/1
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -101,10 +101,10 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -124,7 +124,7 @@ If we want to instead create a "stacked" patch, we can do so with the
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -136,10 +136,10 @@ However, since the patch is still intended to be merged into `master`, we see
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-patch-checkout.md
@@ -22,7 +22,7 @@ Once the code is ready, we open (or create) a patch with our changes for the pro
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -30,9 +30,9 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -41,7 +41,7 @@ Now, let's add a README too!
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -55,18 +55,18 @@ Switched to branch 'master'
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
modified radicle-cli/examples/rad-patch-draft.md
@@ -9,7 +9,7 @@ To open a patch in draft mode, we use the `--draft` option:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -17,10 +17,10 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -36,14 +36,14 @@ $ rad patch show 78fcb007b4a3a898379f1e220d4b9fb54ad04cfc
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -60,11 +60,11 @@ If for whatever reason, it needed to go back into draft mode, we could use
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -75,3 +75,4 @@ $ rad patch show 78fcb007b4a3a898379f1e220d4b9fb54ad04cfc
|
|
|
|
|
|
| + | |
modified radicle-cli/examples/rad-patch-pull-update.md
@@ -49,22 +49,22 @@ $ cd heartwood
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -78,19 +78,19 @@ Bob then updates the patch.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -100,16 +100,16 @@ $ rad patch show a84ea2e
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-patch-update.md
@@ -6,16 +6,16 @@ $ git commit -q -m "Not a real change" --allow-empty
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -46,17 +46,17 @@ Now, instead of using `git push` to update the patch, as we normally would,
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -67,6 +67,6 @@ $ rad patch show 2541d346ba0b9377b3d38852dfded43f23833fc1
|
|
|
|
|
|
| - | |
| + | |
|
|
|
modified radicle-cli/examples/rad-patch-via-push.md
@@ -8,7 +8,7 @@ $ git checkout -b feature/1
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -16,10 +16,10 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -39,7 +39,7 @@ branch associated with this patch:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -47,7 +47,7 @@ Let's check that it's up to date with our local head:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -59,14 +59,14 @@ $ git show-ref
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -75,7 +75,7 @@ We can create another patch:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -84,8 +84,8 @@ We see both branches with upstreams now:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -96,8 +96,8 @@ $ rad patch
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -109,9 +109,9 @@ $ git commit -a -m "Improve code" -q --allow-empty
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -129,10 +129,10 @@ This allows for pushing to the remote patch branch without using the full
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -143,7 +143,7 @@ $ rad patch show b1fd7b6
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -156,14 +156,14 @@ $ git rev-parse HEAD
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -184,7 +184,7 @@ Now let's push to the patch head.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -197,18 +197,18 @@ use `--force` to force the update.
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -219,8 +219,8 @@ $ rad patch show b1fd7b6
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified 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
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -38,14 +38,14 @@ $ rad patch
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -74,7 +74,7 @@ index 0000000..e69de29
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -90,48 +90,48 @@ $ git commit --message "Add README, just for the fun"
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -141,7 +141,7 @@ $ rad patch show a892664
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -149,14 +149,14 @@ $ rad patch show a892664
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -166,7 +166,7 @@ $ rad patch show a892664
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-review-by-hunk.md
@@ -61,7 +61,7 @@ $ git commit -q -m "Update files"
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -70,7 +70,7 @@ Finally, we do a review of the patch by hunk. The output of this command should
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -116,8 +116,8 @@ rename to notes/INSTRUCTIONS.txt
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -127,8 +127,8 @@ index 7937fb3..0000000
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -138,8 +138,8 @@ index 0000000..2b5bd86
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -153,8 +153,8 @@ index 867958c..3af9741 100644
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -169,8 +169,8 @@ index 4e2e828..3af9741 100644
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -178,7 +178,7 @@ rename to notes/INSTRUCTIONS.txt
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
modified 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
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -22,7 +22,7 @@ $ rad issue list
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -31,6 +31,6 @@ found an important detail about the car's power requirements. It will help
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
modified radicle-cli/examples/workflow/4-patching-contributor.md
@@ -26,7 +26,7 @@ Once the code is ready, we open a patch with our changes.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -38,12 +38,12 @@ $ rad patch
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -62,7 +62,7 @@ We can also confirm that the patch branch is in storage:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -77,14 +77,14 @@ $ git commit --message "Add README, just for the fun"
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
modified radicle-cli/examples/workflow/5-patching-maintainer.md
@@ -22,7 +22,7 @@ $ git fetch bob
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -30,12 +30,12 @@ The contributor's changes are now visible to us.
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -47,7 +47,7 @@ $ rad patch show f5e2be4
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -57,20 +57,20 @@ way will tell others about the corrections we needed before merging the
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -78,7 +78,7 @@ Great, all fixed up, lets merge the code.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -89,7 +89,7 @@ Fast-forward
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -98,10 +98,10 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -113,9 +113,9 @@ $ rad patch show f5e2be4
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified radicle-httpd/src/api/v1/projects.rs
@@ -1980,7 +1980,7 @@ mod routes {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2075,20 +2075,24 @@ mod routes {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2099,7 +2103,7 @@ mod routes {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2120,23 +2124,23 @@ mod routes {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2146,14 +2150,14 @@ mod routes {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2215,7 +2219,7 @@ mod routes {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2226,14 +2230,14 @@ mod routes {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2366,7 +2370,7 @@ mod routes {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2615,10 +2619,10 @@ mod routes {
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -2629,7 +2633,7 @@ mod routes {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-httpd/src/test.rs
@@ -34,23 +34,26 @@ pub const HEAD: &str = "e8c676b9e3b42308dc9d218b70faa5408f8e58ca";
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -61,7 +64,7 @@ pub fn profile(home: &Path, seed: [u8; 32]) -> radicle::Profile {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-node/src/runtime.rs
@@ -136,7 +136,13 @@ impl Runtime {
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified radicle-node/src/test/environment.rs
@@ -107,12 +107,19 @@ impl Environment {
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -329,7 +336,14 @@ impl Node<MockSigner> {
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified radicle-node/src/tests.rs
@@ -249,7 +249,7 @@ fn test_inventory_sync() {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -631,13 +631,13 @@ fn test_refs_announcement_relay() {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -703,7 +703,7 @@ fn test_refs_announcement_fetch_trusted_no_inventory() {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1202,7 +1202,7 @@ fn test_queued_fetch() {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1246,7 +1246,11 @@ fn test_refs_synced_event() {
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1255,10 +1259,12 @@ fn test_push_and_pull() {
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
modified radicle/src/cob/identity.rs
@@ -1262,7 +1262,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1316,7 +1316,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1346,7 +1346,6 @@ mod test {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -1384,7 +1383,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1397,7 +1396,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle/src/identity/doc.rs
@@ -449,7 +449,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -480,7 +480,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -496,7 +496,7 @@ mod test {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle/src/profile.rs
@@ -20,12 +20,12 @@ use thiserror::Error;
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -167,10 +167,16 @@ pub struct Profile {
|
|
|
|
|
|
| - | |
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -185,12 +191,18 @@ impl Profile {
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -207,6 +219,13 @@ impl Profile {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified radicle/src/rad.rs
@@ -369,7 +369,7 @@ mod tests {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -423,7 +423,7 @@ mod tests {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -460,7 +460,7 @@ mod tests {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle/src/storage.rs
@@ -313,6 +313,8 @@ impl<V> Deref for Remote<V> {
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
@@ -538,6 +540,10 @@ where
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified radicle/src/storage/git.rs
@@ -81,11 +81,16 @@ impl<'a> TryFrom<git2::Reference<'a>> for Ref {
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -125,7 +130,7 @@ impl WriteStorage for Storage {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -135,7 +140,7 @@ impl WriteStorage for Storage {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -144,7 +149,7 @@ impl Storage {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -286,7 +291,7 @@ impl Repository {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -296,9 +301,8 @@ impl Repository {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -320,7 +324,7 @@ impl Repository {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1116,7 +1120,7 @@ mod tests {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1145,7 +1149,7 @@ mod tests {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle/src/test.rs
@@ -95,16 +95,23 @@ pub mod setup {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -243,9 +250,21 @@ pub mod setup {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified radicle/src/test/fixtures.rs
@@ -1,9 +1,11 @@
|
|
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -12,10 +14,18 @@ use crate::storage::refs::SignedRefs;
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle/src/test/storage.rs
@@ -11,10 +11,13 @@ use crate::node::NodeId;
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -25,17 +28,14 @@ impl MockStorage {
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -55,6 +55,10 @@ impl MockStorage {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|