{"header":{"message":"Initial support for binary diffs (conflicts are not yet supported in the output)","description":null,"timestamp":"2021-07-01T13:15:17.531517834Z","authors":[{}]},"hash":"TGA6QXGIZBDTXMOCHH23HJUGWYOCJQ32M3CQ3U7HUF3TDJO6QNIQC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["TGA6QXGIZBDTXMOCHH23HJUGWYOCJQ32M3CQ3U7HUF3TDJO6QNIQC","Initial support for binary diffs (conflicts are not yet supported in the output)"],["AA",null],["XR7MNOMU5PMOOEY2EPPUABZ7NOP432RDCWUET23ONPXTT3JQIFIAC","file encoding in updates"],["Z6FWHKCAGF5MJCIG327JK7SYXQ53KM2UVGVE3QL64KDVOUPKQ3HQC","Improving the UI around zombie conflicts"],["3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","More convenient interface for channels"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["IYJZVLETBAQDDELENH3FX7ZTOC3HY4UJ3AMC3MACW6O7ZCWZTR6AC","Cleaning up the literate programming bits"],["WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","address clippy lints"],["NA5I4WYNE2O3LPSHXGWXW7XL4YNYFDREEGDOP6LJ5HJXTQDXM7BAC","Fixing the inverse of conflict resolutions"],["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","Refactoring iterators"],["6HNRL5RT76NH5YNSUN7B4FHNRZXKNLX4DROFGMO4R5P2U7JWOL2QC","detect non-utf8 text files"],["Q3GU26WDEYE2HXMM4WWNEGVMSXLQAKRJBSB2EJZA6JTHPKQHXCXQC","merge with changes from sanakirja v1.1.2"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"]],"deps":["XR7MNOMU5PMOOEY2EPPUABZ7NOP432RDCWUET23ONPXTT3JQIFIAC","Z6FWHKCAGF5MJCIG327JK7SYXQ53KM2UVGVE3QL64KDVOUPKQ3HQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","IYJZVLETBAQDDELENH3FX7ZTOC3HY4UJ3AMC3MACW6O7ZCWZTR6AC","NA5I4WYNE2O3LPSHXGWXW7XL4YNYFDREEGDOP6LJ5HJXTQDXM7BAC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","6HNRL5RT76NH5YNSUN7B4FHNRZXKNLX4DROFGMO4R5P2U7JWOL2QC","Q3GU26WDEYE2HXMM4WWNEGVMSXLQAKRJBSB2EJZA6JTHPKQHXCXQC"]},"hunks":[{"Edit":{"inode":{"change":4,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":7,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":677}],"down_context":[{"change":4,"pos":793368}],"flag":"BLOCK","start":0,"end":10,"inode":{"change":4,"pos":793247}}},"contents":[{"Add":"mod bin;"},{"Add":""}]}},{"Edit":{"inode":{"change":4,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":21,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":793593}],"down_context":[{"change":4,"pos":793593}],"flag":"BLOCK","start":11,"end":215,"inode":{"change":4,"pos":793247}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"impl<'a> Default for Line<'a> {"},{"Add":" fn default() -> Self {"},{"Add":" Line {"},{"Add":" l: &[],"},{"Add":" cyclic: false,"},{"Add":" before_end_marker: false,"},{"Add":" last: false,"},{"Add":" }"},{"Add":" }"},{"Add":""}]}},{"Edit":{"inode":{"change":4,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":61,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":115839}],"down_context":[{"change":14,"pos":33372}],"flag":"BLOCK","start":216,"end":1802,"inode":{"change":4,"pos":793247}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"fn make_old_lines(d: &vertex_buffer::Diff) -> Vec {"},{"Add":" d.lines()"},{"Add":" .map(|l| {"},{"Add":" let old_bytes = l.as_ptr() as usize - d.contents_a.as_ptr() as usize;"},{"Add":" let cyclic = if let Err(n) = d"},{"Add":" .cyclic_conflict_bytes"},{"Add":" .binary_search(&(old_bytes, std::usize::MAX))"},{"Add":" {"},{"Add":" n > 0 && {"},{"Add":" let (a, b) = d.cyclic_conflict_bytes[n - 1];"},{"Add":" a <= old_bytes && old_bytes < b"},{"Add":" }"},{"Add":" } else {"},{"Add":" false"},{"Add":" };"},{"Add":" let before_end_marker = if l.last() != Some(&b'\\n') {"},{"Add":" let next_index = l.as_ptr() as usize + l.len() - d.contents_a.as_ptr() as usize + 1;"},{"Add":" d.marker.get(&next_index) == Some(&vertex_buffer::ConflictMarker::End)"},{"Add":" } else {"},{"Add":" false"},{"Add":" };"},{"Add":" debug!(\"old = {:?}\", l);"},{"Add":" Line {"},{"Add":" l,"},{"Add":" cyclic,"},{"Add":" before_end_marker,"},{"Add":" last: l.as_ptr() as usize + l.len() - d.contents_a.as_ptr() as usize"},{"Add":" >= d.contents_a.len(),"},{"Add":" }"},{"Add":" })"},{"Add":" .collect()"},{"Add":"}"},{"Add":""},{"Add":"fn make_new_lines(b: &[u8]) -> Vec {"},{"Add":" split::LineSplit::from(b)"},{"Add":" .map(|l| {"},{"Add":" debug!(\"new: {:?}\", l);"},{"Add":" let next_index = l.as_ptr() as usize + l.len() - b.as_ptr() as usize;"},{"Add":" Line {"},{"Add":" l,"},{"Add":" cyclic: false,"},{"Add":" before_end_marker: false,"},{"Add":" last: next_index >= b.len(),"},{"Add":" }"},{"Add":" })"},{"Add":" .collect()"},{"Add":""}]}},{"Replacement":{"inode":{"change":4,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":128,"ins":{"up_context":[{"change":2,"pos":783}],"down_context":[{"change":3,"pos":29}],"flag":"BLOCK","start":1803,"end":2318,"inode":{"change":4,"pos":793247}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":783},"to":{"change":2,"start":783,"end":815},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":815},"to":{"change":4,"start":1064,"end":1149},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":5212},"to":{"change":4,"start":1064,"end":1149},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":1149},"to":{"change":4,"start":5994,"end":6021},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":6760},"to":{"change":4,"start":5994,"end":6021},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":63649},"to":{"change":4,"start":5994,"end":6021},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":116037},"to":{"change":4,"start":5994,"end":6021},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":5994},"to":{"change":4,"start":5994,"end":6021},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":6021},"to":{"change":4,"start":794898,"end":795855},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":794898},"to":{"change":4,"start":794898,"end":795855},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":795855},"to":{"change":4,"start":143,"end":184},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":184},"to":{"change":4,"start":795855,"end":796248},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":795855},"to":{"change":4,"start":795855,"end":796248},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":796248},"to":{"change":4,"start":185,"end":225},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":225},"to":{"change":4,"start":796248,"end":796567},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":796248},"to":{"change":4,"start":796248,"end":796567},"introduced_by":4}],"inode":{"change":4,"pos":793247}},"ins_contents":[{"Add":" let (lines_a, lines_b) = if encoding.is_none() {"},{"Add":" // self.diff_binary(changes, txn, txn.graph(channel), path, inode, a, &b)?;"},{"Add":" // return Ok(());"},{"Add":" const ROLLING_SIZE: usize = 8192;"},{"Add":" let (ah, old) = bin::make_old_chunks(ROLLING_SIZE, &d.contents_a);"},{"Add":" let (bb, new) = bin::make_new_chunks(ROLLING_SIZE, &ah, &b);"},{"Add":" debug!(\"bb = {:?}\", bb);"},{"Add":" (old, new)"},{"Add":" } else {"},{"Add":" (make_old_lines(&d), make_new_lines(&b))"},{"Add":" };"},{"Add":""}],"del_contents":[{"Del":" if encoding.is_none() {\n"},{"Del":" self.diff_binary(changes, txn, txn.graph(channel), path, inode, a, &b)?;\n"},{"Del":" return Ok(());\n"},{"Del":" }\n let lines_a: Vec = d\n .lines()\n .map(|l| {\n let old_bytes = l.as_ptr() as usize - d.contents_a.as_ptr() as usize;\n let cyclic = if let Err(n) = d\n .cyclic_conflict_bytes\n .binary_search(&(old_bytes, std::usize::MAX))\n {\n n > 0 && {\n let (a, b) = d.cyclic_conflict_bytes[n - 1];\n a <= old_bytes && old_bytes < b\n }\n } else {\n false\n };\n let before_end_marker = if l.last() != Some(&b'\\n') {\n let next_index =\n l.as_ptr() as usize + l.len() - d.contents_a.as_ptr() as usize + 1;\n d.marker.get(&next_index) == Some(&vertex_buffer::ConflictMarker::End)\n } else {\n false\n };\n"},{"Del":" debug!(\"old = {:?}\", l);\n"},{"Del":" Line {\n l,\n cyclic,\n before_end_marker,\n last: l.as_ptr() as usize + l.len() - d.contents_a.as_ptr() as usize\n >= d.contents_a.len(),\n }\n })\n .collect();\n let lines_b: Vec = split::LineSplit::from(&b[..])\n .map(|l| {\n"},{"Del":" debug!(\"new: {:?}\", l);\n"},{"Del":" let next_index = l.as_ptr() as usize + l.len() - b.as_ptr() as usize;\n Line {\n l,\n cyclic: false,\n before_end_marker: false,\n last: next_index >= b.len(),\n }\n })\n .collect();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":265,"ins":{"up_context":[{"change":4,"pos":800857}],"down_context":[{"change":4,"pos":800910}],"flag":"BLOCK","start":2319,"end":2498,"inode":{"change":4,"pos":793247}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":800857},"to":{"change":4,"start":800857,"end":800910},"introduced_by":4}],"inode":{"change":4,"pos":793247}},"ins_contents":[{"Add":" debug!("},{"Add":" \"bytes pos {:?} {:?}\","},{"Add":" old,"},{"Add":" Line {"},{"Add":" l: &(chunks[old].l)[..20.min(chunks[old].l.len())],"},{"Add":" ..chunks[old]"},{"Add":" }"},{"Add":" );"},{"Add":""}],"del_contents":[{"Del":" debug!(\"bytes pos {:?} {:?}\", old, chunks[old]);\n"}]}},{"FileAdd":{"meta":{"basename":"bin.rs","metadata":0},"context":[{"change":4,"pos":768883}],"contents":[{"Add":"use adler32::*;"},{"Add":"use std::collections::hash_map::Entry;"},{"Add":"use std::collections::HashMap;"},{"Add":""},{"Add":"pub(super) fn make_old_chunks("},{"Add":" window: usize,"},{"Add":" a: &[u8],"},{"Add":") -> (HashMap>, Vec) {"},{"Add":" let mut a_ad = 0;"},{"Add":" let mut a_h = HashMap::with_capacity(a.len() / window + 1);"},{"Add":" let mut lines = Vec::new();"},{"Add":" 'outer: for ch in a.chunks(window) {"},{"Add":" debug!(\"chunk {:?}\", ch.len());"},{"Add":" lines.push(super::Line {"},{"Add":" l: ch,"},{"Add":" ..super::Line::default()"},{"Add":" });"},{"Add":" let ad = adler32(ch).unwrap();"},{"Add":" match a_h.entry(ad) {"},{"Add":" Entry::Vacant(e) => {"},{"Add":" e.insert(vec![(a_ad, ch)]);"},{"Add":" }"},{"Add":" Entry::Occupied(mut e) => {"},{"Add":" let e = e.get_mut();"},{"Add":" for (_, old) in e.iter() {"},{"Add":" if *old == ch {"},{"Add":" continue 'outer;"},{"Add":" }"},{"Add":" }"},{"Add":" e.push((a_ad, ch));"},{"Add":" }"},{"Add":" }"},{"Add":" a_ad += 1"},{"Add":" }"},{"Add":" if let Some(l) = lines.last_mut() {"},{"Add":" l.last = true"},{"Add":" }"},{"Add":" (a_h, lines)"},{"Add":"}"},{"Add":""},{"Add":"pub(super) fn make_new_chunks<'a>("},{"Add":" window: usize,"},{"Add":" a_h: &HashMap>,"},{"Add":" b: &'a [u8],"},{"Add":") -> (Vec, Vec>) {"},{"Add":" let mut ad = RollingAdler32::from_buffer(&b[..window]);"},{"Add":" let mut bb = Vec::new();"},{"Add":" let mut i = window;"},{"Add":" let mut j = 0;"},{"Add":" let mut lines = Vec::new();"},{"Add":" while j < b.len() {"},{"Add":" let h = ad.hash();"},{"Add":" if let Some(v) = a_h.get(&h) {"},{"Add":" // We've found a match from the old version."},{"Add":" for &(v, old) in v.iter() {"},{"Add":" if old == &b[j..i] {"},{"Add":" bb.push(Chunk::Old {"},{"Add":" start: j,"},{"Add":" end: i,"},{"Add":" old_pos: v,"},{"Add":" });"},{"Add":" for _ in 0..window {"},{"Add":" if j < b.len() {"},{"Add":" ad.remove(i - j, b[j]);"},{"Add":" j += 1;"},{"Add":" }"},{"Add":" if i < b.len() {"},{"Add":" ad.update(b[i]);"},{"Add":" i += 1;"},{"Add":" }"},{"Add":" }"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" } else {"},{"Add":" if let Some(Chunk::New { ref mut len, .. }) = bb.last_mut() {"},{"Add":" *len += 1"},{"Add":" } else {"},{"Add":" bb.push(Chunk::New { start: j, len: 1 })"},{"Add":" }"},{"Add":" ad.remove(i - j, b[j]);"},{"Add":" j += 1;"},{"Add":" if i < b.len() {"},{"Add":" ad.update(b[i]);"},{"Add":" i += 1;"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" for chunk in bb.iter() {"},{"Add":" match *chunk {"},{"Add":" Chunk::Old { start, end, .. } => lines.push(super::Line {"},{"Add":" l: &b[start..end],"},{"Add":" ..super::Line::default()"},{"Add":" }),"},{"Add":" Chunk::New { start, len } => lines.push(super::Line {"},{"Add":" l: &b[start..start + len],"},{"Add":" ..super::Line::default()"},{"Add":" }),"},{"Add":" }"},{"Add":" }"},{"Add":" if let Some(l) = lines.last_mut() {"},{"Add":" l.last = true"},{"Add":" }"},{"Add":" (bb, lines)"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug)]"},{"Add":"pub(super) enum Chunk {"},{"Add":" Old {"},{"Add":" start: usize,"},{"Add":" end: usize,"},{"Add":" old_pos: usize,"},{"Add":" },"},{"Add":" New {"},{"Add":" start: usize,"},{"Add":" len: usize,"},{"Add":" },"},{"Add":"}"},{"Add":""},{"Add":"/*"},{"Add":"pub fn diff(window: usize, a: &[u8], b: &[u8], d: D)"},{"Add":"where"},{"Add":" D::Error: std::fmt::Debug,"},{"Add":"{"},{"Add":" let a_h = make_old_chunks(window, a);"},{"Add":" let bb = make_new_chunks(window, &a_h, b);"},{"Add":" // Make a dummy vector (because `std::ops::Index` wants a borrow)."},{"Add":" let mut aa = Vec::with_capacity(a.len() / window + 1);"},{"Add":" for pos in 0..(a.len() + window - 1) / window {"},{"Add":" aa.push(pos)"},{"Add":" }"},{"Add":" diffs::myers::diff("},{"Add":" &mut W {"},{"Add":" d,"},{"Add":" window,"},{"Add":" old_len: a.len(),"},{"Add":" a: &aa,"},{"Add":" b: &bb,"},{"Add":" },"},{"Add":" &aa,"},{"Add":" 0,"},{"Add":" aa.len(),"},{"Add":" &bb,"},{"Add":" 0,"},{"Add":" bb.len(),"},{"Add":" )"},{"Add":" .unwrap();"},{"Add":"}"},{"Add":""},{"Add":""},{"Add":"impl Chunk {"},{"Add":" fn start(&self) -> usize {"},{"Add":" match *self {"},{"Add":" Chunk::Old { start, .. } => start,"},{"Add":" Chunk::New { start, .. } => start,"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl PartialEq for Chunk {"},{"Add":" fn eq(&self, b: &usize) -> bool {"},{"Add":" if let Chunk::Old { old_pos, .. } = *self {"},{"Add":" old_pos == *b"},{"Add":" } else {"},{"Add":" false"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug)]"},{"Add":"struct W<'a, D> {"},{"Add":" d: D,"},{"Add":" window: usize,"},{"Add":" old_len: usize,"},{"Add":" a: &'a [usize],"},{"Add":" b: &'a [Chunk],"},{"Add":"}"},{"Add":""},{"Add":"impl<'a, D: diffs::Diff> diffs::Diff for W<'a, D>"},{"Add":"where"},{"Add":" D::Error: std::fmt::Debug,"},{"Add":"{"},{"Add":" type Error = D::Error;"},{"Add":" fn equal(&mut self, old: usize, new: usize, len: usize) -> Result<(), Self::Error> {"},{"Add":" let old = old * self.window;"},{"Add":" let new = self.b[new].start();"},{"Add":" let len = (len * self.window).min(self.old_len - old);"},{"Add":" self.d.equal(old, new, len)"},{"Add":" }"},{"Add":" fn delete(&mut self, old: usize, len: usize, new: usize) -> Result<(), Self::Error> {"},{"Add":" let old = old * self.window;"},{"Add":" let new = self.b[new].start();"},{"Add":" let len = (len * self.window).min(self.old_len - old);"},{"Add":" self.d.delete(old, len, new)"},{"Add":" }"},{"Add":" fn insert(&mut self, old: usize, new: usize, new_len: usize) -> Result<(), Self::Error> {"},{"Add":" let old = old * self.window;"},{"Add":" let new = self.b[new].start();"},{"Add":" let mut new_len_ = 0;"},{"Add":" for b in &self.b[new .. new + new_len] {"},{"Add":" match b {"},{"Add":" Chunk::Old { start, .. } => {"},{"Add":" new_len_ += self.window.min(self.old_len - start)"},{"Add":" }"},{"Add":" Chunk::New { len, .. } => {"},{"Add":" new_len_ += len"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" self.d.insert(old, new, new_len_)"},{"Add":" }"},{"Add":" fn replace("},{"Add":" &mut self,"},{"Add":" old: usize,"},{"Add":" old_len: usize,"},{"Add":" new: usize,"},{"Add":" new_len: usize,"},{"Add":" ) -> Result<(), Self::Error> {"},{"Add":" let old = old * self.window;"},{"Add":" let old_len = (old_len * self.window).min(self.old_len - old);"},{"Add":" let new = self.b[new].start();"},{"Add":" let mut new_len_ = 0;"},{"Add":" for b in &self.b[new .. new + new_len] {"},{"Add":" match b {"},{"Add":" Chunk::Old { start, .. } => {"},{"Add":" new_len_ += self.window.min(self.old_len - start)"},{"Add":" }"},{"Add":" Chunk::New { len, .. } => {"},{"Add":" new_len_ += len"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" self.d.replace(old, old_len, new, new_len_)"},{"Add":" }"},{"Add":" fn finish(&mut self) -> Result<(), Self::Error> {"},{"Add":" self.d.finish()"},{"Add":" }"},{"Add":"}"},{"Add":" */"},{"Add":""}]}}],"owner":"irevoire","repo":"pijul","token":"yAea80/HcAVDyLo0ohsGd6p7bzPaGaOSKmAc9bcqmY4=","login":null}

…

Dependencies

Change contents