Warn if patch fails to apply and windows new lines are involved

openSUSE · Feb 15, 2019 · e3f2190 · e3f2190
1 parent b8eb1ce
commit e3f2190
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -65,7 +65,7 @@ only the `push` command. The goal is to be very fast.
 * only the `push` command
 * only patches in unified format
 * date in patch files is ignored
-* endlines must be the same in patch and patched file (e.g. both "\n" or both "\r\n")
+* endlines must be the same in patch and patched file (e.g. both "\n" or both "\r\n") (always `--binary` mode)
 * ... probably more that I don't know about
 
 ## Screenshot

diff --git a/src/rapidquilt/apply/diagnostics.rs b/src/rapidquilt/apply/diagnostics.rs
@@ -379,7 +379,10 @@ pub fn print_difference_to_closest_match<W: Write>(
 
         if !line_str.ends_with('\n') {
             writeln!(writer)?;
-            write!(writer, "{}       \\ No new line!", prefix)?;
+            writeln!(writer, "{}      {}{}", prefix, " ".repeat(line_str.len()), "^ no new line".bright_red())?;
+        }
+        if !line_str.ends_with("\r\n") {
+            writeln!(writer, "{}      {}{}", prefix, " ".repeat(line_str.len()), "^ windows new line".bright_red())?;
         }
 
         Ok(())