radicle-term: Depend on crossterm instead of termion
When asked about Windows support, I was wondering what we might have to do to get radicle-term to work…
Ditching the pager implementation, and getting rid of a lot of maintenance burden, is the big step here.
Tested on my machine, runs nicely. Please test locally before merging, especially:
rad sync, which makes heavy use of the spinner.- Something involving editing, like
rad comment editorrad id update --edit. - The fact that
rad patch diffandrad diffstill work.
8 files changed
+276
-304
570bfc3b
→
84427a56
modified Cargo.lock
@@ -273,9 +273,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -417,7 +417,7 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -454,6 +454,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -493,6 +502,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -603,6 +655,27 @@ dependencies = [
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -632,6 +705,15 @@ dependencies = [
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -722,9 +804,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -910,7 +992,7 @@ version = "0.19.0"
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -972,7 +1054,7 @@ version = "0.14.12"
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1087,7 +1169,7 @@ version = "0.17.0"
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1194,7 +1276,7 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1306,7 +1388,7 @@ version = "0.10.12"
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1365,7 +1447,7 @@ version = "0.43.1"
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1633,13 +1715,13 @@ version = "0.7.5"
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -1762,9 +1844,9 @@ checksum = "baff4b617f7df3d896f97fe922b64817f6cd9a756bb81d40f8883f2f66dcb401"
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1785,17 +1867,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -1814,12 +1885,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1880,6 +1963,30 @@ dependencies = [
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -2043,12 +2150,6 @@ dependencies = [
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -2631,6 +2732,7 @@ dependencies = [
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -2638,7 +2740,6 @@ dependencies = [
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -2685,12 +2786,6 @@ dependencies = [
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -2790,10 +2885,23 @@ version = "0.38.34"
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2979,6 +3087,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -3237,35 +3376,11 @@ checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -3679,6 +3794,22 @@ dependencies = [
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -3688,12 +3819,18 @@ dependencies = [
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3711,7 +3848,16 @@ version = "0.52.0"
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -3731,18 +3877,18 @@ dependencies = [
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -3753,9 +3899,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3765,9 +3911,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3777,15 +3923,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3795,9 +3941,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3807,9 +3953,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3819,9 +3965,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3831,9 +3977,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3863,8 +4009,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified crates/radicle-cli/src/commands/diff.rs
@@ -145,7 +145,7 @@ pub fn run(options: Options, _ctx: impl term::Context) -> anyhow::Result<()> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified crates/radicle-term/Cargo.toml
@@ -16,10 +16,10 @@ default = ["git2"]
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
| - | |
|
|
|
|
|
modified crates/radicle-term/src/editor.rs
@@ -133,11 +133,19 @@ impl Editor {
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified crates/radicle-term/src/io.rs
@@ -103,15 +103,19 @@ pub fn notice_args<W: io::Write>(w: &mut W, args: fmt::Arguments) {
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified crates/radicle-term/src/lib.rs
@@ -8,7 +8,6 @@ pub mod format;
|
|
|
|
|
|
| - | |
|
|
|
|
|
deleted crates/radicle-term/src/pager.rs
@@ -1,186 +0,0 @@
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
modified crates/radicle-term/src/spinner.rs
@@ -1,4 +1,4 @@
| - | |
| + | |
|
|
|
|
|
@@ -21,6 +21,9 @@ pub const DEFAULT_STYLE: [Paint<&'static str>; 4] = [
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -129,7 +132,7 @@ pub fn spinner(message: impl ToString) -> Spinner {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -141,7 +144,7 @@ pub fn spinner_to(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -151,7 +154,7 @@ pub fn spinner_to(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -173,12 +176,7 @@ pub fn spinner_to(
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -187,7 +185,7 @@ pub fn spinner_to(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -195,7 +193,7 @@ pub fn spinner_to(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -208,7 +206,7 @@ pub fn spinner_to(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -216,7 +214,7 @@ pub fn spinner_to(
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -224,6 +222,9 @@ pub fn spinner_to(
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|