cli: Update to radicle-surf 0.16

radicle-dev · Sep 27, 2023 · 154566f · 154566f
1 parent b896a7f
commit 154566f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/radicle-cli/Cargo.toml b/radicle-cli/Cargo.toml
@@ -22,7 +22,7 @@ nonempty = { version = "0.8" }
 # N.b. this is required to use macros, even though it's re-exported
 # through radicle
 radicle-git-ext = { version = "0.6.0", features = ["serde"] }
-radicle-surf = { version = "0.15.0" }
+radicle-surf = { version = "0.16.0" }
 serde = { version = "1.0" }
 serde_json = { version = "1" }
 serde_yaml = { version = "0.8" }

diff --git a/radicle-cli/src/commands/diff.rs b/radicle-cli/src/commands/diff.rs
@@ -104,7 +104,6 @@ pub fn run(options: Options, _ctx: impl term::Context) -> anyhow::Result<()> {
     let mut find_opts = git::raw::DiffFindOptions::new();
     find_opts.exact_match_only(true);
     find_opts.all(true);
-    find_opts.copies(false); // We don't support finding copies at the moment.
 
     let mut diff = match oids.as_slice() {
         [] => {

diff --git a/radicle-cli/src/git/pretty_diff.rs b/radicle-cli/src/git/pretty_diff.rs
@@ -160,10 +160,10 @@ impl ToPretty for DiffContent {
                 Some((f.old.oid, f.path.clone())),
                 Some((f.new.oid, f.path.clone())),
             ),
-            FileDiff::Copied(_) => {
-                // This is due to not having `oid`s for copied files yet.
-                unimplemented!("DiffContent::pretty: copied files are not supported in diffs")
-            }
+            FileDiff::Copied(f) => (
+                Some((f.old.oid, f.old_path.clone())),
+                Some((f.old.oid, f.new_path.clone())),
+            ),
         };
 
         let mut header = header.pretty(hi, &(), repo);

diff --git a/radicle-httpd/Cargo.toml b/radicle-httpd/Cargo.toml
@@ -27,7 +27,7 @@ hyper = { version = "0.14.17", default-features = false }
 lexopt = { version = "0.2.1" }
 lru = { version = "0.11.0" }
 nonempty = { version = "0.8.1", features = ["serialize"] }
-radicle-surf = { version = "0.15.0", default-features = false, features = ["serde"] }
+radicle-surf = { version = "0.16.0", default-features = false, features = ["serde"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1", features = ["preserve_order"] }
 thiserror = { version = "1" }