diff options
author | Dan Davison <dandavison7@gmail.com> | 2021-10-26 20:15:27 -0400 |
---|---|---|
committer | Dan Davison <dandavison7@gmail.com> | 2021-10-26 20:15:27 -0400 |
commit | 3aab5d19569fa52ace2d7e6d196a1256990c4e20 (patch) | |
tree | 48af762d1ca8e6dd22bd9a6c9642ae11485db748 | |
parent | 7a3527cf0d212cbc911438cac9332d033041c6c6 (diff) |
Delete unused blame CLI
This should have been done in 0745f853d4bed52aca0b6739ac452d54ff54a153
and the command line options were therefore incorrectly released in
0.9.0.
-rw-r--r-- | src/cli.rs | 21 | ||||
-rw-r--r-- | src/config.rs | 10 | ||||
-rw-r--r-- | src/delta.rs | 3 | ||||
-rw-r--r-- | src/options/set.rs | 3 |
4 files changed, 0 insertions, 37 deletions
@@ -420,27 +420,6 @@ pub struct Opt { /// (underline), 'ol' (overline), or the combination 'ul ol'. pub hunk_header_decoration_style: String, - /// Format string for git blame commit metadata. Available placeholders are - /// "{timestamp}", "{author}", and "{commit}". - #[structopt( - long = "blame-format", - default_value = "{timestamp:<15} {author:<15} {commit:<8} │ " - )] - pub blame_format: String, - - /// Background colors used for git blame lines (space-separated string). - /// Lines added by the same commit are painted with the same color; colors - /// are recycled as needed. - #[structopt(long = "blame-palette", default_value = "#FFFFFF #DDDDDD #BBBBBB")] - pub blame_palette: String, - - /// Format of `git blame` timestamp in raw git output received by delta. - #[structopt( - long = "blame-timestamp-format", - default_value = "%Y-%m-%d %H:%M:%S %z" - )] - pub blame_timestamp_format: String, - /// Default language used for syntax highlighting when this cannot be /// inferred from a filename. It will typically make sense to set this in /// per-repository git config (.git/config) diff --git a/src/config.rs b/src/config.rs index 0771b60e..56e9eec6 100644 --- a/src/config.rs +++ b/src/config.rs @@ -57,9 +57,6 @@ fn adapt_wrap_max_lines_argument(arg: String) -> usize { pub struct Config { pub available_terminal_width: usize, pub background_color_extends_to_terminal_width: bool, - pub blame_format: String, - pub blame_palette: Vec<String>, - pub blame_timestamp_format: String, pub commit_style: Style, pub color_only: bool, pub commit_regex: Regex, @@ -260,13 +257,6 @@ impl From<cli::Opt> for Config { background_color_extends_to_terminal_width: opt .computed .background_color_extends_to_terminal_width, - blame_format: opt.blame_format, - blame_palette: opt - .blame_palette - .split_whitespace() - .map(|s| s.to_owned()) - .collect::<Vec<String>>(), - blame_timestamp_format: opt.blame_timestamp_format, commit_style, color_only: opt.color_only, commit_regex, diff --git a/src/delta.rs b/src/delta.rs index cab9d6fb..71b96bff 100644 --- a/src/delta.rs +++ b/src/delta.rs @@ -1,5 +1,4 @@ use std::borrow::Cow; -use std::collections::HashMap; use std::io::BufRead; use std::io::Write; @@ -68,7 +67,6 @@ pub struct StateMachine<'a> { // avoid emitting the file meta header line twice (#245). pub current_file_pair: Option<(String, String)>, pub handled_file_meta_header_line_file_pair: Option<(String, String)>, - pub blame_commit_colors: HashMap<String, String>, } pub fn delta<I>(lines: ByteLines<I>, writer: &mut dyn Write, config: &Config) -> std::io::Result<()> @@ -94,7 +92,6 @@ impl<'a> StateMachine<'a> { handled_file_meta_header_line_file_pair: None, painter: Painter::new(writer, config), config, - blame_commit_colors: HashMap::new(), } } diff --git a/src/options/set.rs b/src/options/set.rs index 65691841..05946d43 100644 --- a/src/options/set.rs +++ b/src/options/set.rs @@ -122,9 +122,6 @@ pub fn set_options( set_options!( [ - blame_format, - blame_palette, - blame_timestamp_format, color_only, commit_decoration_style, commit_regex, |