diff options
author | Wilfred Hughes <me@wilfred.me.uk> | 2024-02-08 08:30:10 -0800 |
---|---|---|
committer | Wilfred Hughes <me@wilfred.me.uk> | 2024-02-08 08:48:56 -0800 |
commit | 7c9e14f55f9642ad1d2292841ad23278f11a3b4b (patch) | |
tree | 6e121f8983aa8014612f9942f081c3627ad037b8 | |
parent | 81fa1c7096711b82d4d783e0bde7685384cec6bb (diff) |
Display paths properlypatch_format
-rw-r--r-- | src/display/patch.rs | 16 | ||||
-rw-r--r-- | src/main.rs | 4 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/display/patch.rs b/src/display/patch.rs index 20aeacfb3..4205ec6e0 100644 --- a/src/display/patch.rs +++ b/src/display/patch.rs @@ -4,23 +4,27 @@ use crate::constants::Side; use crate::diff::myers_diff; use crate::display::style::apply_colors; use crate::line_parser::split_lines_keep_newline; -use crate::options::DisplayOptions; +use crate::options::{DisplayOptions, FileArgument}; use crate::parse::syntax::MatchedPos; use crate::summary::FileFormat; use super::style::apply_header_color; -fn header(display_options: &DisplayOptions, lhs_path: &str, rhs_path: &str) -> String { +fn header( + display_options: &DisplayOptions, + lhs_path: &FileArgument, + rhs_path: &FileArgument, +) -> String { let mut s = String::new(); s.push_str(&apply_header_color( - &format!("--- {}", lhs_path), + &format!("--- {}", lhs_path.display()), display_options.use_color, display_options.background_color, 1, )); s.push('\n'); s.push_str(&apply_header_color( - &format!("+++ {}", rhs_path), + &format!("+++ {}", rhs_path.display()), display_options.use_color, display_options.background_color, 1, @@ -32,8 +36,8 @@ fn header(display_options: &DisplayOptions, lhs_path: &str, rhs_path: &str) -> S pub(crate) fn print( display_options: &DisplayOptions, file_format: &FileFormat, - lhs_path: &str, - rhs_path: &str, + lhs_path: &FileArgument, + rhs_path: &FileArgument, lhs_src: &str, rhs_src: &str, lhs_mps: &[MatchedPos], diff --git a/src/main.rs b/src/main.rs index c56313813..9002672fd 100644 --- a/src/main.rs +++ b/src/main.rs @@ -909,8 +909,8 @@ fn print_diff_result(display_options: &DisplayOptions, summary: &DiffResult) { DisplayMode::Patch => display::patch::print( display_options, &summary.file_format, - &summary.display_path, - "foo.el", + &summary.lhs_path, + &summary.rhs_path, lhs_src, rhs_src, &summary.lhs_positions, |