{"header":{"message":"automerge: Change iterators","description":null,"timestamp":"2023-09-14T19:36:56.931900831Z","authors":[{}]},"hash":"LSM3P7VKAWMCE4VP5F6MU72N6JSSBUX5W5ITE54Z7WSQRUVU2SRQC","authors":[{"login":"kim","key":"GatQwNAvmxN5tCNcwspWc3AJdZydkGgDErEEr6JJLffY"}],"deps":{"hashes":[["LSM3P7VKAWMCE4VP5F6MU72N6JSSBUX5W5ITE54Z7WSQRUVU2SRQC","automerge: Change iterators"],["AA",null],["3RLAEX2L5AGTVBRHDZH3MTJP6JND2J4KPGPQ4DTKTBD6KKJWHTFQC","automerge: Make a doc index based on sanakirja"],["U63IONGETCB4NUGTSWYUJQMZNR5O6ZZKIPPBYJPBGVLAFXSFDNOAC","Start dabbling"]],"deps":["3RLAEX2L5AGTVBRHDZH3MTJP6JND2J4KPGPQ4DTKTBD6KKJWHTFQC"],"known":["U63IONGETCB4NUGTSWYUJQMZNR5O6ZZKIPPBYJPBGVLAFXSFDNOAC"]},"hunks":[{"Edit":{"inode":{"change":2,"pos":141},"path":"nestje-automerge/src/index.rs","line":20,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":455}],"down_context":[{"change":2,"pos":455}],"flag":"BLOCK","start":0,"end":19,"inode":{"change":2,"pos":141}}},"contents":[{"Add":" BTreePage,"}]}},{"Replacement":{"inode":{"change":2,"pos":141},"path":"nestje-automerge/src/index.rs","line":108,"ins":{"up_context":[{"change":2,"pos":2465}],"down_context":[{"change":2,"pos":2556}],"flag":"BLOCK","start":20,"end":266,"inode":{"change":2,"pos":141}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2465},"to":{"change":2,"start":2465,"end":2556},"introduced_by":2}],"inode":{"change":2,"pos":141}},"ins_contents":[{"Add":" /// Iterator over the changes in this document, in the order they were"},{"Add":" /// applied (i.e. oldest first)."},{"Add":" pub fn changes<'a, T>("},{"Add":" &'a self,"},{"Add":" txn: &'a GenericTxn,"},{"Add":" ) -> Changes<'a, T, impl BTreePage>"}],"del_contents":[{"Del":" pub fn changes(&self, txn: &GenericTxn) -> Result, Error>\n"}]}},{"Replacement":{"inode":{"change":2,"pos":141},"path":"nestje-automerge/src/index.rs","line":115,"ins":{"up_context":[{"change":2,"pos":2566}],"down_context":[{"change":2,"pos":2646}],"flag":"BLOCK","start":267,"end":325,"inode":{"change":2,"pos":141}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2566},"to":{"change":2,"start":2566,"end":2646},"introduced_by":2}],"inode":{"change":2,"pos":141}},"ins_contents":[{"Add":" T: sanakirja::LoadPage,"}],"del_contents":[{"Del":" T: sanakirja::LoadPage + sanakirja::RootPage,\n"}]}},{"Replacement":{"inode":{"change":2,"pos":141},"path":"nestje-automerge/src/index.rs","line":117,"ins":{"up_context":[{"change":2,"pos":2652}],"down_context":[{"change":2,"pos":2834}],"flag":"BLOCK","start":326,"end":413,"inode":{"change":2,"pos":141}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2652},"to":{"change":2,"start":2652,"end":2834},"introduced_by":2}],"inode":{"change":2,"pos":141}},"ins_contents":[{"Add":" Changes {"},{"Add":" inner: Some(btree::iter(&txn.txn, &self.changes, None)),"}],"del_contents":[{"Del":" let mut changes = Vec::new();\n for x in btree::iter(&txn.txn, &self.changes, None)? {\n let (t, hash) = x?;\n changes.push((t.0, (*hash).into()));\n"}]}},{"Edit":{"inode":{"change":2,"pos":141},"path":"nestje-automerge/src/index.rs","line":120,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":2844}],"down_context":[{"change":2,"pos":2844}],"flag":"BLOCK","start":414,"end":420,"inode":{"change":2,"pos":141}}},"contents":[{"Add":" }"}]}},{"Replacement":{"inode":{"change":2,"pos":141},"path":"nestje-automerge/src/index.rs","line":122,"ins":{"up_context":[{"change":2,"pos":2845}],"down_context":[{"change":2,"pos":2865}],"flag":"BLOCK","start":421,"end":838,"inode":{"change":2,"pos":141}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2845},"to":{"change":2,"start":2845,"end":2865},"introduced_by":2}],"inode":{"change":2,"pos":141}},"ins_contents":[{"Add":" /// Iterator over the changes in this document, in reverse order (i.e."},{"Add":" /// newest first)."},{"Add":" pub fn rev_changes<'a, T>("},{"Add":" &'a self,"},{"Add":" txn: &'a GenericTxn,"},{"Add":" ) -> RevChanges<'a, T, impl BTreePage>"},{"Add":" where"},{"Add":" T: sanakirja::LoadPage,"},{"Add":" {"},{"Add":" RevChanges {"},{"Add":" inner: Some(btree::rev_iter(&txn.txn, &self.changes, None)),"},{"Add":" }"}],"del_contents":[{"Del":" Ok(changes)\n"}]}},{"Edit":{"inode":{"change":2,"pos":141},"path":"nestje-automerge/src/index.rs","line":136,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":2872}],"down_context":[{"change":2,"pos":2872}],"flag":"BLOCK","start":839,"end":880,"inode":{"change":2,"pos":141}}},"contents":[{"Add":" /// Record a change to the document."}]}},{"Replacement":{"inode":{"change":2,"pos":141},"path":"nestje-automerge/src/index.rs","line":138,"ins":{"up_context":[{"change":2,"pos":2972}],"down_context":[{"change":2,"pos":3067}],"flag":"BLOCK","start":881,"end":1237,"inode":{"change":2,"pos":141}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":2972},"to":{"change":2,"start":2972,"end":3067},"introduced_by":2}],"inode":{"change":2,"pos":141}},"ins_contents":[{"Add":" self.extend_with(txn, Some(change))"},{"Add":" }"},{"Add":""},{"Add":" /// Record a series of changes to the document."},{"Add":" pub fn extend_with(&mut self, txn: &mut MutTxn, changes: I) -> Result<(), Error>"},{"Add":" where"},{"Add":" I: IntoIterator,"},{"Add":" {"},{"Add":" let mut last = if let Some(max) = btree::rev_iter(&txn.txn, &self.changes, None)?.next() {"}],"del_contents":[{"Del":" let last = if let Some(max) = btree::rev_iter(&txn.txn, &self.changes, None)?.next() {\n"}]}},{"Replacement":{"inode":{"change":2,"pos":141},"path":"nestje-automerge/src/index.rs","line":153,"ins":{"up_context":[{"change":2,"pos":3161}],"down_context":[{"change":2,"pos":3306}],"flag":"BLOCK","start":1238,"end":1389,"inode":{"change":2,"pos":141}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":3161},"to":{"change":2,"start":3161,"end":3306},"introduced_by":2}],"inode":{"change":2,"pos":141}},"ins_contents":[{"Add":" for change in changes {"},{"Add":" last += 1;"},{"Add":" btree::put(&mut txn.txn, &mut self.changes, &L64(last), &change.into())?;"},{"Add":" }"}],"del_contents":[{"Del":" btree::put(\n &mut txn.txn,\n &mut self.changes,\n &L64(last + 1),\n &change.into(),\n )?;\n"}]}},{"Edit":{"inode":{"change":2,"pos":141},"path":"nestje-automerge/src/index.rs","line":160,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":3328}],"down_context":[{"change":2,"pos":3328}],"flag":"BLOCK","start":1390,"end":1756,"inode":{"change":2,"pos":141}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"/// Iterator over the changes in a [`Doc`] in the order they were applied."},{"Add":"///"},{"Add":"/// Created by [`Doc::changes`]."},{"Add":"#[must_use = \"iterators are lazy and do nothing unless consumed\"]"},{"Add":"pub struct Changes<'a, T, P>"},{"Add":"where"},{"Add":" T: sanakirja::LoadPage,"},{"Add":" P: BTreePage,"},{"Add":"{"},{"Add":" inner: Option, sanakirja::Error>>,"}]}},{"Edit":{"inode":{"change":2,"pos":141},"path":"nestje-automerge/src/index.rs","line":174,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":3331}],"down_context":[{"change":2,"pos":3331}],"flag":"BLOCK","start":1757,"end":3518,"inode":{"change":2,"pos":141}}},"contents":[{"Add":"impl<'a, T, P> Iterator for Changes<'a, T, P>"},{"Add":"where"},{"Add":" T: sanakirja::LoadPage,"},{"Add":" P: BTreePage + 'a,"},{"Add":"{"},{"Add":" type Item = Result<(u64, ChangeHash), Error>;"},{"Add":""},{"Add":" fn next(&mut self) -> Option {"},{"Add":" let inner = self.inner.take()?;"},{"Add":" inner.map_or_else("},{"Add":" |e| Some(Err(e.into())),"},{"Add":" |mut iter| {"},{"Add":" iter.next().map(|page| {"},{"Add":" let x = page"},{"Add":" .map_err(Into::into)"},{"Add":" .map(|(t, hash)| (t.0, ChangeHash::from(*hash)));"},{"Add":" self.inner = Some(Ok(iter));"},{"Add":" x"},{"Add":" })"},{"Add":" },"},{"Add":" )"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"/// Iterator over the changes in a [`Doc`] in reverse order (newest first)."},{"Add":"///"},{"Add":"/// Created by [`Doc::rev_iter`]."},{"Add":"#[must_use = \"iterators are lazy and do nothing unless consumed\"]"},{"Add":"pub struct RevChanges<'a, T, P>"},{"Add":"where"},{"Add":" T: sanakirja::LoadPage,"},{"Add":" P: BTreePage,"},{"Add":"{"},{"Add":" inner: Option, sanakirja::Error>>,"},{"Add":"}"},{"Add":""},{"Add":"impl<'a, T, P> Iterator for RevChanges<'a, T, P>"},{"Add":"where"},{"Add":" T: sanakirja::LoadPage,"},{"Add":" P: BTreePage + 'a,"},{"Add":"{"},{"Add":" type Item = Result<(u64, ChangeHash), Error>;"},{"Add":""},{"Add":" fn next(&mut self) -> Option {"},{"Add":" let inner = self.inner.take()?;"},{"Add":" inner.map_or_else("},{"Add":" |e| Some(Err(e.into())),"},{"Add":" |mut iter| {"},{"Add":" iter.next().map(|page| {"},{"Add":" let x = page"},{"Add":" .map_err(Into::into)"},{"Add":" .map(|(t, hash)| (t.0, ChangeHash::from(*hash)));"},{"Add":" self.inner = Some(Ok(iter));"},{"Add":" x"},{"Add":" })"},{"Add":" },"},{"Add":" )"},{"Add":" }"},{"Add":"}"},{"Add":""}]}},{"Replacement":{"inode":{"change":2,"pos":141},"path":"nestje-automerge/src/index.rs","line":236,"ins":{"up_context":[{"change":2,"pos":3404}],"down_context":[{"change":2,"pos":3423}],"flag":"BLOCK","start":3519,"end":3542,"inode":{"change":2,"pos":141}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":3404},"to":{"change":2,"start":3404,"end":3423},"introduced_by":2}],"inode":{"change":2,"pos":141}},"ins_contents":[{"Add":"pub struct StoredDoc {"}],"del_contents":[{"Del":"struct StoredDoc {\n"}]}},{"Replacement":{"inode":{"change":2,"pos":141},"path":"nestje-automerge/src/index.rs","line":248,"ins":{"up_context":[{"change":2,"pos":3654}],"down_context":[{"change":2,"pos":3683}],"flag":"BLOCK","start":3543,"end":3576,"inode":{"change":2,"pos":141}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":3654},"to":{"change":2,"start":3654,"end":3683},"introduced_by":2}],"inode":{"change":2,"pos":141}},"ins_contents":[{"Add":"pub struct StoredHash([u8; 32]);"}],"del_contents":[{"Del":"struct StoredHash([u8; 32]);\n"}]}},{"Edit":{"inode":{"change":2,"pos":5365},"path":"nestje-automerge/src/index/tests.rs","line":5,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":5500}],"down_context":[{"change":2,"pos":5500}],"flag":"BLOCK","start":3577,"end":3603,"inode":{"change":2,"pos":5365}}},"contents":[{"Add":"use itertools::Itertools;"}]}},{"Replacement":{"inode":{"change":2,"pos":5365},"path":"nestje-automerge/src/index/tests.rs","line":31,"ins":{"up_context":[{"change":2,"pos":6349}],"down_context":[{"change":2,"pos":6429}],"flag":"BLOCK","start":3604,"end":3661,"inode":{"change":2,"pos":5365}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":6349},"to":{"change":2,"start":6349,"end":6429},"introduced_by":2}],"inode":{"change":2,"pos":5365}},"ins_contents":[{"Add":" idx.extend_with(&mut txn, changes.iter().copied())?;"}],"del_contents":[{"Del":" for change in &changes {\n idx.put_change(&mut txn, *change)?;\n }\n\n"}]}},{"Replacement":{"inode":{"change":2,"pos":5365},"path":"nestje-automerge/src/index/tests.rs","line":33,"ins":{"up_context":[{"change":2,"pos":6450}],"down_context":[{"change":2,"pos":6552}],"flag":"BLOCK","start":3662,"end":3762,"inode":{"change":2,"pos":5365}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":6450},"to":{"change":2,"start":6450,"end":6552},"introduced_by":2}],"inode":{"change":2,"pos":5365}},"ins_contents":[{"Add":" .changes(&txn)"},{"Add":" .map_ok(|(_, hash)| hash)"},{"Add":" .collect::, _>>()?;"},{"Add":""}],"del_contents":[{"Del":" .changes(&txn)?\n .iter()\n .map(|(_, hash)| *hash)\n .collect::>();\n"}]}},{"Edit":{"inode":{"change":3,"pos":7139},"path":"nestje-automerge/Cargo.toml","line":15,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":7388}],"down_context":[{"change":3,"pos":7388}],"flag":"BLOCK","start":3763,"end":3790,"inode":{"change":3,"pos":7139}}},"contents":[{"Add":"itertools.workspace = true"}]}},{"Edit":{"inode":{"change":3,"pos":7503},"path":"Cargo.toml","line":21,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":7818}],"down_context":[{"change":3,"pos":7818}],"flag":"BLOCK","start":3791,"end":3812,"inode":{"change":3,"pos":7503}}},"contents":[{"Add":"itertools = \"0.11.0\""}]}},{"Replacement":{"inode":{"change":3,"pos":7915},"path":"Cargo.lock","line":96,"ins":{"up_context":[{"change":3,"pos":10367}],"down_context":[{"change":3,"pos":10381}],"flag":"BLOCK","start":3813,"end":3834,"inode":{"change":3,"pos":7915}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":10367},"to":{"change":3,"start":10367,"end":10381},"introduced_by":3}],"inode":{"change":3,"pos":7915}},"ins_contents":[{"Add":" \"itertools 0.10.5\","}],"del_contents":[{"Del":" \"itertools\",\n"}]}},{"Edit":{"inode":{"change":3,"pos":7915},"path":"Cargo.lock","line":650,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":24119}],"down_context":[{"change":3,"pos":24119}],"flag":"BLOCK","start":3835,"end":4059,"inode":{"change":3,"pos":7915}}},"contents":[{"Add":"dependencies = ["},{"Add":" \"either\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"itertools\""},{"Add":"version = \"0.11.0\""},{"Add":"source = \"registry+https://github.com/rust-lang/crates.io-index\""},{"Add":"checksum = \"b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57\""}]}},{"Edit":{"inode":{"change":3,"pos":7915},"path":"Cargo.lock","line":833,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":28203}],"down_context":[{"change":3,"pos":28203}],"flag":"BLOCK","start":4060,"end":4081,"inode":{"change":3,"pos":7915}}},"contents":[{"Add":" \"itertools 0.11.0\","}]}}],"owner":"kim","repo":"yapma","token":"zKGo83VL8DtIBp9992qE8bHJrTwCbf0WbzLLRyZkDQ4=","login":null}

…

Dependencies

Change contents