From 6f17a4db67206748b5fe8f812920efaf9b7427ac Mon Sep 17 00:00:00 2001
From: Alexis Sellier <self@cloudhead.io>
Date: Wed, 19 Apr 2023 16:34:29 +0200
Subject: [PATCH] cli: Don't show patch diff by default

It can be re-enabled with `-p`, which is what git uses usually.
---
 radicle-cli/examples/rad-patch.md                |  2 +-
 .../examples/workflow/4-patching-contributor.md  | 11 -----------
 radicle-cli/src/commands/patch.rs                | 16 ++++++++++++++--
 radicle-cli/src/commands/patch/show.rs           | 10 ++++++----
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/radicle-cli/examples/rad-patch.md b/radicle-cli/examples/rad-patch.md
index 84027964..6f89a2ee 100644
--- a/radicle-cli/examples/rad-patch.md
+++ b/radicle-cli/examples/rad-patch.md
@@ -48,7 +48,7 @@ $ rad patch
 ╰─────────────────────────────────────────────────────────────────────────────────────────╯
 ```
 ```
-$ rad patch show 191a14e520f2eeff7c0e3ee0a5523c5217eecb89
+$ rad patch show 191a14e520f2eeff7c0e3ee0a5523c5217eecb89 -p
 ╭─────────────────────────────────────────────────────────────────────────────────────────╮
 │ Title   Define power requirements                                                       │
 │ Patch   191a14e520f2eeff7c0e3ee0a5523c5217eecb89                                        │
diff --git a/radicle-cli/examples/workflow/4-patching-contributor.md b/radicle-cli/examples/workflow/4-patching-contributor.md
index 3f0946a5..aeef1cbf 100644
--- a/radicle-cli/examples/workflow/4-patching-contributor.md
+++ b/radicle-cli/examples/workflow/4-patching-contributor.md
@@ -57,17 +57,6 @@ $ rad patch show a07ef7743a32a2e902672ea3526d1db6ee08108a
 ├─────────────────────────────────────────────────────────────────────────────────────────┤
 │ ● opened by did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (you) [..         ]│
 ╰─────────────────────────────────────────────────────────────────────────────────────────╯
-
-commit 3e674d1a1df90807e934f9ae5da2591dd6848a33
-Author: radicle <radicle@localhost>
-Date:   Thu Dec 15 17:28:04 2022 +0000
-
-    Define power requirements
-
-diff --git a/REQUIREMENTS b/REQUIREMENTS
-new file mode 100644
-index 0000000..e69de29
-
 ```
 
 Wait, let's add a README too! Just for fun.
diff --git a/radicle-cli/src/commands/patch.rs b/radicle-cli/src/commands/patch.rs
index 3d9348f5..b42742cc 100644
--- a/radicle-cli/src/commands/patch.rs
+++ b/radicle-cli/src/commands/patch.rs
@@ -45,6 +45,10 @@ Usage
     rad patch checkout <patch-id> [<option>...]
     rad patch delete <patch-id> [<option>...]
 
+Show options
+
+    -p, --patch                Show the actual patch diff
+
 Create/Update options
 
         --[no-]announce        Announce patch to network (default: false)
@@ -84,6 +88,7 @@ pub enum Operation {
     },
     Show {
         patch_id: Rev,
+        diff: bool,
     },
     Update {
         patch_id: Option<Rev>,
@@ -125,6 +130,7 @@ impl Args for Options {
         let mut message = Message::default();
         let mut push = true;
         let mut filter = Some(patch::State::Open);
+        let mut diff = false;
 
         while let Some(arg) = parser.next()? {
             match arg {
@@ -158,6 +164,11 @@ impl Args for Options {
                     push = false;
                 }
 
+                // Show options.
+                Long("patch") | Short('p') if op == Some(OperationName::Show) => {
+                    diff = true;
+                }
+
                 // List options.
                 Long("all") => {
                     filter = None;
@@ -205,6 +216,7 @@ impl Args for Options {
             OperationName::List => Operation::List { filter },
             OperationName::Show => Operation::Show {
                 patch_id: patch_id.ok_or_else(|| anyhow!("a patch must be provided"))?,
+                diff,
             },
             OperationName::Delete => Operation::Delete {
                 patch_id: patch_id.ok_or_else(|| anyhow!("a patch must be provided"))?,
@@ -249,9 +261,9 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
         Operation::List { filter } => {
             list::run(&repository, &profile, Some(workdir), filter)?;
         }
-        Operation::Show { patch_id } => {
+        Operation::Show { patch_id, diff } => {
             let patch_id = patch_id.resolve(&repository.backend)?;
-            show::run(&profile, &repository, &workdir, &patch_id)?;
+            show::run(&profile, &repository, &workdir, &patch_id, diff)?;
         }
         Operation::Update {
             ref patch_id,
diff --git a/radicle-cli/src/commands/patch/show.rs b/radicle-cli/src/commands/patch/show.rs
index 824b231f..2eed7563 100644
--- a/radicle-cli/src/commands/patch/show.rs
+++ b/radicle-cli/src/commands/patch/show.rs
@@ -40,6 +40,7 @@ pub fn run(
     // TODO: Should be optional.
     workdir: &git::raw::Repository,
     patch_id: &PatchId,
+    diff: bool,
 ) -> anyhow::Result<()> {
     let patches = patch::Patches::open(stored)?;
     let Some(patch) = patches.get(patch_id)? else {
@@ -91,10 +92,11 @@ pub fn run(
         widget.push(line);
     }
     widget.print();
-    term::blank();
-
-    show_patch_diff(&patch, stored, workdir)?;
-    term::blank();
 
+    if diff {
+        term::blank();
+        show_patch_diff(&patch, stored, workdir)?;
+        term::blank();
+    }
     Ok(())
 }