{"header":{"message":"Fixing --features git","description":null,"timestamp":"2020-11-26T06:25:19.367243334Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","authors":[],"deps":{"hashes":[["BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","Fixing --features git"],["AA",null],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["UCQD3JDHULGTUSKWPD3I4FQHA2DX37X7MMHRCOPGQVOT65JWWCIQC","Fix build errors caused by sanakirja 0.14"],["CVAT6LN3SYYLREM6NLM4IUPFI5EX3BL6MRPFTY24ROJFSB3J5OOQC","Fixing git import, and adding more useful feedback (with `RUST_LOG=\"pijul=info\"`)"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["AXVPNZ2NVKYRCTKYI77H72CALZBRTHY3OK4CMWGMTSU2NPMOS42QC","commands/git: fix imports"],["L4JXJHWXYNCL4QGJXNKKTOKKTAXKKXBJUUY7HFZGEUZ5A2V5H34QC","pijul/*: reorganize imports and remove extern crate"]],"deps":["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","CVAT6LN3SYYLREM6NLM4IUPFI5EX3BL6MRPFTY24ROJFSB3J5OOQC","UCQD3JDHULGTUSKWPD3I4FQHA2DX37X7MMHRCOPGQVOT65JWWCIQC"]},"hunks":[{"Edit":{"inode":{"change":3,"pos":137210},"path":"pijul/src/commands/git.rs","line":8,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":16}],"down_context":[{"change":8,"pos":2264}],"flag":"","start":0,"end":27,"inode":{"change":3,"pos":137210}}},"contents":[{"Add":"use libpijul::pristine::*;"}]}},{"Replacement":{"inode":{"change":3,"pos":137210},"path":"pijul/src/commands/git.rs","line":238,"ins":{"up_context":[{"change":3,"pos":144337}],"down_context":[{"change":3,"pos":144396}],"flag":"","start":28,"end":91,"inode":{"change":3,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":144337},"to":{"change":3,"start":144337,"end":144396},"introduced_by":3}],"inode":{"change":3,"pos":137210}},"ins_contents":[{"Add":" .changeid_reverse_log(&channel.borrow(), None)"}],"del_contents":[{"Del":" .changeid_rev_log(&channel.borrow(), None)\n"}]}},{"Replacement":{"inode":{"change":3,"pos":137210},"path":"pijul/src/commands/git.rs","line":408,"ins":{"up_context":[{"change":3,"pos":150512}],"down_context":[{"change":3,"pos":150581}],"flag":"","start":92,"end":167,"inode":{"change":3,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":150512},"to":{"change":3,"start":150512,"end":150581},"introduced_by":3}],"inode":{"change":3,"pos":137210}},"ins_contents":[{"Add":" check_alive_debug(&repo.repo.changes, txn, channel, line!())?;"}],"del_contents":[{"Del":" check_alive(&repo.repo.changes, txn, channel, line!())?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":137210},"path":"pijul/src/commands/git.rs","line":412,"ins":{"up_context":[{"change":3,"pos":150649}],"down_context":[{"change":3,"pos":150714}],"flag":"","start":168,"end":239,"inode":{"change":3,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":150649},"to":{"change":3,"start":150649,"end":150714},"introduced_by":3}],"inode":{"change":3,"pos":137210}},"ins_contents":[{"Add":" check_alive_debug(&repo.repo.changes, txn, channel, line!())?;"}],"del_contents":[{"Del":" check_alive(&repo.repo.changes, txn, channel, line!())?;\n"}]}},{"Edit":{"inode":{"change":3,"pos":137210},"path":"pijul/src/commands/git.rs","line":419,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":150885},"to":{"change":3,"start":150885,"end":151008},"introduced_by":3}],"inode":{"change":3,"pos":137210}}},"contents":[{"Del":" if repo.check > 0 && repo.n % repo.check == 0 && !to_apply.is_empty() {\n txn.check_channel_log(&channel);\n }\n"}]}},{"Replacement":{"inode":{"change":3,"pos":137210},"path":"pijul/src/commands/git.rs","line":436,"ins":{"up_context":[{"change":3,"pos":151569}],"down_context":[{"change":3,"pos":151638}],"flag":"","start":240,"end":315,"inode":{"change":3,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":151569},"to":{"change":3,"start":151569,"end":151638},"introduced_by":3}],"inode":{"change":3,"pos":137210}},"ins_contents":[{"Add":" check_alive_debug(&repo.repo.changes, txn, channel, line!())?;"}],"del_contents":[{"Del":" check_alive(&repo.repo.changes, txn, channel, line!())?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":137210},"path":"pijul/src/commands/git.rs","line":648,"ins":{"up_context":[{"change":3,"pos":159718}],"down_context":[{"change":3,"pos":159783}],"flag":"","start":316,"end":387,"inode":{"change":3,"pos":137210}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":159718},"to":{"change":3,"start":159718,"end":159783},"introduced_by":3}],"inode":{"change":3,"pos":137210}},"ins_contents":[{"Add":" check_alive_debug(&repo.repo.changes, txn, channel, line!())?;"}],"del_contents":[{"Del":" check_alive(&repo.repo.changes, txn, channel, line!())?;\n"}]}},{"Edit":{"inode":{"change":3,"pos":137210},"path":"pijul/src/commands/git.rs","line":819,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":165170},"to":{"change":3,"start":165170,"end":167862},"introduced_by":3}],"inode":{"change":3,"pos":137210}}},"contents":[{"Del":"\n/// Check that each alive vertex in the graph is reachable, and vice-versa.\nfn check_alive(\n changes: &C,\n txn: &T,\n channel: &ChannelRef,\n line: u32,\n) -> Result<(), anyhow::Error> {\n let (alive, reachable) = txn.check_alive(&channel);\n let mut h = BTreeSet::new();\n if !alive.is_empty() {\n for (k, file) in alive.iter() {\n debug!(\"alive = {:?}, file = {:?}\", k, file);\n h.insert(file);\n }\n }\n if !reachable.is_empty() {\n for (k, file) in reachable.iter() {\n debug!(\"reachable = {:?}, file = {:?}\", k, file);\n h.insert(file);\n }\n }\n for file in h.iter() {\n let file_ = file.unwrap().start_pos();\n let mut f = std::fs::File::create(&format!(\"debug_{:?}\", file_))?;\n let graph = libpijul::alive::retrieve::retrieve(txn, &channel.borrow(), file_);\n graph.debug(changes, txn, &channel.borrow(), false, false, &mut f)?;\n\n let mut f = std::fs::File::create(&format!(\"debug_all_{:?}\", file_))?;\n txn.debug_root(channel, file.unwrap(), &mut f)?;\n }\n if !h.is_empty() {\n panic!(\"alive call line {}\", line);\n }\n Ok(())\n}\n\n/// Check that each inode in the inodes table maps to an alive vertex,\n/// and that each inode in the tree table is reachable by only one\n/// path.\nfn check_tree_inodes(txn: &T, channel: &Channel) {\n // Sanity check\n for (inode, vertex) in txn.iter_inodes() {\n let mut inode_ = inode;\n while !inode_.is_root() {\n if let Some(next) = txn.get_revtree(inode_, None) {\n inode_ = next.parent_inode;\n } else {\n panic!(\"inode = {:?}, inode_ = {:?}\", inode, inode_);\n }\n }\n if !txn.is_alive(&channel, vertex.inode_vertex()) {\n for e in txn.iter_adjacent(\n &channel,\n vertex.inode_vertex(),\n EdgeFlags::empty(),\n EdgeFlags::all(),\n ) {\n error!(\"{:?} {:?} {:?}\", inode, vertex, e)\n }\n panic!(\n \"inode {:?}, vertex {:?}, is not alive, {:?}\",\n inode,\n vertex,\n txn.tree_path(vertex)\n )\n }\n }\n let mut h = HashMap::new();\n let id0 = OwnedPathId {\n parent_inode: Inode::ROOT,\n basename: libpijul::small_string::SmallString::new(),\n };\n for (id, inode) in txn.iter_tree(id0, None) {\n if let Some(inode_) = h.insert(id.clone(), inode) {\n panic!(\"id {:?} maps to two inodes: {:?} {:?}\", id, inode, inode_);\n }\n }\n}\n"}]}},{"Edit":{"inode":{"change":3,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":582,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":612336},"to":{"change":2,"start":45938,"end":45951},"introduced_by":2}],"inode":{"change":3,"pos":586748}}},"contents":[{"Del":"#[cfg(test)]\n"}]}},{"Edit":{"inode":{"change":3,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":653,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":48272},"to":{"change":2,"start":48272,"end":48285},"introduced_by":2}],"inode":{"change":3,"pos":586748}}},"contents":[{"Del":"#[cfg(test)]\n"}]}},{"Replacement":{"inode":{"change":3,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":681,"ins":{"up_context":[{"change":3,"pos":616291}],"down_context":[{"change":2,"pos":49091}],"flag":"","start":388,"end":433,"inode":{"change":3,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":616291},"to":{"change":2,"start":49042,"end":49091},"introduced_by":2}],"inode":{"change":3,"pos":586748}},"ins_contents":[{"Add":"pub(crate) fn debug_root("}],"del_contents":[{"Del":"pub(crate) fn debug_root_rev(\n"}]}},{"Edit":{"inode":{"change":3,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1312,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":55588}],"down_context":[],"flag":"","start":434,"end":3209,"inode":{"change":3,"pos":586748}}},"contents":[{"Add":""},{"Add":"/// Check that each inode in the inodes table maps to an alive vertex,"},{"Add":"/// and that each inode in the tree table is reachable by only one"},{"Add":"/// path."},{"Add":"pub fn check_tree_inodes(txn: &T, channel: &Channel) {"},{"Add":" // Sanity check"},{"Add":" for (inode, vertex) in txn.iter_inodes() {"},{"Add":" let mut inode_ = inode;"},{"Add":" while !inode_.is_root() {"},{"Add":" if let Some(next) = txn.get_revtree(inode_, None) {"},{"Add":" inode_ = next.parent_inode;"},{"Add":" } else {"},{"Add":" panic!(\"inode = {:?}, inode_ = {:?}\", inode, inode_);"},{"Add":" }"},{"Add":" }"},{"Add":" if !is_alive(txn, &channel, vertex.inode_vertex()) {"},{"Add":" for e in iter_adjacent("},{"Add":" txn,"},{"Add":" &channel,"},{"Add":" vertex.inode_vertex(),"},{"Add":" EdgeFlags::empty(),"},{"Add":" EdgeFlags::all(),"},{"Add":" ) {"},{"Add":" error!(\"{:?} {:?} {:?}\", inode, vertex, e)"},{"Add":" }"},{"Add":" panic!("},{"Add":" \"inode {:?}, vertex {:?}, is not alive, {:?}\","},{"Add":" inode,"},{"Add":" vertex,"},{"Add":" tree_path(txn, vertex)"},{"Add":" )"},{"Add":" }"},{"Add":" }"},{"Add":" let mut h = HashMap::new();"},{"Add":" let id0 = OwnedPathId {"},{"Add":" parent_inode: Inode::ROOT,"},{"Add":" basename: crate::small_string::SmallString::new(),"},{"Add":" };"},{"Add":" for (id, inode) in txn.iter_tree(id0, None) {"},{"Add":" if let Some(inode_) = h.insert(id.clone(), inode) {"},{"Add":" panic!(\"id {:?} maps to two inodes: {:?} {:?}\", id, inode, inode_);"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"/// Check that each alive vertex in the graph is reachable, and vice-versa."},{"Add":"pub fn check_alive_debug("},{"Add":" changes: &C,"},{"Add":" txn: &T,"},{"Add":" channel: &ChannelRef,"},{"Add":" line: u32,"},{"Add":") -> Result<(), anyhow::Error> {"},{"Add":" let (alive, reachable) = crate::pristine::check_alive(txn, &channel);"},{"Add":" let mut h = HashSet::new();"},{"Add":" if !alive.is_empty() {"},{"Add":" for (k, file) in alive.iter() {"},{"Add":" debug!(\"alive = {:?}, file = {:?}\", k, file);"},{"Add":" h.insert(file);"},{"Add":" }"},{"Add":" }"},{"Add":" if !reachable.is_empty() {"},{"Add":" for (k, file) in reachable.iter() {"},{"Add":" debug!(\"reachable = {:?}, file = {:?}\", k, file);"},{"Add":" h.insert(file);"},{"Add":" }"},{"Add":" }"},{"Add":" for file in h.iter() {"},{"Add":" let file_ = file.unwrap().start_pos();"},{"Add":" let mut f = std::fs::File::create(&format!(\"debug_{:?}\", file_))?;"},{"Add":" let graph = crate::alive::retrieve::retrieve(txn, &channel.borrow(), file_);"},{"Add":" graph.debug(changes, txn, &channel.borrow(), false, false, &mut f)?;"},{"Add":""},{"Add":" let mut f = std::fs::File::create(&format!(\"debug_all_{:?}\", file_))?;"},{"Add":" let channel = channel.borrow();"},{"Add":" debug_root(txn, &channel, file.unwrap(), &mut f)?;"},{"Add":" }"},{"Add":" if !h.is_empty() {"},{"Add":" panic!(\"alive call line {}\", line);"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":3,"pos":686190},"path":"libpijul/src/output/mod.rs","line":100,"ins":{"up_context":[{"change":3,"pos":688970}],"down_context":[{"change":3,"pos":689072}],"flag":"","start":3210,"end":3292,"inode":{"change":3,"pos":686190}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":688970},"to":{"change":2,"start":56808,"end":56894},"introduced_by":2}],"inode":{"change":3,"pos":686190}},"ins_contents":[{"Add":" debug_root(txn, channel, child.dest.inode_vertex(), &mut f).unwrap();"}],"del_contents":[{"Del":" debug_root_rev(txn, channel, child.dest.inode_vertex(), &mut f).unwrap();\n"}]}},{"Replacement":{"inode":{"change":3,"pos":717381},"path":"libpijul/src/lib.rs","line":97,"ins":{"up_context":[{"change":2,"pos":60252}],"down_context":[{"change":2,"pos":60358}],"flag":"","start":3293,"end":3419,"inode":{"change":3,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":60252},"to":{"change":2,"start":60252,"end":60358},"introduced_by":2}],"inode":{"change":3,"pos":717381}},"ins_contents":[{"Add":" Base32, ChangeId, Channel, ChannelRef, EdgeFlags, Hash, Inode, Merkle, MutTxnT, OwnedPathId,"},{"Add":" RemoteRef, TxnT, Vertex,"}],"del_contents":[{"Del":" Base32, ChangeId, Channel, ChannelRef, EdgeFlags, Hash, Merkle, MutTxnT, RemoteRef, TxnT,\n Vertex,\n"}]}}],"owner":"irevoire","repo":"pijul","token":"mgsJpcyCUZ5yd0XxH2cl7VlzzpARD18voSpcvDzXQro=","login":null}

…

Dependencies

Change contents