{"header":{"message":"Slightly more generic libpijul::change::Hunk","description":null,"timestamp":"2021-09-15T15:31:40.646947335Z","authors":[{}]},"hash":"CBVGAARCMKJ2EARAQCVSPKMB43NATIYEY76BOQJLN7MXDUQVSJBAC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["CBVGAARCMKJ2EARAQCVSPKMB43NATIYEY76BOQJLN7MXDUQVSJBAC","Slightly more generic libpijul::change::Hunk"],["AA",null],["RRCSHAYZ6RLWVPNYHF2F5FSRL2KKJNPQUQRIJYLJGB23BZQQ7JLQC","Formatting"],["NYOF5766GLBTWQV2KTVRAJMGVJNJ37Z5BLJMFPZA3HG7X2Q2RXPAC","track file encoding in the record, including change text for file adds"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["UNZXTNSJI4YRY3EQ3M4HMBKQDNYDTY6B7IZRBNYGDJXTA2UKYWRAC","Change text format: order dependencies in the order they were on the channel at record time"],["Q3GU26WDEYE2HXMM4WWNEGVMSXLQAKRJBSB2EJZA6JTHPKQHXCXQC","merge with changes from sanakirja v1.1.2"],["XR7MNOMU5PMOOEY2EPPUABZ7NOP432RDCWUET23ONPXTT3JQIFIAC","file encoding in updates"],["CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","Renaming \"Record\" to \"Hunk\" in the changes"],["352WW5FPLUBGEHM7W5WF7N7AMO56LPLL4WSR44VIPCSZVQRDLN4AC","Fixing a bug when deleting conflict resolutions"],["ZSF3YFZTDOXMCOC3HOT5C6MQLYLWOR7QJAOUDS2M2Z4SC2YW3GRAC","encoded file deletion"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"]],"deps":["RRCSHAYZ6RLWVPNYHF2F5FSRL2KKJNPQUQRIJYLJGB23BZQQ7JLQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","UNZXTNSJI4YRY3EQ3M4HMBKQDNYDTY6B7IZRBNYGDJXTA2UKYWRAC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","352WW5FPLUBGEHM7W5WF7N7AMO56LPLL4WSR44VIPCSZVQRDLN4AC","NYOF5766GLBTWQV2KTVRAJMGVJNJ37Z5BLJMFPZA3HG7X2Q2RXPAC","Q3GU26WDEYE2HXMM4WWNEGVMSXLQAKRJBSB2EJZA6JTHPKQHXCXQC","XR7MNOMU5PMOOEY2EPPUABZ7NOP432RDCWUET23ONPXTT3JQIFIAC","ZSF3YFZTDOXMCOC3HOT5C6MQLYLWOR7QJAOUDS2M2Z4SC2YW3GRAC"]},"hunks":[{"Edit":{"inode":{"change":3,"pos":779907},"path":"\"libpijul/src/diff/replace.rs\"","line":113,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":782992}],"down_context":[{"change":3,"pos":782992}],"flag":"BLOCK","start":0,"end":58,"inode":{"change":3,"pos":779907}}},"contents":[{"Add":" byte: Some(bytes_pos(lines_b, from_new)),"}]}},{"Replacement":{"inode":{"change":3,"pos":805350},"path":"\"libpijul/src/diff/delete.rs\"","line":25,"ins":{"up_context":[{"change":3,"pos":46}],"down_context":[{"change":3,"pos":806121}],"flag":"BLOCK","start":59,"end":141,"inode":{"change":3,"pos":805350}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":46},"to":{"change":2,"start":3791,"end":3864},"introduced_by":2}],"inode":{"change":3,"pos":805350}},"ins_contents":[{"Add":" self.delete_lines(txn, channel, diff, d, lines_a, lines_b, r, encoding)?;"}],"del_contents":[{"Del":" self.delete_lines(txn, channel, diff, d, lines_a, r, encoding)?;\n"}]}},{"Edit":{"inode":{"change":3,"pos":805350},"path":"\"libpijul/src/diff/delete.rs\"","line":56,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":806886}],"down_context":[{"change":3,"pos":806886}],"flag":"BLOCK","start":142,"end":168,"inode":{"change":3,"pos":805350}}},"contents":[{"Add":" lines_b: &[Line],"}]}},{"Edit":{"inode":{"change":3,"pos":805350},"path":"\"libpijul/src/diff/delete.rs\"","line":70,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":807373}],"down_context":[{"change":3,"pos":807373}],"flag":"BLOCK","start":169,"end":231,"inode":{"change":3,"pos":805350}}},"contents":[{"Add":" byte: Some(bytes_pos(lines_b, d[r].new)),"}]}},{"Edit":{"inode":{"change":3,"pos":805350},"path":"\"libpijul/src/diff/delete.rs\"","line":84,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":808267}],"down_context":[{"change":3,"pos":808267}],"flag":"BLOCK","start":232,"end":294,"inode":{"change":3,"pos":805350}}},"contents":[{"Add":" byte: Some(bytes_pos(lines_b, d[r].new)),"}]}},{"Edit":{"inode":{"change":3,"pos":805350},"path":"\"libpijul/src/diff/delete.rs\"","line":279,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":814383}],"down_context":[{"change":3,"pos":814383}],"flag":"BLOCK","start":295,"end":348,"inode":{"change":3,"pos":805350}}},"contents":[{"Add":" byte: Some(bytes_pos(lines_b, new)),"}]}},{"Edit":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":468,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":844784}],"down_context":[{"change":3,"pos":844784}],"flag":"BLOCK","start":349,"end":548,"inode":{"change":3,"pos":831311}}},"contents":[{"Add":"impl Atom {"},{"Add":" pub fn as_newvertex(&self) -> &NewVertex {"},{"Add":" if let Atom::NewVertex(n) = self {"},{"Add":" n"},{"Add":" } else {"},{"Add":" panic!(\"Not a NewVertex\")"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""}]}},{"Edit":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":680,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":851125}],"down_context":[{"change":3,"pos":851125}],"flag":"BLOCK","start":549,"end":578,"inode":{"change":3,"pos":831311}}},"contents":[{"Add":" pub byte: Option,"}]}},{"Edit":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":682,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":851127}],"down_context":[{"change":3,"pos":851127}],"flag":"BLOCK","start":579,"end":638,"inode":{"change":3,"pos":831311}}},"contents":[{"Add":""},{"Add":"pub type Hunk = BaseHunk, Local>;"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":686,"ins":{"up_context":[{"change":3,"pos":851191}],"down_context":[{"change":3,"pos":851222}],"flag":"BLOCK","start":639,"end":672,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":851191},"to":{"change":3,"start":3719,"end":3748},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":"pub enum BaseHunk {"}],"del_contents":[{"Del":"pub enum Hunk {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":688,"ins":{"up_context":[{"change":3,"pos":851237}],"down_context":[{"change":3,"pos":851287}],"flag":"BLOCK","start":673,"end":711,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":851237},"to":{"change":3,"start":851237,"end":851287},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" del: Atom,"},{"Add":" add: Atom,"}],"del_contents":[{"Del":" del: Atom,\n add: Atom,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":693,"ins":{"up_context":[{"change":3,"pos":851330}],"down_context":[{"change":3,"pos":851393}],"flag":"BLOCK","start":712,"end":763,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":851330},"to":{"change":3,"start":851330,"end":851393},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" del: Atom,"},{"Add":" contents: Option,"}],"del_contents":[{"Del":" del: Atom,\n contents: Option>,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":699,"ins":{"up_context":[{"change":3,"pos":851438}],"down_context":[{"change":3,"pos":851503}],"flag":"BLOCK","start":764,"end":817,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":851438},"to":{"change":3,"start":851438,"end":851503},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" undel: Atom,"},{"Add":" contents: Option,"}],"del_contents":[{"Del":" undel: Atom,\n contents: Option>,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":705,"ins":{"up_context":[{"change":3,"pos":851546}],"down_context":[{"change":3,"pos":851645}],"flag":"BLOCK","start":818,"end":899,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":851546},"to":{"change":3,"start":851546,"end":851645},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" add_name: Atom,"},{"Add":" add_inode: Atom,"},{"Add":" contents: Option,"}],"del_contents":[{"Del":" add_name: Atom,\n add_inode: Atom,\n contents: Option>,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":712,"ins":{"up_context":[{"change":3,"pos":851698}],"down_context":[{"change":3,"pos":851724}],"flag":"BLOCK","start":900,"end":920,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":851698},"to":{"change":3,"start":851698,"end":851724},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" name: Atom,"}],"del_contents":[{"Del":" name: Atom,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":716,"ins":{"up_context":[{"change":3,"pos":851779}],"down_context":[{"change":3,"pos":851805}],"flag":"BLOCK","start":921,"end":941,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":851779},"to":{"change":3,"start":851779,"end":851805},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" name: Atom,"}],"del_contents":[{"Del":" name: Atom,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":720,"ins":{"up_context":[{"change":3,"pos":851845}],"down_context":[{"change":3,"pos":851873}],"flag":"BLOCK","start":942,"end":964,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":851845},"to":{"change":3,"start":851845,"end":851873},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" change: Atom,"}],"del_contents":[{"Del":" change: Atom,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":725,"ins":{"up_context":[{"change":3,"pos":851920}],"down_context":[{"change":3,"pos":851981}],"flag":"BLOCK","start":965,"end":1014,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":851920},"to":{"change":3,"start":851920,"end":851981},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" change: Atom,"},{"Add":" replacement: Atom,"}],"del_contents":[{"Del":" change: Atom,\n replacement: Atom,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":731,"ins":{"up_context":[{"change":3,"pos":852035}],"down_context":[{"change":3,"pos":852063}],"flag":"BLOCK","start":1015,"end":1037,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":852035},"to":{"change":3,"start":852035,"end":852063},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" change: Atom,"}],"del_contents":[{"Del":" change: Atom,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":735,"ins":{"up_context":[{"change":3,"pos":852119}],"down_context":[{"change":3,"pos":852147}],"flag":"BLOCK","start":1038,"end":1060,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":852119},"to":{"change":3,"start":852119,"end":852147},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" change: Atom,"}],"del_contents":[{"Del":" change: Atom,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":739,"ins":{"up_context":[{"change":3,"pos":852199}],"down_context":[{"change":3,"pos":852227}],"flag":"BLOCK","start":1061,"end":1083,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":852199},"to":{"change":3,"start":852199,"end":852227},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" change: Atom,"}],"del_contents":[{"Del":" change: Atom,\n"}]}},{"Edit":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1065,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":6366}],"down_context":[{"change":3,"pos":862693}],"flag":"BLOCK","start":1084,"end":1467,"inode":{"change":3,"pos":831311}}},"contents":[{"Add":" pub fn local(&self) -> Option<&Local> {"},{"Add":" match self {"},{"Add":" Hunk::Edit { ref local, .. }"},{"Add":" | Hunk::Replacement { ref local, .. }"},{"Add":" | Hunk::SolveOrderConflict { ref local, .. }"},{"Add":" | Hunk::UnsolveOrderConflict { ref local, .. }"},{"Add":" | Hunk::ResurrectZombies { ref local, .. } => Some(local),"},{"Add":" _ => None,"},{"Add":" }"},{"Add":" }"},{"Add":""}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1093,"ins":{"up_context":[{"change":3,"pos":863408}],"down_context":[{"change":3,"pos":863986}],"flag":"BLOCK","start":1468,"end":1505,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":863408},"to":{"change":3,"start":863408,"end":863429},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":863429},"to":{"change":3,"start":6948,"end":7473},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":7473},"to":{"change":3,"start":863976,"end":863986},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":863976},"to":{"change":3,"start":863976,"end":863986},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" self.local().map(|x| x.line)"}],"del_contents":[{"Del":" match self {\n"},{"Del":" Hunk::FileMove { .. }\n | Hunk::FileDel { .. }\n | Hunk::FileUndel { .. }\n | Hunk::SolveNameConflict { .. }\n | Hunk::UnsolveNameConflict { .. }\n | Hunk::FileAdd { .. } => None,\n Hunk::Edit { ref local, .. }\n | Hunk::Replacement { ref local, .. }\n | Hunk::SolveOrderConflict { ref local, .. }\n | Hunk::UnsolveOrderConflict { ref local, .. }\n | Hunk::ResurrectZombies { ref local, .. } => Some(local.line),\n"},{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1097,"ins":{"up_context":[{"change":3,"pos":863995}],"down_context":[{"change":3,"pos":121448}],"flag":"BLOCK","start":1506,"end":1598,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":863995},"to":{"change":3,"start":7474,"end":7518},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":7518},"to":{"change":3,"start":121412,"end":121448},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":864041},"to":{"change":3,"start":121412,"end":121448},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":"impl BaseHunk {"},{"Add":" pub fn atom_map Result>("}],"del_contents":[{"Del":"impl Hunk, Local> {\n"},{"Del":" pub fn globalize(\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1100,"ins":{"up_context":[{"change":3,"pos":121462}],"down_context":[{"change":3,"pos":121541}],"flag":"BLOCK","start":1599,"end":1658,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":121462},"to":{"change":3,"start":121462,"end":121479},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":121479},"to":{"change":3,"start":7519,"end":7579},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" mut f: F,"},{"Add":" ) -> Result, E> {"}],"del_contents":[{"Del":" txn: &T,\n"},{"Del":" ) -> Result, Local>, T::GraphError> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1103,"ins":{"up_context":[{"change":3,"pos":121565}],"down_context":[{"change":3,"pos":864292}],"flag":"BLOCK","start":1659,"end":1793,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":121565},"to":{"change":3,"start":7580,"end":7646},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":7646},"to":{"change":3,"start":121566,"end":121650},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":864210},"to":{"change":3,"start":121566,"end":121650},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" BaseHunk::FileMove { del, add, path } => BaseHunk::FileMove {"},{"Add":" del: f(del)?,"},{"Add":" add: f(add)?,"}],"del_contents":[{"Del":" Hunk::FileMove { del, add, path } => Hunk::FileMove {\n"},{"Del":" del: del.globalize(txn)?,\n add: add.globalize(txn)?,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1108,"ins":{"up_context":[{"change":3,"pos":864329}],"down_context":[{"change":3,"pos":864359}],"flag":"BLOCK","start":1794,"end":1826,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":864329},"to":{"change":3,"start":7647,"end":7675},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" BaseHunk::FileDel {"}],"del_contents":[{"Del":" Hunk::FileDel {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1113,"ins":{"up_context":[{"change":3,"pos":4688}],"down_context":[{"change":3,"pos":864579}],"flag":"BLOCK","start":1827,"end":2049,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":4688},"to":{"change":3,"start":7676,"end":7709},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":864428},"to":{"change":3,"start":7676,"end":7709},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":7709},"to":{"change":3,"start":121651,"end":121777},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":864463},"to":{"change":3,"start":121651,"end":121777},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" } => BaseHunk::FileDel {"},{"Add":" del: f(del)?,"},{"Add":" contents: if let Some(c) = contents {"},{"Add":" Some(f(c)?)"},{"Add":" } else {"},{"Add":" None"},{"Add":" },"}],"del_contents":[{"Del":" } => Hunk::FileDel {\n"},{"Del":" del: del.globalize(txn)?,\n contents: contents.as_ref().map(|del| del.globalize(txn).unwrap()),\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1123,"ins":{"up_context":[{"change":3,"pos":864616}],"down_context":[{"change":3,"pos":864648}],"flag":"BLOCK","start":2050,"end":2084,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":864616},"to":{"change":3,"start":7710,"end":7740},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" BaseHunk::FileUndel {"}],"del_contents":[{"Del":" Hunk::FileUndel {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1128,"ins":{"up_context":[{"change":3,"pos":4742}],"down_context":[{"change":3,"pos":864876}],"flag":"BLOCK","start":2085,"end":2313,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":4742},"to":{"change":3,"start":7741,"end":7776},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":864719},"to":{"change":3,"start":7741,"end":7776},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":7776},"to":{"change":3,"start":121778,"end":121908},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":864756},"to":{"change":3,"start":121778,"end":121908},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" } => BaseHunk::FileUndel {"},{"Add":" undel: f(undel)?,"},{"Add":" contents: if let Some(c) = contents {"},{"Add":" Some(f(c)?)"},{"Add":" } else {"},{"Add":" None"},{"Add":" },"}],"del_contents":[{"Del":" } => Hunk::FileUndel {\n"},{"Del":" undel: undel.globalize(txn)?,\n contents: contents.as_ref().map(|del| del.globalize(txn).unwrap()),\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1138,"ins":{"up_context":[{"change":3,"pos":864913}],"down_context":[{"change":3,"pos":865040}],"flag":"BLOCK","start":2314,"end":2434,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":864913},"to":{"change":3,"start":7777,"end":7857},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":7857},"to":{"change":3,"start":121909,"end":121953},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":864997},"to":{"change":3,"start":121909,"end":121953},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" BaseHunk::SolveNameConflict { name, path } => BaseHunk::SolveNameConflict {"},{"Add":" name: f(name)?,"}],"del_contents":[{"Del":" Hunk::SolveNameConflict { name, path } => Hunk::SolveNameConflict {\n"},{"Del":" name: name.globalize(txn)?,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1142,"ins":{"up_context":[{"change":3,"pos":865077}],"down_context":[{"change":3,"pos":865208}],"flag":"BLOCK","start":2435,"end":2559,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":865077},"to":{"change":3,"start":7858,"end":7942},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":7942},"to":{"change":3,"start":121954,"end":121998},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":865165},"to":{"change":3,"start":121954,"end":121998},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" BaseHunk::UnsolveNameConflict { name, path } => BaseHunk::UnsolveNameConflict {"},{"Add":" name: f(name)?,"}],"del_contents":[{"Del":" Hunk::UnsolveNameConflict { name, path } => Hunk::UnsolveNameConflict {\n"},{"Del":" name: name.globalize(txn)?,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1146,"ins":{"up_context":[{"change":3,"pos":865245}],"down_context":[{"change":3,"pos":865275}],"flag":"BLOCK","start":2560,"end":2592,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":865245},"to":{"change":3,"start":7943,"end":7971},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" BaseHunk::FileAdd {"}],"del_contents":[{"Del":" Hunk::FileAdd {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1152,"ins":{"up_context":[{"change":3,"pos":1176}],"down_context":[{"change":3,"pos":865590}],"flag":"BLOCK","start":2593,"end":2867,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":1176},"to":{"change":3,"start":7972,"end":8005},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":865376},"to":{"change":3,"start":7972,"end":8005},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":8005},"to":{"change":3,"start":121999,"end":122189},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":865411},"to":{"change":3,"start":121999,"end":122189},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" } => BaseHunk::FileAdd {"},{"Add":" add_name: f(add_name)?,"},{"Add":" add_inode: f(add_inode)?,"},{"Add":" contents: if let Some(c) = contents {"},{"Add":" Some(f(c)?)"},{"Add":" } else {"},{"Add":" None"},{"Add":" },"}],"del_contents":[{"Del":" } => Hunk::FileAdd {\n"},{"Del":" add_name: add_name.globalize(txn)?,\n add_inode: add_inode.globalize(txn)?,\n contents: contents.as_ref().map(|add| add.globalize(txn).unwrap()),\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1163,"ins":{"up_context":[{"change":3,"pos":865627}],"down_context":[{"change":3,"pos":2071}],"flag":"BLOCK","start":2868,"end":2897,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":865627},"to":{"change":3,"start":2046,"end":2071},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" BaseHunk::Edit {"}],"del_contents":[{"Del":" Hunk::Edit {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1167,"ins":{"up_context":[{"change":3,"pos":2144}],"down_context":[{"change":3,"pos":865735}],"flag":"BLOCK","start":2898,"end":2968,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2144},"to":{"change":3,"start":2144,"end":2174},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2174},"to":{"change":3,"start":122190,"end":122238},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":8063},"to":{"change":3,"start":122190,"end":122238},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":865688},"to":{"change":3,"start":122190,"end":122238},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" } => BaseHunk::Edit {"},{"Add":" change: f(change)?,"}],"del_contents":[{"Del":" } => Hunk::Edit {\n"},{"Del":" change: change.globalize(txn)?,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1172,"ins":{"up_context":[{"change":3,"pos":865773}],"down_context":[{"change":3,"pos":865807}],"flag":"BLOCK","start":2969,"end":3005,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":865773},"to":{"change":3,"start":8064,"end":8096},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" BaseHunk::Replacement {"}],"del_contents":[{"Del":" Hunk::Replacement {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1177,"ins":{"up_context":[{"change":3,"pos":2228}],"down_context":[{"change":3,"pos":866026}],"flag":"BLOCK","start":3006,"end":3129,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":2228},"to":{"change":3,"start":8097,"end":8134},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":865883},"to":{"change":3,"start":8097,"end":8134},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":8134},"to":{"change":3,"start":122239,"end":122345},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":865922},"to":{"change":3,"start":122239,"end":122345},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" } => BaseHunk::Replacement {"},{"Add":" change: f(change)?,"},{"Add":" replacement: f(replacement)?,"}],"del_contents":[{"Del":" } => Hunk::Replacement {\n"},{"Del":" change: change.globalize(txn)?,\n replacement: replacement.globalize(txn)?,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1183,"ins":{"up_context":[{"change":3,"pos":866064}],"down_context":[{"change":3,"pos":866200}],"flag":"BLOCK","start":3130,"end":3259,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":866064},"to":{"change":3,"start":8135,"end":8220},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":8220},"to":{"change":3,"start":122346,"end":122394},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":866153},"to":{"change":3,"start":122346,"end":122394},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" BaseHunk::SolveOrderConflict { change, local } => BaseHunk::SolveOrderConflict {"},{"Add":" change: f(change)?,"}],"del_contents":[{"Del":" Hunk::SolveOrderConflict { change, local } => Hunk::SolveOrderConflict {\n"},{"Del":" change: change.globalize(txn)?,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1187,"ins":{"up_context":[{"change":3,"pos":866238}],"down_context":[{"change":3,"pos":866378}],"flag":"BLOCK","start":3260,"end":3393,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":866238},"to":{"change":3,"start":8221,"end":8310},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":8310},"to":{"change":3,"start":122395,"end":122443},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":866331},"to":{"change":3,"start":122395,"end":122443},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" BaseHunk::UnsolveOrderConflict { change, local } => BaseHunk::UnsolveOrderConflict {"},{"Add":" change: f(change)?,"}],"del_contents":[{"Del":" Hunk::UnsolveOrderConflict { change, local } => Hunk::UnsolveOrderConflict {\n"},{"Del":" change: change.globalize(txn)?,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1191,"ins":{"up_context":[{"change":3,"pos":866416}],"down_context":[{"change":3,"pos":2293}],"flag":"BLOCK","start":3394,"end":3435,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":866416},"to":{"change":3,"start":2256,"end":2293},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" BaseHunk::ResurrectZombies {"}],"del_contents":[{"Del":" Hunk::ResurrectZombies {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1195,"ins":{"up_context":[{"change":3,"pos":2366}],"down_context":[{"change":3,"pos":866548}],"flag":"BLOCK","start":3436,"end":3518,"inode":{"change":3,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":2366},"to":{"change":3,"start":2366,"end":2408},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2408},"to":{"change":3,"start":122444,"end":122492},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":8392},"to":{"change":3,"start":122444,"end":122492},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":866501},"to":{"change":3,"start":122444,"end":122492},"introduced_by":3}],"inode":{"change":3,"pos":831311}},"ins_contents":[{"Add":" } => BaseHunk::ResurrectZombies {"},{"Add":" change: f(change)?,"}],"del_contents":[{"Del":" } => Hunk::ResurrectZombies {\n"},{"Del":" change: change.globalize(txn)?,\n"}]}},{"Edit":{"inode":{"change":3,"pos":831311},"path":"\"libpijul/src/change.rs\"","line":1201,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":122504}],"down_context":[{"change":3,"pos":866596}],"flag":"BLOCK","start":3519,"end":3743,"inode":{"change":3,"pos":831311}}},"contents":[{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Hunk, Local> {"},{"Add":" pub fn globalize("},{"Add":" self,"},{"Add":" txn: &T,"},{"Add":" ) -> Result, Local>, T::GraphError> {"},{"Add":" self.atom_map(|x| x.globalize(txn))"}]}},{"Edit":{"inode":{"change":13,"pos":37976},"path":"\"libpijul/src/change/text_changes.rs\"","line":719,"atom":{"NewVertex":{"up_context":[{"change":13,"pos":61420}],"down_context":[{"change":13,"pos":61420}],"flag":"BLOCK","start":3744,"end":3780,"inode":{"change":13,"pos":37976}}},"contents":[{"Add":" byte: None,"}]}},{"Edit":{"inode":{"change":13,"pos":37976},"path":"\"libpijul/src/change/text_changes.rs\"","line":739,"atom":{"NewVertex":{"up_context":[{"change":13,"pos":62075}],"down_context":[{"change":13,"pos":62075}],"flag":"BLOCK","start":3781,"end":3817,"inode":{"change":13,"pos":37976}}},"contents":[{"Add":" byte: None,"}]}},{"Edit":{"inode":{"change":13,"pos":37976},"path":"\"libpijul/src/change/text_changes.rs\"","line":864,"atom":{"NewVertex":{"up_context":[{"change":13,"pos":66364}],"down_context":[{"change":13,"pos":66364}],"flag":"BLOCK","start":3818,"end":3858,"inode":{"change":13,"pos":37976}}},"contents":[{"Add":" byte: None,"}]}},{"Edit":{"inode":{"change":13,"pos":37976},"path":"\"libpijul/src/change/text_changes.rs\"","line":875,"atom":{"NewVertex":{"up_context":[{"change":13,"pos":66801}],"down_context":[{"change":13,"pos":66801}],"flag":"BLOCK","start":3859,"end":3899,"inode":{"change":13,"pos":37976}}},"contents":[{"Add":" byte: None,"}]}},{"Edit":{"inode":{"change":13,"pos":37976},"path":"\"libpijul/src/change/text_changes.rs\"","line":893,"atom":{"NewVertex":{"up_context":[{"change":13,"pos":67507}],"down_context":[{"change":13,"pos":67507}],"flag":"BLOCK","start":3900,"end":3936,"inode":{"change":13,"pos":37976}}},"contents":[{"Add":" byte: None,"}]}}],"owner":"irevoire","repo":"pijul","token":"G8aINOHwh7iY1guBlMfFIdX+xQuNvE68XC72ZxqgTlI=","login":null}

…

Dependencies

Change contents