{"header":{"message":"fix a bunch of warnings","description":null,"timestamp":"2023-06-15T07:33:22.343103338Z","authors":[{}]},"hash":"VL34T74TXXZ7MBJATMU2QQTR4BV7PBMU6DE4DCKX5ERHKAYHIZXAC","authors":[{"login":"laumann","key":"3hFDodmFeE2ctGSdVvGCMGGumCr5RyZx83fRqEiTgwJg"}],"deps":{"hashes":[["VL34T74TXXZ7MBJATMU2QQTR4BV7PBMU6DE4DCKX5ERHKAYHIZXAC","fix a bunch of warnings"],["AA",null],["DF2KXDEK7B5ADHJYG7RUAZPTHUVUOLCLQLUUUIZP2OMJRRAKJJIQC","add run() function, clean up unwrap()s"],["C5ZEXJ6ZBETDLSNRE7IPXMRNQARLRKK3Y275T2VYJ74TISJOV6OAC","initial change"],["VJ5MYXCEDWECE2TAIJOTGDVZXWQ6QQLWERXCD7B7U734VD3ND73QC","minimal implementation of WorkingCopy"],["ISUKIWVPGBA7ITNBPSAACNOB4FLAIMSCP7A6I33XE5UITW7M7GYAC","begin formatting output"],["JNHJLQE6TQDFL2L3S2K5FSRT4FAGDC3Z57MXV2ARP33JGSS2ZPIAC","faking it"]],"deps":["DF2KXDEK7B5ADHJYG7RUAZPTHUVUOLCLQLUUUIZP2OMJRRAKJJIQC"],"known":["C5ZEXJ6ZBETDLSNRE7IPXMRNQARLRKK3Y275T2VYJ74TISJOV6OAC","JNHJLQE6TQDFL2L3S2K5FSRT4FAGDC3Z57MXV2ARP33JGSS2ZPIAC","VJ5MYXCEDWECE2TAIJOTGDVZXWQ6QQLWERXCD7B7U734VD3ND73QC","ISUKIWVPGBA7ITNBPSAACNOB4FLAIMSCP7A6I33XE5UITW7M7GYAC"]},"hunks":[{"Replacement":{"inode":{"change":3,"pos":55},"path":"src/repository.rs","line":118,"ins":{"up_context":[{"change":3,"pos":3514}],"down_context":[],"flag":"BLOCK","start":0,"end":488,"inode":{"change":3,"pos":55}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3514},"to":{"change":3,"start":3514,"end":3963},"introduced_by":3}],"inode":{"change":3,"pos":55}},"ins_contents":[{"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":"// }"}],"del_contents":[{"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"}]}},{"Replacement":{"inode":{"change":3,"pos":3996},"path":"src/main.rs","line":7,"ins":{"up_context":[{"change":2,"pos":132}],"down_context":[{"change":2,"pos":133}],"flag":"BLOCK","start":489,"end":509,"inode":{"change":3,"pos":3996}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":132},"to":{"change":3,"start":3997,"end":4037},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":3,"pos":222},"to":{"change":3,"start":3997,"end":4037},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":3996},"to":{"change":3,"start":3997,"end":4037},"introduced_by":3}],"inode":{"change":3,"pos":3996}},"ins_contents":[{"Add":"use libpijul::TxnT;"}],"del_contents":[{"Del":"use libpijul::{MutTxnT, TxnT, TxnTExt};\n"}]}},{"Replacement":{"inode":{"change":3,"pos":3996},"path":"src/main.rs","line":22,"ins":{"up_context":[{"change":3,"pos":349}],"down_context":[{"change":3,"pos":429}],"flag":"BLOCK","start":510,"end":591,"inode":{"change":3,"pos":3996}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":349},"to":{"change":3,"start":349,"end":429},"introduced_by":3}],"inode":{"change":3,"pos":3996}},"ins_contents":[{"Add":" fn file_metadata(&self, _file: &str) -> Result {"}],"del_contents":[{"Del":" fn file_metadata(&self, file: &str) -> Result {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":3996},"path":"src/main.rs","line":26,"ins":{"up_context":[{"change":3,"pos":478}],"down_context":[{"change":3,"pos":565}],"flag":"BLOCK","start":592,"end":681,"inode":{"change":3,"pos":3996}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":478},"to":{"change":3,"start":478,"end":565},"introduced_by":3}],"inode":{"change":3,"pos":3996}},"ins_contents":[{"Add":" fn read_file(&self, _file: &str, _buffer: &mut Vec) -> Result<(), Self::Error> {"}],"del_contents":[{"Del":" fn read_file(&self, file: &str, buffer: &mut Vec) -> Result<(), Self::Error> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":3996},"path":"src/main.rs","line":30,"ins":{"up_context":[{"change":3,"pos":4083}],"down_context":[{"change":3,"pos":698}],"flag":"BLOCK","start":682,"end":771,"inode":{"change":3,"pos":3996}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":4083},"to":{"change":3,"start":610,"end":698},"introduced_by":3}],"inode":{"change":3,"pos":3996}},"ins_contents":[{"Add":" fn modified_time(&self, _file: &str) -> Result {"}],"del_contents":[{"Del":" fn modified_time(&self, file: &str) -> Result {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":3996},"path":"src/main.rs","line":36,"ins":{"up_context":[{"change":3,"pos":786}],"down_context":[{"change":3,"pos":0}],"flag":"BLOCK","start":772,"end":843,"inode":{"change":3,"pos":3996}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":786},"to":{"change":3,"start":786,"end":856},"introduced_by":3}],"inode":{"change":3,"pos":3996}},"ins_contents":[{"Add":" fn create_dir_all(&self, _path: &str) -> Result<(), Self::Error> {"}],"del_contents":[{"Del":" fn create_dir_all(&self, path: &str) -> Result<(), Self::Error> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":3996},"path":"src/main.rs","line":39,"ins":{"up_context":[{"change":3,"pos":903}],"down_context":[{"change":3,"pos":16}],"flag":"BLOCK","start":844,"end":924,"inode":{"change":3,"pos":3996}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":903},"to":{"change":3,"start":903,"end":981},"introduced_by":3}],"inode":{"change":3,"pos":3996}},"ins_contents":[{"Add":" fn remove_path(&self, _name: &str, _rec: bool) -> Result<(), Self::Error> {"}],"del_contents":[{"Del":" fn remove_path(&self, name: &str, rec: bool) -> Result<(), Self::Error> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":3996},"path":"src/main.rs","line":42,"ins":{"up_context":[{"change":3,"pos":1025}],"down_context":[{"change":3,"pos":32}],"flag":"BLOCK","start":925,"end":1002,"inode":{"change":3,"pos":3996}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1025},"to":{"change":3,"start":1025,"end":1100},"introduced_by":3}],"inode":{"change":3,"pos":3996}},"ins_contents":[{"Add":" fn rename(&self, _former: &str, _new: &str) -> Result<(), Self::Error> {"}],"del_contents":[{"Del":" fn rename(&self, former: &str, new: &str) -> Result<(), Self::Error> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":3996},"path":"src/main.rs","line":45,"ins":{"up_context":[{"change":3,"pos":1139}],"down_context":[{"change":3,"pos":48}],"flag":"BLOCK","start":1003,"end":1094,"inode":{"change":3,"pos":3996}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1139},"to":{"change":3,"start":1139,"end":1228},"introduced_by":3}],"inode":{"change":3,"pos":3996}},"ins_contents":[{"Add":" fn set_permissions(&self, _name: &str, _permissions: u16) -> Result<(), Self::Error> {"}],"del_contents":[{"Del":" fn set_permissions(&self, name: &str, permissions: u16) -> Result<(), Self::Error> {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":3996},"path":"src/main.rs","line":50,"ins":{"up_context":[{"change":3,"pos":1310}],"down_context":[{"change":3,"pos":1400}],"flag":"BLOCK","start":1095,"end":1187,"inode":{"change":3,"pos":3996}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1310},"to":{"change":3,"start":1310,"end":1400},"introduced_by":3}],"inode":{"change":3,"pos":3996}},"ins_contents":[{"Add":" fn write_file(&self, _file: &str, _inode: Inode) -> Result {"}],"del_contents":[{"Del":" fn write_file(&self, file: &str, inode: Inode) -> Result {\n"}]}},{"Replacement":{"inode":{"change":3,"pos":3996},"path":"src/main.rs","line":97,"ins":{"up_context":[{"change":2,"pos":1239}],"down_context":[{"change":2,"pos":1292}],"flag":"BLOCK","start":1188,"end":1255,"inode":{"change":3,"pos":3996}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":1239},"to":{"change":2,"start":1239,"end":1292},"introduced_by":2}],"inode":{"change":3,"pos":3996}},"ins_contents":[{"Add":" writeln!(std::io::stderr(), \"fatal: {}\", e).unwrap_or(());"}],"del_contents":[{"Del":" writeln!(std::io::stderr(), \"fatal: {}\", e);\n"}]}}],"owner":"laumann","repo":"pijul-conflicts","token":"6dMgtqBS0dx59DYM/FoMKHNIR3egHJalEWmh3RIhS0o=","login":null}

…

Dependencies

Change contents