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
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
|
use std::io::{ErrorKind, Write};
use std::path::PathBuf;
use std::process;
use bytelines::ByteLinesReader;
use crate::config::{self, delta_unreachable};
use crate::delta;
/// Run `git diff` on the files provided on the command line and display the output.
pub fn diff(
minus_file: Option<&PathBuf>,
plus_file: Option<&PathBuf>,
config: &config::Config,
writer: &mut dyn Write,
) -> i32 {
use std::io::BufReader;
if minus_file.is_none() || plus_file.is_none() {
eprintln!(
"\
The main way to use delta is to configure it as the pager for git: \
see https://github.com/dandavison/delta#configuration. \
You can also use delta to diff two files: `delta file_A file_B`."
);
return config.error_exit_code;
}
let minus_file = minus_file.unwrap();
let plus_file = plus_file.unwrap();
let diff_command = "git";
let diff_command_path = match grep_cli::resolve_binary(PathBuf::from(diff_command)) {
Ok(path) => path,
Err(err) => {
eprintln!("Failed to resolve command '{}': {}", diff_command, err);
return config.error_exit_code;
}
};
let diff_process = process::Command::new(diff_command_path)
.args(&["diff", "--no-index"])
.args(&[minus_file, plus_file])
.stdout(process::Stdio::piped())
.spawn();
if let Err(err) = diff_process {
eprintln!("Failed to execute the command '{}': {}", diff_command, err);
return config.error_exit_code;
}
let mut diff_process = diff_process.unwrap();
if let Err(error) = delta::delta(
BufReader::new(diff_process.stdout.take().unwrap()).byte_lines(),
writer,
config,
) {
match error.kind() {
ErrorKind::BrokenPipe => return 0,
_ => {
eprintln!("{}", error);
return config.error_exit_code;
}
}
};
// Return the exit code from the `git diff` processl, so that the exit code
// contract of `delta file_A file_B` is the same as that of `diff file_A
// file_B` (i.e. 0 if same, 1 if different, 2 if error).
diff_process
.wait()
.unwrap_or_else(|_| {
delta_unreachable(&format!("'{}' process not running.", diff_command));
})
.code()
.unwrap_or_else(|| {
eprintln!("'{}' process terminated without exit status.", diff_command);
config.error_exit_code
})
}
#[cfg(test)]
mod main_tests {
use std::io::{Cursor, Read, Seek, SeekFrom};
use std::path::PathBuf;
use super::diff;
use crate::tests::integration_test_utils;
#[test]
#[ignore] // https://github.com/dandavison/delta/pull/546
fn test_diff_same_empty_file() {
_do_diff_test("/dev/null", "/dev/null", false);
}
#[test]
#[cfg_attr(target_os = "windows", ignore)]
fn test_diff_same_non_empty_file() {
_do_diff_test("/etc/passwd", "/etc/passwd", false);
}
#[test]
#[cfg_attr(target_os = "windows", ignore)]
fn test_diff_empty_vs_non_empty_file() {
_do_diff_test("/dev/null", "/etc/passwd", true);
}
#[test]
#[cfg_attr(target_os = "windows", ignore)]
fn test_diff_two_non_empty_files() {
_do_diff_test("/etc/group", "/etc/passwd", true);
}
fn _do_diff_test(file_a: &str, file_b: &str, expect_diff: bool) {
let config = integration_test_utils::make_config_from_args(&[]);
let mut writer = Cursor::new(vec![]);
let exit_code = diff(
Some(&PathBuf::from(file_a)),
Some(&PathBuf::from(file_b)),
&config,
&mut writer,
);
assert_eq!(exit_code, if expect_diff { 1 } else { 0 });
}
fn _read_to_string(cursor: &mut Cursor<Vec<u8>>) -> String {
let mut s = String::new();
cursor.seek(SeekFrom::Start(0)).unwrap();
cursor.read_to_string(&mut s).unwrap();
s
}
}
|
