History

bring back old implementation from https://github.com/Byron/gitoxide/commit/65e64964c7cd151e53e5a7d4b9ba8fabda1c0e16 this also removes terminal_size, although its not large

Benedikt Mandelkow committed 2 years ago

Commit 1ecc96d1 parent fcd585b3 files · +8 −16Browse files

Unified · Split

3 files
  1. Cargo.lock +0 −11
  2. Cargo.toml +1 −1
  3. src/plumbing/progress.rs +7 −4
Cargo.lock+0−11
@@ -1248,7 +1248,6 @@ dependencies = [ · 1247 unmodified lines
12481248 "owo-colors",
12491249 "prodash 28.0.0",
12501250 "serde_derive",
1251− "terminal_size",
12521251 "time",
12531252 "tracing",
12541253 "tracing-forest",
@@ -4593,16 +4592,6 @@ dependencies = [ · 3338 unmodified lines
45934592 "winapi-util",
45944593 ]
45954594
4596−[[package]]
4597−name = "terminal_size"
4598−version = "0.3.0"
4599−source = "registry+https://github.com/rust-lang/crates.io-index"
4600−checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
4601−dependencies = [
4602− "rustix 0.38.31",
4603− "windows-sys 0.48.0",
4604−]
4605−
46064595 [[package]]
46074596 name = "thiserror"
46084597 version = "1.0.56"
Cargo.toml+1−1
@@ -190,7 +190,7 @@ tracing = { version = "0.1.37", optional = true } · 189 unmodified lines
190190 owo-colors = "4.0.0"
191191
192192 # for config-tree
193−terminal_size = "0.3.0"
193+# terminal_size = "0.3.0"
194194
195195 # Avoid pre-compiled binaries, see https://github.com/serde-rs/serde/issues/2538 and https://github.com/serde-rs/serde/pull/2590
196196 serde_derive = ">=1.0.185"
src/plumbing/progress.rs+7−4
@@ -1,7 +1,4 @@
1−use std::{
2− borrow::Cow,
3− fmt::{Display, Formatter},
4−};
1+use std::fmt::{Display, Formatter};
52
63 use crosstermion::crossterm::style::Stylize;
74 use owo_colors::OwoColorize;
@@ -586,6 +583,12 @@ pub fn show_progress() -> anyhow::Result<()> { · 578 unmodified lines
586583 // table
587584 // }
588585 // );
586+
587+ // noted: reverted from https://github.com/Byron/gitoxide/commit/65e64964c7cd151e53e5a7d4b9ba8fabda1c0e16
588+ for Record { config, usage } in sorted {
589+ println!("{} {}: {usage}", usage.icon(), config.bold(),);
590+ }
591+
589592 println!("{buf}");
590593 Ok(())
591594 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t