{"header":{"message":"Bug fixes when unrecording a patch that introduced zombie files","description":"When unrecording a patch that introduced a zombie file by deleting a file, we must delete the paths made of pseudo-edges that represent the zombie conflict. The algorithm for finding that path was wrong, this patch replaces it with a proper one.","timestamp":"2023-10-27T16:03:33.619346398Z","authors":[{}]},"hash":"MQ6ERQ43MWASF2OSG65FHKWHCWT35BJVFJWKHAFPVCTLICCTJWUAC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["MQ6ERQ43MWASF2OSG65FHKWHCWT35BJVFJWKHAFPVCTLICCTJWUAC","Bug fixes when unrecording a patch that introduced zombie files"],["AA",null],["UEWNF7X3S5V6N2LEJCFMZKFZZHQUCAF6FZF5DYO5XATNDEQ4G35QC","Detecting \"self-solving\" zombie folder (or file) conflicts"],["RSFUX6MLPHII3DRELHN62DOJCHFCDNKSRMWJDSFGTWN5S4RJVSSQC","Correct find_alive cache system"],["YXAVFTPP2PQAYMKGQH7QNKFVGKDI2UHVWB7SIDA4QEYSBP75ZGUQC","Allowing vertex buffer to use references to the transaction, by changing `output::output` to take an ArcTxn instead of a simple T"],["ZJWCPRMHAYZYGCPYBTBIPBBFVCVDSFNGUL36HMC2DHCWZZKNA7PAC","Fixing known patches in deleted contexts"],["BOJEBIOIRT73FEVDUZPKRIBQMP3XX2HCZQ6CIB2AGMWTGNN47JRQC","Fixing \"block error\" in unrecord"],["QY4E6CLE6MFO6GGT5XVCPMGJQK22W4FZNLWRZKVMYYPOMAAZUX4AC","Replacing a panic with a proper error"],["3QXUJMZDPH2EDJY6UXIRA5ZQK3GRS2R422S7CKN56I36O4POAQXQC","More detailed display of conflicts"],["3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","More convenient interface for channels"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["3CFU4DQNHPPJC2B63RSVAVGHTQZT3RT5CCHHYC4ZM6DQ4GVQULSQC","Fixing a bug in unrecord, where a patch creating an undeletion conflict would not be properly unrecorded"],["KQTD46KVVWMJ3W6O55BEJLCVTNTDLUH6QT46AEFT7OU2SELXG4IAC","Unrecord: restore files *after* having unapplied the *entire* change"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["KDF6FJRVF72L274BEUJCTUKRFMNL6BDZMTVKDPEYGFX4TC3YOVSQC","bigger clippy refactors"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC","Tag transactions (including a massive refactoring of errors)"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["7ZFRYVVQQGJYG3POPWJWL3CDW37YDXZYZQC3OSWFHWEUSEMYQ4EQC","Cargo.nix and formatting"],["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","Refactoring iterators"],["RMDMAYRXYBU5OQXV5HSF6LFD4NBMKRNH5EPIVW3K5HAV6D56IG6QC","Adding a root inode (aka supporting submodules)"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["MDADYULS5AWVMTJDGYCGNQTN6T7XJDRUBDTFILDY5MLF6I2PE5NAC","Fix a panic when switching between channels that have different files"],["AD6M434OFUCH6ISHP7GXSNNRBHEWP242ZDH7QCVCYLHMRASGE5MQC","find_alive performance (matters a lot for unrecord)"],["6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","Refactoring apply"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["I3OVP3NHSMB2YLU4EPU5BFH7KB54PMQ4WDATGINIJKRIHMSVFUSQC","Archive: set the accurate and deterministic mtime"],["A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","Integrating identity malleability"],["G55Y75FUL4LWA346HQCZ5EVA5G54EDTZAW7MPVTO44BP6D5UMURAC","Avoiding deadlocks when using output.rs with a non-filesystem output"],["BD5PC25AB5MKVIYDFSDGRZ4YGX4PKW4SMZ3YAYAPNA5HLDVJUR3QC","Deleting conflict resolution vertices when the sides are deleted"],["HMMMKONLCRAXVT7SO2ITTFDOJIQKKVSRIZPXYVPDC34RCBHWMHVAC","Fixing alive vertices"],["YRBOKAWJVS24QTCEMYIUWTEE6HE7BM5OBF5U5MPYFTYW4ZYV2THQC","Formatting (why wasn't this recorded before? I'm not sure)"],["BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","Fixing --features git"],["IXC43DSHDSXCE2X6H6N47GGVKTYM2D2BUUWF34CFWMFT6Z45NOOAC","Fixing a bug in unrecord"]],"deps":["UEWNF7X3S5V6N2LEJCFMZKFZZHQUCAF6FZF5DYO5XATNDEQ4G35QC","RSFUX6MLPHII3DRELHN62DOJCHFCDNKSRMWJDSFGTWN5S4RJVSSQC","YXAVFTPP2PQAYMKGQH7QNKFVGKDI2UHVWB7SIDA4QEYSBP75ZGUQC","ZJWCPRMHAYZYGCPYBTBIPBBFVCVDSFNGUL36HMC2DHCWZZKNA7PAC","BOJEBIOIRT73FEVDUZPKRIBQMP3XX2HCZQ6CIB2AGMWTGNN47JRQC","QY4E6CLE6MFO6GGT5XVCPMGJQK22W4FZNLWRZKVMYYPOMAAZUX4AC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","KDF6FJRVF72L274BEUJCTUKRFMNL6BDZMTVKDPEYGFX4TC3YOVSQC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","KQTD46KVVWMJ3W6O55BEJLCVTNTDLUH6QT46AEFT7OU2SELXG4IAC","HMMMKONLCRAXVT7SO2ITTFDOJIQKKVSRIZPXYVPDC34RCBHWMHVAC","BD5PC25AB5MKVIYDFSDGRZ4YGX4PKW4SMZ3YAYAPNA5HLDVJUR3QC","6YMDOZIB5LVYLFIDGN2WNT5JTHEAMS4TFPVDEZ3OWXWOKJOC5QDAC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","I3OVP3NHSMB2YLU4EPU5BFH7KB54PMQ4WDATGINIJKRIHMSVFUSQC","3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","MDADYULS5AWVMTJDGYCGNQTN6T7XJDRUBDTFILDY5MLF6I2PE5NAC","7ZFRYVVQQGJYG3POPWJWL3CDW37YDXZYZQC3OSWFHWEUSEMYQ4EQC","YRBOKAWJVS24QTCEMYIUWTEE6HE7BM5OBF5U5MPYFTYW4ZYV2THQC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","AD6M434OFUCH6ISHP7GXSNNRBHEWP242ZDH7QCVCYLHMRASGE5MQC","A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","RMDMAYRXYBU5OQXV5HSF6LFD4NBMKRNH5EPIVW3K5HAV6D56IG6QC","ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC","G55Y75FUL4LWA346HQCZ5EVA5G54EDTZAW7MPVTO44BP6D5UMURAC","3QXUJMZDPH2EDJY6UXIRA5ZQK3GRS2R422S7CKN56I36O4POAQXQC","3CFU4DQNHPPJC2B63RSVAVGHTQZT3RT5CCHHYC4ZM6DQ4GVQULSQC"]},"hunks":[{"Edit":{"inode":{"change":8,"pos":177758},"path":"pijul/src/commands/debug.rs","line":7,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":31}],"down_context":[{"change":8,"pos":177836}],"flag":"BLOCK","start":0,"end":12,"inode":{"change":8,"pos":177758}}},"contents":[{"Add":"use log::*;"}]}},{"Replacement":{"inode":{"change":8,"pos":177758},"path":"pijul/src/commands/debug.rs","line":44,"ins":{"up_context":[{"change":8,"pos":21392}],"down_context":[{"change":8,"pos":21530}],"flag":"BLOCK","start":13,"end":670,"inode":{"change":8,"pos":177758}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":21392},"to":{"change":8,"start":21392,"end":21427},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":21427},"to":{"change":7,"start":0,"end":74},"introduced_by":7}],"inode":{"change":8,"pos":177758}},"ins_contents":[{"Add":" let pos = if let Some(pos) = parse_pos(&root) {"},{"Add":" pos"},{"Add":" } else {"},{"Add":" let inode = libpijul::fs::find_inode(&txn, &root)?;"},{"Add":" debug!(\"inode {:?}\", inode);"},{"Add":" use libpijul::TreeTxnT;"},{"Add":" if let Ok(Some(pos)) = txn.get_inodes(&inode, None) {"},{"Add":" debug!(\"inode {:?}\", pos);"},{"Add":" *pos"},{"Add":" } else {"},{"Add":" debug!(\"no inode\");"},{"Add":" txn"},{"Add":" .follow_oldest_path(&repo.changes, &channel, &root)?.0"},{"Add":" }"},{"Add":" };"}],"del_contents":[{"Del":" let (pos, _) = txn\n"},{"Del":" .follow_oldest_path(&repo.changes, &channel, &root)?;\n"}]}},{"Edit":{"inode":{"change":8,"pos":177758},"path":"pijul/src/commands/debug.rs","line":80,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":178663}],"down_context":[{"change":8,"pos":178663}],"flag":"BLOCK","start":671,"end":1164,"inode":{"change":8,"pos":177758}}},"contents":[{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn parse_pos(s: &str) -> Option> {"},{"Add":" let mut it = s.split('.');"},{"Add":" if let (Some(a), Some(b)) = (it.next(),it.next()) {"},{"Add":" use libpijul::pristine::{Position, ChangeId, ChangePosition, Base32};"},{"Add":" let change = ChangeId::from_base32(a.as_bytes())?;"},{"Add":" let pos: u64 = b.parse().ok()?;"},{"Add":" Some(Position {"},{"Add":" change,"},{"Add":" pos: ChangePosition(pos.into()),"},{"Add":" })"},{"Add":" } else {"},{"Add":" None"}]}},{"Replacement":{"inode":{"change":8,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":251,"ins":{"up_context":[{"change":8,"pos":939}],"down_context":[{"change":8,"pos":968}],"flag":"BLOCK","start":1165,"end":1201,"inode":{"change":8,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":939},"to":{"change":8,"start":939,"end":968},"introduced_by":8}],"inode":{"change":8,"pos":231493}},"ins_contents":[{"Add":" // edges are PSEUDO|FOLDER."}],"del_contents":[{"Del":" // edges are PSEUDO.\n"}]}},{"Edit":{"inode":{"change":8,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":259,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":123}],"down_context":[{"change":6,"pos":123}],"flag":"BLOCK","start":1202,"end":1283,"inode":{"change":8,"pos":231493}}},"contents":[{"Add":" debug!(\"line {}, del {:?} {:?} {:?}\", line!(), u, v, e);"}]}},{"Edit":{"inode":{"change":8,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":264,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":312}],"down_context":[{"change":6,"pos":312}],"flag":"BLOCK","start":1284,"end":1365,"inode":{"change":8,"pos":231493}}},"contents":[{"Add":" debug!(\"line {}, del {:?} {:?} {:?}\", line!(), v, w, e);"}]}},{"Edit":{"inode":{"change":8,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":293,"atom":{"NewVertex":{"up_context":[{"change":34,"pos":69}],"down_context":[{"change":8,"pos":235977}],"flag":"BLOCK","start":1366,"end":1422,"inode":{"change":8,"pos":231493}}},"contents":[{"Add":" zombies_stack: Vec<(Vertex, bool, bool)>,"}]}},{"Edit":{"inode":{"change":8,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":353,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":238407}],"down_context":[{"change":8,"pos":8010}],"flag":"BLOCK","start":1423,"end":1492,"inode":{"change":8,"pos":231493}}},"contents":[{"Add":" debug!(\"line {}, del {:?} {:?} {:?}\", line!(), a, b, e);"}]}},{"Edit":{"inode":{"change":8,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":591,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":18573}],"down_context":[{"change":8,"pos":18573}],"flag":"BLOCK","start":1493,"end":1566,"inode":{"change":8,"pos":231493}}},"contents":[{"Add":" debug!(\"line {}, del {:?} {:?} {:?}\", line!(), u, v, e);"}]}},{"Edit":{"inode":{"change":8,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":595,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":18721}],"down_context":[{"change":8,"pos":18721}],"flag":"BLOCK","start":1567,"end":1640,"inode":{"change":8,"pos":231493}}},"contents":[{"Add":" debug!(\"line {}, del {:?} {:?} {:?}\", line!(), v, w, e);"}]}},{"Replacement":{"inode":{"change":8,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":614,"ins":{"up_context":[{"change":8,"pos":3151}],"down_context":[{"change":8,"pos":3198}],"flag":"BLOCK","start":1641,"end":1689,"inode":{"change":8,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3151},"to":{"change":8,"start":3151,"end":3198},"introduced_by":8}],"inode":{"change":8,"pos":231493}},"ins_contents":[{"Add":" debug!(\"collect_zombies, v = {:?}\", v);"}],"del_contents":[{"Del":" debug!(\"remove_zombies, v = {:?}\", v);\n"}]}},{"Edit":{"inode":{"change":8,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":652,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":2201}],"down_context":[{"change":6,"pos":430}],"flag":"BLOCK","start":1690,"end":1734,"inode":{"change":8,"pos":231493}}},"contents":[{"Add":""},{"Add":" // First, collect the paths downwards."}]}},{"Replacement":{"inode":{"change":8,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":655,"ins":{"up_context":[{"change":6,"pos":480}],"down_context":[{"change":6,"pos":508}],"flag":"BLOCK","start":1735,"end":4096,"inode":{"change":8,"pos":231493}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":480},"to":{"change":6,"start":480,"end":508},"introduced_by":6}],"inode":{"change":8,"pos":231493}},"ins_contents":[{"Add":" ws.zombies_stack.push((*to, false, false))"},{"Add":" }"},{"Add":""},{"Add":" while let Some((v, alive, on_path)) = ws.zombies_stack.pop() {"},{"Add":" if on_path {"},{"Add":" // Already visited. If not alive, delete PSEUDO edges."},{"Add":" if !alive {"},{"Add":" for e in iter_adj_all(txn, channel, v)? {"},{"Add":" let e = e?;"},{"Add":" if e.flag().contains(EdgeFlags::PSEUDO) {"},{"Add":" ws.del_edges.push((v, *e))"},{"Add":" }"},{"Add":" }"},{"Add":" if ws.zombies_stack.is_empty() {"},{"Add":" debug_assert_eq!(v.start_pos(), to);"},{"Add":" // Collect all the pseudo-paths up."},{"Add":" ws.parents.clear();"},{"Add":" collect_zombies_up(txn, channel, to, ws)?"},{"Add":" }"},{"Add":" }"},{"Add":" continue"},{"Add":" }"},{"Add":""},{"Add":" // A vertex cannot be marked alive if it wasn't on the path."},{"Add":" assert!(!alive);"},{"Add":""},{"Add":" // If the vertex was already visited in another path, pass."},{"Add":" if !ws.parents.insert(v) {"},{"Add":" continue;"},{"Add":" }"},{"Add":""},{"Add":" // Else, iterate through all children. If any of them is"},{"Add":" // alive, mark the entire path as alive. Else, just push onto"},{"Add":" // the stack and continue the DFS."},{"Add":" let mut is_first = true;"},{"Add":" for e in iter_alive_children(txn, channel, v)? {"},{"Add":" let e = e?;"},{"Add":" if e.flag().intersects(EdgeFlags::PARENT | EdgeFlags::DELETED) {"},{"Add":" continue"},{"Add":" }"},{"Add":" let x = txn.find_block(channel, e.dest())?;"},{"Add":" if is_alive(txn, channel, x)? {"},{"Add":" // Mark all edges on the path as alive."},{"Add":" for (_, alive, on_path) in ws.zombies_stack.iter_mut() {"},{"Add":" if *on_path {"},{"Add":" *alive = true"},{"Add":" }"},{"Add":" }"},{"Add":" } else {"},{"Add":" if is_first {"},{"Add":" is_first = false;"},{"Add":" ws.zombies_stack.push((v, false, true))"},{"Add":" }"},{"Add":" ws.zombies_stack.push((*x, false, false))"},{"Add":" }"},{"Add":" }"},{"Add":" }"},{"Add":" ws.zombies_stack.clear();"},{"Add":" ws.parents.clear();"},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"fn collect_zombies_up("},{"Add":" txn: &T,"},{"Add":" channel: &T::Graph,"},{"Add":" to: Position,"},{"Add":" ws: &mut Workspace,"},{"Add":") -> Result<(), BlockError> {"},{"Add":""},{"Add":" if let Ok(&to) = txn.find_block(channel, to) {"},{"Add":" ws.stack.push(to);"}],"del_contents":[{"Del":" ws.stack.push(*to);\n"}]}},{"Edit":{"inode":{"change":8,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":727,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":514}],"down_context":[{"change":8,"pos":2251}],"flag":"BLOCK","start":4097,"end":4098,"inode":{"change":8,"pos":231493}}},"contents":[{"Add":""}]}},{"Edit":{"inode":{"change":8,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":738,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2597},"to":{"change":8,"start":2597,"end":2869},"introduced_by":8}],"inode":{"change":8,"pos":231493}}},"contents":[{"Del":" if (e.flag() & (EdgeFlags::PSEUDO | EdgeFlags::DELETED)).is_empty() {\n // This isn't a pseudo edge, `v` isn't part\n ws.del_edges.truncate(del_len);\n ws.stack.truncate(stack_len);\n break\n }\n"}]}},{"Edit":{"inode":{"change":8,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":739,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":2923}],"down_context":[{"change":6,"pos":515}],"flag":"BLOCK","start":4099,"end":4457,"inode":{"change":8,"pos":231493}}},"contents":[{"Add":""},{"Add":" assert!(e.flag().contains(EdgeFlags::FOLDER));"},{"Add":""},{"Add":" if !e.flag().intersects(EdgeFlags::PSEUDO | EdgeFlags::DELETED) {"},{"Add":" // Neither a pseudo edge nor a deleted edge."},{"Add":" ws.del_edges.truncate(del_len);"},{"Add":" ws.stack.truncate(stack_len);"},{"Add":" break"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":8,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":751,"ins":{"up_context":[{"change":6,"pos":642}],"down_context":[{"change":6,"pos":748}],"flag":"BLOCK","start":4458,"end":4563,"inode":{"change":8,"pos":231493}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":6,"pos":642},"to":{"change":8,"start":2994,"end":3015},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":2994},"to":{"change":8,"start":2994,"end":3015},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3015},"to":{"change":6,"start":643,"end":748},"introduced_by":6}],"inode":{"change":8,"pos":231493}},"ins_contents":[{"Add":" if e.flag().contains(EdgeFlags::PSEUDO) {"},{"Add":" ws.del_edges.push((v, *e))"}],"del_contents":[{"Del":" } else {\n"},{"Del":" if let Ok(x) = txn.find_block(channel, e.dest()) {\n ws.stack.push(*x)\n"}]}},{"Edit":{"inode":{"change":8,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":755,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3096},"to":{"change":8,"start":3096,"end":3150},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":3150},"to":{"change":8,"start":19204,"end":19247},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":19204},"to":{"change":8,"start":19204,"end":19247},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":19247},"to":{"change":8,"start":3796,"end":3810},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":3796},"to":{"change":8,"start":3796,"end":3810},"introduced_by":8}],"inode":{"change":8,"pos":231493}}},"contents":[{"Del":" if e.flag().contains(EdgeFlags::PSEUDO) {\n"},{"Del":" ws.del_edges.push((v, *e))\n"},{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":8,"pos":488880},"path":"libpijul/src/record.rs","line":1220,"ins":{"up_context":[{"change":4,"pos":3954}],"down_context":[{"change":4,"pos":4017}],"flag":"BLOCK","start":4564,"end":4634,"inode":{"change":8,"pos":488880}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3954},"to":{"change":4,"start":3954,"end":4017},"introduced_by":4}],"inode":{"change":8,"pos":488880}},"ins_contents":[{"Add":" retrieve(&*txn, txn.graph(&*channel), vertex, false)?"}],"del_contents":[{"Del":" retrieve(&*txn, txn.graph(&*channel), vertex)?\n"}]}},{"Replacement":{"inode":{"change":8,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1339,"ins":{"up_context":[{"change":8,"pos":67436}],"down_context":[{"change":8,"pos":106106}],"flag":"BLOCK","start":4635,"end":4697,"inode":{"change":8,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":67436},"to":{"change":8,"start":106045,"end":106106},"introduced_by":8}],"inode":{"change":8,"pos":586748}},"ins_contents":[{"Add":" if e.flag().contains(EdgeFlags::PARENT) != down {"}],"del_contents":[{"Del":" if e.flag().contains(EdgeFlags::PARENT) ^ down {\n"}]}},{"Replacement":{"inode":{"change":8,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":2211,"ins":{"up_context":[{"change":8,"pos":835}],"down_context":[{"change":8,"pos":3917}],"flag":"BLOCK","start":4698,"end":4799,"inode":{"change":8,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":835},"to":{"change":8,"start":3822,"end":3917},"introduced_by":8}],"inode":{"change":8,"pos":586748}},"ins_contents":[{"Add":" let graph = crate::alive::retrieve::retrieve(txn, txn.graph(channel), file_, true).unwrap();"}],"del_contents":[{"Del":" let graph = crate::alive::retrieve::retrieve(txn, txn.graph(channel), file_).unwrap();\n"}]}},{"Replacement":{"inode":{"change":8,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":2215,"ins":{"up_context":[{"change":8,"pos":906}],"down_context":[{"change":8,"pos":3117}],"flag":"BLOCK","start":4800,"end":4875,"inode":{"change":8,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":906},"to":{"change":8,"start":3996,"end":4072},"introduced_by":8}],"inode":{"change":8,"pos":586748}},"ins_contents":[{"Add":" debug_root(txn, txn.graph(channel), file.unwrap(), &mut f, true)?;"}],"del_contents":[{"Del":" debug_root(txn, txn.graph(channel), file.unwrap(), &mut f, false)?;\n"}]}},{"Replacement":{"inode":{"change":8,"pos":671807},"path":"libpijul/src/output/output.rs","line":770,"ins":{"up_context":[{"change":8,"pos":86}],"down_context":[{"change":8,"pos":150}],"flag":"BLOCK","start":4876,"end":4947,"inode":{"change":8,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":86},"to":{"change":8,"start":86,"end":150},"introduced_by":8}],"inode":{"change":8,"pos":671807}},"ins_contents":[{"Add":" retrieve(&*txn, txn.graph(&*channel), output_item.pos, false)?"}],"del_contents":[{"Del":" retrieve(&*txn, txn.graph(&*channel), output_item.pos)?\n"}]}},{"Edit":{"inode":{"change":8,"pos":686190},"path":"libpijul/src/output/mod.rs","line":258,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":23999}],"down_context":[{"change":8,"pos":23999}],"flag":"BLOCK","start":4948,"end":5135,"inode":{"change":8,"pos":686190}}},"contents":[{"Add":" return Ok(());"},{"Add":" // The following was supposed to be a panic, but actually it"},{"Add":" // doesn't need to be one, there just wasn't any file to"},{"Add":" // output."},{"Add":" /*"}]}},{"Edit":{"inode":{"change":8,"pos":686190},"path":"libpijul/src/output/mod.rs","line":281,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":24566}],"down_context":[{"change":8,"pos":24566}],"flag":"BLOCK","start":5136,"end":5147,"inode":{"change":8,"pos":686190}}},"contents":[{"Add":" */"}]}},{"Replacement":{"inode":{"change":8,"pos":686190},"path":"libpijul/src/output/mod.rs","line":339,"ins":{"up_context":[{"change":4,"pos":4295}],"down_context":[{"change":4,"pos":4360}],"flag":"BLOCK","start":5148,"end":5220,"inode":{"change":8,"pos":686190}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4295},"to":{"change":4,"start":4295,"end":4360},"introduced_by":4}],"inode":{"change":8,"pos":686190}},"ins_contents":[{"Add":" crate::alive::retrieve(&*txn, txn.graph(&*channel), v0, false)?"}],"del_contents":[{"Del":" crate::alive::retrieve(&*txn, txn.graph(&*channel), v0)?\n"}]}},{"Replacement":{"inode":{"change":8,"pos":690044},"path":"libpijul/src/output/archive.rs","line":268,"ins":{"up_context":[{"change":4,"pos":5681}],"down_context":[{"change":8,"pos":0}],"flag":"BLOCK","start":5221,"end":5325,"inode":{"change":8,"pos":690044}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":5681},"to":{"change":4,"start":5681,"end":5778},"introduced_by":4}],"inode":{"change":8,"pos":690044}},"ins_contents":[{"Add":" crate::alive::retrieve(&*txn_, txn_.graph(&channel_), output_item.pos, false)?;"}],"del_contents":[{"Del":" crate::alive::retrieve(&*txn_, txn_.graph(&channel_), output_item.pos)?;\n"}]}},{"Replacement":{"inode":{"change":8,"pos":696460},"path":"libpijul/src/missing_context.rs","line":46,"ins":{"up_context":[{"change":8,"pos":697496}],"down_context":[{"change":8,"pos":697575}],"flag":"BLOCK","start":5326,"end":5413,"inode":{"change":8,"pos":696460}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":697496},"to":{"change":8,"start":88998,"end":89078},"introduced_by":8}],"inode":{"change":8,"pos":696460}},"ins_contents":[{"Add":" let mut graph = crate::alive::retrieve(txn, channel, pos, false)?;"}],"del_contents":[{"Del":" let mut graph = crate::alive::retrieve(txn, channel, pos)?;\n"}]}},{"Edit":{"inode":{"change":8,"pos":696460},"path":"libpijul/src/missing_context.rs","line":367,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":3800}],"down_context":[{"change":2,"pos":3800}],"flag":"BLOCK","start":5414,"end":5505,"inode":{"change":8,"pos":696460}}},"contents":[{"Add":" debug!(\"detect folder conflict resolution, deleting {:?} → {:?} {:?}\", v, e, p);"}]}},{"Edit":{"inode":{"change":8,"pos":763306},"path":"libpijul/src/find_alive.rs","line":166,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":734}],"down_context":[{"change":8,"pos":135056}],"flag":"BLOCK","start":5506,"end":5616,"inode":{"change":8,"pos":763306}}},"contents":[{"Add":" if v.flag() & EdgeFlags::pseudof() == EdgeFlags::PSEUDO {"},{"Add":" continue;"},{"Add":" }"}]}},{"Edit":{"inode":{"change":8,"pos":763306},"path":"libpijul/src/find_alive.rs","line":170,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":135095}],"down_context":[{"change":8,"pos":135095}],"flag":"BLOCK","start":5617,"end":5694,"inode":{"change":8,"pos":763306}}},"contents":[{"Add":" debug!(\"is_file {:?} {:?}\", is_file, !v.flag().is_folder());"}]}},{"Edit":{"inode":{"change":8,"pos":763306},"path":"libpijul/src/find_alive.rs","line":172,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":8,"pos":15924},"to":{"change":8,"start":766374,"end":766414},"introduced_by":8},{"previous":"","flag":"DELETED","from":{"change":8,"pos":135145},"to":{"change":8,"start":766374,"end":766414},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":766374},"to":{"change":8,"start":766374,"end":766414},"introduced_by":8},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":766414},"to":{"change":8,"start":135146,"end":135216},"introduced_by":8}],"inode":{"change":8,"pos":763306}}},"contents":[{"Del":" continue;\n }\n"},{"Del":" if v.flag() & EdgeFlags::pseudof() == EdgeFlags::PSEUDO {\n"}]}},{"Replacement":{"inode":{"change":8,"pos":763306},"path":"libpijul/src/find_alive.rs","line":175,"ins":{"up_context":[{"change":8,"pos":135257}],"down_context":[{"change":3,"pos":6275}],"flag":"BLOCK","start":5695,"end":5757,"inode":{"change":8,"pos":763306}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":135257},"to":{"change":3,"start":6236,"end":6275},"introduced_by":3}],"inode":{"change":8,"pos":763306}},"ins_contents":[{"Add":" if v.flag().is_block() && vertex == vertex0 {"}],"del_contents":[{"Del":" if vertex == vertex0 {\n"}]}},{"Edit":{"inode":{"change":8,"pos":763306},"path":"libpijul/src/find_alive.rs","line":212,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":135477}],"down_context":[{"change":3,"pos":7231}],"flag":"BLOCK","start":5758,"end":5984,"inode":{"change":8,"pos":763306}}},"contents":[{"Add":" for e in it {"},{"Add":" let e = e?;"},{"Add":" is_file |= !e.flag().intersects(EdgeFlags::parent_folder())"},{"Add":" }"},{"Add":" debug!(\"{:?} is a file ? {:?}\", vertex, is_file);"}]}},{"Replacement":{"inode":{"change":8,"pos":944089},"path":"libpijul/src/apply.rs","line":337,"ins":{"up_context":[{"change":8,"pos":949433}],"down_context":[{"change":8,"pos":949531}],"flag":"BLOCK","start":5985,"end":6337,"inode":{"change":8,"pos":944089}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":949433},"to":{"change":5,"start":1565,"end":1845},"introduced_by":5}],"inode":{"change":8,"pos":944089}},"ins_contents":[{"Add":" Atom::NewVertex(ref n) => {"},{"Add":" put_newvertex("},{"Add":" txn,"},{"Add":" T::graph_mut(channel),"},{"Add":" changes,"},{"Add":" change,"},{"Add":" ws,"},{"Add":" change_id,"},{"Add":" n,"},{"Add":" )?"},{"Add":" },"}],"del_contents":[{"Del":" Atom::NewVertex(ref n) => put_newvertex(\n txn,\n T::graph_mut(channel),\n changes,\n change,\n ws,\n change_id,\n n,\n )?,\n"}]}},{"Edit":{"inode":{"change":8,"pos":944089},"path":"libpijul/src/apply.rs","line":384,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":951555}],"down_context":[{"change":8,"pos":951555}],"flag":"BLOCK","start":6338,"end":7040,"inode":{"change":8,"pos":944089}}},"contents":[{"Add":""},{"Add":" {"},{"Add":" let file = Vertex {"},{"Add":" change: ChangeId(L64(5867590239053715538)),"},{"Add":" start: ChangePosition(204370u64.into()),"},{"Add":" end: ChangePosition(204370u64.into()),"},{"Add":" };"},{"Add":" let still_here: Vec<_> = iter_adjacent("},{"Add":" txn,"},{"Add":" T::graph_mut(channel),"},{"Add":" file,"},{"Add":" EdgeFlags::empty(),"},{"Add":" EdgeFlags::all(),"},{"Add":" )?.collect();"},{"Add":" debug!(\"still here! {:?}\", still_here);"},{"Add":" }"}]}},{"Edit":{"inode":{"change":8,"pos":944089},"path":"libpijul/src/apply.rs","line":586,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":971508}],"down_context":[{"change":8,"pos":146962}],"flag":"BLOCK","start":7041,"end":7464,"inode":{"change":8,"pos":944089}}},"contents":[{"Add":" debug!(\"clean_obsolete_pseudo_edges {:?} {:?} {:?}\", next_vertex, p, inode);"},{"Add":""},{"Add":" {"},{"Add":" let still_here: Vec<_> = iter_adjacent("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" next_vertex,"},{"Add":" EdgeFlags::empty(),"},{"Add":" EdgeFlags::all(),"},{"Add":" )?.collect();"},{"Add":" debug!(\"pseudo edge still here ? {:?} {:?}\", next_vertex.change.0.0, still_here)"},{"Add":" }"},{"Add":""}]}},{"Edit":{"inode":{"change":8,"pos":96160},"path":"libpijul/src/apply/edge.rs","line":270,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":44053}],"down_context":[{"change":8,"pos":103957}],"flag":"BLOCK","start":7465,"end":7599,"inode":{"change":8,"pos":96160}}},"contents":[{"Add":" debug!(\"reconnect pseudo edges, parents = {:?}\", ws.parents);"},{"Add":" debug!(\"reconnect pseudo edges, children = {:?}\", ws.children);"}]}},{"Edit":{"inode":{"change":8,"pos":984582},"path":"libpijul/src/alive/retrieve.rs","line":10,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":134379}],"down_context":[{"change":8,"pos":134379}],"flag":"BLOCK","start":7600,"end":7627,"inode":{"change":8,"pos":984582}}},"contents":[{"Add":" include_deleted: bool,"}]}},{"Replacement":{"inode":{"change":8,"pos":984582},"path":"libpijul/src/alive/retrieve.rs","line":42,"ins":{"up_context":[{"change":8,"pos":985908}],"down_context":[{"change":8,"pos":134424}],"flag":"BLOCK","start":7628,"end":7824,"inode":{"change":8,"pos":984582}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":985908},"to":{"change":8,"start":985908,"end":985958},"introduced_by":8}],"inode":{"change":8,"pos":984582}},"ins_contents":[{"Add":" if include_deleted {"},{"Add":" EdgeFlags::PSEUDO | EdgeFlags::BLOCK | EdgeFlags::DELETED"},{"Add":" } else {"},{"Add":" EdgeFlags::PSEUDO | EdgeFlags::BLOCK"},{"Add":" },"}],"del_contents":[{"Del":" EdgeFlags::PSEUDO | EdgeFlags::BLOCK,\n"}]}},{"Edit":{"inode":{"change":8,"pos":984582},"path":"libpijul/src/alive/retrieve.rs","line":49,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":134461}],"down_context":[{"change":8,"pos":148298}],"flag":"BLOCK","start":7825,"end":7920,"inode":{"change":8,"pos":984582}}},"contents":[{"Add":" if e.flag().intersects(EdgeFlags::PARENT) {"},{"Add":" continue"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":8,"pos":984582},"path":"libpijul/src/alive/retrieve.rs","line":123,"ins":{"up_context":[{"change":8,"pos":135400}],"down_context":[{"change":8,"pos":987863}],"flag":"BLOCK","start":7921,"end":7978,"inode":{"change":8,"pos":984582}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":8,"pos":135400},"to":{"change":8,"start":135400,"end":135450},"introduced_by":8}],"inode":{"change":8,"pos":984582}},"ins_contents":[{"Add":" let mut graph = retrieve(txn, channel, pos, false)?;"}],"del_contents":[{"Del":" let mut graph = retrieve(txn, channel, pos)?;\n"}]}}],"owner":"oknozor","repo":"pijul","token":"XLHnarvJ0ZFS7OiVXmXZOZ49JONj6x6UnyjSH0YfEiM=","login":null}

…

Dependencies

Change contents