Skip to content

Commit

Permalink
Revert "Revert "Revert git blame handling (#746)""
Browse files Browse the repository at this point in the history
This reverts commit 8886648.
  • Loading branch information
dandavison committed Oct 26, 2021
1 parent 40c004a commit 0745f85
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 215 deletions.
25 changes: 0 additions & 25 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ name = "delta"
path = "src/main.rs"

[dependencies]
chrono = "0.4.19"
chrono-humanize = "0.2.1"
ansi_colours = "1.0.4"
ansi_term = "0.12.1"
atty = "0.2.14"
Expand Down
2 changes: 0 additions & 2 deletions src/delta.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ pub enum State {
HunkPlus(Option<String>), // In hunk; added line (raw_line)
SubmoduleLog, // In a submodule section, with gitconfig diff.submodule = log
SubmoduleShort(String), // In a submodule section, with gitconfig diff.submodule = short
Blame(String), // In a line of `git blame` output.
Unknown,
// The following elements are created when a line is wrapped to display it:
HunkZeroWrapped, // Wrapped unchanged line
Expand Down Expand Up @@ -120,7 +119,6 @@ impl<'a> StateMachine<'a> {
|| self.handle_submodule_log_line()?
|| self.handle_submodule_short_line()?
|| self.handle_hunk_line()?
|| self.handle_blame_line()?
|| self.should_skip_line()
|| self.emit_line_unchanged()?;
}
Expand Down
183 changes: 0 additions & 183 deletions src/handlers/blame.rs

This file was deleted.

1 change: 0 additions & 1 deletion src/handlers/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/// This module contains functions handling input lines encountered during the
/// main `StateMachine::consume()` loop.
pub mod blame;
pub mod commit_meta;
pub mod diff_stat;
pub mod draw;
Expand Down
2 changes: 0 additions & 2 deletions src/paint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,6 @@ impl<'a> Painter<'a> {
(config.plus_style, config.plus_non_emph_style)
}
}
State::Blame(_) => (diff_sections[0].0, diff_sections[0].0),
_ => (config.null_style, config.null_style),
};
let fill_style = if style_sections_contain_more_than_one_style(diff_sections) {
Expand Down Expand Up @@ -622,7 +621,6 @@ impl<'a> Painter<'a> {
}
State::HunkHeader(_, _) => true,
State::HunkMinus(Some(_)) | State::HunkPlus(Some(_)) => false,
State::Blame(_) => true,
_ => panic!(
"should_compute_syntax_highlighting is undefined for state {:?}",
state
Expand Down

0 comments on commit 0745f85

Please sign in to comment.