{"header":{"message":"Cleanup and formatting","description":null,"timestamp":"2021-09-09T12:32:15.988063781Z","authors":[{}]},"hash":"KJOOI346EYXQIRDEGWHYILGX44AZNPHBFUDW5HYEEG5IC2ZXV6GAC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["KJOOI346EYXQIRDEGWHYILGX44AZNPHBFUDW5HYEEG5IC2ZXV6GAC","Cleanup and formatting"],["AA",null],["C4MJ7D7QCOFGIHQSDV3UC76DTSE5M7JSLGN5MROMSVKFVQRFSP5QC","Verbose printing of conflicts to stderr"],["44HXAOMJAKQJEZNE5ESE4HZ2NOOMFKMH2GYIG5WOSAOWN6GTNN6QC","When applying non-block edgemaps pointing to split vertices, do not propagate to the rest of the split"],["FJTRJD6BWXK5TMCYHXLTXVCM2ZOC4BN6Q5K72LAFITRK36RDYNDAC","Supporting patches recorded with older versions of Pijul"],["KDF6FJRVF72L274BEUJCTUKRFMNL6BDZMTVKDPEYGFX4TC3YOVSQC","bigger clippy refactors"],["7A2TSC4PAKK3WOH3DMAJASCEC6D5JLJWNFWJTEEBE4CVS4K76PPQC","Conflict solving code (FOLDER edges)"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC","Fixing output (including its uses in reset and pull)"],["3KRGVQFUWFHPOGZOXVTJYNCM4XBRVYITAEOVPKBSAZ5GZIUO5KVQC","Do not update the mtime of unmodified files"],["2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","Making libpijul deterministic (and getting rid of `rand`)"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["XA23FMQM2AI7RMR36AYN7UNP2D5JWVJMJPHURWZO7URM7H46PU6AC","Reset only files that have been modified"],["YGPEHOTED5UG3IUK263PIX566VEHM3KYHPYIXZHPJ4ICHXWZEUJAC","libpijul::fs::add_{file,dir} now return the created Inode"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["G6S6PWZEFJK7ARWBIFKDU6VYC5DCJ2YFJMWZOLLWWKU52R2QPXZAC","Do not touch the channel if this is a partial record"],["MDADYULS5AWVMTJDGYCGNQTN6T7XJDRUBDTFILDY5MLF6I2PE5NAC","Fix a panic when switching between channels that have different files"],["6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","Refactoring apply"]],"deps":["C4MJ7D7QCOFGIHQSDV3UC76DTSE5M7JSLGN5MROMSVKFVQRFSP5QC","44HXAOMJAKQJEZNE5ESE4HZ2NOOMFKMH2GYIG5WOSAOWN6GTNN6QC","FJTRJD6BWXK5TMCYHXLTXVCM2ZOC4BN6Q5K72LAFITRK36RDYNDAC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","KDF6FJRVF72L274BEUJCTUKRFMNL6BDZMTVKDPEYGFX4TC3YOVSQC","7A2TSC4PAKK3WOH3DMAJASCEC6D5JLJWNFWJTEEBE4CVS4K76PPQC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","3KRGVQFUWFHPOGZOXVTJYNCM4XBRVYITAEOVPKBSAZ5GZIUO5KVQC","XA23FMQM2AI7RMR36AYN7UNP2D5JWVJMJPHURWZO7URM7H46PU6AC","G6S6PWZEFJK7ARWBIFKDU6VYC5DCJ2YFJMWZOLLWWKU52R2QPXZAC","LGEJSLTYI7Y2CYC3AN6ECMT3D3MTWCAKZPVQEG5MPM2OBW5FQ46AC","MDADYULS5AWVMTJDGYCGNQTN6T7XJDRUBDTFILDY5MLF6I2PE5NAC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","2RXOCWUWOGHEKHT5W73LAHJSOZVRTOGS7BWLSIGEEEBJGMCZBXQAC","YGPEHOTED5UG3IUK263PIX566VEHM3KYHPYIXZHPJ4ICHXWZEUJAC"]},"hunks":[{"Replacement":{"inode":{"change":5,"pos":525242},"path":"\"\"libpijul/src/pristine/vertex.rs\"\"","line":49,"ins":{"up_context":[{"change":5,"pos":114}],"down_context":[{"change":5,"pos":526481}],"flag":"BLOCK","start":0,"end":58,"inode":{"change":5,"pos":525242}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":5,"pos":114},"to":{"change":5,"start":526416,"end":526481},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":526416},"to":{"change":5,"start":526416,"end":526481},"introduced_by":5}],"inode":{"change":5,"pos":525242}},"ins_contents":[{"Add":" pub fn to_option(&self) -> Vertex> {"}],"del_contents":[{"Del":" pub(crate) fn to_option(&self) -> Vertex> {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":525242},"path":"\"\"libpijul/src/pristine/vertex.rs\"\"","line":196,"ins":{"up_context":[{"change":5,"pos":530456}],"down_context":[{"change":5,"pos":530523}],"flag":"BLOCK","start":59,"end":119,"inode":{"change":5,"pos":525242}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":530456},"to":{"change":5,"start":530456,"end":530523},"introduced_by":5}],"inode":{"change":5,"pos":525242}},"ins_contents":[{"Add":" pub fn to_option(&self) -> Position> {"}],"del_contents":[{"Del":" pub(crate) fn to_option(&self) -> Position> {\n"}]}},{"Replacement":{"inode":{"change":5,"pos":671807},"path":"\"\"libpijul/src/output/output.rs\"\"","line":231,"ins":{"up_context":[{"change":5,"pos":675655}],"down_context":[{"change":2,"pos":4714}],"flag":"BLOCK","start":120,"end":401,"inode":{"change":5,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":675655},"to":{"change":5,"start":675655,"end":675741},"introduced_by":5}],"inode":{"change":5,"pos":671807}},"ins_contents":[{"Add":" debug!("},{"Add":" \"pos already visited: {:?} {:?} {:?} {:?}\","},{"Add":" a,"},{"Add":" output_item.pos,"},{"Add":" e.get(),"},{"Add":" name_key"},{"Add":" );"}],"del_contents":[{"Del":" debug!(\"pos already visited: {:?} {:?}\", a, output_item.pos);\n"}]}},{"Replacement":{"inode":{"change":5,"pos":671807},"path":"\"\"libpijul/src/output/output.rs\"\"","line":246,"ins":{"up_context":[{"change":5,"pos":676028}],"down_context":[{"change":2,"pos":4867}],"flag":"BLOCK","start":402,"end":569,"inode":{"change":5,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":676028},"to":{"change":2,"start":4824,"end":4867},"introduced_by":2}],"inode":{"change":5,"pos":671807}},"ins_contents":[{"Add":" Entry::Vacant(e) => {"},{"Add":" debug!(\"first visit {:?} {:?}\", a, output_item.pos);"},{"Add":" e"},{"Add":" }"}],"del_contents":[{"Del":" Entry::Vacant(e) => e,\n"}]}},{"Edit":{"inode":{"change":5,"pos":717381},"path":"\"\"libpijul/src/lib.rs\"\"","line":164,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":722974},"to":{"change":5,"start":722974,"end":722981},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":722981},"to":{"change":5,"start":84190,"end":84197},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":84197},"to":{"change":5,"start":722981,"end":723283},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":722981},"to":{"change":5,"start":722981,"end":723283},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":723283},"to":{"change":5,"start":93730,"end":93967},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":93967},"to":{"change":5,"start":84198,"end":84240},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":84240},"to":{"change":5,"start":94006,"end":94083},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":94006},"to":{"change":5,"start":94006,"end":94083},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":94083},"to":{"change":5,"start":723405,"end":723558},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":723405},"to":{"change":5,"start":723405,"end":723558},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":723558},"to":{"change":5,"start":84241,"end":84287},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":84287},"to":{"change":5,"start":723608,"end":723681},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":723608},"to":{"change":5,"start":723608,"end":723681},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":723681},"to":{"change":5,"start":94084,"end":94265},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":28500},"to":{"change":5,"start":723732,"end":723789},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":94265},"to":{"change":5,"start":723732,"end":723789},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":723732},"to":{"change":5,"start":723732,"end":723789},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":723789},"to":{"change":5,"start":94266,"end":94336},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":94336},"to":{"change":5,"start":84288,"end":84330},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":84330},"to":{"change":5,"start":94375,"end":94454},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":94375},"to":{"change":5,"start":94375,"end":94454},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":94454},"to":{"change":5,"start":723876,"end":723905},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":723876},"to":{"change":5,"start":723876,"end":723905},"introduced_by":5}],"inode":{"change":5,"pos":717381}}},"contents":[{"Del":" }\n\n"},{"Del":" /*\n"},{"Del":" fn record(\n &mut self,\n builder: &mut RecordBuilder,\n diff_algorithm: Algorithm,\n channel: &mut pristine::ChannelRef,\n working_copy: &mut W,\n changes: &C,\n prefix: &str,\n"},{"Del":" ) -> Result<(), crate::record::RecordError>\n where\n ::Error: 'static,\n {\n builder.record(\n self,\n diff_algorithm,\n"},{"Del":" &mut channel.lock().unwrap(),\n"},{"Del":" working_copy,\n changes,\n prefix,\n )\n"},{"Del":" }\n\n fn record_all(\n &mut self,\n diff_algorithm: Algorithm,\n"},{"Del":" channel: &pristine::ChannelRef,\n"},{"Del":" working_copy: &mut W,\n changes: &C,\n prefix: &str,\n"},{"Del":" ) -> Result>\n where\n ::Error: 'static,\n {\n"},{"Del":" let mut builder = crate::record::Builder::new();\n"},{"Del":" builder.record(\n self,\n diff_algorithm,\n"},{"Del":" &mut channel.lock().unwrap(),\n"},{"Del":" working_copy,\n changes,\n prefix,\n )?;\n"},{"Del":" Ok(builder.finish())\n"}]}},{"Edit":{"inode":{"change":5,"pos":717381},"path":"\"\"libpijul/src/lib.rs\"\"","line":165,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":723911},"to":{"change":5,"start":84331,"end":84338},"introduced_by":5}],"inode":{"change":5,"pos":717381}}},"contents":[{"Del":" */\n"}]}},{"Edit":{"inode":{"change":5,"pos":717381},"path":"\"\"libpijul/src/lib.rs\"\"","line":214,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":725466},"to":{"change":5,"start":84606,"end":84613},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":84613},"to":{"change":5,"start":725466,"end":725674},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":725466},"to":{"change":5,"start":725466,"end":725674},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2178},"to":{"change":5,"start":725674,"end":725733},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":725674},"to":{"change":5,"start":725674,"end":725733},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":725733},"to":{"change":5,"start":1500,"end":1558},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":1558},"to":{"change":5,"start":94684,"end":94788},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2654},"to":{"change":5,"start":94684,"end":94788},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":725733},"to":{"change":5,"start":94684,"end":94788},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":28874},"to":{"change":5,"start":725789,"end":725913},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":94788},"to":{"change":5,"start":725789,"end":725913},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":725789},"to":{"change":5,"start":725789,"end":725913},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2197},"to":{"change":5,"start":725913,"end":725968},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":725913},"to":{"change":5,"start":725913,"end":725968},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":725968},"to":{"change":5,"start":2655,"end":2686},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":2686},"to":{"change":5,"start":725968,"end":725978},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":725968},"to":{"change":5,"start":725968,"end":725978},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":725978},"to":{"change":5,"start":725978,"end":725984},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":725984},"to":{"change":5,"start":84614,"end":84621},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":84621},"to":{"change":5,"start":725984,"end":725985},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":725984},"to":{"change":5,"start":725984,"end":725985},"introduced_by":5}],"inode":{"change":5,"pos":717381}}},"contents":[{"Del":" /*\n"},{"Del":" fn output_repository_no_pending(\n &mut self,\n repo: &mut R,\n changes: &C,\n channel: &mut pristine::ChannelRef,\n"},{"Del":" prefix: &str,\n output_name_conflicts: bool,\n"},{"Del":" if_modified_since: Option,\n"},{"Del":" ) -> Result, output::OutputError>\n {\n"},{"Del":" output::output_repository_no_pending(\n repo,\n changes,\n self,\n channel,\n"},{"Del":" prefix,\n output_name_conflicts,\n"},{"Del":" if_modified_since,\n"},{"Del":" )\n"},{"Del":" }\n"},{"Del":" */\n"},{"Del":"\n"}]}},{"Replacement":{"inode":{"change":5,"pos":737429},"path":"\"\"libpijul/src/fs.rs\"\"","line":877,"ins":{"up_context":[{"change":4,"pos":47}],"down_context":[{"change":4,"pos":190}],"flag":"BLOCK","start":570,"end":776,"inode":{"change":5,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":47},"to":{"change":4,"start":47,"end":190},"introduced_by":4}],"inode":{"change":5,"pos":737429}},"ins_contents":[{"Add":" info!("},{"Add":" \"find_path: {:?} != {:?}, this may be due to a corrupt change\","},{"Add":" inode_vertex,"},{"Add":" v.inode_vertex()"},{"Add":" );"},{"Add":" return Ok(None);"}],"del_contents":[{"Del":" info!(\"find_path: {:?} != {:?}, this may be due to a corrupt change\", inode_vertex, v.inode_vertex());\n return Ok(None)\n"}]}},{"Replacement":{"inode":{"change":5,"pos":96160},"path":"\"\"libpijul/src/apply/edge.rs\"\"","line":88,"ins":{"up_context":[{"change":3,"pos":49}],"down_context":[{"change":3,"pos":67}],"flag":"BLOCK","start":777,"end":796,"inode":{"change":5,"pos":96160}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":49},"to":{"change":3,"start":49,"end":67},"introduced_by":3}],"inode":{"change":5,"pos":96160}},"ins_contents":[{"Add":" break;"}],"del_contents":[{"Del":" break\n"}]}}],"owner":"irevoire","repo":"pijul","token":"khDInBqSh8lBFbRx/SZhhrdWlEfS7W0RnIdNiIPGWYY=","login":null}

…

Dependencies

Change contents