blob: fdd2d39a066ef5c2a3783d6b9cf267374e55b227 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
use crate::delta::{DiffType, InMergeConflict, MergeParents, State, StateMachine};
impl<'a> StateMachine<'a> {
#[inline]
fn test_diff_header_diff_line(&self) -> bool {
self.line.starts_with("diff ")
}
#[allow(clippy::unnecessary_wraps)]
pub fn handle_diff_header_diff_line(&mut self) -> std::io::Result<bool> {
if !self.test_diff_header_diff_line() {
return Ok(false);
}
self.painter.paint_buffered_minus_and_plus_lines();
self.state =
if self.line.starts_with("diff --cc ") || self.line.starts_with("diff --combined ") {
// We will determine the number of parents when we see the hunk header.
State::DiffHeader(DiffType::Combined(
MergeParents::Unknown,
InMergeConflict::No,
))
} else {
State::DiffHeader(DiffType::Unified)
};
self.handle_pending_mode_line_with_diff_name()?;
self.handled_diff_header_header_line_file_pair = None;
self.diff_line = self.line.clone();
if !self.should_skip_line() {
self.emit_line_unchanged()?;
}
Ok(true)
}
}
|