{"header":{"message":"Fixing a bug in unrecord","description":null,"timestamp":"2021-01-07T19:07:34.002570403Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"JACZYXK43IU5HWLHQBY3BOAE7CUO6NGEXQ3HSZL3CQP3SLGKMBOAC","authors":[],"deps":{"hashes":[["JACZYXK43IU5HWLHQBY3BOAE7CUO6NGEXQ3HSZL3CQP3SLGKMBOAC","Fixing a bug in unrecord"],["AA",null],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","Refactoring apply"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["BD5PC25AB5MKVIYDFSDGRZ4YGX4PKW4SMZ3YAYAPNA5HLDVJUR3QC","Deleting conflict resolution vertices when the sides are deleted"],["76PCXGML77EZWTRI5E6KHLVRAFTJ2AB5YRN5EKOYNAPKTWY2KCGAC","Pushing to, and pulling from the local repository"]],"deps":["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","BD5PC25AB5MKVIYDFSDGRZ4YGX4PKW4SMZ3YAYAPNA5HLDVJUR3QC","6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC"]},"hunks":[{"Edit":{"inode":{"change":3,"pos":52474},"path":"pijul/src/remote/mod.rs","line":94,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":772}],"down_context":[{"change":3,"pos":54644}],"flag":"BLOCK","start":0,"end":53,"inode":{"change":3,"pos":52474}}},"contents":[{"Add":" root: Path::new(name).to_path_buf(),"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":79,"ins":{"up_context":[{"change":3,"pos":219820}],"down_context":[{"change":3,"pos":5817}],"flag":"BLOCK","start":54,"end":134,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":219820},"to":{"change":3,"start":5737,"end":5817},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" fn output_line(&mut self, v: Vertex, c: C) -> Result<(), E>"}],"del_contents":[{"Del":" fn output_line(&mut self, _: Vertex, c: C) -> Result<(), E>\n"}]}},{"Edit":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":86,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":220046}],"down_context":[{"change":3,"pos":220046}],"flag":"BLOCK","start":135,"end":204,"inode":{"change":3,"pos":217202}}},"contents":[{"Add":" debug!(\"vbuf {:?} {:?}\", v, std::str::from_utf8(&self.buf));"}]}},{"Replacement":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":168,"ins":{"up_context":[{"change":3,"pos":222360}],"down_context":[{"change":3,"pos":6292}],"flag":"BLOCK","start":205,"end":285,"inode":{"change":3,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":222360},"to":{"change":3,"start":6212,"end":6292},"introduced_by":3}],"inode":{"change":3,"pos":217202}},"ins_contents":[{"Add":" fn output_line(&mut self, v: Vertex, c: C) -> Result<(), E>"}],"del_contents":[{"Del":" fn output_line(&mut self, _: Vertex, c: C) -> Result<(), E>\n"}]}},{"Edit":{"inode":{"change":3,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":175,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":222586}],"down_context":[{"change":3,"pos":222586}],"flag":"BLOCK","start":286,"end":355,"inode":{"change":3,"pos":217202}}},"contents":[{"Add":" debug!(\"vbuf {:?} {:?}\", v, std::str::from_utf8(&self.buf));"}]}},{"Replacement":{"inode":{"change":3,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":522,"ins":{"up_context":[{"change":3,"pos":247825}],"down_context":[{"change":3,"pos":4025}],"flag":"BLOCK","start":356,"end":418,"inode":{"change":3,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":247825},"to":{"change":3,"start":247825,"end":247885},"introduced_by":3}],"inode":{"change":3,"pos":231493}},"ins_contents":[{"Add":" |h| changes.knows(&change_hash, &h).unwrap(),"}],"del_contents":[{"Del":" |h| changes.knows(&intro_ext, &h).unwrap(),\n"}]}},{"Edit":{"inode":{"change":3,"pos":696460},"path":"libpijul/src/missing_context.rs","line":172,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":89764}],"down_context":[{"change":3,"pos":11056}],"flag":"BLOCK","start":419,"end":481,"inode":{"change":3,"pos":696460}}},"contents":[{"Add":" debug!(\"deleted by unknown, repairing {:?}\", source);"}]}},{"Replacement":{"inode":{"change":3,"pos":696460},"path":"libpijul/src/missing_context.rs","line":177,"ins":{"up_context":[{"change":3,"pos":11219}],"down_context":[{"change":3,"pos":11301}],"flag":"BLOCK","start":482,"end":754,"inode":{"change":3,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":11219},"to":{"change":3,"start":11219,"end":11301},"introduced_by":3}],"inode":{"change":3,"pos":696460}},"ins_contents":[{"Add":" if e.flag.contains(EdgeFlags::BLOCK) {"},{"Add":" repair_missing_down_context(txn, channel, ws, inode, target, &[target])?;"},{"Add":" } else if is_alive(txn, channel, source)? {"},{"Add":" repair_missing_down_context(txn, channel, ws, inode, target, &[source])?;"},{"Add":" }"},{"Add":" Ok(())"}],"del_contents":[{"Del":" reconnect_target_down(txn, channel, ws, inode, target, change_id, &mut known)\n"}]}},{"Edit":{"inode":{"change":3,"pos":696460},"path":"libpijul/src/missing_context.rs","line":209,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":11910},"to":{"change":3,"start":704864,"end":704870},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":704864},"to":{"change":3,"start":704864,"end":704870},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":704870},"to":{"change":3,"start":11911,"end":11924},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":11924},"to":{"change":3,"start":704870,"end":704871},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":704870},"to":{"change":3,"start":704870,"end":704871},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":704871},"to":{"change":2,"start":89964,"end":90010},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":90010},"to":{"change":3,"start":11966,"end":11983},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":11966},"to":{"change":3,"start":11966,"end":11983},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":11983},"to":{"change":2,"start":90011,"end":90039},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":90039},"to":{"change":3,"start":12013,"end":12146},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":12013},"to":{"change":3,"start":12013,"end":12146},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":12146},"to":{"change":2,"start":90040,"end":90085},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":90085},"to":{"change":3,"start":12186,"end":12222},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":12186},"to":{"change":3,"start":12186,"end":12222},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":12222},"to":{"change":3,"start":704871,"end":705017},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":704871},"to":{"change":3,"start":704871,"end":705017},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":705017},"to":{"change":2,"start":90086,"end":90157},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":3,"pos":57956},"to":{"change":3,"start":705105,"end":705429},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":90157},"to":{"change":3,"start":705105,"end":705429},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":3,"pos":12273},"to":{"change":3,"start":705105,"end":705429},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":705105},"to":{"change":3,"start":705105,"end":705429},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":705429},"to":{"change":2,"start":90158,"end":90223},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":90223},"to":{"change":3,"start":705493,"end":705601},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":705493},"to":{"change":3,"start":705493,"end":705601},"introduced_by":3}],"inode":{"change":3,"pos":696460}}},"contents":[{"Del":" }\n"},{"Del":" Ok(())\n}\n"},{"Del":"\n"},{"Del":"fn reconnect_target_down(\n"},{"Del":" txn: &mut T,\n"},{"Del":" channel: &mut T::Graph,\n"},{"Del":" ws: &mut Workspace,\n inode: Position>,\n target: Vertex,\n change_id: ChangeId,\n known: &mut K,\n"},{"Del":") -> Result<(), MissingError>\n"},{"Del":"where\n K: FnMut(Hash) -> bool,\n{\n"},{"Del":" // Finally, we fix the down context of target, i.e. collecting unknown deleted children.\n let mut children_are_deleted_by_unknown = false;\n"},{"Del":" for v in iter_adj_all(txn, channel, target)? {\n let v = v?;\n"},{"Del":" if !v.flag.contains(EdgeFlags::DELETED)\n || v.flag.contains(EdgeFlags::PARENT)\n || v.introduced_by == change_id\n || v.dest.change.is_root()\n || v.introduced_by.is_root()\n {\n continue;\n }\n\n // This unwrap is ok, since `v` is in the channel.\n"},{"Del":" let intro = txn.get_external(v.introduced_by)?.unwrap();\n"},{"Del":" if !known(intro) {\n children_are_deleted_by_unknown = true;\n break;\n }\n"}]}},{"Edit":{"inode":{"change":3,"pos":696460},"path":"libpijul/src/missing_context.rs","line":210,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":705607},"to":{"change":3,"start":705607,"end":705736},"introduced_by":3}],"inode":{"change":3,"pos":696460}}},"contents":[{"Del":" if children_are_deleted_by_unknown {\n repair_missing_down_context(txn, channel, ws, inode, target, &[target])?;\n }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":984582},"path":"libpijul/src/alive/retrieve.rs","line":59,"ins":{"up_context":[{"change":3,"pos":986530}],"down_context":[{"change":3,"pos":986574}],"flag":"BLOCK","start":755,"end":799,"inode":{"change":3,"pos":984582}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":986530},"to":{"change":3,"start":986530,"end":986574},"introduced_by":3}],"inode":{"change":3,"pos":984582}},"ins_contents":[{"Add":" trace!(\"child {:?}\", dest_vid);"}],"del_contents":[{"Del":" debug!(\"child {:?}\", dest_vid);\n"}]}},{"Edit":{"inode":{"change":3,"pos":984582},"path":"libpijul/src/alive/retrieve.rs","line":77,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":134778}],"down_context":[{"change":2,"pos":134778}],"flag":"BLOCK","start":800,"end":843,"inode":{"change":3,"pos":984582}}},"contents":[{"Add":" debug!(\"not alive: {:?}\", vertex);"}]}},{"Edit":{"inode":{"change":3,"pos":984582},"path":"libpijul/src/alive/retrieve.rs","line":96,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":2210}],"down_context":[{"change":2,"pos":135224}],"flag":"BLOCK","start":844,"end":895,"inode":{"change":3,"pos":984582}}},"contents":[{"Add":" debug!(\"flags for {:?}: {:?}\", vertex, flags);"}]}}],"owner":"irevoire","repo":"pijul","token":"qOu8LGrI+3Cw2woczNdT7q2QMwbV2gkMcn8G0CFTOWc=","login":null}

…

Dependencies

Change contents