Radish alpha
h
Radicle Heartwood Protocol & Stack
Radicle
Git (anonymous pull)
Log in to clone via SSH
cli: Small change to output for clarity
cloudhead committed 2 years ago
commit 6349c1c55957083ea40570d4cfe667eac3e86a8a
parent 9f9df6264ea48cedd4588e09e0fa103a2595c5cc
11 files changed +16 -16
modified rad-patch.1.adoc
@@ -204,7 +204,7 @@ To update a patch, we simply make our changes locally and push:

    $ git commit --amend
    $ git push --force
-
    ✓ Patch 90c77f2 updated to d0018fcc21d87c91a1ff9155aed6b4e57535566b
+
    ✓ Patch 90c77f2 updated to revision d0018fcc21d87c91a1ff9155aed6b4e57535566b
    ...

Note that this will only work if the current branch upstream is set correctly.
modified radicle-cli/examples/rad-merge-after-update.md
@@ -27,7 +27,7 @@ update it, we expect it to be updated and merged:
``` (stderr) RAD_SOCKET=/dev/null
$ git checkout feature/1 -q
$ git push -f
-
✓ Patch a1207f6 updated to [...]
+
✓ Patch a1207f6 updated to revision [...]
✓ Patch a1207f6e82700e42cc46c9c38c7786b18cbd2040 merged
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
 + 20aa5dd...954bcdb feature/1 -> patches/a1207f6e82700e42cc46c9c38c7786b18cbd2040 (forced update)
modified radicle-cli/examples/rad-patch-checkout-force.md
@@ -45,7 +45,7 @@ $ git commit --message "Add README, just for the fun"

``` ~alice (stderr)
$ git push rad -o patch.message="Add README, just for the fun"
-
✓ Patch 6ff4f09 updated to 0c0942e2ff2488617d950ede15567ca39a29972e
+
✓ Patch 6ff4f09 updated to revision 0c0942e2ff2488617d950ede15567ca39a29972e
✓ Synced with 1 node(s)
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
   3e674d1..27857ec  flux-capacitor-power -> patches/6ff4f09c1b5a81347981f59b02ef43a31a07cdae
modified radicle-cli/examples/rad-patch-checkout.md
@@ -59,7 +59,7 @@ We can now finish off the update:

``` (stderr)
$ git push rad -o patch.message="Add README, just for the fun"
-
✓ Patch 6ff4f09 updated to 0c0942e2ff2488617d950ede15567ca39a29972e
+
✓ Patch 6ff4f09 updated to revision 0c0942e2ff2488617d950ede15567ca39a29972e
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
   3e674d1..27857ec  patch/6ff4f09 -> patches/6ff4f09c1b5a81347981f59b02ef43a31a07cdae
```
modified radicle-cli/examples/rad-patch-pull-update.md
@@ -82,7 +82,7 @@ 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 48c3035 updated to 8c15a61af45f561b4bf0694aee03ade34a1b18f5
+
✓ Patch 48c3035 updated to revision 8c15a61af45f561b4bf0694aee03ade34a1b18f5
✓ Synced with 1 node(s)
To rad://zhbMU4DUXrzB8xT6qAJh6yZ7bFMK/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
   bdcdb30..cad2666  bob/feature -> patches/48c30356be83049458c0608d5a6f84789e9dc1d0
modified radicle-cli/examples/rad-patch-via-push.md
@@ -112,7 +112,7 @@ $ git commit -a -m "Improve code" -q --allow-empty

``` (stderr)
$ git push rad
-
✓ Patch b77b2e8 updated to 8d6692ce2b2219a54d09ccd5feefedb2bae33eba
+
✓ Patch b77b2e8 updated to revision 8d6692ce2b2219a54d09ccd5feefedb2bae33eba
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
   8b0ea80..02bef3f  feature/2 -> patches/b77b2e8a05adcdc859a0184f7db859df1c6686b6
```
@@ -200,7 +200,7 @@ use `--force` to force the update.

