{"header":{"message":"Fixing a bug where zombie files could be deleted by unrecord, but not their contents","description":null,"timestamp":"2022-04-14T11:17:32.27571694Z","authors":[{}]},"hash":"ZCPGCKKYDBXUTIYGKGRA7C43CJ2WNWH3L6Q7ETSVLYB6AE4HAGTQC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["ZCPGCKKYDBXUTIYGKGRA7C43CJ2WNWH3L6Q7ETSVLYB6AE4HAGTQC","Fixing a bug where zombie files could be deleted by unrecord, but not their contents"],["AA",null],["ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC","Tag transactions (including a massive refactoring of errors)"],["YUJV2OHL2JRZBT2E25KLIPWO44IFCGJ47IQNQKHMZO5U2FYANQYQC","changelog"],["6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","Refactoring apply"],["2BKYJ2JM5PTXWO6HTVBKFQANWWSCJ4UHJYKAXWGTVZB35AZJ76CQC","Fixing a bug introduced by the recent refactoring"],["IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","Cleanup, formatting, and fixing the Git feature"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["HMMMKONLCRAXVT7SO2ITTFDOJIQKKVSRIZPXYVPDC34RCBHWMHVAC","Fixing alive vertices"]],"deps":["ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC","YUJV2OHL2JRZBT2E25KLIPWO44IFCGJ47IQNQKHMZO5U2FYANQYQC"],"known":["6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","2BKYJ2JM5PTXWO6HTVBKFQANWWSCJ4UHJYKAXWGTVZB35AZJ76CQC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC"]},"hunks":[{"Edit":{"inode":{"change":9,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":566,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":3349}],"down_context":[{"change":4,"pos":2292}],"flag":"BLOCK","start":0,"end":190,"inode":{"change":9,"pos":231493}}},"contents":[{"Add":""},{"Add":" // Do not follow edges that are introduced by this patch"},{"Add":" // and are trivial parents (i.e. non-blocks), since they"},{"Add":" // aren't part of the zombie conflict."}]}},{"Edit":{"inode":{"change":9,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":600,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":247205}],"down_context":[{"change":9,"pos":247205}],"flag":"BLOCK","start":191,"end":240,"inode":{"change":9,"pos":231493}}},"contents":[{"Add":" debug!(\"repair_edges_context: {:?}\", e);"}]}},{"Edit":{"inode":{"change":9,"pos":944089},"path":"libpijul/src/apply.rs","line":479,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":145968}],"down_context":[{"change":9,"pos":961591}],"flag":"BLOCK","start":241,"end":341,"inode":{"change":9,"pos":944089}}},"contents":[{"Add":" alive_folder: HashMap, bool>,"},{"Add":" folder_stack: Vec<(Vertex, bool)>,"}]}},{"Edit":{"inode":{"change":9,"pos":944089},"path":"libpijul/src/apply.rs","line":497,"atom":{"NewVertex":{"up_context":[{"change":10,"pos":129726}],"down_context":[{"change":9,"pos":962286}],"flag":"BLOCK","start":342,"end":412,"inode":{"change":9,"pos":944089}}},"contents":[{"Add":" self.alive_folder.clear();"},{"Add":" self.folder_stack.clear();"}]}},{"Edit":{"inode":{"change":9,"pos":944089},"path":"libpijul/src/apply.rs","line":510,"atom":{"NewVertex":{"up_context":[{"change":10,"pos":129809}],"down_context":[{"change":9,"pos":962669}],"flag":"BLOCK","start":413,"end":507,"inode":{"change":9,"pos":944089}}},"contents":[{"Add":" assert!(self.alive_folder.is_empty());"},{"Add":" assert!(self.folder_stack.is_empty());"}]}},{"Edit":{"inode":{"change":9,"pos":944089},"path":"libpijul/src/apply.rs","line":521,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":42353}],"down_context":[{"change":9,"pos":971451}],"flag":"BLOCK","start":508,"end":672,"inode":{"change":9,"pos":944089}}},"contents":[{"Add":" let mut alive_folder = std::mem::replace(&mut ws.alive_folder, HashMap::new());"},{"Add":" let mut folder_stack = std::mem::replace(&mut ws.folder_stack, Vec::new());"}]}},{"Edit":{"inode":{"change":9,"pos":944089},"path":"libpijul/src/apply.rs","line":540,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":21011}],"down_context":[{"change":4,"pos":170}],"flag":"BLOCK","start":673,"end":1854,"inode":{"change":9,"pos":944089}}},"contents":[{"Add":""},{"Add":" // If we're deleting a FOLDER edge, repair_context_deleted"},{"Add":" // will not repair its potential descendants. Hence, we must"},{"Add":" // also count as \"alive\" a FOLDER node with alive descendants."},{"Add":" if p.flag().is_folder() {"},{"Add":" if folder_has_alive_descendants(txn, channel, &mut alive_folder, &mut folder_stack, b)?"},{"Add":" {"},{"Add":" continue;"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" if a.is_empty() && b_is_alive {"},{"Add":" // In this case, `a` can be an inode, in which case we"},{"Add":" // can't simply delete the edge, since b would become"},{"Add":" // unreachable."},{"Add":" //"},{"Add":" // We test this here:"},{"Add":" let mut is_inode = false;"},{"Add":" for e in iter_adjacent("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" a,"},{"Add":" EdgeFlags::FOLDER | EdgeFlags::PARENT,"},{"Add":" EdgeFlags::all(),"},{"Add":" )? {"},{"Add":" let e = e?;"},{"Add":" if e.flag().contains(EdgeFlags::FOLDER | EdgeFlags::PARENT) {"},{"Add":" is_inode = true;"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" if is_inode {"},{"Add":" continue;"},{"Add":" }"},{"Add":" }"},{"Add":""}]}},{"Replacement":{"inode":{"change":9,"pos":944089},"path":"libpijul/src/apply.rs","line":577,"ins":{"up_context":[{"change":4,"pos":186}],"down_context":[{"change":4,"pos":21996}],"flag":"BLOCK","start":1855,"end":1909,"inode":{"change":9,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":186},"to":{"change":4,"start":186,"end":230},"introduced_by":4}],"inode":{"change":9,"pos":944089}},"ins_contents":[{"Add":" \"Deleting {:?} {:?} {:?} {:?} {:?} {:?}\","}],"del_contents":[{"Del":" \"Deleting {:?} {:?} {:?} {:?}\",\n"}]}},{"Replacement":{"inode":{"change":9,"pos":944089},"path":"libpijul/src/apply.rs","line":581,"ins":{"up_context":[{"change":4,"pos":22057}],"down_context":[{"change":4,"pos":272}],"flag":"BLOCK","start":1910,"end":1980,"inode":{"change":9,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":22057},"to":{"change":4,"start":22057,"end":22078},"introduced_by":4}],"inode":{"change":9,"pos":944089}},"ins_contents":[{"Add":" p.flag(),"},{"Add":" a_is_alive,"},{"Add":" b_is_alive,"}],"del_contents":[{"Del":" p.flag()\n"}]}},{"Edit":{"inode":{"change":9,"pos":944089},"path":"libpijul/src/apply.rs","line":607,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":407}],"down_context":[{"change":4,"pos":21515}],"flag":"BLOCK","start":1981,"end":2142,"inode":{"change":9,"pos":944089}}},"contents":[{"Add":""},{"Add":" // Note: if this is a folder edge,"},{"Add":" // repair_missing_up_context will stop immediately, so we"},{"Add":" // don't even need to call it."}]}},{"Edit":{"inode":{"change":9,"pos":944089},"path":"libpijul/src/apply.rs","line":623,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":974238}],"down_context":[{"change":9,"pos":974238}],"flag":"BLOCK","start":2143,"end":2215,"inode":{"change":9,"pos":944089}}},"contents":[{"Add":" ws.alive_folder = alive_folder;"},{"Add":" ws.folder_stack = folder_stack;"}]}},{"Edit":{"inode":{"change":9,"pos":944089},"path":"libpijul/src/apply.rs","line":628,"atom":{"NewVertex":{"up_context":[{"change":11,"pos":1060}],"down_context":[{"change":2,"pos":42354}],"flag":"BLOCK","start":2216,"end":3809,"inode":{"change":9,"pos":944089}}},"contents":[{"Add":"fn folder_has_alive_descendants("},{"Add":" txn: &mut T,"},{"Add":" channel: &mut T::Graph,"},{"Add":" alive: &mut HashMap, bool>,"},{"Add":" stack: &mut Vec<(Vertex, bool)>,"},{"Add":" b: Vertex,"},{"Add":") -> Result> {"},{"Add":" if let Some(r) = alive.get(&b) {"},{"Add":" return Ok(*r);"},{"Add":" }"},{"Add":" debug!(\"alive descendants\");"},{"Add":" stack.clear();"},{"Add":" stack.push((b, false));"},{"Add":" while let Some((b, visited)) = stack.pop() {"},{"Add":" debug!(\"visiting {:?} {:?}\", b, visited);"},{"Add":" if visited {"},{"Add":" if !alive.contains_key(&b) {"},{"Add":" alive.insert(b, false);"},{"Add":" }"},{"Add":" continue;"},{"Add":" }"},{"Add":" stack.push((b, true));"},{"Add":" for e in iter_adjacent("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" b,"},{"Add":" EdgeFlags::empty(),"},{"Add":" EdgeFlags::all() - EdgeFlags::DELETED - EdgeFlags::PARENT,"},{"Add":" )? {"},{"Add":" let e = e?;"},{"Add":" if e.flag().contains(EdgeFlags::FOLDER) {"},{"Add":" let c = txn.find_block(channel, e.dest())?;"},{"Add":" stack.push((*c, false));"},{"Add":" } else {"},{"Add":" // This is a non-deleted non-folder edge."},{"Add":" let c = txn.find_block(channel, e.dest())?;"},{"Add":" if is_alive(txn, channel, &c)? {"},{"Add":" // The entire path is alive."},{"Add":" for (x, on_path) in stack.iter() {"},{"Add":" if *on_path {"},{"Add":" alive.insert(*x, true);"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(*alive.get(&b).unwrap_or(&false))"},{"Add":"}"},{"Add":""}]}},{"Edit":{"inode":{"change":3,"pos":37},"path":"CHANGELOG.md","line":2,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":50}],"down_context":[{"change":3,"pos":50}],"flag":"BLOCK","start":3810,"end":3825,"inode":{"change":3,"pos":37}}},"contents":[{"Add":""},{"Add":"## Unreleased"}]}},{"Edit":{"inode":{"change":3,"pos":37},"path":"CHANGELOG.md","line":5,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":51}],"down_context":[{"change":3,"pos":51}],"flag":"BLOCK","start":3826,"end":4058,"inode":{"change":3,"pos":37}}},"contents":[{"Add":"### Fixed"},{"Add":""},{"Add":"- Fixing a bug with name conflicts, where files could end up with 0 alive name."},{"Add":"- Fixing a few panics/unwraps"},{"Add":"- Fixing a bug where a zombie file could be deleted by `pijul unrecord`, but its contents would stay zombie."},{"Add":""},{"Add":""}]}}],"owner":"irevoire","repo":"pijul","token":"M/EEnqiOCLWkbXcQBXzU+y4bWKA3Iykdwuc6U7EVVm4=","login":null}

…

Dependencies

Change contents