Update pijul

Author: fossdd

libpijul/src/change/parse.rs

@@ -140,7 +140,11 @@ fn parse_edit_hunk(i: &str) -> IResult<&str, PrintableHunk> {
     let (i, encoding) = preceded(space0, parse_encoding)(i)?;
     let (i, _) = tuple((space0, newline))(i)?;
     let (i, change) = parse_atom(i)?;
-    let (i, contents) = parse_contents('+', encoding.clone(), i)?;
+    let (i, contents) = if let Ok(s) = parse_contents('+', encoding.clone(), i) {
+        s
+    } else {
+        parse_contents('-', encoding.clone(), i)?
+    };
     Ok((
         i,
         Edit {
@@ -352,13 +356,14 @@ fn parse_contents(
         if backslash.is_some() && vec[vec.len() - 1] == b'\n' {
             vec.pop();
         }
-        Ok((i, vec))
-    } else {
-        Err(nom::Err::Error(nom::error::Error::new(
-            i,
-            nom::error::ErrorKind::Verify,
-        )))
+        if !vec.is_empty() {
+            return Ok((i, vec))
+        }
     }
+    Err(nom::Err::Error(nom::error::Error::new(
+        i,
+        nom::error::ErrorKind::Verify,
+    )))
 }
 
 fn encode(encoding: Option<Encoding>, contents: &str) -> Result<Vec<u8>, String> {

libpijul/src/change/printable.rs

@@ -452,7 +452,16 @@ impl PrintableHunk {
                     Escaped(encoding_label(encoding))
                 )?;
                 writeln!(w, "{}", change)?;
-                print_contents(w, "+", contents, encoding)?;
+                let sign = if let PrintableAtom::Edges(ref e) = change {
+                    if e[0].flag.deleted {
+                        "-"
+                    } else {
+                        "+"
+                    }
+                } else {
+                    "+"
+                };
+                print_contents(w, sign, contents, encoding)?;
             }
 
             Replace {

libpijul/src/diff/bin.rs

@@ -51,11 +51,16 @@ pub(super) fn make_new_chunks<'a>(
     let mut j = 0;
     let mut lines = Vec::new();
     while j < b.len() {
+        debug!("processing {:?}", j);
         let h = ad.hash();
+        let mut found = false;
         if let Some(v) = a_h.get(&h) {
             // We've found a match from the old version.
+            debug!("matched {:?}", h);
             for &(v, old) in v.iter() {
-                if old == &b[j..i] {
+                found = old == &b[j..i];
+                if found {
+                    debug!("old matched from {:?}-{:?}", j, i);
                     bb.push(Chunk::Old {
                         start: j,
                         end: i,
@@ -77,7 +82,9 @@ pub(super) fn make_new_chunks<'a>(
                     break;
                 }
             }
-        } else {
+        }
+        if !found {
+            debug!("new {:?}", h);
             if let Some(Chunk::New { ref mut len, .. }) = bb.last_mut() {
                 *len += 1
             } else {