diff --git a/Cargo.lock b/Cargo.lock index 6c42863d..096e851c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -974,9 +974,9 @@ checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "git-ref-format" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee7296543085890905b49ee720902b25133a8d878b7221488d0450bbd965741" +checksum = "137adab7111fcb575db6f07dae3a7d37f3c2630878954c9931f7135dfa33eeef" dependencies = [ "git-ref-format-core", "git-ref-format-macro", @@ -984,9 +984,9 @@ dependencies = [ [[package]] name = "git-ref-format-core" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54d2d2c6b5f0b38d20c51883abe9ee5879fb50e56a8255bb35ac0b0c679504c5" +checksum = "ebb6549ddc63ba5722acb98c823b0eccb7f8b979407bd2a8fd616f581ae50982" dependencies = [ "serde", "thiserror", @@ -994,9 +994,9 @@ dependencies = [ [[package]] name = "git-ref-format-macro" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b7367435d968adc55ba8cd0bb3c12a3cb517270f110b5300df9c6f0726c762" +checksum = "18ffd0101a3bd9a3aba39602b8b20751ddb7ee11596debb58be3074209dad2ae" dependencies = [ "git-ref-format-core", "proc-macro-error", @@ -2043,9 +2043,9 @@ dependencies = [ [[package]] name = "radicle-git-ext" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85d13d7488924b07c0d541760520b1e4224c6ffa2d9765e05d1de9591e248970" +checksum = "90bc5efea239afa1fb374923be50c3a5f98cec92d53b5fa55bdf57ac76b16433" dependencies = [ "git-ref-format", "git2", @@ -2152,9 +2152,9 @@ checksum = "db20136bbc9ae63f3fec8e5a6c369f4902fac2244501b5dfc6d668e43475aaa4" [[package]] name = "radicle-surf" -version = "0.12.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de8c146d519788c2edf77de4d876a168de47230b8c57b9e3f7fdc3dc72b2a0cb" +checksum = "b801a32980495a643bd380cc88f2074cf978862efbc8c085d5bd9f3be4caafd6" dependencies = [ "anyhow", "base64 0.13.1", diff --git a/radicle-cli/Cargo.toml b/radicle-cli/Cargo.toml index 6c76acc6..8cc3ad11 100644 --- a/radicle-cli/Cargo.toml +++ b/radicle-cli/Cargo.toml @@ -13,7 +13,7 @@ path = "src/main.rs" [dependencies] anyhow = { version = "1" } chrono = { version = "0.4", default-features = false, features = ["clock", "std"] } -git-ref-format = { version = "0.2.3", features = ["macro"] } +git-ref-format = { version = "0.3.0", features = ["macro"] } json-color = { version = "0.7" } lexopt = { version = "0.2" } localtime = { version = "1.2.0" } @@ -21,8 +21,8 @@ log = { version = "0.4", features = ["std"] } 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.5.0", features = ["serde"] } -radicle-surf = { version = "0.12.0" } +radicle-git-ext = { version = "0.6.0", features = ["serde"] } +radicle-surf = { version = "0.14.0" } serde = { version = "1.0" } serde_json = { version = "1" } serde_yaml = { version = "0.8" } diff --git a/radicle-cob/Cargo.toml b/radicle-cob/Cargo.toml index 4f13cccd..24d6cfba 100644 --- a/radicle-cob/Cargo.toml +++ b/radicle-cob/Cargo.toml @@ -16,7 +16,7 @@ keywords = ["radicle", "collaborative objects", "cob", "cobs"] fastrand = { version = "1.9.0" } log = { version = "0.4.17" } nonempty = { version = "0.8.1", features = ["serialize"] } -radicle-git-ext = { version = "0.5.0", features = ["serde"] } +radicle-git-ext = { version = "0.6.0", features = ["serde"] } serde_json = { version = "1.0" } thiserror = { version = "1.0" } diff --git a/radicle-crypto/Cargo.toml b/radicle-crypto/Cargo.toml index 6741b518..da935004 100644 --- a/radicle-crypto/Cargo.toml +++ b/radicle-crypto/Cargo.toml @@ -28,7 +28,7 @@ default-features = false optional = true [dependencies.radicle-git-ext] -version = "0.5.0" +version = "0.6.0" default-features = false optional = true diff --git a/radicle-httpd/Cargo.toml b/radicle-httpd/Cargo.toml index a16b6f38..979401f1 100644 --- a/radicle-httpd/Cargo.toml +++ b/radicle-httpd/Cargo.toml @@ -25,7 +25,7 @@ flate2 = { version = "1" } hyper = { version = "0.14.17", default-features = false } lexopt = { version = "0.2.1" } nonempty = { version = "0.8.1", features = ["serialize"] } -radicle-surf = { version = "0.12.0", default-features = false, features = ["serde"] } +radicle-surf = { version = "0.14.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 c2a4b7de..b362300d 100644 --- a/radicle-httpd/src/api/v1/projects.rs +++ b/radicle-httpd/src/api/v1/projects.rs @@ -879,6 +879,14 @@ mod routes { "type": "addition", }, ], + "old": { + "start": 0, + "end": 0, + }, + "new": { + "start": 1, + "end": 2, + }, }, ], "eof": "noneMissing", @@ -901,7 +909,15 @@ mod routes { "lineNo": 1, "type": "addition" } - ] + ], + "old": { + "start": 0, + "end": 0, + }, + "new": { + "start": 1, + "end": 2, + }, } ], "eof": "noneMissing", @@ -927,6 +943,14 @@ mod routes { "type": "deletion", }, ], + "old": { + "start": 1, + "end": 2, + }, + "new": { + "start": 0, + "end": 0, + }, }, ], "eof": "noneMissing", @@ -981,6 +1005,14 @@ mod routes { "type": "addition", }, ], + "old": { + "start": 0, + "end": 0, + }, + "new": { + "start": 1, + "end": 2, + }, }, ], "eof": "noneMissing", @@ -1006,6 +1038,14 @@ mod routes { "type": "deletion", }, ], + "old": { + "start": 1, + "end": 2, + }, + "new": { + "start": 0, + "end": 0, + }, }, ], "eof": "noneMissing", @@ -1059,7 +1099,15 @@ mod routes { "lineNo": 1, "type": "addition" } - ] + ], + "old": { + "start": 0, + "end": 0, + }, + "new": { + "start": 1, + "end": 2, + }, } ], "eof": "noneMissing", @@ -1134,6 +1182,14 @@ mod routes { "type": "addition", }, ], + "old": { + "start": 0, + "end": 0, + }, + "new": { + "start": 1, + "end": 2, + }, }, ], "eof": "noneMissing", @@ -1156,7 +1212,15 @@ mod routes { "lineNo": 1, "type": "addition" } - ] + ], + "old": { + "start": 0, + "end": 0, + }, + "new": { + "start": 1, + "end": 2, + }, } ], "eof": "noneMissing", @@ -1182,6 +1246,14 @@ mod routes { "type": "deletion", }, ], + "old": { + "start": 1, + "end": 2, + }, + "new": { + "start": 0, + "end": 0, + }, }, ], "eof": "noneMissing", @@ -1431,6 +1503,14 @@ mod routes { "type": "addition", }, ], + "old": { + "start": 0, + "end": 0, + }, + "new": { + "start": 1, + "end": 2, + }, }, ], "eof": "noneMissing", diff --git a/radicle-node/Cargo.toml b/radicle-node/Cargo.toml index 34f74314..9dd6d66b 100644 --- a/radicle-node/Cargo.toml +++ b/radicle-node/Cargo.toml @@ -29,7 +29,7 @@ nonempty = { version = "0.8.1", features = ["serialize"] } qcheck = { version = "1", default-features = false, optional = true } # N.b. this is required to use macros, even though it's re-exported # through radicle -radicle-git-ext = { version = "0.5.0", features = ["serde"] } +radicle-git-ext = { version = "0.6.0", features = ["serde"] } sqlite = { version = "0.30.3" } scrypt = { version = "0.10.0", default-features = false } serde = { version = "1", features = ["derive"] } diff --git a/radicle-remote-helper/Cargo.toml b/radicle-remote-helper/Cargo.toml index 250ba306..17d81dc5 100644 --- a/radicle-remote-helper/Cargo.toml +++ b/radicle-remote-helper/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] thiserror = "1" -radicle-git-ext = { version = "0.5.0" } +radicle-git-ext = { version = "0.6.0" } [dependencies.radicle] path = "../radicle" diff --git a/radicle-tools/Cargo.toml b/radicle-tools/Cargo.toml index 1ca43571..3f5ebe62 100644 --- a/radicle-tools/Cargo.toml +++ b/radicle-tools/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" anyhow = { version = "1" } # N.b. this is required to use macros, even though it's re-exported # through radicle -radicle-git-ext = { version = "0.5.0", features = ["serde"] } +radicle-git-ext = { version = "0.6.0", features = ["serde"] } [dependencies.radicle] version = "0" diff --git a/radicle-tui/Cargo.toml b/radicle-tui/Cargo.toml index 8e6caf6c..4ecd51c2 100644 --- a/radicle-tui/Cargo.toml +++ b/radicle-tui/Cargo.toml @@ -13,7 +13,7 @@ path = "src/main.rs" [dependencies] anyhow = { version = "1" } lexopt = { version = "0.2" } -radicle-surf = { version = "0.12.0" } +radicle-surf = { version = "0.14.0" } timeago = { version = "0.4.1" } tuirealm = { version = "1.8.0", default-features = false, features = [ "with-termion" ] } tui-realm-stdlib = { version = "1.2.0", default-features = false, features = [ "with-termion" ] } diff --git a/radicle/Cargo.toml b/radicle/Cargo.toml index 0e7afcec..4822b0e1 100644 --- a/radicle/Cargo.toml +++ b/radicle/Cargo.toml @@ -22,7 +22,7 @@ once_cell = { version = "1.13" } serde = { version = "1", features = ["derive"] } serde_json = { version = "1", features = ["preserve_order"] } siphasher = { version = "0.3.10" } -radicle-git-ext = { version = "0.5.0", features = ["serde"] } +radicle-git-ext = { version = "0.6.0", features = ["serde"] } sqlite = { version = "0.30.3" } tempfile = { version = "3.3.0" } thiserror = { version = "1" }