{"header":{"message":"Include file content","description":null,"timestamp":"2023-03-20T23:50:10.737563972Z","authors":[{}]},"hash":"FIIUZR4LJOB5DPB4CBMPJHMO7C5Q4ZINUVM52UK6SIM5WM7R7ZLAC","authors":[{"login":"andybalholm","key":"BCEXYuKWaQ96btsk8UyBZWHLjn1Brhykv8tuZGPRjzFn"}],"deps":{"hashes":[["FIIUZR4LJOB5DPB4CBMPJHMO7C5Q4ZINUVM52UK6SIM5WM7R7ZLAC","Include file content"],["AA",null],["D467LQZ62MTKWYPTMRBYTTR63CZDCE5WGBIGLQMSWAQYPHC3XITAC","Load identities"],["OZUZ5H6DJUXJ2MEHQK6FQ7LTSPUHHGZSFZ3SPBV26A2KBE4TQKQQC","Use marks for commits"],["YNZMKRJDWYOQ3R3XHA2G47YG2SDI7FT7AEXH3OLB3BJGB6ALTRQAC","include more information in log"],["UFSP7C7B2ERFJ2XVVVNXGZRXUEMFSMRABC5YXXLK6ONMFG6QBNHAC","Export metadata"],["W7HZ5VFMEFVJIPYZJXOSMWTQ7DOZOOHT4QZTMDCT63AKIWB3TCZQC","RIIR: list changes"],["ATRA7XTTN62JZQOI7A4JI3Z7L3XVTAEEW2U4AX6UQKEQ6USOXQDQC","RIIR: factor out Repository struct"],["RVRUZGHUCMZO2UAXMT5NVJM62XK3B3TZWXZFWZKKGIX6RI7LPLCQC","Factor out load_channel function"],["TQBJZLD7Q223IFEBR7SU4FJWPWQWVBCSRPYYYEHXNSDM6DC7UWRAC","RIIR: hello, world"]],"deps":["D467LQZ62MTKWYPTMRBYTTR63CZDCE5WGBIGLQMSWAQYPHC3XITAC","OZUZ5H6DJUXJ2MEHQK6FQ7LTSPUHHGZSFZ3SPBV26A2KBE4TQKQQC"],"known":["W7HZ5VFMEFVJIPYZJXOSMWTQ7DOZOOHT4QZTMDCT63AKIWB3TCZQC","YNZMKRJDWYOQ3R3XHA2G47YG2SDI7FT7AEXH3OLB3BJGB6ALTRQAC","UFSP7C7B2ERFJ2XVVVNXGZRXUEMFSMRABC5YXXLK6ONMFG6QBNHAC"]},"hunks":[{"Edit":{"inode":{"change":8,"pos":32},"path":"rust/src/repo.rs","line":7,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":91}],"down_context":[{"change":4,"pos":0}],"flag":"BLOCK","start":0,"end":42,"inode":{"change":8,"pos":32}}},"contents":[{"Add":"use std::sync::Arc;"},{"Add":"use std::sync::Mutex;"}]}},{"Edit":{"inode":{"change":8,"pos":32},"path":"rust/src/repo.rs","line":20,"atom":{"NewVertex":{"up_context":[{"change":9,"pos":76}],"down_context":[{"change":8,"pos":137}],"flag":"BLOCK","start":43,"end":217,"inode":{"change":8,"pos":32}}},"contents":[{"Add":"use libpijul::pristine::InodeMetadata;"},{"Add":"use libpijul::working_copy::WorkingCopy;"},{"Add":"use libpijul::working_copy::WorkingCopyRead;"},{"Add":"use libpijul::MutTxnT;"},{"Add":"use libpijul::MutTxnTExt;"}]}},{"Edit":{"inode":{"change":8,"pos":32},"path":"rust/src/repo.rs","line":29,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":205}],"down_context":[{"change":8,"pos":205}],"flag":"BLOCK","start":218,"end":236,"inode":{"change":8,"pos":32}}},"contents":[{"Add":" path: String,"}]}},{"Edit":{"inode":{"change":8,"pos":32},"path":"rust/src/repo.rs","line":56,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":570}],"down_context":[{"change":2,"pos":128}],"flag":"BLOCK","start":237,"end":609,"inode":{"change":8,"pos":32}}},"contents":[{"Add":""},{"Add":"#[derive(Debug, Clone)]"},{"Add":"pub struct StateMismatch {"},{"Add":" got: libpijul::Merkle,"},{"Add":" want: libpijul::Merkle,"},{"Add":"}"},{"Add":""},{"Add":"impl fmt::Display for StateMismatch {"},{"Add":" fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {"},{"Add":" write!("},{"Add":" f,"},{"Add":" \"state mismatch: got {:?}, want {:?}\","},{"Add":" self.got, self.want"},{"Add":" )"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl Error for StateMismatch {}"}]}},{"Edit":{"inode":{"change":8,"pos":32},"path":"rust/src/repo.rs","line":109,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":474}],"down_context":[{"change":4,"pos":474}],"flag":"BLOCK","start":610,"end":646,"inode":{"change":8,"pos":32}}},"contents":[{"Add":" path: path.to_string(),"}]}},{"Edit":{"inode":{"change":8,"pos":32},"path":"rust/src/repo.rs","line":205,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":1462}],"down_context":[{"change":8,"pos":1462}],"flag":"BLOCK","start":647,"end":2781,"inode":{"change":8,"pos":32}}},"contents":[{"Add":" }"},{"Add":""},{"Add":" pub fn new_sandbox(&mut self) -> Result> {"},{"Add":" let change_store ="},{"Add":" libpijul::changestore::filesystem::FileSystem::from_root(&Path::new(&self.path), 256);"},{"Add":" let txn = self.pristine.arc_txn_begin()?;"},{"Add":" let channel = txn.write().open_or_create_channel(\"pijul-export-sandbox\")?;"},{"Add":" return Ok(Sandbox {"},{"Add":" change_store,"},{"Add":" txn,"},{"Add":" channel,"},{"Add":" });"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"// A Sandbox has a temporary channel for applying changes and getting the"},{"Add":"// contents of the affected files."},{"Add":"pub struct Sandbox {"},{"Add":" change_store: libpijul::changestore::filesystem::FileSystem,"},{"Add":" txn: libpijul::pristine::ArcTxn>,"},{"Add":" channel: libpijul::pristine::ChannelRef>,"},{"Add":"}"},{"Add":""},{"Add":"impl Sandbox {"},{"Add":" pub fn add_change(&mut self, change: &Change) -> Result<(), Box> {"},{"Add":" let (_, new_state) = self.txn.write().apply_change("},{"Add":" &self.change_store,"},{"Add":" &mut *self.channel.write(),"},{"Add":" &change.hash,"},{"Add":" )?;"},{"Add":" if new_state != change.state {"},{"Add":" return Err(Box::new(StateMismatch {"},{"Add":" got: new_state,"},{"Add":" want: change.state,"},{"Add":" }));"},{"Add":" }"},{"Add":" return Ok(());"},{"Add":" }"},{"Add":""},{"Add":" pub fn get_files(&mut self) -> Result, Box> {"},{"Add":" let fs = FileSet {"},{"Add":" files: Arc::new(Mutex::new(Vec::new())),"},{"Add":" };"},{"Add":" libpijul::output::output_repository_no_pending("},{"Add":" &fs,"},{"Add":" &self.change_store,"},{"Add":" &self.txn,"},{"Add":" &self.channel,"},{"Add":" \"\","},{"Add":" false,"},{"Add":" None,"},{"Add":" 1,"},{"Add":" 0,"},{"Add":" )?;"},{"Add":""},{"Add":" let mut files: Vec = Vec::new();"},{"Add":" let mut file_writers = match fs.files.lock() {"},{"Add":" Ok(fw) => fw,"},{"Add":" Err(err) => panic!(\"mutex error: {}\", err),"},{"Add":" };"},{"Add":" for f in file_writers.drain(..) {"},{"Add":" files.push(File {"},{"Add":" name: f.name,"},{"Add":" content: Arc::try_unwrap(f.content).unwrap().into_inner()?,"},{"Add":" });"},{"Add":" }"},{"Add":""},{"Add":" return Ok(files);"}]}},{"Edit":{"inode":{"change":8,"pos":32},"path":"rust/src/repo.rs","line":274,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":1468}],"down_context":[{"change":8,"pos":1468}],"flag":"BLOCK","start":2782,"end":2851,"inode":{"change":8,"pos":32}}},"contents":[{"Add":"}"},{"Add":""},{"Add":"pub struct File {"},{"Add":" pub name: String,"},{"Add":" pub content: Vec,"}]}},{"Edit":{"inode":{"change":8,"pos":32},"path":"rust/src/repo.rs","line":280,"atom":{"NewVertex":{"up_context":[{"change":8,"pos":1470}],"down_context":[],"flag":"BLOCK","start":2852,"end":5642,"inode":{"change":8,"pos":32}}},"contents":[{"Add":""},{"Add":"#[derive(Clone)]"},{"Add":"pub struct FileWriter {"},{"Add":" pub name: String,"},{"Add":" pub content: Arc>>,"},{"Add":"}"},{"Add":""},{"Add":"impl std::io::Write for FileWriter {"},{"Add":" fn write(&mut self, b: &[u8]) -> Result {"},{"Add":" match self.content.lock() {"},{"Add":" Ok(mut c) => c.write(b),"},{"Add":" Err(e) => panic!(\"{}\", e),"},{"Add":" }"},{"Add":" }"},{"Add":" fn flush(&mut self) -> Result<(), std::io::Error> {"},{"Add":" Ok(())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Clone)]"},{"Add":"struct FileSet {"},{"Add":" pub files: Arc>>,"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Debug, Clone)]"},{"Add":"enum FileSetError {"},{"Add":" RemoveNotImplemented(String),"},{"Add":" RenameNotImplemented(String, String),"},{"Add":" ReadNotImplemented,"},{"Add":" MutexPoison,"},{"Add":"}"},{"Add":""},{"Add":"impl Error for FileSetError {}"},{"Add":""},{"Add":"impl fmt::Display for FileSetError {"},{"Add":" fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {"},{"Add":" match self {"},{"Add":" FileSetError::RemoveNotImplemented(p) => {"},{"Add":" write!(f, \"not implemented: remove_path({})\", p)"},{"Add":" }"},{"Add":" FileSetError::RenameNotImplemented(old, new) => {"},{"Add":" write!(f, \"not implemented: rename({}, {})\", old, new)"},{"Add":" }"},{"Add":" FileSetError::ReadNotImplemented => write!(f, \"not implemented: WorkingCopyRead\"),"},{"Add":" FileSetError::MutexPoison => write!(f, \"poisoned mutex\"),"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl WorkingCopyRead for FileSet {"},{"Add":" type Error = FileSetError;"},{"Add":""},{"Add":" fn file_metadata(&self, _file: &str) -> Result {"},{"Add":" Err(FileSetError::ReadNotImplemented)"},{"Add":" }"},{"Add":""},{"Add":" fn read_file(&self, _file: &str, _buffer: &mut Vec) -> Result<(), Self::Error> {"},{"Add":" Err(FileSetError::ReadNotImplemented)"},{"Add":" }"},{"Add":""},{"Add":" fn modified_time(&self, _file: &str) -> Result {"},{"Add":" Err(FileSetError::ReadNotImplemented)"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl WorkingCopy for FileSet {"},{"Add":" type Writer = FileWriter;"},{"Add":""},{"Add":" fn create_dir_all(&self, _file: &str) -> Result<(), Self::Error> {"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" fn remove_path(&self, path: &str, _rec: bool) -> Result<(), Self::Error> {"},{"Add":" Err(FileSetError::RemoveNotImplemented(path.to_string()))"},{"Add":" }"},{"Add":""},{"Add":" fn rename(&self, old: &str, new: &str) -> Result<(), Self::Error> {"},{"Add":" Err(FileSetError::RenameNotImplemented("},{"Add":" old.to_string(),"},{"Add":" new.to_string(),"},{"Add":" ))"},{"Add":" }"},{"Add":""},{"Add":" fn set_permissions(&self, _file: &str, _permissions: u16) -> Result<(), Self::Error> {"},{"Add":" Ok(())"},{"Add":" }"},{"Add":""},{"Add":" fn write_file(&self, file: &str, _: libpijul::Inode) -> Result {"},{"Add":" let f = FileWriter {"},{"Add":" name: file.to_string(),"},{"Add":" content: Arc::new(Mutex::new(Vec::new())),"},{"Add":" };"},{"Add":" match self.files.lock() {"},{"Add":" Ok(mut v) => v.push(f.clone()),"},{"Add":" Err(_err) => return Err(FileSetError::MutexPoison),"},{"Add":" }"},{"Add":" return Ok(f);"},{"Add":" }"},{"Add":"}"}]}},{"Edit":{"inode":{"change":10,"pos":67},"path":"rust/src/main.rs","line":25,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":1721}],"down_context":[{"change":3,"pos":98}],"flag":"BLOCK","start":5643,"end":5695,"inode":{"change":10,"pos":67}}},"contents":[{"Add":" let mut sandbox = repo.new_sandbox().unwrap();"},{"Add":""}]}},{"Edit":{"inode":{"change":10,"pos":67},"path":"rust/src/main.rs","line":28,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":130}],"down_context":[{"change":3,"pos":130}],"flag":"BLOCK","start":5696,"end":5796,"inode":{"change":10,"pos":67}}},"contents":[{"Add":" sandbox.add_change(&changes[i]).unwrap();"},{"Add":" let files = sandbox.get_files().unwrap();"}]}},{"Replacement":{"inode":{"change":10,"pos":67},"path":"rust/src/main.rs","line":33,"ins":{"up_context":[{"change":3,"pos":197}],"down_context":[{"change":3,"pos":234}],"flag":"BLOCK","start":5797,"end":5836,"inode":{"change":10,"pos":67}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":197},"to":{"change":3,"start":197,"end":234},"introduced_by":3}],"inode":{"change":10,"pos":67}},"ins_contents":[{"Add":" Some(changes[i - 1].state)"}],"del_contents":[{"Del":" Some(changes[i-1].state)\n"}]}},{"Replacement":{"inode":{"change":10,"pos":67},"path":"rust/src/main.rs","line":35,"ins":{"up_context":[{"change":3,"pos":245}],"down_context":[{"change":4,"pos":939}],"flag":"BLOCK","start":5837,"end":5895,"inode":{"change":10,"pos":67}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":245},"to":{"change":3,"start":245,"end":295},"introduced_by":3}],"inode":{"change":10,"pos":67}},"ins_contents":[{"Add":" stream.write_commit(&changes[i], parent, &files);"}],"del_contents":[{"Del":" stream.write_commit(&changes[i], parent);\n"}]}},{"Edit":{"inode":{"change":4,"pos":313},"path":"rust/src/fast_export.rs","line":2,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":327}],"down_context":[{"change":3,"pos":327}],"flag":"BLOCK","start":5896,"end":5916,"inode":{"change":4,"pos":313}}},"contents":[{"Add":"use std::io::Write;"}]}},{"Edit":{"inode":{"change":4,"pos":313},"path":"rust/src/fast_export.rs","line":5,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":339}],"down_context":[{"change":4,"pos":339}],"flag":"BLOCK","start":5917,"end":5940,"inode":{"change":4,"pos":313}}},"contents":[{"Add":"use crate::repo::File;"}]}},{"Edit":{"inode":{"change":4,"pos":313},"path":"rust/src/fast_export.rs","line":12,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":406}],"down_context":[{"change":4,"pos":399}],"flag":"BLOCK","start":5941,"end":5966,"inode":{"change":4,"pos":313}}},"contents":[{"Add":""},{"Add":" max_blob_mark: i32,"}]}},{"Edit":{"inode":{"change":4,"pos":313},"path":"rust/src/fast_export.rs","line":23,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":599}],"down_context":[{"change":3,"pos":599}],"flag":"BLOCK","start":5967,"end":6007,"inode":{"change":4,"pos":313}}},"contents":[{"Add":""},{"Add":" max_blob_mark: 1000000000,"}]}},{"Edit":{"inode":{"change":4,"pos":313},"path":"rust/src/fast_export.rs","line":27,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":616}],"down_context":[{"change":3,"pos":616}],"flag":"BLOCK","start":6008,"end":6525,"inode":{"change":4,"pos":313}}},"contents":[{"Add":""},{"Add":" pub fn write_commit(&mut self, c: &Change, parent: Option, files: &Vec) {"},{"Add":" let mut file_marks = Vec::new();"},{"Add":" for f in files {"},{"Add":" self.max_blob_mark += 1;"},{"Add":" let blob_mark = self.max_blob_mark;"},{"Add":" file_marks.push(blob_mark);"},{"Add":" println!(\"blob\");"},{"Add":" println!(\"mark :{}\", blob_mark);"},{"Add":" println!(\"data {}\", f.content.len());"},{"Add":" std::io::stdout().write_all(&f.content).unwrap();"},{"Add":" println!(\"\");"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":4,"pos":313},"path":"rust/src/fast_export.rs","line":41,"ins":{"up_context":[{"change":3,"pos":617}],"down_context":[{"change":4,"pos":475}],"flag":"BLOCK","start":6526,"end":6529,"inode":{"change":4,"pos":313}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":617},"to":{"change":3,"start":617,"end":700},"introduced_by":3}],"inode":{"change":4,"pos":313}},"ins_contents":[{"Add":""},{"Add":""},{"Add":""}],"del_contents":[{"Del":" pub fn write_commit(&mut self, c: &Change, parent: Option) {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":313},"path":"rust/src/fast_export.rs","line":63,"ins":{"up_context":[{"change":3,"pos":917}],"down_context":[{"change":3,"pos":1108}],"flag":"BLOCK","start":6530,"end":6676,"inode":{"change":4,"pos":313}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":917},"to":{"change":3,"start":917,"end":1108},"introduced_by":3}],"inode":{"change":4,"pos":313}},"ins_contents":[{"Add":" Some(p) => match self.commit_marks.get(&p) {"},{"Add":" Some(p_mark) => println!(\"from :{}\", p_mark),"},{"Add":" None => {}"}],"del_contents":[{"Del":" Some(p) => {\n match self.commit_marks.get(&p) {\n Some(p_mark) => println!(\"from :{}\", p_mark),\n None => {},\n }\n"}]}},{"Replacement":{"inode":{"change":4,"pos":313},"path":"rust/src/fast_export.rs","line":67,"ins":{"up_context":[{"change":3,"pos":1123}],"down_context":[{"change":3,"pos":1147}],"flag":"BLOCK","start":6677,"end":6844,"inode":{"change":4,"pos":313}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":1123},"to":{"change":3,"start":1123,"end":1147},"introduced_by":3}],"inode":{"change":4,"pos":313}},"ins_contents":[{"Add":" None => {}"},{"Add":" }"},{"Add":" println!(\"deleteall\");"},{"Add":" for i in 0..files.len() {"},{"Add":" println!(\"M 644 :{} {}\", file_marks[i], &files[i].name);"}],"del_contents":[{"Del":" None => {},\n"}]}},{"Edit":{"inode":{"change":4,"pos":313},"path":"rust/src/fast_export.rs","line":73,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":1157},"to":{"change":4,"start":1032,"end":1082},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1032},"to":{"change":4,"start":1032,"end":1082},"introduced_by":4}],"inode":{"change":4,"pos":313}}},"contents":[{"Del":" // TODO: deleteall\n // TODO: files\n"}]}}],"owner":"andybalholm","repo":"pijul-export","token":"BtL8+qdSjWQMnJi+QjStJT8g8zOwvxAmqIq/PH0PjSo=","login":null}

…

Dependencies

Change contents