diff --git a/radicle-httpd/Cargo.toml b/radicle-httpd/Cargo.toml index 05ce9b662..8c92063d9 100644 --- a/radicle-httpd/Cargo.toml +++ b/radicle-httpd/Cargo.toml @@ -37,7 +37,7 @@ hyper = { version = "1.0.1", default-features = false } lexopt = { version = "0.3.0" } lru = { version = "0.12.0" } nonempty = { version = "0.9.0", features = ["serialize"] } -radicle-surf = { version = "0.19.0", default-features = false, features = ["serde"] } +radicle-surf = { version = "0.21.0", default-features = false, features = ["serde"] } serde = { version = "1", features = ["derive"] } serde_json = { version = "1", features = ["preserve_order"] } thiserror = { version = "1" } diff --git a/radicle-httpd/src/api/v1/projects.rs b/radicle-httpd/src/api/v1/projects.rs index 49dd197a3..d3e979087 100644 --- a/radicle-httpd/src/api/v1/projects.rs +++ b/radicle-httpd/src/api/v1/projects.rs @@ -1190,8 +1190,45 @@ mod routes { }, }, "diff": { - "added": [ + "files": [ { + "state": "deleted", + "path": "CONTRIBUTING", + "diff": { + "type": "plain", + "hunks": [ + { + "header": "@@ -1 +0,0 @@\n", + "lines": [ + { + "line": "Thank you very much!\n", + "lineNo": 1, + "type": "deletion", + }, + ], + "old": { + "start": 1, + "end": 2, + }, + "new": { + "start": 0, + "end": 0, + }, + }, + ], + "stats": { + "additions": 0, + "deletions": 1, + }, + "eof": "noneMissing", + }, + "old": { + "oid": "82eb77880c693655bce074e3dbbd9fa711dc018b", + "mode": "blob", + }, + }, + { + "state": "added", "path": "README", "diff": { "type": "plain", @@ -1227,6 +1264,7 @@ mod routes { }, }, { + "state": "added", "path": "dir1/README", "diff": { "type": "plain", @@ -1260,48 +1298,8 @@ mod routes { "oid": "1dd5654ca2d2cf9f33b14c92b5ca9e1d21a91ae1", "mode": "blob", }, - } - ], - "deleted": [ - { - "path": "CONTRIBUTING", - "diff": { - "type": "plain", - "hunks": [ - { - "header": "@@ -1 +0,0 @@\n", - "lines": [ - { - "line": "Thank you very much!\n", - "lineNo": 1, - "type": "deletion", - }, - ], - "old": { - "start": 1, - "end": 2, - }, - "new": { - "start": 0, - "end": 0, - }, - }, - ], - "stats": { - "additions": 0, - "deletions": 1, - }, - "eof": "noneMissing", - }, - "old": { - "oid": "82eb77880c693655bce074e3dbbd9fa711dc018b", - "mode": "blob", - }, }, ], - "moved": [], - "copied": [], - "modified": [], "stats": { "filesChanged": 3, "insertions": 2, @@ -1604,8 +1602,9 @@ mod routes { response.json().await, json!({ "diff": { - "added": [ + "files": [ { + "state": "added", "path": "dir1/README", "diff": { "type": "plain", @@ -1641,10 +1640,6 @@ mod routes { }, }, ], - "deleted": [], - "moved": [], - "copied": [], - "modified": [], "stats": { "filesChanged": 1, "insertions": 1,