blob: c5e4026b072dfb42bd0606b867650e86dfc69e5c (
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
34
35
36
37
38
39
40
41
42
43
|
use crate::delta::{DiffType, Source, State, StateMachine};
impl<'a> StateMachine<'a> {
#[inline]
fn test_diff_file_missing(&self) -> bool {
self.source == Source::DiffUnified && self.line.starts_with("Only in ")
}
#[inline]
fn test_diff_is_binary(&self) -> bool {
self.line.starts_with("Binary files ")
}
pub fn handle_diff_header_misc_line(&mut self) -> std::io::Result<bool> {
if !self.test_diff_file_missing() && !self.test_diff_is_binary() {
return Ok(false);
}
if self.test_diff_is_binary() {
// Print the "Binary files" line verbatim, if there was no "diff" line, or it
// listed different files but was not followed by header minus and plus lines.
// This can happen in output of standalone diff or git diff --no-index.
if self.minus_file.is_empty() && self.plus_file.is_empty() {
self.emit_line_unchanged()?;
self.handled_diff_header_header_line_file_pair = self.current_file_pair.clone();
return Ok(true);
}
if self.minus_file != "/dev/null" {
self.minus_file.push_str(" (binary file)");
}
if self.plus_file != "/dev/null" {
self.plus_file.push_str(" (binary file)");
}
return Ok(true);
}
self.handle_additional_cases(match self.state {
State::DiffHeader(_) => self.state.clone(),
_ => State::DiffHeader(DiffType::Unified),
})
}
}
|