{"header":{"message":"Use pijul-repository instead of internal copy","description":"The internal repository.rs was a copy from the pijul crate, but it has\nsince been moved into its own sub-crate allowing us to use it\ndirectly.\n","timestamp":"2024-04-11T04:23:10.530550184Z","authors":[{}]},"hash":"T4W2OZYIFN6WVSIYCQRVAQTTTWRQNIHCLEY25HS6FTREKIXROYYQC","authors":[{"login":"laumann","key":"3hFDodmFeE2ctGSdVvGCMGGumCr5RyZx83fRqEiTgwJg"}],"deps":{"hashes":[["T4W2OZYIFN6WVSIYCQRVAQTTTWRQNIHCLEY25HS6FTREKIXROYYQC","Use pijul-repository instead of internal copy"],["AA",null],["VL34T74TXXZ7MBJATMU2QQTR4BV7PBMU6DE4DCKX5ERHKAYHIZXAC","fix a bunch of warnings"],["UOJJOLNHPX73LWHAOVCUPB2LG735XY36CTS6TIQIB5VCDOYIJUFAC","Use IntoIterator directly instead of coercing a BTreeSet to a Vec"],["NJIHOHVX2EKPYDY2VRKE4TNR3TWFK2COVDB4RNIUBGI3B5ON5BEAC","Bump libpijul version"],["JNHJLQE6TQDFL2L3S2K5FSRT4FAGDC3Z57MXV2ARP33JGSS2ZPIAC","faking it"],["DF2KXDEK7B5ADHJYG7RUAZPTHUVUOLCLQLUUUIZP2OMJRRAKJJIQC","add run() function, clean up unwrap()s"],["C5ZEXJ6ZBETDLSNRE7IPXMRNQARLRKK3Y275T2VYJ74TISJOV6OAC","initial change"]],"deps":["VL34T74TXXZ7MBJATMU2QQTR4BV7PBMU6DE4DCKX5ERHKAYHIZXAC","UOJJOLNHPX73LWHAOVCUPB2LG735XY36CTS6TIQIB5VCDOYIJUFAC","NJIHOHVX2EKPYDY2VRKE4TNR3TWFK2COVDB4RNIUBGI3B5ON5BEAC"],"known":["C5ZEXJ6ZBETDLSNRE7IPXMRNQARLRKK3Y275T2VYJ74TISJOV6OAC","JNHJLQE6TQDFL2L3S2K5FSRT4FAGDC3Z57MXV2ARP33JGSS2ZPIAC","DF2KXDEK7B5ADHJYG7RUAZPTHUVUOLCLQLUUUIZP2OMJRRAKJJIQC"]},"hunks":[{"FileDel":{"deleted_names":[{"basename":"repository.rs","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":5,"pos":15},"to":{"change":5,"start":17,"end":54},"introduced_by":5},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":5,"pos":54},"to":{"change":5,"start":55,"end":55},"introduced_by":5}],"inode":{"change":5,"pos":55}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":55},"to":{"change":5,"start":56,"end":3514},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":3514},"to":{"change":2,"start":0,"end":488},"introduced_by":2}],"inode":{"change":5,"pos":55}},"content":[{"Del":"//! This file is copy-pasted directly from the pijul source code\nuse std::path::PathBuf;\n\nuse anyhow::bail;\nuse libpijul::DOT_DIR;\nuse log::debug;\n\npub fn current_dir() -> Result {\n if let Ok(cur) = std::env::current_dir() {\n Ok(cur)\n } else {\n bail!(\"Cannot access working directory\")\n }\n}\n\npub struct Repository {\n pub pristine: libpijul::pristine::sanakirja::Pristine,\n pub changes: libpijul::changestore::filesystem::FileSystem,\n pub working_copy: libpijul::working_copy::filesystem::FileSystem,\n //pub config: config::Config,\n pub path: PathBuf,\n pub changes_dir: PathBuf,\n}\n\npub const PRISTINE_DIR: &str = \"pristine\";\npub const CHANGES_DIR: &str = \"changes\";\n//pub const CONFIG_FILE: &str = \"config\";\n\n#[cfg(unix)]\npub fn max_files() -> usize {\n let n = if let Ok((n, _)) = rlimit::getrlimit(rlimit::Resource::NOFILE) {\n (n as usize / (2 * num_cpus::get())).max(1)\n } else {\n 256\n };\n debug!(\"max_files = {:?}\", n);\n n\n}\n\n#[cfg(not(unix))]\npub fn max_files() -> usize {\n 1\n}\n\nimpl Repository {\n fn find_root_(cur: Option, dot_dir: &str) -> Result {\n let mut cur = if let Some(cur) = cur {\n cur\n } else {\n current_dir()?\n };\n cur.push(dot_dir);\n loop {\n debug!(\"{:?}\", cur);\n if std::fs::metadata(&cur).is_err() {\n cur.pop();\n if cur.pop() {\n cur.push(DOT_DIR);\n } else {\n bail!(\"No Pijul repository found\")\n }\n } else {\n break;\n }\n }\n Ok(cur)\n }\n\n pub fn find_root(cur: Option) -> Result {\n Self::find_root_with_dot_dir(cur, DOT_DIR)\n }\n\n pub fn find_root_with_dot_dir(\n cur: Option,\n dot_dir: &str,\n ) -> Result {\n let cur = Self::find_root_(cur, dot_dir)?;\n let mut pristine_dir = cur.clone();\n pristine_dir.push(PRISTINE_DIR);\n let mut changes_dir = cur.clone();\n changes_dir.push(CHANGES_DIR);\n let mut working_copy_dir = cur.clone();\n working_copy_dir.pop();\n // let config_path = cur.join(CONFIG_FILE);\n // let config = if let Ok(config) = std::fs::read(&config_path) {\n // if let Ok(toml) = toml::from_slice(&config) {\n // toml\n // } else {\n // bail!(\"Could not read configuration file at {:?}\", config_path)\n // }\n // } else {\n // config::Config::default()\n // };\n Ok(Repository {\n pristine: libpijul::pristine::sanakirja::Pristine::new(&pristine_dir.join(\"db\"))?,\n working_copy: libpijul::working_copy::filesystem::FileSystem::from_root(\n &working_copy_dir,\n ),\n changes: libpijul::changestore::filesystem::FileSystem::from_root(\n &working_copy_dir,\n crate::repository::max_files(),\n ),\n //config,\n path: working_copy_dir,\n changes_dir,\n })\n }\n\n // pub fn update_config(&self) -> Result<(), anyhow::Error> {\n // std::fs::write(\n // self.path.join(DOT_DIR).join(\"config\"),\n // toml::to_string(&self.config)?,\n // )?;\n // Ok(())\n // }\n}\n\n"},{"Del":"// fn init_default_config(path: &std::path::Path, remote: Option<&str>) -> Result<(), anyhow::Error> {\n// use std::io::Write;\n// let mut path = path.join(DOT_DIR);\n// path.push(\"config\");\n// if std::fs::metadata(&path).is_err() {\n// let mut f = std::fs::File::create(&path)?;\n// if let Some(rem) = remote {\n// writeln!(f, \"default_remote = {:?}\", rem)?;\n// }\n// writeln!(f, \"[hooks]\\nrecord = []\")?;\n// }\n// Ok(())\n// }\n"}]}},{"Edit":{"inode":{"change":5,"pos":3996},"path":"src/main.rs","line":8,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":509}],"down_context":[{"change":5,"pos":133}],"flag":"BLOCK","start":0,"end":34,"inode":{"change":5,"pos":3996}}},"contents":[{"Add":"use pijul_repository::Repository;"}]}},{"Edit":{"inode":{"change":5,"pos":3996},"path":"src/main.rs","line":14,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":29},"to":{"change":5,"start":4065,"end":4066},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":5,"pos":173},"to":{"change":5,"start":4065,"end":4066},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":4065},"to":{"change":5,"start":4065,"end":4066},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":4066},"to":{"change":5,"start":174,"end":202},"introduced_by":5},{"previous":"","flag":"DELETED","from":{"change":5,"pos":202},"to":{"change":5,"start":4066,"end":4082},"introduced_by":5},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":4066},"to":{"change":5,"start":4066,"end":4082},"introduced_by":5}],"inode":{"change":5,"pos":3996}}},"contents":[{"Del":"\n"},{"Del":"use repository::Repository;\n"},{"Del":"mod repository;\n"}]}},{"Edit":{"inode":{"change":5,"pos":4358},"path":"Cargo.toml","line":11,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":27}],"down_context":[{"change":5,"pos":4584}],"flag":"BLOCK","start":35,"end":62,"inode":{"change":5,"pos":4358}}},"contents":[{"Add":"pijul-repository = \"0.0.1\""}]}}],"owner":"laumann","repo":"pijul-conflicts","token":"aAVm4XsUl1+GcWAmOyVFvKLitnFquwFWNpbzgD3LQL4=","login":null}

…

Dependencies

Change contents