{"header":{"message":"Getting rid of edge validation, which does not work for zombie conflicts","description":null,"timestamp":"2020-11-25T12:17:33.279792982Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"43AJ37IXON6PMMYRZM6OB2MJXPYCNIWW2XBDVNBXIRH5DD7JDTVQC","authors":[],"deps":{"hashes":[["43AJ37IXON6PMMYRZM6OB2MJXPYCNIWW2XBDVNBXIRH5DD7JDTVQC","Getting rid of edge validation, which does not work for zombie conflicts"],["AA",null],["BAUL3WR2ACY2HCJIM7K6HJOJ3UXDJISGLMDCSPH3WMPGJPL5AR4QC","Format, versions, README"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."]],"deps":["BAUL3WR2ACY2HCJIM7K6HJOJ3UXDJISGLMDCSPH3WMPGJPL5AR4QC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC"]},"hunks":[{"Edit":{"inode":{"change":4,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":301,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":240684},"to":{"change":4,"start":240684,"end":240757},"introduced_by":4}],"inode":{"change":4,"pos":231493}}},"contents":[{"Del":" let mut f = |h, from, to, flag| changes.has_edge(h, from, to, flag);\n"}]}},{"Edit":{"inode":{"change":4,"pos":231493},"path":"libpijul/src/unrecord/mod.rs","line":305,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":240968},"to":{"change":4,"start":240968,"end":240988},"introduced_by":4}],"inode":{"change":4,"pos":231493}}},"contents":[{"Del":" &mut f,\n"}]}},{"Edit":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":47,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":945713},"to":{"change":4,"start":945713,"end":945917},"introduced_by":4}],"inode":{"change":4,"pos":944089}}},"contents":[{"Del":" apply_change_to_channel(\n |h, from, to, flag| changes.has_edge(h, from, to, flag),\n txn,\n &mut channel,\n internal,\n &hash,\n &change,\n workspace,\n )\n"}]}},{"Edit":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":47,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":945713}],"down_context":[{"change":4,"pos":945917}],"flag":"","start":0,"end":84,"inode":{"change":4,"pos":944089}}},"contents":[{"Add":" apply_change_to_channel(txn, &mut channel, internal, &hash, &change, workspace)"}]}},{"Edit":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":89,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":947384},"to":{"change":4,"start":947384,"end":947698},"introduced_by":4}],"inode":{"change":4,"pos":944089}}},"contents":[{"Del":" apply_change_to_channel(\n |h, from, to, flag| changes.has_edge(h, from, to, flag),\n txn,\n &mut channel,\n internal,\n &hash,\n &change,\n workspace,\n )?;\n"}]}},{"Edit":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":89,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":947384}],"down_context":[{"change":4,"pos":947698}],"flag":"","start":85,"end":183,"inode":{"change":4,"pos":944089}}},"contents":[{"Add":" apply_change_to_channel(txn, &mut channel, internal, &hash, &change, workspace)?;"}]}},{"Edit":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":125,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":948511},"to":{"change":4,"start":948511,"end":948727},"introduced_by":4}],"inode":{"change":4,"pos":944089}}},"contents":[{"Del":"fn apply_change_to_channel<\n T: MutTxnT,\n F: FnMut(\n Hash,\n Position>,\n Position>,\n EdgeFlags,\n ) -> Result,\n>(\n mut changes: F,\n"}]}},{"Edit":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":125,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":948511}],"down_context":[{"change":4,"pos":948727}],"flag":"","start":184,"end":224,"inode":{"change":4,"pos":944089}}},"contents":[{"Add":"fn apply_change_to_channel("}]}},{"Edit":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":152,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":949732},"to":{"change":4,"start":949732,"end":949778},"introduced_by":4}],"inode":{"change":4,"pos":944089}}},"contents":[{"Del":" &mut changes,\n"}]}},{"Edit":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":174,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":950554},"to":{"change":4,"start":950554,"end":950600},"introduced_by":4}],"inode":{"change":4,"pos":944089}}},"contents":[{"Del":" &mut changes,\n"}]}},{"Edit":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":213,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":952104},"to":{"change":4,"start":952104,"end":952159},"introduced_by":4}],"inode":{"change":4,"pos":944089}}},"contents":[{"Del":"// org id 7IPbKRayK1ey50vdV6FP2KOmzRGn2tCT3qapFICvlNc=\n"}]}},{"Edit":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":213,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":952104}],"down_context":[{"change":4,"pos":952159}],"flag":"","start":225,"end":226,"inode":{"change":4,"pos":944089}}},"contents":[{"Add":""}]}},{"Edit":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":227,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":952701},"to":{"change":4,"start":952701,"end":952760},"introduced_by":4}],"inode":{"change":4,"pos":944089}}},"contents":[{"Del":" // org id GEylov+bdcaQUmngYlibUCe0K6dMYx9lmeEmNPGCFUQ=\n"}]}},{"Edit":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":230,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":67381},"to":{"change":4,"start":952912,"end":953210},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":952912},"to":{"change":4,"start":952912,"end":953210},"introduced_by":4}],"inode":{"change":4,"pos":944089}}},"contents":[{"Del":" // org id O9lNVqhAbRqj2tE6JW0Ax8U3WSetv22rYrSXHQlT78A=\n let n = apply_change_to_channel(\n |_, _, _, _| Ok(true),\n txn,\n &mut channel,\n internal,\n &hash,\n &change,\n workspace,\n )?;\n // org id w0Bu10TO1Kbn1WbRcFHyU/0xBR4Yi61jj66D/1uiicM=\n"}]}},{"Edit":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":230,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":67381}],"down_context":[{"change":4,"pos":953210}],"flag":"","start":227,"end":321,"inode":{"change":4,"pos":944089}}},"contents":[{"Add":" let n = apply_change_to_channel(txn, &mut channel, internal, &hash, &change, workspace)?;"}]}},{"Edit":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":524,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":962732},"to":{"change":4,"start":962732,"end":962794},"introduced_by":4}],"inode":{"change":4,"pos":944089}}},"contents":[{"Del":"pub(crate) fn put_newedge(\n mut validate_edge: C,\n"}]}},{"Edit":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":524,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":962732}],"down_context":[{"change":4,"pos":962794}],"flag":"","start":322,"end":355,"inode":{"change":4,"pos":944089}}},"contents":[{"Add":"pub(crate) fn put_newedge("}]}},{"Edit":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":535,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":963026},"to":{"change":4,"start":963026,"end":963175},"introduced_by":4}],"inode":{"change":4,"pos":944089}}},"contents":[{"Del":" C: FnMut(\n Hash,\n Position>,\n Position>,\n EdgeFlags,\n ) -> Result,\n"}]}},{"Edit":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":594,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":965236},"to":{"change":4,"start":965236,"end":965517},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":965517},"to":{"change":2,"start":453,"end":526},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":526},"to":{"change":4,"start":965589,"end":965631},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":965589},"to":{"change":4,"start":965589,"end":965631},"introduced_by":4}],"inode":{"change":4,"pos":944089}}},"contents":[{"Del":" if !del {\n if let Some(intro) = n.introduced_by {\n // Check that the edge actually existed at some point.\n if !validate_edge(intro, n.from, n.to.start_pos(), n.previous)? {\n debug!(\"edge doesn't exist: {:?}\", n);\n"},{"Del":" return Err(crate::Error::InconsistentChange.into());\n"},{"Del":" }\n }\n }\n"}]}}],"owner":"irevoire","repo":"pijul","token":"qBuJ8HfRMgWaPLO+bZ1tG8NZL3mwHC5dEJ8vPJkYrkE=","login":null}

…

Dependencies

Change contents