binary diff creates new chunk when no exact match found

rohan

Oct 25, 2021, 7:39 AM

7WIVT3R7HXPYTWRUMW6JGHVUTKRBRMD6SA7RQCMXVWNII5VJCSAAC

Dependencies

• [2] TGA6QXGI Initial support for binary diffs (conflicts are not yet supported in the output)
• [3] S7MAMMFW Formatting
• [4] 4DNDMC7I Fixing a number of bugs related to encodings (extra newlines + misdetection in linux2x)

Change contents

• edit in "libpijul/src/diff/bin.rs" at line 54
  [2.3959]

  [2.3959]
  + debug!("processing {:?}", j);
• edit in "libpijul/src/diff/bin.rs" at line 56
  [2.3986]

  [2.3986]
  + let mut found = false;
• edit in "libpijul/src/diff/bin.rs" at line 59
  [2.4082]

  [2.4082]
  + debug!("matched {:?}", h);
• replacement in "libpijul/src/diff/bin.rs" at line 61
  [2.4122]→[2.4122:4159](∅→∅)
  − if old == &b[j..i] {
  [2.4122]

  [2.4159]
  + found = old == &b[j..i];

  + if found {

  + debug!("old matched from {:?}-{:?}", j, i);
• replacement in "libpijul/src/diff/bin.rs" at line 85
  [2.4751]→[2.4751:4768](∅→∅)
  − } else {
  [2.4751]

  [2.4768]
  + }

  + if !found {

  + debug!("new {:?}", h);