Formatting

pmeunier

Jan 14, 2022, 12:14 PM

WDSAO5YK3IMM65AXFLQG7OINYIYKF76IH555QJ5RTUH44BJXVWDQC

Dependencies

• [2] INXHKEMU Removing some old debugging contents
• [3] J3WXJPRA Fixing a bug in diff where a deletion inside a conflict was trying to find a byte offset just past the end of a vertex (found thanks to the same-size blocks in binary diff)
• [4] I24UEJQL Various post-fire fixes
• [5] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [6] I52XSRUH Massive cleanup, and simplification
• [7] YN63NUZO Sanakirja 1.0

Change contents

• replacement in libpijul/src/pristine/mod.rs at line 1989
  [4.54257]→[2.0:21](∅→∅)
  − assert!(!(a^b));
  [4.54257]

  [4.72479]
  + assert!(!(a ^ b));
• replacement in libpijul/src/diff/vertex_buffer.rs at line 282
  [4.778526]→[3.0:150](∅→∅)
  − let len = self.pos_a[i-1].vertex.end - self.pos_a[i-1].vertex.start;

  − if pos < self.pos_a[i-1].pos + len || len == 0 {
  [4.778526]

  [3.150]
  + let len = self.pos_a[i - 1].vertex.end - self.pos_a[i - 1].vertex.start;

  + if pos < self.pos_a[i - 1].pos + len || len == 0 {