{"header":{"message":"Fixing a number of bugs related to encodings (extra newlines + misdetection in linux2x)","description":null,"timestamp":"2021-07-03T10:32:52.445458831Z","authors":[{}]},"hash":"4DNDMC7IUZNYLDEQQYYF5K3G2QWWXGQENTEWPNTM6XKQEFPW7L3QC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["4DNDMC7IUZNYLDEQQYYF5K3G2QWWXGQENTEWPNTM6XKQEFPW7L3QC","Fixing a number of bugs related to encodings (extra newlines + misdetection in linux2x)"],["AA",null],["NG3Z3DOKDZQDQ7UNQEOMXWX2NJKKLM7DKRWW3KIUD7QEECTNQIZQC","roundtrip text encoding when recording"],["SGXOEWHUET7RVS5HANSYE7QRQAG56NIKTC56MLPZ5XBCXODEWUXQC","Adding a patched chardetng (temporarily)"],["TGA6QXGIZBDTXMOCHH23HJUGWYOCJQ32M3CQ3U7HUF3TDJO6QNIQC","Initial support for binary diffs (conflicts are not yet supported in the output)"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["ZXTHL45OYLOICXTXXEQ6AMNSLMQFZ6BFUJWMO6LZOSDK7ERROC5AC","address clippy lints"],["QJXNUQFJOAPQT3GUXRDTVKMJZCKFONSXUZMAZB7VC7OHDCGAVCOQC","Solving conflicts"],["6CZYYOG7C7ULY5Q4WSRVVC3QVSYACV3KFEYXDCH63OXXX2QFFFBAC","Faster guessing of encoding"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["IACED7RWM2ZQIPN3YZATA6SXTRO2C6OUGT3HSOU3LIDZ7YRMLRXAC","text_encoding module"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["Z6FWHKCAGF5MJCIG327JK7SYXQ53KM2UVGVE3QL64KDVOUPKQ3HQC","Improving the UI around zombie conflicts"],["WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","address clippy lints"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","Renaming \"Record\" to \"Hunk\" in the changes"],["Q3GU26WDEYE2HXMM4WWNEGVMSXLQAKRJBSB2EJZA6JTHPKQHXCXQC","merge with changes from sanakirja v1.1.2"],["IYJZVLETBAQDDELENH3FX7ZTOC3HY4UJ3AMC3MACW6O7ZCWZTR6AC","Cleaning up the literate programming bits"],["XR7MNOMU5PMOOEY2EPPUABZ7NOP432RDCWUET23ONPXTT3JQIFIAC","file encoding in updates"],["QNJBR73KCSCCF6FTHGZDF2K7PZQL3EFKZFOBT77KYZBMALTTW6OQC","don't return Result for infallible functions"],["UM5DLRPBCQZQBEDJDLDPKODOKLACUHZD6YL6S4JRNKW6JLPNUVSAC","store new non-UTF-8 files raw and decode to deplay the contents"],["LV34DUJYQNSHJSNFALRRS3FFQWUU57HIJU26TTKNXDFWD6UWD4QAC","Formatting"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["ZSF3YFZTDOXMCOC3HOT5C6MQLYLWOR7QJAOUDS2M2Z4SC2YW3GRAC","encoded file deletion"],["F6S2RUVPUGZDCDAI7D2MZNSLUTQZU3CPQXX6LRQ2P7KGQCJV7BQQC","Fixing an index out of bounds on binary files smaller than a full hash window"],["YWUZQU3TBJJMUVMX2JJW2D2JLTN57YJA36YJXKHBF7UJ6GEBTWUAC","Formatting (for some reason, this previously escaped the hooks)"],["EEBKW7VTILH6AGGV57ZIJ3DJGYHDSYBWGU3C7Q4WWAKSVNUGIYMQC","Keys and identities"]],"deps":["NG3Z3DOKDZQDQ7UNQEOMXWX2NJKKLM7DKRWW3KIUD7QEECTNQIZQC","SGXOEWHUET7RVS5HANSYE7QRQAG56NIKTC56MLPZ5XBCXODEWUXQC","TGA6QXGIZBDTXMOCHH23HJUGWYOCJQ32M3CQ3U7HUF3TDJO6QNIQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","ZXTHL45OYLOICXTXXEQ6AMNSLMQFZ6BFUJWMO6LZOSDK7ERROC5AC","WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","QNJBR73KCSCCF6FTHGZDF2K7PZQL3EFKZFOBT77KYZBMALTTW6OQC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","IYJZVLETBAQDDELENH3FX7ZTOC3HY4UJ3AMC3MACW6O7ZCWZTR6AC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","YWUZQU3TBJJMUVMX2JJW2D2JLTN57YJA36YJXKHBF7UJ6GEBTWUAC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","UM5DLRPBCQZQBEDJDLDPKODOKLACUHZD6YL6S4JRNKW6JLPNUVSAC","Q3GU26WDEYE2HXMM4WWNEGVMSXLQAKRJBSB2EJZA6JTHPKQHXCXQC","IACED7RWM2ZQIPN3YZATA6SXTRO2C6OUGT3HSOU3LIDZ7YRMLRXAC","XR7MNOMU5PMOOEY2EPPUABZ7NOP432RDCWUET23ONPXTT3JQIFIAC","ZSF3YFZTDOXMCOC3HOT5C6MQLYLWOR7QJAOUDS2M2Z4SC2YW3GRAC","Z6FWHKCAGF5MJCIG327JK7SYXQ53KM2UVGVE3QL64KDVOUPKQ3HQC","QJXNUQFJOAPQT3GUXRDTVKMJZCKFONSXUZMAZB7VC7OHDCGAVCOQC","6CZYYOG7C7ULY5Q4WSRVVC3QVSYACV3KFEYXDCH63OXXX2QFFFBAC","LV34DUJYQNSHJSNFALRRS3FFQWUU57HIJU26TTKNXDFWD6UWD4QAC","F6S2RUVPUGZDCDAI7D2MZNSLUTQZU3CPQXX6LRQ2P7KGQCJV7BQQC"]},"hunks":[{"Replacement":{"inode":{"change":5,"pos":19},"path":"libpijul/src/text_encoding.rs","line":2,"ins":{"up_context":[{"change":5,"pos":34}],"down_context":[{"change":5,"pos":35}],"flag":"BLOCK","start":0,"end":22,"inode":{"change":5,"pos":19}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":34},"to":{"change":5,"start":34,"end":35},"introduced_by":5}],"inode":{"change":5,"pos":19}},"ins_contents":[{"Add":"use std::borrow::Cow;"}],"del_contents":[{"Del":"\n"}]}},{"Replacement":{"inode":{"change":5,"pos":19},"path":"libpijul/src/text_encoding.rs","line":17,"ins":{"up_context":[{"change":5,"pos":424}],"down_context":[{"change":5,"pos":595}],"flag":"BLOCK","start":23,"end":124,"inode":{"change":5,"pos":19}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":424},"to":{"change":5,"start":424,"end":595},"introduced_by":5}],"inode":{"change":5,"pos":19}},"ins_contents":[{"Add":" pub(crate) fn decode<'a>(&self, text: &'a [u8]) -> Cow<'a, str> {"},{"Add":" self.0.decode(&text).0"}],"del_contents":[{"Del":" pub(crate) fn decode(&self, text: &[u8]) -> String {\n let (decoded, ..) = self.0.decode(&text);\n String::from_utf8(decoded.as_bytes().to_vec()).unwrap()\n"}]}},{"Replacement":{"inode":{"change":5,"pos":19},"path":"libpijul/src/text_encoding.rs","line":21,"ins":{"up_context":[{"change":2,"pos":1}],"down_context":[{"change":2,"pos":145}],"flag":"BLOCK","start":125,"end":225,"inode":{"change":5,"pos":19}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1},"to":{"change":2,"start":1,"end":145},"introduced_by":2}],"inode":{"change":5,"pos":19}},"ins_contents":[{"Add":" pub(crate) fn encode<'a>(&self, text: &'a str) -> Cow<'a, [u8]> {"},{"Add":" self.0.encode(text).0"}],"del_contents":[{"Del":" pub(crate) fn encode(&self, text: &str) -> Vec {\n let (encoded, ..) = self.0.encode(text);\n encoded.into_owned().to_vec()\n"}]}},{"Replacement":{"inode":{"change":5,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":16,"ins":{"up_context":[{"change":5,"pos":793459}],"down_context":[{"change":5,"pos":793495}],"flag":"BLOCK","start":226,"end":255,"inode":{"change":5,"pos":793247}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":793459},"to":{"change":5,"start":793459,"end":793495},"introduced_by":5}],"inode":{"change":5,"pos":793247}},"ins_contents":[{"Add":"#[derive(Hash, Clone, Copy)]"}],"del_contents":[{"Del":"#[derive(Debug, Hash, Clone, Copy)]\n"}]}},{"Edit":{"inode":{"change":5,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":22,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":793593}],"down_context":[{"change":4,"pos":11}],"flag":"BLOCK","start":256,"end":276,"inode":{"change":5,"pos":793247}}},"contents":[{"Add":" ptr: *const u8,"}]}},{"Edit":{"inode":{"change":5,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":25,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":14}],"down_context":[{"change":4,"pos":14}],"flag":"BLOCK","start":277,"end":468,"inode":{"change":5,"pos":793247}}},"contents":[{"Add":"impl<'a> std::fmt::Debug for Line<'a> {"},{"Add":" fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {"},{"Add":" write!(fmt, \"Line {{ l: {:?} }}\", std::str::from_utf8(self.l))"},{"Add":" }"},{"Add":"}"},{"Add":""}]}},{"Edit":{"inode":{"change":5,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":38,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":198}],"down_context":[{"change":4,"pos":198}],"flag":"BLOCK","start":469,"end":504,"inode":{"change":5,"pos":793247}}},"contents":[{"Add":" ptr: std::ptr::null(),"}]}},{"Replacement":{"inode":{"change":5,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":51,"ins":{"up_context":[{"change":5,"pos":794015}],"down_context":[{"change":5,"pos":794064}],"flag":"BLOCK","start":505,"end":577,"inode":{"change":5,"pos":793247}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":794015},"to":{"change":5,"start":794015,"end":794064},"introduced_by":5}],"inode":{"change":5,"pos":793247}},"ins_contents":[{"Add":" (self.ptr == b.ptr || self.l == b.l) && self.cyclic == b.cyclic"}],"del_contents":[{"Del":" self.l == b.l && self.cyclic == b.cyclic\n"}]}},{"Edit":{"inode":{"change":5,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":100,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":1344}],"down_context":[{"change":4,"pos":1344}],"flag":"BLOCK","start":578,"end":611,"inode":{"change":5,"pos":793247}}},"contents":[{"Add":" ptr: l.as_ptr(),"}]}},{"Edit":{"inode":{"change":5,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":116,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":1757}],"down_context":[{"change":4,"pos":1757}],"flag":"BLOCK","start":612,"end":645,"inode":{"change":5,"pos":793247}}},"contents":[{"Add":" ptr: l.as_ptr(),"}]}},{"Edit":{"inode":{"change":5,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":139,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":783}],"down_context":[{"change":4,"pos":1803}],"flag":"BLOCK","start":646,"end":691,"inode":{"change":5,"pos":793247}}},"contents":[{"Add":" debug!(\"encoding = {:?}\", encoding);"}]}},{"Edit":{"inode":{"change":5,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":141,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1860},"to":{"change":4,"start":1860,"end":1978},"introduced_by":4}],"inode":{"change":5,"pos":793247}}},"contents":[{"Del":" // self.diff_binary(changes, txn, txn.graph(channel), path, inode, a, &b)?;\n // return Ok(());\n"}]}},{"Replacement":{"inode":{"change":5,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":151,"ins":{"up_context":[{"change":5,"pos":68}],"down_context":[{"change":5,"pos":796653}],"flag":"BLOCK","start":692,"end":930,"inode":{"change":5,"pos":793247}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":68},"to":{"change":5,"start":68,"end":115},"introduced_by":5}],"inode":{"change":5,"pos":793247}},"ins_contents":[{"Add":" if log::log_enabled!(log::Level::Trace) {"},{"Add":" for l in lines_a.iter() {"},{"Add":" trace!(\"a: {:?}\", l)"},{"Add":" }"},{"Add":" for l in lines_b.iter() {"},{"Add":" trace!(\"b: {:?}\", l)"},{"Add":" }"},{"Add":" }"}],"del_contents":[{"Del":" trace!(\"{:?} {:?}\", lines_a, lines_b);\n"}]}},{"Edit":{"inode":{"change":5,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":190,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":797337},"to":{"change":5,"start":797337,"end":797338},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":797338},"to":{"change":5,"start":116096,"end":116146},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":116146},"to":{"change":5,"start":797383,"end":797440},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":797383},"to":{"change":5,"start":797383,"end":797440},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":797440},"to":{"change":5,"start":116147,"end":116175},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":116175},"to":{"change":5,"start":797470,"end":797588},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":797470},"to":{"change":5,"start":797470,"end":797588},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":797588},"to":{"change":5,"start":116176,"end":116221},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":116221},"to":{"change":5,"start":86503,"end":86541},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":86541},"to":{"change":5,"start":52,"end":129},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":797638},"to":{"change":5,"start":52,"end":129},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":129},"to":{"change":5,"start":86542,"end":86778},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":86778},"to":{"change":5,"start":797895,"end":798199},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":797895},"to":{"change":5,"start":797895,"end":798199},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":798199},"to":{"change":5,"start":116222,"end":116349},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":116349},"to":{"change":5,"start":136081,"end":136139},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":136139},"to":{"change":5,"start":798352,"end":798400},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":798352},"to":{"change":5,"start":798352,"end":798400},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":798400},"to":{"change":5,"start":136140,"end":136198},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":136198},"to":{"change":5,"start":798456,"end":798787},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":798456},"to":{"change":5,"start":798456,"end":798787},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":798787},"to":{"change":5,"start":136199,"end":136320},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":136320},"to":{"change":5,"start":798904,"end":798951},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":798904},"to":{"change":5,"start":798904,"end":798951},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":798951},"to":{"change":5,"start":136321,"end":136509},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":136509},"to":{"change":5,"start":799133,"end":799187},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":799133},"to":{"change":5,"start":799133,"end":799187},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":799187},"to":{"change":5,"start":136510,"end":136578},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":136578},"to":{"change":5,"start":799253,"end":799309},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":799253},"to":{"change":5,"start":799253,"end":799309},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":799309},"to":{"change":5,"start":136579,"end":136648},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":136648},"to":{"change":5,"start":799376,"end":799524},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":799376},"to":{"change":5,"start":799376,"end":799524},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":799524},"to":{"change":5,"start":136649,"end":136705},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":136705},"to":{"change":5,"start":799578,"end":799632},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":799578},"to":{"change":5,"start":799578,"end":799632},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":799632},"to":{"change":5,"start":136706,"end":136774},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":136774},"to":{"change":5,"start":799698,"end":799869},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":799698},"to":{"change":5,"start":799698,"end":799869},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":799869},"to":{"change":5,"start":86779,"end":86822},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2400},"to":{"change":5,"start":799918,"end":800168},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":86822},"to":{"change":5,"start":799918,"end":800168},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":799918},"to":{"change":5,"start":799918,"end":800168},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":800168},"to":{"change":5,"start":1103,"end":1135},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1135},"to":{"change":5,"start":800168,"end":800193},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":800168},"to":{"change":5,"start":800168,"end":800193},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":800193},"to":{"change":5,"start":86823,"end":86869},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2451},"to":{"change":5,"start":548,"end":592},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":86869},"to":{"change":5,"start":548,"end":592},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":800245},"to":{"change":5,"start":548,"end":592},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":592},"to":{"change":5,"start":800348,"end":800587},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":800348},"to":{"change":5,"start":800348,"end":800587},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":800587},"to":{"change":5,"start":136775,"end":136879},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":136879},"to":{"change":5,"start":800691,"end":800730},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":800691},"to":{"change":5,"start":800691,"end":800730},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":800730},"to":{"change":5,"start":1136,"end":1164},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1164},"to":{"change":5,"start":116350,"end":116377},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":800730},"to":{"change":5,"start":116350,"end":116377},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":116377},"to":{"change":5,"start":800741,"end":800747},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":800741},"to":{"change":5,"start":800741,"end":800747},"introduced_by":5}],"inode":{"change":5,"pos":793247}}},"contents":[{"Del":"\n"},{"Del":" fn diff_binary(\n"},{"Del":" &mut self,\n changes: &C,\n txn: &T,\n"},{"Del":" channel: &T::Graph,\n"},{"Del":" path: String,\n inode: Position>,\n ret: &crate::alive::Graph,\n b: &[u8],\n"},{"Del":" ) -> Result<(), TxnErr> {\n"},{"Del":" self.has_binary_files = true;\n"},{"Del":" use crate::change::{Atom, EdgeMap, Hunk, Local, NewEdge, NewVertex};\n"},{"Del":"\n let mut contents = self.contents.lock().unwrap();\n let pos = contents.len();\n contents.extend_from_slice(&b[..]);\n let pos_end = contents.len();\n contents.push(0);\n std::mem::drop(contents);\n\n"},{"Del":" let mut edges = Vec::new();\n let mut deleted = Vec::new();\n for v in ret.lines.iter() {\n debug!(\"v.vertex = {:?}, inode = {:?}\", v.vertex, inode);\n if Some(v.vertex.change) == inode.change && v.vertex.end == inode.pos {\n continue;\n }\n"},{"Del":" for e in iter_adjacent(txn, channel, v.vertex, EdgeFlags::PARENT, EdgeFlags::all())? {\n let e = e?;\n"},{"Del":" if e.flag().contains(EdgeFlags::PSEUDO) {\n"},{"Del":" continue;\n }\n"},{"Del":" if e.flag().contains(EdgeFlags::FOLDER) {\n"},{"Del":" if log_enabled!(log::Level::Debug) {\n let f = std::fs::File::create(\"debug_diff_binary\").unwrap();\n ret.debug(changes, txn, channel, false, true, f).unwrap();\n }\n panic!(\"e.flag.contains(EdgeFlags::FOLDER)\");\n }\n"},{"Del":" if e.flag().contains(EdgeFlags::PARENT) {\n if e.flag().contains(EdgeFlags::DELETED) {\n"},{"Del":" deleted.push(NewEdge {\n"},{"Del":" previous: e.flag() - EdgeFlags::PARENT,\n flag: e.flag() - EdgeFlags::PARENT,\n from: e.dest().to_option(),\n"},{"Del":" to: v.vertex.to_option(),\n"},{"Del":" introduced_by: Some(e.introduced_by()),\n"},{"Del":" })\n } else {\n"},{"Del":" let previous = e.flag() - EdgeFlags::PARENT;\n"},{"Del":" edges.push(NewEdge {\n previous,\n flag: previous | EdgeFlags::DELETED,\n"},{"Del":" from: e.dest().to_option(),\n"},{"Del":" to: v.vertex.to_option(),\n"},{"Del":" introduced_by: Some(e.introduced_by()),\n"},{"Del":" })\n }\n }\n }\n }\n // Kill all of `ret`, add `b` instead.\n if !deleted.is_empty() {\n"},{"Del":" self.actions.push(Hunk::Edit {\n"},{"Del":" local: Local {\n line: 0,\n path: path.clone(),\n },\n change: Atom::EdgeMap(EdgeMap {\n edges: deleted,\n inode,\n }),\n"},{"Del":" encoding: None,\n"},{"Del":" })\n }\n"},{"Del":" self.actions.push(Hunk::Replacement {\n"},{"Del":" local: Local { line: 0, path },\n"},{"Del":" change: Atom::EdgeMap(EdgeMap { edges, inode }),\n replacement: Atom::NewVertex(NewVertex {\n up_context: vec![inode],\n down_context: Vec::new(),\n flag: EdgeFlags::empty(),\n"},{"Del":" start: ChangePosition(pos.into()),\n end: ChangePosition(pos_end.into()),\n"},{"Del":" inode,\n }),\n"},{"Del":" encoding: None,\n"},{"Del":" });\n Ok(())\n"},{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":4,"pos":2530},"path":"libpijul/src/diff/bin.rs","line":49,"ins":{"up_context":[{"change":4,"pos":3860}],"down_context":[{"change":4,"pos":3884}],"flag":"BLOCK","start":931,"end":968,"inode":{"change":4,"pos":2530}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3860},"to":{"change":4,"start":3860,"end":3884},"introduced_by":4}],"inode":{"change":4,"pos":2530}},"ins_contents":[{"Add":" let mut i = window.min(b.len());"}],"del_contents":[{"Del":" let mut i = window;\n"}]}},{"Edit":{"inode":{"change":4,"pos":2530},"path":"libpijul/src/diff/bin.rs","line":62,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":4302}],"down_context":[{"change":4,"pos":4302}],"flag":"BLOCK","start":969,"end":1012,"inode":{"change":4,"pos":2530}}},"contents":[{"Add":" ptr: old.as_ptr(),"}]}},{"Edit":{"inode":{"change":4,"pos":2530},"path":"libpijul/src/diff/bin.rs","line":68,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":4496}],"down_context":[{"change":4,"pos":4496}],"flag":"BLOCK","start":1013,"end":1080,"inode":{"change":4,"pos":2530}}},"contents":[{"Add":" } else {"},{"Add":" break"}]}},{"Replacement":{"inode":{"change":4,"pos":2530},"path":"libpijul/src/diff/bin.rs","line":95,"ins":{"up_context":[{"change":4,"pos":5184}],"down_context":[{"change":4,"pos":5254}],"flag":"BLOCK","start":1081,"end":1156,"inode":{"change":4,"pos":2530}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":5184},"to":{"change":4,"start":5184,"end":5254},"introduced_by":4}],"inode":{"change":4,"pos":2530}},"ins_contents":[{"Add":" Chunk::Old { start, end, ptr, .. } => lines.push(super::Line {"}],"del_contents":[{"Del":" Chunk::Old { start, end, .. } => lines.push(super::Line {\n"}]}},{"Edit":{"inode":{"change":4,"pos":2530},"path":"libpijul/src/diff/bin.rs","line":97,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":5289}],"down_context":[{"change":4,"pos":5289}],"flag":"BLOCK","start":1157,"end":1178,"inode":{"change":4,"pos":2530}}},"contents":[{"Add":" ptr,"}]}},{"Edit":{"inode":{"change":4,"pos":2530},"path":"libpijul/src/diff/bin.rs","line":118,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":5732}],"down_context":[{"change":4,"pos":5732}],"flag":"BLOCK","start":1179,"end":1203,"inode":{"change":4,"pos":2530}}},"contents":[{"Add":" ptr: *const u8,"}]}},{"Replacement":{"inode":{"change":5,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1281,"ins":{"up_context":[{"change":2,"pos":987}],"down_context":[{"change":2,"pos":1033}],"flag":"BLOCK","start":1204,"end":1262,"inode":{"change":5,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":987},"to":{"change":2,"start":987,"end":1033},"introduced_by":2}],"inode":{"change":5,"pos":37976}},"ins_contents":[{"Add":" None => std::borrow::Cow::Borrowed(h.as_bytes()),"}],"del_contents":[{"Del":" None => String::from(h).into_bytes(),\n"}]}},{"Replacement":{"inode":{"change":5,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1320,"ins":{"up_context":[{"change":5,"pos":522}],"down_context":[{"change":5,"pos":1236}],"flag":"BLOCK","start":1263,"end":1466,"inode":{"change":5,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":522},"to":{"change":5,"start":6111,"end":6169},"introduced_by":5}],"inode":{"change":5,"pos":37976}},"ins_contents":[{"Add":" let dec = encoding.decode(&contents);"},{"Add":" let dec = if dec.ends_with(\"\\n\") {"},{"Add":" &dec[..dec.len() - 1]"},{"Add":" } else {"},{"Add":" &dec"},{"Add":" };"},{"Add":" for a in dec.split('\\n') {"}],"del_contents":[{"Del":" for a in encoding.decode(&contents).split('\\n') {\n"}]}},{"Edit":{"inode":{"change":3,"pos":12027},"path":"chardetng/src/lib.rs","line":2950,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":128274}],"down_context":[{"change":3,"pos":128274}],"flag":"BLOCK","start":1467,"end":1468,"inode":{"change":3,"pos":12027}}},"contents":[{"Add":""}]}},{"Replacement":{"inode":{"change":3,"pos":12027},"path":"chardetng/src/lib.rs","line":2962,"ins":{"up_context":[{"change":3,"pos":128794}],"down_context":[{"change":3,"pos":128849}],"flag":"BLOCK","start":1469,"end":1544,"inode":{"change":3,"pos":12027}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":128794},"to":{"change":3,"start":128794,"end":128849},"introduced_by":3}],"inode":{"change":3,"pos":12027}},"ins_contents":[{"Add":" if self.non_ascii_seen == 0"},{"Add":" && self.esc_seen"},{"Add":" {"}],"del_contents":[{"Del":" if self.non_ascii_seen == 0 && self.esc_seen {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":12027},"path":"chardetng/src/lib.rs","line":2966,"ins":{"up_context":[{"change":3,"pos":128923}],"down_context":[{"change":3,"pos":128967}],"flag":"BLOCK","start":1545,"end":1588,"inode":{"change":3,"pos":12027}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":128923},"to":{"change":3,"start":128923,"end":128967},"introduced_by":3}],"inode":{"change":3,"pos":12027}},"ins_contents":[{"Add":" return (ISO_2022_JP, true)"}],"del_contents":[{"Del":" return (ISO_2022_JP, true);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":12027},"path":"chardetng/src/lib.rs","line":3041,"ins":{"up_context":[{"change":3,"pos":132034}],"down_context":[{"change":3,"pos":132063}],"flag":"BLOCK","start":1589,"end":1618,"inode":{"change":3,"pos":12027}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":132034},"to":{"change":3,"start":132034,"end":132063},"introduced_by":3}],"inode":{"change":3,"pos":12027}},"ins_contents":[{"Add":" (encoding, max >= 0)"}],"del_contents":[{"Del":"\n (encoding, max > 0)\n"}]}},{"Edit":{"inode":{"change":3,"pos":12027},"path":"chardetng/src/lib.rs","line":3386,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":143335}],"down_context":[{"change":3,"pos":143335}],"flag":"BLOCK","start":1619,"end":1750,"inode":{"change":3,"pos":12027}}},"contents":[{"Add":" }"},{"Add":""},{"Add":" #[test]"},{"Add":" fn test_en_windows1252() {"},{"Add":" // \"Don't \""},{"Add":" check_bytes(&[68,111,110,180,116,32], WINDOWS_1252);"}]}},{"Edit":{"inode":{"change":5,"pos":1030385},"path":"Cargo.lock","line":21,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":1030901}],"down_context":[{"change":28,"pos":16895}],"flag":"BLOCK","start":1751,"end":1942,"inode":{"change":5,"pos":1030385}}},"contents":[{"Add":"name = \"adler32\""},{"Add":"version = \"1.2.0\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234\""},{"Add":""},{"Add":"[[package]]"}]}},{"Edit":{"inode":{"change":5,"pos":1030385},"path":"Cargo.lock","line":212,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":2369},"to":{"change":5,"start":2369,"end":2512},"introduced_by":5}],"inode":{"change":5,"pos":1030385}}},"contents":[{"Del":"source = \"registry+https://github.com/rust-lang/crates.io-index\"\nchecksum = \"81a81b0d8f8ee23417182818b4f06312c5f535c2b04eef1773f7c24bbdf8c500\"\n"}]}},{"Edit":{"inode":{"change":5,"pos":1030385},"path":"Cargo.lock","line":213,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":2529}],"down_context":[{"change":5,"pos":2529}],"flag":"BLOCK","start":1943,"end":1956,"inode":{"change":5,"pos":1030385}}},"contents":[{"Add":" \"arrayvec\","}]}},{"Edit":{"inode":{"change":5,"pos":1030385},"path":"Cargo.lock","line":215,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":2547}],"down_context":[{"change":5,"pos":2547}],"flag":"BLOCK","start":1957,"end":1968,"inode":{"change":5,"pos":1030385}}},"contents":[{"Add":" \"detone\","}]}},{"Edit":{"inode":{"change":5,"pos":1030385},"path":"Cargo.lock","line":218,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":466}],"down_context":[{"change":5,"pos":2580}],"flag":"BLOCK","start":1969,"end":1979,"inode":{"change":5,"pos":1030385}}},"contents":[{"Add":" \"rayon\","}]}},{"Edit":{"inode":{"change":5,"pos":1030385},"path":"Cargo.lock","line":326,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":5083}],"down_context":[{"change":5,"pos":5083}],"flag":"BLOCK","start":1980,"end":2237,"inode":{"change":5,"pos":1030385}}},"contents":[{"Add":"name = \"crossbeam-channel\""},{"Add":"version = \"0.5.1\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4\""},{"Add":"dependencies = ["},{"Add":" \"cfg-if 1.0.0\","},{"Add":" \"crossbeam-utils\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"}]}},{"Edit":{"inode":{"change":5,"pos":1030385},"path":"Cargo.lock","line":439,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":7564}],"down_context":[{"change":5,"pos":7564}],"flag":"BLOCK","start":2238,"end":2428,"inode":{"change":5,"pos":1030385}}},"contents":[{"Add":"name = \"detone\""},{"Add":"version = \"1.0.0\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"f7104c193859c8141dcbb2008bd3d93e581d0fa7bb47b0d9f5e15c89d1b55514\""},{"Add":""},{"Add":"[[package]]"}]}},{"Edit":{"inode":{"change":5,"pos":1030385},"path":"Cargo.lock","line":1074,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":22974}],"down_context":[{"change":5,"pos":22974}],"flag":"BLOCK","start":2429,"end":2441,"inode":{"change":5,"pos":1030385}}},"contents":[{"Add":" \"adler32\","}]}},{"Edit":{"inode":{"change":5,"pos":1030385},"path":"Cargo.lock","line":1705,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":39097}],"down_context":[{"change":5,"pos":39097}],"flag":"BLOCK","start":2442,"end":2708,"inode":{"change":5,"pos":1030385}}},"contents":[{"Add":"]"},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"rayon\""},{"Add":"version = \"1.5.1\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90\""},{"Add":"dependencies = ["},{"Add":" \"autocfg\","},{"Add":" \"crossbeam-deque\","},{"Add":" \"either\","},{"Add":" \"rayon-core\","}]}},{"Edit":{"inode":{"change":5,"pos":1030385},"path":"Cargo.lock","line":1720,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":39310}],"down_context":[{"change":5,"pos":39310}],"flag":"BLOCK","start":2709,"end":3013,"inode":{"change":5,"pos":1030385}}},"contents":[{"Add":"name = \"rayon-core\""},{"Add":"version = \"1.9.1\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e\""},{"Add":"dependencies = ["},{"Add":" \"crossbeam-channel\","},{"Add":" \"crossbeam-deque\","},{"Add":" \"crossbeam-utils\","},{"Add":" \"lazy_static\","},{"Add":" \"num_cpus\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"}]}}],"owner":"irevoire","repo":"pijul","token":"OSltit71Q3AEEtzmlKS5Vy7NHG1+xhzhX+RbeQp9XYo=","login":null}

…

Dependencies

Change contents