``` (stderr)
$ git push --force
-
✓ Patch b77b2e8 updated to 8438ab3940316abe65c93982a0a8f39688400359
+
✓ Patch b77b2e8 updated to revision 8438ab3940316abe65c93982a0a8f39688400359
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
 + 02bef3f...9304dbc feature/2 -> patches/b77b2e8a05adcdc859a0184f7db859df1c6686b6 (forced update)
```
modified radicle-cli/examples/rad-patch.md
@@ -126,7 +126,7 @@ $ git commit --message "Add README, just for the fun"
```
``` (stderr)
$ git push rad -o patch.message="Add README, just for the fun"
-
✓ Patch 6ff4f09 updated to e0fd9f00b51e10e1ca88868e68e46e859ed371d7
+
✓ Patch 6ff4f09 updated to revision e0fd9f00b51e10e1ca88868e68e46e859ed371d7
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
   3e674d1..27857ec  flux-capacitor-power -> patches/6ff4f09c1b5a81347981f59b02ef43a31a07cdae
```
modified radicle-cli/examples/rad-push-and-pull-patches.md
@@ -32,7 +32,7 @@ f2de534b5e81d7c6e2dcaf58c3dd91573c0a0354
$ git checkout patch/0fd67a0 -q
$ git commit --allow-empty -m "Changes #2" -q
$ git push
-
✓ Patch 0fd67a0 updated to c360232989049f6d95efe3512e68608317333a5e
+
✓ Patch 0fd67a0 updated to revision c360232989049f6d95efe3512e68608317333a5e
✓ Synced with 1 node(s)
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
 * [new branch]      patch/0fd67a0 -> patches/0fd67a0364af1f79ed8770a35ed09d85571d4c21
@@ -51,7 +51,7 @@ From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji
$ git checkout - -q
$ git commit --allow-empty -m "Changes #3" -q
$ git push
-
✓ Patch 0fd67a0 updated to c4115970191cd0e67212b6d26ad9e3bd992dce35
+
✓ Patch 0fd67a0 updated to revision c4115970191cd0e67212b6d26ad9e3bd992dce35
✓ Synced with 1 node(s)
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
   c2aaf1c..d9f8caf  patch/0fd67a0 -> patches/0fd67a0364af1f79ed8770a35ed09d85571d4c21
modified radicle-cli/examples/workflow/4-patching-contributor.md
@@ -77,7 +77,7 @@ $ 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 3581e83 updated to 6de8527cdf51f96e12649c7278efe1dccfdee885
+
✓ Patch 3581e83 updated to revision 6de8527cdf51f96e12649c7278efe1dccfdee885
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
   3e674d1..27857ec  flux-capacitor-power -> patches/3581e83ad18f5cdd806ab50fa11cfd5dd4e8ae1c
```
modified radicle-cli/examples/workflow/5-patching-maintainer.md
@@ -55,7 +55,7 @@ $ git commit -m "Use markdown for requirements"
```
``` (stderr)
$ git push rad -o no-sync -o patch.message="Use markdown for requirements"
-
✓ Patch 3581e83 updated to abb0360eae315bbd460743381303567587ab0e08
+
✓ Patch 3581e83 updated to revision abb0360eae315bbd460743381303567587ab0e08
To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi
 * [new branch]      patch/3581e83 -> patches/3581e83ad18f5cdd806ab50fa11cfd5dd4e8ae1c
```
modified radicle-remote-helper/src/push.rs
@@ -473,10 +473,10 @@ fn patch_update<G: Signer>(
    let revision = patch.update(message, base, head, signer)?;

    eprintln!(
-
        "{} Patch {} updated to {}",
+
        "{} Patch {} updated to revision {}",
        cli::format::positive("✓"),
-
        cli::format::dim(cli::format::cob(&patch_id)),
-
        cli::format::tertiary(revision)
+
        cli::format::tertiary(cli::format::cob(&patch_id)),
+
        cli::format::dim(revision)
    );

    // In this case, the patch was already merged via git, and pushed to storage.
@@ -594,7 +594,7 @@ fn patch_merge<G: Signer>(
            "{} Patch {} merged at revision {}",
            cli::format::positive("✓"),
            cli::format::tertiary(merged.patch),
-
            cli::format::oid(revision),
+
            cli::format::dim(cli::format::oid(revision)),
        );
    }