{"header":{"message":"Fixing a bug in unrecord","description":"Edge reintroduction was happening while reintroducing parallel edges, which was confusing everything","timestamp":"2021-05-09T20:59:55.735039351Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"IXC43DSHDSXCE2X6H6N47GGVKTYM2D2BUUWF34CFWMFT6Z45NOOAC","authors":[],"deps":{"hashes":[["IXC43DSHDSXCE2X6H6N47GGVKTYM2D2BUUWF34CFWMFT6Z45NOOAC","Fixing a bug in unrecord"],["AA",null],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","Refactoring iterators"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","Refactoring apply"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["23LVKATNTT74YKHG7KJM6SBO2IVZEV24TQ46ZJIHQ2IXONWNVXJAC","Use pager crate for log output"]],"deps":["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC"]},"hunks":[{"Edit":{"inode":{"change":3,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":230,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":16786}],"down_context":[{"change":3,"pos":235977}],"flag":"BLOCK","start":0,"end":69,"inode":{"change":3,"pos":231493}}},"contents":[{"Add":" must_reintroduce: HashSet<(Vertex, Vertex)>,"}]}},{"Edit":{"inode":{"change":3,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":369,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":17932}],"down_context":[{"change":3,"pos":240757}],"flag":"BLOCK","start":70,"end":1099,"inode":{"change":3,"pos":231493}}},"contents":[{"Add":" ws.must_reintroduce.clear();"},{"Add":" for n in newedges.edges.iter() {"},{"Add":" let mut source = crate::apply::edge::find_source_vertex(txn, channel, &n.from, change_id, newedges.inode, n.flag, &mut ws.apply)?;"},{"Add":" let mut target = crate::apply::edge::find_target_vertex(txn, channel, &n.to, change_id, newedges.inode, n.flag, &mut ws.apply)?;"},{"Add":" loop {"},{"Add":" let intro_ext = n.introduced_by.unwrap_or(ext);"},{"Add":" let intro = internal(txn, &n.introduced_by, change_id)?.unwrap();"},{"Add":" if must_reintroduce(txn, channel, changes, source, target, intro_ext, intro, change_id)? {"},{"Add":" ws.must_reintroduce.insert((source, target));"},{"Add":" }"},{"Add":" if target.end >= n.to.end {"},{"Add":" break;"},{"Add":" }"},{"Add":" source = target;"},{"Add":" target = *txn"},{"Add":" .find_block(channel, target.end_pos())"},{"Add":" .map_err(UnrecordError::from)?;"},{"Add":" assert_ne!(source, target);"},{"Add":" }"},{"Add":" }"},{"Add":" let reintro = std::mem::take(&mut ws.must_reintroduce);"}]}},{"Replacement":{"inode":{"change":3,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":399,"ins":{"up_context":[{"change":3,"pos":1845}],"down_context":[{"change":2,"pos":30211}],"flag":"BLOCK","start":1100,"end":1146,"inode":{"change":3,"pos":231493}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":1845},"to":{"change":3,"start":241314,"end":241349},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":241314},"to":{"change":3,"start":241314,"end":241349},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":241349},"to":{"change":3,"start":1846,"end":1931},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1931},"to":{"change":3,"start":241604,"end":241619},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":241604},"to":{"change":3,"start":241604,"end":241619},"introduced_by":3}],"inode":{"change":3,"pos":231493}},"ins_contents":[{"Add":" |a, b| reintro.contains(&(a, b)),"}],"del_contents":[{"Del":" |txn, channel, a, b| {\n"},{"Del":" must_reintroduce(txn, channel, changes, a, b, ext, intro, change_id)\n"},{"Del":" },\n"}]}},{"Edit":{"inode":{"change":3,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":403,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":241637}],"down_context":[{"change":3,"pos":241961}],"flag":"BLOCK","start":1147,"end":1215,"inode":{"change":3,"pos":231493}}},"contents":[{"Add":" ws.must_reintroduce = reintro;"},{"Add":" ws.must_reintroduce.clear();"}]}},{"Replacement":{"inode":{"change":3,"pos":944089},"path":"libpijul/src/apply.rs","line":9,"ins":{"up_context":[{"change":3,"pos":93417}],"down_context":[{"change":2,"pos":89930}],"flag":"BLOCK","start":1216,"end":1237,"inode":{"change":3,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":93417},"to":{"change":2,"start":89920,"end":89930},"introduced_by":2}],"inode":{"change":3,"pos":944089}},"ins_contents":[{"Add":"pub(crate) mod edge;"}],"del_contents":[{"Del":"mod edge;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":944089},"path":"libpijul/src/apply.rs","line":248,"ins":{"up_context":[{"change":3,"pos":950014}],"down_context":[{"change":2,"pos":90134}],"flag":"BLOCK","start":1238,"end":1283,"inode":{"change":3,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":950014},"to":{"change":3,"start":126004,"end":126099},"introduced_by":3}],"inode":{"change":3,"pos":944089}},"ins_contents":[{"Add":" |_, _| true,"}],"del_contents":[{"Del":" |_, _, _, _| Ok::>(true),\n"}]}},{"Replacement":{"inode":{"change":3,"pos":944089},"path":"libpijul/src/apply.rs","line":270,"ins":{"up_context":[{"change":3,"pos":126360}],"down_context":[{"change":2,"pos":90188}],"flag":"BLOCK","start":1284,"end":1325,"inode":{"change":3,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":126360},"to":{"change":3,"start":126360,"end":126451},"introduced_by":3}],"inode":{"change":3,"pos":944089}},"ins_contents":[{"Add":" |_, _| true,"}],"del_contents":[{"Del":" |_, _, _, _| Ok::>(true),\n"}]}},{"Replacement":{"inode":{"change":2,"pos":96160},"path":"libpijul/src/apply/edge.rs","line":6,"ins":{"up_context":[{"change":2,"pos":96273}],"down_context":[{"change":2,"pos":96305}],"flag":"BLOCK","start":1326,"end":1355,"inode":{"change":2,"pos":96160}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":96273},"to":{"change":2,"start":96273,"end":96305},"introduced_by":2}],"inode":{"change":2,"pos":96160}},"ins_contents":[{"Add":"pub fn put_newedge("}],"del_contents":[{"Del":"pub fn put_newedge(\n"}]}},{"Replacement":{"inode":{"change":2,"pos":96160},"path":"libpijul/src/apply/edge.rs","line":15,"ins":{"up_context":[{"change":2,"pos":96505}],"down_context":[{"change":2,"pos":96524}],"flag":"BLOCK","start":1356,"end":1404,"inode":{"change":2,"pos":96160}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":96505},"to":{"change":2,"start":96505,"end":96524},"introduced_by":2}],"inode":{"change":2,"pos":96160}},"ins_contents":[{"Add":") -> Result<(), LocalApplyError>"}],"del_contents":[{"Del":") -> Result<(), E>\n"}]}},{"Replacement":{"inode":{"change":2,"pos":96160},"path":"libpijul/src/apply/edge.rs","line":18,"ins":{"up_context":[{"change":2,"pos":96551}],"down_context":[{"change":2,"pos":96715}],"flag":"BLOCK","start":1405,"end":1460,"inode":{"change":2,"pos":96160}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":96551},"to":{"change":2,"start":96551,"end":96715},"introduced_by":2}],"inode":{"change":2,"pos":96160}},"ins_contents":[{"Add":" F: Fn(Vertex, Vertex) -> bool,"}],"del_contents":[{"Del":" E: From> + From>,\n F: Fn(&mut T, &mut T::Graph, Vertex, Vertex) -> Result,\n"}]}},{"Replacement":{"inode":{"change":2,"pos":96160},"path":"libpijul/src/apply/edge.rs","line":40,"ins":{"up_context":[{"change":2,"pos":97389}],"down_context":[{"change":2,"pos":97440}],"flag":"BLOCK","start":1461,"end":1509,"inode":{"change":2,"pos":96160}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":97389},"to":{"change":2,"start":97389,"end":97440},"introduced_by":2}],"inode":{"change":2,"pos":96160}},"ins_contents":[{"Add":" collect_nondeleted_zombies::<_, _>("}],"del_contents":[{"Del":" collect_nondeleted_zombies::<_, E, _>(\n"}]}},{"Replacement":{"inode":{"change":2,"pos":96160},"path":"libpijul/src/apply/edge.rs","line":68,"ins":{"up_context":[{"change":2,"pos":98413}],"down_context":[{"change":2,"pos":98467}],"flag":"BLOCK","start":1510,"end":1551,"inode":{"change":2,"pos":96160}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":98413},"to":{"change":2,"start":98413,"end":98467},"introduced_by":2}],"inode":{"change":2,"pos":96160}},"ins_contents":[{"Add":" if apply_check(source, target) {"}],"del_contents":[{"Del":" if apply_check(txn, graph, source, target)? {\n"}]}},{"Replacement":{"inode":{"change":2,"pos":96160},"path":"libpijul/src/apply/edge.rs","line":94,"ins":{"up_context":[{"change":2,"pos":99267}],"down_context":[{"change":2,"pos":99307}],"flag":"BLOCK","start":1552,"end":1589,"inode":{"change":2,"pos":96160}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":99267},"to":{"change":2,"start":99267,"end":99307},"introduced_by":2}],"inode":{"change":2,"pos":96160}},"ins_contents":[{"Add":"fn collect_nondeleted_zombies("}],"del_contents":[{"Del":"fn collect_nondeleted_zombies(\n"}]}},{"Replacement":{"inode":{"change":2,"pos":96160},"path":"libpijul/src/apply/edge.rs","line":101,"ins":{"up_context":[{"change":2,"pos":99461}],"down_context":[{"change":2,"pos":99480}],"flag":"BLOCK","start":1590,"end":1638,"inode":{"change":2,"pos":96160}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":99461},"to":{"change":2,"start":99461,"end":99480},"introduced_by":2}],"inode":{"change":2,"pos":96160}},"ins_contents":[{"Add":") -> Result<(), LocalApplyError>"}],"del_contents":[{"Del":") -> Result<(), E>\n"}]}},{"Edit":{"inode":{"change":2,"pos":96160},"path":"libpijul/src/apply/edge.rs","line":104,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":99507},"to":{"change":2,"start":99507,"end":99582},"introduced_by":2}],"inode":{"change":2,"pos":96160}}},"contents":[{"Del":" E: From> + From>,\n"}]}},{"Replacement":{"inode":{"change":2,"pos":96160},"path":"libpijul/src/apply/edge.rs","line":152,"ins":{"up_context":[{"change":2,"pos":100992}],"down_context":[{"change":2,"pos":101032}],"flag":"BLOCK","start":1639,"end":1690,"inode":{"change":2,"pos":96160}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":100992},"to":{"change":2,"start":100992,"end":101032},"introduced_by":2}],"inode":{"change":2,"pos":96160}},"ins_contents":[{"Add":"pub(crate) fn find_source_vertex("}],"del_contents":[{"Del":"fn find_source_vertex(\n"}]}},{"Replacement":{"inode":{"change":2,"pos":96160},"path":"libpijul/src/apply/edge.rs","line":173,"ins":{"up_context":[{"change":2,"pos":101745}],"down_context":[{"change":2,"pos":101785}],"flag":"BLOCK","start":1691,"end":1742,"inode":{"change":2,"pos":96160}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":101745},"to":{"change":2,"start":101745,"end":101785},"introduced_by":2}],"inode":{"change":2,"pos":96160}},"ins_contents":[{"Add":"pub(crate) fn find_target_vertex("}],"del_contents":[{"Del":"fn find_target_vertex(\n"}]}},{"Edit":{"inode":{"change":3,"pos":1030385},"path":"Cargo.lock","line":950,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":1055730}],"down_context":[{"change":3,"pos":1055730}],"flag":"BLOCK","start":1743,"end":1758,"inode":{"change":3,"pos":1030385}}},"contents":[{"Add":" \"path-slash\","}]}},{"Edit":{"inode":{"change":3,"pos":1030385},"path":"Cargo.lock","line":1278,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":1063641}],"down_context":[{"change":3,"pos":1063843}],"flag":"BLOCK","start":1759,"end":1953,"inode":{"change":3,"pos":1030385}}},"contents":[{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"path-slash\""},{"Add":"version = \"0.1.4\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"3cacbb3c4ff353b534a67fb8d7524d00229da4cb1dc8c79f4db96e375ab5b619\""}]}},{"Edit":{"inode":{"change":3,"pos":1030385},"path":"Cargo.lock","line":1317,"atom":{"NewVertex":{"up_context":[{"change":10,"pos":1067}],"down_context":[{"change":2,"pos":118314}],"flag":"BLOCK","start":1954,"end":1969,"inode":{"change":3,"pos":1030385}}},"contents":[{"Add":" \"path-slash\","}]}}],"owner":"irevoire","repo":"pijul","token":"l0sxdvDcpGIfGF7jl994NtDWIZLzg38UqawmtvHjRC8=","login":null}

…

Dependencies

Change contents