{"header":{"message":"Adding rollback test","description":null,"timestamp":"2021-01-04T19:21:42.203320312Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"NO2QPRFLGCYUDXYJTOY3S3NZJCCLAFOQUHITKDZ7LSZLRLOV5W3QC","authors":[],"deps":{"hashes":[["NO2QPRFLGCYUDXYJTOY3S3NZJCCLAFOQUHITKDZ7LSZLRLOV5W3QC","Adding rollback test"],["AA",null],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."]],"deps":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC"],"known":[]},"hunks":[{"FileAdd":{"meta":{"basename":"rollback.rs","metadata":420},"context":[{"change":2,"pos":248792}],"contents":[{"Add":"use super::*;"},{"Add":"use crate::working_copy::WorkingCopy;"},{"Add":""},{"Add":"#[test]"},{"Add":"fn rollback_conflict_resolution_simple() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let mut repo = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":""},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":""},{"Add":" let mut channela = txn.open_or_create_channel(\"main\")?;"},{"Add":""},{"Add":" // Create a simple conflict between axb and ayb"},{"Add":" repo.add_file(\"file\", b\"a\\nb\\n\".to_vec());"},{"Add":" txn.add_file(\"file\")?;"},{"Add":" record_all(&mut repo, &changes, &mut txn, &mut channela, \"\")?;"},{"Add":""},{"Add":" let mut channelb = txn.fork(&channela, \"other\")?;"},{"Add":""},{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"},{"Add":" w.write_all(b\"a\\nx\\nb\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let ha = record_all(&mut repo, &changes, &mut txn, &mut channela, \"\")?;"},{"Add":""},{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"},{"Add":" w.write_all(b\"a\\ny\\nb\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let hb = record_all(&mut repo, &changes, &mut txn, &mut channelb, \"\")?;"},{"Add":""},{"Add":" apply::apply_change(&changes, &mut txn, &mut channelb, ha)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channela, hb)?;"},{"Add":""},{"Add":" debug_to_file(&txn, &channela.borrow(), \"debuga\")?;"},{"Add":" debug_to_file(&txn, &channelb.borrow(), \"debugb\")?;"},{"Add":""},{"Add":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channela, \"\", true)?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo.read_file(\"file\", &mut buf)?;"},{"Add":" debug!(\"{}\", std::str::from_utf8(&buf).unwrap());"},{"Add":""},{"Add":" // Solve the conflict."},{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();"},{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"},{"Add":" for l in conflict.iter().filter(|l| l.len() == 1) {"},{"Add":" writeln!(w, \"{}\", l)?"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":""},{"Add":" buf.clear();"},{"Add":" repo.read_file(\"file\", &mut buf)?;"},{"Add":" debug!(\"{}\", std::str::from_utf8(&buf).unwrap());"},{"Add":" let resb = record_all(&mut repo, &changes, &mut txn, &mut channela, \"\")?;"},{"Add":" debug_to_file(&txn, &channela.borrow(), \"debugres\")?;"},{"Add":""},{"Add":" let p_inv = changes.get_change(&resb).unwrap().inverse("},{"Add":" &resb,"},{"Add":" crate::change::ChangeHeader {"},{"Add":" authors: vec![],"},{"Add":" message: \"rollback\".to_string(),"},{"Add":" description: None,"},{"Add":" timestamp: chrono::Utc::now(),"},{"Add":" },"},{"Add":" Vec::new(),"},{"Add":" );"},{"Add":" let h_inv = changes.save_change(&p_inv)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channela, h_inv)?;"},{"Add":" debug_to_file(&txn, &channela.borrow(), \"debug\")?;"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"},{"Add":""},{"Add":"#[test]"},{"Add":"fn rollback_conflict_resolution_swap() -> Result<(), anyhow::Error> {"},{"Add":" env_logger::try_init().unwrap_or(());"},{"Add":""},{"Add":" let mut repo = working_copy::memory::Memory::new();"},{"Add":" let changes = changestore::memory::Memory::new();"},{"Add":""},{"Add":" let env = pristine::sanakirja::Pristine::new_anon()?;"},{"Add":""},{"Add":" let mut txn = env.mut_txn_begin();"},{"Add":""},{"Add":" let mut channela = txn.open_or_create_channel(\"main\")?;"},{"Add":""},{"Add":" // Create a simple conflict between axb and ayb"},{"Add":" repo.add_file(\"file\", b\"a\\nb\\n\".to_vec());"},{"Add":" txn.add_file(\"file\")?;"},{"Add":" record_all(&mut repo, &changes, &mut txn, &mut channela, \"\")?;"},{"Add":""},{"Add":" let mut channelb = txn.fork(&channela, \"other\")?;"},{"Add":""},{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"},{"Add":" w.write_all(b\"a\\nx\\nb\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let ha = record_all(&mut repo, &changes, &mut txn, &mut channela, \"\")?;"},{"Add":""},{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"},{"Add":" w.write_all(b\"a\\ny\\nb\\n\")?;"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":" let hb = record_all(&mut repo, &changes, &mut txn, &mut channelb, \"\")?;"},{"Add":""},{"Add":" apply::apply_change(&changes, &mut txn, &mut channelb, ha)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channela, hb)?;"},{"Add":""},{"Add":" debug_to_file(&txn, &channela.borrow(), \"debuga\")?;"},{"Add":" debug_to_file(&txn, &channelb.borrow(), \"debugb\")?;"},{"Add":""},{"Add":" output::output_repository_no_pending(&mut repo, &changes, &mut txn, &mut channela, \"\", true)?;"},{"Add":" let mut buf = Vec::new();"},{"Add":" repo.read_file(\"file\", &mut buf)?;"},{"Add":" debug!(\"{}\", std::str::from_utf8(&buf).unwrap());"},{"Add":""},{"Add":" // Solve the conflict."},{"Add":" let conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();"},{"Add":" repo.write_file::<_, std::io::Error, _>(\"file\", |w| {"},{"Add":" for l in conflict.iter().filter(|l| l.len() == 1) {"},{"Add":" writeln!(w, \"{}\", l)?"},{"Add":" }"},{"Add":" Ok(())"},{"Add":" })?;"},{"Add":""},{"Add":" buf.clear();"},{"Add":" repo.read_file(\"file\", &mut buf)?;"},{"Add":" debug!(\"{}\", std::str::from_utf8(&buf).unwrap());"},{"Add":" let resb = record_all(&mut repo, &changes, &mut txn, &mut channelb, \"\")?;"},{"Add":" debug_to_file(&txn, &channelb.borrow(), \"debugres\")?;"},{"Add":""},{"Add":" let p_inv = changes.get_change(&resb).unwrap().inverse("},{"Add":" &resb,"},{"Add":" crate::change::ChangeHeader {"},{"Add":" authors: vec![],"},{"Add":" message: \"rollback\".to_string(),"},{"Add":" description: None,"},{"Add":" timestamp: chrono::Utc::now(),"},{"Add":" },"},{"Add":" Vec::new(),"},{"Add":" );"},{"Add":" let h_inv = changes.save_change(&p_inv)?;"},{"Add":" apply::apply_change(&changes, &mut txn, &mut channelb, h_inv)?;"},{"Add":" debug_to_file(&txn, &channelb.borrow(), \"debug\")?;"},{"Add":""},{"Add":" Ok(())"},{"Add":"}"}]}}],"owner":"irevoire","repo":"pijul","token":"i+d0boW+324NsF3lKf0233DQuc0pKqb9sX5QK5dLx+o=","login":null}

…

Dependencies

Change contents