Handle more ambiguous binary file names

Author: sourcefrog

src/parser.rs

@@ -10,7 +10,7 @@ use nom::{
     combinator::{map, map_opt, not, opt},
     error::context,
     multi::{many0, many1},
-    sequence::{delimited, pair, preceded, terminated, tuple},
+    sequence::{delimited, preceded, terminated, tuple},
 };
 
 use crate::ast::*;
@@ -119,17 +119,19 @@ fn patch(input: Input<'_>) -> IResult<Input<'_>, Patch> {
 
 /// Recognize a "binary files XX and YY differ" line as an empty patch.
 fn binary_files_differ(input: Input<'_>) -> IResult<Input<'_>, Patch> {
-    // let (input, _) = context("Binary file line", tag("Binary files "))(input)?;
     // The names aren't quoted so this seems to require lookahead and then
     // parsing the identified string.
     let (input, (old, new)) = context(
         "Binary file line",
         delimited(
             tag("Binary files "),
-            map_opt(take_until(" differ"), |names: Input<'_>| {
-                names.split_once(" and ")
+            map_opt(take_until("\n"), |names: Input<'_>| {
+                names
+                    .trim_end()
+                    .strip_suffix(" differ")
+                    .and_then(|s| s.split_once(" and "))
             }),
-            pair(tag(" differ"), line_ending),
+            line_ending,
         ),
     )(input)?;
     dbg!(&old, &new);

tests/parse_patch.rs

@@ -298,6 +298,21 @@ fn binary_diff_with_crlf() {
     assert_eq!(patch.hunks, []);
 }
 
+#[test]
+fn binary_diff_with_ambiguous_names() {
+    // The main goal here is that this doesn't crash or error:
+    // the format with quotes means for some names there is no
+    // unambiguous meaning.
+    let sample = "Binary files a differ program and a patcher binary and a wiggler differ\r\n";
+
+    let patch = Patch::from_single(sample).unwrap();
+    assert_eq!(patch.old.path, "a differ program");
+    assert_eq!(patch.old.meta, None);
+    assert_eq!(patch.new.path, "a patcher binary and a wiggler");
+    assert_eq!(patch.new.meta, None);
+    assert_eq!(patch.hunks, []);
+}
+
 #[test]
 fn binary_diff_with_spaces_in_name() {
     let sample = "Binary files an old binary and a new binary differ\n";