{"header":{"message":"track file encoding in the record, including change text for file adds","description":null,"timestamp":"2020-12-15T09:16:00.318414972Z","authors":[{"email":"rohan.hart17@gmail.com","full_name":"Rohan Hart","name":"rohan"}]},"hash":"NYOF5766GLBTWQV2KTVRAJMGVJNJ37Z5BLJMFPZA3HG7X2Q2RXPAC","authors":[],"deps":{"hashes":[["NYOF5766GLBTWQV2KTVRAJMGVJNJ37Z5BLJMFPZA3HG7X2Q2RXPAC","track file encoding in the record, including change text for file adds"],["AA",null],["KJDQ2WOMIUTVDEEQ7NMJYBZAVUZ3NIVOVJ6MUCZPRAWIEWOV6TWQC","Fixing the parsing of section headers in the text change format"],["246V5TYIUL7CFN7G5Y7A35EEM6IJPN532ROEYVSM7Q4HCQSWPDBQC","decode existing files"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["VMOYG7MKEWTUEEY2EOL256RWCVPGRD63IFOSKXHBGJ6VSRITLMOAC","text file decoding for new files"],["O4DNWMPDUWI6SKYOZTQKCSX6MSR73CTGCUSM65TSQYVOUSAAS6KAC","Cleaunp and proofreading of libpijul::record"],["7FFFKQZU3TFXWL45TILYNX5A7AC7HBK526SD5DZGYCELN76YE7TAC","add 'Default' implementations"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["6HNRL5RT76NH5YNSUN7B4FHNRZXKNLX4DROFGMO4R5P2U7JWOL2QC","detect non-utf8 text files"]],"deps":["KJDQ2WOMIUTVDEEQ7NMJYBZAVUZ3NIVOVJ6MUCZPRAWIEWOV6TWQC","246V5TYIUL7CFN7G5Y7A35EEM6IJPN532ROEYVSM7Q4HCQSWPDBQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","O4DNWMPDUWI6SKYOZTQKCSX6MSR73CTGCUSM65TSQYVOUSAAS6KAC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","7FFFKQZU3TFXWL45TILYNX5A7AC7HBK526SD5DZGYCELN76YE7TAC","6HNRL5RT76NH5YNSUN7B4FHNRZXKNLX4DROFGMO4R5P2U7JWOL2QC","VMOYG7MKEWTUEEY2EOL256RWCVPGRD63IFOSKXHBGJ6VSRITLMOAC"]},"hunks":[{"Replacement":{"inode":{"change":4,"pos":198172},"path":"libpijul/src/working_copy/mod.rs","line":1,"ins":{"up_context":[{"change":4,"pos":198172}],"down_context":[{"change":3,"pos":0}],"flag":"","start":0,"end":15,"inode":{"change":4,"pos":198172}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":198172},"to":{"change":4,"start":198173,"end":198228},"introduced_by":4}],"inode":{"change":4,"pos":198172}},"ins_contents":[{"Add":"use std::fmt;"},{"Add":""}],"del_contents":[{"Del":"// org id jgSEtEI/xIjz/bF+vtGtYbEA9bNIeFWLqnZT+M51S64=\n"}]}},{"Replacement":{"inode":{"change":4,"pos":198172},"path":"libpijul/src/working_copy/mod.rs","line":4,"ins":{"up_context":[{"change":3,"pos":33}],"down_context":[{"change":3,"pos":63}],"flag":"","start":16,"end":66,"inode":{"change":4,"pos":198172}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":33},"to":{"change":3,"start":33,"end":63},"introduced_by":3}],"inode":{"change":4,"pos":198172}},"ins_contents":[{"Add":"use serde::{de::Visitor, Deserialize, Serialize};"}],"del_contents":[{"Del":"// use encoding_rs::Encoding;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":198172},"path":"libpijul/src/working_copy/mod.rs","line":39,"ins":{"up_context":[{"change":3,"pos":66}],"down_context":[{"change":3,"pos":159}],"flag":"","start":67,"end":351,"inode":{"change":4,"pos":198172}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":66},"to":{"change":3,"start":66,"end":159},"introduced_by":3}],"inode":{"change":4,"pos":198172}},"ins_contents":[{"Add":" /// Read the file into the buffer, decoding to UTF-8 for text files"},{"Add":" ///"},{"Add":" /// Returns the encoding used or None if it was a binary file"},{"Add":" fn decode_file("},{"Add":" &mut self,"},{"Add":" file: &str,"},{"Add":" buffer: &mut Vec,"},{"Add":" ) -> Result, Self::Error> {"}],"del_contents":[{"Del":" fn decode_file(&mut self, file: &str, buffer: &mut Vec) -> Result<(), Self::Error> {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":198172},"path":"libpijul/src/working_copy/mod.rs","line":49,"ins":{"up_context":[{"change":3,"pos":243}],"down_context":[{"change":3,"pos":342}],"flag":"","start":352,"end":513,"inode":{"change":4,"pos":198172}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":243},"to":{"change":3,"start":243,"end":342},"introduced_by":3}],"inode":{"change":4,"pos":198172}},"ins_contents":[{"Add":" let mime = tree_magic_mini::from_u8(&uncoded);"},{"Add":" debug!(\"mime = {:?}\", mime);"},{"Add":" let (mut decoded, encoding) = if mime.starts_with(\"text/\") {"}],"del_contents":[{"Del":" let (mut decoded, encoding) = if tree_magic_mini::from_u8(&uncoded).starts_with(\"text/\") {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":198172},"path":"libpijul/src/working_copy/mod.rs","line":59,"ins":{"up_context":[{"change":3,"pos":726}],"down_context":[{"change":3,"pos":788}],"flag":"","start":514,"end":586,"inode":{"change":4,"pos":198172}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":726},"to":{"change":3,"start":726,"end":788},"introduced_by":3}],"inode":{"change":4,"pos":198172}},"ins_contents":[{"Add":" (decoded.as_bytes().to_vec(), Some(Encoding(encoding)))"}],"del_contents":[{"Del":" (decoded.as_bytes().to_vec(), Some(encoding))\n"}]}},{"Edit":{"inode":{"change":4,"pos":198172},"path":"libpijul/src/working_copy/mod.rs","line":68,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":998}],"down_context":[{"change":3,"pos":998}],"flag":"","start":587,"end":617,"inode":{"change":4,"pos":198172}}},"contents":[{"Add":""},{"Add":" Ok(encoding)"},{"Add":" }"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":4,"pos":198172},"path":"libpijul/src/working_copy/mod.rs","line":73,"ins":{"up_context":[{"change":3,"pos":999}],"down_context":[{"change":3,"pos":1014}],"flag":"","start":618,"end":2007,"inode":{"change":4,"pos":198172}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":999},"to":{"change":3,"start":999,"end":1014},"introduced_by":3}],"inode":{"change":4,"pos":198172}},"ins_contents":[{"Add":"#[derive(Debug, PartialEq, Eq)]"},{"Add":"pub struct Encoding(&'static encoding_rs::Encoding);"},{"Add":""},{"Add":"impl Encoding {"},{"Add":" pub(crate) fn for_label(label: &str) -> Encoding {"},{"Add":" Encoding(encoding_rs::Encoding::for_label_no_replacement(label.as_bytes()).unwrap())"},{"Add":" }"},{"Add":""},{"Add":" pub(crate) fn label(&self) -> &str {"},{"Add":" self.0.name()"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Clone for Encoding {"},{"Add":" fn clone(&self) -> Self {"},{"Add":" Encoding(self.0)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Serialize for Encoding {"},{"Add":" fn serialize(&self, serializer: S) -> Result"},{"Add":" where"},{"Add":" S: serde::Serializer,"},{"Add":" {"},{"Add":" serializer.serialize_str(self.label())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"struct EncodingVisitor;"},{"Add":""},{"Add":"impl<'de> Deserialize<'de> for Encoding {"},{"Add":" fn deserialize(deserializer: D) -> Result"},{"Add":" where"},{"Add":" D: serde::Deserializer<'de>,"},{"Add":" {"},{"Add":" impl<'de> Visitor<'de> for EncodingVisitor {"},{"Add":" type Value = Encoding;"},{"Add":""},{"Add":" fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {"},{"Add":" formatter.write_str(\"a string label meeting the encoding standard https://encoding.spec.whatwg.org/#concept-encoding-get\")"},{"Add":" }"},{"Add":""},{"Add":" fn visit_str(self, v: &str) -> Result"},{"Add":" where"},{"Add":" E: serde::de::Error,"},{"Add":" {"},{"Add":" Ok(Encoding::for_label(v))"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" deserializer.deserialize_str(EncodingVisitor)"}],"del_contents":[{"Del":" Ok(())\n"}]}},{"FileMove":{"meta":{"basename":"text.rs","metadata":493},"old":[{"basename":"text.rs","metadata":420}],"up":[{"change":4,"pos":248792}],"down":[{"change":4,"pos":10}],"show_perms":true}},{"Edit":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":136,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":492161},"to":{"change":4,"start":492161,"end":492194},"introduced_by":4}],"inode":{"change":4,"pos":488880}}},"contents":[{"Del":"\nconst CHECK_UTF8: usize = 1000;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":236,"ins":{"up_context":[{"change":4,"pos":496437}],"down_context":[{"change":4,"pos":496480}],"flag":"","start":2018,"end":2073,"inode":{"change":4,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":496437},"to":{"change":4,"start":496437,"end":496480},"introduced_by":4}],"inode":{"change":4,"pos":488880}},"ins_contents":[{"Add":" let (contents, encoding) = if meta.is_file() {"}],"del_contents":[{"Del":" let contents = if meta.is_file() {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":238,"ins":{"up_context":[{"change":4,"pos":496552}],"down_context":[{"change":4,"pos":496630}],"flag":"","start":2074,"end":2169,"inode":{"change":4,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":496552},"to":{"change":3,"start":1021,"end":1101},"introduced_by":3}],"inode":{"change":4,"pos":488880}},"ins_contents":[{"Add":" let encoding = working_copy.decode_file(&item.full_path, &mut self.rec.contents)?;"}],"del_contents":[{"Del":" working_copy.decode_file(&item.full_path, &mut self.rec.contents)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":241,"ins":{"up_context":[{"change":4,"pos":496780}],"down_context":[{"change":4,"pos":497208}],"flag":"","start":2170,"end":2231,"inode":{"change":4,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":496780},"to":{"change":4,"start":496780,"end":496931},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":496931},"to":{"change":4,"start":4780,"end":4947},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":4947},"to":{"change":4,"start":497193,"end":497208},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":497193},"to":{"change":4,"start":497193,"end":497208},"introduced_by":4}],"inode":{"change":4,"pos":488880}},"ins_contents":[{"Add":" self.rec.has_binary_files |= encoding.is_none();"}],"del_contents":[{"Del":" self.rec.has_binary_files |= {\n let s = start.0 as usize;\n let e = (end.0 as usize).min(s + CHECK_UTF8 + 4);\n"},{"Del":" let mime = tree_magic_mini::from_u8(&self.rec.contents[s..e]);\n debug!(\"mime = {:?}\", mime);\n !mime.starts_with(\"text/\")\n"},{"Del":" };\n"}]}},{"Replacement":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":244,"ins":{"up_context":[{"change":4,"pos":497313}],"down_context":[{"change":4,"pos":497811}],"flag":"","start":2232,"end":2853,"inode":{"change":4,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":497313},"to":{"change":4,"start":497313,"end":497811},"introduced_by":4}],"inode":{"change":4,"pos":488880}},"ins_contents":[{"Add":" ("},{"Add":" Some(Atom::NewVertex(NewVertex {"},{"Add":" up_context: vec![Position {"},{"Add":" change: None,"},{"Add":" pos: inode_pos,"},{"Add":" }],"},{"Add":" down_context: vec![],"},{"Add":" start,"},{"Add":" end,"},{"Add":" flag: EdgeFlags::empty(),"},{"Add":" inode: Position {"},{"Add":" change: None,"},{"Add":" pos: inode_pos,"},{"Add":" },"},{"Add":" })),"},{"Add":" encoding,"},{"Add":" )"}],"del_contents":[{"Del":" Some(Atom::NewVertex(NewVertex {\n up_context: vec![Position {\n change: None,\n pos: inode_pos,\n }],\n down_context: vec![],\n start,\n end,\n flag: EdgeFlags::empty(),\n inode: Position {\n change: None,\n pos: inode_pos,\n },\n }))\n"}]}},{"Replacement":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":262,"ins":{"up_context":[{"change":4,"pos":497832}],"down_context":[{"change":4,"pos":497853}],"flag":"","start":2854,"end":2887,"inode":{"change":4,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":497832},"to":{"change":4,"start":497832,"end":497853},"introduced_by":4}],"inode":{"change":4,"pos":488880}},"ins_contents":[{"Add":" (None, encoding)"}],"del_contents":[{"Del":" None\n"}]}},{"Replacement":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":265,"ins":{"up_context":[{"change":4,"pos":497884}],"down_context":[{"change":4,"pos":497901}],"flag":"","start":2888,"end":2913,"inode":{"change":4,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":497884},"to":{"change":4,"start":497884,"end":497901},"introduced_by":4}],"inode":{"change":4,"pos":488880}},"ins_contents":[{"Add":" (None, None)"}],"del_contents":[{"Del":" None\n"}]}},{"Edit":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":289,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":498800}],"down_context":[{"change":4,"pos":498800}],"flag":"","start":2914,"end":2936,"inode":{"change":4,"pos":488880}}},"contents":[{"Add":" encoding,"}]}},{"FileMove":{"meta":{"basename":"mod.rs","metadata":493},"old":[{"basename":"mod.rs","metadata":420}],"up":[{"change":4,"pos":768883}],"down":[{"change":4,"pos":793247}],"show_perms":true}},{"Edit":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":831385},"to":{"change":4,"start":831385,"end":831438},"introduced_by":4}],"inode":{"change":4,"pos":831311}}},"contents":[{"Del":"use crate::pristine::*;\nuse chrono::{DateTime, Utc};\n"}]}},{"Edit":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":2,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":831481}],"down_context":[{"change":4,"pos":831519}],"flag":"","start":2946,"end":3027,"inode":{"change":4,"pos":831311}}},"contents":[{"Add":""},{"Add":"use chrono::{DateTime, Utc};"},{"Add":""},{"Add":"use crate::{pristine::*, working_copy::Encoding};"}]}},{"Edit":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":561,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":848439}],"down_context":[{"change":4,"pos":848439}],"flag":"","start":3028,"end":3047,"inode":{"change":4,"pos":831311}}},"contents":[{"Add":" .."}]}},{"Edit":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":659,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":851667}],"down_context":[{"change":4,"pos":851667}],"flag":"","start":3048,"end":3084,"inode":{"change":4,"pos":831311}}},"contents":[{"Add":" encoding: Option,"}]}},{"Edit":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1066,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":865376}],"down_context":[{"change":4,"pos":865376}],"flag":"","start":3085,"end":3111,"inode":{"change":4,"pos":831311}}},"contents":[{"Add":" encoding,"}]}},{"Edit":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1072,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":865612}],"down_context":[{"change":4,"pos":865612}],"flag":"","start":3112,"end":3138,"inode":{"change":4,"pos":831311}}},"contents":[{"Add":" encoding,"}]}},{"Edit":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":295,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":48443}],"down_context":[{"change":4,"pos":48443}],"flag":"","start":3139,"end":3177,"inode":{"change":4,"pos":37976}}},"contents":[{"Add":""},{"Add":"const BINARY_LABEL: &str = \"binary\";"}]}},{"Edit":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":385,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":51767}],"down_context":[{"change":4,"pos":51767}],"flag":"","start":3178,"end":3204,"inode":{"change":4,"pos":37976}}},"contents":[{"Add":" encoding,"}]}},{"Edit":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":404,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":52540}],"down_context":[{"change":4,"pos":52540}],"flag":"","start":3205,"end":3389,"inode":{"change":4,"pos":37976}}},"contents":[{"Add":" };"},{"Add":" let encoding_label = match encoding {"},{"Add":" Some(encoding) => encoding.label(),"},{"Add":" _ => BINARY_LABEL,"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":411,"ins":{"up_context":[{"change":4,"pos":52618}],"down_context":[{"change":4,"pos":52730}],"flag":"","start":3390,"end":3523,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":52618},"to":{"change":4,"start":52618,"end":52730},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" \"File addition: {:?} in {:?} {:o} {:?}\\n up\","},{"Add":" name, parent, perms.0, encoding_label"}],"del_contents":[{"Del":" \"File addition: {:?} in {:?} {:o}\\n up\",\n name, parent, perms.0\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":516,"ins":{"up_context":[{"change":4,"pos":57069}],"down_context":[{"change":4,"pos":57195}],"flag":"","start":3524,"end":3673,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":57069},"to":{"change":2,"start":0,"end":127},"introduced_by":2}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Regex::new(r#\"^(?P\\d+)\\. File addition: \"(?P[^\"]*)\" in \"(?P[^\"]*)\" (?P\\d+) \"(?P[^\"]*)\"\"#).unwrap();"}],"del_contents":[{"Del":" Regex::new(r#\"^(?P\\d+)\\. File addition: \"(?P[^\"]*)\" in \"(?P[^\"]*)\" (?P\\d+)\"#).unwrap();\n"}]}},{"Edit":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":588,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":60586}],"down_context":[{"change":4,"pos":60586}],"flag":"","start":3674,"end":3925,"inode":{"change":4,"pos":37976}}},"contents":[{"Add":" let encoding_label = cap.name(\"encoding\").unwrap().as_str();"},{"Add":" let encoding = if encoding_label != BINARY_LABEL {"},{"Add":" Some(Encoding::for_label(encoding_label))"},{"Add":" } else {"},{"Add":" None"},{"Add":" };"}]}},{"Edit":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":601,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":60862}],"down_context":[{"change":4,"pos":60862}],"flag":"","start":3926,"end":3956,"inode":{"change":4,"pos":37976}}},"contents":[{"Add":" encoding,"}]}}],"owner":"irevoire","repo":"pijul","token":"2v8R667FTcIymwLciQd6emgj6aybAV9NMeH/IYhARN8=","login":null}

…

Dependencies

Change contents