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

…

Dependencies

Change contents