{"header":{"message":"Detecting \"self-solving\" zombie folder (or file) conflicts","description":null,"timestamp":"2021-08-03T16:23:56.325295191Z","authors":[{}]},"hash":"UEWNF7X3S5V6N2LEJCFMZKFZZHQUCAF6FZF5DYO5XATNDEQ4G35QC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["UEWNF7X3S5V6N2LEJCFMZKFZZHQUCAF6FZF5DYO5XATNDEQ4G35QC","Detecting \"self-solving\" zombie folder (or file) conflicts"],["AA",null],["7FFFKQZU3TFXWL45TILYNX5A7AC7HBK526SD5DZGYCELN76YE7TAC","add 'Default' implementations"],["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","Refactoring iterators"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"]],"deps":["7FFFKQZU3TFXWL45TILYNX5A7AC7HBK526SD5DZGYCELN76YE7TAC","GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC"],"known":[]},"hunks":[{"Edit":{"inode":{"change":5,"pos":488880},"path":"libpijul/src/record.rs","line":1423,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":525199}],"down_context":[{"change":5,"pos":525199}],"flag":"BLOCK","start":0,"end":44,"inode":{"change":5,"pos":488880}}},"contents":[{"Add":" } else {"},{"Add":" unreachable!()"}]}},{"Edit":{"inode":{"change":5,"pos":696460},"path":"libpijul/src/missing_context.rs","line":234,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":26882}],"down_context":[{"change":2,"pos":602}],"flag":"BLOCK","start":45,"end":4001,"inode":{"change":5,"pos":696460}}},"contents":[{"Add":"/// If we're deleting a folder edge, there is a possibility that this"},{"Add":"/// solves a \"zombie conflict\", by removing the last child of a folder"},{"Add":"/// that was a zombie, in which case that parent folder can finally"},{"Add":"/// rest in peace."},{"Add":"///"},{"Add":"/// This function takes care of this for the entire change, by"},{"Add":"/// removing all obsolete folder conflict edges."},{"Add":"pub(crate) fn detect_folder_conflict_resolutions("},{"Add":" txn: &mut T,"},{"Add":" channel: &mut T::Graph,"},{"Add":" ws: &mut Workspace,"},{"Add":" change_id: ChangeId,"},{"Add":" change: &Change,"},{"Add":") -> Result<(), MissingError> {"},{"Add":" for change_ in change.changes.iter() {"},{"Add":" for change_ in change_.iter() {"},{"Add":" if let Atom::EdgeMap(ref n) = *change_ {"},{"Add":" for edge in n.edges.iter() {"},{"Add":" if !edge.flag.contains(EdgeFlags::DELETED) {"},{"Add":" continue;"},{"Add":" }"},{"Add":" detect_folder_conflict_resolution(txn, channel, ws, change_id, &n.inode, edge)?"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"fn detect_folder_conflict_resolution("},{"Add":" txn: &mut T,"},{"Add":" channel: &mut T::Graph,"},{"Add":" ws: &mut Workspace,"},{"Add":" change_id: ChangeId,"},{"Add":" inode: &Position>,"},{"Add":" e: &NewEdge>,"},{"Add":") -> Result<(), MissingError> {"},{"Add":" let mut stack = vec![if e.flag.contains(EdgeFlags::FOLDER) {"},{"Add":" if e.to.is_empty() {"},{"Add":" internal_pos(txn, &e.to.start_pos(), change_id)?"},{"Add":" } else {"},{"Add":" internal_pos(txn, &e.from, change_id)?"},{"Add":" }"},{"Add":" } else {"},{"Add":" internal_pos(txn, &inode, change_id)?"},{"Add":" }];"},{"Add":" let len = ws.pseudo.len();"},{"Add":" while let Some(pos) = stack.pop() {"},{"Add":" let dest_vertex = if let Ok(&dest_vertex) = txn.find_block_end(&channel, pos) {"},{"Add":" if !dest_vertex.is_empty() {"},{"Add":" continue;"},{"Add":" }"},{"Add":" dest_vertex"},{"Add":" } else {"},{"Add":" continue;"},{"Add":" };"},{"Add":" // Is `dest_vertex` alive? If so, stop this path."},{"Add":" let f0 = EdgeFlags::FOLDER | EdgeFlags::PARENT;"},{"Add":" let f1 = EdgeFlags::FOLDER | EdgeFlags::PARENT | EdgeFlags::BLOCK;"},{"Add":" if let Some(e) = iter_adjacent(txn, channel, dest_vertex, f0, f1)?"},{"Add":" .filter_map(|e| e.ok())"},{"Add":" .filter(|e| !e.flag().contains(EdgeFlags::PSEUDO))"},{"Add":" .next()"},{"Add":" {"},{"Add":" debug!(\"is_alive: {:?}\", e);"},{"Add":" continue;"},{"Add":" }"},{"Add":" // Does `dest_vertex` have alive or zombie descendants? If"},{"Add":" // so, stop this path."},{"Add":" let f0 = EdgeFlags::empty();"},{"Add":" let f1 = EdgeFlags::FOLDER | EdgeFlags::BLOCK | EdgeFlags::PSEUDO;"},{"Add":" if let Some(e) = iter_adjacent(txn, channel, dest_vertex, f0, f1)?.next() {"},{"Add":" debug!(\"child is_alive: {:?}\", e);"},{"Add":" continue;"},{"Add":" }"},{"Add":" // Else, `dest_vertex` is dead. We should remove its"},{"Add":" // pseudo-parents."},{"Add":" let f = EdgeFlags::FOLDER | EdgeFlags::PARENT | EdgeFlags::PSEUDO;"},{"Add":" for e in iter_adjacent(txn, channel, dest_vertex, f, f)? {"},{"Add":" let e = e?;"},{"Add":" ws.pseudo.push((dest_vertex, *e));"},{"Add":" let gr = *txn.find_block_end(&channel, e.dest()).unwrap();"},{"Add":" for e in iter_adjacent(txn, channel, gr, f, f)? {"},{"Add":" let e = e?;"},{"Add":" ws.pseudo.push((gr, *e));"},{"Add":" stack.push(e.dest())"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" // Finally, we were only squatting the `.pseudo` field of the"},{"Add":" // workspace, since that field is normally used for missing"},{"Add":" // children, and pseudo-edges from that field are treated in a"},{"Add":" // special way (by `delete_pseudo_edges` in this module)."},{"Add":" //"},{"Add":" // Therefore, we need to delete our folder-pseudo-edges now."},{"Add":" for (v, e) in ws.pseudo.drain(len..) {"},{"Add":" let p = *txn.find_block_end(channel, e.dest())?;"},{"Add":" del_graph_with_rev("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" e.flag() - EdgeFlags::PARENT,"},{"Add":" p,"},{"Add":" v,"},{"Add":" e.introduced_by(),"},{"Add":" )?;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""}]}},{"Edit":{"inode":{"change":5,"pos":944089},"path":"libpijul/src/apply.rs","line":295,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":65359}],"down_context":[{"change":3,"pos":65359}],"flag":"BLOCK","start":4002,"end":4207,"inode":{"change":5,"pos":944089}}},"contents":[{"Add":" detect_folder_conflict_resolutions("},{"Add":" txn,"},{"Add":" T::graph_mut(channel),"},{"Add":" &mut ws.missing_context,"},{"Add":" change_id,"},{"Add":" change,"},{"Add":" )"},{"Add":" .map_err(LocalApplyError::from_missing)?;"},{"Add":""}]}}],"owner":"irevoire","repo":"pijul","token":"6FF31Dro0Rt784n4dsfq8dl5zHD2H6pJIg3gdmfeTLg=","login":null}

…

Dependencies

Change contents