{"header":{"message":"Cleanup (debugging a crash related to trees/inodes)","description":null,"timestamp":"2020-12-02T17:38:05.805053792Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC","authors":[],"deps":{"hashes":[["5BRU2RRWOQBMS2V3RQM7PRFR5UILYZ73GISHAKJA6KIZGC5M2MFAC","Cleanup (debugging a crash related to trees/inodes)"],["AA",null],["OCBM7IFE7CL3PM5KPYTRTKTHYKC76NTFK5C4VA4JFAKQUA6GC7FAC","New release: pijul-1.0.0-alpha.8"],["R3H7D42UZ446V5TO2574BMAQQAYYJPEIMSZVDPAGVIYU2COJSWBAC","Debugging `pijul git`: proper error reporting"],["7UPL3Y2A5QOBU6VIUHNWEFGSGQ5CMWGDGOVLRZ53UARXG3TDGLMAC","Unrecord: don't restore the same unrecorded file deletion twice in the inodes and tree tables"],["B5Z4IMEUYAEJPOU5EIAXI7VYZVUM6CWKV7CTSOXK3F4GXTNNMMAAC","Generating Cargo.nix for pijul 1.0.0-alpha.6"],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["43AJ37IXON6PMMYRZM6OB2MJXPYCNIWW2XBDVNBXIRH5DD7JDTVQC","Getting rid of edge validation, which does not work for zombie conflicts"],["WI5BS6BSRA7T3BCDF6EGB2JZHTZRX4SLT5EG4D67PVRBTZH5YIXAC","New published versions"],["NX5I5H53IWX76GA3MTXTWZXU2HKUDL4ENED7LTGHMPWLHSAHYEAQC","New published versions"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["OUWD436ATBTZJR53B6XDSI5SXRRNZV7YGRUEA5ACHZC2RUDP7G5QC","Version bump"],["3S4DR77ZU3XFGGDE6XSCUK6TN76IXNOQIKQSLDBM7KUHNILWHS3QC","Version updates"]],"deps":["OCBM7IFE7CL3PM5KPYTRTKTHYKC76NTFK5C4VA4JFAKQUA6GC7FAC","R3H7D42UZ446V5TO2574BMAQQAYYJPEIMSZVDPAGVIYU2COJSWBAC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","3S4DR77ZU3XFGGDE6XSCUK6TN76IXNOQIKQSLDBM7KUHNILWHS3QC","OUWD436ATBTZJR53B6XDSI5SXRRNZV7YGRUEA5ACHZC2RUDP7G5QC","L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","7UPL3Y2A5QOBU6VIUHNWEFGSGQ5CMWGDGOVLRZ53UARXG3TDGLMAC","NX5I5H53IWX76GA3MTXTWZXU2HKUDL4ENED7LTGHMPWLHSAHYEAQC","B5Z4IMEUYAEJPOU5EIAXI7VYZVUM6CWKV7CTSOXK3F4GXTNNMMAAC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","43AJ37IXON6PMMYRZM6OB2MJXPYCNIWW2XBDVNBXIRH5DD7JDTVQC","WI5BS6BSRA7T3BCDF6EGB2JZHTZRX4SLT5EG4D67PVRBTZH5YIXAC"]},"hunks":[{"Edit":{"inode":{"change":4,"pos":177758},"path":"pijul/src/commands/debug.rs","line":3,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2737},"to":{"change":4,"start":2737,"end":2753},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2753},"to":{"change":4,"start":5642,"end":5662},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":5662},"to":{"change":4,"start":2753,"end":2754},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2753},"to":{"change":4,"start":2753,"end":2754},"introduced_by":4}],"inode":{"change":4,"pos":177758}}},"contents":[{"Del":"use clap::Clap;\n"},{"Del":"use libpijul::TxnT;\n"},{"Del":"\n"}]}},{"Edit":{"inode":{"change":4,"pos":177758},"path":"pijul/src/commands/debug.rs","line":5,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":177812}],"down_context":[{"change":4,"pos":177836}],"flag":"","start":0,"end":62,"inode":{"change":4,"pos":177758}}},"contents":[{"Add":"use clap::Clap;"},{"Add":"use libpijul::{Base32, TxnT};"},{"Add":"use log::debug;"}]}},{"Edit":{"inode":{"change":4,"pos":177758},"path":"pijul/src/commands/debug.rs","line":22,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":5711}],"down_context":[{"change":4,"pos":5711}],"flag":"","start":63,"end":114,"inode":{"change":4,"pos":177758}}},"contents":[{"Add":" libpijul::pristine::debug_revinodes(&txn);"}]}},{"Edit":{"inode":{"change":4,"pos":177758},"path":"pijul/src/commands/debug.rs","line":25,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":5818}],"down_context":[{"change":4,"pos":178214}],"flag":"","start":115,"end":256,"inode":{"change":4,"pos":177758}}},"contents":[{"Add":" let c: libpijul::ChangeId = libpijul::ChangeId::from_base32(b\"L4ITS7QS3M4P6\").unwrap();"},{"Add":" debug!(\"{:?}\", txn.get_external(c));"}]}},{"Replacement":{"inode":{"change":4,"pos":196374},"path":"pijul/Cargo.toml","line":4,"ins":{"up_context":[{"change":4,"pos":196462}],"down_context":[{"change":4,"pos":196488}],"flag":"","start":257,"end":284,"inode":{"change":4,"pos":196374}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":196462},"to":{"change":2,"start":0,"end":26},"introduced_by":2}],"inode":{"change":4,"pos":196374}},"ins_contents":[{"Add":"version = \"1.0.0-alpha.11\""}],"del_contents":[{"Del":"version = \"1.0.0-alpha.8\"\n"}]}},{"Replacement":{"inode":{"change":4,"pos":196374},"path":"pijul/Cargo.toml","line":49,"ins":{"up_context":[{"change":4,"pos":197456}],"down_context":[{"change":4,"pos":197523}],"flag":"","start":285,"end":352,"inode":{"change":4,"pos":196374}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":197456},"to":{"change":2,"start":27,"end":94},"introduced_by":2}],"inode":{"change":4,"pos":196374}},"ins_contents":[{"Add":"libpijul = { version = \"1.0.0-alpha.7\", features = [ \"tarball\" ] }"}],"del_contents":[{"Del":"libpijul = { version = \"1.0.0-alpha.6\", features = [ \"tarball\" ] }\n"}]}},{"Replacement":{"inode":{"change":4,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":17,"ins":{"up_context":[{"change":4,"pos":226518}],"down_context":[{"change":4,"pos":226645}],"flag":"","start":353,"end":404,"inode":{"change":4,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":226518},"to":{"change":4,"start":226518,"end":226645},"introduced_by":4}],"inode":{"change":4,"pos":225940}},"ins_contents":[{"Add":" del_inodes_with_rev(txn, inode, pos)?;"}],"del_contents":[{"Del":" let inode = inode.to_owned();\n txn.del_revinodes(pos, None)?;\n txn.del_inodes(inode, None)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":98,"ins":{"up_context":[{"change":4,"pos":152}],"down_context":[{"change":3,"pos":1571}],"flag":"","start":405,"end":467,"inode":{"change":4,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":152},"to":{"change":4,"start":152,"end":259},"introduced_by":4}],"inode":{"change":4,"pos":225940}},"ins_contents":[{"Add":" put_tree_with_rev(txn, file_id.as_file_id(), inode)?;"}],"del_contents":[{"Del":" txn.put_tree(file_id.as_file_id(), inode)?;\n txn.put_revtree(inode, file_id.as_file_id())?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":225940},"path":"libpijul/src/unrecord/working_copy.rs","line":149,"ins":{"up_context":[{"change":4,"pos":231296}],"down_context":[{"change":4,"pos":231440}],"flag":"","start":468,"end":528,"inode":{"change":4,"pos":225940}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":231296},"to":{"change":4,"start":231296,"end":231440},"introduced_by":4}],"inode":{"change":4,"pos":225940}},"ins_contents":[{"Add":" del_inodes_with_rev(txn, inode, position)?;"}],"del_contents":[{"Del":" let inode = inode.to_owned();\n txn.del_revinodes(position, None)?;\n txn.del_inodes(inode, None)?;\n"}]}},{"Edit":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":179,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":494753},"to":{"change":4,"start":494753,"end":495140},"introduced_by":4}],"inode":{"change":4,"pos":488880}}},"contents":[{"Del":" }\n Ok(None) => continue,\n Err(_) => {\n let parent = txn.get_revtree(item.inode, None).unwrap().to_owned();\n info!(\"recursively deleting {:?} {:?}\", parent, item.inode);\n crate::fs::rec_delete(txn, parent, item.inode, false)?;\n continue;\n"}]}},{"Edit":{"inode":{"change":4,"pos":488880},"path":"libpijul/src/record.rs","line":180,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":495162}],"down_context":[{"change":4,"pos":495162}],"flag":"","start":529,"end":564,"inode":{"change":4,"pos":488880}}},"contents":[{"Add":" _ => continue,"}]}},{"Edit":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":421,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":545544}],"down_context":[{"change":4,"pos":545544}],"flag":"","start":565,"end":617,"inode":{"change":4,"pos":531056}}},"contents":[{"Add":" type Revinodes = Db, Inode>;"}]}},{"Edit":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":424,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":545669},"to":{"change":4,"start":545669,"end":545701},"introduced_by":4}],"inode":{"change":4,"pos":531056}}},"contents":[{"Del":" // #[cfg(debug_assertions)]\n"}]}},{"Edit":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":425,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":545759}],"down_context":[{"change":4,"pos":545759}],"flag":"","start":618,"end":708,"inode":{"change":4,"pos":531056}}},"contents":[{"Add":" #[cfg(debug_assertions)]"},{"Add":" sanakirja_cursor!(revinodes, Position, Inode);"}]}},{"Edit":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":635,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":552961},"to":{"change":4,"start":552961,"end":552993},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":552993},"to":{"change":4,"start":36949,"end":36950},"introduced_by":4}],"inode":{"change":4,"pos":531056}}},"contents":[{"Del":" // #[cfg(debug_assertions)]\n"},{"Del":"\n"}]}},{"Edit":{"inode":{"change":4,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":641,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":553202}],"down_context":[{"change":4,"pos":553221}],"flag":"","start":709,"end":940,"inode":{"change":4,"pos":531056}}},"contents":[{"Add":" #[cfg(debug_assertions)]"},{"Add":" fn iter_revinodes<'txn>("},{"Add":" &'txn self,"},{"Add":" ) -> super::Cursor, Inode> {"},{"Add":" self.cursor_revinodes(&self.revinodes, None)"},{"Add":" }"},{"Add":""}]}},{"Edit":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":141,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":589844}],"down_context":[{"change":4,"pos":589844}],"flag":"","start":941,"end":964,"inode":{"change":4,"pos":586748}}},"contents":[{"Add":" table!(revinodes);"}]}},{"Edit":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":260,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":36994},"to":{"change":4,"start":36994,"end":37026},"introduced_by":4}],"inode":{"change":4,"pos":586748}}},"contents":[{"Del":" // #[cfg(debug_assertions)]\n"}]}},{"Edit":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":261,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":37074},"to":{"change":4,"start":37074,"end":37139},"introduced_by":4}],"inode":{"change":4,"pos":586748}}},"contents":[{"Del":" #[cfg(not(debug_assertions))]\n fn debug_inodes(&self) {}\n\n"}]}},{"Edit":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":264,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":37267}],"down_context":[{"change":4,"pos":37267}],"flag":"","start":965,"end":1209,"inode":{"change":4,"pos":586748}}},"contents":[{"Add":""},{"Add":" #[cfg(debug_assertions)]"},{"Add":" cursor!(revinodes, Position, Inode);"},{"Add":" #[cfg(debug_assertions)]"},{"Add":" fn iter_revinodes<'txn>("},{"Add":" &'txn self,"},{"Add":" ) -> Cursor, Inode>;"}]}},{"Edit":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":562,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":611728}],"down_context":[{"change":4,"pos":45204}],"flag":"","start":1210,"end":1430,"inode":{"change":4,"pos":586748}}},"contents":[{"Add":"#[cfg(debug_assertions)]"},{"Add":"pub fn debug_revinodes(txn: &T) {"},{"Add":" debug!(\"debug_revinodes\");"},{"Add":" for t in txn.iter_revinodes() {"},{"Add":" debug!(\"debug_revinodes = {:?}\", t)"},{"Add":" }"},{"Add":" debug!(\"/debug_revinodes\");"},{"Add":"}"},{"Add":""}]}},{"Edit":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":866,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":621464},"to":{"change":4,"start":621464,"end":621492},"introduced_by":4}],"inode":{"change":4,"pos":586748}}},"contents":[{"Del":"// #[cfg(debug_assertions)]\n"}]}},{"Edit":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":867,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":621548}],"down_context":[{"change":4,"pos":621548}],"flag":"","start":1431,"end":1515,"inode":{"change":4,"pos":586748}}},"contents":[{"Add":"#[cfg(debug_assertions)]"},{"Add":"initialized_cursor!(revinodes, Position, Inode);"}]}},{"Edit":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1146,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":50319}],"down_context":[{"change":4,"pos":50319}],"flag":"","start":1516,"end":2053,"inode":{"change":4,"pos":586748}}},"contents":[{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"pub(crate) fn del_inodes_with_rev("},{"Add":" txn: &mut T,"},{"Add":" inode: Inode,"},{"Add":" position: Position,"},{"Add":") -> Result {"},{"Add":" if txn.del_inodes(inode, Some(position))? {"},{"Add":" assert!(txn.del_revinodes(position, Some(inode))?);"},{"Add":" Ok(true)"},{"Add":" } else {"},{"Add":" Ok(false)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub(crate) fn put_tree_with_rev("},{"Add":" txn: &mut T,"},{"Add":" file_id: PathId,"},{"Add":" inode: Inode,"},{"Add":") -> Result<(), anyhow::Error> {"},{"Add":" txn.put_tree(file_id, inode)?;"},{"Add":" txn.put_revtree(inode, file_id)?;"}]}},{"Edit":{"inode":{"change":4,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1172,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":50333}],"down_context":[{"change":4,"pos":50333}],"flag":"","start":2054,"end":2405,"inode":{"change":4,"pos":586748}}},"contents":[{"Add":"pub(crate) fn del_tree_with_rev("},{"Add":" txn: &mut T,"},{"Add":" file_id: PathId,"},{"Add":" inode: Inode,"},{"Add":") -> Result {"},{"Add":" if txn.del_tree(file_id, Some(inode))? {"},{"Add":" if !file_id.basename.is_empty() {"},{"Add":" assert!(txn.del_revtree(inode, Some(file_id))?);"},{"Add":" }"},{"Add":" Ok(true)"},{"Add":" } else {"},{"Add":" Ok(false)"},{"Add":" }"},{"Add":"}"},{"Add":""}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":238,"ins":{"up_context":[{"change":4,"pos":680701}],"down_context":[{"change":4,"pos":680852}],"flag":"","start":2406,"end":2475,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":680701},"to":{"change":4,"start":680701,"end":680852},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" del_tree_with_rev(txn, parent.as_file_id(), inode)?;"}],"del_contents":[{"Del":" assert!(txn.del_revtree(inode, Some(parent.as_file_id()))?);\n assert!(txn.del_tree(parent.as_file_id(), Some(inode))?);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":258,"ins":{"up_context":[{"change":3,"pos":1729}],"down_context":[{"change":4,"pos":681836}],"flag":"","start":2476,"end":2534,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":1729},"to":{"change":4,"start":681737,"end":681836},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":681737},"to":{"change":4,"start":681737,"end":681836},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" put_tree_with_rev(txn, file_id_, inode)?;"}],"del_contents":[{"Del":" txn.put_tree(file_id_, inode)?;\n txn.put_revtree(inode, file_id_)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":266,"ins":{"up_context":[{"change":3,"pos":1793}],"down_context":[{"change":4,"pos":682297}],"flag":"","start":2535,"end":2589,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":1793},"to":{"change":4,"start":682206,"end":682297},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":682206},"to":{"change":4,"start":682206,"end":682297},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" put_tree_with_rev(txn, file_id_, inode)?;"}],"del_contents":[{"Del":" txn.put_tree(file_id_, inode)?;\n txn.put_revtree(inode, file_id_)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":280,"ins":{"up_context":[{"change":3,"pos":1853}],"down_context":[{"change":4,"pos":682885}],"flag":"","start":2590,"end":2640,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":1853},"to":{"change":4,"start":682802,"end":682885},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":682802},"to":{"change":4,"start":682802,"end":682885},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" put_tree_with_rev(txn, file_id_, inode)?;"}],"del_contents":[{"Del":" txn.put_tree(file_id_, inode)?;\n txn.put_revtree(inode, file_id_)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":357,"ins":{"up_context":[{"change":4,"pos":685693}],"down_context":[{"change":4,"pos":685885}],"flag":"","start":2641,"end":2703,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":685693},"to":{"change":4,"start":685693,"end":685885},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" del_tree_with_rev(txn, fileid.as_file_id(), *inode)?;"}],"del_contents":[{"Del":" assert!(txn.del_tree(fileid.as_file_id(), Some(*inode))?);\n if !fileid.basename.is_empty() {\n assert!(txn.del_revtree(*inode, Some(fileid.as_file_id()))?);\n }\n"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":359,"ins":{"up_context":[{"change":4,"pos":685946}],"down_context":[{"change":4,"pos":686069}],"flag":"","start":2704,"end":2823,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":685946},"to":{"change":4,"start":685946,"end":686069},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" debug!(\"kill_dead_files {:?} {:?}\", inode, vertex);"},{"Add":" del_inodes_with_rev(txn, *inode, vertex)?;"}],"del_contents":[{"Del":" assert!(txn.del_inodes(*inode, Some(vertex))?);\n assert!(txn.del_revinodes(vertex, Some(*inode))?);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":737429},"path":"libpijul/src/fs.rs","line":171,"ins":{"up_context":[{"change":4,"pos":743256}],"down_context":[{"change":4,"pos":743414}],"flag":"","start":2824,"end":2896,"inode":{"change":4,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":743256},"to":{"change":4,"start":743256,"end":743414},"introduced_by":4}],"inode":{"change":4,"pos":737429}},"ins_contents":[{"Add":" del_tree_with_rev(txn, parent_id.as_file_id(), inode)?;"}],"del_contents":[{"Del":" assert!(txn.del_tree(parent_id.as_file_id(), Some(inode))?);\n assert!(txn.del_revtree(inode, Some(parent_id.as_file_id()))?);\n\n"}]}},{"Replacement":{"inode":{"change":4,"pos":737429},"path":"libpijul/src/fs.rs","line":173,"ins":{"up_context":[{"change":4,"pos":743482}],"down_context":[{"change":4,"pos":743619}],"flag":"","start":2897,"end":2959,"inode":{"change":4,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":743482},"to":{"change":4,"start":743482,"end":743619},"introduced_by":4}],"inode":{"change":4,"pos":737429}},"ins_contents":[{"Add":" del_inodes_with_rev(txn, inode, vertex)?;"}],"del_contents":[{"Del":" assert!(txn.del_revinodes(vertex, Some(inode))?);\n assert!(txn.del_inodes(inode, Some(vertex))?);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":737429},"path":"libpijul/src/fs.rs","line":175,"ins":{"up_context":[{"change":4,"pos":743637}],"down_context":[{"change":4,"pos":743764}],"flag":"","start":2960,"end":3032,"inode":{"change":4,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":743637},"to":{"change":4,"start":743637,"end":743764},"introduced_by":4}],"inode":{"change":4,"pos":737429}},"ins_contents":[{"Add":" put_tree_with_rev(txn, parent_id.as_file_id(), child)?;"}],"del_contents":[{"Del":" txn.put_tree(parent_id.as_file_id(), child)?;\n txn.put_revtree(child, parent_id.as_file_id())?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":737429},"path":"libpijul/src/fs.rs","line":191,"ins":{"up_context":[{"change":4,"pos":744222}],"down_context":[{"change":4,"pos":744345}],"flag":"","start":3033,"end":3103,"inode":{"change":4,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":744222},"to":{"change":4,"start":744222,"end":744345},"introduced_by":4}],"inode":{"change":4,"pos":737429}},"ins_contents":[{"Add":" put_tree_with_rev(txn, parent_id.as_file_id(), child_inode)?;"}],"del_contents":[{"Del":" txn.put_tree(parent_id.as_file_id(), child_inode)?;\n txn.put_revtree(child_inode, parent_id.as_file_id())?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":737429},"path":"libpijul/src/fs.rs","line":248,"ins":{"up_context":[{"change":4,"pos":746252}],"down_context":[{"change":4,"pos":746499}],"flag":"","start":3104,"end":3162,"inode":{"change":4,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":746252},"to":{"change":4,"start":746252,"end":746499},"introduced_by":4}],"inode":{"change":4,"pos":737429}},"ins_contents":[{"Add":" del_tree_with_rev(txn, fileref.as_file_id(), inode)?;"}],"del_contents":[{"Del":" // org id pbMhYNkbwXVN5IhA6QR+oGisezusrYj/GXR0zMRLtTU=\n assert!(txn.del_tree(fileref.as_file_id(), Some(inode))?);\n assert!(txn.del_revtree(inode, Some(fileref.as_file_id()))?);\n // org id yM7YkGaAlCc1HX7iY/8kRuL9f2moGbKyzXKA/sGOdlM=\n"}]}},{"Replacement":{"inode":{"change":4,"pos":737429},"path":"libpijul/src/fs.rs","line":298,"ins":{"up_context":[{"change":4,"pos":747947}],"down_context":[{"change":4,"pos":748177}],"flag":"","start":3163,"end":3230,"inode":{"change":4,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":747947},"to":{"change":4,"start":747947,"end":748177},"introduced_by":4}],"inode":{"change":4,"pos":737429}},"ins_contents":[{"Add":" assert!(txn.del_tree(file_id.as_file_id(), Some(inode))?);"}],"del_contents":[{"Del":" if !txn.del_tree(file_id.as_file_id(), Some(inode))? {\n debug!(\n \"rec_delete (is_dir): {:?} {:?} not present\",\n file_id.as_file_id(),\n inode\n );\n }\n"}]}},{"Replacement":{"inode":{"change":4,"pos":737429},"path":"libpijul/src/fs.rs","line":300,"ins":{"up_context":[{"change":4,"pos":748183}],"down_context":[{"change":4,"pos":748543}],"flag":"","start":3231,"end":3406,"inode":{"change":4,"pos":737429}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":748183},"to":{"change":4,"start":748183,"end":748543},"introduced_by":4}],"inode":{"change":4,"pos":737429}},"ins_contents":[{"Add":" if del_tree_with_rev(txn, parent.as_file_id(), inode)? {"},{"Add":" if let Some(vertex) = txn.get_inodes(inode, None) {"},{"Add":" del_inodes_with_rev(txn, inode, vertex)?;"}],"del_contents":[{"Del":" if txn.del_tree(parent.as_file_id(), Some(inode))? {\n assert!(txn.del_revtree(inode, Some(parent.as_file_id()))?);\n if update_inodes {\n if let Some(vertex) = txn.get_inodes(inode, None) {\n assert!(txn.del_revinodes(vertex, Some(inode))?);\n assert!(txn.del_inodes(inode, Some(vertex))?);\n }\n"}]}},{"Replacement":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":268,"ins":{"up_context":[{"change":4,"pos":953809}],"down_context":[{"change":4,"pos":953864}],"flag":"","start":3407,"end":3408,"inode":{"change":4,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":953809},"to":{"change":4,"start":953809,"end":953864},"introduced_by":4}],"inode":{"change":4,"pos":944089}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id zzKI7nUCrGP6P9+0nk29zZnRY1qcdFJH2tXwOxTn/xM=\n"}]}},{"Edit":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":277,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":954080},"to":{"change":4,"start":954080,"end":954143},"introduced_by":4}],"inode":{"change":4,"pos":944089}}},"contents":[{"Del":" // org id 8cpuyZX4ja1VYT3lhtYBMXJenBtvUbVEGky3wZ6W/HM=\n"}]}},{"Edit":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":292,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":954670},"to":{"change":4,"start":954670,"end":954733},"introduced_by":4}],"inode":{"change":4,"pos":944089}}},"contents":[{"Del":" // org id iTzVDtyzdcIEH3EDPbaq8PfGH9WgwLTd5XSxI5nK4Kc=\n"}]}},{"Replacement":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":294,"ins":{"up_context":[{"change":4,"pos":954864}],"down_context":[{"change":4,"pos":954997}],"flag":"","start":3409,"end":3478,"inode":{"change":4,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":954864},"to":{"change":4,"start":954864,"end":954997},"introduced_by":4}],"inode":{"change":4,"pos":944089}},"ins_contents":[{"Add":" del_tree_with_rev(txn, parent.as_file_id(), inode)?;"}],"del_contents":[{"Del":" txn.del_revtree(inode, Some(parent.as_file_id()))?;\n txn.del_tree(parent.as_file_id(), Some(inode))?;\n"}]}},{"Edit":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":296,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":955011}],"down_context":[{"change":4,"pos":955011}],"flag":"","start":3479,"end":3531,"inode":{"change":4,"pos":944089}}},"contents":[{"Add":" // Delete the directory, if it's there."}]}},{"Replacement":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":306,"ins":{"up_context":[{"change":4,"pos":955339}],"down_context":[{"change":4,"pos":955450}],"flag":"","start":3532,"end":3590,"inode":{"change":4,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":955339},"to":{"change":4,"start":955339,"end":955450},"introduced_by":4}],"inode":{"change":4,"pos":944089}},"ins_contents":[{"Add":" del_inodes_with_rev(txn, inode, vertex)?;"}],"del_contents":[{"Del":" txn.del_inodes(inode, Some(vertex))?;\n txn.del_revinodes(vertex, Some(inode))?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":312,"ins":{"up_context":[{"change":4,"pos":955493}],"down_context":[{"change":4,"pos":955548}],"flag":"","start":3591,"end":3592,"inode":{"change":4,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":955493},"to":{"change":4,"start":955493,"end":955548},"introduced_by":4}],"inode":{"change":4,"pos":944089}},"ins_contents":[{"Add":""}],"del_contents":[{"Del":"// org id QIECdrRSNOnrMRRD9QO87SUCSg4dt9OUS5V6GZPPmeM=\n"}]}}],"owner":"irevoire","repo":"pijul","token":"D7EHOrTcZxs9bkyw7ErtznC/f7ioZzdmBgGDZmXBbl8=","login":null}

…

Dependencies

Change contents