{"header":{"message":"Refactoring apply","description":null,"timestamp":"2020-12-25T12:14:00.238217444Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","authors":[],"deps":{"hashes":[["6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","Refactoring apply"],["AA",null],["BD5PC25AB5MKVIYDFSDGRZ4YGX4PKW4SMZ3YAYAPNA5HLDVJUR3QC","Deleting conflict resolution vertices when the sides are deleted"],["ATZ3BWSEFJBLVGDUZFESRNHVCIO6ZRZ3ALPANZSVGVO7A5BUAFQQC","Fixing the double-deletion of repairs for folder edges"],["CFNFIUJVWV2PHHZKAPBY6GLW4TCX2N66DYH2QCFU5X7D7KE5D4AQC","Parsing the correct flags for new vertices"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["HMMMKONLCRAXVT7SO2ITTFDOJIQKKVSRIZPXYVPDC34RCBHWMHVAC","Fixing alive vertices"],["7FFFKQZU3TFXWL45TILYNX5A7AC7HBK526SD5DZGYCELN76YE7TAC","add 'Default' implementations"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["KDF6FJRVF72L274BEUJCTUKRFMNL6BDZMTVKDPEYGFX4TC3YOVSQC","bigger clippy refactors"],["KQTD46KVVWMJ3W6O55BEJLCVTNTDLUH6QT46AEFT7OU2SELXG4IAC","Unrecord: restore files *after* having unapplied the *entire* change"],["WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","address clippy lints"],["BAUL3WR2ACY2HCJIM7K6HJOJ3UXDJISGLMDCSPH3WMPGJPL5AR4QC","Format, versions, README"],["7A2TSC4PAKK3WOH3DMAJASCEC6D5JLJWNFWJTEEBE4CVS4K76PPQC","Conflict solving code (FOLDER edges)"],["L5PHFTIERPDAFIOSHZSMAN2CUSFM626ISMGTDYRN5KWPLXCOVPXAC","Minor simplification"],["BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","Fixing --features git"],["43AJ37IXON6PMMYRZM6OB2MJXPYCNIWW2XBDVNBXIRH5DD7JDTVQC","Getting rid of edge validation, which does not work for zombie conflicts"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["ZXTHL45OYLOICXTXXEQ6AMNSLMQFZ6BFUJWMO6LZOSDK7ERROC5AC","address clippy lints"]],"deps":["BD5PC25AB5MKVIYDFSDGRZ4YGX4PKW4SMZ3YAYAPNA5HLDVJUR3QC","ATZ3BWSEFJBLVGDUZFESRNHVCIO6ZRZ3ALPANZSVGVO7A5BUAFQQC","CFNFIUJVWV2PHHZKAPBY6GLW4TCX2N66DYH2QCFU5X7D7KE5D4AQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","BAUL3WR2ACY2HCJIM7K6HJOJ3UXDJISGLMDCSPH3WMPGJPL5AR4QC","L5PHFTIERPDAFIOSHZSMAN2CUSFM626ISMGTDYRN5KWPLXCOVPXAC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","43AJ37IXON6PMMYRZM6OB2MJXPYCNIWW2XBDVNBXIRH5DD7JDTVQC","BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","KDF6FJRVF72L274BEUJCTUKRFMNL6BDZMTVKDPEYGFX4TC3YOVSQC","ZXTHL45OYLOICXTXXEQ6AMNSLMQFZ6BFUJWMO6LZOSDK7ERROC5AC","WZVCLZKY34KQBQU6YBGJLQCDADBQ67LQVDNRVCMQVY3O3C3EIWSQC","7A2TSC4PAKK3WOH3DMAJASCEC6D5JLJWNFWJTEEBE4CVS4K76PPQC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","KQTD46KVVWMJ3W6O55BEJLCVTNTDLUH6QT46AEFT7OU2SELXG4IAC","HMMMKONLCRAXVT7SO2ITTFDOJIQKKVSRIZPXYVPDC34RCBHWMHVAC","7FFFKQZU3TFXWL45TILYNX5A7AC7HBK526SD5DZGYCELN76YE7TAC"]},"hunks":[{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":124,"ins":{"up_context":[{"change":5,"pos":234263}],"down_context":[{"change":5,"pos":234298}],"flag":"","start":0,"end":39,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":234263},"to":{"change":5,"start":234263,"end":234298},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":" let mut ws = Workspace::default();"}],"del_contents":[{"Del":" let mut ws = Workspace::new();\n"}]}},{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":143,"ins":{"up_context":[{"change":5,"pos":234990}],"down_context":[{"change":5,"pos":235104}],"flag":"","start":40,"end":114,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":234990},"to":{"change":5,"start":9732,"end":9795},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":" repair_newvertex_contexts::(txn, channel, &mut ws, change_id)?;"}],"del_contents":[{"Del":" repair_newvertex_contexts::(txn, channel, &mut ws)?;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":146,"ins":{"up_context":[{"change":5,"pos":2017}],"down_context":[{"change":5,"pos":2074}],"flag":"","start":115,"end":189,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":2017},"to":{"change":5,"start":9796,"end":9861},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":" remove_zombies::<_, C>(txn, channel, &mut ws, change_id, n)?;"}],"del_contents":[{"Del":" remove_zombies::(txn, channel, change_id, n)?;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":178,"ins":{"up_context":[{"change":5,"pos":1137}],"down_context":[{"change":5,"pos":235674}],"flag":"","start":190,"end":347,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":2289},"to":{"change":5,"start":235597,"end":235674},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1137},"to":{"change":5,"start":235597,"end":235674},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":235597},"to":{"change":5,"start":235597,"end":235674},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":" crate::apply::clean_obsolete_pseudo_edges(txn, channel, &mut ws.apply, change_id)?;"},{"Add":" crate::apply::repair_cyclic_paths(txn, channel, &mut ws.apply)?;"}],"del_contents":[{"Del":" crate::apply::clean_obsolete_pseudo_edges(txn, channel, &mut ws.apply)?;\n"}]}},{"Edit":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":184,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":235774}],"down_context":[{"change":5,"pos":235774}],"flag":"","start":348,"end":367,"inode":{"change":5,"pos":231493}}},"contents":[{"Add":"#[derive(Default)]"}]}},{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":187,"ins":{"up_context":[{"change":5,"pos":235852}],"down_context":[{"change":5,"pos":235921}],"flag":"","start":368,"end":469,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":235852},"to":{"change":5,"start":235852,"end":235921},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":" down: HashMap, Position>>,"},{"Add":" parents: HashSet>,"}],"del_contents":[{"Del":" down: HashMap, (Position>, bool)>,\n"}]}},{"Edit":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":191,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":235977}],"down_context":[{"change":5,"pos":235977}],"flag":"","start":470,"end":550,"inode":{"change":5,"pos":231493}}},"contents":[{"Add":" stack: Vec>,"},{"Add":" del_edges: Vec<(Vertex, Edge)>,"}]}},{"Edit":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":195,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":235980},"to":{"change":5,"start":235980,"end":236205},"introduced_by":5}],"inode":{"change":5,"pos":231493}}},"contents":[{"Del":"impl Workspace {\n fn new() -> Self {\n Workspace {\n up: HashMap::new(),\n down: HashMap::new(),\n del: Vec::new(),\n apply: crate::apply::Workspace::new(),\n }\n }\n}\n\n"}]}},{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":207,"ins":{"up_context":[{"change":5,"pos":236556}],"down_context":[{"change":5,"pos":237184}],"flag":"","start":551,"end":610,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":236556},"to":{"change":5,"start":236556,"end":236629},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":236629},"to":{"change":5,"start":7507,"end":7575},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":7575},"to":{"change":5,"start":236696,"end":237011},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":236696},"to":{"change":5,"start":236696,"end":237011},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":237011},"to":{"change":5,"start":7576,"end":7645},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":7645},"to":{"change":5,"start":237079,"end":237184},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":237079},"to":{"change":5,"start":237079,"end":237184},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":" while let Ok(vertex) = find_block(txn, channel, pos) {"}],"del_contents":[{"Del":" while pos.pos <= new_vertex.end {\n debug!(\"pos = {:?}\", pos);\n"},{"Del":" let vertex = if let Ok(v) = find_block(txn, channel, pos) {\n"},{"Del":" v\n } else {\n // This means that the only edges to this block were\n // removed from the graph, which can only happen if this\n // block is the bottommost vertex in the graph.\n if cfg!(debug_assertions) {\n while pos.pos <= new_vertex.end {\n"},{"Del":" assert!(find_block(txn, channel, pos).is_err());\n"},{"Del":" pos.pos = pos.pos + 1;\n }\n }\n break;\n };\n"}]}},{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":209,"ins":{"up_context":[{"change":5,"pos":237225}],"down_context":[{"change":5,"pos":237317}],"flag":"","start":611,"end":665,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":237225},"to":{"change":5,"start":7646,"end":7739},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":" for e in iter_adj_all(txn, channel, vertex) {"}],"del_contents":[{"Del":" for e in iter_adjacent(txn, channel, vertex, EdgeFlags::empty(), EdgeFlags::all()) {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":211,"ins":{"up_context":[{"change":5,"pos":237352}],"down_context":[{"change":5,"pos":7740}],"flag":"","start":666,"end":789,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":237352},"to":{"change":5,"start":237352,"end":237523},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":" if !e.flag.is_deleted() {"},{"Add":" if e.flag.is_parent() {"},{"Add":" if !e.flag.is_folder() {"}],"del_contents":[{"Del":" if !e.flag.contains(EdgeFlags::DELETED) {\n if e.flag.contains(EdgeFlags::PARENT) {\n if !e.flag.contains(EdgeFlags::FOLDER) {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":219,"ins":{"up_context":[{"change":5,"pos":7883}],"down_context":[{"change":5,"pos":237943}],"flag":"","start":790,"end":989,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":7883},"to":{"change":5,"start":237772,"end":237943},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":237772},"to":{"change":5,"start":237772,"end":237943},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":" ws.down.insert(down_v, new_vertex.inode);"},{"Add":" if e.flag.is_folder() {"},{"Add":" ws.apply.missing_context.files.insert(down_v);"},{"Add":" }"}],"del_contents":[{"Del":" ws.down.insert(\n down_v,\n (new_vertex.inode, e.flag.contains(EdgeFlags::FOLDER)),\n );\n"}]}},{"Edit":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":230,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":238115}],"down_context":[{"change":5,"pos":238115}],"flag":"","start":990,"end":1148,"inode":{"change":5,"pos":231493}}},"contents":[{"Add":" ws.perform_del::(txn, channel, vertex)?;"},{"Add":" if vertex.end < new_vertex.end {"},{"Add":" pos.pos = vertex.end"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":238,"ins":{"up_context":[{"change":5,"pos":238116}],"down_context":[{"change":5,"pos":7884}],"flag":"","start":1149,"end":1466,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":238116},"to":{"change":5,"start":238116,"end":238184},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":238184},"to":{"change":5,"start":238184,"end":238249},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":"impl Workspace {"},{"Add":" fn perform_del("},{"Add":" &mut self,"},{"Add":" txn: &mut T,"},{"Add":" channel: &mut Channel,"},{"Add":" vertex: Vertex,"},{"Add":" ) -> Result<(), UnrecordError> {"},{"Add":" for e in self.del.drain(..) {"},{"Add":" let (a, b) = if e.flag.is_parent() {"}],"del_contents":[{"Del":" // Delete all in `del`.\n for e in ws.del.drain(..) {\n"},{"Del":" let (a, b) = if e.flag.contains(EdgeFlags::PARENT) {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":261,"ins":{"up_context":[{"change":5,"pos":238514}],"down_context":[{"change":5,"pos":238914}],"flag":"","start":1467,"end":1482,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":238514},"to":{"change":5,"start":238514,"end":238598},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":" Ok(())"}],"del_contents":[{"Del":"\n // Move on to the next split of ~new_vertex~.\n pos.pos = vertex.end\n"}]}},{"Edit":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":263,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":238920},"to":{"change":5,"start":238920,"end":238931},"introduced_by":5}],"inode":{"change":5,"pos":231493}}},"contents":[{"Del":" Ok(())\n"}]}},{"Edit":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":269,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":239047}],"down_context":[{"change":5,"pos":10184}],"flag":"","start":1483,"end":1508,"inode":{"change":5,"pos":231493}}},"contents":[{"Add":" change_id: ChangeId,"}]}},{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":286,"ins":{"up_context":[{"change":5,"pos":239484}],"down_context":[{"change":5,"pos":8261}],"flag":"","start":1509,"end":1552,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":239484},"to":{"change":5,"start":239484,"end":239522},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":239522},"to":{"change":5,"start":239522,"end":239578},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":" for (down, inode) in ws.down.drain() {"}],"del_contents":[{"Del":" let mut parents = HashSet::new();\n"},{"Del":" for (down, (inode, is_folder)) in ws.down.drain() {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":296,"ins":{"up_context":[{"change":5,"pos":8434}],"down_context":[{"change":5,"pos":239908}],"flag":"","start":1553,"end":1596,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":8434},"to":{"change":5,"start":239868,"end":239908},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":239868},"to":{"change":5,"start":239868,"end":239908},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":" ws.parents.insert(parent);"}],"del_contents":[{"Del":" parents.insert(parent);\n"}]}},{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":299,"ins":{"up_context":[{"change":5,"pos":239932}],"down_context":[{"change":5,"pos":240010}],"flag":"","start":1597,"end":1681,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":239932},"to":{"change":5,"start":239932,"end":240010},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":" debug!(\"parents {:#?}\", ws.parents);"},{"Add":" for up in ws.parents.drain() {"}],"del_contents":[{"Del":" debug!(\"parents {:#?}\", parents);\n for up in parents.drain() {\n"}]}},{"Edit":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":305,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":240166}],"down_context":[{"change":5,"pos":240166}],"flag":"","start":1682,"end":1709,"inode":{"change":5,"pos":231493}}},"contents":[{"Add":" change_id,"}]}},{"Edit":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":309,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":240234},"to":{"change":5,"start":240234,"end":240261},"introduced_by":5}],"inode":{"change":5,"pos":231493}}},"contents":[{"Del":" is_folder,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":326,"ins":{"up_context":[{"change":5,"pos":240797}],"down_context":[{"change":5,"pos":240940}],"flag":"","start":1710,"end":1786,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":240797},"to":{"change":5,"start":240797,"end":240867},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":240867},"to":{"change":5,"start":8435,"end":8509},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":" let intro = internal(txn, &edge.introduced_by, change_id).unwrap();"}],"del_contents":[{"Del":" // This is ok: since this change is applied, this can't fail.\n"},{"Del":" let int = internal(txn, &edge.introduced_by, change_id).unwrap();\n"}]}},{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":331,"ins":{"up_context":[{"change":5,"pos":241053}],"down_context":[{"change":5,"pos":241070}],"flag":"","start":1787,"end":1806,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":241053},"to":{"change":5,"start":241053,"end":241070},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":" intro,"}],"del_contents":[{"Del":" int,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":333,"ins":{"up_context":[{"change":5,"pos":241098}],"down_context":[{"change":5,"pos":241314}],"flag":"","start":1807,"end":1845,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":241098},"to":{"change":5,"start":241098,"end":241314},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":" &edge.reverse(Some(ext)),"}],"del_contents":[{"Del":" &NewEdge {\n previous: edge.flag,\n flag: edge.previous,\n from: edge.from,\n to: edge.to,\n introduced_by: Some(ext),\n },\n"}]}},{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":335,"ins":{"up_context":[{"change":5,"pos":241349}],"down_context":[{"change":5,"pos":241604}],"flag":"","start":1846,"end":1931,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":241349},"to":{"change":5,"start":241349,"end":241586},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":241586},"to":{"change":5,"start":241586,"end":241604},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":" must_reintroduce(txn, channel, changes, a, b, ext, intro, change_id)"}],"del_contents":[{"Del":" must_reintroduce(\n txn,\n channel,\n changes,\n a,\n b,\n edge.introduced_by.unwrap(),\n int,\n"},{"Del":" )\n"}]}},{"Edit":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":350,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":242168}],"down_context":[{"change":5,"pos":10378}],"flag":"","start":1932,"end":1958,"inode":{"change":5,"pos":231493}}},"contents":[{"Add":" current_id: ChangeId,"}]}},{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":360,"ins":{"up_context":[{"change":5,"pos":242478}],"down_context":[{"change":5,"pos":8706}],"flag":"","start":1959,"end":2185,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":242478},"to":{"change":5,"start":8510,"end":8605},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":8605},"to":{"change":5,"start":8605,"end":8706},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":" for e in iter_adj_all(txn, channel, a).filter(|e| {"},{"Add":" !e.flag.contains(EdgeFlags::PARENT)"},{"Add":" && e.dest == b.start_pos()"},{"Add":" && !e.introduced_by.is_root()"},{"Add":" && e.introduced_by != current_id"}],"del_contents":[{"Del":" for e in iter_adjacent(txn, channel, a, EdgeFlags::empty(), EdgeFlags::all()).filter(|e| {\n"},{"Del":" !e.flag.contains(EdgeFlags::PARENT) && e.dest == b.start_pos() && !e.introduced_by.is_root()\n"}]}},{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":366,"ins":{"up_context":[{"change":5,"pos":8715}],"down_context":[{"change":5,"pos":243116}],"flag":"","start":2186,"end":2507,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":8715},"to":{"change":5,"start":242744,"end":243116},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":242744},"to":{"change":5,"start":242744,"end":243116},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":" // Optimisation to avoid opening change files in the vast"},{"Add":" // majority of cases: if there is an edge `e` parallel to a ->"},{"Add":" // b introduced by the change that introduced a or b, don't"},{"Add":" // reinsert a -> b: that edge was removed by `e`."},{"Add":" if a.change == intro_id || b.change == intro_id {"}],"del_contents":[{"Del":" // Optimisation to avoid opening change files\n // in the vast majority of cases: if there is\n // an edge `e` parallel to a -> b introduced\n // by the change that introduced a or b, don't\n // reinsert a -> b: that edge was removed by\n // `e`.\n if !cfg!(debug_assertions) && (a.change == intro_id || b.change == intro_id) {\n"}]}},{"Edit":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":406,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":244016}],"down_context":[{"change":5,"pos":244016}],"flag":"","start":2508,"end":2532,"inode":{"change":5,"pos":231493}}},"contents":[{"Add":" ws: &mut Workspace,"}]}},{"Edit":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":410,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":10634},"to":{"change":5,"start":244112,"end":244208},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":244112},"to":{"change":5,"start":244112,"end":244208},"introduced_by":5}],"inode":{"change":5,"pos":231493}}},"contents":[{"Del":" let mut del = Vec::new();\n let mut stack = vec![];\n let mut visited = HashSet::new();\n"}]}},{"Edit":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":412,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":244307},"to":{"change":5,"start":244307,"end":244357},"introduced_by":5}],"inode":{"change":5,"pos":231493}}},"contents":[{"Del":" // Remove zombies caused by this EdgeMap.\n"}]}},{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":413,"ins":{"up_context":[{"change":5,"pos":8786}],"down_context":[{"change":5,"pos":245689}],"flag":"","start":2533,"end":2699,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":8786},"to":{"change":5,"start":8786,"end":8837},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":8837},"to":{"change":5,"start":244476,"end":244670},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":244476},"to":{"change":5,"start":244476,"end":244670},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":244670},"to":{"change":5,"start":8838,"end":8930},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":8930},"to":{"change":5,"start":244761,"end":244800},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":244761},"to":{"change":5,"start":244761,"end":244800},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":244800},"to":{"change":5,"start":244800,"end":244866},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":244866},"to":{"change":5,"start":244866,"end":245084},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":245084},"to":{"change":5,"start":245084,"end":245085},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":245085},"to":{"change":5,"start":2568,"end":2629},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":2629},"to":{"change":5,"start":2629,"end":2659},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2659},"to":{"change":5,"start":245224,"end":245298},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":245224},"to":{"change":5,"start":245224,"end":245298},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":245298},"to":{"change":5,"start":8931,"end":9001},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":9001},"to":{"change":5,"start":245367,"end":245392},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":245367},"to":{"change":5,"start":245367,"end":245392},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":245392},"to":{"change":5,"start":9002,"end":9068},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":9068},"to":{"change":5,"start":245457,"end":245604},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":245457},"to":{"change":5,"start":245457,"end":245604},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":245604},"to":{"change":5,"start":245604,"end":245689},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":" collect_zombies(txn, channel, change_id, to, ws)?;"},{"Add":" debug!(\"remove_zombies = {:#?}\", ws.del_edges);"},{"Add":" for (v, mut e) in ws.del_edges.drain(..) {"}],"del_contents":[{"Del":" stack.push(find_block(txn, channel, to)?);\n"},{"Del":" visited.clear();\n while let Some(v) = stack.pop() {\n debug!(\"remove_zombies, v = {:?}\", v);\n if !visited.insert(v) {\n continue;\n }\n"},{"Del":" for e in iter_adjacent(txn, channel, v, EdgeFlags::empty(), EdgeFlags::all()) {\n"},{"Del":" debug!(\"e = {:?}\", e);\n"},{"Del":" // If the edge is a parent-non-block edge, go up.\n"},{"Del":" let mut follow =\n e.flag.contains(EdgeFlags::DELETED) && e.introduced_by != change_id;\n follow |= e.flag & (EdgeFlags::BLOCK | EdgeFlags::PARENT) == EdgeFlags::PARENT;\n"},{"Del":"\n"},{"Del":" if !follow && e.introduced_by != change_id {\n"},{"Del":" continue;\n"},{"Del":" }\n if e.flag.contains(EdgeFlags::PARENT) {\n"},{"Del":" stack.push(find_block_end(txn, channel, e.dest)?)\n"},{"Del":" } else {\n"},{"Del":" stack.push(find_block(txn, channel, e.dest)?)\n"},{"Del":" }\n if e.introduced_by == change_id {\n del.push((v, e))\n }\n }\n }\n"},{"Del":" debug!(\"remove_zombies = {:#?}\", del);\n for (v, e) in del.drain(..) {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":418,"ins":{"up_context":[{"change":5,"pos":9132}],"down_context":[{"change":5,"pos":246602}],"flag":"","start":2700,"end":2876,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":9132},"to":{"change":5,"start":9132,"end":9353},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":9353},"to":{"change":5,"start":10635,"end":10700},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":10700},"to":{"change":5,"start":9373,"end":9621},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":9373},"to":{"change":5,"start":9373,"end":9621},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":9621},"to":{"change":5,"start":2660,"end":2711},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2711},"to":{"change":5,"start":9698,"end":9725},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":9698},"to":{"change":5,"start":9698,"end":9725},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":9725},"to":{"change":5,"start":246288,"end":246511},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":246288},"to":{"change":5,"start":246288,"end":246511},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":246511},"to":{"change":5,"start":10701,"end":10828},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":9800},"to":{"change":5,"start":246584,"end":246602},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":10828},"to":{"change":5,"start":246584,"end":246602},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":246584},"to":{"change":5,"start":246584,"end":246602},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":" e.flag -= EdgeFlags::PARENT;"},{"Add":" del_graph_with_rev(txn, channel, e.flag, u, v, e.introduced_by)"},{"Add":" .map_err(UnrecordError::Txn)?;"}],"del_contents":[{"Del":" del_graph_with_rev(\n txn,\n channel,\n e.flag - EdgeFlags::PARENT,\n u,\n v,\n e.introduced_by,\n"},{"Del":" )\n .map_err(UnrecordError::Txn)?;\n"},{"Del":" if iter_adjacent(\n txn,\n channel,\n u,\n EdgeFlags::empty(),\n EdgeFlags::all() - EdgeFlags::DELETED - EdgeFlags::PARENT,\n )\n"},{"Del":" .find(|e| e.dest == v.start_pos())\n"},{"Del":" .is_none()\n"},{"Del":" {\n let f = if e.flag.contains(EdgeFlags::FOLDER) {\n EdgeFlags::FOLDER\n } else {\n EdgeFlags::empty()\n };\n"},{"Del":" put_graph_with_rev(txn, channel, f, u, v, u.change)\n .map_err(UnrecordError::Txn)?;\n"},{"Del":" }\n"}]}},{"Edit":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":431,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":246806}],"down_context":[{"change":5,"pos":246861}],"flag":"","start":2877,"end":3886,"inode":{"change":5,"pos":231493}}},"contents":[{"Add":"fn collect_zombies("},{"Add":" txn: &mut T,"},{"Add":" channel: &mut Channel,"},{"Add":" change_id: ChangeId,"},{"Add":" to: Position,"},{"Add":" ws: &mut Workspace,"},{"Add":") -> Result<(), BlockError> {"},{"Add":" ws.stack.push(find_block(txn, channel, to)?);"},{"Add":" while let Some(v) = ws.stack.pop() {"},{"Add":" debug!(\"remove_zombies, v = {:?}\", v);"},{"Add":" if !ws.parents.insert(v) {"},{"Add":" continue;"},{"Add":" }"},{"Add":" for e in iter_adj_all(txn, channel, v) {"},{"Add":" debug!(\"e = {:?}\", e);"},{"Add":" if !(e.introduced_by == change_id || e.flag & EdgeFlags::bp() == EdgeFlags::PARENT) {"},{"Add":" continue;"},{"Add":" }"},{"Add":" if e.flag.contains(EdgeFlags::PARENT) {"},{"Add":" ws.stack.push(find_block_end(txn, channel, e.dest)?)"},{"Add":" } else {"},{"Add":" ws.stack.push(find_block(txn, channel, e.dest)?)"},{"Add":" }"},{"Add":" if e.introduced_by == change_id {"},{"Add":" ws.del_edges.push((v, e))"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" ws.stack.clear();"},{"Add":" ws.parents.clear();"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""}]}},{"Edit":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":475,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":247259}],"down_context":[{"change":5,"pos":247259}],"flag":"","start":3887,"end":4024,"inode":{"change":5,"pos":231493}}},"contents":[{"Add":" let intro = internal(txn, &e.introduced_by, change_id).unwrap();"},{"Add":" let intro_ext = e.introduced_by.unwrap_or(change_hash);"}]}},{"Edit":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":478,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":247312},"to":{"change":5,"start":247312,"end":247531},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":247531},"to":{"change":5,"start":9943,"end":10020},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":10020},"to":{"change":5,"start":247607,"end":247675},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":247607},"to":{"change":5,"start":247607,"end":247675},"introduced_by":5}],"inode":{"change":5,"pos":231493}}},"contents":[{"Del":" let e = NewEdge {\n previous: e.flag,\n flag: e.previous,\n from: e.from,\n to: e.to,\n introduced_by: Some(change_hash),\n };\n"},{"Del":" let intro = internal(txn, &e.introduced_by, change_id).unwrap();\n"},{"Del":" let intro_ext = e.introduced_by.unwrap_or(change_hash);\n"}]}},{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":485,"ins":{"up_context":[{"change":5,"pos":247885}],"down_context":[{"change":5,"pos":247905}],"flag":"","start":4025,"end":4072,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":247885},"to":{"change":5,"start":247885,"end":247905},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":" &e.reverse(Some(change_hash)),"}],"del_contents":[{"Del":" &e,\n"}]}},{"Edit":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":488,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":247937},"to":{"change":5,"start":10021,"end":10098},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":10098},"to":{"change":5,"start":248013,"end":248081},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":248013},"to":{"change":5,"start":248013,"end":248081},"introduced_by":5}],"inode":{"change":5,"pos":231493}}},"contents":[{"Del":" let intro = internal(txn, &e.introduced_by, change_id).unwrap();\n"},{"Del":" let intro_ext = e.introduced_by.unwrap_or(change_hash);\n"}]}},{"Replacement":{"inode":{"change":5,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":500,"ins":{"up_context":[{"change":5,"pos":248499}],"down_context":[{"change":5,"pos":248739}],"flag":"","start":4073,"end":4120,"inode":{"change":5,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":248499},"to":{"change":5,"start":248499,"end":248739},"introduced_by":5}],"inode":{"change":5,"pos":231493}},"ins_contents":[{"Add":" &e.reverse(Some(change_hash)),"}],"del_contents":[{"Del":" &NewEdge {\n previous: e.flag,\n flag: e.previous,\n from: e.from,\n to: e.to,\n introduced_by: Some(change_hash),\n },\n"}]}},{"Replacement":{"inode":{"change":5,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":120,"ins":{"up_context":[{"change":5,"pos":294504}],"down_context":[{"change":5,"pos":294603}],"flag":"","start":4121,"end":4360,"inode":{"change":5,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":294504},"to":{"change":5,"start":14404,"end":14575},"introduced_by":5}],"inode":{"change":5,"pos":291589}},"ins_contents":[{"Add":" &\"a\\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nx\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\ny\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nz\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\nf\\n\""}],"del_contents":[{"Del":" &\"a\\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nx\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\ny\\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nz\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\nf\\n\"\n"}]}},{"Replacement":{"inode":{"change":5,"pos":291589},"path":"libpijul/src/tests/missing_context.rs","line":127,"ins":{"up_context":[{"change":5,"pos":294725}],"down_context":[{"change":5,"pos":294822}],"flag":"","start":4361,"end":4598,"inode":{"change":5,"pos":291589}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":294725},"to":{"change":5,"start":14576,"end":14745},"introduced_by":5}],"inode":{"change":5,"pos":291589}},"ins_contents":[{"Add":" Ok(&\">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nx\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\ny\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nz\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\n\"[..])"}],"del_contents":[{"Del":" Ok(&\">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nx\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\ny\\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\\nz\\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\\n\"[..])\n"}]}},{"Replacement":{"inode":{"change":5,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":414,"ins":{"up_context":[{"change":5,"pos":17241}],"down_context":[{"change":5,"pos":318478}],"flag":"","start":4599,"end":5070,"inode":{"change":5,"pos":305506}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":17241},"to":{"change":5,"start":318427,"end":318478},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":318427},"to":{"change":5,"start":318427,"end":318478},"introduced_by":5}],"inode":{"change":5,"pos":305506}},"ins_contents":[{"Add":" let mut files_charlie = repo_charlie.list_files();"},{"Add":" files_charlie.sort();"},{"Add":" // Two files with the same name (file), one of which also has another name (file3). This means that we don't know which one of the two names crate::output will pick, between \"file3\" and the conflicting name."},{"Add":" // This depends on which file gets output first."},{"Add":" assert_eq!(files_charlie[0], \"file\");"},{"Add":" assert!(files_charlie[1] == \"file3\" || files_charlie[1].starts_with(\"file.\"));"}],"del_contents":[{"Del":" let files_charlie = repo_charlie.list_files();\n"}]}},{"Edit":{"inode":{"change":5,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":422,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":318528}],"down_context":[{"change":5,"pos":318528}],"flag":"","start":5071,"end":5735,"inode":{"change":5,"pos":305506}}},"contents":[{"Add":" repo_charlie.rename(&files_charlie[1], \"file3\")?;"},{"Add":" txn_charlie.move_file(&files_charlie[1], \"file3\")?;"},{"Add":" let _charlie_solution = record_all("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn_charlie,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" )"},{"Add":" .unwrap();"},{"Add":" debug_to_file(&txn_charlie, &channel_charlie, \"debug_charlie3\")?;"},{"Add":" output::output_repository_no_pending("},{"Add":" &mut repo_charlie,"},{"Add":" &changes,"},{"Add":" &mut txn_charlie,"},{"Add":" &mut channel_charlie,"},{"Add":" \"\","},{"Add":" true,"},{"Add":" )?;"},{"Add":" let mut files_charlie = repo_charlie.list_files();"},{"Add":" files_charlie.sort();"},{"Add":" assert_eq!(files_charlie, &[\"file\", \"file3\"]);"},{"Add":""}]}},{"Replacement":{"inode":{"change":5,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":457,"ins":{"up_context":[{"change":5,"pos":318979}],"down_context":[{"change":5,"pos":319026}],"flag":"","start":5736,"end":5811,"inode":{"change":5,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":318979},"to":{"change":5,"start":318979,"end":319026},"introduced_by":5}],"inode":{"change":5,"pos":305506}},"ins_contents":[{"Add":" let mut files_alice = repo_alice.list_files();"},{"Add":" files_alice.sort();"}],"del_contents":[{"Del":" let files_alice = repo_alice.list_files();\n"}]}},{"Replacement":{"inode":{"change":5,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":471,"ins":{"up_context":[{"change":5,"pos":319354}],"down_context":[{"change":5,"pos":319388}],"flag":"","start":5812,"end":5867,"inode":{"change":5,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":319354},"to":{"change":5,"start":319354,"end":319388},"introduced_by":5}],"inode":{"change":5,"pos":305506}},"ins_contents":[{"Add":" // Bob applies Alice's change and Charlie's change"}],"del_contents":[{"Del":" // Bob applies Alice's change\n"}]}},{"Replacement":{"inode":{"change":5,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1195,"ins":{"up_context":[{"change":5,"pos":342672}],"down_context":[{"change":5,"pos":342721}],"flag":"","start":5868,"end":5945,"inode":{"change":5,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":342672},"to":{"change":5,"start":342672,"end":342721},"introduced_by":5}],"inode":{"change":5,"pos":305506}},"ins_contents":[{"Add":" // Charlie applies Alice's move and deletes (i.e. does the same as Bob)."}],"del_contents":[{"Del":" // Charlie applies Alice's move and deletes.\n"}]}},{"Edit":{"inode":{"change":5,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1225,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":343693}],"down_context":[{"change":5,"pos":343693}],"flag":"","start":5946,"end":5992,"inode":{"change":5,"pos":305506}}},"contents":[{"Add":" debug!(\"Charlie applies Bob's deletion\");"}]}},{"Edit":{"inode":{"change":5,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1228,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":20732}],"down_context":[{"change":5,"pos":343852}],"flag":"","start":5993,"end":6041,"inode":{"change":5,"pos":305506}}},"contents":[{"Add":" debug!(\"Charlie applies Bob's resolution\");"}]}},{"Replacement":{"inode":{"change":5,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1245,"ins":{"up_context":[{"change":5,"pos":344257}],"down_context":[{"change":5,"pos":344572}],"flag":"","start":6042,"end":6181,"inode":{"change":5,"pos":305506}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":344257},"to":{"change":5,"start":344257,"end":344572},"introduced_by":5}],"inode":{"change":5,"pos":305506}},"ins_contents":[{"Add":" assert_eq!(conflicts.len(), 1);"},{"Add":" match conflicts[0] {"},{"Add":" Conflict::ZombieFile { ref path } => assert_eq!(path, \"a/b/c/alice\"),"}],"del_contents":[{"Del":" assert_eq!(conflicts.len(), 2);\n match (&conflicts[0], &conflicts[1]) {\n (Conflict::ZombieFile { ref path }, Conflict::MultipleNames { .. })\n | (Conflict::MultipleNames { .. }, Conflict::ZombieFile { ref path }) => {\n assert!(path == \"a/b/c/alice\" || path == \"a/b/c/file\")\n }\n"}]}},{"Edit":{"inode":{"change":5,"pos":305506},"path":"libpijul/src/tests/file_conflicts.rs","line":1252,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":344643}],"down_context":[{"change":5,"pos":344643}],"flag":"","start":6182,"end":6230,"inode":{"change":5,"pos":305506}}},"contents":[{"Add":" debug!(\"Alice applies Charlie's deletion\");"}]}},{"Replacement":{"inode":{"change":5,"pos":488880},"path":"libpijul/src/record.rs","line":262,"ins":{"up_context":[{"change":5,"pos":497606}],"down_context":[{"change":5,"pos":497652}],"flag":"","start":6231,"end":6275,"inode":{"change":5,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":497606},"to":{"change":5,"start":497606,"end":497652},"introduced_by":5}],"inode":{"change":5,"pos":488880}},"ins_contents":[{"Add":" flag: EdgeFlags::BLOCK,"}],"del_contents":[{"Del":" flag: EdgeFlags::empty(),\n"}]}},{"Edit":{"inode":{"change":5,"pos":488880},"path":"libpijul/src/record.rs","line":572,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":508937}],"down_context":[{"change":5,"pos":508937}],"flag":"","start":6276,"end":6391,"inode":{"change":5,"pos":488880}}},"contents":[{"Add":" if !moved.need_new_name {"},{"Add":" moved.resurrect.extend(moved.edges.drain(..));"},{"Add":" }"}]}},{"Edit":{"inode":{"change":5,"pos":488880},"path":"libpijul/src/record.rs","line":584,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":509246},"to":{"change":5,"start":509246,"end":509247},"introduced_by":5}],"inode":{"change":5,"pos":488880}}},"contents":[{"Del":"\n"}]}},{"Replacement":{"inode":{"change":5,"pos":488880},"path":"libpijul/src/record.rs","line":784,"ins":{"up_context":[{"change":5,"pos":517750}],"down_context":[{"change":5,"pos":517779}],"flag":"","start":6392,"end":6452,"inode":{"change":5,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":517750},"to":{"change":5,"start":517750,"end":517779},"introduced_by":5}],"inode":{"change":5,"pos":488880}},"ins_contents":[{"Add":" if intro.len() > 1 || !moved.resurrect.is_empty() {"}],"del_contents":[{"Del":" if intro.len() > 1 {\n"}]}},{"Edit":{"inode":{"change":5,"pos":525242},"path":"libpijul/src/pristine/vertex.rs","line":34,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":526409},"to":{"change":5,"start":526409,"end":526416},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":526416},"to":{"change":5,"start":0,"end":107},"introduced_by":5}],"inode":{"change":5,"pos":525242}}},"contents":[{"Del":" }\n\n"},{"Del":" /// Is this vertex of zero length?\n pub fn is_empty(&self) -> bool {\n self.end == self.start\n"}]}},{"Edit":{"inode":{"change":5,"pos":525242},"path":"libpijul/src/pristine/vertex.rs","line":66,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":527253}],"down_context":[{"change":5,"pos":527253}],"flag":"","start":6453,"end":6567,"inode":{"change":5,"pos":525242}}},"contents":[{"Add":" /// Is this vertex of zero length?"},{"Add":" pub fn is_empty(&self) -> bool {"},{"Add":" self.end == self.start"},{"Add":" }"},{"Add":""}]}},{"Edit":{"inode":{"change":5,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":63,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":588093}],"down_context":[{"change":5,"pos":588093}],"flag":"","start":6568,"end":6831,"inode":{"change":5,"pos":586748}}},"contents":[{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Channel {"},{"Add":" pub(crate) fn touch(&mut self) {"},{"Add":" use std::time::SystemTime;"},{"Add":" if let Ok(duration) = SystemTime::now().duration_since(SystemTime::UNIX_EPOCH) {"},{"Add":" self.last_modified = duration.as_secs();"},{"Add":" }"}]}},{"Edit":{"inode":{"change":5,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":307,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":607395}],"down_context":[{"change":5,"pos":37846}],"flag":"","start":6832,"end":7136,"inode":{"change":5,"pos":586748}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"pub(crate) fn iter_alive_children<'db, 'txn: 'db, T: TxnT>("},{"Add":" txn: &'txn T,"},{"Add":" channel: &'db Channel,"},{"Add":" key: Vertex,"},{"Add":") -> AdjacentIterator<'txn, T> {"},{"Add":" iter_adjacent("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" key,"},{"Add":" EdgeFlags::empty(),"},{"Add":" EdgeFlags::alive_children(),"},{"Add":" )"}]}},{"Edit":{"inode":{"change":5,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":323,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":607396}],"down_context":[{"change":5,"pos":37849}],"flag":"","start":7137,"end":7690,"inode":{"change":5,"pos":586748}}},"contents":[{"Add":"pub(crate) fn iter_deleted_parents<'db, 'txn: 'db, T: TxnT>("},{"Add":" txn: &'txn T,"},{"Add":" channel: &'db Channel,"},{"Add":" key: Vertex,"},{"Add":") -> AdjacentIterator<'txn, T> {"},{"Add":" iter_adjacent("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" key,"},{"Add":" EdgeFlags::DELETED | EdgeFlags::PARENT,"},{"Add":" EdgeFlags::all(),"},{"Add":" )"},{"Add":"}"},{"Add":""},{"Add":"pub(crate) fn iter_adj_all<'db, 'txn: 'db, T: TxnT>("},{"Add":" txn: &'txn T,"},{"Add":" channel: &'db Channel,"},{"Add":" key: Vertex,"},{"Add":") -> AdjacentIterator<'txn, T> {"},{"Add":" iter_adjacent(txn, channel, key, EdgeFlags::empty(), EdgeFlags::all())"},{"Add":"}"},{"Add":""}]}},{"Replacement":{"inode":{"change":5,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":766,"ins":{"up_context":[{"change":5,"pos":49443}],"down_context":[{"change":2,"pos":507}],"flag":"","start":7691,"end":7741,"inode":{"change":5,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":49443},"to":{"change":5,"start":49443,"end":49532},"introduced_by":5}],"inode":{"change":5,"pos":586748}},"ins_contents":[{"Add":" for e in iter_adj_all(txn, &channel, v) {"}],"del_contents":[{"Del":" for e in iter_adjacent(txn, &channel, v, EdgeFlags::empty(), EdgeFlags::all()) {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1457,"ins":{"up_context":[{"change":5,"pos":1067}],"down_context":[{"change":5,"pos":1275}],"flag":"","start":7742,"end":7816,"inode":{"change":5,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":1067},"to":{"change":5,"start":1067,"end":1275},"introduced_by":5}],"inode":{"change":5,"pos":586748}},"ins_contents":[{"Add":" for e in iter_adj_all(txn, &channel, vertex.inode_vertex()) {"}],"del_contents":[{"Del":" for e in iter_adjacent(\n txn,\n &channel,\n vertex.inode_vertex(),\n EdgeFlags::empty(),\n EdgeFlags::all(),\n ) {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":648958},"path":"libpijul/src/pristine/edge.rs","line":5,"ins":{"up_context":[{"change":5,"pos":649074}],"down_context":[{"change":5,"pos":649577}],"flag":"","start":7817,"end":8426,"inode":{"change":5,"pos":648958}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":649074},"to":{"change":5,"start":649074,"end":649577},"introduced_by":5}],"inode":{"change":5,"pos":648958}},"ins_contents":[{"Add":" /// Possible flags of edges."},{"Add":" #[derive(Serialize, Deserialize)]"},{"Add":" pub struct EdgeFlags: u8 {"},{"Add":" const BLOCK = 1;"},{"Add":" /// A pseudo-edge, computed when applying the change to"},{"Add":" /// restore connectivity, and/or mark conflicts."},{"Add":" const PSEUDO = 4;"},{"Add":" /// An edge encoding file system hierarchy."},{"Add":" const FOLDER = 16;"},{"Add":" /// A \"reverse\" edge (all edges in the graph have a reverse edge)."},{"Add":" const PARENT = 32;"},{"Add":" /// An edge whose target (if not also `PARENT`) or"},{"Add":" /// source (if also `PARENT`) is marked as deleted."},{"Add":" const DELETED = 128;"},{"Add":" }"}],"del_contents":[{"Del":"/// Possible flags of edges.\n#[derive(Serialize, Deserialize)]\npub struct EdgeFlags: u8 {\nconst BLOCK = 1;\n/// A pseudo-edge, computed when applying the change to\n/// restore connectivity, and/or mark conflicts.\nconst PSEUDO = 4;\n/// An edge encoding file system hierarchy.\nconst FOLDER = 16;\n/// A \"reverse\" edge (all edges in the graph have a reverse edge).\nconst PARENT = 32;\n/// An edge whose target (if not also `PARENT`) or\n/// source (if also `PARENT`) is marked as deleted.\nconst DELETED = 128;\n"}]}},{"Edit":{"inode":{"change":5,"pos":648958},"path":"libpijul/src/pristine/edge.rs","line":21,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":649579}],"down_context":[{"change":5,"pos":649579}],"flag":"","start":8427,"end":9360,"inode":{"change":5,"pos":648958}}},"contents":[{"Add":""},{"Add":"impl EdgeFlags {"},{"Add":" #[inline]"},{"Add":" pub(crate) fn db() -> Self {"},{"Add":" Self::DELETED | Self::BLOCK"},{"Add":" }"},{"Add":""},{"Add":" #[inline]"},{"Add":" pub(crate) fn bp() -> Self {"},{"Add":" Self::BLOCK | Self::PARENT"},{"Add":" }"},{"Add":""},{"Add":" #[inline]"},{"Add":" pub(crate) fn pseudof() -> Self {"},{"Add":" Self::PSEUDO | Self::FOLDER"},{"Add":" }"},{"Add":""},{"Add":" #[inline]"},{"Add":" pub(crate) fn alive_children() -> Self {"},{"Add":" Self::BLOCK | Self::PSEUDO | Self::FOLDER"},{"Add":" }"},{"Add":""},{"Add":" #[inline]"},{"Add":" pub(crate) fn parent_folder() -> Self {"},{"Add":" Self::PARENT | Self::FOLDER"},{"Add":" }"},{"Add":""},{"Add":" #[inline]"},{"Add":" pub(crate) fn is_deleted(&self) -> bool {"},{"Add":" self.contains(EdgeFlags::DELETED)"},{"Add":" }"},{"Add":" #[inline]"},{"Add":" pub(crate) fn is_parent(&self) -> bool {"},{"Add":" self.contains(EdgeFlags::PARENT)"},{"Add":" }"},{"Add":" #[inline]"},{"Add":" pub(crate) fn is_folder(&self) -> bool {"},{"Add":" self.contains(EdgeFlags::FOLDER)"},{"Add":" }"},{"Add":" #[inline]"},{"Add":" pub(crate) fn is_block(&self) -> bool {"},{"Add":" self.contains(EdgeFlags::BLOCK)"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":5,"pos":671807},"path":"libpijul/src/output/output.rs","line":98,"ins":{"up_context":[{"change":5,"pos":675153}],"down_context":[{"change":5,"pos":675184}],"flag":"","start":9361,"end":9401,"inode":{"change":5,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":675153},"to":{"change":5,"start":675153,"end":675184},"introduced_by":5}],"inode":{"change":5,"pos":671807}},"ins_contents":[{"Add":" b.sort_unstable_by(|u, v| {"}],"del_contents":[{"Del":" b.sort_by(|u, v| {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":26,"ins":{"up_context":[{"change":5,"pos":697000}],"down_context":[{"change":5,"pos":697045}],"flag":"","start":9402,"end":9449,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":697000},"to":{"change":5,"start":697000,"end":697045},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" match self.graphs.0.entry(inode) {"}],"del_contents":[{"Del":" match self.graphs.entry(inode) {\n"}]}},{"Edit":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":60,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":698194}],"down_context":[{"change":5,"pos":698194}],"flag":"","start":9450,"end":9475,"inode":{"change":5,"pos":696460}}},"contents":[{"Add":" change_id: ChangeId,"}]}},{"Edit":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":64,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":698264},"to":{"change":5,"start":698264,"end":698287},"introduced_by":5}],"inode":{"change":5,"pos":696460}}},"contents":[{"Del":" d_is_folder: bool,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":66,"ins":{"up_context":[{"change":5,"pos":698361}],"down_context":[{"change":5,"pos":698423}],"flag":"","start":9476,"end":9555,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":698361},"to":{"change":5,"start":698361,"end":698423},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" let mut alive = find_alive_up(txn, channel, &mut ws.files, c, change_id)?;"}],"del_contents":[{"Del":" let (mut alive, files) = find_alive_up(txn, channel, c)?;\n"}]}},{"Edit":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":71,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":698590},"to":{"change":5,"start":698590,"end":698652},"introduced_by":5}],"inode":{"change":5,"pos":696460}}},"contents":[{"Del":" debug!(\"repair_missing_up_context, files = {:?}\", files);\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":72,"ins":{"up_context":[{"change":5,"pos":698670}],"down_context":[{"change":5,"pos":698731}],"flag":"","start":9556,"end":9619,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":698670},"to":{"change":5,"start":698670,"end":698731},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" if let Some((graph, vids)) = ws.graphs.0.get(&inode) {"}],"del_contents":[{"Del":" if let Some((graph, vids)) = ws.graphs.get(&inode) {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":81,"ins":{"up_context":[{"change":5,"pos":698941}],"down_context":[{"change":5,"pos":699912}],"flag":"","start":9620,"end":9719,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":698941},"to":{"change":5,"start":698941,"end":699328},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":699328},"to":{"change":5,"start":56974,"end":57027},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":57027},"to":{"change":5,"start":699364,"end":699639},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":699364},"to":{"change":5,"start":699364,"end":699639},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":699639},"to":{"change":5,"start":26489,"end":26545},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":26545},"to":{"change":5,"start":699655,"end":699665},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":699655},"to":{"change":5,"start":699655,"end":699665},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":699665},"to":{"change":5,"start":699665,"end":699700},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":699700},"to":{"change":5,"start":57028,"end":57081},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":57081},"to":{"change":5,"start":699736,"end":699886},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":699736},"to":{"change":5,"start":699736,"end":699886},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":699886},"to":{"change":5,"start":26546,"end":26602},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":26602},"to":{"change":5,"start":699902,"end":699912},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":699902},"to":{"change":5,"start":699902,"end":699912},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" repair_regular_up(txn, channel, &alive, d, EdgeFlags::PSEUDO).map_err(MissingError::Txn)?;"}],"del_contents":[{"Del":" for &ancestor in alive.iter() {\n debug!(\"put_graph_with_rev {:?} -> {:?}\", ancestor, d);\n if ancestor == d {\n info!(\n \"repair_missing_up_context, alive: {:?} == {:?}\",\n ancestor, d\n );\n continue;\n }\n debug!(\"repair_missing_up {:?} {:?}\", ancestor, d);\n"},{"Del":" put_graph_with_rev(\n txn,\n"},{"Del":" channel,\n if d_is_folder {\n EdgeFlags::PSEUDO | EdgeFlags::FOLDER\n } else {\n EdgeFlags::PSEUDO\n },\n ancestor,\n d,\n ChangeId::ROOT,\n"},{"Del":" )\n .map_err(MissingError::Txn)?;\n"},{"Del":" }\n"},{"Del":" if d_is_folder && c != d {\n"},{"Del":" put_graph_with_rev(\n txn,\n"},{"Del":" channel,\n EdgeFlags::PSEUDO | EdgeFlags::FOLDER,\n c,\n d,\n ChangeId::ROOT,\n"},{"Del":" )\n .map_err(MissingError::Txn)?;\n"},{"Del":" }\n"}]}},{"Edit":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":83,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":699918},"to":{"change":3,"start":0,"end":48},"introduced_by":3}],"inode":{"change":5,"pos":696460}}},"contents":[{"Del":" repair_files_up(txn, channel, &files, ws)?;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":86,"ins":{"up_context":[{"change":5,"pos":699976}],"down_context":[{"change":5,"pos":700008}],"flag":"","start":9720,"end":9754,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":699976},"to":{"change":5,"start":699976,"end":700008},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":"fn repair_regular_up("}],"del_contents":[{"Del":"fn repair_files_up(\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":89,"ins":{"up_context":[{"change":5,"pos":700055}],"down_context":[{"change":5,"pos":700569}],"flag":"","start":9755,"end":10293,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":700055},"to":{"change":5,"start":700055,"end":700095},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":700095},"to":{"change":3,"start":49,"end":73},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":73},"to":{"change":5,"start":26603,"end":26645},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":700095},"to":{"change":5,"start":26603,"end":26645},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":26645},"to":{"change":5,"start":700128,"end":700155},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":700128},"to":{"change":5,"start":700128,"end":700155},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":700155},"to":{"change":5,"start":700155,"end":700193},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":700193},"to":{"change":5,"start":57082,"end":57132},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":57132},"to":{"change":5,"start":700242,"end":700395},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":700242},"to":{"change":5,"start":700242,"end":700395},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":700395},"to":{"change":5,"start":57133,"end":57178},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":57178},"to":{"change":5,"start":700427,"end":700557},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":700427},"to":{"change":5,"start":700427,"end":700557},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":700557},"to":{"change":5,"start":26646,"end":26694},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":26694},"to":{"change":3,"start":74,"end":105},"introduced_by":3}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" alive: &HashSet>,"},{"Add":" d: Vertex,"},{"Add":" flag: EdgeFlags,"},{"Add":") -> Result<(), T::Error> {"},{"Add":" for &ancestor in alive.iter() {"},{"Add":" debug!(\"put_graph_with_rev {:?} -> {:?}\", ancestor, d);"},{"Add":" if ancestor == d {"},{"Add":" info!("},{"Add":" \"repair_missing_up_context, alive: {:?} == {:?}\","},{"Add":" ancestor, d"},{"Add":" );"},{"Add":" continue;"},{"Add":" }"},{"Add":" debug!(\"repair_missing_up {:?} {:?}\", ancestor, d);"},{"Add":" put_graph_with_rev(txn, channel, flag, ancestor, d, ChangeId::ROOT)?;"}],"del_contents":[{"Del":" files: &[(Vertex, Edge)],\n"},{"Del":" ws: &mut Workspace,\n"},{"Del":") -> Result<(), MissingError> {\n"},{"Del":" for &(a, b) in files {\n"},{"Del":" let b = if a.start == a.end {\n"},{"Del":" find_block_end(txn, channel, b.dest)?\n"},{"Del":" } else {\n b.dest.inode_vertex()\n };\n debug!(\"put_graph_with_rev (files) {:?} -> {:?}\", b, a);\n assert_ne!(a, b);\n"},{"Del":" put_graph_with_rev(\n txn,\n"},{"Del":" channel,\n EdgeFlags::FOLDER | EdgeFlags::PSEUDO,\n b,\n a,\n ChangeId::ROOT,\n"},{"Del":" )\n .map_err(MissingError::Txn)?;\n"},{"Del":" ws.repaired.insert(a);\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":124,"ins":{"up_context":[{"change":5,"pos":701137}],"down_context":[{"change":5,"pos":701194}],"flag":"","start":10294,"end":10353,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":701137},"to":{"change":5,"start":701137,"end":701194},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" if let Some((graph, vids)) = ws.graphs.0.get(&inode) {"}],"del_contents":[{"Del":" if let Some((graph, vids)) = ws.graphs.get(&inode) {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":133,"ins":{"up_context":[{"change":5,"pos":701398}],"down_context":[{"change":5,"pos":701621}],"flag":"","start":10354,"end":10501,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":701398},"to":{"change":5,"start":701398,"end":701621},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" for &desc in alive.iter() {"},{"Add":" if d == desc {"},{"Add":" info!(\"repair_missing_down_context, alive: {:?} == {:?}\", d, desc);"}],"del_contents":[{"Del":" for &descendant in alive.iter() {\n if d == descendant {\n info!(\n \"repair_missing_down_context, alive: {:?} == {:?}\",\n d, descendant\n );\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":138,"ins":{"up_context":[{"change":5,"pos":701661}],"down_context":[{"change":5,"pos":701825}],"flag":"","start":10502,"end":10699,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":701661},"to":{"change":5,"start":701661,"end":701729},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":701729},"to":{"change":5,"start":57179,"end":57371},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":57371},"to":{"change":5,"start":26740,"end":26796},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" debug!(\"repair_missing_down {:?} {:?}\", d, desc);"},{"Add":" put_graph_with_rev(txn, channel, EdgeFlags::PSEUDO, d, desc, ChangeId::ROOT)"},{"Add":" .map_err(MissingError::Txn)?;"}],"del_contents":[{"Del":" debug!(\"repair_missing_down {:?} {:?}\", d, descendant);\n"},{"Del":" put_graph_with_rev(\n txn,\n channel,\n EdgeFlags::PSEUDO,\n d,\n descendant,\n ChangeId::ROOT,\n"},{"Del":" )\n .map_err(MissingError::Txn)?;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":158,"ins":{"up_context":[{"change":5,"pos":702212}],"down_context":[{"change":5,"pos":703811}],"flag":"","start":10700,"end":10767,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":702212},"to":{"change":5,"start":57388,"end":57622},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":57622},"to":{"change":5,"start":702442,"end":702686},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":702442},"to":{"change":5,"start":702442,"end":702686},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":702686},"to":{"change":5,"start":702686,"end":702821},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":702821},"to":{"change":5,"start":702821,"end":702861},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":702861},"to":{"change":5,"start":702861,"end":702899},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":702899},"to":{"change":5,"start":57623,"end":57712},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":57712},"to":{"change":5,"start":702987,"end":703036},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":702987},"to":{"change":5,"start":702987,"end":703036},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":703036},"to":{"change":5,"start":703036,"end":703103},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":703103},"to":{"change":5,"start":703103,"end":703217},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":703217},"to":{"change":5,"start":703217,"end":703315},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":703315},"to":{"change":5,"start":703315,"end":703347},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":703347},"to":{"change":5,"start":703347,"end":703470},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":703470},"to":{"change":5,"start":703470,"end":703471},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":703471},"to":{"change":5,"start":703471,"end":703497},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":703497},"to":{"change":5,"start":703497,"end":703811},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" if e.flag.contains(EdgeFlags::FOLDER) {"},{"Add":" return Ok(());"}],"del_contents":[{"Del":" let source = internal_pos(txn, &e.from, change_id)?;\n let source = find_block_end(txn, &channel, source)?;\n let target = internal_pos(txn, &e.to.start_pos(), change_id)?;\n let target = find_block(txn, &channel, target)?;\n"},{"Del":" debug!(\n \"repair_context_nondeleted: source = {:?}, target: {:?}\",\n source, target\n );\n\n // Fixing the connection from root to the source: if the source is\n // deleted by an unknown patch, or if the target is deleted\n"},{"Del":" // (necessarily by unknown patch), then `target` might be\n // disconnected from the alive graph, so we need to fix the context.\n"},{"Del":" let mut deleted_by_unknown = false;\n"},{"Del":" let mut target_is_folder = false;\n"},{"Del":" for v in iter_adjacent(txn, channel, source, EdgeFlags::empty(), EdgeFlags::all()) {\n"},{"Del":" if !v.flag.contains(EdgeFlags::PARENT) {\n"},{"Del":" target_is_folder = v.flag.contains(EdgeFlags::FOLDER);\n"},{"Del":" continue;\n }\n if !v.flag.contains(EdgeFlags::DELETED) {\n continue;\n }\n"},{"Del":" if v.introduced_by == change_id || v.dest.change.is_root() || v.introduced_by.is_root() {\n"},{"Del":" continue;\n }\n"},{"Del":" // This unwrap is ok, since `v` is in the channel.\n let intro = txn.get_external(v.introduced_by).unwrap();\n"},{"Del":"\n"},{"Del":" if known(intro) {\n"},{"Del":" // If a known change also delete the context, we're good.\n deleted_by_unknown = false;\n break;\n } else {\n // If an unknown change deletes the context, wait: maybe a\n // known change will delete it too.\n deleted_by_unknown = true;\n }\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":161,"ins":{"up_context":[{"change":5,"pos":703817}],"down_context":[{"change":5,"pos":704002}],"flag":"","start":10768,"end":11147,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":703817},"to":{"change":5,"start":703817,"end":703904},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":703904},"to":{"change":5,"start":703904,"end":704002},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" let source = find_block_end(txn, &channel, internal_pos(txn, &e.from, change_id)?)?;"},{"Add":" let target = find_block("},{"Add":" txn,"},{"Add":" &channel,"},{"Add":" internal_pos(txn, &e.to.start_pos(), change_id)?,"},{"Add":" )?;"},{"Add":" if deleted_by_unknown(txn, channel, source, change_id, &mut known) {"},{"Add":" repair_missing_up_context(txn, channel, ws, change_id, inode, source, &[target])?;"}],"del_contents":[{"Del":" debug!(\"deleted_by_unknown {:?}\", deleted_by_unknown);\n if deleted_by_unknown {\n"},{"Del":" repair_missing_up_context(txn, channel, ws, inode, source, &[target], target_is_folder)?;\n"}]}},{"Edit":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":170,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":704008}],"down_context":[{"change":5,"pos":704008}],"flag":"","start":11148,"end":11303,"inode":{"change":5,"pos":696460}}},"contents":[{"Add":""},{"Add":" reconnect_target_up(txn, channel, ws, inode, target, change_id)?;"},{"Add":" reconnect_target_down(txn, channel, ws, inode, target, change_id, &mut known)"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":175,"ins":{"up_context":[{"change":5,"pos":704009}],"down_context":[{"change":5,"pos":704175}],"flag":"","start":11304,"end":11543,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":704009},"to":{"change":5,"start":704009,"end":704175},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":"fn reconnect_target_up("},{"Add":" txn: &mut T,"},{"Add":" channel: &mut Channel,"},{"Add":" ws: &mut Workspace,"},{"Add":" inode: Position>,"},{"Add":" target: Vertex,"},{"Add":" change_id: ChangeId,"},{"Add":") -> Result<(), MissingError> {"}],"del_contents":[{"Del":" // Now, maybe ~source~ was deleted by known changes, but\n // accessibility to ~target~ was provided by other edges that got\n // deleted by unknown changes.\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":184,"ins":{"up_context":[{"change":5,"pos":704213}],"down_context":[{"change":5,"pos":704390}],"flag":"","start":11544,"end":11668,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":704213},"to":{"change":5,"start":57713,"end":57802},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":57802},"to":{"change":5,"start":704301,"end":704390},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":704301},"to":{"change":5,"start":704301,"end":704390},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" for v in iter_deleted_parents(txn, channel, target) {"},{"Add":" if v.dest.change.is_root() || v.introduced_by.is_root() {"}],"del_contents":[{"Del":" for v in iter_adjacent(txn, channel, target, EdgeFlags::empty(), EdgeFlags::all()) {\n"},{"Del":" if !v.flag.contains(EdgeFlags::PARENT) || !v.flag.contains(EdgeFlags::DELETED) {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":188,"ins":{"up_context":[{"change":5,"pos":704422}],"down_context":[{"change":5,"pos":704542}],"flag":"","start":11669,"end":11759,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":704422},"to":{"change":5,"start":704422,"end":704520},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":704520},"to":{"change":5,"start":704520,"end":704542},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" if v.introduced_by == change_id {"},{"Add":" unknown.clear();"},{"Add":" break;"}],"del_contents":[{"Del":" if v.introduced_by == change_id || v.dest.change.is_root() || v.introduced_by.is_root() {\n"},{"Del":" continue;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":193,"ins":{"up_context":[{"change":5,"pos":704620}],"down_context":[{"change":5,"pos":57803}],"flag":"","start":11760,"end":11822,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":704620},"to":{"change":5,"start":704620,"end":704670},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" // since no change can create a conflict with itself."}],"del_contents":[{"Del":" // since no change can create a conflict.\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":197,"ins":{"up_context":[{"change":5,"pos":704770}],"down_context":[{"change":5,"pos":704864}],"flag":"","start":11823,"end":11910,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":704770},"to":{"change":5,"start":704770,"end":704864},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" repair_missing_up_context(txn, channel, ws, change_id, inode, up, &[target])?;"}],"del_contents":[{"Del":" repair_missing_up_context(txn, channel, ws, inode, up, &[target], target_is_folder)?;\n"}]}},{"Edit":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":199,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":704870}],"down_context":[{"change":5,"pos":704870}],"flag":"","start":11911,"end":11924,"inode":{"change":5,"pos":696460}}},"contents":[{"Add":" Ok(())"},{"Add":"}"}]}},{"Edit":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":202,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":704871}],"down_context":[{"change":5,"pos":704871}],"flag":"","start":11925,"end":12222,"inode":{"change":5,"pos":696460}}},"contents":[{"Add":"fn reconnect_target_down("},{"Add":" txn: &mut T,"},{"Add":" channel: &mut Channel,"},{"Add":" ws: &mut Workspace,"},{"Add":" inode: Position>,"},{"Add":" target: Vertex,"},{"Add":" change_id: ChangeId,"},{"Add":" known: &mut K,"},{"Add":") -> Result<(), MissingError>"},{"Add":"where"},{"Add":" K: FnMut(Hash) -> bool,"},{"Add":"{"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":216,"ins":{"up_context":[{"change":5,"pos":705017}],"down_context":[{"change":5,"pos":705105}],"flag":"","start":12223,"end":12273,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":705017},"to":{"change":5,"start":57867,"end":57956},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" for v in iter_adj_all(txn, channel, target) {"}],"del_contents":[{"Del":" for v in iter_adjacent(txn, channel, target, EdgeFlags::empty(), EdgeFlags::all()) {\n"}]}},{"Edit":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":237,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":705747}],"down_context":[{"change":5,"pos":705747}],"flag":"","start":12274,"end":13072,"inode":{"change":5,"pos":696460}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"fn deleted_by_unknown("},{"Add":" txn: &T,"},{"Add":" channel: &Channel,"},{"Add":" source: Vertex,"},{"Add":" change_id: ChangeId,"},{"Add":" known: &mut K,"},{"Add":") -> bool"},{"Add":"where"},{"Add":" K: FnMut(Hash) -> bool,"},{"Add":"{"},{"Add":" let mut deleted_by_unknown = false;"},{"Add":" for v in iter_deleted_parents(txn, channel, source) {"},{"Add":" if v.dest.change.is_root() || v.introduced_by.is_root() {"},{"Add":" continue;"},{"Add":" }"},{"Add":" if v.introduced_by == change_id || known(txn.get_external(v.introduced_by).unwrap()) {"},{"Add":" // If a known change also delete the context, we're good."},{"Add":" return false;"},{"Add":" } else {"},{"Add":" // If an unknown change deletes the context, wait: maybe a"},{"Add":" // known change will delete it too."},{"Add":" deleted_by_unknown = true;"},{"Add":" }"},{"Add":" }"},{"Add":" deleted_by_unknown"}]}},{"Edit":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":278,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":706105}],"down_context":[{"change":5,"pos":706105}],"flag":"","start":13073,"end":13146,"inode":{"change":5,"pos":696460}}},"contents":[{"Add":" if e.flag.contains(EdgeFlags::FOLDER) {"},{"Add":" return Ok(());"},{"Add":" }"}]}},{"Edit":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":283,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":58025},"to":{"change":5,"start":58025,"end":58091},"introduced_by":5}],"inode":{"change":5,"pos":696460}}},"contents":[{"Del":" let end_pos = internal_pos(txn, &e.to.end_pos(), change_id)?;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":286,"ins":{"up_context":[{"change":5,"pos":706520}],"down_context":[{"change":5,"pos":706563}],"flag":"","start":13147,"end":13187,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":706520},"to":{"change":5,"start":706520,"end":706563},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" if dest_vertex.end < e.to.end {"}],"del_contents":[{"Del":" if dest_vertex.end < end_pos.pos {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":307,"ins":{"up_context":[{"change":3,"pos":147}],"down_context":[{"change":5,"pos":707101}],"flag":"","start":13188,"end":13219,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":147},"to":{"change":5,"start":706977,"end":707101},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":706977},"to":{"change":5,"start":706977,"end":707101},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" pub(crate) graphs: Graphs,"}],"del_contents":[{"Del":" pub(crate) graphs:\n HashMap>, (Graph, HashMap, crate::alive::VertexId>)>,\n"}]}},{"Edit":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":309,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":707180}],"down_context":[{"change":5,"pos":707180}],"flag":"","start":13220,"end":13269,"inode":{"change":5,"pos":696460}}},"contents":[{"Add":" pub(crate) files: HashSet>,"}]}},{"Edit":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":312,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":707183}],"down_context":[{"change":5,"pos":707183}],"flag":"","start":13270,"end":14291,"inode":{"change":5,"pos":696460}}},"contents":[{"Add":"#[derive(Debug, Default)]"},{"Add":"pub(crate) struct Graphs("},{"Add":" pub HashMap>, (Graph, HashMap, crate::alive::VertexId>)>,"},{"Add":");"},{"Add":""},{"Add":"impl Graphs {"},{"Add":" pub(crate) fn get("},{"Add":" &self,"},{"Add":" inode: Position>,"},{"Add":" ) -> Result<&(Graph, HashMap, VertexId>), InconsistentChange> {"},{"Add":" if let Some(n) = self.0.get(&inode) {"},{"Add":" Ok(n)"},{"Add":" } else {"},{"Add":" Err(InconsistentChange {})"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" pub fn split("},{"Add":" &mut self,"},{"Add":" inode: Position>,"},{"Add":" vertex: Vertex,"},{"Add":" mid: ChangePosition,"},{"Add":" ) {"},{"Add":" if let Some((_, vids)) = self.0.get_mut(&inode) {"},{"Add":" if let Some(vid) = vids.remove(&vertex) {"},{"Add":" vids.insert(Vertex { end: mid, ..vertex }, vid);"},{"Add":" vids.insert("},{"Add":" Vertex {"},{"Add":" start: mid,"},{"Add":" ..vertex"},{"Add":" },"},{"Add":" vid,"},{"Add":" );"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":356,"ins":{"up_context":[{"change":5,"pos":707644}],"down_context":[{"change":3,"pos":148}],"flag":"","start":14292,"end":14323,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":707644},"to":{"change":5,"start":707644,"end":707673},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" self.graphs.0.clear();"}],"del_contents":[{"Del":" self.graphs.clear();\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":365,"ins":{"up_context":[{"change":5,"pos":707925}],"down_context":[{"change":3,"pos":180}],"flag":"","start":14324,"end":14367,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":707925},"to":{"change":5,"start":707925,"end":707966},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" assert!(self.graphs.0.is_empty());"}],"del_contents":[{"Del":" assert!(self.graphs.is_empty());\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":381,"ins":{"up_context":[{"change":5,"pos":708246}],"down_context":[{"change":5,"pos":58199}],"flag":"","start":14368,"end":14430,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":708246},"to":{"change":5,"start":58157,"end":58198},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":58198},"to":{"change":5,"start":708278,"end":708419},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":708278},"to":{"change":5,"start":708278,"end":708419},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" for v in iter_alive_children(txn, channel, dest_vertex) {"}],"del_contents":[{"Del":" for v in iter_adjacent(\n txn,\n"},{"Del":" channel,\n dest_vertex,\n EdgeFlags::empty(),\n EdgeFlags::all() - EdgeFlags::DELETED - EdgeFlags::PARENT,\n ) {\n"}]}},{"Edit":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":393,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":708668},"to":{"change":5,"start":708668,"end":708829},"introduced_by":5}],"inode":{"change":5,"pos":696460}}},"contents":[{"Del":" // If `dest_vertex` is not also deleted by the same change\n // that introduced unknown edge `v`, then `v` is really\n // a missing context.\n"}]}},{"Edit":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":402,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":709098},"to":{"change":5,"start":709098,"end":709161},"introduced_by":5}],"inode":{"change":5,"pos":696460}}},"contents":[{"Del":" // This unwrap is ok, since `v` is in the channel.\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":425,"ins":{"up_context":[{"change":5,"pos":709899}],"down_context":[{"change":5,"pos":710052}],"flag":"","start":14431,"end":14503,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":709899},"to":{"change":5,"start":709899,"end":710052},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" debug!(\"dest_vertex = {:?}, unknown = {:?}\", dest_vertex, unknown);"}],"del_contents":[{"Del":" if unknown.is_empty() {\n trace!(\"unknown = []\")\n } else {\n debug!(\"dest_vertex = {:?}, unknown = {:?}\", dest_vertex, unknown)\n }\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":428,"ins":{"up_context":[{"change":5,"pos":58613}],"down_context":[{"change":5,"pos":26938}],"flag":"","start":14504,"end":14706,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":58613},"to":{"change":5,"start":710141,"end":710193},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":710141},"to":{"change":5,"start":710141,"end":710193},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":710260},"to":{"change":5,"start":710260,"end":710324},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":710324},"to":{"change":5,"start":58614,"end":58667},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":58667},"to":{"change":5,"start":710360,"end":710515},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":710360},"to":{"change":5,"start":710360,"end":710515},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":710515},"to":{"change":5,"start":26924,"end":26938},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" assert!(!edge.flag.contains(EdgeFlags::FOLDER));"},{"Add":" debug!(\"dest_vertex {:?}, p {:?}\", dest_vertex, p);"},{"Add":" put_graph_with_rev(txn, channel, EdgeFlags::db(), dest_vertex, p, change_id)"}],"del_contents":[{"Del":" if !edge.flag.contains(EdgeFlags::FOLDER) {\n"},{"Del":" debug!(\"dest_vertex {:?}, p {:?}\", dest_vertex, p);\n"},{"Del":" put_graph_with_rev(\n txn,\n"},{"Del":" channel,\n EdgeFlags::DELETED | EdgeFlags::BLOCK,\n dest_vertex,\n p,\n change_id,\n"},{"Del":" )\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":432,"ins":{"up_context":[{"change":5,"pos":26980}],"down_context":[{"change":5,"pos":27003}],"flag":"","start":14707,"end":14977,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":26980},"to":{"change":5,"start":710531,"end":710558},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":710531},"to":{"change":5,"start":710531,"end":710558},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":710558},"to":{"change":5,"start":58668,"end":58738},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":58738},"to":{"change":5,"start":710627,"end":710733},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":710627},"to":{"change":5,"start":710627,"end":710733},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":710733},"to":{"change":5,"start":58739,"end":58808},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":58808},"to":{"change":5,"start":710777,"end":710962},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":710777},"to":{"change":5,"start":710777,"end":710962},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":710962},"to":{"change":5,"start":26981,"end":27003},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" let mut u = p;"},{"Add":" while let Ok(v) = find_block(txn, channel, u.end_pos()) {"},{"Add":" if u != v {"},{"Add":" debug!(\"repair_children_of_deleted: {:?} -> {:?}\", u, v);"},{"Add":" put_graph_with_rev(txn, channel, EdgeFlags::db(), u, v, change_id)"}],"del_contents":[{"Del":" let mut u = p;\n"},{"Del":" while let Ok(v) = find_block(txn, channel, u.end_pos()) {\n"},{"Del":" if u != v {\n debug!(\"repair_children_of_deleted: {:?} -> {:?}\", u, v);\n"},{"Del":" put_graph_with_rev(\n txn,\n"},{"Del":" channel,\n EdgeFlags::DELETED | EdgeFlags::BLOCK,\n u,\n v,\n change_id,\n"},{"Del":" )\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":438,"ins":{"up_context":[{"change":5,"pos":27053}],"down_context":[{"change":5,"pos":711082}],"flag":"","start":14978,"end":15044,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":27053},"to":{"change":5,"start":710986,"end":711082},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":710986},"to":{"change":5,"start":710986,"end":711082},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" u = v"},{"Add":" } else {"},{"Add":" break;"}],"del_contents":[{"Del":" u = v\n } else {\n break;\n }\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":443,"ins":{"up_context":[{"change":5,"pos":711106}],"down_context":[{"change":5,"pos":711414}],"flag":"","start":15045,"end":15179,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":711169},"to":{"change":5,"start":58809,"end":58889},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":58889},"to":{"change":5,"start":711248,"end":711317},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":711248},"to":{"change":5,"start":711248,"end":711317},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":711317},"to":{"change":5,"start":711317,"end":711414},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" if is_alive(txn, channel, p) {"},{"Add":" repair_missing_up_context(txn, channel, ws, change_id, inode, dest_vertex, &[p])?;"}],"del_contents":[{"Del":" if is_alive(txn, channel, p) || edge.flag.contains(EdgeFlags::FOLDER) {\n"},{"Del":" let p_is_folder = edge.flag.contains(EdgeFlags::FOLDER);\n"},{"Del":" repair_missing_up_context(txn, channel, ws, inode, dest_vertex, &[p], p_is_folder)?;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":447,"ins":{"up_context":[{"change":5,"pos":711490}],"down_context":[{"change":5,"pos":711583}],"flag":"","start":15180,"end":15277,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":711490},"to":{"change":5,"start":711490,"end":711583},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" repair_missing_up_context(txn, channel, ws, change_id, inode, dest_vertex, &alive)?;"}],"del_contents":[{"Del":" repair_missing_up_context(txn, channel, ws, inode, dest_vertex, &alive, false)?;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":462,"ins":{"up_context":[{"change":5,"pos":711914}],"down_context":[{"change":5,"pos":711964}],"flag":"","start":15278,"end":15332,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":711914},"to":{"change":5,"start":711914,"end":711964},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" for (dest_vertex, mut e) in ws.pseudo.drain(..) {"}],"del_contents":[{"Del":" for (dest_vertex, e) in ws.pseudo.drain(..) {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":469,"ins":{"up_context":[{"change":5,"pos":59118}],"down_context":[{"change":5,"pos":712510}],"flag":"","start":15333,"end":15530,"inode":{"change":5,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":59118},"to":{"change":5,"start":59118,"end":59187},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":59187},"to":{"change":5,"start":712296,"end":712486},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":712296},"to":{"change":5,"start":712296,"end":712486},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":712486},"to":{"change":5,"start":27097,"end":27169},"introduced_by":5}],"inode":{"change":5,"pos":696460}},"ins_contents":[{"Add":" e.flag -= EdgeFlags::PARENT;"},{"Add":" del_graph_with_rev(txn, channel, e.flag, p, dest_vertex, e.introduced_by)"},{"Add":" .map_err(MissingError::Txn)?;"}],"del_contents":[{"Del":" del_graph_with_rev(\n txn,\n"},{"Del":" channel,\n e.flag - EdgeFlags::PARENT,\n p,\n dest_vertex,\n e.introduced_by,\n"},{"Del":" )\n .map_err(MissingError::Txn)?;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":763306},"path":"libpijul/src/find_alive.rs","line":23,"ins":{"up_context":[{"change":5,"pos":764231}],"down_context":[{"change":5,"pos":764387}],"flag":"","start":15531,"end":15586,"inode":{"change":5,"pos":763306}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":764294},"to":{"change":5,"start":64513,"end":64607},"introduced_by":5}],"inode":{"change":5,"pos":763306}},"ins_contents":[{"Add":" for v in iter_adj_all(txn, &channel, vertex) {"}],"del_contents":[{"Del":" for v in iter_adjacent(txn, &channel, vertex, EdgeFlags::empty(), EdgeFlags::all()) {\n"}]}},{"Edit":{"inode":{"change":5,"pos":763306},"path":"libpijul/src/find_alive.rs","line":50,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":765267}],"down_context":[{"change":5,"pos":765267}],"flag":"","start":15587,"end":15630,"inode":{"change":5,"pos":763306}}},"contents":[{"Add":" files: &mut HashSet>,"}]}},{"Replacement":{"inode":{"change":5,"pos":763306},"path":"libpijul/src/find_alive.rs","line":52,"ins":{"up_context":[{"change":5,"pos":765298}],"down_context":[{"change":5,"pos":765386}],"flag":"","start":15631,"end":15706,"inode":{"change":5,"pos":763306}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":765298},"to":{"change":5,"start":32415,"end":32501},"introduced_by":5}],"inode":{"change":5,"pos":763306}},"ins_contents":[{"Add":" change: ChangeId,"},{"Add":") -> Result>, BlockError> {"}],"del_contents":[{"Del":") -> Result<(HashSet>, Vec<(Vertex, Edge)>), BlockError> {\n"}]}},{"Edit":{"inode":{"change":5,"pos":763306},"path":"libpijul/src/find_alive.rs","line":55,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":765422},"to":{"change":5,"start":765422,"end":765454},"introduced_by":5}],"inode":{"change":5,"pos":763306}}},"contents":[{"Del":" let mut files = Vec::new();\n"}]}},{"Replacement":{"inode":{"change":5,"pos":763306},"path":"libpijul/src/find_alive.rs","line":71,"ins":{"up_context":[{"change":5,"pos":766044}],"down_context":[{"change":5,"pos":766233}],"flag":"","start":15707,"end":15838,"inode":{"change":5,"pos":763306}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":766107},"to":{"change":5,"start":766107,"end":766141},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":766141},"to":{"change":5,"start":64786,"end":64879},"introduced_by":5}],"inode":{"change":5,"pos":763306}},"ins_contents":[{"Add":" let mut is_file = false;"},{"Add":" let mut it = iter_adj_all(txn, &channel, vertex);"},{"Add":" while let Some(v) = it.next() {"}],"del_contents":[{"Del":" let mut next_file = None;\n"},{"Del":" for v in iter_adjacent(txn, &channel, vertex, EdgeFlags::PARENT, EdgeFlags::all()) {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":763306},"path":"libpijul/src/find_alive.rs","line":75,"ins":{"up_context":[{"change":5,"pos":766283}],"down_context":[{"change":5,"pos":766374}],"flag":"","start":15839,"end":15924,"inode":{"change":5,"pos":763306}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":766283},"to":{"change":5,"start":766283,"end":766374},"introduced_by":5}],"inode":{"change":5,"pos":763306}},"ins_contents":[{"Add":" if !v.flag.is_parent() {"},{"Add":" is_file |= !v.flag.is_folder();"}],"del_contents":[{"Del":" if !v.flag.contains(EdgeFlags::PARENT) || v.flag.contains(EdgeFlags::PSEUDO) {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":763306},"path":"libpijul/src/find_alive.rs","line":79,"ins":{"up_context":[{"change":5,"pos":766414}],"down_context":[{"change":5,"pos":5472}],"flag":"","start":15925,"end":16235,"inode":{"change":5,"pos":763306}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":766481},"to":{"change":5,"start":766481,"end":766828},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":766828},"to":{"change":5,"start":5337,"end":5422},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":5422},"to":{"change":5,"start":64922,"end":65388},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":64922},"to":{"change":5,"start":64922,"end":65388},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":65388},"to":{"change":5,"start":5423,"end":5472},"introduced_by":5}],"inode":{"change":5,"pos":763306}},"ins_contents":[{"Add":" if v.flag & EdgeFlags::pseudof() == EdgeFlags::PSEUDO {"},{"Add":" continue;"},{"Add":" }"},{"Add":" if !v.flag.is_deleted() {"},{"Add":" if v.flag.is_folder() {"},{"Add":" is_file |= it.any(|e| !e.flag.intersects(EdgeFlags::parent_folder()));"},{"Add":" if is_file {"}],"del_contents":[{"Del":" if !v.flag.contains(EdgeFlags::DELETED) {\n if v.flag.contains(EdgeFlags::FOLDER) {\n // check whether `vertex` is a \"file\" inode,\n // i.e. if it has non-folder children. We're never\n // in the case of an empty file if we call this\n // function.\n"},{"Del":" if next_file.is_none()\n && iter_adjacent(\n"},{"Del":" txn,\n &channel,\n vertex,\n EdgeFlags::empty(),\n EdgeFlags::all(),\n )\n .any(|e| {\n e.flag.contains(EdgeFlags::BLOCK)\n && !e.flag.contains(EdgeFlags::PARENT)\n && !e.flag.contains(EdgeFlags::FOLDER)\n"},{"Del":" })\n {\n"}]}},{"Edit":{"inode":{"change":5,"pos":763306},"path":"libpijul/src/find_alive.rs","line":87,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":5518}],"down_context":[{"change":5,"pos":767318}],"flag":"","start":16236,"end":16282,"inode":{"change":5,"pos":763306}}},"contents":[{"Add":" files.insert(vertex);"}]}},{"Replacement":{"inode":{"change":5,"pos":763306},"path":"libpijul/src/find_alive.rs","line":89,"ins":{"up_context":[{"change":5,"pos":767340}],"down_context":[{"change":5,"pos":767378}],"flag":"","start":16283,"end":16310,"inode":{"change":5,"pos":763306}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":767340},"to":{"change":5,"start":767340,"end":767378},"introduced_by":5}],"inode":{"change":5,"pos":763306}},"ins_contents":[{"Add":" break;"}],"del_contents":[{"Del":" next_file = None;\n"}]}},{"Edit":{"inode":{"change":5,"pos":763306},"path":"libpijul/src/find_alive.rs","line":92,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":767445}],"down_context":[{"change":5,"pos":767445}],"flag":"","start":16311,"end":16466,"inode":{"change":5,"pos":763306}}},"contents":[{"Add":" if v.introduced_by != change {"},{"Add":" stack.truncate(elt_index);"},{"Add":" break;"},{"Add":" }"}]}},{"Edit":{"inode":{"change":5,"pos":763306},"path":"libpijul/src/find_alive.rs","line":97,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":767463},"to":{"change":5,"start":767463,"end":767529},"introduced_by":5}],"inode":{"change":5,"pos":763306}}},"contents":[{"Del":" stack.truncate(elt_index);\n break;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":763306},"path":"libpijul/src/find_alive.rs","line":98,"ins":{"up_context":[{"change":5,"pos":767543}],"down_context":[{"change":5,"pos":768635}],"flag":"","start":16467,"end":16616,"inode":{"change":5,"pos":763306}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":767610},"to":{"change":5,"start":767610,"end":767662},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":767662},"to":{"change":5,"start":767662,"end":768099},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":768099},"to":{"change":5,"start":768099,"end":768226},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":768226},"to":{"change":5,"start":65418,"end":65516},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":65516},"to":{"change":5,"start":768348,"end":768567},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":768348},"to":{"change":5,"start":768348,"end":768567},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":768567},"to":{"change":5,"start":768567,"end":768635},"introduced_by":5}],"inode":{"change":5,"pos":763306}},"ins_contents":[{"Add":" if v.flag.is_folder() {"},{"Add":" if is_file {"},{"Add":" alive.insert(vertex);"},{"Add":" files.insert(vertex);"}],"del_contents":[{"Del":" if v.flag.contains(EdgeFlags::FOLDER) {\n"},{"Del":" let v_age = txn\n .get_changeset(&channel.changes, v.introduced_by, None)\n .unwrap();\n if let Some((ref mut file, ref mut age)) = next_file {\n if v_age > *age {\n *age = v_age;\n *file = (vertex, v)\n }\n } else {\n next_file = Some(((vertex, v), v_age));\n"},{"Del":" // If `vertex` is a \"file\" inode (as opposed to a\n // \"folder\" inode), mark it \"alive\".\n"},{"Del":" if iter_adjacent(txn, &channel, vertex, EdgeFlags::empty(), EdgeFlags::all())\n"},{"Del":" .any(|e| {\n !e.flag.contains(EdgeFlags::PARENT)\n && !e.flag.contains(EdgeFlags::FOLDER)\n })\n {\n"},{"Del":" alive.insert(vertex);\n }\n"}]}},{"Edit":{"inode":{"change":5,"pos":763306},"path":"libpijul/src/find_alive.rs","line":103,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":768653}],"down_context":[{"change":5,"pos":768653}],"flag":"","start":16617,"end":16640,"inode":{"change":5,"pos":763306}}},"contents":[{"Add":" break;"}]}},{"Edit":{"inode":{"change":5,"pos":763306},"path":"libpijul/src/find_alive.rs","line":107,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":768718},"to":{"change":5,"start":768718,"end":768834},"introduced_by":5}],"inode":{"change":5,"pos":763306}}},"contents":[{"Del":" }\n if let Some((file, _)) = next_file {\n files.push(file);\n stack.push(file.1)\n"}]}},{"Edit":{"inode":{"change":5,"pos":763306},"path":"libpijul/src/find_alive.rs","line":108,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":768844}],"down_context":[{"change":5,"pos":768844}],"flag":"","start":16641,"end":16684,"inode":{"change":5,"pos":763306}}},"contents":[{"Add":" debug!(\"is_file = {:?}\", is_file);"}]}},{"Replacement":{"inode":{"change":5,"pos":763306},"path":"libpijul/src/find_alive.rs","line":110,"ins":{"up_context":[{"change":5,"pos":768850}],"down_context":[{"change":5,"pos":768873}],"flag":"","start":16685,"end":16699,"inode":{"change":5,"pos":763306}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":768850},"to":{"change":5,"start":768850,"end":768873},"introduced_by":5}],"inode":{"change":5,"pos":763306}},"ins_contents":[{"Add":" Ok(alive)"}],"del_contents":[{"Del":" Ok((alive, files))\n"}]}},{"Replacement":{"inode":{"change":5,"pos":805350},"path":"libpijul/src/diff/delete.rs","line":176,"ins":{"up_context":[{"change":5,"pos":810948}],"down_context":[{"change":5,"pos":810997}],"flag":"","start":16700,"end":16749,"inode":{"change":5,"pos":805350}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":810948},"to":{"change":4,"start":0,"end":68},"introduced_by":4}],"inode":{"change":5,"pos":805350}},"ins_contents":[{"Add":" flag: previous | EdgeFlags::DELETED,"}],"del_contents":[{"Del":" flag: previous | EdgeFlags::BLOCK | EdgeFlags::DELETED,\n"}]}},{"Edit":{"inode":{"change":5,"pos":831311},"path":"libpijul/src/change.rs","line":84,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":832924}],"down_context":[{"change":5,"pos":832924}],"flag":"","start":16750,"end":17039,"inode":{"change":5,"pos":831311}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"impl NewEdge {"},{"Add":" pub(crate) fn reverse(&self, introduced_by: T) -> Self {"},{"Add":" NewEdge {"},{"Add":" previous: self.flag,"},{"Add":" flag: self.previous,"},{"Add":" from: self.from.clone(),"},{"Add":" to: self.to.clone(),"},{"Add":" introduced_by,"},{"Add":" }"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":5,"pos":831311},"path":"libpijul/src/change.rs","line":285,"ins":{"up_context":[{"change":5,"pos":66514}],"down_context":[{"change":5,"pos":838760}],"flag":"","start":17040,"end":17091,"inode":{"change":5,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":66514},"to":{"change":5,"start":66514,"end":66604},"introduced_by":5}],"inode":{"change":5,"pos":831311}},"ins_contents":[{"Add":" for edge in iter_adj_all(txn, channel, from) {"}],"del_contents":[{"Del":" for edge in iter_adjacent(txn, channel, from, EdgeFlags::empty(), EdgeFlags::all()) {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":831311},"path":"libpijul/src/change.rs","line":317,"ins":{"up_context":[{"change":5,"pos":839576}],"down_context":[{"change":5,"pos":839667}],"flag":"","start":17092,"end":17145,"inode":{"change":5,"pos":831311}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":839576},"to":{"change":5,"start":66666,"end":66758},"introduced_by":5}],"inode":{"change":5,"pos":831311}},"ins_contents":[{"Add":" for edge in iter_adj_all(txn, channel, to) {"}],"del_contents":[{"Del":" for edge in iter_adjacent(txn, channel, to, EdgeFlags::empty(), EdgeFlags::all()) {\n"}]}},{"Edit":{"inode":{"change":5,"pos":37976},"path":"libpijul/src/change/text_changes.rs","line":783,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":68233}],"down_context":[{"change":5,"pos":68233}],"flag":"","start":17146,"end":17201,"inode":{"change":5,"pos":37976}}},"contents":[{"Add":" v.flag = EdgeFlags::BLOCK;"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":2,"ins":{"up_context":[{"change":5,"pos":944165}],"down_context":[{"change":5,"pos":944220}],"flag":"","start":17202,"end":17266,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":944165},"to":{"change":5,"start":944165,"end":944220},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":"use crate::change::{Atom, Change, EdgeMap, NewEdge, NewVertex};"}],"del_contents":[{"Del":"use crate::change::{Atom, Change, NewEdge, NewVertex};\n"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":35,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":94266}],"down_context":[{"change":5,"pos":94266}],"flag":"","start":17267,"end":17434,"inode":{"change":5,"pos":944089}}},"contents":[{"Add":"impl LocalApplyError {"},{"Add":" const INCONSISTENT: Self ="},{"Add":" LocalApplyError::InconsistentChange(crate::pristine::InconsistentChange {});"},{"Add":"}"},{"Add":""}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":219,"ins":{"up_context":[{"change":5,"pos":95841}],"down_context":[{"change":5,"pos":950100}],"flag":"","start":17435,"end":17467,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":95841},"to":{"change":5,"start":950069,"end":950100},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":950069},"to":{"change":5,"start":950069,"end":950100},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" )?;"}],"del_contents":[{"Del":" )?\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":252,"ins":{"up_context":[{"change":5,"pos":951686}],"down_context":[{"change":5,"pos":951738}],"flag":"","start":17468,"end":17531,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":951686},"to":{"change":5,"start":951686,"end":951738},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" clean_obsolete_pseudo_edges(txn, channel, ws, change_id)?;"}],"del_contents":[{"Del":" clean_obsolete_pseudo_edges(txn, channel, ws)?;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":256,"ins":{"up_context":[{"change":5,"pos":951847}],"down_context":[{"change":5,"pos":951910}],"flag":"","start":17532,"end":17576,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":951847},"to":{"change":5,"start":951847,"end":951910},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" repair_cyclic_paths(txn, channel, ws)?;"}],"del_contents":[{"Del":" repair_cyclic_paths(txn, channel, ws, change_id, change)?;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":258,"ins":{"up_context":[{"change":5,"pos":951945}],"down_context":[{"change":5,"pos":952082}],"flag":"","start":17577,"end":17598,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":951945},"to":{"change":5,"start":96007,"end":96184},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" channel.touch();"}],"del_contents":[{"Del":" if let Ok(duration) =\n std::time::SystemTime::now().duration_since(std::time::SystemTime::UNIX_EPOCH)\n {\n channel.last_modified = duration.as_secs();\n }\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":382,"ins":{"up_context":[{"change":5,"pos":67490}],"down_context":[{"change":5,"pos":956160}],"flag":"","start":17599,"end":17757,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":67490},"to":{"change":5,"start":956100,"end":956160},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":956100},"to":{"change":5,"start":956100,"end":956160},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" if put_up_context(txn, channel, ch, ws, up)? && n.flag.contains(EdgeFlags::FOLDER) {"},{"Add":" return Err(LocalApplyError::INCONSISTENT);"},{"Add":" }"}],"del_contents":[{"Del":" put_up_context(txn, channel, ch, n.inode, ws, up)?;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":388,"ins":{"up_context":[{"change":5,"pos":67544}],"down_context":[{"change":5,"pos":956322}],"flag":"","start":17758,"end":18022,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":67544},"to":{"change":5,"start":956258,"end":956322},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":956258},"to":{"change":5,"start":956258,"end":956322},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" if down.change == change {"},{"Add":" return Err((InconsistentChange {}).into());"},{"Add":" }"},{"Add":" if put_down_context(txn, channel, ch, ws, down)? && !n.flag.contains(EdgeFlags::FOLDER) {"},{"Add":" return Err(LocalApplyError::INCONSISTENT);"},{"Add":" }"}],"del_contents":[{"Del":" put_down_context(txn, channel, ch, n.inode, ws, down)?;\n"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":397,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":956376}],"down_context":[{"change":5,"pos":956376}],"flag":"","start":18023,"end":18089,"inode":{"change":5,"pos":944089}}},"contents":[{"Add":" let up_flag = n.flag | EdgeFlags::BLOCK | EdgeFlags::DELETED;"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":401,"ins":{"up_context":[{"change":5,"pos":956497}],"down_context":[{"change":5,"pos":96963}],"flag":"","start":18090,"end":18218,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":956497},"to":{"change":5,"start":956497,"end":956626},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":956626},"to":{"change":5,"start":96887,"end":96963},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" for change in ws.deleted_by.iter() {"},{"Add":" put_graph_with_rev(txn, channel, up_flag, up, vertex, *change)"}],"del_contents":[{"Del":" for (change, _) in ws.deleted_by.iter() {\n let flag = n.flag | EdgeFlags::BLOCK | EdgeFlags::DELETED;\n"},{"Del":" put_graph_with_rev(txn, channel, flag, up, vertex, *change)\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":406,"ins":{"up_context":[{"change":5,"pos":956727}],"down_context":[{"change":5,"pos":956816}],"flag":"","start":18219,"end":18352,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":956727},"to":{"change":5,"start":67624,"end":67684},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":67684},"to":{"change":5,"start":965,"end":1046},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1046},"to":{"change":5,"start":250,"end":354},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":250},"to":{"change":5,"start":250,"end":354},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":354},"to":{"change":5,"start":97017,"end":97116},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" put_graph_with_rev(txn, channel, n.flag | EdgeFlags::BLOCK, up, vertex, change)"},{"Add":" .map_err(LocalApplyError::Txn)?;"}],"del_contents":[{"Del":" debug!(\"put_graph_with_rev {:?} {:?}\", up, vertex);\n"},{"Del":" let flag = if n.flag.contains(EdgeFlags::FOLDER) || !vertex.is_empty() {\n"},{"Del":" n.flag | EdgeFlags::BLOCK\n } else {\n n.flag - EdgeFlags::BLOCK\n };\n"},{"Del":" put_graph_with_rev(txn, channel, flag, up, vertex, change).map_err(LocalApplyError::Txn)?;\n"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":410,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":956872}],"down_context":[{"change":5,"pos":67775}],"flag":"","start":18353,"end":18458,"inode":{"change":5,"pos":944089}}},"contents":[{"Add":" let mut down_flag = n.flag;"},{"Add":" if !n.flag.is_folder() {"},{"Add":" down_flag -= EdgeFlags::BLOCK"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":416,"ins":{"up_context":[{"change":5,"pos":956966}],"down_context":[{"change":5,"pos":97131}],"flag":"","start":18459,"end":18533,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":956966},"to":{"change":5,"start":67820,"end":68059},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":68059},"to":{"change":5,"start":97117,"end":97131},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" put_graph_with_rev(txn, channel, down_flag, vertex, down, change)"}],"del_contents":[{"Del":" if n.flag.contains(EdgeFlags::FOLDER) {\n put_graph_with_rev(\n txn,\n channel,\n n.flag | EdgeFlags::BLOCK,\n vertex,\n down,\n change,\n"},{"Del":" )\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":418,"ins":{"up_context":[{"change":5,"pos":97176}],"down_context":[{"change":5,"pos":957497}],"flag":"","start":18534,"end":18617,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":68075},"to":{"change":5,"start":957404,"end":957421},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":97176},"to":{"change":5,"start":957404,"end":957421},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":957404},"to":{"change":5,"start":957404,"end":957421},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":957421},"to":{"change":5,"start":68076,"end":68267},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":68267},"to":{"change":5,"start":97177,"end":97191},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":97191},"to":{"change":5,"start":97191,"end":97236},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" if n.flag.is_folder() {"},{"Add":" ws.missing_context.files.insert(down);"}],"del_contents":[{"Del":" } else {\n"},{"Del":" put_graph_with_rev(\n txn,\n channel,\n n.flag - EdgeFlags::BLOCK,\n vertex,\n down,\n change,\n"},{"Del":" )\n"},{"Del":" .map_err(LocalApplyError::Txn)?;\n"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":430,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":957703},"to":{"change":5,"start":957703,"end":957738},"introduced_by":5}],"inode":{"change":5,"pos":944089}}},"contents":[{"Del":" inode: Position>,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":432,"ins":{"up_context":[{"change":5,"pos":957790}],"down_context":[{"change":5,"pos":957823}],"flag":"","start":18618,"end":18665,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":957790},"to":{"change":5,"start":97237,"end":97282},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":") -> Result> {"}],"del_contents":[{"Del":") -> Result<(), LocalApplyError> {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":442,"ins":{"up_context":[{"change":5,"pos":958151}],"down_context":[{"change":5,"pos":97283}],"flag":"","start":18666,"end":18835,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":958151},"to":{"change":5,"start":958151,"end":958453},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" // The missing context \"graphs\" are only used at the"},{"Add":" // DELETION stage, check that:"},{"Add":" assert!(ws.missing_context.graphs.0.is_empty());"}],"del_contents":[{"Del":" if let Some((_, vids)) = ws.missing_context.graphs.get_mut(&inode) {\n if let Some(vid) = vids.remove(&k) {\n vids.insert(Vertex { end: up.pos, ..k }, vid);\n vids.insert(Vertex { start: up.pos, ..k }, vid);\n }\n }\n"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":456,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":68505}],"down_context":[{"change":5,"pos":68505}],"flag":"","start":18836,"end":18871,"inode":{"change":5,"pos":944089}}},"contents":[{"Add":" let mut is_non_folder = false;"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":458,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":68579}],"down_context":[{"change":5,"pos":68579}],"flag":"","start":18872,"end":18973,"inode":{"change":5,"pos":944089}}},"contents":[{"Add":" is_non_folder |= parent.flag & (EdgeFlags::PARENT | EdgeFlags::FOLDER) == EdgeFlags::PARENT;"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":463,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":68706},"to":{"change":5,"start":68706,"end":68768},"introduced_by":5}],"inode":{"change":5,"pos":944089}}},"contents":[{"Del":" // This unwrap is ok: `parent` is in the channel.\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":465,"ins":{"up_context":[{"change":5,"pos":68892}],"down_context":[{"change":5,"pos":69008}],"flag":"","start":18974,"end":19034,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":68892},"to":{"change":5,"start":68892,"end":69008},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" ws.deleted_by.insert(parent.introduced_by);"}],"del_contents":[{"Del":" ws.deleted_by\n .insert((parent.introduced_by, parent.flag - EdgeFlags::PARENT));\n"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":467,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":69022},"to":{"change":5,"start":69022,"end":69101},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":69101},"to":{"change":5,"start":69101,"end":69243},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":69243},"to":{"change":5,"start":69243,"end":69262},"introduced_by":5}],"inode":{"change":5,"pos":944089}}},"contents":[{"Del":" } else if parent.flag.contains(EdgeFlags::PARENT | EdgeFlags::BLOCK) {\n"},{"Del":" // This vertex is alive, even if its parent is in conflict.\n debug!(\"up_context: alive {:?} {:?}\", up_vertex, parent);\n"},{"Del":" break;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":470,"ins":{"up_context":[{"change":5,"pos":959194}],"down_context":[{"change":5,"pos":959205}],"flag":"","start":19035,"end":19057,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":959194},"to":{"change":5,"start":959194,"end":959205},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" Ok(is_non_folder)"}],"del_contents":[{"Del":" Ok(())\n"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":477,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":959359},"to":{"change":5,"start":959359,"end":959394},"introduced_by":5}],"inode":{"change":5,"pos":944089}}},"contents":[{"Del":" inode: Position>,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":479,"ins":{"up_context":[{"change":5,"pos":959448}],"down_context":[{"change":5,"pos":69263}],"flag":"","start":19058,"end":19105,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":959448},"to":{"change":5,"start":97364,"end":97423},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":") -> Result> {"}],"del_contents":[{"Del":") -> Result, LocalApplyError> {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":484,"ins":{"up_context":[{"change":5,"pos":959659}],"down_context":[{"change":5,"pos":97424}],"flag":"","start":19106,"end":19263,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":959659},"to":{"change":5,"start":959659,"end":960068},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" // The missing context \"graphs\" are only used at the"},{"Add":" // DELETION stage, check that:"},{"Add":" assert!(ws.missing_context.graphs.0.is_empty());"}],"del_contents":[{"Del":" if let Some((_, vids)) = ws.missing_context.graphs.get_mut(&inode) {\n if let Some(vid) = vids.remove(&k) {\n vids.insert(Vertex { end: down.pos, ..k }, vid);\n vids.insert(\n Vertex {\n start: down.pos,\n ..k\n },\n vid,\n );\n }\n }\n"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":498,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":960393}],"down_context":[{"change":5,"pos":69361}],"flag":"","start":19264,"end":19295,"inode":{"change":5,"pos":944089}}},"contents":[{"Add":" let mut is_folder = false;"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":500,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":69437}],"down_context":[{"change":5,"pos":69437}],"flag":"","start":19296,"end":19378,"inode":{"change":5,"pos":944089}}},"contents":[{"Add":" is_folder |= parent.flag.contains(EdgeFlags::PARENT | EdgeFlags::FOLDER);"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":503,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":960613},"to":{"change":5,"start":960613,"end":960679},"introduced_by":5}],"inode":{"change":5,"pos":944089}}},"contents":[{"Del":" // This unwrap is ok: `parent` is in the channel.\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":505,"ins":{"up_context":[{"change":5,"pos":960811}],"down_context":[{"change":5,"pos":960935}],"flag":"","start":19379,"end":19443,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":960811},"to":{"change":5,"start":960811,"end":960935},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" ws.deleted_by.insert(parent.introduced_by);"}],"del_contents":[{"Del":" ws.deleted_by\n .insert((parent.introduced_by, parent.flag - EdgeFlags::PARENT));\n"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":507,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":960953},"to":{"change":5,"start":960953,"end":960974},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":960974},"to":{"change":5,"start":69510,"end":69550},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":69550},"to":{"change":5,"start":69550,"end":69573},"introduced_by":5}],"inode":{"change":5,"pos":944089}}},"contents":[{"Del":" } else {\n"},{"Del":" // This parent is alive\n"},{"Del":" break;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":511,"ins":{"up_context":[{"change":5,"pos":69613}],"down_context":[{"change":5,"pos":961115}],"flag":"","start":19444,"end":19462,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":69613},"to":{"change":5,"start":961095,"end":961115},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":961095},"to":{"change":5,"start":961095,"end":961115},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" Ok(is_folder)"}],"del_contents":[{"Del":" Ok(down_vertex)\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":519,"ins":{"up_context":[{"change":5,"pos":961343}],"down_context":[{"change":5,"pos":961391}],"flag":"","start":19463,"end":19498,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":961343},"to":{"change":5,"start":961343,"end":961391},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" deleted_by: HashSet,"}],"del_contents":[{"Del":" deleted_by: HashSet<(ChangeId, EdgeFlags)>,\n"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":566,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":963319}],"down_context":[{"change":5,"pos":963319}],"flag":"","start":19499,"end":19547,"inode":{"change":5,"pos":944089}}},"contents":[{"Add":" debug!(\"put_newedge {:?} {:?}\", n, change);"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":572,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":963431}],"down_context":[{"change":5,"pos":963431}],"flag":"","start":19548,"end":19728,"inode":{"change":5,"pos":944089}}},"contents":[{"Add":" if (n.previous.is_block() != n.flag.is_block())"},{"Add":" || (n.previous.is_folder() != n.flag.is_folder())"},{"Add":" {"},{"Add":" return Err(LocalApplyError::INCONSISTENT.into());"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":578,"ins":{"up_context":[{"change":5,"pos":963432}],"down_context":[{"change":5,"pos":69656}],"flag":"","start":19729,"end":19814,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":963432},"to":{"change":5,"start":963432,"end":963505},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":963505},"to":{"change":5,"start":963505,"end":963553},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" debug_assert!(ws.children.is_empty());"},{"Add":" debug_assert!(ws.parents.is_empty());"}],"del_contents":[{"Del":" assert!(ws.children.is_empty());\n assert!(ws.parents.is_empty());\n"},{"Del":" debug!(\"put_newedge {:?} {:?}\", n, change);\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":583,"ins":{"up_context":[{"change":5,"pos":963660}],"down_context":[{"change":5,"pos":963721}],"flag":"","start":19815,"end":19873,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":963660},"to":{"change":5,"start":97826,"end":97953},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" return Err(LocalApplyError::INCONSISTENT.into());"}],"del_contents":[{"Del":" return Err(\n LocalApplyError::InconsistentChange(crate::pristine::InconsistentChange {}).into(),\n );\n"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":589,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":963912}],"down_context":[{"change":5,"pos":963912}],"flag":"","start":19874,"end":19974,"inode":{"change":5,"pos":944089}}},"contents":[{"Add":" if n.flag.contains(EdgeFlags::FOLDER) {"},{"Add":" ws.missing_context.files.insert(target);"},{"Add":" }"},{"Add":""}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":596,"ins":{"up_context":[{"change":5,"pos":964016}],"down_context":[{"change":5,"pos":97954}],"flag":"","start":19975,"end":20045,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":964016},"to":{"change":5,"start":964016,"end":964639},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" ws.missing_context.graphs.split(inode, target, n.to.end);"}],"del_contents":[{"Del":" if let Some((_, vids)) = ws.missing_context.graphs.get_mut(&inode) {\n if let Some(vid) = vids.remove(&target) {\n vids.insert(\n Vertex {\n end: n.to.end,\n ..target\n },\n vid,\n );\n vids.insert(\n Vertex {\n start: n.to.end,\n ..target\n },\n vid,\n );\n }\n }\n"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":607,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":965032}],"down_context":[{"change":5,"pos":965032}],"flag":"","start":20046,"end":20078,"inode":{"change":5,"pos":944089}}},"contents":[{"Add":" ws.parents.clear();"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":610,"ins":{"up_context":[{"change":5,"pos":965043}],"down_context":[{"change":5,"pos":98139}],"flag":"","start":20079,"end":20165,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":965043},"to":{"change":5,"start":965043,"end":965101},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":965101},"to":{"change":5,"start":98043,"end":98139},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" del_graph_with_rev(txn, channel, n.previous, source, target, n_introduced_by)"}],"del_contents":[{"Del":" debug!(\"deleting {:?} {:?}\", n.previous, n.flag);\n"},{"Del":" let del = del_graph_with_rev(txn, channel, n.previous, source, target, n_introduced_by)\n"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":612,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":69899},"to":{"change":5,"start":965198,"end":965236},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":98184},"to":{"change":5,"start":965198,"end":965236},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":965198},"to":{"change":5,"start":965198,"end":965236},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":965631},"to":{"change":5,"start":965631,"end":965742},"introduced_by":5}],"inode":{"change":5,"pos":944089}}},"contents":[{"Del":" debug!(\"deleted: {:?}\", del);\n"},{"Del":" debug!(\"put_graph {:?} {:?}, intro {:?}\", source, target, change);\n assert_ne!(source, target);\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":618,"ins":{"up_context":[{"change":5,"pos":965923}],"down_context":[{"change":5,"pos":965969}],"flag":"","start":20166,"end":20265,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":965923},"to":{"change":5,"start":965923,"end":965969},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" debug!(\"{:?} {:?}\", target, n.to);"},{"Add":" debug_assert_eq!(target.end, n.to.end);"}],"del_contents":[{"Del":" assert_eq!(target.end, n.to.end);\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":644,"ins":{"up_context":[{"change":5,"pos":966729}],"down_context":[{"change":5,"pos":98467}],"flag":"","start":20266,"end":20332,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":966729},"to":{"change":5,"start":966729,"end":967280},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" ws.missing_context.graphs.split(inode, source, from.pos);"}],"del_contents":[{"Del":" if let Some((_, vids)) = ws.missing_context.graphs.get_mut(&inode) {\n if let Some(vid) = vids.remove(&source) {\n vids.insert(\n Vertex {\n end: from.pos,\n ..source\n },\n vid,\n );\n vids.insert(\n Vertex {\n start: from.pos,\n ..source\n },\n vid,\n );\n }\n }\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":661,"ins":{"up_context":[{"change":5,"pos":70249}],"down_context":[{"change":5,"pos":70250}],"flag":"","start":20333,"end":20382,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":70249},"to":{"change":5,"start":967711,"end":967745},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":967711},"to":{"change":5,"start":967711,"end":967745},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" debug!(\"find_target_vertex, to = {:?}\", to);"}],"del_contents":[{"Del":" debug!(\"find_target_vertex\");\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":666,"ins":{"up_context":[{"change":5,"pos":967922}],"down_context":[{"change":5,"pos":98612}],"flag":"","start":20383,"end":20449,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":967922},"to":{"change":5,"start":967922,"end":968473},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" ws.missing_context.graphs.split(inode, target, to.start);"}],"del_contents":[{"Del":" if let Some((_, vids)) = ws.missing_context.graphs.get_mut(&inode) {\n if let Some(vid) = vids.remove(&target) {\n vids.insert(\n Vertex {\n end: to.start,\n ..target\n },\n vid,\n );\n vids.insert(\n Vertex {\n start: to.start,\n ..target\n },\n vid,\n );\n }\n }\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":713,"ins":{"up_context":[{"change":5,"pos":98788}],"down_context":[{"change":5,"pos":970152}],"flag":"","start":20450,"end":20507,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":98788},"to":{"change":5,"start":969844,"end":970152},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":969844},"to":{"change":5,"start":969844,"end":970152},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" if ws.parents.is_empty() || ws.children.is_empty() {"}],"del_contents":[{"Del":" debug!(\n \"reconnect: parents.len() = {:?} to children.len() = {:?}\",\n ws.parents.len(),\n ws.children.len()\n );\n debug!(\n \"reconnect: parents = {:#?} to children = {:#?}\",\n ws.parents, ws.children\n );\n if ws.parents.is_empty() {\n ws.children.clear();\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":716,"ins":{"up_context":[{"change":5,"pos":970181}],"down_context":[{"change":5,"pos":970270}],"flag":"","start":20508,"end":20572,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":970181},"to":{"change":5,"start":970181,"end":970241},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":970241},"to":{"change":5,"start":970241,"end":970270},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":""},{"Add":" let (graph, vids) = ws.missing_context.graphs.get(inode)?;"}],"del_contents":[{"Del":" if ws.children.is_empty() {\n ws.parents.clear();\n"},{"Del":" return Ok(());\n }\n"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":719,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":970271},"to":{"change":5,"start":970271,"end":970375},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":970375},"to":{"change":5,"start":98789,"end":98841},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":98841},"to":{"change":5,"start":970436,"end":970443},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":970436},"to":{"change":5,"start":970436,"end":970443},"introduced_by":5}],"inode":{"change":5,"pos":944089}}},"contents":[{"Del":" let (graph, vids) = if let Some(n) = ws.missing_context.graphs.get(&inode) {\n n\n } else {\n"},{"Del":" return Err((InconsistentChange {}).into());\n"},{"Del":" };\n"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":731,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":970806},"to":{"change":5,"start":970806,"end":970906},"introduced_by":5}],"inode":{"change":5,"pos":944089}}},"contents":[{"Del":" debug!(\n \"reconnect (nonredundant) {:?} to {:?}\",\n ws.parents, ws.children\n );\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":732,"ins":{"up_context":[{"change":5,"pos":970907}],"down_context":[{"change":5,"pos":98933}],"flag":"","start":20573,"end":20868,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":970907},"to":{"change":5,"start":970907,"end":970979},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":970979},"to":{"change":5,"start":70575,"end":70659},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":70659},"to":{"change":5,"start":98842,"end":98933},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" for &p in ws.parents.iter() {"},{"Add":" debug_assert!(is_alive(txn, channel, p));"},{"Add":" for &c in ws.children.iter() {"},{"Add":" if p != c {"},{"Add":" debug_assert!(is_alive(txn, channel, c));"},{"Add":" put_graph_with_rev(txn, channel, EdgeFlags::PSEUDO, p, c, ChangeId::ROOT)"}],"del_contents":[{"Del":" for p in ws.parents.drain() {\n for c in ws.children.iter() {\n"},{"Del":" if p != *c && is_alive(txn, channel, p) && is_alive(txn, channel, *c) {\n"},{"Del":" put_graph_with_rev(txn, channel, EdgeFlags::PSEUDO, p, *c, ChangeId::ROOT)\n"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":749,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":971377}],"down_context":[{"change":5,"pos":98987}],"flag":"","start":20869,"end":20894,"inode":{"change":5,"pos":944089}}},"contents":[{"Add":" change_id: ChangeId,"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":751,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":99032},"to":{"change":5,"start":971410,"end":971451},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":971410},"to":{"change":5,"start":971410,"end":971451},"introduced_by":5}],"inode":{"change":5,"pos":944089}}},"contents":[{"Del":" debug!(\"pseudo = {:#?}\", ws.pseudo);\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":752,"ins":{"up_context":[{"change":5,"pos":971508}],"down_context":[{"change":5,"pos":70753}],"flag":"","start":20895,"end":20940,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":971508},"to":{"change":5,"start":971508,"end":971636},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":971636},"to":{"change":5,"start":971636,"end":971697},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" let (a, b) = if p.flag.is_parent() {"}],"del_contents":[{"Del":" // Reorder next_vertex and p.dest to reformulate this as an \"a -> b\" edge.\n debug!(\"{:?} {:?}\", next_vertex, p);\n"},{"Del":" let (a, b) = if p.flag.contains(EdgeFlags::PARENT) {\n"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":763,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":972425},"to":{"change":5,"start":972425,"end":972426},"introduced_by":5}],"inode":{"change":5,"pos":944089}}},"contents":[{"Del":"\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":765,"ins":{"up_context":[{"change":5,"pos":70993}],"down_context":[{"change":5,"pos":972853}],"flag":"","start":20941,"end":21227,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":70993},"to":{"change":5,"start":972799,"end":972853},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":972799},"to":{"change":5,"start":972799,"end":972853},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" if a_is_alive && b_is_alive {"},{"Add":" continue;"},{"Add":" }"},{"Add":" del_graph_with_rev("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" p.flag - EdgeFlags::PARENT,"},{"Add":" a,"},{"Add":" b,"},{"Add":" p.introduced_by,"},{"Add":" )"},{"Add":" .map_err(LocalApplyError::Txn)?;"}],"del_contents":[{"Del":"\n debug!(\"{:?} {:?}\", a_is_alive, b_is_alive);\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":778,"ins":{"up_context":[{"change":5,"pos":972877}],"down_context":[{"change":5,"pos":71094}],"flag":"","start":21228,"end":21333,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":972877},"to":{"change":5,"start":972877,"end":972961},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":972961},"to":{"change":5,"start":70994,"end":71058},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":71058},"to":{"change":5,"start":973004,"end":973164},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":973004},"to":{"change":5,"start":973004,"end":973164},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":973164},"to":{"change":5,"start":99033,"end":99117},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":99117},"to":{"change":5,"start":973185,"end":973501},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":973185},"to":{"change":5,"start":973185,"end":973501},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":973501},"to":{"change":5,"start":99118,"end":99201},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":99201},"to":{"change":5,"start":973524,"end":973638},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":973524},"to":{"change":5,"start":973524,"end":973638},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":973638},"to":{"change":5,"start":71059,"end":71094},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" debug_assert!(!b_is_alive);"},{"Add":" crate::missing_context::repair_missing_down_context("}],"del_contents":[{"Del":" if !b_is_alive {\n debug!(\"deleting {:?} -> {:?}\", a, b);\n"},{"Del":" if del_graph_with_rev(\n txn,\n"},{"Del":" channel,\n p.flag - EdgeFlags::PARENT,\n a,\n b,\n p.introduced_by,\n"},{"Del":" )\n .map_err(LocalApplyError::Txn)?\n {\n"},{"Del":" // repair down context.\n crate::missing_context::repair_missing_down_context(\n txn,\n channel,\n &mut ws.missing_context,\n inode,\n b,\n &[a],\n"},{"Del":" )\n .map_err(LocalApplyError::from_missing)?\n"},{"Del":" }\n }\n } else if b_is_alive {\n debug!(\"deleting {:?} -> {:?}\", a, b);\n"},{"Del":" if del_graph_with_rev(\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":782,"ins":{"up_context":[{"change":5,"pos":71140}],"down_context":[{"change":5,"pos":71203}],"flag":"","start":21334,"end":21398,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":71140},"to":{"change":5,"start":71140,"end":71203},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" &mut ws.missing_context,"},{"Add":" inode,"}],"del_contents":[{"Del":" p.flag - EdgeFlags::PARENT,\n a,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":785,"ins":{"up_context":[{"change":5,"pos":71222}],"down_context":[{"change":5,"pos":99202}],"flag":"","start":21399,"end":21421,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":71222},"to":{"change":5,"start":71222,"end":71255},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" &[a],"}],"del_contents":[{"Del":" p.introduced_by,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":787,"ins":{"up_context":[{"change":5,"pos":99216}],"down_context":[{"change":5,"pos":71305}],"flag":"","start":21422,"end":21578,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":99216},"to":{"change":5,"start":99216,"end":99260},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":99260},"to":{"change":5,"start":99260,"end":99274},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":71272},"to":{"change":5,"start":973739,"end":973844},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":99274},"to":{"change":5,"start":973739,"end":973844},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":973739},"to":{"change":5,"start":973739,"end":973844},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":973844},"to":{"change":5,"start":973844,"end":973970},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":973970},"to":{"change":5,"start":973970,"end":974075},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":974075},"to":{"change":5,"start":99275,"end":99350},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":99350},"to":{"change":5,"start":974094,"end":974108},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":974094},"to":{"change":5,"start":974094,"end":974108},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":974108},"to":{"change":5,"start":974108,"end":974125},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":974125},"to":{"change":5,"start":71273,"end":71305},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" .map_err(LocalApplyError::from_missing)?"},{"Add":" } else if !p.flag.is_folder() {"},{"Add":" crate::missing_context::repair_missing_up_context("}],"del_contents":[{"Del":" .map_err(LocalApplyError::Txn)?\n"},{"Del":" {\n"},{"Del":" // repair up context.\n crate::missing_context::repair_missing_up_context(\n"},{"Del":" txn,\n channel,\n &mut ws.missing_context,\n inode,\n"},{"Del":" a,\n &[b],\n p.flag.contains(EdgeFlags::FOLDER),\n"},{"Del":" )\n .map_err(LocalApplyError::from_missing)?\n"},{"Del":" }\n"},{"Del":" } else {\n"},{"Del":" del_graph_with_rev(\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":792,"ins":{"up_context":[{"change":5,"pos":71351}],"down_context":[{"change":5,"pos":71395}],"flag":"","start":21579,"end":21670,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":71351},"to":{"change":5,"start":71351,"end":71395},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" &mut ws.missing_context,"},{"Add":" change_id,"},{"Add":" inode,"}],"del_contents":[{"Del":" p.flag - EdgeFlags::PARENT,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":796,"ins":{"up_context":[{"change":5,"pos":71414}],"down_context":[{"change":5,"pos":99351}],"flag":"","start":21671,"end":21693,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":71414},"to":{"change":5,"start":71414,"end":71466},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" &[b],"}],"del_contents":[{"Del":" b,\n p.introduced_by,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":798,"ins":{"up_context":[{"change":5,"pos":99365}],"down_context":[{"change":5,"pos":974222}],"flag":"","start":21694,"end":21747,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":99365},"to":{"change":5,"start":99365,"end":99410},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" .map_err(LocalApplyError::from_missing)?"}],"del_contents":[{"Del":" .map_err(LocalApplyError::Txn)?;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":816,"ins":{"up_context":[{"change":5,"pos":974716}],"down_context":[{"change":5,"pos":974756}],"flag":"","start":21748,"end":21811,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":974716},"to":{"change":5,"start":974716,"end":974756},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" Atom::NewVertex(ref n) if !n.flag.is_folder() => {"}],"del_contents":[{"Del":" Atom::NewVertex(ref n) => {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":822,"ins":{"up_context":[{"change":5,"pos":974920}],"down_context":[{"change":5,"pos":976945}],"flag":"","start":21812,"end":21988,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":974920},"to":{"change":5,"start":974920,"end":975038},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":975038},"to":{"change":5,"start":71483,"end":71579},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":71579},"to":{"change":5,"start":975132,"end":975133},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":975132},"to":{"change":5,"start":975132,"end":975133},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":975133},"to":{"change":5,"start":71580,"end":71633},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":71633},"to":{"change":5,"start":975185,"end":975617},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":975185},"to":{"change":5,"start":975185,"end":975617},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":975617},"to":{"change":5,"start":99601,"end":99692},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":99692},"to":{"change":5,"start":975644,"end":975797},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":975644},"to":{"change":5,"start":975644,"end":975797},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":975797},"to":{"change":5,"start":71634,"end":72020},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":72020},"to":{"change":5,"start":1712,"end":1776},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1776},"to":{"change":5,"start":72118,"end":72153},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":72118},"to":{"change":5,"start":72118,"end":72153},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":72153},"to":{"change":5,"start":976346,"end":976780},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":976346},"to":{"change":5,"start":976346,"end":976780},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":976780},"to":{"change":5,"start":99693,"end":99792},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":99792},"to":{"change":5,"start":976811,"end":976945},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":976811},"to":{"change":5,"start":976811,"end":976945},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" repair_new_vertex_context_up(txn, channel, ws, change_id, n, vertex)?;"},{"Add":" repair_new_vertex_context_down(txn, channel, ws, change_id, n, vertex)?;"}],"del_contents":[{"Del":" debug!(\"repairing missing context for {:?}\", vertex);\n for up in n.up_context.iter() {\n"},{"Del":" let up = find_block_end(txn, channel, internal_pos(txn, &up, change_id)?)?;\n"},{"Del":"\n"},{"Del":" if !is_alive(txn, channel, up) {\n"},{"Del":" debug!(\"repairing missing up context {:?} {:?}\", up, vertex);\n repair_missing_up_context(\n txn,\n channel,\n &mut ws.missing_context,\n n.inode,\n up,\n &[vertex],\n n.flag.contains(EdgeFlags::FOLDER),\n"},{"Del":" )\n .map_err(LocalApplyError::from_missing)?\n"},{"Del":" }\n }\n if !n.flag.contains(EdgeFlags::FOLDER) {\n for down in n.down_context.iter() {\n"},{"Del":" let down = find_block(txn, channel, internal_pos(txn, &down, change_id)?)?;\n if iter_adjacent(\n txn,\n channel,\n down,\n EdgeFlags::PARENT,\n EdgeFlags::all() - EdgeFlags::DELETED,\n )\n"},{"Del":" .find(|e| e.introduced_by != change_id)\n"},{"Del":" .is_none()\n"},{"Del":" {\n debug!(\"repairing missing down context {:?} {:?}\", down, vertex);\n repair_missing_down_context(\n txn,\n channel,\n &mut ws.missing_context,\n n.inode,\n down,\n &[vertex],\n"},{"Del":" )\n .map_err(LocalApplyError::from_missing)?\n"},{"Del":" }\n }\n }\n debug!(\"done repairing contexts for {:?}\", vertex);\n"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":825,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":976959}],"down_context":[{"change":5,"pos":976959}],"flag":"","start":21989,"end":22026,"inode":{"change":5,"pos":944089}}},"contents":[{"Add":" Atom::NewVertex(_) => {}"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":827,"ins":{"up_context":[{"change":5,"pos":976997}],"down_context":[{"change":5,"pos":977637}],"flag":"","start":22027,"end":22105,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":976997},"to":{"change":5,"start":976997,"end":977570},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":977570},"to":{"change":5,"start":99793,"end":99884},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":99884},"to":{"change":5,"start":977597,"end":977637},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":977597},"to":{"change":5,"start":977597,"end":977637},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" repair_edge_context(txn, channel, ws, change_id, change, n)?;"}],"del_contents":[{"Del":" for e in n.edges.iter() {\n assert!(!e.flag.contains(EdgeFlags::PARENT));\n if !e.flag.contains(EdgeFlags::DELETED) {\n trace!(\"repairing context nondeleted {:?}\", e);\n repair_context_nondeleted(\n txn,\n channel,\n &mut ws.missing_context,\n n.inode,\n change_id,\n |h| change.knows(&h),\n e,\n"},{"Del":" )\n .map_err(LocalApplyError::from_missing)?\n"},{"Del":" }\n }\n"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":831,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":977667},"to":{"change":5,"start":977667,"end":977730},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":977730},"to":{"change":5,"start":7144,"end":7639},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":7639},"to":{"change":5,"start":99885,"end":99968},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":7662},"to":{"change":5,"start":978338,"end":978356},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":99968},"to":{"change":5,"start":978338,"end":978356},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":978338},"to":{"change":5,"start":978338,"end":978356},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":978356},"to":{"change":5,"start":978356,"end":978370},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":978390},"to":{"change":5,"start":978390,"end":978406},"introduced_by":5}],"inode":{"change":5,"pos":944089}}},"contents":[{"Del":" for atom in change.changes.iter().flat_map(|r| r.iter()) {\n"},{"Del":" if let Atom::EdgeMap(ref n) = atom {\n for e in &n.edges {\n if e.flag.contains(EdgeFlags::DELETED) {\n trace!(\"repairing context deleted {:?}\", e);\n repair_context_deleted(\n txn,\n channel,\n &mut ws.missing_context,\n n.inode,\n change_id,\n |h| change.knows(&h),\n e,\n"},{"Del":" )\n .map_err(LocalApplyError::from_missing)?\n"},{"Del":" }\n"},{"Del":" }\n"},{"Del":" }\n }\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":837,"ins":{"up_context":[{"change":5,"pos":1062}],"down_context":[{"change":5,"pos":978666}],"flag":"","start":22106,"end":24044,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":1062},"to":{"change":5,"start":978630,"end":978666},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":978630},"to":{"change":5,"start":978630,"end":978666},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":"fn repair_new_vertex_context_up("},{"Add":" txn: &mut T,"},{"Add":" channel: &mut Channel,"},{"Add":" ws: &mut Workspace,"},{"Add":" change_id: ChangeId,"},{"Add":" n: &NewVertex>,"},{"Add":" vertex: Vertex,"},{"Add":") -> Result<(), LocalApplyError> {"},{"Add":" for up in n.up_context.iter() {"},{"Add":" let up = find_block_end(txn, channel, internal_pos(txn, &up, change_id)?)?;"},{"Add":" if !is_alive(txn, channel, up) {"},{"Add":" debug!(\"repairing missing up context {:?} {:?}\", up, vertex);"},{"Add":" repair_missing_up_context("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" &mut ws.missing_context,"},{"Add":" change_id,"},{"Add":" n.inode,"},{"Add":" up,"},{"Add":" &[vertex],"},{"Add":" )"},{"Add":" .map_err(LocalApplyError::from_missing)?"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"fn repair_new_vertex_context_down("},{"Add":" txn: &mut T,"},{"Add":" channel: &mut Channel,"},{"Add":" ws: &mut Workspace,"},{"Add":" change_id: ChangeId,"},{"Add":" n: &NewVertex>,"},{"Add":" vertex: Vertex,"},{"Add":") -> Result<(), LocalApplyError> {"},{"Add":" debug!(\"repairing missing context for {:?}\", vertex);"},{"Add":" if n.flag.contains(EdgeFlags::FOLDER) {"},{"Add":" return Ok(());"},{"Add":" }"},{"Add":" for down in n.down_context.iter() {"},{"Add":" let down = find_block(txn, channel, internal_pos(txn, &down, change_id)?)?;"},{"Add":" if iter_adjacent("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" down,"},{"Add":" EdgeFlags::PARENT,"},{"Add":" EdgeFlags::all() - EdgeFlags::DELETED,"},{"Add":" )"},{"Add":" .any(|e| e.introduced_by != change_id)"},{"Add":" {"},{"Add":" continue;"},{"Add":" }"},{"Add":" debug!(\"repairing missing down context {:?} {:?}\", down, vertex);"},{"Add":" repair_missing_down_context("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" &mut ws.missing_context,"},{"Add":" n.inode,"},{"Add":" down,"},{"Add":" &[vertex],"},{"Add":" )"},{"Add":" .map_err(LocalApplyError::from_missing)?"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"fn repair_edge_context("}],"del_contents":[{"Del":"fn repair_cyclic_paths(\n"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":909,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":978783}],"down_context":[{"change":5,"pos":100107}],"flag":"","start":24045,"end":25137,"inode":{"change":5,"pos":944089}}},"contents":[{"Add":" n: &EdgeMap>,"},{"Add":") -> Result<(), LocalApplyError> {"},{"Add":" for e in n.edges.iter() {"},{"Add":" assert!(!e.flag.contains(EdgeFlags::PARENT));"},{"Add":" if e.flag.contains(EdgeFlags::DELETED) {"},{"Add":" trace!(\"repairing context deleted {:?}\", e);"},{"Add":" repair_context_deleted("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" &mut ws.missing_context,"},{"Add":" n.inode,"},{"Add":" change_id,"},{"Add":" |h| change.knows(&h),"},{"Add":" e,"},{"Add":" )"},{"Add":" .map_err(LocalApplyError::from_missing)?"},{"Add":" } else {"},{"Add":" trace!(\"repairing context nondeleted {:?}\", e);"},{"Add":" repair_context_nondeleted("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" &mut ws.missing_context,"},{"Add":" n.inode,"},{"Add":" change_id,"},{"Add":" |h| change.knows(&h),"},{"Add":" e,"},{"Add":" )"},{"Add":" .map_err(LocalApplyError::from_missing)?"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"pub(crate) fn repair_cyclic_paths("},{"Add":" txn: &mut T,"},{"Add":" channel: &mut Channel,"},{"Add":" ws: &mut Workspace,"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":948,"ins":{"up_context":[{"change":5,"pos":978857}],"down_context":[{"change":5,"pos":979334}],"flag":"","start":25138,"end":25787,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":978857},"to":{"change":5,"start":978857,"end":978920},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":978920},"to":{"change":5,"start":1777,"end":2083},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" let mut files = std::mem::replace(&mut ws.missing_context.files, HashSet::new());"},{"Add":" for file in files.drain() {"},{"Add":" if file.is_empty() {"},{"Add":" if !is_rooted(txn, channel, file, ws)? {"},{"Add":" repair_edge(txn, channel, file, ws)?"},{"Add":" }"},{"Add":" } else {"},{"Add":" let f0 = EdgeFlags::FOLDER;"},{"Add":" let f1 = EdgeFlags::FOLDER | EdgeFlags::BLOCK | EdgeFlags::PSEUDO;"},{"Add":" if let Some(ee) = iter_adjacent(txn, channel, file, f0, f1).next() {"},{"Add":" let dest = ee.dest.inode_vertex();"},{"Add":" if !is_rooted(txn, channel, dest, ws)? {"},{"Add":" repair_edge(txn, channel, dest, ws)?"}],"del_contents":[{"Del":" for atom in change.changes.iter().flat_map(|r| r.iter()) {\n"},{"Del":" if let Atom::EdgeMap(ref n) = atom {\n for e in n.edges.iter() {\n assert!(!e.flag.contains(EdgeFlags::PARENT));\n if e.flag.contains(EdgeFlags::FOLDER | EdgeFlags::DELETED) && e.to.len() > 0 {\n repair_edge(txn, channel, e, change_id, ws)?;\n"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":965,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":979402}],"down_context":[{"change":5,"pos":979402}],"flag":"","start":25788,"end":25826,"inode":{"change":5,"pos":944089}}},"contents":[{"Add":" ws.missing_context.files = files;"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":973,"ins":{"up_context":[{"change":5,"pos":979562}],"down_context":[{"change":5,"pos":979618}],"flag":"","start":25827,"end":25854,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":979562},"to":{"change":5,"start":979562,"end":979618},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" to0: Vertex,"}],"del_contents":[{"Del":" e: &NewEdge>,\n change_id: ChangeId,\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":976,"ins":{"up_context":[{"change":5,"pos":100198}],"down_context":[{"change":5,"pos":979916}],"flag":"","start":25855,"end":27274,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":100198},"to":{"change":5,"start":979675,"end":979916},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":979675},"to":{"change":5,"start":979675,"end":979916},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" debug!(\"repair_edge {:?}\", to0);"},{"Add":" let mut stack = vec![(to0, true, true, true)];"},{"Add":" ws.parents.clear();"},{"Add":" while let Some((current, _, al, anc_al)) = stack.pop() {"},{"Add":" if !ws.parents.insert(current) {"},{"Add":" continue;"},{"Add":" }"},{"Add":" debug!(\"repair_cyclic {:?}\", current);"},{"Add":" if current != to0 {"},{"Add":" stack.push((current, true, al, anc_al));"},{"Add":" }"},{"Add":" if current.is_root() {"},{"Add":" debug!(\"root\");"},{"Add":" break;"},{"Add":" }"},{"Add":" if let Some(&true) = ws.rooted.get(¤t) {"},{"Add":" debug!(\"rooted\");"},{"Add":" break;"},{"Add":" }"},{"Add":" let f = EdgeFlags::PARENT | EdgeFlags::FOLDER;"},{"Add":" let len = stack.len();"},{"Add":" for parent in iter_adjacent(txn, channel, current, f, EdgeFlags::all()) {"},{"Add":" if parent.flag.is_parent() {"},{"Add":" let anc = find_block_end(txn, channel, parent.dest)?;"},{"Add":" debug!(\"is_rooted, parent = {:?}\", parent);"},{"Add":" let al = iter_adjacent("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" anc,"},{"Add":" f,"},{"Add":" f | EdgeFlags::BLOCK | EdgeFlags::PSEUDO,"},{"Add":" )"},{"Add":" .next()"},{"Add":" .is_some();"},{"Add":" debug!(\"al = {:?}, flag = {:?}\", al, parent.flag);"},{"Add":" stack.push((anc, false, parent.flag.is_deleted(), al));"},{"Add":" }"},{"Add":" }"},{"Add":" if stack.len() == len {"},{"Add":" stack.pop();"}],"del_contents":[{"Del":" // If we're deleting a name and not a whole file.\n let h = if let Some(h) = e.to.change {\n h\n } else {\n return Ok(());\n };\n let to = Vertex {\n change: if let Some(h) = txn.get_internal(h) {\n h\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":1017,"ins":{"up_context":[{"change":5,"pos":979933}],"down_context":[{"change":5,"pos":980413}],"flag":"","start":27275,"end":27346,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":979933},"to":{"change":5,"start":100199,"end":100272},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":100272},"to":{"change":5,"start":979998,"end":980262},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":979998},"to":{"change":5,"start":979998,"end":980262},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":980262},"to":{"change":5,"start":72154,"end":72210},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":72210},"to":{"change":5,"start":980317,"end":980413},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":980317},"to":{"change":5,"start":980317,"end":980413},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" (&mut stack[len..]).sort_unstable_by(|a, b| a.3.cmp(&b.3))"}],"del_contents":[{"Del":" return Err((crate::pristine::InconsistentChange {}).into());\n"},{"Del":" },\n start: e.to.start,\n end: e.to.end,\n };\n // Check that the inode descendant of this name is rooted.\n let mut unrooted = false;\n let f0 = EdgeFlags::FOLDER;\n let f1 = EdgeFlags::FOLDER | EdgeFlags::BLOCK | EdgeFlags::PSEUDO;\n"},{"Del":" for ee in iter_adjacent(txn, channel, to, f0, f1) {\n"},{"Del":" if !is_rooted(txn, channel, ee.dest.inode_vertex(), ws)? {\n unrooted = true;\n"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":1020,"ins":{"up_context":[{"change":5,"pos":980429}],"down_context":[{"change":5,"pos":980795}],"flag":"","start":27347,"end":27817,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":980429},"to":{"change":5,"start":980429,"end":980470},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":980470},"to":{"change":5,"start":72211,"end":72301},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":72301},"to":{"change":5,"start":980558,"end":980617},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":980558},"to":{"change":5,"start":980558,"end":980617},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":980617},"to":{"change":5,"start":72302,"end":72347},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":72347},"to":{"change":5,"start":980649,"end":980783},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":980649},"to":{"change":5,"start":980649,"end":980783},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":980783},"to":{"change":5,"start":100273,"end":100324},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" let mut current = to0;"},{"Add":" for (next, on_path, del, _) in stack {"},{"Add":" if on_path {"},{"Add":" if del {"},{"Add":" put_graph_with_rev("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" EdgeFlags::FOLDER | EdgeFlags::PSEUDO,"},{"Add":" next,"},{"Add":" current,"},{"Add":" ChangeId::ROOT,"},{"Add":" )"},{"Add":" .map_err(LocalApplyError::Txn)?;"},{"Add":" }"},{"Add":" current = next"},{"Add":" }"}],"del_contents":[{"Del":" // If not, repair.\n if unrooted {\n"},{"Del":" let from = find_block_end(txn, channel, internal_pos(txn, &e.from, change_id)?)?;\n"},{"Del":" debug!(\"repairing unrooted: {:?} {:?}\", from, to);\n"},{"Del":" put_graph_with_rev(\n txn,\n"},{"Del":" channel,\n EdgeFlags::FOLDER | EdgeFlags::PSEUDO,\n from,\n to,\n ChangeId::ROOT,\n"},{"Del":" )\n .map_err(LocalApplyError::Txn)?;\n"}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":1046,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":100372}],"down_context":[{"change":5,"pos":980960}],"flag":"","start":27818,"end":28348,"inode":{"change":5,"pos":944089}}},"contents":[{"Add":" let mut alive = false;"},{"Add":" assert!(v.is_empty());"},{"Add":" for e in iter_adjacent(txn, channel, v, EdgeFlags::empty(), EdgeFlags::all()) {"},{"Add":" if e.flag.contains(EdgeFlags::PARENT) {"},{"Add":" if e.flag & (EdgeFlags::FOLDER | EdgeFlags::DELETED) == EdgeFlags::FOLDER {"},{"Add":" alive = true;"},{"Add":" break;"},{"Add":" }"},{"Add":" } else if !e.flag.is_deleted() {"},{"Add":" alive = true;"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" if !alive {"},{"Add":" debug!(\"is_rooted, not alive\");"},{"Add":" return Ok(true);"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":1102,"ins":{"up_context":[{"change":5,"pos":982036}],"down_context":[{"change":5,"pos":982135}],"flag":"","start":28349,"end":28416,"inode":{"change":5,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":982036},"to":{"change":5,"start":72521,"end":72590},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":72590},"to":{"change":5,"start":982104,"end":982135},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":982104},"to":{"change":5,"start":982104,"end":982135},"introduced_by":5}],"inode":{"change":5,"pos":944089}},"ins_contents":[{"Add":" stack.push(find_block_end(txn, channel, parent.dest)?)"}],"del_contents":[{"Del":" let parent = find_block_end(txn, channel, parent.dest)?;\n"},{"Del":" stack.push(parent)\n"}]}}],"owner":"irevoire","repo":"pijul","token":"dabN/tDWPiT8LqLEfNUoQrhucDoBVFdFs4PdVc8drBc=","login":null}

…

Dependencies

Change contents