{"header":{"message":"automerge: Wrap up API","description":null,"timestamp":"2023-09-15T08:45:00.551184953Z","authors":[{}]},"hash":"BUKUHTU2FHX7K5KJC434LFCR7CCP7DIVNDCWWCXNG5Q2Q2SPS23AC","authors":[{"login":"kim","key":"GatQwNAvmxN5tCNcwspWc3AJdZydkGgDErEEr6JJLffY"}],"deps":{"hashes":[["BUKUHTU2FHX7K5KJC434LFCR7CCP7DIVNDCWWCXNG5Q2Q2SPS23AC","automerge: Wrap up API"],["AA",null],["3RLAEX2L5AGTVBRHDZH3MTJP6JND2J4KPGPQ4DTKTBD6KKJWHTFQC","automerge: Make a doc index based on sanakirja"],["LSM3P7VKAWMCE4VP5F6MU72N6JSSBUX5W5ITE54Z7WSQRUVU2SRQC","automerge: Change iterators"],["U63IONGETCB4NUGTSWYUJQMZNR5O6ZZKIPPBYJPBGVLAFXSFDNOAC","Start dabbling"]],"deps":["3RLAEX2L5AGTVBRHDZH3MTJP6JND2J4KPGPQ4DTKTBD6KKJWHTFQC"],"known":["U63IONGETCB4NUGTSWYUJQMZNR5O6ZZKIPPBYJPBGVLAFXSFDNOAC","LSM3P7VKAWMCE4VP5F6MU72N6JSSBUX5W5ITE54Z7WSQRUVU2SRQC"]},"hunks":[{"FileDel":{"deleted_names":[{"basename":"store","metadata":576}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":3514},"to":{"change":3,"start":3996,"end":4012},"introduced_by":3},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":4012},"to":{"change":3,"start":4013,"end":4013},"introduced_by":3}],"inode":{"change":3,"pos":4013}}},"content_edges":null,"content":[]}},{"FileAdd":{"meta":{"basename":"traits.rs","metadata":0},"context":[{"change":3,"pos":3514}],"contents":[{"Add":"// Copyright © 2023 Kim Altintop "},{"Add":"// SPDX-License-Identifier: GPL-2.0-only"},{"Add":""},{"Add":"use automerge::{"},{"Add":" Automerge,"},{"Add":" Change,"},{"Add":" ChangeHash,"},{"Add":"};"},{"Add":""},{"Add":"pub trait WritableStorage {"},{"Add":" type Error;"},{"Add":""},{"Add":" fn store("},{"Add":" &mut self,"},{"Add":" doc: &str,"},{"Add":" changes: impl IntoIterator,"},{"Add":" ) -> Result<(), Self::Error>;"},{"Add":"}"},{"Add":""},{"Add":"pub trait ReadableStorage {"},{"Add":" type Error;"},{"Add":" type Doc;"},{"Add":""},{"Add":" fn load(&self, doc: &str) -> Result, Self::Error>;"},{"Add":" fn exists(&self, doc: &str) -> Result;"},{"Add":" fn doc(&self, doc: &str) -> Result, Self::Error>;"},{"Add":"}"},{"Add":""},{"Add":"pub trait ChangeStore {"},{"Add":" type Error;"},{"Add":""},{"Add":" fn write_change(&self, change: Change) -> Result<(), Self::Error>;"},{"Add":" fn get_change(&self, hash: &ChangeHash) -> Result, Self::Error>;"},{"Add":" fn has_change(&self, hash: &ChangeHash) -> Result;"},{"Add":"}"}]}},{"Edit":{"inode":{"change":3,"pos":3549},"path":"nestje-automerge/src/store.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":3641}],"down_context":[{"change":3,"pos":3641}],"flag":"BLOCK","start":918,"end":940,"inode":{"change":3,"pos":3549}}},"contents":[{"Add":""},{"Add":"use std::path::Path;"}]}},{"Edit":{"inode":{"change":3,"pos":3549},"path":"nestje-automerge/src/store.rs","line":7,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":3659}],"down_context":[{"change":3,"pos":3659}],"flag":"BLOCK","start":941,"end":956,"inode":{"change":3,"pos":3549}}},"contents":[{"Add":" Automerge,"}]}},{"Edit":{"inode":{"change":3,"pos":3549},"path":"nestje-automerge/src/store.rs","line":10,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":3687}],"down_context":[{"change":3,"pos":3687}],"flag":"BLOCK","start":957,"end":1154,"inode":{"change":3,"pos":3549}}},"contents":[{"Add":"};"},{"Add":"use thiserror::Error;"},{"Add":""},{"Add":"use crate::{"},{"Add":" changes::{"},{"Add":" self,"},{"Add":" FileStore,"},{"Add":" },"},{"Add":" index,"},{"Add":" traits::{"},{"Add":" ChangeStore,"},{"Add":" ReadableStorage,"},{"Add":" WritableStorage,"},{"Add":" },"}]}},{"Edit":{"inode":{"change":3,"pos":3549},"path":"nestje-automerge/src/store.rs","line":25,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":3690}],"down_context":[{"change":3,"pos":3690}],"flag":"BLOCK","start":1155,"end":2269,"inode":{"change":3,"pos":3549}}},"contents":[{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum Error {"},{"Add":" #[error(\"missing change: {0}\")]"},{"Add":" MissingChange(ChangeHash),"},{"Add":" #[error(transparent)]"},{"Add":" Automerge(#[from] automerge::AutomergeError),"},{"Add":" #[error(transparent)]"},{"Add":" Changes(#[from] changes::fs::Error),"},{"Add":" #[error(transparent)]"},{"Add":" Index(#[from] index::Error),"},{"Add":"}"},{"Add":""},{"Add":"pub struct Storage {"},{"Add":" changes: FileStore,"},{"Add":" index: index::Sanakirja,"},{"Add":"}"},{"Add":""},{"Add":"impl Storage {"},{"Add":" pub fn new(root: impl AsRef) -> Result {"},{"Add":" let changes = FileStore::new(root.as_ref().join(\"changes\"));"},{"Add":" let index = index::Sanakirja::new(Some(&root.as_ref().join(\"index\")))?;"},{"Add":""},{"Add":" Ok(Self { changes, index })"},{"Add":" }"},{"Add":""},{"Add":" pub fn readable(&self) -> Result {"},{"Add":" Ok(Readable {"},{"Add":" changes: self.changes.clone(),"},{"Add":" tx: self.index.txn_begin()?,"},{"Add":" })"},{"Add":" }"},{"Add":""},{"Add":" pub fn writable(&self) -> Result, Error> {"},{"Add":" Ok(Writable {"},{"Add":" changes: self.changes.clone(),"},{"Add":" tx: self.index.mut_txn_begin()?,"},{"Add":" })"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub type Readable = Tx;"},{"Add":"pub type Writable = Tx>;"}]}},{"Replacement":{"inode":{"change":3,"pos":3549},"path":"nestje-automerge/src/store.rs","line":69,"ins":{"up_context":[{"change":3,"pos":3691}],"down_context":[{"change":3,"pos":3722}],"flag":"BLOCK","start":2270,"end":3540,"inode":{"change":3,"pos":3549}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3691},"to":{"change":3,"start":3691,"end":3722},"introduced_by":3}],"inode":{"change":3,"pos":3549}},"ins_contents":[{"Add":"pub struct Tx {"},{"Add":" changes: FileStore,"},{"Add":" tx: T,"},{"Add":"}"},{"Add":""},{"Add":"impl Tx {"},{"Add":" pub fn commit(self) -> Result<(), Error> {"},{"Add":" Ok(sanakirja::Commit::commit(self.tx).map_err(index::Error::from)?)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl ReadableStorage for Tx>"},{"Add":"where"},{"Add":" T: sanakirja::LoadPage,"},{"Add":"{"},{"Add":" type Error = Error;"},{"Add":" type Doc = index::Doc;"},{"Add":""},{"Add":" fn load(&self, doc: &str) -> Result, Error> {"},{"Add":" let stored = self.tx.get_doc(doc)?;"},{"Add":" if let Some(doc) = stored {"},{"Add":" let mut am = Automerge::new();"},{"Add":" for change in doc.changes(&self.tx) {"},{"Add":" let (_, hash) = change?;"},{"Add":" let change = self"},{"Add":" .changes"},{"Add":" .get_change(&hash)?"},{"Add":" .ok_or_else(|| Error::MissingChange(hash))?;"},{"Add":" am.apply_changes(Some(change))?;"},{"Add":" }"},{"Add":" Ok(Some(am))"},{"Add":" } else {"},{"Add":" Ok(None)"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" fn exists(&self, doc: &str) -> Result {"},{"Add":" Ok(self.tx.has_doc(doc)?)"},{"Add":" }"},{"Add":""},{"Add":" fn doc(&self, doc: &str) -> Result, Self::Error> {"},{"Add":" Ok(self.tx.get_doc(doc)?)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl WritableStorage for Writable {"},{"Add":" type Error = Error;"}],"del_contents":[{"Del":"mod fs;\npub use fs::FileStore;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":3549},"path":"nestje-automerge/src/store.rs","line":117,"ins":{"up_context":[{"change":3,"pos":3723}],"down_context":[{"change":3,"pos":3763}],"flag":"BLOCK","start":3541,"end":3910,"inode":{"change":3,"pos":3549}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3723},"to":{"change":3,"start":3723,"end":3763},"introduced_by":3}],"inode":{"change":3,"pos":3549}},"ins_contents":[{"Add":" fn store("},{"Add":" &mut self,"},{"Add":" doc: &str,"},{"Add":" changes: impl IntoIterator,"},{"Add":" ) -> Result<(), Self::Error> {"},{"Add":" let mut stored = self.tx.create_doc(doc)?;"},{"Add":" for change in changes {"},{"Add":" let hash = change.hash();"},{"Add":" self.changes.write_change(change)?;"},{"Add":" stored.put_change(&mut self.tx, hash)?;"},{"Add":" }"}],"del_contents":[{"Del":"pub trait ChangeStore {\n type Error;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":3549},"path":"nestje-automerge/src/store.rs","line":129,"ins":{"up_context":[{"change":3,"pos":3764}],"down_context":[{"change":3,"pos":3993}],"flag":"BLOCK","start":3911,"end":3932,"inode":{"change":3,"pos":3549}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3764},"to":{"change":3,"start":3764,"end":3993},"introduced_by":3}],"inode":{"change":3,"pos":3549}},"ins_contents":[{"Add":" Ok(())"},{"Add":" }"}],"del_contents":[{"Del":" fn write_change(&self, change: Change) -> Result<(), Self::Error>;\n fn get_change(&self, hash: &ChangeHash) -> Result, Self::Error>;\n fn has_change(&self, hash: &ChangeHash) -> Result;\n"}]}},{"Edit":{"inode":{"change":3,"pos":6208},"path":"nestje-automerge/src/lib.rs","line":3,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":6300}],"down_context":[{"change":3,"pos":6300}],"flag":"BLOCK","start":3933,"end":3966,"inode":{"change":3,"pos":6208}}},"contents":[{"Add":""},{"Add":"pub mod changes;"},{"Add":"pub mod index;"}]}},{"Replacement":{"inode":{"change":3,"pos":6208},"path":"nestje-automerge/src/lib.rs","line":8,"ins":{"up_context":[{"change":3,"pos":6316}],"down_context":[{"change":3,"pos":6344}],"flag":"BLOCK","start":3967,"end":3991,"inode":{"change":3,"pos":6208}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":6316},"to":{"change":3,"start":6316,"end":6344},"introduced_by":3}],"inode":{"change":3,"pos":6208}},"ins_contents":[{"Add":"pub use store::Storage;"}],"del_contents":[{"Del":"pub use store::ChangeStore;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":6208},"path":"nestje-automerge/src/lib.rs","line":10,"ins":{"up_context":[{"change":3,"pos":6345}],"down_context":[],"flag":"BLOCK","start":3992,"end":4084,"inode":{"change":3,"pos":6208}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":6345},"to":{"change":2,"start":92,"end":107},"introduced_by":2}],"inode":{"change":3,"pos":6208}},"ins_contents":[{"Add":"mod traits;"},{"Add":"pub use traits::{"},{"Add":" ChangeStore,"},{"Add":" ReadableStorage,"},{"Add":" WritableStorage,"},{"Add":"};"}],"del_contents":[{"Del":"pub mod index;\n"}]}},{"Edit":{"inode":{"change":2,"pos":141},"path":"nestje-automerge/src/index.rs","line":25,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":504}],"down_context":[{"change":2,"pos":504}],"flag":"BLOCK","start":4085,"end":4097,"inode":{"change":2,"pos":141}}},"contents":[{"Add":" Commit,"}]}},{"Replacement":{"inode":{"change":2,"pos":141},"path":"nestje-automerge/src/index.rs","line":275,"ins":{"up_context":[{"change":2,"pos":4233}],"down_context":[{"change":2,"pos":4325}],"flag":"BLOCK","start":4098,"end":4252,"inode":{"change":2,"pos":141}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":4233},"to":{"change":2,"start":4233,"end":4325},"introduced_by":2}],"inode":{"change":2,"pos":141}},"ins_contents":[{"Add":"impl GenericTxn"},{"Add":"where"},{"Add":" T: sanakirja::LoadPage,"},{"Add":"{"},{"Add":" pub fn get_doc(&self, name: &str) -> Result, Error> {"}],"del_contents":[{"Del":"impl MutTxn<()> {\n pub fn get_doc(&mut self, name: &str) -> Result, Error> {\n"}]}},{"Edit":{"inode":{"change":2,"pos":141},"path":"nestje-automerge/src/index.rs","line":292,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":4641}],"down_context":[{"change":2,"pos":4641}],"flag":"BLOCK","start":4253,"end":4557,"inode":{"change":2,"pos":141}}},"contents":[{"Add":" pub fn has_doc(&self, name: &str) -> Result {"},{"Add":" let name = SmallString::from_str(name);"},{"Add":" if let Some((k, _)) = btree::get(&self.txn, &self.docs, &name, None)? {"},{"Add":" Ok(k == name.as_ref())"},{"Add":" } else {"},{"Add":" Ok(false)"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl MutTxn {"}]}},{"Edit":{"inode":{"change":2,"pos":141},"path":"nestje-automerge/src/index.rs","line":322,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":5304}],"down_context":[{"change":2,"pos":5304}],"flag":"BLOCK","start":4558,"end":4676,"inode":{"change":2,"pos":141}}},"contents":[{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Commit for MutTxn<()> {"},{"Add":" fn commit(self) -> Result<(), sanakirja::Error> {"},{"Add":" self.txn.commit()"}]}},{"FileAdd":{"meta":{"basename":"changes.rs","metadata":0},"context":[{"change":3,"pos":3514}],"contents":[{"Add":"// Copyright © 2023 Kim Altintop "},{"Add":"// SPDX-License-Identifier: GPL-2.0-only"},{"Add":""},{"Add":"pub mod fs;"},{"Add":"pub use fs::FileStore;"}]}},{"FileAdd":{"meta":{"basename":"changes","metadata":576},"context":[{"change":3,"pos":3514}],"contents":[]}},{"FileMove":{"meta":{"basename":"fs.rs","metadata":0},"old":[{"basename":"fs.rs","metadata":0}],"up":[{"change":0,"pos":4860}],"down":[{"change":3,"pos":4045}],"show_perms":false}},{"Edit":{"inode":{"change":3,"pos":4045},"path":"nestje-automerge/src/changes/fs.rs","line":10,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":4216},"to":{"change":3,"start":4216,"end":4266},"introduced_by":3}],"inode":{"change":3,"pos":4045}}},"contents":[{"Del":" },\n path::{\n Path,\n PathBuf,\n"}]}},{"Edit":{"inode":{"change":3,"pos":4045},"path":"nestje-automerge/src/changes/fs.rs","line":11,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":4273}],"down_context":[{"change":3,"pos":4273}],"flag":"BLOCK","start":4879,"end":4898,"inode":{"change":3,"pos":4045}}},"contents":[{"Add":" path::PathBuf,"}]}},{"Edit":{"inode":{"change":3,"pos":4045},"path":"nestje-automerge/src/changes/fs.rs","line":35,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":4645}],"down_context":[{"change":3,"pos":4645}],"flag":"BLOCK","start":4899,"end":4923,"inode":{"change":3,"pos":4045}}},"contents":[{"Add":"#[derive(Clone, Debug)]"}]}},{"Replacement":{"inode":{"change":3,"pos":4045},"path":"nestje-automerge/src/changes/fs.rs","line":41,"ins":{"up_context":[{"change":3,"pos":4707}],"down_context":[{"change":3,"pos":4849}],"flag":"BLOCK","start":4924,"end":5010,"inode":{"change":3,"pos":4045}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":4707},"to":{"change":3,"start":4707,"end":4849},"introduced_by":3}],"inode":{"change":3,"pos":4045}},"ins_contents":[{"Add":" pub fn new(root: impl Into) -> Self {"},{"Add":" Self { root: root.into() }"}],"del_contents":[{"Del":" pub fn pijul(repo: &Path) -> Self {\n let root = repo.join(libpijul::DOT_DIR).join(\"nestje\").join(\"changes\");\n Self { root }\n"}]}}],"owner":"kim","repo":"yapma","token":"dLMCyYsJq2ljNl5KT7LMn4nkKZGwASPvjk1ldcP+ur0=","login":null}

…

Dependencies

Change contents