{"header":{"message":"Renaming \"Record\" to \"Hunk\" in the changes","description":null,"timestamp":"2021-01-08T18:56:37.789947558Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","authors":[],"deps":{"hashes":[["CCFJ7VO3I73FE3MZRS5RSDRYNZVW7AXC345P4BXS7JIL2TU3LQJQC","Renaming \"Record\" to \"Hunk\" in the changes"],["AA",null],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["CIEUBH465IFZXO3YDG7XYHP54NJ4TGVQD47SKNW6P5XM4X7IVNBAC","Fixing an index-out-of-bounds error when serialising bad changes"],["YDKNUL6B4EFM5U2GG36SSEKXHS6XK4OLIWUVE4BUAJ5VYJFHAOIQC","Add `diff --short` that lists changes without showing them"],["IYJZVLETBAQDDELENH3FX7ZTOC3HY4UJ3AMC3MACW6O7ZCWZTR6AC","Cleaning up the literate programming bits"],["6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","Refactoring apply"],["KVBLRDOUFRYB6BPOQJDD7OVBYMTTPDAUX7CJ5DC3U7WFRI5OLWRAC","Concatenating edits with order conflict resolutions (if relevant), and parsing the text format of the result"],["7A2TSC4PAKK3WOH3DMAJASCEC6D5JLJWNFWJTEEBE4CVS4K76PPQC","Conflict solving code (FOLDER edges)"],["7FFFKQZU3TFXWL45TILYNX5A7AC7HBK526SD5DZGYCELN76YE7TAC","add 'Default' implementations"],["BZSC7VMYSFRXDHDDAMCDR6X67FN5VWIBOSE76BQLX7OCVOJFUA3AC","address clippy lints"],["UNZXTNSJI4YRY3EQ3M4HMBKQDNYDTY6B7IZRBNYGDJXTA2UKYWRAC","Change text format: order dependencies in the order they were on the channel at record time"],["QNJBR73KCSCCF6FTHGZDF2K7PZQL3EFKZFOBT77KYZBMALTTW6OQC","don't return Result for infallible functions"],["NZIK34IMY3L5YMFISBLHUL5ATENBL35VOZJW4EHPINZEL6IQE4UQC","Fixing a bug in diff, where some changes were ignored for no reason"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["CFNFIUJVWV2PHHZKAPBY6GLW4TCX2N66DYH2QCFU5X7D7KE5D4AQC","Parsing the correct flags for new vertices"],["MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","Partial push and pull (WARNING: breaks the existing protocol)"],["O4DNWMPDUWI6SKYOZTQKCSX6MSR73CTGCUSM65TSQYVOUSAAS6KAC","Cleaunp and proofreading of libpijul::record"],["JRSBH6HTYXSIZKHW6SGWAF3JCEPMFTUG4JZUSUSF73ODEGFLAAJAC","Identification of line numbers in replacements"],["73NW2X2MI767RYNTKS67ZB5QUWYEAA4SCORLD52K36ZU3JAK67AQC","Returning a parse error instead of panicking when parsing a text change"],["KJDQ2WOMIUTVDEEQ7NMJYBZAVUZ3NIVOVJ6MUCZPRAWIEWOV6TWQC","Fixing the parsing of section headers in the text change format"],["PSKXR4QEPPVJZR777HW67IEHUPGZB44MFCNQ2KUS422Q3W22IQWAC","Do not load the entire change in memory in log"],["NE4A4WUK5IKCMMVWC7MYD6AF2NFJDCJT5EWTP64MRGLDN3WKSIIQC","Parsing of file addition metadata"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["65S67T3EKKLFRBCU73Z542V7A4JSMGP37OJINON6N563UIBQAITAC","Parsing \\\\ for empty additions (rare problem)"],["ZXTHL45OYLOICXTXXEQ6AMNSLMQFZ6BFUJWMO6LZOSDK7ERROC5AC","address clippy lints"],["NA5I4WYNE2O3LPSHXGWXW7XL4YNYFDREEGDOP6LJ5HJXTQDXM7BAC","Fixing the inverse of conflict resolutions"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["UBCBQ5FGH2KASHEUPDLIKGLVVX3GSRQ4F4P2JEJZL2NX2DUSYARAC","Removing pijul/src/commands/checkout.rs (unused file), as well as litorg comments"]],"deps":["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","CIEUBH465IFZXO3YDG7XYHP54NJ4TGVQD47SKNW6P5XM4X7IVNBAC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","UBCBQ5FGH2KASHEUPDLIKGLVVX3GSRQ4F4P2JEJZL2NX2DUSYARAC","YDKNUL6B4EFM5U2GG36SSEKXHS6XK4OLIWUVE4BUAJ5VYJFHAOIQC","UNZXTNSJI4YRY3EQ3M4HMBKQDNYDTY6B7IZRBNYGDJXTA2UKYWRAC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","JRSBH6HTYXSIZKHW6SGWAF3JCEPMFTUG4JZUSUSF73ODEGFLAAJAC","KVBLRDOUFRYB6BPOQJDD7OVBYMTTPDAUX7CJ5DC3U7WFRI5OLWRAC","O4DNWMPDUWI6SKYOZTQKCSX6MSR73CTGCUSM65TSQYVOUSAAS6KAC","ZXTHL45OYLOICXTXXEQ6AMNSLMQFZ6BFUJWMO6LZOSDK7ERROC5AC","BZSC7VMYSFRXDHDDAMCDR6X67FN5VWIBOSE76BQLX7OCVOJFUA3AC","7A2TSC4PAKK3WOH3DMAJASCEC6D5JLJWNFWJTEEBE4CVS4K76PPQC","QNJBR73KCSCCF6FTHGZDF2K7PZQL3EFKZFOBT77KYZBMALTTW6OQC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","7FFFKQZU3TFXWL45TILYNX5A7AC7HBK526SD5DZGYCELN76YE7TAC","KJDQ2WOMIUTVDEEQ7NMJYBZAVUZ3NIVOVJ6MUCZPRAWIEWOV6TWQC","65S67T3EKKLFRBCU73Z542V7A4JSMGP37OJINON6N563UIBQAITAC","PSKXR4QEPPVJZR777HW67IEHUPGZB44MFCNQ2KUS422Q3W22IQWAC","73NW2X2MI767RYNTKS67ZB5QUWYEAA4SCORLD52K36ZU3JAK67AQC","IYJZVLETBAQDDELENH3FX7ZTOC3HY4UJ3AMC3MACW6O7ZCWZTR6AC","NZIK34IMY3L5YMFISBLHUL5ATENBL35VOZJW4EHPINZEL6IQE4UQC","MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","NA5I4WYNE2O3LPSHXGWXW7XL4YNYFDREEGDOP6LJ5HJXTQDXM7BAC","CFNFIUJVWV2PHHZKAPBY6GLW4TCX2N66DYH2QCFU5X7D7KE5D4AQC","6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","NE4A4WUK5IKCMMVWC7MYD6AF2NFJDCJT5EWTP64MRGLDN3WKSIIQC"]},"hunks":[{"Replacement":{"inode":{"change":4,"pos":173551},"path":"pijul/src/commands/diff.rs","line":99,"ins":{"up_context":[{"change":4,"pos":817}],"down_context":[{"change":4,"pos":1663}],"flag":"BLOCK","start":0,"end":824,"inode":{"change":4,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":817},"to":{"change":4,"start":817,"end":1663},"introduced_by":4}],"inode":{"change":4,"pos":173551}},"ins_contents":[{"Add":" Hunk::FileMove { .. } => \"file move\","},{"Add":" Hunk::FileDel { .. } => \"file del\","},{"Add":" Hunk::FileUndel { .. } => \"file undel\","},{"Add":" Hunk::SolveNameConflict { .. } => \"solve name conflict\","},{"Add":" Hunk::UnsolveNameConflict { .. } => \"unsolve name conflict\","},{"Add":" Hunk::FileAdd { .. } => \"file add\","},{"Add":" Hunk::Edit { .. } => \"edit\","},{"Add":" Hunk::Replacement { .. } => \"replacement\","},{"Add":" Hunk::SolveOrderConflict { .. } => \"solve order conflict\","},{"Add":" Hunk::UnsolveOrderConflict { .. } => \"unsolve order conflict\","},{"Add":" Hunk::ResurrectZombies { .. } => \"resurrect zombies\","}],"del_contents":[{"Del":" Record::FileMove { .. } => \"file move\",\n Record::FileDel { .. } => \"file del\",\n Record::FileUndel { .. } => \"file undel\",\n Record::SolveNameConflict { .. } => \"solve name conflict\",\n Record::UnsolveNameConflict { .. } => \"unsolve name conflict\",\n Record::FileAdd { .. } => \"file add\",\n Record::Edit { .. } => \"edit\",\n Record::Replacement { .. } => \"replacement\",\n Record::SolveOrderConflict { .. } => \"solve order conflict\",\n Record::UnsolveOrderConflict { .. } => \"unsolve order conflict\",\n Record::ResurrectZombies { .. } => \"resurrect zombies\",\n"}]}},{"Replacement":{"inode":{"change":4,"pos":173551},"path":"pijul/src/commands/diff.rs","line":120,"ins":{"up_context":[{"change":4,"pos":209}],"down_context":[{"change":4,"pos":4734}],"flag":"BLOCK","start":825,"end":1333,"inode":{"change":4,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":209},"to":{"change":4,"start":4212,"end":4734},"introduced_by":4}],"inode":{"change":4,"pos":173551}},"ins_contents":[{"Add":" Hunk::FileMove { path, .. } => format!(\"MV {}\\n\", path),"},{"Add":" Hunk::FileDel { path, .. } => format!(\"D {}\\n\", path),"},{"Add":" Hunk::FileUndel { path, .. } => format!(\"UD {}\\n\", path),"},{"Add":" Hunk::FileAdd { path, .. } => format!(\"A {}\", path),"},{"Add":" Hunk::SolveNameConflict { path, .. } => format!(\"SC {}\", path),"},{"Add":" Hunk::UnsolveNameConflict { path, .. } => format!(\"UC {}\", path),"},{"Add":" Hunk::Edit {"}],"del_contents":[{"Del":" Record::FileMove { path, .. } => format!(\"MV {}\\n\", path),\n Record::FileDel { path, .. } => format!(\"D {}\\n\", path),\n Record::FileUndel { path, .. } => format!(\"UD {}\\n\", path),\n Record::FileAdd { path, .. } => format!(\"A {}\", path),\n Record::SolveNameConflict { path, .. } => format!(\"SC {}\", path),\n Record::UnsolveNameConflict { path, .. } => format!(\"UC {}\", path),\n Record::Edit {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":173551},"path":"pijul/src/commands/diff.rs","line":130,"ins":{"up_context":[{"change":4,"pos":4861}],"down_context":[{"change":4,"pos":4903}],"flag":"BLOCK","start":1334,"end":1374,"inode":{"change":4,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4861},"to":{"change":4,"start":4861,"end":4903},"introduced_by":4}],"inode":{"change":4,"pos":173551}},"ins_contents":[{"Add":" Hunk::Replacement {"}],"del_contents":[{"Del":" Record::Replacement {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":173551},"path":"pijul/src/commands/diff.rs","line":134,"ins":{"up_context":[{"change":4,"pos":5030}],"down_context":[{"change":4,"pos":5079}],"flag":"BLOCK","start":1375,"end":1422,"inode":{"change":4,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":5030},"to":{"change":4,"start":5030,"end":5079},"introduced_by":4}],"inode":{"change":4,"pos":173551}},"ins_contents":[{"Add":" Hunk::SolveOrderConflict {"}],"del_contents":[{"Del":" Record::SolveOrderConflict {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":173551},"path":"pijul/src/commands/diff.rs","line":138,"ins":{"up_context":[{"change":4,"pos":5206}],"down_context":[{"change":4,"pos":5257}],"flag":"BLOCK","start":1423,"end":1472,"inode":{"change":4,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":5206},"to":{"change":4,"start":5206,"end":5257},"introduced_by":4}],"inode":{"change":4,"pos":173551}},"ins_contents":[{"Add":" Hunk::UnsolveOrderConflict {"}],"del_contents":[{"Del":" Record::UnsolveOrderConflict {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":173551},"path":"pijul/src/commands/diff.rs","line":142,"ins":{"up_context":[{"change":4,"pos":5384}],"down_context":[{"change":4,"pos":5431}],"flag":"BLOCK","start":1473,"end":1518,"inode":{"change":4,"pos":173551}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":5384},"to":{"change":4,"start":5384,"end":5431},"introduced_by":4}],"inode":{"change":4,"pos":173551}},"ins_contents":[{"Add":" Hunk::ResurrectZombies {"}],"del_contents":[{"Del":" Record::ResurrectZombies {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":1,"ins":{"up_context":[{"change":4,"pos":488880}],"down_context":[{"change":4,"pos":488937}],"flag":"BLOCK","start":1519,"end":1573,"inode":{"change":4,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":488880},"to":{"change":4,"start":488881,"end":488937},"introduced_by":4}],"inode":{"change":4,"pos":488880}},"ins_contents":[{"Add":"//! Hunk a change from a pristine and a working copy."}],"del_contents":[{"Del":"//! Record a change from a pristine and a working copy.\n"}]}},{"Replacement":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":47,"ins":{"up_context":[{"change":4,"pos":489333}],"down_context":[{"change":4,"pos":489371}],"flag":"BLOCK","start":1574,"end":1608,"inode":{"change":4,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":489333},"to":{"change":4,"start":489333,"end":489371},"introduced_by":4}],"inode":{"change":4,"pos":488880}},"ins_contents":[{"Add":"/// created using `Builder::new`."}],"del_contents":[{"Del":"/// created using `RecordState::new`.\n"}]}},{"Replacement":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":70,"ins":{"up_context":[{"change":4,"pos":489987}],"down_context":[{"change":4,"pos":490042}],"flag":"BLOCK","start":1609,"end":1662,"inode":{"change":4,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":489987},"to":{"change":4,"start":489987,"end":490042},"introduced_by":4}],"inode":{"change":4,"pos":488880}},"ins_contents":[{"Add":" pub actions: Vec, Local>>,"}],"del_contents":[{"Del":" pub actions: Vec, Local>>,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":293,"ins":{"up_context":[{"change":4,"pos":497912}],"down_context":[{"change":4,"pos":498023}],"flag":"BLOCK","start":1663,"end":1709,"inode":{"change":4,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":497975},"to":{"change":4,"start":497975,"end":498023},"introduced_by":4}],"inode":{"change":4,"pos":488880}},"ins_contents":[{"Add":" self.rec.actions.push(Hunk::FileAdd {"}],"del_contents":[{"Del":" self.rec.actions.push(Record::FileAdd {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":647,"ins":{"up_context":[{"change":4,"pos":6391}],"down_context":[{"change":4,"pos":508991}],"flag":"BLOCK","start":1710,"end":1762,"inode":{"change":4,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":6391},"to":{"change":4,"start":508937,"end":508991},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":508937},"to":{"change":4,"start":508937,"end":508991},"introduced_by":4}],"inode":{"change":4,"pos":488880}},"ins_contents":[{"Add":" self.rec.actions.push(Hunk::FileUndel {"}],"del_contents":[{"Del":" self.rec.actions.push(Record::FileUndel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":658,"ins":{"up_context":[{"change":4,"pos":509321}],"down_context":[{"change":4,"pos":509378}],"flag":"BLOCK","start":1763,"end":1818,"inode":{"change":4,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":509321},"to":{"change":4,"start":509321,"end":509378},"introduced_by":4}],"inode":{"change":4,"pos":488880}},"ins_contents":[{"Add":" self.rec.actions.push(Hunk::FileMove {"}],"del_contents":[{"Del":" self.rec.actions.push(Record::FileMove {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":674,"ins":{"up_context":[{"change":4,"pos":510020}],"down_context":[{"change":4,"pos":510086}],"flag":"BLOCK","start":1819,"end":1883,"inode":{"change":4,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":510020},"to":{"change":4,"start":510020,"end":510086},"introduced_by":4}],"inode":{"change":4,"pos":488880}},"ins_contents":[{"Add":" self.rec.actions.push(Hunk::SolveNameConflict {"}],"del_contents":[{"Del":" self.rec.actions.push(Record::SolveNameConflict {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":1024,"ins":{"up_context":[{"change":4,"pos":523440}],"down_context":[{"change":4,"pos":523492}],"flag":"BLOCK","start":1884,"end":1934,"inode":{"change":4,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":523440},"to":{"change":4,"start":523440,"end":523492},"introduced_by":4}],"inode":{"change":4,"pos":488880}},"ins_contents":[{"Add":" self.rec.actions.push(Hunk::FileDel {"}],"del_contents":[{"Del":" self.rec.actions.push(Record::FileDel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":1043,"ins":{"up_context":[{"change":2,"pos":38596}],"down_context":[{"change":4,"pos":523952}],"flag":"BLOCK","start":1935,"end":1971,"inode":{"change":4,"pos":488880}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":38596},"to":{"change":4,"start":523914,"end":523952},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":523914},"to":{"change":4,"start":523914,"end":523952},"introduced_by":4}],"inode":{"change":4,"pos":488880}},"ins_contents":[{"Add":" if let Some(Hunk::FileDel {"}],"del_contents":[{"Del":" if let Some(Record::FileDel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":4,"ins":{"up_context":[{"change":4,"pos":780074}],"down_context":[{"change":4,"pos":780127}],"flag":"BLOCK","start":1972,"end":2023,"inode":{"change":4,"pos":779907}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":780074},"to":{"change":4,"start":780074,"end":780127},"introduced_by":4}],"inode":{"change":4,"pos":779907}},"ins_contents":[{"Add":"use crate::change::{Atom, Local, NewVertex, Hunk};"}],"del_contents":[{"Del":"use crate::change::{Atom, Local, NewVertex, Record};\n"}]}},{"Replacement":{"inode":{"change":4,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":74,"ins":{"up_context":[{"change":4,"pos":782229}],"down_context":[{"change":4,"pos":0}],"flag":"BLOCK","start":2024,"end":2083,"inode":{"change":4,"pos":779907}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":782229},"to":{"change":4,"start":782229,"end":782290},"introduced_by":4}],"inode":{"change":4,"pos":779907}},"ins_contents":[{"Add":" Some(Hunk::Edit { change: c, local }) => {"}],"del_contents":[{"Del":" Some(Record::Edit { change: c, local }) => {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":76,"ins":{"up_context":[{"change":4,"pos":52}],"down_context":[{"change":4,"pos":782406}],"flag":"BLOCK","start":2084,"end":2150,"inode":{"change":4,"pos":779907}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":52},"to":{"change":4,"start":782338,"end":782406},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":782338},"to":{"change":4,"start":782338,"end":782406},"introduced_by":4}],"inode":{"change":4,"pos":779907}},"ins_contents":[{"Add":" self.rec.actions.push(Hunk::Replacement {"}],"del_contents":[{"Del":" self.rec.actions.push(Record::Replacement {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":83,"ins":{"up_context":[{"change":4,"pos":782625}],"down_context":[{"change":4,"pos":782706}],"flag":"BLOCK","start":2151,"end":2230,"inode":{"change":4,"pos":779907}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":782625},"to":{"change":4,"start":782625,"end":782706},"introduced_by":4}],"inode":{"change":4,"pos":779907}},"ins_contents":[{"Add":" self.rec.actions.push(Hunk::Edit { change: c, local })"}],"del_contents":[{"Del":" self.rec.actions.push(Record::Edit { change: c, local })\n"}]}},{"Replacement":{"inode":{"change":4,"pos":779907},"path":"libpijul/src/diff/replace.rs","line":90,"ins":{"up_context":[{"change":4,"pos":782847}],"down_context":[{"change":4,"pos":782892}],"flag":"BLOCK","start":2231,"end":2274,"inode":{"change":4,"pos":779907}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":782847},"to":{"change":4,"start":782847,"end":782892},"introduced_by":4}],"inode":{"change":4,"pos":779907}},"ins_contents":[{"Add":" self.rec.actions.push(Hunk::Edit {"}],"del_contents":[{"Del":" self.rec.actions.push(Record::Edit {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":150,"ins":{"up_context":[{"change":4,"pos":797638}],"down_context":[{"change":4,"pos":797717}],"flag":"BLOCK","start":2275,"end":2352,"inode":{"change":4,"pos":793247}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":797638},"to":{"change":4,"start":797638,"end":797717},"introduced_by":4}],"inode":{"change":4,"pos":793247}},"ins_contents":[{"Add":" use crate::change::{Atom, EdgeMap, Local, NewEdge, NewVertex, Hunk};"}],"del_contents":[{"Del":" use crate::change::{Atom, EdgeMap, Local, NewEdge, NewVertex, Record};\n"}]}},{"Replacement":{"inode":{"change":4,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":198,"ins":{"up_context":[{"change":4,"pos":799869}],"down_context":[{"change":4,"pos":799918}],"flag":"BLOCK","start":2353,"end":2400,"inode":{"change":4,"pos":793247}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":799869},"to":{"change":4,"start":799869,"end":799918},"introduced_by":4}],"inode":{"change":4,"pos":793247}},"ins_contents":[{"Add":" self.rec.actions.push(Hunk::Edit {"}],"del_contents":[{"Del":" self.rec.actions.push(Record::Edit {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":793247},"path":"libpijul/src/diff/mod.rs","line":209,"ins":{"up_context":[{"change":4,"pos":800193}],"down_context":[{"change":4,"pos":548}],"flag":"BLOCK","start":2401,"end":2451,"inode":{"change":4,"pos":793247}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":800193},"to":{"change":4,"start":800193,"end":800245},"introduced_by":4}],"inode":{"change":4,"pos":793247}},"ins_contents":[{"Add":" self.rec.actions.push(Hunk::Replacement {"}],"del_contents":[{"Del":" self.rec.actions.push(Record::Replacement {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":805350},"path":"libpijul/src/diff/delete.rs","line":6,"ins":{"up_context":[{"change":4,"pos":805588}],"down_context":[{"change":4,"pos":805650}],"flag":"BLOCK","start":2452,"end":2512,"inode":{"change":4,"pos":805350}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":805588},"to":{"change":4,"start":805588,"end":805650},"introduced_by":4}],"inode":{"change":4,"pos":805350}},"ins_contents":[{"Add":"use crate::change::{Atom, EdgeMap, Local, NewVertex, Hunk};"}],"del_contents":[{"Del":"use crate::change::{Atom, EdgeMap, Local, NewVertex, Record};\n"}]}},{"Replacement":{"inode":{"change":4,"pos":805350},"path":"libpijul/src/diff/delete.rs","line":58,"ins":{"up_context":[{"change":4,"pos":807024}],"down_context":[{"change":4,"pos":807073}],"flag":"BLOCK","start":2513,"end":2560,"inode":{"change":4,"pos":805350}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":807024},"to":{"change":4,"start":807024,"end":807073},"introduced_by":4}],"inode":{"change":4,"pos":805350}},"ins_contents":[{"Add":" self.rec.actions.push(Hunk::Edit {"}],"del_contents":[{"Del":" self.rec.actions.push(Record::Edit {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":805350},"path":"libpijul/src/diff/delete.rs","line":70,"ins":{"up_context":[{"change":4,"pos":807902}],"down_context":[{"change":4,"pos":807963}],"flag":"BLOCK","start":2561,"end":2620,"inode":{"change":4,"pos":805350}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":807902},"to":{"change":4,"start":807902,"end":807963},"introduced_by":4}],"inode":{"change":4,"pos":805350}},"ins_contents":[{"Add":" self.rec.actions.push(Hunk::ResurrectZombies {"}],"del_contents":[{"Del":" self.rec.actions.push(Record::ResurrectZombies {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":805350},"path":"libpijul/src/diff/delete.rs","line":248,"ins":{"up_context":[{"change":4,"pos":813947}],"down_context":[{"change":4,"pos":814006}],"flag":"BLOCK","start":2621,"end":2678,"inode":{"change":4,"pos":805350}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":813947},"to":{"change":4,"start":813947,"end":814006},"introduced_by":4}],"inode":{"change":4,"pos":805350}},"ins_contents":[{"Add":" self.rec.actions.push(Hunk::SolveOrderConflict {"}],"del_contents":[{"Del":" self.rec.actions.push(Record::SolveOrderConflict {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":817216},"path":"libpijul/src/changestore/mod.rs","line":50,"ins":{"up_context":[{"change":4,"pos":15428}],"down_context":[{"change":4,"pos":15523}],"flag":"BLOCK","start":2679,"end":2772,"inode":{"change":4,"pos":817216}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":15428},"to":{"change":4,"start":15428,"end":15523},"introduced_by":4}],"inode":{"change":4,"pos":817216}},"ins_contents":[{"Add":" ) -> Result, crate::change::Local>>, Self::Error> {"}],"del_contents":[{"Del":" ) -> Result, crate::change::Local>>, Self::Error> {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":187,"ins":{"up_context":[{"change":4,"pos":835524}],"down_context":[{"change":4,"pos":835575}],"flag":"BLOCK","start":2773,"end":2822,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":835524},"to":{"change":4,"start":835524,"end":835575},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" pub changes: Vec, Local>>,"}],"del_contents":[{"Del":" pub changes: Vec, Local>>,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":198,"ins":{"up_context":[{"change":2,"pos":117726}],"down_context":[{"change":2,"pos":117783}],"flag":"BLOCK","start":2823,"end":2878,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":117726},"to":{"change":2,"start":117726,"end":117783},"introduced_by":2}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" I: Iterator, Local>>,"}],"del_contents":[{"Del":" I: Iterator, Local>>,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":555,"ins":{"up_context":[{"change":4,"pos":847396}],"down_context":[{"change":4,"pos":847437}],"flag":"BLOCK","start":2879,"end":2918,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":847396},"to":{"change":4,"start":847396,"end":847437},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":"impl Hunk, L> {"}],"del_contents":[{"Del":"impl Record, L> {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":558,"ins":{"up_context":[{"change":4,"pos":847507}],"down_context":[{"change":4,"pos":847577}],"flag":"BLOCK","start":2919,"end":2985,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":847507},"to":{"change":4,"start":847507,"end":847577},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::FileMove { del, add, path } => Hunk::FileMove {"}],"del_contents":[{"Del":" Record::FileMove { del, add, path } => Record::FileMove {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":563,"ins":{"up_context":[{"change":4,"pos":847708}],"down_context":[{"change":4,"pos":847738}],"flag":"BLOCK","start":2986,"end":3014,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":847708},"to":{"change":4,"start":847708,"end":847738},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::FileDel {"}],"del_contents":[{"Del":" Record::FileDel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":567,"ins":{"up_context":[{"change":4,"pos":847807}],"down_context":[{"change":4,"pos":847844}],"flag":"BLOCK","start":3015,"end":3050,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":847807},"to":{"change":4,"start":847807,"end":847844},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" } => Hunk::FileUndel {"}],"del_contents":[{"Del":" } => Record::FileUndel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":572,"ins":{"up_context":[{"change":4,"pos":848007}],"down_context":[{"change":4,"pos":848039}],"flag":"BLOCK","start":3051,"end":3081,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":848007},"to":{"change":4,"start":848007,"end":848039},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::FileUndel {"}],"del_contents":[{"Del":" Record::FileUndel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":576,"ins":{"up_context":[{"change":4,"pos":848110}],"down_context":[{"change":4,"pos":848145}],"flag":"BLOCK","start":3082,"end":3115,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":848110},"to":{"change":4,"start":848110,"end":848145},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" } => Hunk::FileDel {"}],"del_contents":[{"Del":" } => Record::FileDel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":581,"ins":{"up_context":[{"change":4,"pos":848308}],"down_context":[{"change":4,"pos":848338}],"flag":"BLOCK","start":3116,"end":3144,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":848308},"to":{"change":4,"start":848308,"end":848338},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::FileAdd {"}],"del_contents":[{"Del":" Record::FileAdd {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":591,"ins":{"up_context":[{"change":4,"pos":848694}],"down_context":[{"change":4,"pos":848728}],"flag":"BLOCK","start":3145,"end":3177,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":848694},"to":{"change":4,"start":848694,"end":848728},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::FileDel {"}],"del_contents":[{"Del":" Record::FileDel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":597,"ins":{"up_context":[{"change":4,"pos":848899}],"down_context":[{"change":4,"pos":848985}],"flag":"BLOCK","start":3178,"end":3260,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":848899},"to":{"change":4,"start":848899,"end":848985},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::SolveNameConflict { name, path } => Hunk::UnsolveNameConflict {"}],"del_contents":[{"Del":" Record::SolveNameConflict { name, path } => Record::UnsolveNameConflict {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":601,"ins":{"up_context":[{"change":4,"pos":849078}],"down_context":[{"change":4,"pos":849164}],"flag":"BLOCK","start":3261,"end":3343,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":849078},"to":{"change":4,"start":849078,"end":849164},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::UnsolveNameConflict { name, path } => Hunk::SolveNameConflict {"}],"del_contents":[{"Del":" Record::UnsolveNameConflict { name, path } => Record::SolveNameConflict {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":605,"ins":{"up_context":[{"change":4,"pos":849257}],"down_context":[{"change":4,"pos":849318}],"flag":"BLOCK","start":3344,"end":3401,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":849257},"to":{"change":4,"start":849257,"end":849318},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::Edit { change, local } => Hunk::Edit {"}],"del_contents":[{"Del":" Record::Edit { change, local } => Record::Edit {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":609,"ins":{"up_context":[{"change":4,"pos":849417}],"down_context":[{"change":4,"pos":849451}],"flag":"BLOCK","start":3402,"end":3434,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":849417},"to":{"change":4,"start":849417,"end":849451},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::Replacement {"}],"del_contents":[{"Del":" Record::Replacement {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":613,"ins":{"up_context":[{"change":4,"pos":849527}],"down_context":[{"change":4,"pos":849566}],"flag":"BLOCK","start":3435,"end":3472,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":849527},"to":{"change":4,"start":849527,"end":849566},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" } => Hunk::Replacement {"}],"del_contents":[{"Del":" } => Record::Replacement {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":618,"ins":{"up_context":[{"change":4,"pos":849721}],"down_context":[{"change":4,"pos":849812}],"flag":"BLOCK","start":3473,"end":3560,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":849721},"to":{"change":4,"start":849721,"end":849812},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::SolveOrderConflict { change, local } => Hunk::UnsolveOrderConflict {"}],"del_contents":[{"Del":" Record::SolveOrderConflict { change, local } => Record::UnsolveOrderConflict {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":622,"ins":{"up_context":[{"change":4,"pos":849911}],"down_context":[{"change":4,"pos":850002}],"flag":"BLOCK","start":3561,"end":3648,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":849911},"to":{"change":4,"start":849911,"end":850002},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::UnsolveOrderConflict { change, local } => Hunk::SolveOrderConflict {"}],"del_contents":[{"Del":" Record::UnsolveOrderConflict { change, local } => Record::SolveOrderConflict {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":626,"ins":{"up_context":[{"change":4,"pos":850101}],"down_context":[{"change":4,"pos":850174}],"flag":"BLOCK","start":3649,"end":3718,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":850101},"to":{"change":4,"start":850101,"end":850174},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::ResurrectZombies { change, local } => Hunk::Edit {"}],"del_contents":[{"Del":" Record::ResurrectZombies { change, local } => Record::Edit {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":662,"ins":{"up_context":[{"change":4,"pos":851191}],"down_context":[{"change":4,"pos":851222}],"flag":"BLOCK","start":3719,"end":3748,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":851191},"to":{"change":4,"start":851191,"end":851222},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":"pub enum Hunk {"}],"del_contents":[{"Del":"pub enum Record {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":716,"ins":{"up_context":[{"change":4,"pos":852329}],"down_context":[{"change":4,"pos":852359}],"flag":"BLOCK","start":3749,"end":3777,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":852329},"to":{"change":4,"start":852329,"end":852359},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":"pub struct HunkIter {"}],"del_contents":[{"Del":"pub struct RecordIter {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":722,"ins":{"up_context":[{"change":4,"pos":852427}],"down_context":[{"change":4,"pos":852561}],"flag":"BLOCK","start":3778,"end":3906,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":852427},"to":{"change":4,"start":852427,"end":852561},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":"impl IntoIterator for Hunk {"},{"Add":" type IntoIter = HunkIter, Atom>;"}],"del_contents":[{"Del":"impl IntoIterator for Record {\n type IntoIter = RecordIter, Atom>;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":726,"ins":{"up_context":[{"change":4,"pos":852635}],"down_context":[{"change":4,"pos":852656}],"flag":"BLOCK","start":3907,"end":3926,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":852635},"to":{"change":4,"start":852635,"end":852656},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" HunkIter {"}],"del_contents":[{"Del":" RecordIter {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":734,"ins":{"up_context":[{"change":4,"pos":852755}],"down_context":[{"change":4,"pos":852902}],"flag":"BLOCK","start":3927,"end":4066,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":852755},"to":{"change":4,"start":852755,"end":852902},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":"impl Hunk {"},{"Add":" pub fn iter(&self) -> HunkIter<&Hunk, &Atom> {"},{"Add":" HunkIter {"}],"del_contents":[{"Del":"impl Record {\n pub fn iter(&self) -> RecordIter<&Record, &Atom> {\n RecordIter {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":742,"ins":{"up_context":[{"change":4,"pos":852998}],"down_context":[{"change":4,"pos":853109}],"flag":"BLOCK","start":4067,"end":4172,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":852998},"to":{"change":4,"start":852998,"end":853109},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" pub fn rev_iter(&self) -> RevHunkIter<&Hunk, &Atom> {"},{"Add":" RevHunkIter {"}],"del_contents":[{"Del":" pub fn rev_iter(&self) -> RevRecordIter<&Record, &Atom> {\n RevRecordIter {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":751,"ins":{"up_context":[{"change":4,"pos":853208}],"down_context":[{"change":4,"pos":853294}],"flag":"BLOCK","start":4173,"end":4255,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":853208},"to":{"change":4,"start":853208,"end":853294},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":"impl Iterator for HunkIter, Atom> {"}],"del_contents":[{"Del":"impl Iterator for RecordIter, Atom> {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":760,"ins":{"up_context":[{"change":4,"pos":853602}],"down_context":[{"change":4,"pos":853657}],"flag":"BLOCK","start":4256,"end":4309,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":853602},"to":{"change":4,"start":853602,"end":853657},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::FileMove { del, add, .. } => {"}],"del_contents":[{"Del":" Record::FileMove { del, add, .. } => {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":764,"ins":{"up_context":[{"change":4,"pos":853749}],"down_context":[{"change":4,"pos":853808}],"flag":"BLOCK","start":4310,"end":4367,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":853749},"to":{"change":4,"start":853749,"end":853808},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::FileDel { del, contents, .. } => {"}],"del_contents":[{"Del":" Record::FileDel { del, contents, .. } => {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":768,"ins":{"up_context":[{"change":4,"pos":853899}],"down_context":[{"change":4,"pos":853935}],"flag":"BLOCK","start":4368,"end":4402,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":853899},"to":{"change":4,"start":853899,"end":853935},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::FileUndel {"}],"del_contents":[{"Del":" Record::FileUndel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":774,"ins":{"up_context":[{"change":4,"pos":854091}],"down_context":[{"change":4,"pos":854125}],"flag":"BLOCK","start":4403,"end":4435,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":854091},"to":{"change":4,"start":854091,"end":854125},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::FileAdd {"}],"del_contents":[{"Del":" Record::FileAdd {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":784,"ins":{"up_context":[{"change":4,"pos":854409}],"down_context":[{"change":4,"pos":854650}],"flag":"BLOCK","start":4436,"end":4669,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":854409},"to":{"change":4,"start":854409,"end":854650},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::SolveNameConflict { name, .. } => Some(name),"},{"Add":" Hunk::UnsolveNameConflict { name, .. } => Some(name),"},{"Add":" Hunk::Edit { change, .. } => Some(change),"},{"Add":" Hunk::Replacement {"}],"del_contents":[{"Del":" Record::SolveNameConflict { name, .. } => Some(name),\n Record::UnsolveNameConflict { name, .. } => Some(name),\n Record::Edit { change, .. } => Some(change),\n Record::Replacement {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":795,"ins":{"up_context":[{"change":4,"pos":854860}],"down_context":[{"change":4,"pos":855085}],"flag":"BLOCK","start":4670,"end":4889,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":854860},"to":{"change":4,"start":854860,"end":855085},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::SolveOrderConflict { change, .. } => Some(change),"},{"Add":" Hunk::UnsolveOrderConflict { change, .. } => Some(change),"},{"Add":" Hunk::ResurrectZombies { change, .. } => Some(change),"}],"del_contents":[{"Del":" Record::SolveOrderConflict { change, .. } => Some(change),\n Record::UnsolveOrderConflict { change, .. } => Some(change),\n Record::ResurrectZombies { change, .. } => Some(change),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":805,"ins":{"up_context":[{"change":4,"pos":855152}],"down_context":[{"change":4,"pos":855250}],"flag":"BLOCK","start":4890,"end":4984,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":855152},"to":{"change":4,"start":855152,"end":855250},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":"impl<'a, Context, Local> Iterator for HunkIter<&'a Hunk, &'a Atom> {"}],"del_contents":[{"Del":"impl<'a, Context, Local> Iterator for RecordIter<&'a Record, &'a Atom> {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":814,"ins":{"up_context":[{"change":4,"pos":855563}],"down_context":[{"change":4,"pos":855598}],"flag":"BLOCK","start":4985,"end":5018,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":855563},"to":{"change":4,"start":855563,"end":855598},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::FileMove {"}],"del_contents":[{"Del":" Record::FileMove {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":820,"ins":{"up_context":[{"change":4,"pos":855754}],"down_context":[{"change":4,"pos":855788}],"flag":"BLOCK","start":5019,"end":5051,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":855754},"to":{"change":4,"start":855754,"end":855788},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::FileDel {"}],"del_contents":[{"Del":" Record::FileDel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":828,"ins":{"up_context":[{"change":4,"pos":855997}],"down_context":[{"change":4,"pos":856033}],"flag":"BLOCK","start":5052,"end":5086,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":855997},"to":{"change":4,"start":855997,"end":856033},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::FileUndel {"}],"del_contents":[{"Del":" Record::FileUndel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":836,"ins":{"up_context":[{"change":4,"pos":856246}],"down_context":[{"change":4,"pos":856280}],"flag":"BLOCK","start":5087,"end":5119,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":856246},"to":{"change":4,"start":856246,"end":856280},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::FileAdd {"}],"del_contents":[{"Del":" Record::FileAdd {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":846,"ins":{"up_context":[{"change":4,"pos":856586}],"down_context":[{"change":4,"pos":856839}],"flag":"BLOCK","start":5120,"end":5365,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":856586},"to":{"change":4,"start":856586,"end":856839},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::SolveNameConflict { ref name, .. } => Some(&name),"},{"Add":" Hunk::UnsolveNameConflict { ref name, .. } => Some(&name),"},{"Add":" Hunk::Edit { change: ref c, .. } => Some(c),"},{"Add":" Hunk::Replacement {"}],"del_contents":[{"Del":" Record::SolveNameConflict { ref name, .. } => Some(&name),\n Record::UnsolveNameConflict { ref name, .. } => Some(&name),\n Record::Edit { change: ref c, .. } => Some(c),\n Record::Replacement {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":857,"ins":{"up_context":[{"change":4,"pos":857048}],"down_context":[{"change":4,"pos":857285}],"flag":"BLOCK","start":5366,"end":5597,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":857048},"to":{"change":4,"start":857048,"end":857285},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::SolveOrderConflict { ref change, .. } => Some(change),"},{"Add":" Hunk::UnsolveOrderConflict { ref change, .. } => Some(change),"},{"Add":" Hunk::ResurrectZombies { ref change, .. } => Some(change),"}],"del_contents":[{"Del":" Record::SolveOrderConflict { ref change, .. } => Some(change),\n Record::UnsolveOrderConflict { ref change, .. } => Some(change),\n Record::ResurrectZombies { ref change, .. } => Some(change),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":867,"ins":{"up_context":[{"change":4,"pos":857352}],"down_context":[{"change":4,"pos":857385}],"flag":"BLOCK","start":5598,"end":5629,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":857352},"to":{"change":4,"start":857352,"end":857385},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":"pub struct RevHunkIter {"}],"del_contents":[{"Del":"pub struct RevRecordIter {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":873,"ins":{"up_context":[{"change":4,"pos":857453}],"down_context":[{"change":4,"pos":857554}],"flag":"BLOCK","start":5630,"end":5727,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":857453},"to":{"change":4,"start":857453,"end":857554},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":"impl<'a, Context, Local> Iterator for RevHunkIter<&'a Hunk, &'a Atom> {"}],"del_contents":[{"Del":"impl<'a, Context, Local> Iterator for RevRecordIter<&'a Record, &'a Atom> {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":882,"ins":{"up_context":[{"change":4,"pos":857867}],"down_context":[{"change":4,"pos":857902}],"flag":"BLOCK","start":5728,"end":5761,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":857867},"to":{"change":4,"start":857867,"end":857902},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::FileMove {"}],"del_contents":[{"Del":" Record::FileMove {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":888,"ins":{"up_context":[{"change":4,"pos":858058}],"down_context":[{"change":4,"pos":858092}],"flag":"BLOCK","start":5762,"end":5794,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":858058},"to":{"change":4,"start":858058,"end":858092},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::FileDel {"}],"del_contents":[{"Del":" Record::FileDel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":900,"ins":{"up_context":[{"change":4,"pos":858436}],"down_context":[{"change":4,"pos":858472}],"flag":"BLOCK","start":5795,"end":5829,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":858436},"to":{"change":4,"start":858436,"end":858472},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::FileUndel {"}],"del_contents":[{"Del":" Record::FileUndel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":912,"ins":{"up_context":[{"change":4,"pos":858822}],"down_context":[{"change":4,"pos":858856}],"flag":"BLOCK","start":5830,"end":5862,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":858822},"to":{"change":4,"start":858822,"end":858856},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::FileAdd {"}],"del_contents":[{"Del":" Record::FileAdd {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":927,"ins":{"up_context":[{"change":4,"pos":859359}],"down_context":[{"change":4,"pos":859612}],"flag":"BLOCK","start":5863,"end":6108,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":859359},"to":{"change":4,"start":859359,"end":859612},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::SolveNameConflict { ref name, .. } => Some(&name),"},{"Add":" Hunk::UnsolveNameConflict { ref name, .. } => Some(&name),"},{"Add":" Hunk::Edit { change: ref c, .. } => Some(c),"},{"Add":" Hunk::Replacement {"}],"del_contents":[{"Del":" Record::SolveNameConflict { ref name, .. } => Some(&name),\n Record::UnsolveNameConflict { ref name, .. } => Some(&name),\n Record::Edit { change: ref c, .. } => Some(c),\n Record::Replacement {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":938,"ins":{"up_context":[{"change":4,"pos":859821}],"down_context":[{"change":4,"pos":860058}],"flag":"BLOCK","start":6109,"end":6340,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":859821},"to":{"change":4,"start":859821,"end":860058},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::SolveOrderConflict { ref change, .. } => Some(change),"},{"Add":" Hunk::UnsolveOrderConflict { ref change, .. } => Some(change),"},{"Add":" Hunk::ResurrectZombies { ref change, .. } => Some(change),"}],"del_contents":[{"Del":" Record::SolveOrderConflict { ref change, .. } => Some(change),\n Record::UnsolveOrderConflict { ref change, .. } => Some(change),\n Record::ResurrectZombies { ref change, .. } => Some(change),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1014,"ins":{"up_context":[{"change":4,"pos":862666}],"down_context":[{"change":4,"pos":862693}],"flag":"BLOCK","start":6341,"end":6366,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":862666},"to":{"change":4,"start":862666,"end":862693},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":"impl Hunk {"}],"del_contents":[{"Del":"impl Record {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1017,"ins":{"up_context":[{"change":4,"pos":862747}],"down_context":[{"change":4,"pos":863349}],"flag":"BLOCK","start":6367,"end":6947,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":862747},"to":{"change":4,"start":862747,"end":863349},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::FileMove { ref path, .. }"},{"Add":" | Hunk::FileDel { ref path, .. }"},{"Add":" | Hunk::FileUndel { ref path, .. }"},{"Add":" | Hunk::SolveNameConflict { ref path, .. }"},{"Add":" | Hunk::UnsolveNameConflict { ref path, .. }"},{"Add":" | Hunk::FileAdd { ref path, .. } => path,"},{"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, .. } => &local.path,"}],"del_contents":[{"Del":" Record::FileMove { ref path, .. }\n | Record::FileDel { ref path, .. }\n | Record::FileUndel { ref path, .. }\n | Record::SolveNameConflict { ref path, .. }\n | Record::UnsolveNameConflict { ref path, .. }\n | Record::FileAdd { ref path, .. } => path,\n Record::Edit { ref local, .. }\n | Record::Replacement { ref local, .. }\n | Record::SolveOrderConflict { ref local, .. }\n | Record::UnsolveOrderConflict { ref local, .. }\n | Record::ResurrectZombies { ref local, .. } => &local.path,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1033,"ins":{"up_context":[{"change":4,"pos":863429}],"down_context":[{"change":4,"pos":863976}],"flag":"BLOCK","start":6948,"end":7473,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":863429},"to":{"change":4,"start":863429,"end":863976},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::FileMove { .. }"},{"Add":" | Hunk::FileDel { .. }"},{"Add":" | Hunk::FileUndel { .. }"},{"Add":" | Hunk::SolveNameConflict { .. }"},{"Add":" | Hunk::UnsolveNameConflict { .. }"},{"Add":" | Hunk::FileAdd { .. } => None,"},{"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.line),"}],"del_contents":[{"Del":" Record::FileMove { .. }\n | Record::FileDel { .. }\n | Record::FileUndel { .. }\n | Record::SolveNameConflict { .. }\n | Record::UnsolveNameConflict { .. }\n | Record::FileAdd { .. } => None,\n Record::Edit { ref local, .. }\n | Record::Replacement { ref local, .. }\n | Record::SolveOrderConflict { ref local, .. }\n | Record::UnsolveOrderConflict { ref local, .. }\n | Record::ResurrectZombies { ref local, .. } => Some(local.line),\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1048,"ins":{"up_context":[{"change":4,"pos":863995}],"down_context":[{"change":2,"pos":121412}],"flag":"BLOCK","start":7474,"end":7518,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":863995},"to":{"change":4,"start":863995,"end":864041},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":"impl Hunk, Local> {"}],"del_contents":[{"Del":"impl Record, Local> {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1052,"ins":{"up_context":[{"change":2,"pos":121479}],"down_context":[{"change":2,"pos":121541}],"flag":"BLOCK","start":7519,"end":7579,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":121479},"to":{"change":2,"start":121479,"end":121541},"introduced_by":2}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" ) -> Result, Local>, T::GraphError> {"}],"del_contents":[{"Del":" ) -> Result, Local>, T::GraphError> {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1054,"ins":{"up_context":[{"change":2,"pos":121565}],"down_context":[{"change":2,"pos":121566}],"flag":"BLOCK","start":7580,"end":7646,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":121565},"to":{"change":4,"start":864140,"end":864210},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":864140},"to":{"change":4,"start":864140,"end":864210},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::FileMove { del, add, path } => Hunk::FileMove {"}],"del_contents":[{"Del":" Record::FileMove { del, add, path } => Record::FileMove {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1059,"ins":{"up_context":[{"change":4,"pos":864329}],"down_context":[{"change":4,"pos":864359}],"flag":"BLOCK","start":7647,"end":7675,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":864329},"to":{"change":4,"start":864329,"end":864359},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::FileDel {"}],"del_contents":[{"Del":" Record::FileDel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1063,"ins":{"up_context":[{"change":4,"pos":864428}],"down_context":[{"change":2,"pos":121651}],"flag":"BLOCK","start":7676,"end":7709,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":864428},"to":{"change":4,"start":864428,"end":864463},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" } => Hunk::FileDel {"}],"del_contents":[{"Del":" } => Record::FileDel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1068,"ins":{"up_context":[{"change":4,"pos":864616}],"down_context":[{"change":4,"pos":864648}],"flag":"BLOCK","start":7710,"end":7740,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":864616},"to":{"change":4,"start":864616,"end":864648},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::FileUndel {"}],"del_contents":[{"Del":" Record::FileUndel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1072,"ins":{"up_context":[{"change":4,"pos":864719}],"down_context":[{"change":2,"pos":121778}],"flag":"BLOCK","start":7741,"end":7776,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":864719},"to":{"change":4,"start":864719,"end":864756},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" } => Hunk::FileUndel {"}],"del_contents":[{"Del":" } => Record::FileUndel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1077,"ins":{"up_context":[{"change":4,"pos":864913}],"down_context":[{"change":2,"pos":121909}],"flag":"BLOCK","start":7777,"end":7857,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":864913},"to":{"change":4,"start":864913,"end":864997},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::SolveNameConflict { name, path } => Hunk::SolveNameConflict {"}],"del_contents":[{"Del":" Record::SolveNameConflict { name, path } => Record::SolveNameConflict {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1081,"ins":{"up_context":[{"change":4,"pos":865077}],"down_context":[{"change":2,"pos":121954}],"flag":"BLOCK","start":7858,"end":7942,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":865077},"to":{"change":4,"start":865077,"end":865165},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::UnsolveNameConflict { name, path } => Hunk::UnsolveNameConflict {"}],"del_contents":[{"Del":" Record::UnsolveNameConflict { name, path } => Record::UnsolveNameConflict {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1085,"ins":{"up_context":[{"change":4,"pos":865245}],"down_context":[{"change":4,"pos":865275}],"flag":"BLOCK","start":7943,"end":7971,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":865245},"to":{"change":4,"start":865245,"end":865275},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::FileAdd {"}],"del_contents":[{"Del":" Record::FileAdd {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1090,"ins":{"up_context":[{"change":4,"pos":865376}],"down_context":[{"change":2,"pos":121999}],"flag":"BLOCK","start":7972,"end":8005,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":865376},"to":{"change":4,"start":865376,"end":865411},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" } => Hunk::FileAdd {"}],"del_contents":[{"Del":" } => Record::FileAdd {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1096,"ins":{"up_context":[{"change":4,"pos":865627}],"down_context":[{"change":2,"pos":122190}],"flag":"BLOCK","start":8006,"end":8063,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":865627},"to":{"change":4,"start":865627,"end":865688},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::Edit { change, local } => Hunk::Edit {"}],"del_contents":[{"Del":" Record::Edit { change, local } => Record::Edit {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1100,"ins":{"up_context":[{"change":4,"pos":865773}],"down_context":[{"change":4,"pos":865807}],"flag":"BLOCK","start":8064,"end":8096,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":865773},"to":{"change":4,"start":865773,"end":865807},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::Replacement {"}],"del_contents":[{"Del":" Record::Replacement {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1104,"ins":{"up_context":[{"change":4,"pos":865883}],"down_context":[{"change":2,"pos":122239}],"flag":"BLOCK","start":8097,"end":8134,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":865883},"to":{"change":4,"start":865883,"end":865922},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" } => Hunk::Replacement {"}],"del_contents":[{"Del":" } => Record::Replacement {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1109,"ins":{"up_context":[{"change":4,"pos":866064}],"down_context":[{"change":2,"pos":122346}],"flag":"BLOCK","start":8135,"end":8220,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":866064},"to":{"change":4,"start":866064,"end":866153},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::SolveOrderConflict { change, local } => Hunk::SolveOrderConflict {"}],"del_contents":[{"Del":" Record::SolveOrderConflict { change, local } => Record::SolveOrderConflict {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1113,"ins":{"up_context":[{"change":4,"pos":866238}],"down_context":[{"change":2,"pos":122395}],"flag":"BLOCK","start":8221,"end":8310,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":866238},"to":{"change":4,"start":866238,"end":866331},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::UnsolveOrderConflict { change, local } => Hunk::UnsolveOrderConflict {"}],"del_contents":[{"Del":" Record::UnsolveOrderConflict { change, local } => Record::UnsolveOrderConflict {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1117,"ins":{"up_context":[{"change":4,"pos":866416}],"down_context":[{"change":2,"pos":122444}],"flag":"BLOCK","start":8311,"end":8392,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":866416},"to":{"change":4,"start":866416,"end":866501},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" Hunk::ResurrectZombies { change, local } => Hunk::ResurrectZombies {"}],"del_contents":[{"Del":" Record::ResurrectZombies { change, local } => Record::ResurrectZombies {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":831311},"path":"libpijul/src/change.rs","line":1145,"ins":{"up_context":[{"change":4,"pos":867256}],"down_context":[{"change":4,"pos":867303}],"flag":"BLOCK","start":8393,"end":8438,"inode":{"change":4,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":867256},"to":{"change":4,"start":867256,"end":867303},"introduced_by":4}],"inode":{"change":4,"pos":831311}},"ins_contents":[{"Add":" changes: Vec, L>>,"}],"del_contents":[{"Del":" changes: Vec, L>>,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":38,"ins":{"up_context":[{"change":4,"pos":38813}],"down_context":[{"change":4,"pos":38867}],"flag":"BLOCK","start":8439,"end":8489,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":38813},"to":{"change":4,"start":38813,"end":38867},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" const HUNKS_LINE: &'static str = \"# Hunks\\n\";"}],"del_contents":[{"Del":" const CHANGES_LINE: &'static str = \"# Changes\\n\";\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":146,"ins":{"up_context":[{"change":4,"pos":42592}],"down_context":[{"change":4,"pos":42649}],"flag":"BLOCK","start":8490,"end":8545,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":42592},"to":{"change":4,"start":42592,"end":42649},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" w.write_all(Self::HUNKS_LINE.as_bytes())?;"}],"del_contents":[{"Del":" w.write_all(Self::CHANGES_LINE.as_bytes())?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":244,"ins":{"up_context":[{"change":4,"pos":45994}],"down_context":[{"change":4,"pos":46042}],"flag":"BLOCK","start":8546,"end":8592,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":45994},"to":{"change":4,"start":45994,"end":46042},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" } else if h == Self::HUNKS_LINE {"}],"del_contents":[{"Del":" } else if h == Self::CHANGES_LINE {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":283,"ins":{"up_context":[{"change":4,"pos":47781}],"down_context":[{"change":4,"pos":47879}],"flag":"BLOCK","start":8593,"end":8689,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":47781},"to":{"change":4,"start":47781,"end":47879},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Hunk::read(updatables, current, &mut contents, &deps, offsets, &h)?"}],"del_contents":[{"Del":" Record::read(updatables, current, &mut contents, &deps, offsets, &h)?\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":304,"ins":{"up_context":[{"change":4,"pos":48444}],"down_context":[{"change":4,"pos":48479}],"flag":"BLOCK","start":8690,"end":8723,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":48444},"to":{"change":4,"start":48444,"end":48479},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":"impl Hunk, Local> {"}],"del_contents":[{"Del":"impl Record, Local> {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":319,"ins":{"up_context":[{"change":4,"pos":48864}],"down_context":[{"change":4,"pos":48927}],"flag":"BLOCK","start":8724,"end":8785,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":48864},"to":{"change":4,"start":48864,"end":48927},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Hunk::FileMove { del, add, path } => match add {"}],"del_contents":[{"Del":" Record::FileMove { del, add, path } => match add {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":354,"ins":{"up_context":[{"change":4,"pos":50402}],"down_context":[{"change":4,"pos":50432}],"flag":"BLOCK","start":8786,"end":8814,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":50402},"to":{"change":4,"start":50402,"end":50432},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Hunk::FileDel {"}],"del_contents":[{"Del":" Record::FileDel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":372,"ins":{"up_context":[{"change":4,"pos":51044}],"down_context":[{"change":4,"pos":51076}],"flag":"BLOCK","start":8815,"end":8845,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":51044},"to":{"change":4,"start":51044,"end":51076},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Hunk::FileUndel {"}],"del_contents":[{"Del":" Record::FileUndel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":389,"ins":{"up_context":[{"change":4,"pos":51663}],"down_context":[{"change":4,"pos":51693}],"flag":"BLOCK","start":8846,"end":8874,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":51663},"to":{"change":4,"start":51663,"end":51693},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Hunk::FileAdd {"}],"del_contents":[{"Del":" Record::FileAdd {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":432,"ins":{"up_context":[{"change":4,"pos":53410}],"down_context":[{"change":3,"pos":309}],"flag":"BLOCK","start":8875,"end":8921,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":53410},"to":{"change":4,"start":53410,"end":53458},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Hunk::Edit { change, local } => {"}],"del_contents":[{"Del":" Record::Edit { change, local } => {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":440,"ins":{"up_context":[{"change":4,"pos":53776}],"down_context":[{"change":4,"pos":53810}],"flag":"BLOCK","start":8922,"end":8954,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":53776},"to":{"change":4,"start":53776,"end":53810},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Hunk::Replacement {"}],"del_contents":[{"Del":" Record::Replacement {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":454,"ins":{"up_context":[{"change":4,"pos":54376}],"down_context":[{"change":4,"pos":54434}],"flag":"BLOCK","start":8955,"end":9011,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":54376},"to":{"change":4,"start":54376,"end":54434},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Hunk::SolveNameConflict { name, path } => {"}],"del_contents":[{"Del":" Record::SolveNameConflict { name, path } => {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":462,"ins":{"up_context":[{"change":4,"pos":54753}],"down_context":[{"change":4,"pos":54813}],"flag":"BLOCK","start":9012,"end":9070,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":54753},"to":{"change":4,"start":54753,"end":54813},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Hunk::UnsolveNameConflict { name, path } => {"}],"del_contents":[{"Del":" Record::UnsolveNameConflict { name, path } => {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":470,"ins":{"up_context":[{"change":4,"pos":55135}],"down_context":[{"change":3,"pos":382}],"flag":"BLOCK","start":9071,"end":9131,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":55135},"to":{"change":4,"start":55135,"end":55197},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Hunk::SolveOrderConflict { change, local } => {"}],"del_contents":[{"Del":" Record::SolveOrderConflict { change, local } => {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":482,"ins":{"up_context":[{"change":4,"pos":55614}],"down_context":[{"change":3,"pos":431}],"flag":"BLOCK","start":9132,"end":9194,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":55614},"to":{"change":4,"start":55614,"end":55678},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Hunk::UnsolveOrderConflict { change, local } => {"}],"del_contents":[{"Del":" Record::UnsolveOrderConflict { change, local } => {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":494,"ins":{"up_context":[{"change":4,"pos":56098}],"down_context":[{"change":3,"pos":482}],"flag":"BLOCK","start":9195,"end":9253,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":56098},"to":{"change":4,"start":56098,"end":56158},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Hunk::ResurrectZombies { change, local } => {"}],"del_contents":[{"Del":" Record::ResurrectZombies { change, local } => {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":511,"ins":{"up_context":[{"change":4,"pos":56603}],"down_context":[{"change":4,"pos":56638}],"flag":"BLOCK","start":9254,"end":9287,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":56603},"to":{"change":4,"start":56603,"end":56638},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":"impl Hunk, Local> {"}],"del_contents":[{"Del":"impl Record, Local> {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":598,"ins":{"up_context":[{"change":4,"pos":60645}],"down_context":[{"change":4,"pos":60684}],"flag":"BLOCK","start":9288,"end":9325,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":60645},"to":{"change":4,"start":60645,"end":60684},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Some(Hunk::FileAdd {"}],"del_contents":[{"Del":" Some(Record::FileAdd {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":615,"ins":{"up_context":[{"change":4,"pos":61196}],"down_context":[{"change":4,"pos":61232}],"flag":"BLOCK","start":9326,"end":9360,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":61196},"to":{"change":4,"start":61196,"end":61232},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Some(Hunk::Edit {"}],"del_contents":[{"Del":" Some(Record::Edit {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":632,"ins":{"up_context":[{"change":4,"pos":61783}],"down_context":[{"change":4,"pos":61826}],"flag":"BLOCK","start":9361,"end":9402,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":61783},"to":{"change":4,"start":61783,"end":61826},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Some(Hunk::Replacement {"}],"del_contents":[{"Del":" Some(Record::Replacement {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":649,"ins":{"up_context":[{"change":4,"pos":62442}],"down_context":[{"change":4,"pos":62481}],"flag":"BLOCK","start":9403,"end":9440,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":62442},"to":{"change":4,"start":62442,"end":62481},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Some(Hunk::FileDel {"}],"del_contents":[{"Del":" Some(Record::FileDel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":663,"ins":{"up_context":[{"change":4,"pos":62958}],"down_context":[{"change":4,"pos":62999}],"flag":"BLOCK","start":9441,"end":9480,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":62958},"to":{"change":4,"start":62958,"end":62999},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Some(Hunk::FileUndel {"}],"del_contents":[{"Del":" Some(Record::FileUndel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":679,"ins":{"up_context":[{"change":4,"pos":63557}],"down_context":[{"change":4,"pos":63610}],"flag":"BLOCK","start":9481,"end":9532,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":63557},"to":{"change":4,"start":63557,"end":63610},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Some(Hunk::SolveNameConflict {"}],"del_contents":[{"Del":" Some(Record::SolveNameConflict {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":684,"ins":{"up_context":[{"change":4,"pos":63759}],"down_context":[{"change":4,"pos":63814}],"flag":"BLOCK","start":9533,"end":9586,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":63759},"to":{"change":4,"start":63759,"end":63814},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Some(Hunk::UnsolveNameConflict {"}],"del_contents":[{"Del":" Some(Record::UnsolveNameConflict {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":713,"ins":{"up_context":[{"change":4,"pos":64934}],"down_context":[{"change":4,"pos":64974}],"flag":"BLOCK","start":9587,"end":9625,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":64934},"to":{"change":4,"start":64934,"end":64974},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Some(Hunk::FileMove {"}],"del_contents":[{"Del":" Some(Record::FileMove {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":729,"ins":{"up_context":[{"change":4,"pos":65528}],"down_context":[{"change":4,"pos":65568}],"flag":"BLOCK","start":9626,"end":9664,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":65528},"to":{"change":4,"start":65528,"end":65568},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Some(Hunk::FileMove {"}],"del_contents":[{"Del":" Some(Record::FileMove {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":745,"ins":{"up_context":[{"change":4,"pos":600}],"down_context":[{"change":4,"pos":66160}],"flag":"BLOCK","start":9665,"end":9712,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":600},"to":{"change":4,"start":66111,"end":66160},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":66111},"to":{"change":4,"start":66111,"end":66160},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Hunk::SolveOrderConflict {"}],"del_contents":[{"Del":" Record::SolveOrderConflict {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":755,"ins":{"up_context":[{"change":4,"pos":661}],"down_context":[{"change":4,"pos":66599}],"flag":"BLOCK","start":9713,"end":9762,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":661},"to":{"change":4,"start":66548,"end":66599},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":66548},"to":{"change":4,"start":66548,"end":66599},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Hunk::UnsolveOrderConflict {"}],"del_contents":[{"Del":" Record::UnsolveOrderConflict {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":772,"ins":{"up_context":[{"change":4,"pos":67212}],"down_context":[{"change":4,"pos":67260}],"flag":"BLOCK","start":9763,"end":9809,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":67212},"to":{"change":4,"start":67212,"end":67260},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Some(Hunk::ResurrectZombies {"}],"del_contents":[{"Del":" Some(Record::ResurrectZombies {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":782,"ins":{"up_context":[{"change":4,"pos":67610}],"down_context":[{"change":4,"pos":67649}],"flag":"BLOCK","start":9810,"end":9847,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":67610},"to":{"change":4,"start":67610,"end":67649},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Some(Hunk::FileAdd {"}],"del_contents":[{"Del":" Some(Record::FileAdd {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":830,"ins":{"up_context":[{"change":4,"pos":69999}],"down_context":[{"change":4,"pos":70038}],"flag":"BLOCK","start":9848,"end":9885,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":69999},"to":{"change":4,"start":69999,"end":70038},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Some(Hunk::FileDel {"}],"del_contents":[{"Del":" Some(Record::FileDel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":852,"ins":{"up_context":[{"change":4,"pos":70904}],"down_context":[{"change":4,"pos":70945}],"flag":"BLOCK","start":9886,"end":9925,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":70904},"to":{"change":4,"start":70904,"end":70945},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Some(Hunk::FileUndel {"}],"del_contents":[{"Del":" Some(Record::FileUndel {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":874,"ins":{"up_context":[{"change":4,"pos":71815}],"down_context":[{"change":4,"pos":71855}],"flag":"BLOCK","start":9926,"end":9964,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":71815},"to":{"change":4,"start":71815,"end":71855},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Some(Hunk::FileMove {"}],"del_contents":[{"Del":" Some(Record::FileMove {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":906,"ins":{"up_context":[{"change":4,"pos":73304}],"down_context":[{"change":4,"pos":73367}],"flag":"BLOCK","start":9965,"end":10026,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":73304},"to":{"change":4,"start":73304,"end":73367},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Some(Hunk::Edit { ref mut change, .. }) => {"}],"del_contents":[{"Del":" Some(Record::Edit { ref mut change, .. }) => {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":941,"ins":{"up_context":[{"change":4,"pos":75063}],"down_context":[{"change":4,"pos":75106}],"flag":"BLOCK","start":10027,"end":10068,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":75063},"to":{"change":4,"start":75063,"end":75106},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Some(Hunk::Replacement {"}],"del_contents":[{"Del":" Some(Record::Replacement {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":978,"ins":{"up_context":[{"change":4,"pos":76884}],"down_context":[{"change":4,"pos":1103}],"flag":"BLOCK","start":10069,"end":10212,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":76884},"to":{"change":4,"start":76884,"end":77031},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Some(Hunk::SolveNameConflict { ref mut name, .. })"},{"Add":" | Some(Hunk::UnsolveNameConflict { ref mut name, .. }) => {"}],"del_contents":[{"Del":" Some(Record::SolveNameConflict { ref mut name, .. })\n | Some(Record::UnsolveNameConflict { ref mut name, .. }) => {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":988,"ins":{"up_context":[{"change":4,"pos":77334}],"down_context":[{"change":4,"pos":77411}],"flag":"BLOCK","start":10213,"end":10288,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":77334},"to":{"change":4,"start":77334,"end":77411},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Some(Hunk::SolveOrderConflict { ref mut change, .. }) => {"}],"del_contents":[{"Del":" Some(Record::SolveOrderConflict { ref mut change, .. }) => {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1016,"ins":{"up_context":[{"change":4,"pos":79025}],"down_context":[{"change":4,"pos":1172}],"flag":"BLOCK","start":10289,"end":10366,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":79025},"to":{"change":4,"start":79025,"end":79104},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Some(Hunk::UnsolveOrderConflict { ref mut change, .. }) => {"}],"del_contents":[{"Del":" Some(Record::UnsolveOrderConflict { ref mut change, .. }) => {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1024,"ins":{"up_context":[{"change":4,"pos":79387}],"down_context":[{"change":4,"pos":1241}],"flag":"BLOCK","start":10367,"end":10440,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":79387},"to":{"change":4,"start":79387,"end":79462},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Some(Hunk::ResurrectZombies { ref mut change, .. }) => {"}],"del_contents":[{"Del":" Some(Record::ResurrectZombies { ref mut change, .. }) => {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1072,"ins":{"up_context":[{"change":4,"pos":80828}],"down_context":[{"change":4,"pos":80907}],"flag":"BLOCK","start":10441,"end":10518,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":80828},"to":{"change":4,"start":80828,"end":80907},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":"pub fn has_newvertices(current: &Option, L>>) -> bool {"}],"del_contents":[{"Del":"pub fn has_newvertices(current: &Option, L>>) -> bool {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1074,"ins":{"up_context":[{"change":4,"pos":80927}],"down_context":[{"change":4,"pos":80997}],"flag":"BLOCK","start":10519,"end":10587,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":80927},"to":{"change":4,"start":80927,"end":80997},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" Some(Hunk::FileAdd { contents: None, .. }) | None => false,"}],"del_contents":[{"Del":" Some(Record::FileAdd { contents: None, .. }) | None => false,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":1376,"ins":{"up_context":[{"change":4,"pos":89960}],"down_context":[{"change":4,"pos":90065}],"flag":"BLOCK","start":10588,"end":10689,"inode":{"change":4,"pos":37976}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":89960},"to":{"change":4,"start":89960,"end":90065},"introduced_by":4}],"inode":{"change":4,"pos":37976}},"ins_contents":[{"Add":" changes: Vec, Local>>,"},{"Add":" current: Option, Local>>,"}],"del_contents":[{"Del":" changes: Vec, Local>>,\n current: Option, Local>>,\n"}]}}],"owner":"irevoire","repo":"pijul","token":"vMVYLdsAHwLL3deSyVPnRPGTtYpAiiFK7oHGC0p5fZ4=","login":null}

…

Dependencies

Change contents