{"header":{"message":"Tags","description":null,"timestamp":"2021-03-10T16:56:02.109721969Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"QL6K2ZM35B3NIXEMMCJWUSFXOBQHAGXRDMO7ID5DCKTJH4QJVY7QC","authors":[],"deps":{"hashes":[["QL6K2ZM35B3NIXEMMCJWUSFXOBQHAGXRDMO7ID5DCKTJH4QJVY7QC","Tags"],["AA",null],["ZBNKSYA6PW4DSPC3NCRUZLVHW2GNXMCSDSAGEIKHGHDGGZRBH7ZQC","Fixing a bus error when starting a transaction on a full disk"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","Cleanup, formatting, and fixing the Git feature"],["BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","Fixing --features git"],["JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","Implement the Sanakirja concurrency model in a cross-process way"],["YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","Sanakirja 1.0"],["SNZ3OAMCPUGFYON5SZHQQQK46ZZMVMJECJYEUCMG657UVLY2PNBQC","use native external subcommand support instead of hand-rolled one"],["7S4YD633DZUPKQNVB5KZBB2XK6FWI6NI2MLPB2P3NJFH443S4QCQC","Change in semantic of the new Sanakirja compared to the previous one (get returns Some(…) even if the key is not found)"],["H23LO7U7MNB5GTLOUIFYAJ6DP57DM3VFBR4IBOAVPMHS356AYFPQC","a few more clippy lints addressed"],["I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","Massive cleanup, and simplification"],["7ZFRYVVQQGJYG3POPWJWL3CDW37YDXZYZQC3OSWFHWEUSEMYQ4EQC","Cargo.nix and formatting"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","Upgrading to Sanakirja 0.15 + version bump"],["GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","Refactoring iterators"],["TZ42DX3BML5C3O5Z6OBVNBCHSIIHT6AOJPD6ICOLOP4LPYFXQN2QC","Properly dropping a channel"]],"deps":["ZBNKSYA6PW4DSPC3NCRUZLVHW2GNXMCSDSAGEIKHGHDGGZRBH7ZQC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","I52XSRUH5RVHQBFWVMAQPTUSPAJ4KNVID2RMI3UGCVKFLYUO6WZAC","BXD3IQYNMKMI5BTANCF6NZHZP4CKPWADGJMBT2R3WTMKVKONT5QAC","SNZ3OAMCPUGFYON5SZHQQQK46ZZMVMJECJYEUCMG657UVLY2PNBQC","H23LO7U7MNB5GTLOUIFYAJ6DP57DM3VFBR4IBOAVPMHS356AYFPQC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","CCLLB7OIFNFYJZTG3UCI7536TOCWSCSXR67VELSB466R24WLJSDAC","GHO6DWPILBBTL6CVZKERJBTFL3EY6ZT4YM4E5R4S6YPGVFKFHCVAC","JL4WKA5PBKXRNAMETYO4I52QKASQ3COYHH2JKGA7W5YLIRZZH53AC","YN63NUZO4LVJ7XPMURDULTXBVJKW5MVCTZ24R7Z52QMHO3HPDUVQC","IIV3EL2XYI2X7HZWKXEXQFAE3R3KC2Q7SGOT3Q332HSENMYVF32QC","7S4YD633DZUPKQNVB5KZBB2XK6FWI6NI2MLPB2P3NJFH443S4QCQC","7ZFRYVVQQGJYG3POPWJWL3CDW37YDXZYZQC3OSWFHWEUSEMYQ4EQC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC"]},"hunks":[{"Replacement":{"inode":{"change":3,"pos":83981},"path":"pijul/src/main.rs","line":125,"ins":{"up_context":[{"change":3,"pos":9020}],"down_context":[{"change":3,"pos":25}],"flag":"BLOCK","start":0,"end":14,"inode":{"change":3,"pos":83981}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9020},"to":{"change":3,"start":9020,"end":9037},"introduced_by":3}],"inode":{"change":3,"pos":83981}},"ins_contents":[{"Add":" Tag(Tag),"}],"del_contents":[{"Del":" // Tag(Tag),\n"}]}},{"Replacement":{"inode":{"change":3,"pos":83981},"path":"pijul/src/main.rs","line":213,"ins":{"up_context":[{"change":3,"pos":5590}],"down_context":[{"change":3,"pos":600}],"flag":"BLOCK","start":15,"end":64,"inode":{"change":3,"pos":83981}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":5590},"to":{"change":3,"start":9038,"end":9090},"introduced_by":3}],"inode":{"change":3,"pos":83981}},"ins_contents":[{"Add":" SubCommand::Tag(tag) => tag.run().await,"}],"del_contents":[{"Del":" // SubCommand::Tag(tag) => tag.run().await,\n"}]}},{"FileAdd":{"meta":{"basename":"tag.rs","metadata":0},"context":[{"change":3,"pos":93386}],"contents":[{"Add":"use std::io::Write;"},{"Add":"use std::path::PathBuf;"},{"Add":"use std::sync::{Arc, RwLock};"},{"Add":""},{"Add":"use crate::repository::Repository;"},{"Add":"use anyhow::bail;"},{"Add":"use clap::Clap;"},{"Add":"use libpijul::change::ChangeHeader;"},{"Add":"use libpijul::{Base32, ChannelMutTxnT, ChannelTxnT, MutTxnT, TxnT, TxnTExt};"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub struct Tag {"},{"Add":" /// Set the repository where this command should run. Defaults to"},{"Add":" /// the first ancestor of the current directory that contains a"},{"Add":" /// `.pijul` directory."},{"Add":" #[clap(long = \"repository\")]"},{"Add":" repo_path: Option,"},{"Add":" #[clap(subcommand)]"},{"Add":" subcmd: SubCommand,"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Clap, Debug)]"},{"Add":"pub enum SubCommand {"},{"Add":" /// Create a tag."},{"Add":" #[clap(name = \"create\")]"},{"Add":" Create {"},{"Add":" #[clap(short = 'm', long = \"message\")]"},{"Add":" message: Option,"},{"Add":" /// Set the author field"},{"Add":" #[clap(long = \"author\")]"},{"Add":" author: Option,"},{"Add":" /// Record the change in this channel instead of the current channel"},{"Add":" #[clap(long = \"channel\")]"},{"Add":" channel: Option,"},{"Add":" #[clap(long = \"timestamp\")]"},{"Add":" timestamp: Option,"},{"Add":" },"},{"Add":" /// Restore a tag into a new channel."},{"Add":" #[clap(name = \"checkout\")]"},{"Add":" Checkout {"},{"Add":" tag: String,"},{"Add":" /// Optional new channel name. If not given, the base32"},{"Add":" /// representation of the tag hash is used."},{"Add":" #[clap(long = \"to-channel\")]"},{"Add":" to_channel: Option,"},{"Add":" },"},{"Add":"}"},{"Add":""},{"Add":"impl Tag {"},{"Add":" pub async fn run(self) -> Result<(), anyhow::Error> {"},{"Add":" let mut stdout = std::io::stdout();"},{"Add":" let mut repo = Repository::find_root(self.repo_path).await?;"},{"Add":" match self.subcmd {"},{"Add":" SubCommand::Create {"},{"Add":" message,"},{"Add":" author,"},{"Add":" channel,"},{"Add":" timestamp,"},{"Add":" } => {"},{"Add":" let channel_name = repo"},{"Add":" .config"},{"Add":" .get_current_channel(channel.as_deref())"},{"Add":" .0"},{"Add":" .to_string();"},{"Add":" try_record(&mut repo, &channel_name)?;"},{"Add":" let mut txn = repo.pristine.mut_txn_begin()?;"},{"Add":" let channel = txn.load_channel(&channel_name)?.unwrap();"},{"Add":" let last_t = if let Some(n) = txn.reverse_log(&*channel.read()?, None)?.next() {"},{"Add":" n?.0.into()"},{"Add":" } else {"},{"Add":" bail!(\"Channel {} is empty\", channel_name);"},{"Add":" };"},{"Add":" log::debug!(\"last_t = {:?}\", last_t);"},{"Add":" if txn.get_tags(&channel.read()?.tags, &last_t)?.is_some() {"},{"Add":" bail!(\"Current state is already tagged\")"},{"Add":" }"},{"Add":" let mut tag_path = repo.path.join(libpijul::DOT_DIR);"},{"Add":" tag_path.push(\"tags\");"},{"Add":" std::fs::create_dir_all(&tag_path)?;"},{"Add":""},{"Add":" let mut temp_path = tag_path.clone();"},{"Add":" temp_path.push(\"tag\");"},{"Add":""},{"Add":" let mut w = std::fs::File::create(&temp_path)?;"},{"Add":" let header = header(author.as_deref(), message, timestamp)?;"},{"Add":" let h = libpijul::tag::from_channel(&txn, &channel_name, &header, &mut w)?;"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut tag_path, &h);"},{"Add":" std::fs::create_dir_all(tag_path.parent().unwrap())?;"},{"Add":" std::fs::rename(&temp_path, &tag_path)?;"},{"Add":""},{"Add":" txn.put_tags(&mut *channel.write()?, last_t.into(), &h)?;"},{"Add":" txn.commit()?;"},{"Add":" writeln!(stdout, \"{}\", h.to_base32())?;"},{"Add":" }"},{"Add":" SubCommand::Checkout { tag, to_channel } => {"},{"Add":" let h = if let Some(h) = libpijul::Hash::from_base32(tag.as_bytes()) {"},{"Add":" h"},{"Add":" } else {"},{"Add":" bail!(\"Invalid tag {:?}\", tag)"},{"Add":" };"},{"Add":" let channel_name = if let Some(ref channel) = to_channel {"},{"Add":" channel.as_str()"},{"Add":" } else {"},{"Add":" tag.as_str()"},{"Add":" };"},{"Add":" let mut txn = repo.pristine.mut_txn_begin()?;"},{"Add":" if txn.load_channel(channel_name)?.is_some() {"},{"Add":" bail!(\"Channel {:?} already exists\", channel_name)"},{"Add":" }"},{"Add":" let mut tag_path = repo.path.join(libpijul::DOT_DIR);"},{"Add":" tag_path.push(\"tags\");"},{"Add":" libpijul::changestore::filesystem::push_filename(&mut tag_path, &h);"},{"Add":" let f = libpijul::tag::OpenTagFile::open(&tag)?;"},{"Add":" libpijul::tag::restore_channel(f, &mut txn, &channel_name)?;"},{"Add":" txn.commit()?;"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn header("},{"Add":" author: Option<&str>,"},{"Add":" message: Option,"},{"Add":" timestamp: Option,"},{"Add":") -> Result {"},{"Add":" let authors = if let Some(a) = author {"},{"Add":" vec![libpijul::change::Author {"},{"Add":" name: a.to_string(),"},{"Add":" full_name: None,"},{"Add":" email: None,"},{"Add":" }]"},{"Add":" } else if let Ok(global) = crate::config::Global::load() {"},{"Add":" vec![global.author]"},{"Add":" } else {"},{"Add":" Vec::new()"},{"Add":" };"},{"Add":" let header = ChangeHeader {"},{"Add":" message: message.clone().unwrap_or_else(String::new),"},{"Add":" authors,"},{"Add":" description: None,"},{"Add":" timestamp: if let Some(t) = timestamp {"},{"Add":" chrono::DateTime::from_utc(chrono::NaiveDateTime::from_timestamp(t, 0), chrono::Utc)"},{"Add":" } else {"},{"Add":" chrono::Utc::now()"},{"Add":" },"},{"Add":" };"},{"Add":" let toml = toml::to_string_pretty(&header)?;"},{"Add":" loop {"},{"Add":" let bytes = edit::edit_bytes(toml.as_bytes())?;"},{"Add":" if let Ok(header) = toml::from_slice(&bytes) {"},{"Add":" return Ok(header);"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn try_record(repo: &mut Repository, channel: &str) -> Result<(), anyhow::Error> {"},{"Add":" let txn = repo.pristine.mut_txn_begin()?;"},{"Add":" if let Some(channel) = txn.load_channel(channel)? {"},{"Add":" let mut state = libpijul::RecordBuilder::new();"},{"Add":" state.record("},{"Add":" Arc::new(RwLock::new(txn)),"},{"Add":" libpijul::Algorithm::default(),"},{"Add":" channel,"},{"Add":" repo.working_copy.clone(),"},{"Add":" &repo.changes,"},{"Add":" \"\","},{"Add":" num_cpus::get(),"},{"Add":" )?;"},{"Add":" let rec = state.finish();"},{"Add":" if !rec.actions.is_empty() {"},{"Add":" bail!(\"Cannot change channel, as there are unrecorded changes.\")"},{"Add":" }"},{"Add":" } else {"},{"Add":" bail!(\"Channel not found: {}\", channel)"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":3,"pos":133619},"path":"pijul/src/commands/mod.rs","line":54,"ins":{"up_context":[{"change":3,"pos":134253}],"down_context":[{"change":3,"pos":90}],"flag":"BLOCK","start":6362,"end":6387,"inode":{"change":3,"pos":133619}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":134253},"to":{"change":3,"start":59,"end":90},"introduced_by":3}],"inode":{"change":3,"pos":133619}},"ins_contents":[{"Add":"mod tag;"},{"Add":"pub use tag::*;"}],"del_contents":[{"Del":"// mod tag;\n// pub use tag::*;\n"}]}},{"FileAdd":{"meta":{"basename":"tag.rs","metadata":0},"context":[{"change":3,"pos":198146}],"contents":[{"Add":"use crate::pristine::sanakirja::{Channel, MutTxn, SanakirjaError, P, UP};"},{"Add":"use crate::pristine::*;"},{"Add":"use crate::HashSet;"},{"Add":"use crate::TxnT;"},{"Add":"use log::*;"},{"Add":"use serde_derive::*;"},{"Add":"use std::io::Read;"},{"Add":"use std::path::Path;"},{"Add":"use std::sync::{Arc, RwLock};"},{"Add":""},{"Add":"#[derive(Debug, Serialize, Deserialize, Default)]"},{"Add":"struct FileHeader {"},{"Add":" version: u64,"},{"Add":" header: u64,"},{"Add":" channel: u64,"},{"Add":" unhashed: u64,"},{"Add":" total: u64,"},{"Add":" offsets: DbOffsets,"},{"Add":" state: Merkle,"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Serialize, Deserialize, Default)]"},{"Add":"struct DbOffsets {"},{"Add":" internal: u64,"},{"Add":" external: u64,"},{"Add":" graph: u64,"},{"Add":" changes: u64,"},{"Add":" revchanges: u64,"},{"Add":" states: u64,"},{"Add":" tags: u64,"},{"Add":" apply_counter: u64,"},{"Add":" size: u64,"},{"Add":"}"},{"Add":""},{"Add":"pub struct OpenTagFile {"},{"Add":" header: FileHeader,"},{"Add":" file: std::fs::File,"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Error)]"},{"Add":"pub enum TagError {"},{"Add":" #[error(\"Version mismatch\")]"},{"Add":" VersionMismatch,"},{"Add":" #[error(transparent)]"},{"Add":" Io(#[from] std::io::Error),"},{"Add":" #[error(transparent)]"},{"Add":" Bincode(#[from] bincode::Error),"},{"Add":" #[error(transparent)]"},{"Add":" Zstd(#[from] zstd_seekable::Error),"},{"Add":" #[error(transparent)]"},{"Add":" Txn(SanakirjaError),"},{"Add":" #[error(\"Synchronisation error\")]"},{"Add":" Sync,"},{"Add":"}"},{"Add":""},{"Add":"impl From> for TagError {"},{"Add":" fn from(e: TxnErr) -> Self {"},{"Add":" TagError::Txn(e.0)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl OpenTagFile {"},{"Add":" pub fn open>(p: P) -> Result {"},{"Add":" let mut file = std::fs::File::open(p)?;"},{"Add":" let mut off = [0u8; std::mem::size_of::() as usize];"},{"Add":" file.read_exact(&mut off)?;"},{"Add":" let header = bincode::deserialize(&off)?;"},{"Add":" Ok(OpenTagFile { header, file })"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub const VERSION: u64 = 5;"},{"Add":""},{"Add":"const BLOCK_SIZE: usize = 4096;"},{"Add":""},{"Add":"pub fn restore_channel("},{"Add":" mut tag: OpenTagFile,"},{"Add":" txn: &mut MutTxn<()>,"},{"Add":" name: &str,"},{"Add":") -> Result>, TagError> {"},{"Add":" use std::io::{Seek, SeekFrom};"},{"Add":" tag.file.seek(SeekFrom::Start(tag.header.channel))?;"},{"Add":" let mut comp = vec![0; (tag.header.unhashed - tag.header.channel) as usize];"},{"Add":" debug!(\"tag header {:?}\", tag.header);"},{"Add":" tag.file.read_exact(&mut comp)?;"},{"Add":" debug!(\"{:?} {:?}\", &comp[..20], comp.len());"},{"Add":" debug!(\"{:?}\", &comp[comp.len() - 20..]);"},{"Add":" let mut buf = vec![0; tag.header.offsets.size as usize];"},{"Add":" zstd_seekable::Seekable::init_buf(&comp)?"},{"Add":" .decompress(&mut buf, 0)"},{"Add":" .unwrap();"},{"Add":" let filetxn = Txn::from_slice(&mut buf);"},{"Add":" let external: ::sanakirja::btree::Db_> ="},{"Add":" ::sanakirja::btree::Db_::from_page(tag.header.offsets.external);"},{"Add":" debug!(\"restoring graph\");"},{"Add":" let graph = restore("},{"Add":" &filetxn,"},{"Add":" txn,"},{"Add":" tag.header.offsets.graph,"},{"Add":" |file_txn, txn, k: &Vertex, v: &SerializedEdge| {"},{"Add":" let k = if k.change.is_root() {"},{"Add":" *k"},{"Add":" } else {"},{"Add":" debug!(\"btree get: {:?}\", k.change);"},{"Add":" let (kc, h) ="},{"Add":" ::sanakirja::btree::get(file_txn, &external, &k.change, None)?.unwrap();"},{"Add":" assert_eq!(k.change, *kc);"},{"Add":" Vertex {"},{"Add":" change: crate::pristine::make_changeid(txn, &h.into())?,"},{"Add":" ..*k"},{"Add":" }"},{"Add":" };"},{"Add":""},{"Add":" let dest = v.dest();"},{"Add":" let dest = {"},{"Add":" if dest.change.is_root() {"},{"Add":" dest"},{"Add":" } else {"},{"Add":" let (vd, change) ="},{"Add":" ::sanakirja::btree::get(file_txn, &external, &dest.change, None)?.unwrap();"},{"Add":" assert_eq!(v.dest().change, *vd);"},{"Add":" Position {"},{"Add":" change: crate::pristine::make_changeid(txn, &change.into())?,"},{"Add":" ..v.dest()"},{"Add":" }"},{"Add":" }"},{"Add":" };"},{"Add":" let introduced_by = v.introduced_by();"},{"Add":" let introduced_by = if introduced_by.is_root() {"},{"Add":" introduced_by"},{"Add":" } else {"},{"Add":" let (vi, change) ="},{"Add":" ::sanakirja::btree::get(file_txn, &external, &introduced_by, None)?.unwrap();"},{"Add":" assert_eq!(introduced_by, *vi);"},{"Add":" crate::pristine::make_changeid(txn, &change.into())?"},{"Add":" };"},{"Add":" let v = Edge {"},{"Add":" dest,"},{"Add":" introduced_by,"},{"Add":" ..v.into()"},{"Add":" };"},{"Add":" Ok((k, v.into()))"},{"Add":" },"},{"Add":" )?;"},{"Add":""},{"Add":" debug!(\"restoring changes\");"},{"Add":" let changes = restore("},{"Add":" &filetxn,"},{"Add":" txn,"},{"Add":" tag.header.offsets.changes,"},{"Add":" |file_txn, txn, k: &ChangeId, v: &L64| {"},{"Add":" let (k_, h) = ::sanakirja::btree::get(file_txn, &external, k, None)?.unwrap();"},{"Add":" assert_eq!(k, k_);"},{"Add":" let k = crate::pristine::make_changeid(txn, &h.into())?;"},{"Add":" Ok((k, *v))"},{"Add":" },"},{"Add":" )?;"},{"Add":""},{"Add":" debug!(\"restoring revchanges\");"},{"Add":" let revchanges = restore("},{"Add":" &filetxn,"},{"Add":" txn,"},{"Add":" tag.header.offsets.revchanges,"},{"Add":" |file_txn, txn, k: &L64, v: &Pair| {"},{"Add":" let (v0, h) = ::sanakirja::btree::get(file_txn, &external, &v.a, None)?.unwrap();"},{"Add":" assert_eq!(v.a, *v0);"},{"Add":" let v_ = crate::pristine::make_changeid(txn, &h.into())?;"},{"Add":" Ok(("},{"Add":" *k,"},{"Add":" Pair {"},{"Add":" a: v_,"},{"Add":" b: v.b.clone(),"},{"Add":" },"},{"Add":" ))"},{"Add":" },"},{"Add":" )?;"},{"Add":""},{"Add":" debug!(\"restoring states\");"},{"Add":" let states = restore("},{"Add":" &filetxn,"},{"Add":" txn,"},{"Add":" tag.header.offsets.states,"},{"Add":" |_, _, k: &SerializedMerkle, v: &L64| Ok((k.clone(), *v)),"},{"Add":" )?;"},{"Add":""},{"Add":" debug!(\"restoring states\");"},{"Add":" let tags = restore("},{"Add":" &filetxn,"},{"Add":" txn,"},{"Add":" tag.header.offsets.tags,"},{"Add":" |_, _, k: &L64, v: &SerializedHash| Ok((*k, *v)),"},{"Add":" )?;"},{"Add":""},{"Add":" let name = crate::small_string::SmallString::from_str(name);"},{"Add":" let br = ChannelRef {"},{"Add":" r: Arc::new(RwLock::new(Channel {"},{"Add":" graph,"},{"Add":" changes,"},{"Add":" revchanges,"},{"Add":" states,"},{"Add":" tags,"},{"Add":" apply_counter: tag.header.offsets.apply_counter,"},{"Add":" name: name.clone(),"},{"Add":" last_modified: 0,"},{"Add":" })),"},{"Add":" };"},{"Add":" txn.open_channels.lock().unwrap().insert(name, br.clone());"},{"Add":" Ok(br)"},{"Add":"}"},{"Add":""},{"Add":"struct Txn<'a> {"},{"Add":" data: *mut u8,"},{"Add":" marker: std::marker::PhantomData<&'a ()>,"},{"Add":"}"},{"Add":""},{"Add":"impl<'a> Txn<'a> {"},{"Add":" fn from_slice(s: &'a mut [u8]) -> Self {"},{"Add":" Txn {"},{"Add":" data: s.as_mut_ptr(),"},{"Add":" marker: std::marker::PhantomData,"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl<'a> ::sanakirja::LoadPage for Txn<'a> {"},{"Add":" type Error = ::sanakirja::CRCError;"},{"Add":" fn load_page(&self, off: u64) -> Result<::sanakirja::CowPage, ::sanakirja::CRCError> {"},{"Add":" Ok(::sanakirja::CowPage {"},{"Add":" data: unsafe { self.data.add(off as usize) },"},{"Add":" offset: off,"},{"Add":" })"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"fn restore<"},{"Add":" K: ::sanakirja::UnsizedStorable,"},{"Add":" V: ::sanakirja::UnsizedStorable,"},{"Add":" P: ::sanakirja::btree::BTreeMutPage,"},{"Add":" F,"},{"Add":">("},{"Add":" file_txn: &Txn,"},{"Add":" txn: &mut crate::pristine::sanakirja::MutTxn<()>,"},{"Add":" pending: u64,"},{"Add":" f: F,"},{"Add":") -> Result<::sanakirja::btree::Db_, TxnErr>"},{"Add":"where"},{"Add":" F: Fn("},{"Add":" &Txn,"},{"Add":" &mut crate::pristine::sanakirja::MutTxn<()>,"},{"Add":" &K,"},{"Add":" &V,"},{"Add":" ) -> Result<(K, V), TxnErr>,"},{"Add":"{"},{"Add":" use ::sanakirja::AllocPage;"},{"Add":" let mut dict = HashSet::default();"},{"Add":" let page = txn.txn.alloc_page()?;"},{"Add":" let result = page.0.offset;"},{"Add":" let mut pending = vec![(pending, page)];"},{"Add":" while let Some((offset, mut new_page_)) = pending.pop() {"},{"Add":" debug!(\"{:?}\", offset);"},{"Add":" let page = ::sanakirja::CowPage {"},{"Add":" data: unsafe { file_txn.data.offset(offset as isize) },"},{"Add":" offset,"},{"Add":" };"},{"Add":" let mut curs = P::cursor_first(&page);"},{"Add":" let mut new_curs = P::cursor_first(&new_page_.0);"},{"Add":" P::init(&mut new_page_);"},{"Add":" unsafe {"},{"Add":" P::set_left_child("},{"Add":" &mut new_page_,"},{"Add":" &new_curs,"},{"Add":" P::left_child(page.as_page(), &curs),"},{"Add":" );"},{"Add":" }"},{"Add":" while let Some((k, v, r)) = P::next(&txn.txn, page.as_page(), &mut curs) {"},{"Add":" let (k, v) = f(file_txn, txn, k, v)?;"},{"Add":" let r = if r > 0 {"},{"Add":" assert!(dict.insert(r));"},{"Add":" let new_page = txn.txn.alloc_page()?;"},{"Add":" let off = new_page.0.offset;"},{"Add":" pending.push((r, new_page));"},{"Add":" off"},{"Add":" } else {"},{"Add":" 0"},{"Add":" };"},{"Add":" unsafe { P::put_mut(&mut new_page_, &new_curs, &k, &v, r) }"},{"Add":" P::move_next(&mut new_curs);"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(::sanakirja::btree::Db_::from_page(result))"},{"Add":"}"},{"Add":""},{"Add":"pub fn from_channel>("},{"Add":" txn: &crate::pristine::sanakirja::GenericTxn,"},{"Add":" channel: &str,"},{"Add":" header: &crate::change::ChangeHeader,"},{"Add":" mut w: W,"},{"Add":") -> Result {"},{"Add":" let out = Vec::with_capacity(1 << 16);"},{"Add":" let (out, offsets, state) = compress_channel(txn, channel, out)?;"},{"Add":" debug!(\"{:?} {:?}\", &out[..20], out.len());"},{"Add":" debug!(\"{:?}\", &out[out.len() - 20..]);"},{"Add":" let mut header_buf = Vec::with_capacity(1 << 10);"},{"Add":" bincode::serialize_into(&mut header_buf, header).unwrap();"},{"Add":""},{"Add":" let mut off = FileHeader {"},{"Add":" version: VERSION,"},{"Add":" header: 0,"},{"Add":" channel: 0,"},{"Add":" unhashed: 0,"},{"Add":" total: 0,"},{"Add":" offsets,"},{"Add":" state,"},{"Add":" };"},{"Add":" off.header = bincode::serialized_size(&off)?;"},{"Add":" off.channel = off.header + header_buf.len() as u64;"},{"Add":" off.unhashed = off.channel + out.len() as u64;"},{"Add":" off.total = off.unhashed;"},{"Add":" let mut hasher = Hasher::default();"},{"Add":" let mut off_buf = Vec::with_capacity(off.header as usize);"},{"Add":" bincode::serialize_into(&mut off_buf, &off)?;"},{"Add":" debug!(\"off_buf = {:?}\", off_buf.len());"},{"Add":" w.write_all(&off_buf)?;"},{"Add":" hasher.update(&off_buf);"},{"Add":" debug!(\"header_buf = {:?}\", header_buf.len());"},{"Add":" w.write_all(&header_buf)?;"},{"Add":" hasher.update(&header_buf);"},{"Add":" debug!(\"out = {:?}\", out.len());"},{"Add":" w.write_all(&out)?;"},{"Add":" hasher.update(&out);"},{"Add":" Ok(hasher.finish())"},{"Add":"}"},{"Add":""},{"Add":"const LEVEL: usize = 10;"},{"Add":"const PIPE_LEN: usize = 10;"},{"Add":""},{"Add":"fn compress_channel<"},{"Add":" W: std::io::Write + Send + 'static,"},{"Add":" T: ::sanakirja::LoadPage,"},{"Add":">("},{"Add":" txn: &crate::pristine::sanakirja::GenericTxn,"},{"Add":" channel: &str,"},{"Add":" mut to: W,"},{"Add":") -> Result<(W, DbOffsets, Merkle), TagError> {"},{"Add":" debug!(\"int = {:?}\", txn.internal.db);"},{"Add":" let (sender, receiver) = std::sync::mpsc::sync_channel::>(PIPE_LEN);"},{"Add":" let (bsender, breceiver) = std::sync::mpsc::sync_channel::>(PIPE_LEN);"},{"Add":" for _ in 0..PIPE_LEN {"},{"Add":" bsender.send(vec![0; 4096]).map_err(|_| TagError::Sync)?;"},{"Add":" }"},{"Add":""},{"Add":" let t = std::thread::spawn(move || -> Result<(W, usize), TagError> {"},{"Add":" let mut comp = zstd_seekable::SeekableCStream::new(LEVEL, BLOCK_SIZE).unwrap();"},{"Add":" let mut out = [0; BLOCK_SIZE];"},{"Add":" let mut n = 0;"},{"Add":" while let Ok(input) = receiver.recv() {"},{"Add":" n += BLOCK_SIZE;"},{"Add":" let mut input_off = 0;"},{"Add":" let mut output_off = 0;"},{"Add":" while input_off < BLOCK_SIZE as usize {"},{"Add":" let (a, b) = comp"},{"Add":" .compress(&mut out[output_off..], &input[input_off..])"},{"Add":" .unwrap();"},{"Add":" output_off += a;"},{"Add":" input_off += b;"},{"Add":" }"},{"Add":" to.write_all(&out[..output_off]).unwrap();"},{"Add":" bsender.send(input).map_err(|_| TagError::Sync)?;"},{"Add":" }"},{"Add":" while let Ok(n) = comp.end_stream(&mut out) {"},{"Add":" if n == 0 {"},{"Add":" break;"},{"Add":" }"},{"Add":" to.write_all(&out[..n])?;"},{"Add":" }"},{"Add":" Ok((to, n))"},{"Add":" });"},{"Add":" let channel = txn.load_channel(channel)?.unwrap();"},{"Add":" let channel = channel.read().unwrap();"},{"Add":" let mut new = 0;"},{"Add":" debug!(\"copying internal\");"},{"Add":" let internal = copy::, _>("},{"Add":" txn,"},{"Add":" txn.internal.db,"},{"Add":" &mut new,"},{"Add":" &sender,"},{"Add":" &breceiver,"},{"Add":" )?;"},{"Add":" debug!(\"copying external\");"},{"Add":" let external = copy::, _>("},{"Add":" txn,"},{"Add":" txn.external.db,"},{"Add":" &mut new,"},{"Add":" &sender,"},{"Add":" &breceiver,"},{"Add":" )?;"},{"Add":" debug!(\"copying graph\");"},{"Add":" let graph = copy::, SerializedEdge, P, SerializedEdge>, _>("},{"Add":" txn,"},{"Add":" channel.graph.db,"},{"Add":" &mut new,"},{"Add":" &sender,"},{"Add":" &breceiver,"},{"Add":" )?;"},{"Add":" debug!(\"copying changes\");"},{"Add":" let changes = copy::, _>("},{"Add":" txn,"},{"Add":" channel.changes.db,"},{"Add":" &mut new,"},{"Add":" &sender,"},{"Add":" &breceiver,"},{"Add":" )?;"},{"Add":" debug!(\"copying revchanges\");"},{"Add":" let revchanges = copy::<"},{"Add":" L64,"},{"Add":" Pair,"},{"Add":" UP>,"},{"Add":" _,"},{"Add":" >(&txn, channel.revchanges.db, &mut new, &sender, &breceiver)?;"},{"Add":" debug!(\"copying states\");"},{"Add":" let states = copy::, _>("},{"Add":" txn,"},{"Add":" channel.states.db,"},{"Add":" &mut new,"},{"Add":" &sender,"},{"Add":" &breceiver,"},{"Add":" )?;"},{"Add":" let tags = copy::, _>("},{"Add":" &txn,"},{"Add":" channel.states.db,"},{"Add":" &mut new,"},{"Add":" &sender,"},{"Add":" &breceiver,"},{"Add":" )?;"},{"Add":" std::mem::drop(sender);"},{"Add":" let (w, n) = t.join().unwrap()?;"},{"Add":" let state = crate::pristine::current_state(txn, &channel)?;"},{"Add":" Ok(("},{"Add":" w,"},{"Add":" DbOffsets {"},{"Add":" internal,"},{"Add":" external,"},{"Add":" graph,"},{"Add":" changes,"},{"Add":" revchanges,"},{"Add":" states,"},{"Add":" tags: tags,"},{"Add":" apply_counter: channel.apply_counter,"},{"Add":" size: n as u64,"},{"Add":" },"},{"Add":" state,"},{"Add":" ))"},{"Add":"}"},{"Add":""},{"Add":"fn copy<"},{"Add":" K: ::sanakirja::UnsizedStorable,"},{"Add":" V: ::sanakirja::UnsizedStorable,"},{"Add":" P: ::sanakirja::btree::BTreeMutPage,"},{"Add":" T: ::sanakirja::LoadPage,"},{"Add":">("},{"Add":" txn: &crate::pristine::sanakirja::GenericTxn,"},{"Add":" pending: u64,"},{"Add":" new_page: &mut u64,"},{"Add":" sender: &std::sync::mpsc::SyncSender>,"},{"Add":" buffers: &std::sync::mpsc::Receiver>,"},{"Add":") -> Result {"},{"Add":" let mut dict = HashSet::default();"},{"Add":" let result = *new_page;"},{"Add":" let mut pending = vec![(pending, *new_page)];"},{"Add":" *new_page += BLOCK_SIZE as u64;"},{"Add":" while let Some((old_page_off, new_page_)) = pending.pop() {"},{"Add":" let page = txn.txn.load_page(old_page_off).unwrap();"},{"Add":" let mut memory = buffers.recv().map_err(|_| TagError::Sync)?;"},{"Add":" let mut new_page_ = ::sanakirja::MutPage(::sanakirja::CowPage {"},{"Add":" data: memory.as_mut_ptr(),"},{"Add":" offset: new_page_,"},{"Add":" });"},{"Add":" P::init(&mut new_page_);"},{"Add":" let mut curs = P::cursor_first(&page);"},{"Add":" let mut new_curs = P::cursor_first(&new_page_.0);"},{"Add":" unsafe {"},{"Add":" P::set_left_child("},{"Add":" &mut new_page_,"},{"Add":" &new_curs,"},{"Add":" P::left_child(page.as_page(), &curs),"},{"Add":" );"},{"Add":" }"},{"Add":" while let Some((k, v, r)) = P::next(&txn.txn, page.as_page(), &mut curs) {"},{"Add":" let r = if r > 0 {"},{"Add":" assert!(dict.insert(r));"},{"Add":" let new = *new_page;"},{"Add":" *new_page += BLOCK_SIZE as u64;"},{"Add":" pending.push((r, new));"},{"Add":" unsafe {"},{"Add":" P::set_left_child(&mut new_page_, &curs, new);"},{"Add":" }"},{"Add":" new"},{"Add":" } else {"},{"Add":" 0"},{"Add":" };"},{"Add":" debug!(\"put {:?} {:?}\", k, v);"},{"Add":" unsafe { P::put_mut(&mut new_page_, &new_curs, k, v, r) }"},{"Add":" P::move_next(&mut new_curs);"},{"Add":" }"},{"Add":" sender.send(memory).unwrap();"},{"Add":" }"},{"Add":" Ok(result)"},{"Add":"}"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":13,"ins":{"up_context":[{"change":3,"pos":57013}],"down_context":[{"change":3,"pos":57053}],"flag":"BLOCK","start":21968,"end":22019,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":57013},"to":{"change":3,"start":57013,"end":57053},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":"pub(crate) type P = btree::page::Page;"}],"del_contents":[{"Del":"type P = btree::page::Page;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":15,"ins":{"up_context":[{"change":3,"pos":57086}],"down_context":[{"change":3,"pos":57135}],"flag":"BLOCK","start":22020,"end":22080,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":57086},"to":{"change":3,"start":57086,"end":57135},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":"pub(crate) type UP = btree::page_unsized::Page;"}],"del_contents":[{"Del":"type UP = btree::page_unsized::Page;\n"}]}},{"Edit":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":30,"atom":{"NewVertex":{"up_context":[{"change":18,"pos":88}],"down_context":[{"change":3,"pos":38798}],"flag":"BLOCK","start":22081,"end":22176,"inode":{"change":3,"pos":531056}}},"contents":[{"Add":" #[error(\"Pristine version mismatch. Cloning over the network can fix this.\")]"},{"Add":" Version,"}]}},{"Edit":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":100,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":30332}],"down_context":[{"change":3,"pos":532545}],"flag":"BLOCK","start":22177,"end":22190,"inode":{"change":3,"pos":531056}}},"contents":[{"Add":" Version,"}]}},{"Edit":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":115,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":532726}],"down_context":[{"change":3,"pos":532726}],"flag":"BLOCK","start":22191,"end":22232,"inode":{"change":3,"pos":531056}}},"contents":[{"Add":""},{"Add":"const VERSION: L64 = L64(1u64.to_le());"}]}},{"Edit":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":121,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":532869}],"down_context":[{"change":3,"pos":57378}],"flag":"BLOCK","start":22233,"end":22354,"inode":{"change":3,"pos":531056}}},"contents":[{"Add":" if L64(txn.root(Root::Version as usize)) != VERSION {"},{"Add":" return Err(SanakirjaError::Version);"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":152,"ins":{"up_context":[{"change":3,"pos":534125}],"down_context":[{"change":3,"pos":534173}],"flag":"BLOCK","start":22355,"end":22427,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":534125},"to":{"change":2,"start":1200,"end":1263},"introduced_by":2}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":" pub fn mut_txn_begin(&self) -> Result, SanakirjaError> {"}],"del_contents":[{"Del":" pub fn mut_txn_begin(&self) -> Result, Error> {\n"}]}},{"Edit":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":154,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":534255}],"down_context":[{"change":2,"pos":1264}],"flag":"BLOCK","start":22428,"end":22697,"inode":{"change":3,"pos":531056}}},"contents":[{"Add":" if let Some(version) = txn.root(Root::Version as usize) {"},{"Add":" if L64(version) != VERSION {"},{"Add":" return Err(SanakirjaError::Version.into());"},{"Add":" }"},{"Add":" } else {"},{"Add":" txn.set_root(Root::Version as usize, VERSION.0);"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":250,"ins":{"up_context":[{"change":3,"pos":30387}],"down_context":[{"change":3,"pos":30425}],"flag":"BLOCK","start":22698,"end":22747,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":30387},"to":{"change":3,"start":60152,"end":60200},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":" pub internal: UDb,"}],"del_contents":[{"Del":" pub internal: Db,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":252,"ins":{"up_context":[{"change":3,"pos":30444}],"down_context":[{"change":3,"pos":537121}],"flag":"BLOCK","start":22748,"end":22797,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":30444},"to":{"change":3,"start":60201,"end":60249},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":" pub external: UDb,"}],"del_contents":[{"Del":" pub external: Db,\n"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":266,"ins":{"up_context":[{"change":3,"pos":60363}],"down_context":[{"change":3,"pos":60396}],"flag":"BLOCK","start":22798,"end":22831,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":60363},"to":{"change":3,"start":60363,"end":60396},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":" channels: UDb,"}],"del_contents":[{"Del":" channels: UDb,\n"}]}},{"Edit":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":313,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":62979}],"down_context":[{"change":3,"pos":62979}],"flag":"BLOCK","start":22832,"end":22914,"inode":{"change":3,"pos":531056}}},"contents":[{"Add":" let tags: UDb = UDb::from_page(tup.0[4].into());"}]}},{"Edit":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":322,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":63539}],"down_context":[{"change":3,"pos":539904}],"flag":"BLOCK","start":22915,"end":23046,"inode":{"change":3,"pos":531056}}},"contents":[{"Add":" debug!(\"check: tags 0x{:x}\", tags.db);"},{"Add":" ::sanakirja::debug::add_refs(&self.txn, &tags, &mut refs).unwrap();"}]}},{"Edit":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":660,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":70500}],"down_context":[{"change":3,"pos":39127}],"flag":"BLOCK","start":23047,"end":23087,"inode":{"change":3,"pos":531056}}},"contents":[{"Add":" pub tags: UDb,"}]}},{"Edit":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":848,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":8061}],"down_context":[{"change":3,"pos":74129}],"flag":"BLOCK","start":23088,"end":24779,"inode":{"change":3,"pos":531056}}},"contents":[{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" type Tags = UDb;"},{"Add":" fn get_tags("},{"Add":" &self,"},{"Add":" channel: &Self::Tags,"},{"Add":" c: &L64,"},{"Add":" ) -> Result, TxnErr> {"},{"Add":" match btree::get(&self.txn, channel, c, None)? {"},{"Add":" Some((k, v)) if k == c => Ok(Some(v)),"},{"Add":" _ => Ok(None),"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" type TagsCursor ="},{"Add":" ::sanakirja::btree::cursor::Cursor>;"},{"Add":" fn cursor_tags<'txn>("},{"Add":" &'txn self,"},{"Add":" channel: &Self::Tags,"},{"Add":" k: Option,"},{"Add":" ) -> Result<"},{"Add":" crate::pristine::Cursor,"},{"Add":" TxnErr,"},{"Add":" > {"},{"Add":" let mut cursor = btree::cursor::Cursor::new(&self.txn, channel)?;"},{"Add":" if let Some(k) = k {"},{"Add":" cursor.set(&self.txn, &k, None)?;"},{"Add":" }"},{"Add":" Ok(Cursor {"},{"Add":" cursor,"},{"Add":" txn: self,"},{"Add":" k: std::marker::PhantomData,"},{"Add":" v: std::marker::PhantomData,"},{"Add":" t: std::marker::PhantomData,"},{"Add":" })"},{"Add":" }"},{"Add":" fn cursor_tags_next("},{"Add":" &self,"},{"Add":" cursor: &mut Self::TagsCursor,"},{"Add":" ) -> Result, TxnErr> {"},{"Add":" if let Ok(x) = cursor.next(&self.txn) {"},{"Add":" Ok(x)"},{"Add":" } else {"},{"Add":" Err(TxnErr(SanakirjaError::PristineCorrupt))"},{"Add":" }"},{"Add":" }"},{"Add":""},{"Add":" fn cursor_tags_prev("},{"Add":" &self,"},{"Add":" cursor: &mut Self::TagsCursor,"},{"Add":" ) -> Result, TxnErr> {"},{"Add":" if let Ok(x) = cursor.prev(&self.txn) {"},{"Add":" Ok(x)"},{"Add":" } else {"},{"Add":" Err(TxnErr(SanakirjaError::PristineCorrupt))"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1063,"ins":{"up_context":[{"change":3,"pos":76627}],"down_context":[{"change":3,"pos":76731}],"flag":"BLOCK","start":24780,"end":24943,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":76627},"to":{"change":3,"start":76627,"end":76731},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":" tags: UDb::from_page(tup.0[4].into()),"},{"Add":" apply_counter: tup.0[5].into(),"},{"Add":" last_modified: tup.0[6].into(),"}],"del_contents":[{"Del":" apply_counter: tup.0[4].into(),\n last_modified: tup.0[5].into(),\n"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1218,"ins":{"up_context":[{"change":3,"pos":551320}],"down_context":[{"change":3,"pos":47694}],"flag":"BLOCK","start":24944,"end":25125,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":551320},"to":{"change":3,"start":78958,"end":79139},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":" type Channels = UDb;"},{"Add":" type ChannelsCursor = ::sanakirja::btree::cursor::Cursor>;"},{"Add":" sanakirja_cursor!(channels, SmallStr, T8,);"}],"del_contents":[{"Del":" type Channels = UDb;\n type ChannelsCursor = ::sanakirja::btree::cursor::Cursor>;\n sanakirja_cursor!(channels, SmallStr, T6,);\n"}]}},{"Edit":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1634,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":562092}],"down_context":[{"change":3,"pos":85274}],"flag":"BLOCK","start":25126,"end":25198,"inode":{"change":3,"pos":531056}}},"contents":[{"Add":" btree::del(&mut self.txn, &mut channel.tags, &t.into(), None)?;"}]}},{"Edit":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1642,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":50936}],"down_context":[{"change":3,"pos":50936}],"flag":"BLOCK","start":25199,"end":25706,"inode":{"change":3,"pos":531056}}},"contents":[{"Add":""},{"Add":" fn put_tags("},{"Add":" &mut self,"},{"Add":" channel: &mut Self::Channel,"},{"Add":" t: ApplyTimestamp,"},{"Add":" h: &Hash,"},{"Add":" ) -> Result<(), TxnErr> {"},{"Add":" btree::put(&mut self.txn, &mut channel.tags, &t.into(), &h.into())?;"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" fn del_tags("},{"Add":" &mut self,"},{"Add":" channel: &mut Self::Channel,"},{"Add":" t: ApplyTimestamp,"},{"Add":" ) -> Result<(), TxnErr> {"},{"Add":" btree::del(&mut self.txn, &mut channel.tags, &t.into(), None)?;"},{"Add":" Ok(())"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1760,"ins":{"up_context":[{"change":3,"pos":407}],"down_context":[{"change":3,"pos":465}],"flag":"BLOCK","start":25707,"end":25888,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":407},"to":{"change":3,"start":407,"end":465},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":" tags: UDb::from_page(b.0[4].into()),"},{"Add":" apply_counter: b.0[5].into(),"},{"Add":" last_modified: b.0[6].into(),"}],"del_contents":[{"Del":" apply_counter: b.0[4].into(),\n"}]}},{"Edit":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1764,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":513},"to":{"change":3,"start":513,"end":571},"introduced_by":3}],"inode":{"change":3,"pos":531056}}},"contents":[{"Del":" last_modified: b.0[5].into(),\n"}]}},{"Edit":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1773,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":11541}],"down_context":[{"change":3,"pos":11541}],"flag":"BLOCK","start":25889,"end":25962,"inode":{"change":3,"pos":531056}}},"contents":[{"Add":" tags: btree::create_db_(&mut self.txn)?,"}]}},{"Edit":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1775,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":11591}],"down_context":[{"change":3,"pos":11591}],"flag":"BLOCK","start":25963,"end":26013,"inode":{"change":3,"pos":531056}}},"contents":[{"Add":" last_modified: 0,"}]}},{"Edit":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1777,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":11643},"to":{"change":3,"start":11643,"end":11693},"introduced_by":3}],"inode":{"change":3,"pos":531056}}},"contents":[{"Del":" last_modified: 0,\n"}]}},{"Edit":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":1817,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":89448}],"down_context":[{"change":3,"pos":89448}],"flag":"BLOCK","start":26014,"end":26158,"inode":{"change":3,"pos":531056}}},"contents":[{"Add":" tags: btree::fork_db(&mut self.txn, &channel.tags)"},{"Add":" .map_err(|e| ForkError::Txn(e.into()))?,"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2020,"ins":{"up_context":[{"change":3,"pos":93724}],"down_context":[{"change":3,"pos":93824}],"flag":"BLOCK","start":26159,"end":26316,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":93724},"to":{"change":3,"start":93724,"end":93824},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":" tags: UDb::from_page(c.0[4].into()),"},{"Add":" apply_counter: c.0[5].into(),"},{"Add":" last_modified: c.0[6].into(),"}],"del_contents":[{"Del":" apply_counter: c.0[4].into(),\n last_modified: c.0[5].into(),\n"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2046,"ins":{"up_context":[{"change":3,"pos":13754}],"down_context":[{"change":3,"pos":94110}],"flag":"BLOCK","start":26317,"end":26339,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":13754},"to":{"change":3,"start":94088,"end":94110},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":573861},"to":{"change":3,"start":94088,"end":94110},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":" let t8 = T8(["}],"del_contents":[{"Del":" let t6 = T6([\n"}]}},{"Edit":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2051,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":94266}],"down_context":[{"change":3,"pos":94266}],"flag":"BLOCK","start":26340,"end":26376,"inode":{"change":3,"pos":531056}}},"contents":[{"Add":" channel.tags.db.into(),"}]}},{"Edit":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2054,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":94350}],"down_context":[{"change":3,"pos":94350}],"flag":"BLOCK","start":26377,"end":26402,"inode":{"change":3,"pos":531056}}},"contents":[{"Add":" 0u64.into(),"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2056,"ins":{"up_context":[{"change":3,"pos":94362}],"down_context":[{"change":3,"pos":94488}],"flag":"BLOCK","start":26403,"end":26479,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":94362},"to":{"change":3,"start":94362,"end":94395},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":94395},"to":{"change":3,"start":13755,"end":13831},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":" btree::put(&mut self.txn, &mut self.channels, &channel.name, &t8)?;"}],"del_contents":[{"Del":" debug!(\"t6 = {:?}\", t6);\n"},{"Del":" btree::put(&mut self.txn, &mut self.channels, &channel.name, &t6)?;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":531056},"path":"libpijul/src/pristine/sanakirja.rs","line":2192,"ins":{"up_context":[{"change":3,"pos":97832}],"down_context":[],"flag":"BLOCK","start":26480,"end":26498,"inode":{"change":3,"pos":531056}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":97832},"to":{"change":3,"start":97832,"end":97850},"introduced_by":3}],"inode":{"change":3,"pos":531056}},"ins_contents":[{"Add":"direct_repr!(T8);"}],"del_contents":[{"Del":"direct_repr!(T6);\n"}]}},{"Replacement":{"inode":{"change":3,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":119,"ins":{"up_context":[{"change":3,"pos":100861}],"down_context":[{"change":3,"pos":100886}],"flag":"BLOCK","start":26499,"end":26524,"inode":{"change":3,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":100861},"to":{"change":3,"start":100861,"end":100886},"introduced_by":3}],"inode":{"change":3,"pos":586748}},"ins_contents":[{"Add":"pub struct T8([L64; 8]);"}],"del_contents":[{"Del":"pub struct T6([L64; 6]);\n"}]}},{"Edit":{"inode":{"change":3,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":342,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":102574}],"down_context":[{"change":3,"pos":51831}],"flag":"BLOCK","start":26525,"end":27271,"inode":{"change":3,"pos":586748}}},"contents":[{"Add":""},{"Add":" type Tags;"},{"Add":" fn get_tags("},{"Add":" &self,"},{"Add":" channel: &Self::Tags,"},{"Add":" c: &L64,"},{"Add":" ) -> Result, TxnErr>;"},{"Add":""},{"Add":" type TagsCursor;"},{"Add":" fn cursor_tags<'txn>("},{"Add":" &'txn self,"},{"Add":" channel: &Self::Tags,"},{"Add":" pos: Option,"},{"Add":" ) -> Result<"},{"Add":" crate::pristine::Cursor,"},{"Add":" TxnErr,"},{"Add":" >;"},{"Add":" fn cursor_tags_next("},{"Add":" &self,"},{"Add":" cursor: &mut Self::TagsCursor,"},{"Add":" ) -> Result, TxnErr>;"},{"Add":""},{"Add":" fn cursor_tags_prev("},{"Add":" &self,"},{"Add":" cursor: &mut Self::TagsCursor,"},{"Add":" ) -> Result, TxnErr>;"}]}},{"Replacement":{"inode":{"change":3,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":490,"ins":{"up_context":[{"change":3,"pos":58221}],"down_context":[{"change":3,"pos":591136}],"flag":"BLOCK","start":27272,"end":27309,"inode":{"change":3,"pos":586748}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":58221},"to":{"change":3,"start":103089,"end":103126},"introduced_by":3}],"inode":{"change":3,"pos":586748}},"ins_contents":[{"Add":" cursor!(channels, SmallStr, T8);"}],"del_contents":[{"Del":" cursor!(channels, SmallStr, T6);\n"}]}},{"Edit":{"inode":{"change":3,"pos":586748},"path":"libpijul/src/pristine/mod.rs","line":1520,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":73114}],"down_context":[{"change":3,"pos":73114}],"flag":"BLOCK","start":27310,"end":27624,"inode":{"change":3,"pos":586748}}},"contents":[{"Add":""},{"Add":" fn put_tags("},{"Add":" &mut self,"},{"Add":" channel: &mut Self::Channel,"},{"Add":" t: ApplyTimestamp,"},{"Add":" h: &Hash,"},{"Add":" ) -> Result<(), TxnErr>;"},{"Add":""},{"Add":" fn del_tags("},{"Add":" &mut self,"},{"Add":" channel: &mut Self::Channel,"},{"Add":" t: ApplyTimestamp,"},{"Add":" ) -> Result<(), TxnErr>;"}]}},{"Edit":{"inode":{"change":3,"pos":717381},"path":"libpijul/src/lib.rs","line":31,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":717901}],"down_context":[{"change":3,"pos":717901}],"flag":"BLOCK","start":27625,"end":27639,"inode":{"change":3,"pos":717381}}},"contents":[{"Add":""},{"Add":"pub mod tag;"}]}},{"Replacement":{"inode":{"change":3,"pos":717381},"path":"libpijul/src/lib.rs","line":100,"ins":{"up_context":[{"change":3,"pos":60252}],"down_context":[{"change":3,"pos":60358}],"flag":"BLOCK","start":27640,"end":27817,"inode":{"change":3,"pos":717381}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":60252},"to":{"change":3,"start":59713,"end":59874},"introduced_by":3}],"inode":{"change":3,"pos":717381}},"ins_contents":[{"Add":" Base32, ChangeId, ChannelMutTxnT, ChannelRef, ChannelTxnT, DepsTxnT, EdgeFlags, GraphTxnT,"},{"Add":" Hash, Inode, Merkle, MutTxnT, OwnedPathId, RemoteRef, TreeTxnT, TxnT, Vertex,"}],"del_contents":[{"Del":" Base32, ChangeId, ChannelRef, ChannelTxnT, DepsTxnT, EdgeFlags, GraphTxnT, Hash, Inode, Merkle,\n MutTxnT, OwnedPathId, RemoteRef, TreeTxnT, TxnT, Vertex,\n"}]}}],"owner":"irevoire","repo":"pijul","token":"ziItRe/bduA35ca4eww2gIIQKwmtAws+bPX3Hex7P7s=","login":null}

…

Dependencies

Change contents