{"header":{"message":"Record a separate change for Hunk::AddRoot, to avoid #571","description":null,"timestamp":"2021-12-06T11:39:39.574869278Z","authors":[{}]},"hash":"U2CGP7OPHQZNAAPWCRSFVZQWXFRVCB2NC3APRA7ACQJZBIVBE6IQC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["U2CGP7OPHQZNAAPWCRSFVZQWXFRVCB2NC3APRA7ACQJZBIVBE6IQC","Record a separate change for Hunk::AddRoot, to avoid #571"],["AA",null],["EEBKW7VTILH6AGGV57ZIJ3DJGYHDSYBWGU3C7Q4WWAKSVNUGIYMQC","Keys and identities"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."]],"deps":["EEBKW7VTILH6AGGV57ZIJ3DJGYHDSYBWGU3C7Q4WWAKSVNUGIYMQC"],"known":[]},"hunks":[{"Edit":{"inode":{"change":4,"pos":101759},"path":"pijul/src/commands/record.rs","line":144,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":1911}],"down_context":[{"change":4,"pos":104054}],"flag":"BLOCK","start":0,"end":109,"inode":{"change":4,"pos":101759}}},"contents":[{"Add":" txn.write()"},{"Add":" .apply_root_change_if_needed(&repo.changes, &channel, rand::thread_rng())?;"},{"Add":""}]}},{"Edit":{"inode":{"change":4,"pos":717381},"path":"libpijul/src/lib.rs","line":104,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":720579}],"down_context":[{"change":4,"pos":720579}],"flag":"BLOCK","start":110,"end":478,"inode":{"change":4,"pos":717381}}},"contents":[{"Add":" fn apply_root_change_if_needed("},{"Add":" &mut self,"},{"Add":" changes: &C,"},{"Add":" channel: &ChannelRef,"},{"Add":" rng: R,"},{"Add":" ) -> Result, crate::apply::ApplyError> {"},{"Add":" crate::apply::apply_root_change(self, channel, changes, rng)"},{"Add":" }"},{"Add":""}]}},{"Edit":{"inode":{"change":4,"pos":944089},"path":"libpijul/src/apply.rs","line":827,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":982240}],"down_context":[],"flag":"BLOCK","start":479,"end":2981,"inode":{"change":4,"pos":944089}}},"contents":[{"Add":""},{"Add":"pub fn apply_root_change("},{"Add":" txn: &mut T,"},{"Add":" channel: &ChannelRef,"},{"Add":" store: &P,"},{"Add":" rng: R,"},{"Add":") -> Result, ApplyError> {"},{"Add":" let mut change = {"},{"Add":" // If the graph already has a root."},{"Add":" {"},{"Add":" let channel = channel.read();"},{"Add":" let gr = txn.graph(&*channel);"},{"Add":" for v in iter_adjacent(&*txn, gr, Vertex::ROOT, EdgeFlags::FOLDER, EdgeFlags::FOLDER|EdgeFlags::BLOCK)? {"},{"Add":" let v = txn.find_block(gr, v?.dest()).map_err(LocalApplyError::from)?;"},{"Add":" if v.start == v.end {"},{"Add":" // Already has a root"},{"Add":" return Ok(None)"},{"Add":" } else {"},{"Add":" // Non-empty channel without a root"},{"Add":" break"},{"Add":" }"},{"Add":" }"},{"Add":" // If we are here, either the channel is empty, or it"},{"Add":" // isn't and doesn't have a root."},{"Add":" }"},{"Add":" let root = Position {"},{"Add":" change: Some(Hash::None),"},{"Add":" pos: ChangePosition(0u64.into()),"},{"Add":" };"},{"Add":" let contents = rng.sample_iter(rand::distributions::Standard).take(32).collect();"},{"Add":" crate::change::LocalChange::make_change("},{"Add":" txn,"},{"Add":" channel,"},{"Add":" vec![crate::change::Hunk::AddRoot {"},{"Add":" name: Atom::NewVertex(NewVertex {"},{"Add":" up_context: vec![root],"},{"Add":" down_context: Vec::new(),"},{"Add":" start: ChangePosition(0u64.into()),"},{"Add":" end: ChangePosition(0u64.into()),"},{"Add":" flag: EdgeFlags::FOLDER|EdgeFlags::BLOCK,"},{"Add":" inode: root,"},{"Add":" }),"},{"Add":" inode: Atom::NewVertex(NewVertex {"},{"Add":" up_context: vec![Position {"},{"Add":" change: None,"},{"Add":" pos: ChangePosition(0u64.into()),"},{"Add":" }],"},{"Add":" down_context: Vec::new(),"},{"Add":" start: ChangePosition(1u64.into()),"},{"Add":" end: ChangePosition(1u64.into()),"},{"Add":" flag: EdgeFlags::FOLDER|EdgeFlags::BLOCK,"},{"Add":" inode: root,"},{"Add":" }),"},{"Add":" }],"},{"Add":" contents,"},{"Add":" crate::change::ChangeHeader::default(),"},{"Add":" Vec::new(),"},{"Add":" )?"},{"Add":" };"},{"Add":" let h = store.save_change(&mut change, |_, _| Ok(())).map_err(ApplyError::Changestore)?;"},{"Add":" let (n, merkle) = apply_change(store, txn, &mut channel.write(), &h)?;"},{"Add":" Ok(Some((h, n, merkle)))"},{"Add":"}"}]}}],"owner":"irevoire","repo":"pijul","token":"zOBe6QC19EvUJoZ9hgKcIYmsQtPFW1CxwARL0XynrQc=","login":null}

…

Dependencies

Change contents