{"header":{"message":"More detailed display of conflicts","description":null,"timestamp":"2022-10-11T12:13:25.973706199Z","authors":[{}]},"hash":"3QXUJMZDPH2EDJY6UXIRA5ZQK3GRS2R422S7CKN56I36O4POAQXQC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["3QXUJMZDPH2EDJY6UXIRA5ZQK3GRS2R422S7CKN56I36O4POAQXQC","More detailed display of conflicts"],["AA",null],["7GQSGIV5ZRNFT4TRZCG6AW54BZTPSSS75O4HQADOVGMYKO7P6GJQC","Fixing conflict identifiers (some nested conflicts were wrong)"],["YXAVFTPP2PQAYMKGQH7QNKFVGKDI2UHVWB7SIDA4QEYSBP75ZGUQC","Allowing vertex buffer to use references to the transaction, by changing `output::output` to take an ArcTxn instead of a simple T"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["G55Y75FUL4LWA346HQCZ5EVA5G54EDTZAW7MPVTO44BP6D5UMURAC","Avoiding deadlocks when using output.rs with a non-filesystem output"],["VYHHOEYHO67JNJEODX5L3CQFIV3DAXZBBIQUOMCWJDYF3VWICDNQC","Versions and formatting"],["Z6FWHKCAGF5MJCIG327JK7SYXQ53KM2UVGVE3QL64KDVOUPKQ3HQC","Improving the UI around zombie conflicts"],["C4MJ7D7QCOFGIHQSDV3UC76DTSE5M7JSLGN5MROMSVKFVQRFSP5QC","Verbose printing of conflicts to stderr"],["RMDMAYRXYBU5OQXV5HSF6LFD4NBMKRNH5EPIVW3K5HAV6D56IG6QC","Adding a root inode (aka supporting submodules)"],["GA3P7FOMATKDOGCZDYWLZJHAUNOWMRIP3BXTYFEH7PNWTTYYVLIAC","Nicer conflict markers"],["3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","More convenient interface for channels"],["ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC","Tag transactions (including a massive refactoring of errors)"],["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","Refactoring iterators"],["E7UUQQCCX2WSVOSMO4OWCJFFU7RGQKQ4TRBBICVM52K7ATTHYNSAC","Apply changes with prefixes in .pijul/changes"],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["LPM4PBYJFIFZXN3JNEZOKEQ74UXUMURIFY5U4R2CFC6N4XINHL4AC","More precise API for working copy in record and output"],["HBUMCAFVS4W5FHWNZR7ITJFEEUCVZ4Q2U4KGWYN7XZGDZ75JMFTQC","Avoid printing multiple names conflicts more than once"]],"deps":["7GQSGIV5ZRNFT4TRZCG6AW54BZTPSSS75O4HQADOVGMYKO7P6GJQC","YXAVFTPP2PQAYMKGQH7QNKFVGKDI2UHVWB7SIDA4QEYSBP75ZGUQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","3AMEP2Y5J6GA4AWQONF4JVA3XSR3ASLHHKMYG44R72SOUY3UQCDAC","VYHHOEYHO67JNJEODX5L3CQFIV3DAXZBBIQUOMCWJDYF3VWICDNQC","Z6FWHKCAGF5MJCIG327JK7SYXQ53KM2UVGVE3QL64KDVOUPKQ3HQC","E7UUQQCCX2WSVOSMO4OWCJFFU7RGQKQ4TRBBICVM52K7ATTHYNSAC","C4MJ7D7QCOFGIHQSDV3UC76DTSE5M7JSLGN5MROMSVKFVQRFSP5QC","RMDMAYRXYBU5OQXV5HSF6LFD4NBMKRNH5EPIVW3K5HAV6D56IG6QC","LPM4PBYJFIFZXN3JNEZOKEQ74UXUMURIFY5U4R2CFC6N4XINHL4AC","HBUMCAFVS4W5FHWNZR7ITJFEEUCVZ4Q2U4KGWYN7XZGDZ75JMFTQC","GA3P7FOMATKDOGCZDYWLZJHAUNOWMRIP3BXTYFEH7PNWTTYYVLIAC","ZDK3GNDBWXJ2OXFDYB72ZCEBGLBF4MKE5K3PVHDZATHJ7HJIDPRQC","G55Y75FUL4LWA346HQCZ5EVA5G54EDTZAW7MPVTO44BP6D5UMURAC"]},"hunks":[{"Replacement":{"inode":{"change":4,"pos":133619},"path":"pijul/src/commands/mod.rs","line":368,"ins":{"up_context":[{"change":4,"pos":2085}],"down_context":[{"change":4,"pos":2230}],"flag":"BLOCK","start":0,"end":153,"inode":{"change":4,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2085},"to":{"change":4,"start":2085,"end":2230},"introduced_by":4}],"inode":{"change":4,"pos":133619}},"ins_contents":[{"Add":" Conflict::Name { ref path, .. } => writeln!(w, \" - Name conflict on \\\"{}\\\"\", path)?,"},{"Add":" Conflict::ZombieFile { ref path, .. } => {"}],"del_contents":[{"Del":" Conflict::Name { ref path } => writeln!(w, \" - Name conflict on \\\"{}\\\"\", path)?,\n Conflict::ZombieFile { ref path } => {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":133619},"path":"pijul/src/commands/mod.rs","line":375,"ins":{"up_context":[{"change":4,"pos":2462}],"down_context":[{"change":4,"pos":2527}],"flag":"BLOCK","start":154,"end":251,"inode":{"change":4,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2462},"to":{"change":4,"start":2462,"end":2527},"introduced_by":4}],"inode":{"change":4,"pos":133619}},"ins_contents":[{"Add":" Conflict::Zombie {"},{"Add":" ref path, ref line, .."},{"Add":" } => writeln!("}],"del_contents":[{"Del":" Conflict::Zombie { ref path, ref line } => writeln!(\n"}]}},{"Replacement":{"inode":{"change":4,"pos":133619},"path":"pijul/src/commands/mod.rs","line":382,"ins":{"up_context":[{"change":4,"pos":2660}],"down_context":[{"change":4,"pos":2725}],"flag":"BLOCK","start":252,"end":349,"inode":{"change":4,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2660},"to":{"change":4,"start":2660,"end":2725},"introduced_by":4}],"inode":{"change":4,"pos":133619}},"ins_contents":[{"Add":" Conflict::Cyclic {"},{"Add":" ref path, ref line, .."},{"Add":" } => writeln!("}],"del_contents":[{"Del":" Conflict::Cyclic { ref path, ref line } => writeln!(\n"}]}},{"Replacement":{"inode":{"change":4,"pos":133619},"path":"pijul/src/commands/mod.rs","line":389,"ins":{"up_context":[{"change":4,"pos":2855}],"down_context":[{"change":4,"pos":2919}],"flag":"BLOCK","start":350,"end":446,"inode":{"change":4,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2855},"to":{"change":4,"start":2855,"end":2919},"introduced_by":4}],"inode":{"change":4,"pos":133619}},"ins_contents":[{"Add":" Conflict::Order {"},{"Add":" ref path, ref line, .."},{"Add":" } => writeln!("}],"del_contents":[{"Del":" Conflict::Order { ref path, ref line } => writeln!(\n"}]}},{"Edit":{"inode":{"change":4,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":57,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":218994}],"down_context":[{"change":4,"pos":218994}],"flag":"BLOCK","start":447,"end":489,"inode":{"change":4,"pos":217202}}},"contents":[{"Add":" pub inode_vertex: Position,"}]}},{"Replacement":{"inode":{"change":4,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":63,"ins":{"up_context":[{"change":4,"pos":219137}],"down_context":[{"change":4,"pos":219232}],"flag":"BLOCK","start":490,"end":658,"inode":{"change":4,"pos":217202}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":219137},"to":{"change":4,"start":219137,"end":219232},"introduced_by":4}],"inode":{"change":4,"pos":217202}},"ins_contents":[{"Add":" pub fn new("},{"Add":" w: W,"},{"Add":" path: &'b str,"},{"Add":" inode_vertex: Position,"},{"Add":" conflicts: &'a mut Vec,"},{"Add":" ) -> Self {"}],"del_contents":[{"Del":" pub fn new(w: W, path: &'b str, conflicts: &'a mut Vec) -> Self {\n"}]}},{"Edit":{"inode":{"change":4,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":70,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":219258}],"down_context":[{"change":4,"pos":219258}],"flag":"BLOCK","start":659,"end":685,"inode":{"change":4,"pos":217202}}},"contents":[{"Add":" inode_vertex,"}]}},{"Edit":{"inode":{"change":4,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":141,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":221061}],"down_context":[{"change":4,"pos":221061}],"flag":"BLOCK","start":686,"end":733,"inode":{"change":4,"pos":217202}}},"contents":[{"Add":" inode_vertex: [self.inode_vertex],"}]}},{"Edit":{"inode":{"change":4,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":143,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":221091}],"down_context":[{"change":4,"pos":221091}],"flag":"BLOCK","start":734,"end":812,"inode":{"change":4,"pos":217202}}},"contents":[{"Add":" changes: side.iter().cloned().cloned().collect(),"},{"Add":" id,"}]}},{"Edit":{"inode":{"change":4,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":155,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":221333}],"down_context":[{"change":4,"pos":221333}],"flag":"BLOCK","start":813,"end":860,"inode":{"change":4,"pos":217202}}},"contents":[{"Add":" inode_vertex: [self.inode_vertex],"}]}},{"Edit":{"inode":{"change":4,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":157,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":221363}],"down_context":[{"change":4,"pos":221363}],"flag":"BLOCK","start":861,"end":942,"inode":{"change":4,"pos":217202}}},"contents":[{"Add":" changes: add_del.iter().cloned().cloned().collect(),"},{"Add":" id,"}]}},{"Edit":{"inode":{"change":4,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":165,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":221605}],"down_context":[{"change":4,"pos":221605}],"flag":"BLOCK","start":943,"end":990,"inode":{"change":4,"pos":217202}}},"contents":[{"Add":" inode_vertex: [self.inode_vertex],"}]}},{"Edit":{"inode":{"change":4,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":167,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":221635}],"down_context":[{"change":4,"pos":221635}],"flag":"BLOCK","start":991,"end":1040,"inode":{"change":4,"pos":217202}}},"contents":[{"Add":" changes: Vec::new(),"},{"Add":" id,"}]}},{"Edit":{"inode":{"change":4,"pos":217202},"path":"libpijul/src/vertex_buffer.rs","line":172,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":221703}],"down_context":[{"change":4,"pos":221703}],"flag":"BLOCK","start":1041,"end":1836,"inode":{"change":4,"pos":217202}}},"contents":[{"Add":" fn conflict_next(&mut self, id_: usize, side: &[&Hash]) -> Result<(), std::io::Error> {"},{"Add":" for conflict in self.conflicts.iter_mut().rev() {"},{"Add":" match conflict {"},{"Add":" crate::output::Conflict::Order { id, changes, .. } if *id == id_ => {"},{"Add":" changes.extend(side.into_iter().cloned())"},{"Add":" }"},{"Add":" crate::output::Conflict::Zombie { id, changes, .. } if *id == id_ => {"},{"Add":" changes.extend(side.into_iter().cloned())"},{"Add":" }"},{"Add":" crate::output::Conflict::Cyclic { id, changes, .. } if *id == id_ => {"},{"Add":" changes.extend(side.into_iter().cloned())"},{"Add":" }"},{"Add":" _ => break,"},{"Add":" }"},{"Add":" }"},{"Add":" self.output_conflict_marker(SEPARATOR, id_, side)"},{"Add":" }"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":22,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":4222}],"down_context":[{"change":4,"pos":4222}],"flag":"BLOCK","start":1837,"end":1906,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":" inodes: Vec>,"},{"Add":" changes: Vec,"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":27,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":4268}],"down_context":[{"change":4,"pos":4268}],"flag":"BLOCK","start":1907,"end":1975,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":" inode: [Position; 1],"},{"Add":" changes: Vec,"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":31,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4295},"to":{"change":4,"start":4295,"end":4328},"introduced_by":4}],"inode":{"change":4,"pos":671807}}},"contents":[{"Del":" pos: Position,\n"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":32,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":4350}],"down_context":[{"change":4,"pos":4350}],"flag":"BLOCK","start":1976,"end":2080,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":" pos: [Position; 1],"},{"Add":" names: Vec>,"},{"Add":" changes: Vec,"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":38,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":4392}],"down_context":[{"change":4,"pos":4392}],"flag":"BLOCK","start":2081,"end":2128,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":" inode_vertex: [Position; 1],"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":40,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":4413}],"down_context":[{"change":4,"pos":4413}],"flag":"BLOCK","start":2129,"end":2176,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":" changes: Vec,"},{"Add":" id: usize,"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":45,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":4455}],"down_context":[{"change":4,"pos":4455}],"flag":"BLOCK","start":2177,"end":2224,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":" inode_vertex: [Position; 1],"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":47,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":4476}],"down_context":[{"change":4,"pos":4476}],"flag":"BLOCK","start":2225,"end":2272,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":" changes: Vec,"},{"Add":" id: usize,"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":52,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":4517}],"down_context":[{"change":4,"pos":4517}],"flag":"BLOCK","start":2273,"end":2320,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":" inode_vertex: [Position; 1],"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":54,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":4538}],"down_context":[{"change":4,"pos":4538}],"flag":"BLOCK","start":2321,"end":2368,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":" changes: Vec,"},{"Add":" id: usize,"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":57,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":4545}],"down_context":[{"change":4,"pos":672753}],"flag":"BLOCK","start":2369,"end":3402,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"impl Conflict {"},{"Add":" pub fn changes(&self) -> &[Hash] {"},{"Add":" match self {"},{"Add":" Conflict::Name { ref changes, .. } => changes,"},{"Add":" Conflict::ZombieFile { ref changes, .. } => changes,"},{"Add":" Conflict::MultipleNames { ref changes, .. } => changes,"},{"Add":" Conflict::Zombie { ref changes, .. } => changes,"},{"Add":" Conflict::Cyclic { ref changes, .. } => changes,"},{"Add":" Conflict::Order { ref changes, .. } => changes,"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" pub fn inodes(&self) -> &[Position] {"},{"Add":" match self {"},{"Add":" Conflict::Name { ref inodes, .. } => inodes,"},{"Add":" Conflict::ZombieFile { ref inode, .. } => inode,"},{"Add":" Conflict::MultipleNames { ref pos, .. } => pos,"},{"Add":" Conflict::Zombie {"},{"Add":" ref inode_vertex, .."},{"Add":" } => inode_vertex,"},{"Add":" Conflict::Cyclic {"},{"Add":" ref inode_vertex, .."},{"Add":" } => inode_vertex,"},{"Add":" Conflict::Order {"},{"Add":" ref inode_vertex, .."},{"Add":" } => inode_vertex,"},{"Add":" }"},{"Add":" }"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":125,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":24169}],"down_context":[{"change":4,"pos":24169}],"flag":"BLOCK","start":3403,"end":3404,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":""}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":258,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":13191}],"down_context":[{"change":4,"pos":263}],"flag":"BLOCK","start":3405,"end":3406,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":""}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":260,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":299}],"down_context":[{"change":4,"pos":13222}],"flag":"BLOCK","start":3407,"end":3408,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":""}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":304,"ins":{"up_context":[{"change":4,"pos":13906}],"down_context":[{"change":4,"pos":13975}],"flag":"BLOCK","start":3409,"end":3486,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":13906},"to":{"change":4,"start":13906,"end":13975},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" let o = output_loop(repo, changes, txn.clone(), channel, work, stop, 0);"}],"del_contents":[{"Del":" let o = output_loop(repo, changes, txn, channel, work, stop, 0);\n"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":324,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":14225}],"down_context":[{"change":4,"pos":25353}],"flag":"BLOCK","start":3487,"end":3945,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":""},{"Add":" let txn_ = txn.read();"},{"Add":" for (pos, (_, path, names)) in state.done_vertices {"},{"Add":" if !names.is_empty() {"},{"Add":" state.conflicts.insert(Conflict::MultipleNames {"},{"Add":" changes: names"},{"Add":" .iter()"},{"Add":" .map(|v| txn_.get_external(&v.change).unwrap().unwrap().into())"},{"Add":" .collect(),"},{"Add":" pos: [pos],"},{"Add":" names,"},{"Add":" path,"},{"Add":" });"},{"Add":" }"},{"Add":" }"},{"Add":""}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":364,"ins":{"up_context":[{"change":4,"pos":14869}],"down_context":[{"change":4,"pos":472}],"flag":"BLOCK","start":3946,"end":4046,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":14869},"to":{"change":4,"start":14869,"end":14945},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" done_vertices: HashMap, (Vertex, String, Vec>)>,"},{"Add":""}],"del_contents":[{"Del":" done_vertices: HashMap, (Vertex, String)>,\n"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":367,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":507}],"down_context":[{"change":4,"pos":492}],"flag":"BLOCK","start":4047,"end":4048,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":""}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":411,"ins":{"up_context":[{"change":4,"pos":16489}],"down_context":[{"change":4,"pos":16523}],"flag":"BLOCK","start":4049,"end":4158,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":16489},"to":{"change":4,"start":16489,"end":16523},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" is_first_name: &mut Option>,"},{"Add":" name_conflict: &mut Vec>,"}],"del_contents":[{"Del":" is_first_name: &mut bool,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":415,"ins":{"up_context":[{"change":4,"pos":16619}],"down_context":[{"change":4,"pos":16655}],"flag":"BLOCK","start":4159,"end":4199,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":16619},"to":{"change":4,"start":16619,"end":16655},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" Entry::Occupied(mut e) => {"}],"del_contents":[{"Del":" Entry::Occupied(e) => {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":423,"ins":{"up_context":[{"change":4,"pos":16880}],"down_context":[{"change":4,"pos":16923}],"flag":"BLOCK","start":4200,"end":4374,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":16880},"to":{"change":4,"start":16880,"end":16923},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" let e = e.get_mut();"},{"Add":" if e.0 != name_key {"},{"Add":" if e.2.is_empty() {"},{"Add":" e.2.push(e.0)"},{"Add":" }"}],"del_contents":[{"Del":" if e.get().0 != name_key {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":429,"ins":{"up_context":[{"change":4,"pos":16985}],"down_context":[{"change":4,"pos":17170}],"flag":"BLOCK","start":4375,"end":4414,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":16985},"to":{"change":4,"start":508,"end":576},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":576},"to":{"change":4,"start":17051,"end":17170},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":17051},"to":{"change":4,"start":17051,"end":17170},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" e.2.push(name_key)"}],"del_contents":[{"Del":" self.conflicts.insert(Conflict::MultipleNames {\n"},{"Del":" pos: output_item.pos,\n path: e.get().1.clone(),\n });\n"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":438,"ins":{"up_context":[{"change":4,"pos":17397}],"down_context":[{"change":4,"pos":17437}],"flag":"BLOCK","start":4415,"end":4624,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":17397},"to":{"change":4,"start":17397,"end":17437},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" let name = if let Some(ref inode) = is_first_name {"},{"Add":" if name_conflict.is_empty() {"},{"Add":" name_conflict.push(*inode)"},{"Add":" }"},{"Add":" name_conflict.push(output_item.pos);"},{"Add":""}],"del_contents":[{"Del":" let name = if !*is_first_name {\n"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":447,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":17597},"to":{"change":4,"start":577,"end":655},"introduced_by":4}],"inode":{"change":4,"pos":671807}}},"contents":[{"Del":" self.conflicts.insert(Conflict::Name { path: name.clone() });\n"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":449,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":17715},"to":{"change":4,"start":17715,"end":17780},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":17780},"to":{"change":4,"start":656,"end":711},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":711},"to":{"change":4,"start":17833,"end":17894},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":17833},"to":{"change":4,"start":17833,"end":17894},"introduced_by":4}],"inode":{"change":4,"pos":671807}}},"contents":[{"Del":" debug!(\"not outputting {:?} {:?}\", a, name_key);\n"},{"Del":" self.conflicts.insert(Conflict::Name {\n"},{"Del":" path: a.to_string(),\n });\n"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":452,"ins":{"up_context":[{"change":4,"pos":17973}],"down_context":[{"change":4,"pos":18009}],"flag":"BLOCK","start":4625,"end":4677,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":17973},"to":{"change":4,"start":17973,"end":18009},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" *is_first_name = Some(output_item.pos);"}],"del_contents":[{"Del":" *is_first_name = false;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":458,"ins":{"up_context":[{"change":4,"pos":18209}],"down_context":[{"change":4,"pos":18274}],"flag":"BLOCK","start":4678,"end":4755,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":18209},"to":{"change":4,"start":18209,"end":18274},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" name_entry.insert((name_key, output_item.path.clone(), Vec::new()));"}],"del_contents":[{"Del":" name_entry.insert((name_key, output_item.path.clone()));\n"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":476,"ins":{"up_context":[{"change":4,"pos":25796}],"down_context":[{"change":4,"pos":18991}],"flag":"BLOCK","start":4756,"end":4838,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":25796},"to":{"change":4,"start":18953,"end":18991},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":18953},"to":{"change":4,"start":18953,"end":18991},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" let mut is_first_name = None;"},{"Add":" let mut name_conflict = Vec::new();"}],"del_contents":[{"Del":" let mut is_first_name = true;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":480,"ins":{"up_context":[{"change":4,"pos":19105}],"down_context":[{"change":4,"pos":19204}],"flag":"BLOCK","start":4839,"end":5053,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":19105},"to":{"change":4,"start":19105,"end":19204},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" let name = match self.make_inode("},{"Add":" &a,"},{"Add":" name_key,"},{"Add":" &mut output_item,"},{"Add":" &mut is_first_name,"},{"Add":" &mut name_conflict,"},{"Add":" ) {"}],"del_contents":[{"Del":" let name = match self.make_inode(&a, name_key, &mut output_item, &mut is_first_name) {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":552,"ins":{"up_context":[{"change":4,"pos":21266}],"down_context":[{"change":4,"pos":712}],"flag":"BLOCK","start":5054,"end":5115,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":21266},"to":{"change":4,"start":21266,"end":21305},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" if let Some(id) = output_item.is_zombie.take() {"}],"del_contents":[{"Del":" if output_item.is_zombie {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":554,"ins":{"up_context":[{"change":4,"pos":773}],"down_context":[{"change":4,"pos":774}],"flag":"BLOCK","start":5116,"end":5235,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":773},"to":{"change":4,"start":21364,"end":21408},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":21364},"to":{"change":4,"start":21364,"end":21408},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" path: path.clone(),"},{"Add":" changes: id,"},{"Add":" inode: [output_item.pos],"}],"del_contents":[{"Del":" path: name.to_string(),\n"}]}},{"Edit":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":560,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":679083}],"down_context":[{"change":4,"pos":21428}],"flag":"BLOCK","start":5236,"end":5640,"inode":{"change":4,"pos":671807}}},"contents":[{"Add":" if !name_conflict.is_empty() {"},{"Add":" let txn = txn.read();"},{"Add":" self.conflicts.insert(Conflict::Name {"},{"Add":" changes: name_conflict"},{"Add":" .iter()"},{"Add":" .map(|v| txn.get_external(&v.change).unwrap().unwrap().into())"},{"Add":" .collect(),"},{"Add":" path: a.clone(),"},{"Add":" inodes: name_conflict,"},{"Add":" });"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":729,"ins":{"up_context":[{"change":4,"pos":18}],"down_context":[{"change":4,"pos":48}],"flag":"BLOCK","start":5641,"end":5723,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":18},"to":{"change":4,"start":18,"end":48},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" debug!(\"write\");"},{"Add":" let txn = txn.write();"},{"Add":" debug!(\"/write\");"}],"del_contents":[{"Del":" let txn = txn.read();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":671807},"path":"libpijul/src/output/output.rs","line":738,"ins":{"up_context":[{"change":4,"pos":26328}],"down_context":[{"change":3,"pos":4033}],"flag":"BLOCK","start":5724,"end":5876,"inode":{"change":4,"pos":671807}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":26328},"to":{"change":4,"start":26328,"end":26402},"introduced_by":4}],"inode":{"change":4,"pos":671807}},"ins_contents":[{"Add":" debug!(\"vertex_buffer\");"},{"Add":" let mut f = vertex_buffer::ConflictsWriter::new(w, &path, output_item.pos, conflicts);"},{"Add":" debug!(\"outputting graph\");"}],"del_contents":[{"Del":" let mut f = vertex_buffer::ConflictsWriter::new(w, &path, conflicts);\n"}]}},{"Replacement":{"inode":{"change":4,"pos":686190},"path":"libpijul/src/output/mod.rs","line":137,"ins":{"up_context":[{"change":4,"pos":686494}],"down_context":[{"change":4,"pos":686563}],"flag":"BLOCK","start":5877,"end":5911,"inode":{"change":4,"pos":686190}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":686542},"to":{"change":4,"start":686542,"end":686563},"introduced_by":4}],"inode":{"change":4,"pos":686190}},"ins_contents":[{"Add":" is_zombie: Option>,"}],"del_contents":[{"Del":" is_zombie: bool,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":686190},"path":"libpijul/src/output/mod.rs","line":298,"ins":{"up_context":[{"change":4,"pos":87230}],"down_context":[{"change":4,"pos":689844}],"flag":"BLOCK","start":5912,"end":5968,"inode":{"change":4,"pos":686190}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":87230},"to":{"change":4,"start":87230,"end":87273},"introduced_by":4}],"inode":{"change":4,"pos":686190}},"ins_contents":[{"Add":") -> Result>, TxnErr> {"}],"del_contents":[{"Del":") -> Result> {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":686190},"path":"libpijul/src/output/mod.rs","line":304,"ins":{"up_context":[{"change":4,"pos":87402}],"down_context":[{"change":4,"pos":87419}],"flag":"BLOCK","start":5969,"end":6332,"inode":{"change":4,"pos":686190}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":87402},"to":{"change":4,"start":87402,"end":87419},"introduced_by":4}],"inode":{"change":4,"pos":686190}},"ins_contents":[{"Add":" let mut id = Vec::new();"},{"Add":" let f = EdgeFlags::FOLDER | EdgeFlags::PARENT;"},{"Add":" for e in iter_adjacent(txn, channel, pos.inode_vertex(), f, EdgeFlags::all())? {"},{"Add":" let e = e?;"},{"Add":" if e.flag().contains(f) {"},{"Add":" id.push(txn.get_external(&e.introduced_by())?.unwrap().into())"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(Some(id))"}],"del_contents":[{"Del":" Ok(true)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":686190},"path":"libpijul/src/output/mod.rs","line":314,"ins":{"up_context":[{"change":4,"pos":87432}],"down_context":[{"change":4,"pos":87450}],"flag":"BLOCK","start":6333,"end":6350,"inode":{"change":4,"pos":686190}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":87432},"to":{"change":4,"start":87432,"end":87450},"introduced_by":4}],"inode":{"change":4,"pos":686190}},"ins_contents":[{"Add":" Ok(None)"}],"del_contents":[{"Del":" Ok(false)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":690044},"path":"libpijul/src/output/archive.rs","line":196,"ins":{"up_context":[{"change":3,"pos":5317}],"down_context":[{"change":4,"pos":693456}],"flag":"BLOCK","start":6351,"end":6393,"inode":{"change":4,"pos":690044}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":5317},"to":{"change":4,"start":693414,"end":693456},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":693414},"to":{"change":4,"start":693414,"end":693456},"introduced_by":4}],"inode":{"change":4,"pos":690044}},"ins_contents":[{"Add":" let mut is_first_name = None;"}],"del_contents":[{"Del":" let mut is_first_name = true;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":690044},"path":"libpijul/src/output/archive.rs","line":205,"ins":{"up_context":[{"change":4,"pos":693808}],"down_context":[{"change":4,"pos":5165}],"flag":"BLOCK","start":6394,"end":6503,"inode":{"change":4,"pos":690044}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":693808},"to":{"change":4,"start":693808,"end":693862},"introduced_by":4}],"inode":{"change":4,"pos":690044}},"ins_contents":[{"Add":" changes: Vec::new(),"},{"Add":" pos: [output_item.pos],"}],"del_contents":[{"Del":" pos: output_item.pos,\n"}]}},{"Edit":{"inode":{"change":4,"pos":690044},"path":"libpijul/src/output/archive.rs","line":208,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":5222}],"down_context":[{"change":4,"pos":693862}],"flag":"BLOCK","start":6504,"end":6555,"inode":{"change":4,"pos":690044}}},"contents":[{"Add":" names: Vec::new(),"}]}},{"Replacement":{"inode":{"change":4,"pos":690044},"path":"libpijul/src/output/archive.rs","line":219,"ins":{"up_context":[{"change":4,"pos":694368}],"down_context":[{"change":4,"pos":694415}],"flag":"BLOCK","start":6556,"end":6725,"inode":{"change":4,"pos":690044}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":694368},"to":{"change":4,"start":694368,"end":694415},"introduced_by":4}],"inode":{"change":4,"pos":690044}},"ins_contents":[{"Add":" let name = if let Some(inode) = is_first_name {"},{"Add":" let inodes = vec![inode, output_item.pos];"},{"Add":" let txn = txn.read();"}],"del_contents":[{"Del":" let name = if !is_first_name {\n"}]}},{"Edit":{"inode":{"change":4,"pos":690044},"path":"libpijul/src/output/archive.rs","line":224,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":694512}],"down_context":[{"change":4,"pos":694512}],"flag":"BLOCK","start":6726,"end":6965,"inode":{"change":4,"pos":690044}}},"contents":[{"Add":" changes: inodes"},{"Add":" .iter()"},{"Add":" .map(|i| txn.get_external(&i.change).unwrap().unwrap().into())"},{"Add":" .collect(),"},{"Add":" inodes,"}]}},{"Replacement":{"inode":{"change":4,"pos":690044},"path":"libpijul/src/output/archive.rs","line":232,"ins":{"up_context":[{"change":4,"pos":694588}],"down_context":[{"change":4,"pos":694631}],"flag":"BLOCK","start":6966,"end":7025,"inode":{"change":4,"pos":690044}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":694588},"to":{"change":4,"start":694588,"end":694631},"introduced_by":4}],"inode":{"change":4,"pos":690044}},"ins_contents":[{"Add":" is_first_name = Some(output_item.pos);"}],"del_contents":[{"Del":" is_first_name = false;\n"}]}},{"Edit":{"inode":{"change":4,"pos":690044},"path":"libpijul/src/output/archive.rs","line":279,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":695688}],"down_context":[{"change":4,"pos":695688}],"flag":"BLOCK","start":7026,"end":7071,"inode":{"change":4,"pos":690044}}},"contents":[{"Add":" output_item.pos,"}]}},{"Replacement":{"inode":{"change":4,"pos":690044},"path":"libpijul/src/output/archive.rs","line":295,"ins":{"up_context":[{"change":4,"pos":696145}],"down_context":[{"change":4,"pos":696188}],"flag":"BLOCK","start":7072,"end":7130,"inode":{"change":4,"pos":690044}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":696145},"to":{"change":4,"start":696145,"end":696188},"introduced_by":4}],"inode":{"change":4,"pos":690044}},"ins_contents":[{"Add":" if let Some(id) = output_item.is_zombie {"}],"del_contents":[{"Del":" if output_item.is_zombie {\n"}]}},{"Edit":{"inode":{"change":4,"pos":690044},"path":"libpijul/src/output/archive.rs","line":298,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":696294}],"down_context":[{"change":4,"pos":696294}],"flag":"BLOCK","start":7131,"end":7218,"inode":{"change":4,"pos":690044}}},"contents":[{"Add":" changes: id,"},{"Add":" inode: [output_item.pos],"}]}},{"Replacement":{"inode":{"change":4,"pos":988425},"path":"libpijul/src/alive/output.rs","line":63,"ins":{"up_context":[{"change":4,"pos":5871}],"down_context":[{"change":4,"pos":6022}],"flag":"BLOCK","start":7219,"end":7456,"inode":{"change":4,"pos":988425}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":5871},"to":{"change":4,"start":5871,"end":6022},"introduced_by":4}],"inode":{"change":4,"pos":988425}},"ins_contents":[{"Add":" let ext = txn.get_external(&graph[vid].vertex.change)?.unwrap().into();"},{"Add":" std::mem::drop(channel);"},{"Add":" std::mem::drop(txn);"},{"Add":" line_buf.begin_conflict(id, &[&ext])?;"}],"del_contents":[{"Del":" let ext = txn.get_external(&graph[vid].vertex.change)?.unwrap();\n line_buf.begin_conflict(id, &[&ext.into()])?;\n"}]}},{"Edit":{"inode":{"change":4,"pos":988425},"path":"libpijul/src/alive/output.rs","line":69,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":6063}],"down_context":[{"change":4,"pos":6063}],"flag":"BLOCK","start":7457,"end":7543,"inode":{"change":4,"pos":988425}}},"contents":[{"Add":" std::mem::drop(channel);"},{"Add":" std::mem::drop(txn);"}]}},{"Replacement":{"inode":{"change":4,"pos":988425},"path":"libpijul/src/alive/output.rs","line":86,"ins":{"up_context":[{"change":3,"pos":9886}],"down_context":[{"change":4,"pos":6599}],"flag":"BLOCK","start":7544,"end":7751,"inode":{"change":4,"pos":988425}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":9886},"to":{"change":4,"start":6440,"end":6529},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":6440},"to":{"change":4,"start":6440,"end":6529},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":6529},"to":{"change":2,"start":32,"end":105},"introduced_by":2}],"inode":{"change":4,"pos":988425}},"ins_contents":[{"Add":" let ext = txn.get_external(&graph[vid].vertex.change)?.unwrap().into();"},{"Add":" std::mem::drop(txn);"},{"Add":" line_buf.conflict_next(elt.id, &[&ext])?;"}],"del_contents":[{"Del":" let ext = txn.get_external(&graph[vid].vertex.change)?.unwrap();\n"},{"Del":" line_buf.conflict_next(elt.id, &[&ext.into()])?;\n"}]}}],"owner":"irevoire","repo":"pijul","token":"5xkvGF9XTrJwAeWNjBUDDbExtHHf/J8wC9KeDiqxlFs=","login":null}

…

Dependencies

Change contents