{"header":{"message":"Minor change in the type of sanakirja::GraphTxnT::Graph (prepare for more general backends)","description":null,"timestamp":"2021-12-06T09:18:04.469513428Z","authors":[{}]},"hash":"S2B5MEWPPG4P6SL5NWTVAHPRJ6YPKX3VTRONYS267ZTTTPA6L3GAC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["S2B5MEWPPG4P6SL5NWTVAHPRJ6YPKX3VTRONYS267ZTTTPA6L3GAC","Minor change in the type of sanakirja::GraphTxnT::Graph (prepare for more general backends)"],["AA",null],["IVLLXQ5ZWZDKHO4TNQG3TPXN34H6Y2WXPAGSO4PWCYNSKUZWOEJQC","Improved push/pull reporting"],["MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","Partial push and pull (WARNING: breaks the existing protocol)"],["2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","Making libpijul deterministic (and getting rid of `rand`)"],["3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","More convenient interface for channels"],["DJYHARZ7CSRMX6ZFM6P52SM2EC57VTSHWAIMFSD7Q3EL7UYZGLXQC","Skipping old files when recording"],["DF23IIGWXAIVX4EDVYTJ33Y65SIW7LJIZS2Z3QVADIJCIT6NEF4AC","New method to iterate on a graph: libpijul::pristine::GraphIter::iter_graph"],["5OGOE4VWS5AIG4U2UYLLIGA3HY6UB7SNQOSESHNXBLET3VQXFBZAC","Store the current channel in the pristine"],["TKEVOH7HXON7SOBGXTUDHAHO2U2GPTQRNESP6ERKUQAS526OZIRAC","Fixing a bug when downloading changes, and making change download more efficient (more async)"],["A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","Integrating identity malleability"],["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","Refactoring iterators"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["GUL4M5FIE7JYXJHR7MCTQS3543HIQXGPLBWZKASBAWWEA4SZ75CAC","Cleanup and formatting"],["EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","Updating Pijul with the latest changes in Libpijul"],["YD7QFAD7XC35U5N4DOS3B4MBJL4KWSHVEZ6OLO5RYXOUPFQNPQPAC","Simplifying pijul::remote::PushDelta"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["BZCGXVS77ZS3N4QPLIHNWZ3YFVV7H4PXQD3U6RN5ZFVOC7QL7MBQC","Fixing two bugs around conflicts on the last line, where invalid patches were produced (first bug) and applied (second bug)"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"]],"deps":["IVLLXQ5ZWZDKHO4TNQG3TPXN34H6Y2WXPAGSO4PWCYNSKUZWOEJQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","MU5GSJAW65PEG3BRYUKZ7O37BPHW3MOX3S5E2RFOXKGUOJEEDQ5AC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","DJYHARZ7CSRMX6ZFM6P52SM2EC57VTSHWAIMFSD7Q3EL7UYZGLXQC","3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","BZCGXVS77ZS3N4QPLIHNWZ3YFVV7H4PXQD3U6RN5ZFVOC7QL7MBQC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","TKEVOH7HXON7SOBGXTUDHAHO2U2GPTQRNESP6ERKUQAS526OZIRAC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","GUL4M5FIE7JYXJHR7MCTQS3543HIQXGPLBWZKASBAWWEA4SZ75CAC","5OGOE4VWS5AIG4U2UYLLIGA3HY6UB7SNQOSESHNXBLET3VQXFBZAC","A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","EUZFFJSOWV4PXDFFPDAFBHFUUMOFEU6ST7JH57YYRRR2SEOXLN6QC","DF23IIGWXAIVX4EDVYTJ33Y65SIW7LJIZS2Z3QVADIJCIT6NEF4AC","YD7QFAD7XC35U5N4DOS3B4MBJL4KWSHVEZ6OLO5RYXOUPFQNPQPAC"]},"hunks":[{"Replacement":{"inode":{"change":3,"pos":52474},"path":"pijul/src/remote/mod.rs","line":139,"ins":{"up_context":[{"change":2,"pos":739}],"down_context":[{"change":2,"pos":858}],"flag":"BLOCK","start":0,"end":96,"inode":{"change":3,"pos":52474}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":739},"to":{"change":2,"start":739,"end":858},"introduced_by":2}],"inode":{"change":3,"pos":52474}},"ins_contents":[{"Add":" libpijul::fs::iter_graph_descendants(txn, &channel.read(), p)?.map(|x| x.unwrap()),"}],"del_contents":[{"Del":" libpijul::fs::iter_graph_descendants(txn, &channel.read().graph, p)?\n .map(|x| x.unwrap()),\n"}]}},{"Replacement":{"inode":{"change":3,"pos":79745},"path":"pijul/src/remote/local.rs","line":87,"ins":{"up_context":[{"change":3,"pos":10438}],"down_context":[{"change":3,"pos":10681}],"flag":"BLOCK","start":97,"end":241,"inode":{"change":3,"pos":79745}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":10438},"to":{"change":3,"start":10438,"end":10533},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":10533},"to":{"change":3,"start":1058,"end":1112},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":965},"to":{"change":3,"start":10589,"end":10681},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":1112},"to":{"change":3,"start":10589,"end":10681},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":10589},"to":{"change":3,"start":10589,"end":10681},"introduced_by":3}],"inode":{"change":3,"pos":79745}},"ins_contents":[{"Add":" libpijul::fs::iter_graph_descendants(&remote_txn, &remote_channel.read(), p)?"},{"Add":" .map(|x| x.unwrap()),"}],"del_contents":[{"Del":" libpijul::fs::iter_graph_descendants(\n &remote_txn,\n"},{"Del":" &remote_channel.read().graph,\n"},{"Del":" p,\n )?\n .map(|x| x.unwrap()),\n"}]}},{"Replacement":{"inode":{"change":3,"pos":123281},"path":"pijul/src/commands/protocol.rs","line":119,"ins":{"up_context":[{"change":3,"pos":15745}],"down_context":[{"change":3,"pos":15845}],"flag":"BLOCK","start":242,"end":335,"inode":{"change":3,"pos":123281}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":15745},"to":{"change":3,"start":11874,"end":11973},"introduced_by":3}],"inode":{"change":3,"pos":123281}},"ins_contents":[{"Add":" libpijul::fs::iter_graph_descendants(&*txn, &channel.read(), p)?"}],"del_contents":[{"Del":" libpijul::fs::iter_graph_descendants(&*txn, &channel.read().graph, p)?\n"}]}},{"Replacement":{"inode":{"change":3,"pos":177758},"path":"pijul/src/commands/debug.rs","line":48,"ins":{"up_context":[{"change":3,"pos":21604}],"down_context":[{"change":3,"pos":21648}],"flag":"BLOCK","start":336,"end":373,"inode":{"change":3,"pos":177758}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":21604},"to":{"change":3,"start":16478,"end":16521},"introduced_by":3}],"inode":{"change":3,"pos":177758}},"ins_contents":[{"Add":" &channel.read(),"}],"del_contents":[{"Del":" &channel.read().graph,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":177758},"path":"pijul/src/commands/debug.rs","line":55,"ins":{"up_context":[{"change":3,"pos":16568}],"down_context":[{"change":3,"pos":21926}],"flag":"BLOCK","start":374,"end":453,"inode":{"change":3,"pos":177758}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":16568},"to":{"change":3,"start":21841,"end":21926},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":21841},"to":{"change":3,"start":21841,"end":21926},"introduced_by":3}],"inode":{"change":3,"pos":177758}},"ins_contents":[{"Add":" libpijul::pristine::debug(&txn, &channel, std::io::stdout())?;"}],"del_contents":[{"Del":" libpijul::pristine::debug(&txn, &channel.graph, std::io::stdout())?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":365,"ins":{"up_context":[{"change":3,"pos":5811}],"down_context":[{"change":3,"pos":39879}],"flag":"BLOCK","start":454,"end":480,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":5811},"to":{"change":3,"start":64728,"end":64783},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":64728},"to":{"change":3,"start":64728,"end":64783},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":" type Graph = Channel;"}],"del_contents":[{"Del":" type Graph = Db, SerializedEdge>;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":368,"ins":{"up_context":[{"change":3,"pos":39918}],"down_context":[{"change":3,"pos":64857}],"flag":"BLOCK","start":481,"end":1010,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":39918},"to":{"change":3,"start":64784,"end":64857},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":" fn get_graph<'txn>("},{"Add":" &'txn self,"},{"Add":" db: &Self::Graph,"},{"Add":" key: &Vertex,"},{"Add":" value: Option<&SerializedEdge>,"},{"Add":" ) -> Result, TxnErr> {"},{"Add":" match ::sanakirja::btree::get(&self.txn, &db.graph, key, value) {"},{"Add":" Ok(Some((k, v))) if k == key => Ok(Some(v)),"},{"Add":" Ok(_) => Ok(None),"},{"Add":" Err(e) => {"},{"Add":" error!(\"{:?}\", e);"},{"Add":" Err(TxnErr(SanakirjaError::PristineCorrupt))"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":""}],"del_contents":[{"Del":" sanakirja_get!(graph, Vertex, SerializedEdge, GraphError);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":432,"ins":{"up_context":[{"change":3,"pos":65990}],"down_context":[{"change":3,"pos":66074}],"flag":"BLOCK","start":1011,"end":1102,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":65990},"to":{"change":3,"start":65990,"end":66074},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":" let mut cursor = btree::cursor::Cursor::new(&self.txn, &g.graph).map_err(TxnErr)?;"}],"del_contents":[{"Del":" let mut cursor = btree::cursor::Cursor::new(&self.txn, g).map_err(TxnErr)?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":455,"ins":{"up_context":[{"change":3,"pos":66415}],"down_context":[{"change":3,"pos":31644}],"flag":"BLOCK","start":1103,"end":1150,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":66415},"to":{"change":3,"start":31604,"end":31644},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":31604},"to":{"change":3,"start":31604,"end":31644},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":" find_block(&self.txn, &graph.graph, p)"}],"del_contents":[{"Del":" find_block(&self.txn, graph, p)\n"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":463,"ins":{"up_context":[{"change":3,"pos":66483}],"down_context":[{"change":3,"pos":31859}],"flag":"BLOCK","start":1151,"end":1202,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":66483},"to":{"change":3,"start":31815,"end":31859},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":31815},"to":{"change":3,"start":31815,"end":31859},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":" find_block_end(&self.txn, &graph.graph, p)"}],"del_contents":[{"Del":" find_block_end(&self.txn, graph, p)\n"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":651,"ins":{"up_context":[{"change":3,"pos":3493}],"down_context":[{"change":3,"pos":3570}],"flag":"BLOCK","start":1203,"end":1286,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3493},"to":{"change":3,"start":3493,"end":3570},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":" let mut c = ::sanakirja::btree::cursor::Cursor::new(&self.txn, &g.graph)?;"}],"del_contents":[{"Del":" let mut c = ::sanakirja::btree::cursor::Cursor::new(&self.txn, &g)?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":708,"ins":{"up_context":[{"change":3,"pos":40642}],"down_context":[{"change":3,"pos":39330}],"flag":"BLOCK","start":1287,"end":1360,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":40642},"to":{"change":3,"start":70593,"end":70685},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":2104},"to":{"change":3,"start":39313,"end":39330},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":3,"pos":70685},"to":{"change":3,"start":39313,"end":39330},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":39313},"to":{"change":3,"start":39313,"end":39330},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":" fn graph<'a>(&self, c: &'a Self::Channel) -> &'a Channel {"},{"Add":" c"}],"del_contents":[{"Del":" fn graph<'a>(&self, c: &'a Self::Channel) -> &'a Db, SerializedEdge> {\n"},{"Del":" &c.graph\n"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1496,"ins":{"up_context":[{"change":3,"pos":50063}],"down_context":[{"change":3,"pos":559101}],"flag":"BLOCK","start":1361,"end":1424,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":64393},"to":{"change":3,"start":82408,"end":82460},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":50063},"to":{"change":3,"start":82408,"end":82460},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":" Ok(btree::put(&mut self.txn, &mut graph.graph, k, e)?)"}],"del_contents":[{"Del":" Ok(btree::put(&mut self.txn, graph, k, e)?)\n"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1505,"ins":{"up_context":[{"change":3,"pos":50114}],"down_context":[{"change":3,"pos":66261}],"flag":"BLOCK","start":1425,"end":1488,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":50114},"to":{"change":3,"start":1944,"end":1996},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":" Ok(btree::del(&mut self.txn, &mut graph.graph, k, e)?)"}],"del_contents":[{"Del":" Ok(btree::del(&mut self.txn, graph, k, e)?)\n"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1511,"ins":{"up_context":[{"change":3,"pos":66390}],"down_context":[{"change":3,"pos":66412}],"flag":"BLOCK","start":1489,"end":1518,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":66390},"to":{"change":3,"start":66390,"end":66412},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":" &[&graph.graph],"}],"del_contents":[{"Del":" &[graph],\n"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1529,"ins":{"up_context":[{"change":3,"pos":66}],"down_context":[{"change":3,"pos":82871}],"flag":"BLOCK","start":1519,"end":1598,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":66},"to":{"change":3,"start":82799,"end":82871},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":" let mut cursor = btree::cursor::Cursor::new(&self.txn, &graph.graph)?;"}],"del_contents":[{"Del":" let mut cursor = btree::cursor::Cursor::new(&self.txn, graph)?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1596,"ins":{"up_context":[{"change":3,"pos":47691}],"down_context":[{"change":3,"pos":47712}],"flag":"BLOCK","start":1599,"end":1609,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":47691},"to":{"change":3,"start":47691,"end":47712},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":" c"}],"del_contents":[{"Del":" &mut c.graph\n"}]}}],"owner":"irevoire","repo":"pijul","token":"gY5/SqUy3XYU5BeqxhhJasxZiLSGm0/M1GPt6kqCQZM=","login":null}

…

Dependencies

Change contents