{"header":{"message":"Pass deletions and renames to Git","description":null,"timestamp":"2023-04-18T17:47:30.183110996Z","authors":[{}]},"hash":"T3IX7GG7BIFN3AX3QQWRPS5CKFZVRU5TRQAMJSYN4FEJXQL75PJQC","authors":[{"login":"andybalholm","key":"BCEXYuKWaQ96btsk8UyBZWHLjn1Brhykv8tuZGPRjzFn"}],"deps":{"hashes":[["T3IX7GG7BIFN3AX3QQWRPS5CKFZVRU5TRQAMJSYN4FEJXQL75PJQC","Pass deletions and renames to Git"],["AA",null],["VK2ZYIOFG4GKELXWPKYWB33P3G6BEDP4CQAW6GY6YFIKTINVOSLAC","deduplicate blobs"],["ZGFCBIPXE66JLDBV4M7MLIPS5RYE3TDANZO6X2ZEGGWJRC3CPWHAC","FileSet: no error for remove_path"],["FRQZB7LJV6PBJV66QJ52NYFFTV4TFTBRSQRAD46REZJW6BL4W7UAC","quote and escape filenames"],["WQACY5X6MSK7NXFXKV5LSU77RU3UHEHK234GFJ4QUQCZZ23FMHKAC","FileSet: implement rename"],["QWLMNP5FOCONNJDNVKZFHJIM7WHLF7QCJI67YSV5VT2SXEOPZ6TQC","new ChangeStore implementation"],["ATRA7XTTN62JZQOI7A4JI3Z7L3XVTAEEW2U4AX6UQKEQ6USOXQDQC","RIIR: factor out Repository struct"],["OZUZ5H6DJUXJ2MEHQK6FQ7LTSPUHHGZSFZ3SPBV26A2KBE4TQKQQC","Use marks for commits"],["FIIUZR4LJOB5DPB4CBMPJHMO7C5Q4ZINUVM52UK6SIM5WM7R7ZLAC","Include file content"],["UFSP7C7B2ERFJ2XVVVNXGZRXUEMFSMRABC5YXXLK6ONMFG6QBNHAC","Export metadata"]],"deps":["VK2ZYIOFG4GKELXWPKYWB33P3G6BEDP4CQAW6GY6YFIKTINVOSLAC","ZGFCBIPXE66JLDBV4M7MLIPS5RYE3TDANZO6X2ZEGGWJRC3CPWHAC","FRQZB7LJV6PBJV66QJ52NYFFTV4TFTBRSQRAD46REZJW6BL4W7UAC","WQACY5X6MSK7NXFXKV5LSU77RU3UHEHK234GFJ4QUQCZZ23FMHKAC"],"known":["ATRA7XTTN62JZQOI7A4JI3Z7L3XVTAEEW2U4AX6UQKEQ6USOXQDQC","UFSP7C7B2ERFJ2XVVVNXGZRXUEMFSMRABC5YXXLK6ONMFG6QBNHAC","OZUZ5H6DJUXJ2MEHQK6FQ7LTSPUHHGZSFZ3SPBV26A2KBE4TQKQQC","FIIUZR4LJOB5DPB4CBMPJHMO7C5Q4ZINUVM52UK6SIM5WM7R7ZLAC","QWLMNP5FOCONNJDNVKZFHJIM7WHLF7QCJI67YSV5VT2SXEOPZ6TQC"]},"hunks":[{"Replacement":{"inode":{"change":6,"pos":32},"path":"src/repo.rs","line":244,"ins":{"up_context":[{"change":6,"pos":1942}],"down_context":[{"change":6,"pos":2013}],"flag":"BLOCK","start":0,"end":69,"inode":{"change":6,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1942},"to":{"change":6,"start":1942,"end":2013},"introduced_by":6}],"inode":{"change":6,"pos":32}},"ins_contents":[{"Add":" pub fn get_files(&mut self) -> Result> {"}],"del_contents":[{"Del":" pub fn get_files(&mut self) -> Result, Box> {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":32},"path":"src/repo.rs","line":246,"ins":{"up_context":[{"change":6,"pos":2040}],"down_context":[{"change":6,"pos":2093}],"flag":"BLOCK","start":70,"end":128,"inode":{"change":6,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2040},"to":{"change":6,"start":2040,"end":2093},"introduced_by":6}],"inode":{"change":6,"pos":32}},"ins_contents":[{"Add":" operations: Arc::new(Mutex::new(Vec::new())),"}],"del_contents":[{"Del":" files: Arc::new(Mutex::new(Vec::new())),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":32},"path":"src/repo.rs","line":260,"ins":{"up_context":[{"change":6,"pos":2355}],"down_context":[{"change":6,"pos":1462}],"flag":"BLOCK","start":129,"end":152,"inode":{"change":6,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2355},"to":{"change":6,"start":2355,"end":2781},"introduced_by":6}],"inode":{"change":6,"pos":32}},"ins_contents":[{"Add":" return Ok(fs);"}],"del_contents":[{"Del":" let mut files: Vec = Vec::new();\n let mut file_writers = match fs.files.lock() {\n Ok(fw) => fw,\n Err(err) => panic!(\"mutex error: {}\", err),\n };\n for f in file_writers.drain(..) {\n files.push(File {\n name: f.name,\n content: Arc::try_unwrap(f.content).unwrap().into_inner()?,\n });\n }\n\n return Ok(files);\n"}]}},{"Edit":{"inode":{"change":6,"pos":32},"path":"src/repo.rs","line":264,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":2785},"to":{"change":6,"start":2785,"end":2851},"introduced_by":6},{"previous":"","flag":"DELETED","from":{"change":6,"pos":2851},"to":{"change":6,"start":1468,"end":1470},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1468},"to":{"change":6,"start":1468,"end":1470},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":1470},"to":{"change":6,"start":2852,"end":2853},"introduced_by":6}],"inode":{"change":6,"pos":32}}},"contents":[{"Del":"pub struct File {\n pub name: String,\n pub content: Vec,\n"},{"Del":"}\n"},{"Del":"\n"}]}},{"Edit":{"inode":{"change":6,"pos":32},"path":"src/repo.rs","line":282,"atom":{"NewVertex":{"up_context":[{"change":6,"pos":3271}],"down_context":[{"change":6,"pos":3271}],"flag":"BLOCK","start":153,"end":275,"inode":{"change":6,"pos":32}}},"contents":[{"Add":"pub enum FileOp {"},{"Add":" Modify { fw: FileWriter },"},{"Add":" Delete { path: String },"},{"Add":" Rename { old: String, new: String },"},{"Add":"}"},{"Add":""}]}},{"Replacement":{"inode":{"change":6,"pos":32},"path":"src/repo.rs","line":289,"ins":{"up_context":[{"change":6,"pos":3288}],"down_context":[{"change":6,"pos":3349}],"flag":"BLOCK","start":276,"end":342,"inode":{"change":6,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3288},"to":{"change":6,"start":3288,"end":3349},"introduced_by":6}],"inode":{"change":6,"pos":32}},"ins_contents":[{"Add":"pub struct FileSet {"},{"Add":" pub operations: Arc>>,"}],"del_contents":[{"Del":"struct FileSet {\n pub files: Arc>>,\n"}]}},{"Replacement":{"inode":{"change":6,"pos":32},"path":"src/repo.rs","line":294,"ins":{"up_context":[{"change":6,"pos":3376}],"down_context":[{"change":6,"pos":3472}],"flag":"BLOCK","start":343,"end":367,"inode":{"change":6,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3376},"to":{"change":6,"start":3376,"end":3396},"introduced_by":6}],"inode":{"change":6,"pos":32}},"ins_contents":[{"Add":"pub enum FileSetError {"}],"del_contents":[{"Del":"enum FileSetError {\n"}]}},{"Edit":{"inode":{"change":6,"pos":32},"path":"src/repo.rs","line":296,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":3496},"to":{"change":6,"start":3496,"end":3513},"introduced_by":6}],"inode":{"change":6,"pos":32}}},"contents":[{"Del":" MutexPoison,\n"}]}},{"Edit":{"inode":{"change":6,"pos":32},"path":"src/repo.rs","line":304,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4041},"to":{"change":6,"start":4041,"end":4111},"introduced_by":6}],"inode":{"change":6,"pos":32}}},"contents":[{"Del":" FileSetError::MutexPoison => write!(f, \"poisoned mutex\"),\n"}]}},{"Replacement":{"inode":{"change":6,"pos":32},"path":"src/repo.rs","line":331,"ins":{"up_context":[{"change":6,"pos":4772}],"down_context":[{"change":3,"pos":80}],"flag":"BLOCK","start":368,"end":556,"inode":{"change":6,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4772},"to":{"change":3,"start":0,"end":80},"introduced_by":3}],"inode":{"change":6,"pos":32}},"ins_contents":[{"Add":" fn remove_path(&self, path: &str, _rec: bool) -> Result<(), Self::Error> {"},{"Add":" self.operations.lock().unwrap().push(FileOp::Delete {"},{"Add":" path: path.to_owned(),"},{"Add":" });"}],"del_contents":[{"Del":" fn remove_path(&self, _path: &str, _rec: bool) -> Result<(), Self::Error> {\n"}]}},{"Replacement":{"inode":{"change":6,"pos":32},"path":"src/repo.rs","line":339,"ins":{"up_context":[{"change":6,"pos":4996}],"down_context":[{"change":5,"pos":516}],"flag":"BLOCK","start":557,"end":697,"inode":{"change":6,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":4996},"to":{"change":5,"start":0,"end":516},"introduced_by":5}],"inode":{"change":6,"pos":32}},"ins_contents":[{"Add":" self.operations.lock().unwrap().push(FileOp::Rename {"},{"Add":" old: old.to_owned(),"},{"Add":" new: new.to_owned(),"},{"Add":" });"}],"del_contents":[{"Del":" let mut with_slash = old.to_owned();\n with_slash.push_str(\"/\");\n let mut files = self.files.lock().unwrap();\n for f in files.iter_mut() {\n if f.name == old {\n f.name = new.to_owned();\n } else if f.name.starts_with(&with_slash) {\n let (_, remainder) = f.name.split_at(old.len());\n let mut new_name = new.to_owned();\n new_name.push_str(remainder);\n f.name = new_name;\n }\n }\n"}]}},{"Replacement":{"inode":{"change":6,"pos":32},"path":"src/repo.rs","line":355,"ins":{"up_context":[{"change":6,"pos":5460}],"down_context":[{"change":6,"pos":5612}],"flag":"BLOCK","start":698,"end":817,"inode":{"change":6,"pos":32}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":5460},"to":{"change":6,"start":5460,"end":5612},"introduced_by":6}],"inode":{"change":6,"pos":32}},"ins_contents":[{"Add":" self.operations"},{"Add":" .lock()"},{"Add":" .unwrap()"},{"Add":" .push(FileOp::Modify { fw: f.clone() });"}],"del_contents":[{"Del":" match self.files.lock() {\n Ok(mut v) => v.push(f.clone()),\n Err(_err) => return Err(FileSetError::MutexPoison),\n }\n"}]}},{"Replacement":{"inode":{"change":6,"pos":313},"path":"src/fast_export.rs","line":12,"ins":{"up_context":[{"change":6,"pos":339}],"down_context":[{"change":6,"pos":339}],"flag":"BLOCK","start":818,"end":869,"inode":{"change":6,"pos":313}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":339},"to":{"change":6,"start":5917,"end":5940},"introduced_by":6}],"inode":{"change":6,"pos":313}},"ins_contents":[{"Add":"use crate::repo::FileOp;"},{"Add":"use crate::repo::FileSet;"}],"del_contents":[{"Del":"use crate::repo::File;\n"}]}},{"Replacement":{"inode":{"change":6,"pos":313},"path":"src/fast_export.rs","line":53,"ins":{"up_context":[{"change":6,"pos":6009}],"down_context":[{"change":2,"pos":809}],"flag":"BLOCK","start":870,"end":2013,"inode":{"change":6,"pos":313}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6009},"to":{"change":2,"start":80,"end":186},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":186},"to":{"change":2,"start":186,"end":213},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":213},"to":{"change":2,"start":213,"end":221},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":221},"to":{"change":6,"start":6111,"end":6177},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6111},"to":{"change":6,"start":6111,"end":6177},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6177},"to":{"change":2,"start":222,"end":312},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":312},"to":{"change":2,"start":312,"end":549},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":549},"to":{"change":6,"start":6262,"end":6302},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6262},"to":{"change":6,"start":6262,"end":6302},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6302},"to":{"change":2,"start":550,"end":659},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":659},"to":{"change":2,"start":659,"end":779},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":2,"pos":779},"to":{"change":2,"start":779,"end":809},"introduced_by":2}],"inode":{"change":6,"pos":313}},"ins_contents":[{"Add":" pub fn write_commit(&mut self, c: &Change, parent: Option, files: &FileSet) {"},{"Add":" let mut file_marks = HashMap::new();"},{"Add":" for op in &*files.operations.lock().unwrap() {"},{"Add":" match &op {"},{"Add":" FileOp::Modify { fw } => {"},{"Add":" let ct = fw.content.lock().unwrap();"},{"Add":" let content: &[u8] = &*ct;"},{"Add":" let h = sha256::digest(content);"},{"Add":" let mut new_blob = false;"},{"Add":" let blob_mark = *self.blob_marks.entry(h).or_insert_with(|| {"},{"Add":" new_blob = true;"},{"Add":" self.max_blob_mark += 1;"},{"Add":" self.max_blob_mark"},{"Add":" });"},{"Add":" file_marks.insert(fw.name.clone(), blob_mark);"},{"Add":" if new_blob {"},{"Add":" println!(\"blob\");"},{"Add":" println!(\"mark :{}\", blob_mark);"},{"Add":" println!(\"data {}\", content.len());"},{"Add":" std::io::stdout().write_all(content).unwrap();"},{"Add":" println!(\"\");"},{"Add":" }"},{"Add":" }"},{"Add":" _ => (),"}],"del_contents":[{"Del":" pub fn write_commit(\n &mut self,\n c: &Change,\n parent: Option,\n"},{"Del":" files: &Vec,\n"},{"Del":" ) {\n"},{"Del":" let mut file_marks = Vec::new();\n for f in files {\n"},{"Del":" let content: &[u8] = &f.content;\n let h = sha256::digest(content);\n"},{"Del":" let mut new_blob = false;\n let blob_mark = *self.blob_marks.entry(h).or_insert_with(|| {\n new_blob = true;\n self.max_blob_mark += 1;\n self.max_blob_mark\n });\n"},{"Del":" file_marks.push(blob_mark);\n"},{"Del":" if new_blob {\n println!(\"blob\");\n println!(\"mark :{}\", blob_mark);\n"},{"Del":" println!(\"data {}\", f.content.len());\n std::io::stdout().write_all(&f.content).unwrap();\n"},{"Del":" println!(\"\");\n"}]}},{"Replacement":{"inode":{"change":6,"pos":313},"path":"src/fast_export.rs","line":112,"ins":{"up_context":[{"change":6,"pos":6710}],"down_context":[{"change":6,"pos":1147}],"flag":"BLOCK","start":2014,"end":2561,"inode":{"change":6,"pos":313}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6710},"to":{"change":6,"start":6710,"end":6741},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6741},"to":{"change":6,"start":6741,"end":6775},"introduced_by":6},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":6,"pos":6775},"to":{"change":4,"start":340,"end":398},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":398},"to":{"change":4,"start":398,"end":475},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":475},"to":{"change":4,"start":475,"end":490},"introduced_by":4}],"inode":{"change":6,"pos":313}},"ins_contents":[{"Add":" for op in &*files.operations.lock().unwrap() {"},{"Add":" match &op {"},{"Add":" FileOp::Modify { fw } => println!("},{"Add":" \"M 644 :{} \\\"{}\\\"\","},{"Add":" file_marks.get(&fw.name).unwrap(),"},{"Add":" escape_string(&fw.name)"},{"Add":" ),"},{"Add":" FileOp::Delete { path } => println!(\"D \\\"{}\\\"\", escape_string(&path)),"},{"Add":" FileOp::Rename { old, new } => {"},{"Add":" println!(\"R \\\"{}\\\" \\\"{}\\\"\", escape_string(&old), escape_string(&new))"},{"Add":" }"},{"Add":" };"}],"del_contents":[{"Del":" println!(\"deleteall\");\n"},{"Del":" for i in 0..files.len() {\n"},{"Del":" println!(\n \"M 644 :{} \\\"{}\\\"\",\n"},{"Del":" file_marks[i],\n escape_string(&files[i].name)\n"},{"Del":" );\n"}]}}],"owner":"andybalholm","repo":"pijul-export","token":"B9PdBwCqakqh5DUnFMqQCPBBaUhZjTflEMcbpwab7TI=","login":null}

…

Dependencies

Change contents