{"header":{"message":"initial change","description":null,"timestamp":"2023-06-13T21:18:32.868822838Z","authors":[{}]},"hash":"C5ZEXJ6ZBETDLSNRE7IPXMRNQARLRKK3Y275T2VYJ74TISJOV6OAC","authors":[{"login":"laumann","key":"3hFDodmFeE2ctGSdVvGCMGGumCr5RyZx83fRqEiTgwJg"}],"deps":{"hashes":[["C5ZEXJ6ZBETDLSNRE7IPXMRNQARLRKK3Y275T2VYJ74TISJOV6OAC","initial change"],["AA",null],["AEZURCTQZSH4P64IIADUUYQTMTDIDD6XIQ4ZRCEFCT2F4FTDQE7AC",""]],"deps":["AEZURCTQZSH4P64IIADUUYQTMTDIDD6XIQ4ZRCEFCT2F4FTDQE7AC"],"known":[]},"hunks":[{"FileAdd":{"meta":{"basename":"src","metadata":576},"context":[{"change":2,"pos":1}],"contents":[]}},{"FileAdd":{"meta":{"basename":"repository.rs","metadata":0},"context":[{"change":0,"pos":15}],"contents":[{"Add":"//! This file is copy-pasted directly from the pijul source code"},{"Add":"use std::path::PathBuf;"},{"Add":""},{"Add":"use anyhow::bail;"},{"Add":"use libpijul::DOT_DIR;"},{"Add":"use log::debug;"},{"Add":""},{"Add":"pub fn current_dir() -> Result {"},{"Add":" if let Ok(cur) = std::env::current_dir() {"},{"Add":" Ok(cur)"},{"Add":" } else {"},{"Add":" bail!(\"Cannot access working directory\")"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"pub struct Repository {"},{"Add":" pub pristine: libpijul::pristine::sanakirja::Pristine,"},{"Add":" pub changes: libpijul::changestore::filesystem::FileSystem,"},{"Add":" pub working_copy: libpijul::working_copy::filesystem::FileSystem,"},{"Add":" //pub config: config::Config,"},{"Add":" pub path: PathBuf,"},{"Add":" pub changes_dir: PathBuf,"},{"Add":"}"},{"Add":""},{"Add":"pub const PRISTINE_DIR: &str = \"pristine\";"},{"Add":"pub const CHANGES_DIR: &str = \"changes\";"},{"Add":"//pub const CONFIG_FILE: &str = \"config\";"},{"Add":""},{"Add":"#[cfg(unix)]"},{"Add":"pub fn max_files() -> usize {"},{"Add":" let n = if let Ok((n, _)) = rlimit::getrlimit(rlimit::Resource::NOFILE) {"},{"Add":" (n as usize / (2 * num_cpus::get())).max(1)"},{"Add":" } else {"},{"Add":" 256"},{"Add":" };"},{"Add":" debug!(\"max_files = {:?}\", n);"},{"Add":" n"},{"Add":"}"},{"Add":""},{"Add":"#[cfg(not(unix))]"},{"Add":"pub fn max_files() -> usize {"},{"Add":" 1"},{"Add":"}"},{"Add":""},{"Add":"impl Repository {"},{"Add":" fn find_root_(cur: Option, dot_dir: &str) -> Result {"},{"Add":" let mut cur = if let Some(cur) = cur {"},{"Add":" cur"},{"Add":" } else {"},{"Add":" current_dir()?"},{"Add":" };"},{"Add":" cur.push(dot_dir);"},{"Add":" loop {"},{"Add":" debug!(\"{:?}\", cur);"},{"Add":" if std::fs::metadata(&cur).is_err() {"},{"Add":" cur.pop();"},{"Add":" if cur.pop() {"},{"Add":" cur.push(DOT_DIR);"},{"Add":" } else {"},{"Add":" bail!(\"No Pijul repository found\")"},{"Add":" }"},{"Add":" } else {"},{"Add":" break;"},{"Add":" }"},{"Add":" }"},{"Add":" Ok(cur)"},{"Add":" }"},{"Add":""},{"Add":" pub fn find_root(cur: Option) -> Result {"},{"Add":" Self::find_root_with_dot_dir(cur, DOT_DIR)"},{"Add":" }"},{"Add":""},{"Add":" pub fn find_root_with_dot_dir("},{"Add":" cur: Option,"},{"Add":" dot_dir: &str,"},{"Add":" ) -> Result {"},{"Add":" let cur = Self::find_root_(cur, dot_dir)?;"},{"Add":" let mut pristine_dir = cur.clone();"},{"Add":" pristine_dir.push(PRISTINE_DIR);"},{"Add":" let mut changes_dir = cur.clone();"},{"Add":" changes_dir.push(CHANGES_DIR);"},{"Add":" let mut working_copy_dir = cur.clone();"},{"Add":" working_copy_dir.pop();"},{"Add":" // let config_path = cur.join(CONFIG_FILE);"},{"Add":" // let config = if let Ok(config) = std::fs::read(&config_path) {"},{"Add":" // if let Ok(toml) = toml::from_slice(&config) {"},{"Add":" // toml"},{"Add":" // } else {"},{"Add":" // bail!(\"Could not read configuration file at {:?}\", config_path)"},{"Add":" // }"},{"Add":" // } else {"},{"Add":" // config::Config::default()"},{"Add":" // };"},{"Add":" Ok(Repository {"},{"Add":" pristine: libpijul::pristine::sanakirja::Pristine::new(&pristine_dir.join(\"db\"))?,"},{"Add":" working_copy: libpijul::working_copy::filesystem::FileSystem::from_root("},{"Add":" &working_copy_dir,"},{"Add":" ),"},{"Add":" changes: libpijul::changestore::filesystem::FileSystem::from_root("},{"Add":" &working_copy_dir,"},{"Add":" crate::repository::max_files(),"},{"Add":" ),"},{"Add":" //config,"},{"Add":" path: working_copy_dir,"},{"Add":" changes_dir,"},{"Add":" })"},{"Add":" }"},{"Add":""},{"Add":" // pub fn update_config(&self) -> Result<(), anyhow::Error> {"},{"Add":" // std::fs::write("},{"Add":" // self.path.join(DOT_DIR).join(\"config\"),"},{"Add":" // toml::to_string(&self.config)?,"},{"Add":" // )?;"},{"Add":" // Ok(())"},{"Add":" // }"},{"Add":"}"},{"Add":""},{"Add":"fn init_default_config(path: &std::path::Path, remote: Option<&str>) -> Result<(), anyhow::Error> {"},{"Add":" use std::io::Write;"},{"Add":" let mut path = path.join(DOT_DIR);"},{"Add":" path.push(\"config\");"},{"Add":" if std::fs::metadata(&path).is_err() {"},{"Add":" let mut f = std::fs::File::create(&path)?;"},{"Add":" if let Some(rem) = remote {"},{"Add":" writeln!(f, \"default_remote = {:?}\", rem)?;"},{"Add":" }"},{"Add":" writeln!(f, \"[hooks]\\nrecord = []\")?;"},{"Add":" }"},{"Add":" Ok(())"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"main.rs","metadata":0},"context":[{"change":0,"pos":15}],"contents":[{"Add":"use libpijul::{MutTxnT, TxnT, TxnTExt};"},{"Add":"use repository::Repository;"},{"Add":""},{"Add":"mod repository;"},{"Add":""},{"Add":"fn main() {"},{"Add":" let repo = Repository::find_root(None).unwrap();"},{"Add":" let txn = repo.pristine.arc_txn_begin().unwrap();"},{"Add":""},{"Add":" let cur_channel = txn.read().current_channel().unwrap().to_string();"},{"Add":" println!(\"On channel {}\", cur_channel);"},{"Add":"}"}]}},{"FileAdd":{"meta":{"basename":"Cargo.toml","metadata":0},"context":[{"change":2,"pos":1}],"contents":[{"Add":"[package]"},{"Add":"name = \"pijul-conflicts\""},{"Add":"version = \"0.1.0\""},{"Add":"edition = \"2021\""},{"Add":""},{"Add":"# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html"},{"Add":""},{"Add":"[dependencies]"},{"Add":"anyhow = \"1.0\""},{"Add":"libpijul = \"1.0.0-beta.5\""},{"Add":"log = \"0.4\""},{"Add":"rlimit = \"0.6\""},{"Add":"num_cpus = \"1.13\""}]}}],"owner":"laumann","repo":"pijul-conflicts","token":"c2liNUNwNsfEOBwyYzAymozcwPKjGPLlUYsCPgUTJZQ=","login":null}

…

Dependencies

Change contents