{"header":{"message":"Proper escaping of UTF-8 filenames in the patch text format","description":null,"timestamp":"2021-09-07T11:59:17.438883067Z","authors":[{}]},"hash":"SFJ3XRTFUNG6KNYDLIYKHCENZ6Y3PG33GNGDW6444LAVBMCSH2FAC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["SFJ3XRTFUNG6KNYDLIYKHCENZ6Y3PG33GNGDW6444LAVBMCSH2FAC","Proper escaping of UTF-8 filenames in the patch text format"],["AA",null],["NE4A4WUK5IKCMMVWC7MYD6AF2NFJDCJT5EWTP64MRGLDN3WKSIIQC","Parsing of file addition metadata"],["FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","Resurrecting tests, and type cleanup (no need for Arc> anymore)"],["XR7MNOMU5PMOOEY2EPPUABZ7NOP432RDCWUET23ONPXTT3JQIFIAC","file encoding in updates"],["3S6LU2U5TIU43WRE5RQS3IOLVJLVNCDL4W44FVK2HR3NAXZ7IDUAC","abstract out FileMetadata (de)serialistion"],["KWAGWB73AMLJFK2Z7SBKHHKKHFRX7AQKXCWDN2MBX72RYCNMB36QC","Adding extra dependencies from the config file"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["RRCSHAYZ6RLWVPNYHF2F5FSRL2KKJNPQUQRIJYLJGB23BZQQ7JLQC","Formatting"],["X243Z3Y54ULINQMMRIKLHRV5T237B7VUOAHVJ7DMPOQ6A6GQXY2AC","Recording only the required metadata (can even be changed later!)"],["XSEODPNEN2Y2THBRO7L5QFPAEQVSQTLAFZFWCRMBGZ3YSRZB2UJAC","Fixing conflicts"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["CIEUBH465IFZXO3YDG7XYHP54NJ4TGVQD47SKNW6P5XM4X7IVNBAC","Fixing an index-out-of-bounds error when serialising bad changes"],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["Q4SVMHAEZQQCBFGPJMWS5H4VXB2HFQREZ3AWGOHFWHLFARUQVPBAC","Removing --channel from the changes command"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["ZSF3YFZTDOXMCOC3HOT5C6MQLYLWOR7QJAOUDS2M2Z4SC2YW3GRAC","encoded file deletion"],["RUBSM5DRA4O7SGD7NO7QYFGDQ2CQL6K7SZTIQVGRWAQHGSFUBGCQC","Fixing a bug when outputting changes in text format"],["VYHHOEYHO67JNJEODX5L3CQFIV3DAXZBBIQUOMCWJDYF3VWICDNQC","Versions and formatting"],["CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","Renaming \"Record\" to \"Hunk\" in the changes"],["5BB266P6HPUGYEVR7QNNOA62EFPYPUYJ3UMLE5J3LLYMSUWXANIQC","Optional colours in the global config file"],["ZRUPLBBTT4S6S7A3LOAHG4ONYEGPA5CFO4L2XBCNFKK45MWX3BDAC","Colours in diff and change: separating concerns and dependencies"],["NYOF5766GLBTWQV2KTVRAJMGVJNJ37Z5BLJMFPZA3HG7X2Q2RXPAC","track file encoding in the record, including change text for file adds"]],"deps":["NE4A4WUK5IKCMMVWC7MYD6AF2NFJDCJT5EWTP64MRGLDN3WKSIIQC","FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","Q4SVMHAEZQQCBFGPJMWS5H4VXB2HFQREZ3AWGOHFWHLFARUQVPBAC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","CIEUBH465IFZXO3YDG7XYHP54NJ4TGVQD47SKNW6P5XM4X7IVNBAC","CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","KWAGWB73AMLJFK2Z7SBKHHKKHFRX7AQKXCWDN2MBX72RYCNMB36QC","ZRUPLBBTT4S6S7A3LOAHG4ONYEGPA5CFO4L2XBCNFKK45MWX3BDAC","VYHHOEYHO67JNJEODX5L3CQFIV3DAXZBBIQUOMCWJDYF3VWICDNQC","5BB266P6HPUGYEVR7QNNOA62EFPYPUYJ3UMLE5J3LLYMSUWXANIQC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","X243Z3Y54ULINQMMRIKLHRV5T237B7VUOAHVJ7DMPOQ6A6GQXY2AC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","NYOF5766GLBTWQV2KTVRAJMGVJNJ37Z5BLJMFPZA3HG7X2Q2RXPAC","XSEODPNEN2Y2THBRO7L5QFPAEQVSQTLAFZFWCRMBGZ3YSRZB2UJAC","XR7MNOMU5PMOOEY2EPPUABZ7NOP432RDCWUET23ONPXTT3JQIFIAC","3S6LU2U5TIU43WRE5RQS3IOLVJLVNCDL4W44FVK2HR3NAXZ7IDUAC","ZSF3YFZTDOXMCOC3HOT5C6MQLYLWOR7QJAOUDS2M2Z4SC2YW3GRAC","RUBSM5DRA4O7SGD7NO7QYFGDQ2CQL6K7SZTIQVGRWAQHGSFUBGCQC","RRCSHAYZ6RLWVPNYHF2F5FSRL2KKJNPQUQRIJYLJGB23BZQQ7JLQC"]},"hunks":[{"Edit":{"inode":{"change":4,"pos":101759},"path":"\"\"pijul/src/commands/record.rs\"\"","line":363,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":107873},"to":{"change":4,"start":107873,"end":107972},"introduced_by":4}],"inode":{"change":4,"pos":101759}}},"contents":[{"Del":" let file_name = |local: &Local, _| -> String { format!(\"{}:{}\", local.path, local.line) };\n"}]}},{"Replacement":{"inode":{"change":4,"pos":101759},"path":"\"\"pijul/src/commands/record.rs\"\"","line":371,"ins":{"up_context":[{"change":4,"pos":462}],"down_context":[{"change":4,"pos":463}],"flag":"BLOCK","start":0,"end":56,"inode":{"change":4,"pos":101759}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":462},"to":{"change":4,"start":108241,"end":108308},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":108241},"to":{"change":4,"start":108241,"end":108308},"introduced_by":4}],"inode":{"change":4,"pos":101759}},"ins_contents":[{"Add":" change.write(changes, None, true, &mut o)?;"}],"del_contents":[{"Del":" change.write(changes, None, file_name, true, &mut o)?;\n"}]}},{"Edit":{"inode":{"change":4,"pos":173551},"path":"\"\"pijul/src/commands/diff.rs\"\"","line":231,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":177116},"to":{"change":4,"start":177116,"end":177261},"introduced_by":4}],"inode":{"change":4,"pos":173551}}},"contents":[{"Del":" |local: &libpijul::change::Local, _| -> String {\n format!(\"{}:{}\", local.path, local.line)\n },\n"}]}},{"Edit":{"inode":{"change":4,"pos":189306},"path":"\"\"pijul/src/commands/change.rs\"\"","line":4,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":3123},"to":{"change":4,"start":189333,"end":189362},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":189333},"to":{"change":4,"start":189333,"end":189362},"introduced_by":4}],"inode":{"change":4,"pos":189306}}},"contents":[{"Del":"use libpijul::change::Local;\n"}]}},{"Edit":{"inode":{"change":4,"pos":189306},"path":"\"\"pijul/src/commands/change.rs\"\"","line":42,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":190342},"to":{"change":4,"start":346,"end":419},"introduced_by":4}],"inode":{"change":4,"pos":189306}}},"contents":[{"Del":" let file_name = |l: &Local, _| format!(\"{}:{}\", l.path, l.line);\n"}]}},{"Edit":{"inode":{"change":4,"pos":189306},"path":"\"\"pijul/src/commands/change.rs\"\"","line":46,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2218},"to":{"change":4,"start":2218,"end":2241},"introduced_by":4}],"inode":{"change":4,"pos":189306}}},"contents":[{"Del":" file_name,\n"}]}},{"Edit":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":91,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1465},"to":{"change":4,"start":1465,"end":1525},"introduced_by":4}],"inode":{"change":4,"pos":37976}}},"contents":[{"Del":" F: FnMut(&Local, Position>) -> String,\n"}]}},{"Edit":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":95,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":40762},"to":{"change":4,"start":40762,"end":40788},"introduced_by":4}],"inode":{"change":4,"pos":37976}}},"contents":[{"Del":" mut file_name: F,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":153,"ins":{"up_context":[{"change":4,"pos":42756}],"down_context":[{"change":4,"pos":42841}],"flag":"BLOCK","start":57,"end":126,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":42756},"to":{"change":4,"start":42756,"end":42841},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" rec.write(changes, &hashes, &self.contents, &mut w)?"}],"del_contents":[{"Del":" rec.write(changes, &mut file_name, &hashes, &self.contents, &mut w)?\n"}]}},{"Edit":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":309,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":3177}],"down_context":[{"change":4,"pos":48443}],"flag":"BLOCK","start":127,"end":1182,"inode":{"change":4,"pos":37976}}},"contents":[{"Add":""},{"Add":"struct Escaped<'a>(&'a str);"},{"Add":""},{"Add":"impl<'a> std::fmt::Display for Escaped<'a> {"},{"Add":" fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {"},{"Add":" write!(fmt, \"\\\"\")?;"},{"Add":" for c in self.0.chars() {"},{"Add":" if c == '\"' {"},{"Add":" write!(fmt, \"\\\\{}\", c)?"},{"Add":" } else if c == '\\\\' {"},{"Add":" write!(fmt, \"\\\\\\\\\")?"},{"Add":" } else {"},{"Add":" write!(fmt, \"{}\", c)?"},{"Add":" }"},{"Add":" }"},{"Add":" write!(fmt, \"\\\"\")?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn unescape(s: &str) -> std::borrow::Cow {"},{"Add":" let mut b = 0;"},{"Add":" let mut result = String::new();"},{"Add":" let mut ch = s.chars();"},{"Add":" while let Some(c) = ch.next() {"},{"Add":" if c == '\\\\' {"},{"Add":" if result.is_empty() {"},{"Add":" result = s.split_at(b).0.to_string();"},{"Add":" }"},{"Add":" if let Some(c) = ch.next() {"},{"Add":" result.push(c)"},{"Add":" }"},{"Add":" } else if !result.is_empty() {"},{"Add":" result.push(c)"},{"Add":" }"},{"Add":" b += c.len_utf8()"},{"Add":" }"},{"Add":" if result.is_empty() {"},{"Add":" s.into()"},{"Add":" } else {"},{"Add":" result.into()"},{"Add":" }"},{"Add":"}"}]}},{"Edit":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":357,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":48544},"to":{"change":4,"start":48544,"end":48604},"introduced_by":4}],"inode":{"change":4,"pos":37976}}},"contents":[{"Del":" F: FnMut(&Local, Position>) -> String,\n"}]}},{"Edit":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":360,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":48647},"to":{"change":4,"start":48647,"end":48673},"introduced_by":4}],"inode":{"change":4,"pos":37976}}},"contents":[{"Del":" mut file_name: F,\n"}]}},{"Edit":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":364,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":48808}],"down_context":[{"change":4,"pos":48808}],"flag":"BLOCK","start":1183,"end":1287,"inode":{"change":4,"pos":37976}}},"contents":[{"Add":""},{"Add":" // let file_name = |local: &Local, _| -> String { format!(\"{}:{}\", local.path, local.line) };"},{"Add":""}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":378,"ins":{"up_context":[{"change":4,"pos":1537}],"down_context":[{"change":4,"pos":1644}],"flag":"BLOCK","start":1288,"end":1411,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1537},"to":{"change":4,"start":1537,"end":1644},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" \"Moved: {} {} {}\","},{"Add":" Escaped(&path),"},{"Add":" Escaped(&name),"}],"del_contents":[{"Del":" \"Moved: {:?} {:?} {}\",\n path,\n name,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":420,"ins":{"up_context":[{"change":4,"pos":269}],"down_context":[{"change":4,"pos":50578}],"flag":"BLOCK","start":1412,"end":1477,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":269},"to":{"change":3,"start":105657,"end":105716},"introduced_by":3}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" write!(w, \"File deletion: {} \", Escaped(path))?;"}],"del_contents":[{"Del":" write!(w, \"File deletion: {:?} \", path,)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":440,"ins":{"up_context":[{"change":4,"pos":308}],"down_context":[{"change":4,"pos":51227}],"flag":"BLOCK","start":1478,"end":1546,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":308},"to":{"change":3,"start":105717,"end":105779},"introduced_by":3}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" write!(w, \"File un-deletion: {} \", Escaped(path))?;"}],"del_contents":[{"Del":" write!(w, \"File un-deletion: {:?} \", path,)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":476,"ins":{"up_context":[{"change":4,"pos":52618}],"down_context":[{"change":4,"pos":2070}],"flag":"BLOCK","start":1547,"end":1693,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":52618},"to":{"change":4,"start":97,"end":165},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":165},"to":{"change":4,"start":2008,"end":2070},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2008},"to":{"change":4,"start":2008,"end":2070},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" \"File addition: {} in {}{} \\\"{}\\\"\\n up\","},{"Add":" Escaped(name),"},{"Add":" Escaped(parent),"}],"del_contents":[{"Del":" \"File addition: {:?} in {:?}{} {:?}\\n up\",\n"},{"Del":" name,\n parent,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":509,"ins":{"up_context":[{"change":4,"pos":341}],"down_context":[{"change":4,"pos":53536}],"flag":"BLOCK","start":1694,"end":1778,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":341},"to":{"change":4,"start":53458,"end":53536},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":53458},"to":{"change":4,"start":53458,"end":53536},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" write!(w, \"Edit in \\\"{}\\\":{} \", Escaped(&local.path), local.line)?;"}],"del_contents":[{"Del":" write!(w, \"Edit in {} \", file_name(&local, change.inode()))?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":523,"ins":{"up_context":[{"change":4,"pos":381}],"down_context":[{"change":4,"pos":53990}],"flag":"BLOCK","start":1779,"end":1870,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":381},"to":{"change":4,"start":53905,"end":53990},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":53905},"to":{"change":4,"start":53905,"end":53990},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" write!(w, \"Replacement in \\\"{}\\\":{} \", Escaped(&local.path), local.line)?;"}],"del_contents":[{"Del":" write!(w, \"Replacement in {} \", file_name(&local, change.inode()))?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":533,"ins":{"up_context":[{"change":4,"pos":9011}],"down_context":[{"change":4,"pos":54504}],"flag":"BLOCK","start":1871,"end":1948,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":9011},"to":{"change":4,"start":54434,"end":54504},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":54434},"to":{"change":4,"start":54434,"end":54504},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" write!(w, \"Solving a name conflict in {} \", Escaped(path))?;"}],"del_contents":[{"Del":" write!(w, \"Solving a name conflict in {:?} \", path)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":541,"ins":{"up_context":[{"change":4,"pos":9070}],"down_context":[{"change":4,"pos":54886}],"flag":"BLOCK","start":1949,"end":2029,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":9070},"to":{"change":4,"start":54813,"end":54886},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":54813},"to":{"change":4,"start":54813,"end":54886},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" write!(w, \"Un-solving a name conflict in {} \", Escaped(path))?;"}],"del_contents":[{"Del":" write!(w, \"Un-solving a name conflict in {:?} \", path)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":552,"ins":{"up_context":[{"change":4,"pos":55244}],"down_context":[{"change":4,"pos":55354}],"flag":"BLOCK","start":2030,"end":2167,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":55244},"to":{"change":4,"start":55244,"end":55354},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" \"Solving an order conflict in \\\"{}\\\":{} \","},{"Add":" Escaped(&local.path),"},{"Add":" local.line,"}],"del_contents":[{"Del":" \"Solving an order conflict in {} \",\n file_name(&local, change.inode())\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":565,"ins":{"up_context":[{"change":4,"pos":55725}],"down_context":[{"change":4,"pos":55838}],"flag":"BLOCK","start":2168,"end":2308,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":55725},"to":{"change":4,"start":55725,"end":55838},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" \"Un-solving an order conflict in \\\"{}\\\":{} \","},{"Add":" Escaped(&local.path),"},{"Add":" local.line,"}],"del_contents":[{"Del":" \"Un-solving an order conflict in {} \",\n file_name(&local, change.inode())\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":582,"ins":{"up_context":[{"change":4,"pos":56205}],"down_context":[{"change":4,"pos":56309}],"flag":"BLOCK","start":2309,"end":2421,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":56205},"to":{"change":4,"start":56205,"end":56309},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" \"Resurrecting zombie lines in {}:{} \","},{"Add":" Escaped(&local.path), local.line"}],"del_contents":[{"Del":" \"Resurrecting zombie lines in {:?}:{} \",\n local.path, local.line\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":586,"ins":{"up_context":[{"change":4,"pos":56389}],"down_context":[{"change":4,"pos":56389}],"flag":"BLOCK","start":2422,"end":2487,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":56389},"to":{"change":4,"start":3532,"end":3595},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" write!(w, \" \\\"{}\\\"\", encoding_label(encoding))?;"}],"del_contents":[{"Del":" write!(w, \" {:?}\", encoding_label(encoding))?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":651,"ins":{"up_context":[{"change":4,"pos":59079}],"down_context":[{"change":4,"pos":59139}],"flag":"BLOCK","start":2488,"end":2558,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":59079},"to":{"change":4,"start":59079,"end":59139},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" let name = unescape(&cap.name(\"name\").unwrap().as_str());"}],"del_contents":[{"Del":" let name = &cap.name(\"name\").unwrap().as_str();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":657,"ins":{"up_context":[{"change":4,"pos":59326}],"down_context":[{"change":4,"pos":59391}],"flag":"BLOCK","start":2559,"end":2642,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":59326},"to":{"change":2,"start":0,"end":45},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":45},"to":{"change":4,"start":59365,"end":59391},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":59365},"to":{"change":4,"start":59365,"end":59391},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" unescape(&parent).to_string() + \"/\""},{"Add":" }) + &name"}],"del_contents":[{"Del":" parent.to_string() + \"/\"\n"},{"Del":" }) + name\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":676,"ins":{"up_context":[{"change":4,"pos":3129}],"down_context":[{"change":4,"pos":5888}],"flag":"BLOCK","start":2643,"end":2676,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3129},"to":{"change":4,"start":3129,"end":3161},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" basename: &name,"}],"del_contents":[{"Del":" basename: name,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":806,"ins":{"up_context":[{"change":4,"pos":64287}],"down_context":[{"change":4,"pos":2937}],"flag":"BLOCK","start":2677,"end":2745,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":64287},"to":{"change":4,"start":64287,"end":64345},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" let name = unescape(cap.name(\"new\").unwrap().as_str());"}],"del_contents":[{"Del":" let name = cap.name(\"new\").unwrap().as_str();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"\"\"libpijul/src/change/text_changes.rs\"\"","line":821,"ins":{"up_context":[{"change":4,"pos":3302}],"down_context":[{"change":4,"pos":6078}],"flag":"BLOCK","start":2746,"end":2779,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3302},"to":{"change":4,"start":3302,"end":3334},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" basename: &name,"}],"del_contents":[{"Del":" basename: name,\n"}]}}],"owner":"irevoire","repo":"pijul","token":"a3Acua98e3XSiLnX0WCY0wxaXUR2fHEDlfdM6wxxbYU=","login":null}

…

Dependencies

Change contents