cli/sync: Also print node addresses
26 files changed
+133
-103
72913b8c
→
dc1ff882
modified radicle-cli/examples/git/git-push-amend.md
@@ -5,7 +5,7 @@ c036c0d89ce26aef3ad7da402157dba16b5163b4
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/git/git-push-converge.md
@@ -14,15 +14,15 @@ responsibilities:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -58,14 +58,14 @@ found` error is showing up:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -100,8 +100,8 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -126,8 +126,8 @@ Once Eve also resets to the merge commits, the canonical `master` is set to this
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/git/git-push-diverge.md
@@ -13,7 +13,7 @@ Then, as Bob, we commit some code on top of the canonical head:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/git/git-push-rollback.md
@@ -12,7 +12,7 @@ Bob then syncs these changes and adds a new commit:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/git/git-tag.md
@@ -37,7 +37,7 @@ Bob fetches the tag from Alice, by adding her as a remote:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -73,7 +73,7 @@ update of the tag:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-clone-all.md
@@ -1,7 +1,7 @@
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-clone-connect.md
@@ -5,9 +5,9 @@ automatically connect to the necessary seeds.
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-clone-directory.md
@@ -4,7 +4,7 @@ by specifying the directory in the `rad clone` command:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -22,6 +22,6 @@ and is not empty, will fail:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
modified radicle-cli/examples/rad-clone-partial-fail.md
@@ -16,8 +16,8 @@ still returns successfully.
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-clone.md
@@ -4,7 +4,7 @@ To create a local copy of a repository on the radicle network, we use the
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-fetch.md
@@ -19,7 +19,7 @@ by passing the `--fetch` option.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-id-collaboration.md
@@ -9,8 +9,8 @@ to have a fork of the project and Alice must be aware of the fork:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -50,15 +50,15 @@ So, instead Alice needs to first follow Bob and fetch his references:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -67,8 +67,8 @@ Bob can confirm that he was made a delegate by fetching the update:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -83,8 +83,8 @@ between Alice and Bob. Eve first needs to setup a fork:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -107,8 +107,8 @@ Bob then adds Eve as a delegate:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -122,8 +122,8 @@ the change to meet a quorum of votes (`votes >= (delegates / 2) + 1`):
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -157,8 +157,8 @@ since she has become a delegate:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -173,8 +173,8 @@ see that both seeds are `synced`:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-id-conflict.md
@@ -7,7 +7,7 @@ $ rad id update --title "Add Bob" --description "Add Bob as a delegate" --delega
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -28,7 +28,7 @@ revisions.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -62,7 +62,7 @@ accepted now.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-id-multi-delegate.md
@@ -6,7 +6,7 @@ $ rad id update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Add Bob" --des
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -57,8 +57,8 @@ $ rad id update --repo rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji --title "Add Eve" --des
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-id-threshold.md
@@ -96,7 +96,7 @@ errors:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -170,8 +170,8 @@ sync` and fetch his references:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -192,8 +192,8 @@ $ rad fork
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-init-private-clone-seed.md
@@ -31,7 +31,7 @@ $ rad inspect --identity
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -49,5 +49,5 @@ We can also use `rad seed` to seed and fetch without creating a checkout.
|
|
|
|
|
|
| - | |
| + | |
|
modified radicle-cli/examples/rad-init-private-clone.md
@@ -7,7 +7,7 @@ $ rad ls
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -26,7 +26,7 @@ that Alice has the repo after she announced her refs:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-init-private-seed.md
@@ -24,7 +24,7 @@ He has to specify a seed that isn't in his routing table:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -42,7 +42,7 @@ seed succeeds.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-patch-checkout-force.md
@@ -24,7 +24,7 @@ On the other end, Bob uses `rad patch checkout` to view the patch:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-patch-delete.md
@@ -19,7 +19,7 @@ To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkE
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-patch-pull-update.md
@@ -23,7 +23,7 @@ To push changes, run `git push`.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-push-and-pull-patches.md
@@ -17,7 +17,7 @@ $ rad patch checkout d004b67
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/rad-sync.md
@@ -55,8 +55,8 @@ We can also use the `--fetch` option to only fetch objects:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -64,8 +64,8 @@ Specifying both `--fetch` and `--announce` is equivalent to specifying none:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -74,7 +74,7 @@ It's also possible to use the `--seed` flag to only sync with a specific node:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -87,7 +87,7 @@ $ rad issue open --title "Test `rad sync --replicas`" --description "Check that
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/workflow/5-patching-maintainer.md
@@ -8,7 +8,7 @@ of this.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/examples/workflow/6-pulling-contributor.md
@@ -10,7 +10,7 @@ f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-cli/src/commands/sync.rs
@@ -9,9 +9,9 @@ use anyhow::{anyhow, Context as _};
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -461,25 +461,35 @@ pub fn fetch(
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -512,7 +522,18 @@ pub fn fetch(
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -524,13 +545,13 @@ pub fn fetch(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -542,7 +563,7 @@ fn connect(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -552,7 +573,7 @@ fn connect(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -562,7 +583,7 @@ fn connect(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -574,20 +595,29 @@ fn connect(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
| + | |
|
|
|
|
|